@adaptabletools/adaptable-cjs 20.0.0-canary.15 → 20.0.0-canary.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable-cjs",
-  "version": "20.0.0-canary.15",
+  "version": "20.0.0-canary.17",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",
@@ -40,7 +40,7 @@
   "dependencies": {
     "@finos/fdc3": "2.1.0",
     "@infinite-table/infinite-react": "6.2.5",
-    "date-fns": "^2.28.0",
+    "date-fns": "^4.1.0",
     "lodash": "^4.17.15",
     "normalize.css": "^8.0.1",
     "prop-types": "^15.6.2",

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -2,19 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SystemBadgeStylePredicateIds = exports.SystemFlashingCellPredicateIds = exports.SystemFormatColumnPredicateIds = exports.SystemAlertPredicateIds = exports.SystemFilterPredicateIds = exports.SystemPredicateDefs = void 0;
 const tslib_1 = require("tslib");
-const isAfter_1 = tslib_1.__importDefault(require("date-fns/isAfter"));
-const isBefore_1 = tslib_1.__importDefault(require("date-fns/isBefore"));
-const isEqual_1 = tslib_1.__importDefault(require("date-fns/isEqual"));
-const isFuture_1 = tslib_1.__importDefault(require("date-fns/isFuture"));
-const isPast_1 = tslib_1.__importDefault(require("date-fns/isPast"));
-const isSameDay_1 = tslib_1.__importDefault(require("date-fns/isSameDay"));
-const isThisMonth_1 = tslib_1.__importDefault(require("date-fns/isThisMonth"));
-const isThisQuarter_1 = tslib_1.__importDefault(require("date-fns/isThisQuarter"));
-const isThisWeek_1 = tslib_1.__importDefault(require("date-fns/isThisWeek"));
-const isThisYear_1 = tslib_1.__importDefault(require("date-fns/isThisYear"));
-const isToday_1 = tslib_1.__importDefault(require("date-fns/isToday"));
-const isTomorrow_1 = tslib_1.__importDefault(require("date-fns/isTomorrow"));
-const isYesterday_1 = tslib_1.__importDefault(require("date-fns/isYesterday"));
+const date_fns_1 = require("date-fns");
+const date_fns_2 = require("date-fns");
+const date_fns_3 = require("date-fns");
+const date_fns_4 = require("date-fns");
+const date_fns_5 = require("date-fns");
+const date_fns_6 = require("date-fns");
+const date_fns_7 = require("date-fns");
+const date_fns_8 = require("date-fns");
+const date_fns_9 = require("date-fns");
+const date_fns_10 = require("date-fns");
+const date_fns_11 = require("date-fns");
+const date_fns_12 = require("date-fns");
+const date_fns_13 = require("date-fns");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const DateHelper_1 = require("../../Utilities/Helpers/DateHelper");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
@@ -56,10 +56,10 @@ exports.SystemPredicateDefs = [
             if (column.dataType === 'date') {
                 return inputs.some((input) => {
                     if (adaptableApi.optionsApi.getPredicateOptions().evaluateValuesPredicateUsingTime) {
-                        return (0, isEqual_1.default)(input, value);
+                        return (0, date_fns_3.isEqual)(input, value);
                     }
                     else {
-                        return (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(input), (0, DateHelper_1.parseDateValue)(value));
+                        return (0, date_fns_6.isSameDay)((0, DateHelper_1.parseDateValue)(input), (0, DateHelper_1.parseDateValue)(value));
                     }
                 });
             }
@@ -116,12 +116,12 @@ exports.SystemPredicateDefs = [
             if (column.dataType === 'date') {
                 if (adaptableApi.optionsApi.getPredicateOptions().evaluateValuesPredicateUsingTime) {
                     return inputs.every((input) => {
-                        return !(0, isEqual_1.default)(input, value);
+                        return !(0, date_fns_3.isEqual)(input, value);
                     });
                 }
                 else {
                     return inputs.every((input) => {
-                        return !(0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(input), (0, DateHelper_1.parseDateValue)(value));
+                        return !(0, date_fns_6.isSameDay)((0, DateHelper_1.parseDateValue)(input), (0, DateHelper_1.parseDateValue)(value));
                     });
                 }
             }
@@ -398,7 +398,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isToday_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_11.isToday)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'Yesterday',
@@ -406,7 +406,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isYesterday_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_13.isYesterday)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'Tomorrow',
@@ -414,7 +414,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isTomorrow_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_12.isTomorrow)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'ThisWeek',
@@ -422,7 +422,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isThisWeek_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_9.isThisWeek)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'ThisMonth',
@@ -430,7 +430,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isThisMonth_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_7.isThisMonth)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'ThisQuarter',
@@ -438,7 +438,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isThisQuarter_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_8.isThisQuarter)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'ThisYear',
@@ -446,7 +446,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isThisYear_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_10.isThisYear)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'InPast',
@@ -454,7 +454,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isPast_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_5.isPast)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'InFuture',
@@ -462,7 +462,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isFuture_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_4.isFuture)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'After',
@@ -471,7 +471,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => (0, isAfter_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
+        handler: ({ value, inputs }) => (0, date_fns_1.isAfter)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `> ${inputs[0] ?? ''}`,
     },
     {
@@ -481,7 +481,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => (0, isBefore_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
+        handler: ({ value, inputs }) => (0, date_fns_2.isBefore)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `< ${inputs[0] ?? ''}`,
     },
     {
@@ -491,7 +491,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
+        handler: ({ value, inputs }) => (0, date_fns_6.isSameDay)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `= ${inputs[0] ?? ''}`,
     },
     {
@@ -501,7 +501,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => !(0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
+        handler: ({ value, inputs }) => !(0, date_fns_6.isSameDay)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `!= ${inputs[0] ?? ''}`,
     },
     {
@@ -510,7 +510,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value, adaptableApi }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), adaptableApi.calendarApi.getNextWorkingDay()),
+        handler: ({ value, adaptableApi }) => (0, date_fns_6.isSameDay)((0, DateHelper_1.parseDateValue)(value), adaptableApi.calendarApi.getNextWorkingDay()),
     },
     {
         id: 'LastWorkDay',
@@ -518,7 +518,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value, adaptableApi }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), adaptableApi.calendarApi.getPreviousWorkingDay()),
+        handler: ({ value, adaptableApi }) => (0, date_fns_6.isSameDay)((0, DateHelper_1.parseDateValue)(value), adaptableApi.calendarApi.getPreviousWorkingDay()),
     },
     {
         id: 'WorkDay',

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addGroupByParams = exports.aggregatedScalarExpressionFunctionNames = exports.aggregatedScalarExpressionFunctions = exports.quantileAggregatedExpressionFunctions = exports.cumulativeAggregatedExpressionFunctions = exports.aggregatedExpressionFunctions = void 0;
-const tslib_1 = require("tslib");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const ArrayExtensions_1 = require("../Extensions/ArrayExtensions");
 const TypeExtensions_1 = require("../Extensions/TypeExtensions");
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
-const isAfter_1 = tslib_1.__importDefault(require("date-fns/isAfter"));
+const date_fns_1 = require("date-fns");
 const DateHelper_1 = require("../Helpers/DateHelper");
 exports.aggregatedExpressionFunctions = [
     'SUM',
@@ -589,7 +588,7 @@ exports.aggregatedScalarExpressionFunctions = {
                                 }
                                 else {
                                     // Date
-                                    return (0, isAfter_1.default)((0, DateHelper_1.parseDateValue)(rowValue), (0, DateHelper_1.parseDateValue)(minValue))
+                                    return (0, date_fns_1.isAfter)((0, DateHelper_1.parseDateValue)(rowValue), (0, DateHelper_1.parseDateValue)(minValue))
                                         ? minValue
                                         : rowValue;
                                 }
@@ -653,7 +652,7 @@ exports.aggregatedScalarExpressionFunctions = {
                                 }
                                 else {
                                     // Date
-                                    return (0, isAfter_1.default)((0, DateHelper_1.parseDateValue)(rowValue), (0, DateHelper_1.parseDateValue)(maxValue))
+                                    return (0, date_fns_1.isAfter)((0, DateHelper_1.parseDateValue)(rowValue), (0, DateHelper_1.parseDateValue)(maxValue))
                                         ? rowValue
                                         : maxValue;
                                 }
@@ -1245,7 +1244,7 @@ const mapAggregationToCumulation = (aggregationParameter, overColumnParameter, c
                     if (isDefinedValue(rowValue)) {
                         if (aggregationEvaluation.columnType === 'date') {
                             if (cumulationBag.currentValue === aggregationReducer.initialValue ||
-                                (0, isAfter_1.default)((0, DateHelper_1.parseDateValue)(cumulationBag.currentValue), (0, DateHelper_1.parseDateValue)(rowValue))) {
+                                (0, date_fns_1.isAfter)((0, DateHelper_1.parseDateValue)(cumulationBag.currentValue), (0, DateHelper_1.parseDateValue)(rowValue))) {
                                 cumulationBag.currentValue = rowValue;
                             }
                         }
@@ -1271,7 +1270,7 @@ const mapAggregationToCumulation = (aggregationParameter, overColumnParameter, c
                         if (isDefinedValue(rowValue)) {
                             if (aggregationEvaluation.columnType === 'date') {
                                 if (cumulationBag.currentValue === aggregationReducer.initialValue ||
-                                    (0, isAfter_1.default)((0, DateHelper_1.parseDateValue)(rowValue), (0, DateHelper_1.parseDateValue)(cumulationBag.currentValue))) {
+                                    (0, date_fns_1.isAfter)((0, DateHelper_1.parseDateValue)(rowValue), (0, DateHelper_1.parseDateValue)(cumulationBag.currentValue))) {
                                     cumulationBag.currentValue = rowValue;
                                 }
                             }

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isBooleanAdaptableQlFunction = exports.booleanExpressionFunctionsNames = exports.booleanExpressionFunctions = void 0;
-const tslib_1 = require("tslib");
-const isAfter_1 = tslib_1.__importDefault(require("date-fns/isAfter"));
-const isBefore_1 = tslib_1.__importDefault(require("date-fns/isBefore"));
-const isEqual_1 = tslib_1.__importDefault(require("date-fns/isEqual"));
+const date_fns_1 = require("date-fns");
+const date_fns_2 = require("date-fns");
+const date_fns_3 = require("date-fns");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
 const TypeExtensions_1 = require("../Extensions/TypeExtensions");
@@ -69,7 +68,7 @@ exports.booleanExpressionFunctions = {
     EQ: {
         handler(args, context) {
             if (args[0] instanceof Date && args[1] instanceof Date) {
-                return (0, isEqual_1.default)(args[0], args[1]);
+                return (0, date_fns_3.isEqual)(args[0], args[1]);
             }
             if (typeof args[0] === 'string' || typeof args[1] === 'string') {
                 const [first, second] = (0, expressionFunctionUtils_1.getStringValues)(context, String(args[0]), String(args[1]));
@@ -93,7 +92,7 @@ exports.booleanExpressionFunctions = {
     NEQ: {
         handler(args, context) {
             if (args[0] instanceof Date && args[1] instanceof Date) {
-                return !(0, isEqual_1.default)(args[0], args[1]);
+                return !(0, date_fns_3.isEqual)(args[0], args[1]);
             }
             if (typeof args[0] === 'string' || typeof args[1] === 'string') {
                 const [first, second] = (0, expressionFunctionUtils_1.getStringValues)(context, String(args[0]), String(args[1]));
@@ -117,7 +116,7 @@ exports.booleanExpressionFunctions = {
     LT: {
         handler(args, context) {
             if (args[0] instanceof Date && args[1] instanceof Date) {
-                return (0, isBefore_1.default)(args[0], args[1]);
+                return (0, date_fns_2.isBefore)(args[0], args[1]);
             }
             if (typeof args[0] === 'string' || typeof args[1] === 'string') {
                 const [first, second] = (0, expressionFunctionUtils_1.getStringValues)(context, String(args[0]), String(args[1]));
@@ -144,7 +143,7 @@ exports.booleanExpressionFunctions = {
     LTE: {
         handler(args, context) {
             if (args[0] instanceof Date && args[1] instanceof Date) {
-                return (0, isBefore_1.default)(args[0], args[1]) || (0, isEqual_1.default)(args[0], args[1]);
+                return (0, date_fns_2.isBefore)(args[0], args[1]) || (0, date_fns_3.isEqual)(args[0], args[1]);
             }
             if (typeof args[0] === 'string' || typeof args[1] === 'string') {
                 const [first, second] = (0, expressionFunctionUtils_1.getStringValues)(context, String(args[0]), String(args[1]));
@@ -171,7 +170,7 @@ exports.booleanExpressionFunctions = {
     GT: {
         handler(args, context) {
             if (args[0] instanceof Date && args[1] instanceof Date) {
-                return (0, isAfter_1.default)(args[0], args[1]);
+                return (0, date_fns_1.isAfter)(args[0], args[1]);
             }
             if (typeof args[0] === 'string' || typeof args[1] === 'string') {
                 const [first, second] = (0, expressionFunctionUtils_1.getStringValues)(context, String(args[0]), String(args[1]));
@@ -198,7 +197,7 @@ exports.booleanExpressionFunctions = {
     GTE: {
         handler(args, context) {
             if (args[0] instanceof Date && args[1] instanceof Date) {
-                return (0, isAfter_1.default)(args[0], args[1]) || (0, isEqual_1.default)(args[0], args[1]);
+                return (0, date_fns_1.isAfter)(args[0], args[1]) || (0, date_fns_3.isEqual)(args[0], args[1]);
             }
             if (typeof args[0] === 'string' || typeof args[1] === 'string') {
                 const [first, second] = (0, expressionFunctionUtils_1.getStringValues)(context, String(args[0]), String(args[1]));

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.scalarExpressionFunctionNames = exports.scalarExpressionFunctions = void 0;
 const tslib_1 = require("tslib");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
-const parseISO_1 = tslib_1.__importDefault(require("date-fns/parseISO"));
-const startOfDay_1 = tslib_1.__importDefault(require("date-fns/startOfDay"));
-const startOfWeek_1 = tslib_1.__importDefault(require("date-fns/startOfWeek"));
-const startOfMonth_1 = tslib_1.__importDefault(require("date-fns/startOfMonth"));
-const startOfYear_1 = tslib_1.__importDefault(require("date-fns/startOfYear"));
-const addDays_1 = tslib_1.__importDefault(require("date-fns/addDays"));
-const addWeeks_1 = tslib_1.__importDefault(require("date-fns/addWeeks"));
-const addMonths_1 = tslib_1.__importDefault(require("date-fns/addMonths"));
-const addYears_1 = tslib_1.__importDefault(require("date-fns/addYears"));
-const differenceInDays_1 = tslib_1.__importDefault(require("date-fns/differenceInDays"));
-const differenceInWeeks_1 = tslib_1.__importDefault(require("date-fns/differenceInWeeks"));
-const differenceInMonths_1 = tslib_1.__importDefault(require("date-fns/differenceInMonths"));
-const differenceInYears_1 = tslib_1.__importDefault(require("date-fns/differenceInYears"));
+const date_fns_1 = require("date-fns");
+const date_fns_2 = require("date-fns");
+const date_fns_3 = require("date-fns");
+const date_fns_4 = require("date-fns");
+const date_fns_5 = require("date-fns");
+const date_fns_6 = require("date-fns");
+const date_fns_7 = require("date-fns");
+const date_fns_8 = require("date-fns");
+const date_fns_9 = require("date-fns");
+const date_fns_10 = require("date-fns");
+const date_fns_11 = require("date-fns");
+const date_fns_12 = require("date-fns");
+const date_fns_13 = require("date-fns");
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
 const dateUtils_1 = require("./dateUtils");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
@@ -377,7 +377,7 @@ exports.scalarExpressionFunctions = {
     },
     DATE: {
         handler(args) {
-            return (0, parseISO_1.default)(args[0]);
+            return (0, date_fns_1.parseISO)(args[0]);
         },
         description: 'Returns a new date by parsing the given string in ISO 8601 format',
         signatures: [
@@ -402,7 +402,7 @@ exports.scalarExpressionFunctions = {
     },
     CURRENT_DAY: {
         handler() {
-            return (0, startOfDay_1.default)(new Date());
+            return (0, date_fns_2.startOfDay)(new Date());
         },
         description: 'Returns the current day',
         signatures: ['CURRENT_DAY()'],
@@ -412,7 +412,7 @@ exports.scalarExpressionFunctions = {
     },
     DAY: {
         handler(args) {
-            return (0, startOfDay_1.default)(args[0]);
+            return (0, date_fns_2.startOfDay)(args[0]);
         },
         description: 'Returns the day from a date',
         signatures: ['DAY(input: date)'],
@@ -422,7 +422,7 @@ exports.scalarExpressionFunctions = {
     },
     WEEK: {
         handler(args) {
-            return (0, startOfWeek_1.default)(args[0]);
+            return (0, date_fns_3.startOfWeek)(args[0]);
         },
         description: 'Returns the week from a date',
         signatures: ['WEEK(input: date)'],
@@ -432,7 +432,7 @@ exports.scalarExpressionFunctions = {
     },
     MONTH: {
         handler(args) {
-            return (0, startOfMonth_1.default)(args[0]);
+            return (0, date_fns_4.startOfMonth)(args[0]);
         },
         description: 'Returns the month from a date',
         signatures: ['MONTH(input: date)'],
@@ -442,7 +442,7 @@ exports.scalarExpressionFunctions = {
     },
     YEAR: {
         handler(args) {
-            return (0, startOfYear_1.default)(args[0]);
+            return (0, date_fns_5.startOfYear)(args[0]);
         },
         description: 'Returns the year from a date',
         signatures: ['YEAR(input: date)'],
@@ -452,7 +452,7 @@ exports.scalarExpressionFunctions = {
     },
     ADD_DAYS: {
         handler(args) {
-            return (0, addDays_1.default)(args[0], args[1]);
+            return (0, date_fns_6.addDays)(args[0], args[1]);
         },
         description: 'Returns a date based on input data and days to add',
         signatures: ['ADD_DAYS(input: date, days: number)'],
@@ -462,7 +462,7 @@ exports.scalarExpressionFunctions = {
     },
     ADD_WEEKS: {
         handler(args) {
-            return (0, addWeeks_1.default)(args[0], args[1]);
+            return (0, date_fns_7.addWeeks)(args[0], args[1]);
         },
         description: 'Returns a date based on input data and weeks to add',
         signatures: ['ADD_WEEKS(input: date, weeks: number)'],
@@ -472,7 +472,7 @@ exports.scalarExpressionFunctions = {
     },
     ADD_MONTHS: {
         handler(args) {
-            return (0, addMonths_1.default)(args[0], args[1]);
+            return (0, date_fns_8.addMonths)(args[0], args[1]);
         },
         description: 'Returns a date based on input data and months to add',
         signatures: ['ADD_MONTHS(input: date, months: number)'],
@@ -482,7 +482,7 @@ exports.scalarExpressionFunctions = {
     },
     ADD_YEARS: {
         handler(args) {
-            return (0, addYears_1.default)(args[0], args[1]);
+            return (0, date_fns_9.addYears)(args[0], args[1]);
         },
         description: 'Returns a date based on input data and years to add',
         signatures: ['ADD_YEARS(input: date, years: number)'],
@@ -493,7 +493,7 @@ exports.scalarExpressionFunctions = {
     DIFF_DAYS: {
         handler(args) {
             const [first, second] = (0, dateUtils_1.normalizeDateParams)(args);
-            const result = (0, differenceInDays_1.default)(first, second);
+            const result = (0, date_fns_10.differenceInDays)(first, second);
             return sanitizeNumericResult(result);
         },
         description: 'Returns the difference in days between 2 dates',
@@ -505,7 +505,7 @@ exports.scalarExpressionFunctions = {
     DIFF_WEEKS: {
         handler(args) {
             const [first, second] = (0, dateUtils_1.normalizeDateParams)(args);
-            const result = (0, differenceInWeeks_1.default)(first, second);
+            const result = (0, date_fns_11.differenceInWeeks)(first, second);
             return sanitizeNumericResult(result);
         },
         description: 'Returns the difference in weeks between 2 dates',
@@ -517,7 +517,7 @@ exports.scalarExpressionFunctions = {
     DIFF_MONTHS: {
         handler(args) {
             const [first, second] = (0, dateUtils_1.normalizeDateParams)(args);
-            const result = (0, differenceInMonths_1.default)(first, second);
+            const result = (0, date_fns_12.differenceInMonths)(first, second);
             return sanitizeNumericResult(result);
         },
         description: 'Returns the difference in months between 2 dates',
@@ -529,7 +529,7 @@ exports.scalarExpressionFunctions = {
     DIFF_YEARS: {
         handler(args) {
             const [first, second] = (0, dateUtils_1.normalizeDateParams)(args);
-            const result = (0, differenceInYears_1.default)(first, second);
+            const result = (0, date_fns_13.differenceInYears)(first, second);
             return sanitizeNumericResult(result);
         },
         description: 'Returns the difference in years between 2 dates',

package/src/Utilities/Helpers/DateHelper.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseFilterInputDate = exports.parseDateValue = exports.parseToISO = exports.dateToISO = exports.isValueValidDate = exports.isValidDate = void 0;
-const tslib_1 = require("tslib");
-const parseISO_1 = tslib_1.__importDefault(require("date-fns/parseISO"));
-const parse_1 = tslib_1.__importDefault(require("date-fns/parse"));
+const date_fns_1 = require("date-fns");
 const FormatHelper_1 = require("./FormatHelper");
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 const isValidDate = (date) => {
@@ -46,10 +44,10 @@ const parseDateValue = (dateValue, dateFormat) => {
     else {
         // typeof dateValue === 'string'
         if (dateFormat) {
-            dateInstance = (0, parse_1.default)(dateValue, dateFormat, new Date());
+            dateInstance = (0, date_fns_1.parse)(dateValue, dateFormat, new Date());
         }
         else {
-            dateInstance = (0, parseISO_1.default)(dateValue);
+            dateInstance = (0, date_fns_1.parseISO)(dateValue);
         }
         if (!(0, exports.isValidDate)(dateInstance)) {
             // last chance: try to use the native Date.parse(), https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/parse

package/src/Utilities/Helpers/FormatHelper.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StringFormatter = exports.DateFormatter = exports.NumberFormatter = void 0;
 const tslib_1 = require("tslib");
 // TODO inspect why the following is erroring on angular build
-// import dateFnsFormat from 'date-fns/format';
-const format_1 = tslib_1.__importDefault(require("date-fns/format"));
+const date_fns_1 = require("date-fns");
 const sentence_case_1 = require("sentence-case");
 const GeneralConstants_1 = require("../Constants/GeneralConstants");
 const Helper_1 = tslib_1.__importDefault(require("./Helper"));
@@ -103,7 +102,7 @@ function DateFormatter(input, options, strictFormatting = false) {
         if (typeof input === 'string') {
             input = new Date(input);
         }
-        return (0, format_1.default)(input, options?.Pattern || GeneralConstants_1.DEFAULT_DATE_FORMAT_PATTERN);
+        return (0, date_fns_1.format)(input, options?.Pattern || GeneralConstants_1.DEFAULT_DATE_FORMAT_PATTERN);
     }
     catch (error) {
         if (strictFormatting) {

package/src/View/Comments/CommentsEditor.js

@@ -12,7 +12,7 @@ const CommentsRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/
 const InternalRedux_1 = require("../../Redux/ActionsReducers/InternalRedux");
 const AdaptableContext_1 = require("../AdaptableContext");
 const AdaptableInput_1 = tslib_1.__importDefault(require("../Components/AdaptableInput"));
-const format_1 = tslib_1.__importDefault(require("date-fns/format"));
+const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/FormatHelper"));
 // Edit Mode
 // [author] [edit, delete]
 // [text-editor] * this is different
@@ -52,6 +52,9 @@ const CommentsEditor = (props) => {
     if (!commentThread) {
         return null;
     }
+    const formatDate = (date, format) => {
+        return FormatHelper_1.default.DateFormatter(date, { Pattern: format });
+    };
     return (React.createElement(Panel_1.default, { color: "var(--ab-color-text-on-primary)", onClick: () => props.enableEditMode(), minWidth: 250, className: "ab-CommentPopup", onKeyDown: (event) => {
             if (event.key === 'Escape') {
                 api.commentApi.hideCommentsPopup();
@@ -79,7 +82,7 @@ const CommentsEditor = (props) => {
                     React.createElement(rebass_1.Flex, { mb: 2, alignItems: "center" },
                         React.createElement(rebass_1.Box, null,
                             React.createElement(rebass_1.Box, { "data-name": "comment-username", fontSize: 3, fontWeight: "bold" }, comment?.Author?.UserName),
-                            comment.Timestamp && (React.createElement(rebass_1.Box, { "data-name": "comment-timestamp", fontSize: 2 }, (0, format_1.default)(comment.Timestamp, api.commentApi.internalApi.getCommentsDateFormat())))),
+                            comment.Timestamp && (React.createElement(rebass_1.Box, { "data-name": "comment-timestamp", fontSize: 2 }, formatDate(comment.Timestamp, api.commentApi.internalApi.getCommentsDateFormat())))),
                         React.createElement(rebass_1.Box, { flex: 1 }),
                         React.createElement(SimpleButton_1.default, { variant: "text", icon: "edit", disabled: !isOwnComment || isReadOnlyModule, onClick: () => setActiveEditingComment(comment.Uuid) }),
                         React.createElement(SimpleButton_1.default, { variant: "text", icon: "delete", disabled: !isOwnComment || isReadOnlyModule, onClick: () => {

package/src/View/Comments/CommentsPopup.js

@@ -7,10 +7,10 @@ const react_redux_1 = require("react-redux");
 const InfiniteTable_1 = require("../../components/InfiniteTable");
 const Panel_1 = tslib_1.__importDefault(require("../../components/Panel"));
 const rebass_1 = require("rebass");
-const format_1 = tslib_1.__importDefault(require("date-fns/format"));
 const AdaptableContext_1 = require("../AdaptableContext");
 const PopupPanel_1 = require("../Components/Popups/AdaptablePopup/PopupPanel");
 const AdaptableButton_1 = require("../Components/AdaptableButton");
+const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/FormatHelper"));
 const tableDOMProps = {
     style: {
         minHeight: 160,
@@ -20,6 +20,9 @@ const tableDOMProps = {
 const CellComments = (props) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const isReadOnlyModule = adaptable.api.entitlementApi.getEntitlementAccessLevelForModule('Comment') === 'ReadOnly';
+    const formatDate = (date, format) => {
+        return FormatHelper_1.default.DateFormatter(date, { Pattern: format });
+    };
     const columnsMap = React.useMemo(() => {
         const columns = {
             author: {
@@ -31,7 +34,7 @@ const CellComments = (props) => {
                 field: 'Timestamp',
                 maxWidth: 150,
                 valueGetter: (params) => {
-                    return (0, format_1.default)(params.data.Timestamp, adaptable.api.commentApi.internalApi.getCommentsDateFormat());
+                    return formatDate(params.data.Timestamp, adaptable.api.commentApi.internalApi.getCommentsDateFormat());
                 },
             },
             text: {

package/src/View/Components/ColumnFilter/utils.js

@@ -75,7 +75,7 @@ const qlPredicateToString = (qlPredicate, predicateDefs) => {
 };
 exports.qlPredicateToString = qlPredicateToString;
 const isPredicateEmpty = (predicate, predicateDef) => {
-    if (!predicateDef.inputs || predicateDef.inputs.length === 0) {
+    if (!predicateDef?.inputs || predicateDef.inputs.length === 0) {
         return false;
     }
     return (!predicate ||

package/src/View/Components/FilterForm/ListBoxFilterForm.js

@@ -4,7 +4,7 @@ exports.ColumnValuesSelect = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const StringExtensions_1 = require("../../../Utilities/Extensions/StringExtensions");
-const isEqual_1 = tslib_1.__importDefault(require("date-fns/isEqual"));
+const date_fns_1 = require("date-fns");
 const DateHelper_1 = require("../../../Utilities/Helpers/DateHelper");
 const join_1 = tslib_1.__importDefault(require("../../../components/utils/join"));
 const Select_1 = require("../../../components/Select");
@@ -17,7 +17,7 @@ const ColumnValuesSelect = (props) => {
         let isActive = selectedColumnValues.indexOf(distinctValue.value) >= 0;
         // special case for date objects, need to check against string values
         if (!isActive && distinctValue.value && distinctValue.value instanceof Date) {
-            isActive = selectedColumnValues.some((dateStr) => (0, isEqual_1.default)((0, DateHelper_1.parseDateValue)(dateStr), (0, DateHelper_1.parseDateValue)(distinctValue.value)));
+            isActive = selectedColumnValues.some((dateStr) => (0, date_fns_1.isEqual)((0, DateHelper_1.parseDateValue)(dateStr), (0, DateHelper_1.parseDateValue)(distinctValue.value)));
         }
         const columnLabel = distinctValue.label;
         if (StringExtensions_1.StringExtensions.IsNullOrEmpty(columnLabel)) {