@adaptabletools/adaptable-cjs 23.0.0-canary.7 → 23.0.0-canary.9

package/src/Utilities/Helpers/{percentBarPreviewHelper.js → StyledColumns/PercentBarStyleHelper.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasPercentBarStylePreview = exports.getPercentBarPreviewResolvedBarColor = exports.getPercentBarPreviewTrackColor = exports.formatPercentBarPreviewCellText = exports.getPercentBarPreviewGeometry = exports.getPercentBarPreviewSampleValues = exports.getPercentBarPreviewScale = exports.hasPercentBarRangesConfigured = void 0;
-const tslib_1 = require("tslib");
-const StyleHelper_1 = require("./StyleHelper");
-const clamp_1 = tslib_1.__importDefault(require("../utils/clamp"));
-const StyledColumnGradientHelper_1 = require("./StyledColumnGradientHelper");
+const StyleHelper_1 = require("../StyleHelper");
+const NumberExtensions_1 = require("../../Extensions/NumberExtensions");
+const GradientStyleHelper_1 = require("./GradientStyleHelper");
+const BarStylesHelper_1 = require("./BarStylesHelper");
 const evenlySpacedValues = (min, max, count) => {
     if (count <= 1) {
         return [min];
@@ -16,7 +16,7 @@ const toFraction = (value, min, max) => {
     if (max === min) {
         return 0;
     }
-    return (0, clamp_1.default)((value - min) / (max - min), 0, 1);
+    return (0, NumberExtensions_1.clamp)((value - min) / (max - min), 0, 1);
 };
 const resolveOrigin = (percentBarStyle, cellValue, min, max) => {
     const origin = percentBarStyle.Origin ?? 'Auto';
@@ -72,14 +72,14 @@ exports.hasPercentBarRangesConfigured = hasPercentBarRangesConfigured;
 const getPercentBarPreviewScale = (pb) => {
     const origin = pb.Origin ?? 'Auto';
     if (origin === 'Zero' || origin === 'Auto') {
-        return { min: StyledColumnGradientHelper_1.ZERO_CENTRED_PREVIEW_SCALE_MIN, max: StyledColumnGradientHelper_1.ZERO_CENTRED_PREVIEW_SCALE_MAX };
+        return { min: GradientStyleHelper_1.ZERO_CENTRED_PREVIEW_SCALE_MIN, max: GradientStyleHelper_1.ZERO_CENTRED_PREVIEW_SCALE_MAX };
     }
     return { min: 0, max: 100 };
 };
 exports.getPercentBarPreviewScale = getPercentBarPreviewScale;
 const getPercentBarPreviewSampleValues = (pb) => {
     const { min, max } = (0, exports.getPercentBarPreviewScale)(pb);
-    return evenlySpacedValues(min, max, StyledColumnGradientHelper_1.STYLED_COLUMN_PREVIEW_SAMPLE_COUNT);
+    return evenlySpacedValues(min, max, GradientStyleHelper_1.STYLED_COLUMN_PREVIEW_SAMPLE_COUNT);
 };
 exports.getPercentBarPreviewSampleValues = getPercentBarPreviewSampleValues;
 const getPercentBarPreviewGeometry = (numericValue, pb, min, max) => {
@@ -114,7 +114,7 @@ const getPercentBarPreviewGeometry = (numericValue, pb, min, max) => {
         barWidthPercent = 0;
     }
     else {
-        percentageValue = (((0, clamp_1.default)(numericValue, min, max) - min) / (max - min)) * 100;
+        percentageValue = (((0, NumberExtensions_1.clamp)(numericValue, min, max) - min) / (max - min)) * 100;
         const origin = resolveOrigin(pb, numericValue, min, max);
         const valueFrac = toFraction(numericValue, min, max);
         const originFrac = toFraction(origin, min, max);
@@ -132,14 +132,8 @@ const getPercentBarPreviewGeometry = (numericValue, pb, min, max) => {
 };
 exports.getPercentBarPreviewGeometry = getPercentBarPreviewGeometry;
 const formatPercentBarPreviewCellText = (numericValue, percentageValue, pb) => {
-    const parts = [];
-    if (pb.CellText?.includes('CellValue')) {
-        parts.push(Number.isInteger(numericValue) ? String(numericValue) : numericValue.toFixed(1));
-    }
-    if (pb.CellText?.includes('PercentageValue')) {
-        parts.push(`${percentageValue.toFixed(0)}%`);
-    }
-    return parts.join(' ');
+    const labels = (0, BarStylesHelper_1.buildBarStyleCellTextLabels)(pb.CellTextProperties, Number.isInteger(numericValue) ? String(numericValue) : numericValue.toFixed(1), `${percentageValue.toFixed(0)}%`);
+    return (0, BarStylesHelper_1.joinBarStyleCellTextLabels)(labels);
 };
 exports.formatPercentBarPreviewCellText = formatPercentBarPreviewCellText;
 const getPercentBarPreviewTrackColor = (pb) => {
@@ -149,7 +143,7 @@ const getPercentBarPreviewTrackColor = (pb) => {
     return pb.BackColor ?? undefined;
 };
 exports.getPercentBarPreviewTrackColor = getPercentBarPreviewTrackColor;
-const getPercentBarPreviewResolvedBarColor = (color) => color ? (0, StyleHelper_1.getVariableColor)(color) : undefined;
+const getPercentBarPreviewResolvedBarColor = (color) => (color ? (0, StyleHelper_1.getVariableColor)(color) : undefined);
 exports.getPercentBarPreviewResolvedBarColor = getPercentBarPreviewResolvedBarColor;
 const hasPercentBarStylePreview = (styledColumn) => (0, exports.hasPercentBarRangesConfigured)(styledColumn.PercentBarStyle);
 exports.hasPercentBarStylePreview = hasPercentBarStylePreview;

package/src/Utilities/Helpers/{SparklineOptionsHelper.js → StyledColumns/SparklineStyleHelper.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveSparklineOptionsForRender = resolveSparklineOptionsForRender;
-const StyleHelper_1 = require("./StyleHelper");
+const StyleHelper_1 = require("../StyleHelper");
 const resolveCssColor = (color) => {
     if (color == null || color === '') {
         return color;

package/src/Utilities/Helpers/StyledColumns/StyledColumnHelper.d.ts

@@ -0,0 +1,52 @@
+import type { IRowNode } from 'ag-grid-enterprise';
+import type { AdaptableApi } from '../../../Api/AdaptableApi';
+import type { StyledColumn } from '../../../AdaptableState/StyledColumnState';
+import type { RowScope } from '../../../AdaptableState/Common/RowScope';
+/**
+ * Row kinds used by {@link RowScope} and the Styled Column Scope wizard.
+ * All are available to all Styled Columns with exception of Sparkline (which is data rows only)
+ */
+export type StyledColumnRowKind = 'Data' | 'Group' | 'Summary' | 'Total';
+export declare const STYLED_COLUMN_ROW_KINDS: StyledColumnRowKind[];
+export declare const STYLED_COLUMN_ROW_KIND_EXCLUDE_KEY: Record<StyledColumnRowKind, keyof RowScope>;
+export declare const isStyledColumnRowKindSupported: (styledColumn: StyledColumn, kind: StyledColumnRowKind) => boolean;
+export declare const getStyledColumnRowKindDisabledReason: (styledColumn: StyledColumn, kind: StyledColumnRowKind) => string | undefined;
+/**
+ * Classifies the AG Grid row node into a single {@link StyledColumnRowKind}.
+ * Order matches {@link shouldRenderStyledColumnOnRow}: total before summary,
+ * summary before group.
+ */
+export declare const getStyledColumnRowKindForNode: (node: IRowNode, api: AdaptableApi) => StyledColumnRowKind;
+/**
+ * Forces `Exclude*` to `true` for row kinds that do not apply to the current
+ * Styled Column type, so persisted state cannot contradict the capability
+ * matrix. Returns `undefined` when no change is needed.
+ */
+export declare const sanitizeStyledColumnRowScope: (styledColumn: StyledColumn) => RowScope | undefined;
+/**
+ * Returns `true` when the Styled Column should render on the given row.
+ *
+ * Single source of truth consulted by every styled-column cell renderer
+ * (Badge / Icon / Rating / Percent Bar / Bullet Chart / Range Bar) and
+ * by `getStyledColumnStyle` (Gradient / Percent Bar cellStyle).
+ *
+ * Semantics:
+ *  - **Type capabilities** first: some types never target certain row kinds
+ *    (see {@link isStyledColumnRowKindSupported}). Unsupported kinds always
+ *    return `false` regardless of `RowScope`.
+ *  - When `StyledColumn.RowScope` is **set**, the explicit `Exclude*`
+ *    flags win. Unset flags default to "include" — i.e. `RowScope: {}`
+ *    means "render on every *supported* row kind".
+ *  - When `StyledColumn.RowScope` is **unset**, the historical per-type
+ *    default applies:
+ *      - Badge: render on every row kind (that the type supports).
+ *      - All other types: render on every row kind *except* group rows
+ *        (matches the hardcoded "isGroupRowNode → plain text" check that
+ *        every other styled-column renderer used to carry), again
+ *        intersected with type capabilities (e.g. Sparkline → data only).
+ *
+ * The per-type default lets us promote `RowScope` cleanly without
+ * altering existing user-visible behaviour: state that doesn't mention
+ * `RowScope` keeps rendering exactly as before.
+ */
+export declare const shouldRenderStyledColumnOnRow: (styledColumn: StyledColumn, node: IRowNode, api: AdaptableApi) => boolean;

package/src/Utilities/Helpers/StyledColumns/StyledColumnHelper.js

@@ -0,0 +1,124 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shouldRenderStyledColumnOnRow = exports.sanitizeStyledColumnRowScope = exports.getStyledColumnRowKindForNode = exports.getStyledColumnRowKindDisabledReason = exports.isStyledColumnRowKindSupported = exports.STYLED_COLUMN_ROW_KIND_EXCLUDE_KEY = exports.STYLED_COLUMN_ROW_KINDS = void 0;
+exports.STYLED_COLUMN_ROW_KINDS = ['Data', 'Group', 'Summary', 'Total'];
+exports.STYLED_COLUMN_ROW_KIND_EXCLUDE_KEY = {
+    Data: 'ExcludeDataRows',
+    Group: 'ExcludeGroupRows',
+    Summary: 'ExcludeSummaryRows',
+    Total: 'ExcludeTotalRows',
+};
+const isStyledColumnRowKindSupported = (styledColumn, kind) => {
+    if (styledColumn.SparklineStyle) {
+        return kind === 'Data';
+    }
+    return true;
+};
+exports.isStyledColumnRowKindSupported = isStyledColumnRowKindSupported;
+const getStyledColumnRowKindDisabledReason = (styledColumn, kind) => {
+    if ((0, exports.isStyledColumnRowKindSupported)(styledColumn, kind)) {
+        return undefined;
+    }
+    if (styledColumn.SparklineStyle) {
+        return 'Sparklines only apply to leaf data rows (cells with a numeric array of points).';
+    }
+    return undefined;
+};
+exports.getStyledColumnRowKindDisabledReason = getStyledColumnRowKindDisabledReason;
+/**
+ * Classifies the AG Grid row node into a single {@link StyledColumnRowKind}.
+ * Order matches {@link shouldRenderStyledColumnOnRow}: total before summary,
+ * summary before group.
+ */
+const getStyledColumnRowKindForNode = (node, api) => {
+    if (api.gridApi.isGrandTotalRowNode(node)) {
+        return 'Total';
+    }
+    if (api.gridApi.isSummaryNode(node)) {
+        return 'Summary';
+    }
+    if (api.gridApi.isGroupRowNode(node)) {
+        return 'Group';
+    }
+    return 'Data';
+};
+exports.getStyledColumnRowKindForNode = getStyledColumnRowKindForNode;
+/**
+ * Forces `Exclude*` to `true` for row kinds that do not apply to the current
+ * Styled Column type, so persisted state cannot contradict the capability
+ * matrix. Returns `undefined` when no change is needed.
+ */
+const sanitizeStyledColumnRowScope = (styledColumn) => {
+    const scope = styledColumn.RowScope;
+    if (!scope) {
+        return undefined;
+    }
+    let next = { ...scope };
+    let changed = false;
+    for (const kind of exports.STYLED_COLUMN_ROW_KINDS) {
+        if ((0, exports.isStyledColumnRowKindSupported)(styledColumn, kind)) {
+            continue;
+        }
+        const key = exports.STYLED_COLUMN_ROW_KIND_EXCLUDE_KEY[kind];
+        if (next[key] !== true) {
+            next = { ...next, [key]: true };
+            changed = true;
+        }
+    }
+    return changed ? next : undefined;
+};
+exports.sanitizeStyledColumnRowScope = sanitizeStyledColumnRowScope;
+/**
+ * Returns `true` when the Styled Column should render on the given row.
+ *
+ * Single source of truth consulted by every styled-column cell renderer
+ * (Badge / Icon / Rating / Percent Bar / Bullet Chart / Range Bar) and
+ * by `getStyledColumnStyle` (Gradient / Percent Bar cellStyle).
+ *
+ * Semantics:
+ *  - **Type capabilities** first: some types never target certain row kinds
+ *    (see {@link isStyledColumnRowKindSupported}). Unsupported kinds always
+ *    return `false` regardless of `RowScope`.
+ *  - When `StyledColumn.RowScope` is **set**, the explicit `Exclude*`
+ *    flags win. Unset flags default to "include" — i.e. `RowScope: {}`
+ *    means "render on every *supported* row kind".
+ *  - When `StyledColumn.RowScope` is **unset**, the historical per-type
+ *    default applies:
+ *      - Badge: render on every row kind (that the type supports).
+ *      - All other types: render on every row kind *except* group rows
+ *        (matches the hardcoded "isGroupRowNode → plain text" check that
+ *        every other styled-column renderer used to carry), again
+ *        intersected with type capabilities (e.g. Sparkline → data only).
+ *
+ * The per-type default lets us promote `RowScope` cleanly without
+ * altering existing user-visible behaviour: state that doesn't mention
+ * `RowScope` keeps rendering exactly as before.
+ */
+const shouldRenderStyledColumnOnRow = (styledColumn, node, api) => {
+    const rowKind = (0, exports.getStyledColumnRowKindForNode)(node, api);
+    if (!(0, exports.isStyledColumnRowKindSupported)(styledColumn, rowKind)) {
+        return false;
+    }
+    const isGroup = api.gridApi.isGroupRowNode(node);
+    const isTotal = api.gridApi.isGrandTotalRowNode(node);
+    const isSummary = !isTotal && api.gridApi.isSummaryNode(node);
+    const isLeaf = !isGroup && !isSummary && !isTotal;
+    const scope = styledColumn.RowScope;
+    if (scope) {
+        if (isLeaf && scope.ExcludeDataRows)
+            return false;
+        if (isGroup && scope.ExcludeGroupRows)
+            return false;
+        if (isSummary && scope.ExcludeSummaryRows)
+            return false;
+        if (isTotal && scope.ExcludeTotalRows)
+            return false;
+        return true;
+    }
+    // No explicit RowScope → fall back to historical per-type behaviour.
+    if (styledColumn.BadgeStyle) {
+        return true;
+    }
+    return !isGroup;
+};
+exports.shouldRenderStyledColumnOnRow = shouldRenderStyledColumnOnRow;

package/src/Utilities/Helpers/TimingHelper.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Timing helpers for delaying / rate-limiting function calls.
+ *
+ * `debounce` and `throttle` are drop-in replacements for the equivalent
+ * lodash exports (`debounce` supports `{ leading, trailing, maxWait }`,
+ * `throttle` supports `{ leading, trailing }`).
+ *
+ * Both return an instance of `DebouncedFunction<T>` which exposes
+ * `cancel()` and `flush()` for managing pending invocations.
+ */
+export interface DebounceOptions {
+    leading?: boolean;
+    trailing?: boolean;
+    maxWait?: number;
+}
+export interface DebouncedFunction<T extends (...args: any[]) => any> {
+    (...args: Parameters<T>): ReturnType<T> | undefined;
+    cancel(): void;
+    flush(): ReturnType<T> | undefined;
+}
+export declare function debounce<T extends (...args: any[]) => any>(func: T, wait?: number, options?: DebounceOptions): DebouncedFunction<T>;
+export interface ThrottleOptions {
+    leading?: boolean;
+    trailing?: boolean;
+}
+/**
+ * Implemented in terms of `debounce` with `maxWait` (same approach as lodash).
+ */
+export declare function throttle<T extends (...args: any[]) => any>(func: T, wait?: number, options?: ThrottleOptions): DebouncedFunction<T>;
+export declare const TimingHelper: {
+    debounce: typeof debounce;
+    throttle: typeof throttle;
+};
+export default TimingHelper;

package/src/Utilities/{utils/debounce.js → Helpers/TimingHelper.js}

@@ -1,15 +1,18 @@
 "use strict";
 /**
- * Creates a debounced function that delays invoking func until after wait
- * milliseconds have elapsed since the last time the debounced function was
- * invoked. The debounced function comes with a cancel method to cancel
- * delayed func invocations and a flush method to immediately invoke them.
+ * Timing helpers for delaying / rate-limiting function calls.
  *
- * Supports options: { leading, trailing, maxWait }
- * Drop-in replacement for lodash/debounce.
+ * `debounce` and `throttle` are drop-in replacements for the equivalent
+ * lodash exports (`debounce` supports `{ leading, trailing, maxWait }`,
+ * `throttle` supports `{ leading, trailing }`).
+ *
+ * Both return an instance of `DebouncedFunction<T>` which exposes
+ * `cancel()` and `flush()` for managing pending invocations.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = debounce;
+exports.TimingHelper = void 0;
+exports.debounce = debounce;
+exports.throttle = throttle;
 function debounce(func, wait = 0, options) {
     let lastArgs;
     let lastThis;
@@ -62,7 +65,6 @@ function debounce(func, wait = 0, options) {
             trailingEdge(time);
             return;
         }
-        // Restart the timer
         startTimer(timerExpired, remainingWait(time));
     }
     function trailingEdge(time) {
@@ -94,7 +96,6 @@ function debounce(func, wait = 0, options) {
                 return result;
             }
             if (maxing) {
-                // Handle invocations in a tight loop with maxWait
                 cancelTimer();
                 startTimer(timerExpired, wait);
                 invokeFunc(time);
@@ -122,3 +123,18 @@ function debounce(func, wait = 0, options) {
     };
     return debounced;
 }
+/**
+ * Implemented in terms of `debounce` with `maxWait` (same approach as lodash).
+ */
+function throttle(func, wait = 0, options) {
+    return debounce(func, wait, {
+        leading: options?.leading ?? true,
+        trailing: options?.trailing ?? true,
+        maxWait: wait,
+    });
+}
+exports.TimingHelper = {
+    debounce,
+    throttle,
+};
+exports.default = exports.TimingHelper;

package/src/Utilities/ObjectFactory.js

@@ -33,7 +33,7 @@ exports.CreateToastOptions = CreateToastOptions;
 exports.CreateDefaultSchedule = CreateDefaultSchedule;
 const Enums_1 = require("../AdaptableState/Common/Enums");
 const Uuid_1 = require("../AdaptableState/Uuid");
-const ScheduleHelper_1 = require("./Helpers/ScheduleHelper");
+const ScheduleHelper_1 = require("./Helpers/Scheduling/ScheduleHelper");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const ObjectDefaultConstants_1 = require("./Constants/ObjectDefaultConstants");
 const Toastify_1 = require("../components/Toastify");

package/src/Utilities/Services/CalculatedColumnExpressionService.d.ts

@@ -18,3 +18,5 @@ export declare class CalculatedColumnExpressionService implements ICalculatedCol
     createAggregatedScalarLiveValue(calculatedColumn: CalculatedColumn): void;
     destroyAggregatedScalarLiveValue(calculatedColumn: CalculatedColumn): void;
 }
+export declare function buildSyntheticCellDataChangedInfosForCalcColumns(adaptableApi: AdaptableApi, info: CellDataChangedInfo): CellDataChangedInfo[];
+export declare function expandCellDataChangedInfosWithCalculatedColumns(adaptableApi: AdaptableApi, cellDataChangedInfos: CellDataChangedInfo[]): CellDataChangedInfo[];

package/src/Utilities/Services/CalculatedColumnExpressionService.js

@@ -1,9 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CalculatedColumnExpressionService = void 0;
+exports.buildSyntheticCellDataChangedInfosForCalcColumns = buildSyntheticCellDataChangedInfosForCalcColumns;
+exports.expandCellDataChangedInfosWithCalculatedColumns = expandCellDataChangedInfosWithCalculatedColumns;
+const tslib_1 = require("tslib");
 const ModuleConstants_1 = require("../Constants/ModuleConstants");
 const AggregatedScalarLiveValue_1 = require("./AggregatedScalarLiveValue");
-const CalculatedColumnSyntheticChange_1 = require("./CalculatedColumnSyntheticChange");
+const parser = tslib_1.__importStar(require("../../parser/src"));
+const Helper_1 = tslib_1.__importDefault(require("../Helpers/Helper"));
 class CalculatedColumnExpressionService {
     adaptableApi;
     aggregatedScalarLiveValuesMap = new Map();
@@ -12,7 +16,7 @@ class CalculatedColumnExpressionService {
         this.adaptableApi = adaptableApi;
     }
     buildSyntheticCellDataChangedInfosForCalcColumns(cellDataChangedInfo) {
-        return (0, CalculatedColumnSyntheticChange_1.buildSyntheticCellDataChangedInfosForCalcColumns)(this.adaptableApi, cellDataChangedInfo);
+        return buildSyntheticCellDataChangedInfosForCalcColumns(this.adaptableApi, cellDataChangedInfo);
     }
     listentoCellDataChange(cellDataChangedInfo) {
         if (cellDataChangedInfo.trigger === 'calculatedColumnChange') {
@@ -143,3 +147,115 @@ class CalculatedColumnExpressionService {
     }
 }
 exports.CalculatedColumnExpressionService = CalculatedColumnExpressionService;
+function isScalarCalculatedColumn(calculatedColumn) {
+    return !!calculatedColumn.Query?.ScalarExpression;
+}
+function collectDependentScalarCalculatedColumns(adaptableApi, rootColumnId) {
+    const collected = [];
+    const seenCalcColumnIds = new Set();
+    const queue = [rootColumnId];
+    while (queue.length > 0) {
+        const columnId = queue.shift();
+        const adaptableColumn = adaptableApi.columnApi.getColumnWithColumnId(columnId);
+        if (!adaptableColumn) {
+            continue;
+        }
+        const dependentColumnIds = adaptableApi.calculatedColumnApi.internalApi.getCalculatedColumnsDependentOnColumn(adaptableColumn);
+        dependentColumnIds.forEach((dependentColumnId) => {
+            if (seenCalcColumnIds.has(dependentColumnId)) {
+                return;
+            }
+            const calculatedColumn = adaptableApi.calculatedColumnApi.getCalculatedColumnForColumnId(dependentColumnId);
+            if (!calculatedColumn || !isScalarCalculatedColumn(calculatedColumn)) {
+                return;
+            }
+            seenCalcColumnIds.add(dependentColumnId);
+            collected.push(calculatedColumn);
+            queue.push(dependentColumnId);
+        });
+    }
+    return collected;
+}
+function buildShadowRowData(adaptableApi, info) {
+    const shadowData = Helper_1.default.cloneObject(info.rowNode?.data ?? info.rowData ?? {});
+    const fieldName = info.column.field ?? info.column.columnId;
+    adaptableApi.internalApi.setValueUsingField(shadowData, fieldName, info.oldValue);
+    return shadowData;
+}
+function evaluateScalarExpressionWithShadowData(adaptableApi, calculatedColumn, rowNode, shadowData) {
+    const internalApi = adaptableApi.internalApi;
+    const moduleFns = internalApi
+        .getQueryLanguageService()
+        .getModuleExpressionFunctionsMap(ModuleConstants_1.CalculatedColumnModuleId);
+    const baseFunctions = { ...moduleFns.booleanFunctions, ...moduleFns.scalarFunctions };
+    const resolveColumnValue = (columnId) => {
+        const childCalculatedColumn = adaptableApi.calculatedColumnApi.getCalculatedColumnForColumnId(columnId);
+        if (childCalculatedColumn?.Query?.ScalarExpression) {
+            return evaluateScalarExpressionWithShadowData(adaptableApi, childCalculatedColumn, rowNode, shadowData);
+        }
+        const adaptableColumn = adaptableApi.columnApi.getColumnWithColumnId(columnId);
+        return internalApi.getValueUsingField(shadowData, adaptableColumn?.field ?? columnId);
+    };
+    const customFunctions = {
+        ...baseFunctions,
+        COL: {
+            ...baseFunctions.COL,
+            handler: (args) => resolveColumnValue(args[0]),
+        },
+        FIELD: {
+            ...baseFunctions.FIELD,
+            handler: (args) => internalApi.getValueUsingField(shadowData, args[0]),
+        },
+    };
+    return parser.evaluate(calculatedColumn.Query.ScalarExpression, {
+        node: { ...rowNode, data: shadowData },
+        functions: customFunctions,
+        ...internalApi.buildBaseContext(),
+    });
+}
+function buildSyntheticCellDataChangedInfosForCalcColumns(adaptableApi, info) {
+    if (!info.rowNode ||
+        info.preventEdit ||
+        info.trigger === 'undo' ||
+        info.trigger === 'aggChange' ||
+        info.trigger === 'calculatedColumnChange') {
+        return [];
+    }
+    const calculatedColumns = collectDependentScalarCalculatedColumns(adaptableApi, info.column.columnId);
+    if (!calculatedColumns.length) {
+        return [];
+    }
+    const shadowData = buildShadowRowData(adaptableApi, info);
+    const expressionService = adaptableApi.internalApi.getCalculatedColumnExpressionService();
+    const syntheticEvents = [];
+    calculatedColumns.forEach((calculatedColumn) => {
+        const oldValue = evaluateScalarExpressionWithShadowData(adaptableApi, calculatedColumn, info.rowNode, shadowData);
+        const newValue = expressionService.evaluateCalculatedColumnQuery(calculatedColumn, info.rowNode);
+        if (oldValue == newValue) {
+            return;
+        }
+        const column = adaptableApi.columnApi.getColumnWithColumnId(calculatedColumn.ColumnId);
+        if (!column) {
+            return;
+        }
+        syntheticEvents.push(adaptableApi.internalApi.buildCellDataChangedInfo({
+            oldValue,
+            newValue,
+            column,
+            primaryKeyValue: info.primaryKeyValue,
+            rowNode: info.rowNode,
+            trigger: 'calculatedColumnChange',
+        }));
+    });
+    return syntheticEvents;
+}
+function expandCellDataChangedInfosWithCalculatedColumns(adaptableApi, cellDataChangedInfos) {
+    if (!cellDataChangedInfos.length) {
+        return cellDataChangedInfos;
+    }
+    const syntheticEvents = cellDataChangedInfos.flatMap((info) => buildSyntheticCellDataChangedInfosForCalcColumns(adaptableApi, info));
+    if (!syntheticEvents.length) {
+        return cellDataChangedInfos;
+    }
+    return [...cellDataChangedInfos, ...syntheticEvents];
+}

package/src/Utilities/Services/LicenseService/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../../Redux/ActionsReducers/InternalRedux"),t=require("../../../Redux/ActionsReducers/PopupRedux"),s=e.__importDefault(require("../../ObjectFactory")),i=e.__importDefault(require("../../utils/clamp")),o=require("../../Constants/DocumentationLinkConstants"),n=require("../../license/decode"),r=require("./shouldLogThankYouMessage"),l="sales@adaptabletools.com",c=10,d=864e5;var p;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(p||(exports.LicenseValidityType=p={}));const h=()=>"undefined"!=typeof window?window.location.origin:"",E=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g.exec(e)||[]);return"https"===t&&"sandpack.codesandbox.io"===s},_=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.csb\.app)/g.exec(e)||[]);return"https"===t&&".csb.app"===s},I=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.adaptabletools\.com)/g.exec(e)||[]);return"https"===t&&".adaptabletools.com"===s};class O{adaptable;licenseKey;packageDetails;constructor(e,a,t){this.adaptable=e,this.licenseKey=a,this.packageDetails=t,this.adaptable=e,this.adaptable.api.eventApi.on("AdaptableReady",()=>{requestAnimationFrame(()=>{this.adaptable.isDestroyed||this.init()})})}init(){let e=null;if(this.licenseKey)try{e=(0,n.decode)(this.licenseKey)}catch(a){e=a}E()||_()||I()||this.handleLicenseValidation(e,this.getValidityType(e,this.packageDetails))}getValidityType(e,a){if(!e)return p.NO_LICENSE;if(e instanceof Error)return p.INVALID_LICENSE;const t=new Date(a.publishedAt),s=new Date(e.end),i=s<new Date,o=e.trial;let n=null;return n=i?s>t?o?p.NON_PRODUCTION_EXPIRED_IN_SCOPE:p.COMMERCIAL_EXPIRED_IN_SCOPE:o?p.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:p.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:o?p.NON_PRODUCTION_VALID:p.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){const t=new Date;t.setHours(0,0,0,0);let s=0;e instanceof Error||!e?.end||(s=Math.floor((e?.end?.getTime()-t.getTime())/d),s=(0,i.default)(s,0,1/0));let p="",h="";!e||e instanceof Error||!e.appName||e.appName==n.GENERIC_APP_NAME||(p=e.appName,h=" for application [APP_NAME]");const E=(e,a=o.LicenseDocsLink,t=l,i=s,n=p)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",n).replace("[DAYS]",`${i}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(E("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":this.adaptable.logger.consoleLogByMessageType(E("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":this.adaptable.logger.consoleLogByMessageType(E("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(E("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":if(s<=c)this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{(0,r.shouldLogThankYouMessage)()&&this.adaptable.logger.consoleLogByMessageType(E(`Thank you for using a valid AdapTable license${h}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license.`),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction((0,t.PopupShowAlert)({alertType:"generic",header:"License Error",message:e,alertDefinition:s.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction((0,a.LicenseShowWatermark)(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction((0,a.LicenseDisablePersistence)())}destroy(){}}exports.LicenseService=O;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LicenseService=exports.LicenseValidityType=void 0;const e=require("tslib"),a=require("../../../Redux/ActionsReducers/InternalRedux"),t=require("../../../Redux/ActionsReducers/PopupRedux"),s=e.__importDefault(require("../../ObjectFactory")),i=require("../../Extensions/NumberExtensions"),o=require("../../Constants/DocumentationLinkConstants"),n=require("../../license/decode"),r=require("./shouldLogThankYouMessage"),l="sales@adaptabletools.com",c=10,d=864e5;var p;!function(e){e.INVALID_LICENSE="INVALID_LICENSE",e.NO_LICENSE="NO_LICENSE",e.NON_PRODUCTION_VALID="NON_PRODUCTION_VALID",e.NON_PRODUCTION_EXPIRED_IN_SCOPE="NON_PRODUCTION_EXPIRED_IN_SCOPE",e.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE="NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE",e.COMMERCIAL_VALID="COMMERCIAL_VALID",e.COMMERCIAL_EXPIRED_IN_SCOPE="COMMERCIAL_EXPIRED_IN_SCOPE",e.COMMERCIAL_EXPIRED_OUT_OF_SCOPE="COMMERCIAL_EXPIRED_OUT_OF_SCOPE"}(p||(exports.LicenseValidityType=p={}));const h=()=>"undefined"!=typeof window?window.location.origin:"",E=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g.exec(e)||[]);return"https"===t&&"sandpack.codesandbox.io"===s},I=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.csb\.app)/g.exec(e)||[]);return"https"===t&&".csb.app"===s},_=()=>{const e=h(),[a,t,s]=Array.from(/(https):\/\/\S+(\.adaptabletools\.com)/g.exec(e)||[]);return"https"===t&&".adaptabletools.com"===s};class O{adaptable;licenseKey;packageDetails;constructor(e,a,t){this.adaptable=e,this.licenseKey=a,this.packageDetails=t,this.adaptable=e,this.adaptable.api.eventApi.on("AdaptableReady",()=>{requestAnimationFrame(()=>{this.adaptable.isDestroyed||this.init()})})}init(){let e=null;if(this.licenseKey)try{e=(0,n.decode)(this.licenseKey)}catch(a){e=a}E()||I()||_()||this.handleLicenseValidation(e,this.getValidityType(e,this.packageDetails))}getValidityType(e,a){if(!e)return p.NO_LICENSE;if(e instanceof Error)return p.INVALID_LICENSE;const t=new Date(a.publishedAt),s=new Date(e.end),i=s<new Date,o=e.trial;let n=null;return n=i?s>t?o?p.NON_PRODUCTION_EXPIRED_IN_SCOPE:p.COMMERCIAL_EXPIRED_IN_SCOPE:o?p.NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE:p.COMMERCIAL_EXPIRED_OUT_OF_SCOPE:o?p.NON_PRODUCTION_VALID:p.COMMERCIAL_VALID,n}handleLicenseValidation(e,a){const t=new Date;t.setHours(0,0,0,0);let s=0;e instanceof Error||!e?.end||(s=Math.floor((e?.end?.getTime()-t.getTime())/d),s=(0,i.clamp)(s,0,1/0));let p="",h="";!e||e instanceof Error||!e.appName||e.appName==n.GENERIC_APP_NAME||(p=e.appName,h=" for application [APP_NAME]");const E=(e,a=o.LicenseDocsLink,t=l,i=s,n=p)=>e.replace("[LINK]",a).replace("[EMAIL]",t).replace("[APP_NAME]",n).replace("[DAYS]",`${i}`);switch(a){case"NO_LICENSE":case"NON_PRODUCTION_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(E("This instance of AdapTable does not have a license, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("No AdapTable License found."),this.showWatermark("This instance of AdapTable does not have a license, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"INVALID_LICENSE":this.adaptable.logger.consoleLogByMessageType(E("This instance of AdapTable seems to use a corrupted License, and some functionality has therefore been removed. In order to use a fully-featured version of AdapTable, please contact [EMAIL]. You can learn more about the different AdapTable license options at [LINK]."),"Error"),this.showNotification("Corrupted AdapTable License found."),this.showWatermark("This instance of AdapTable has a corrupted License, and some functionality has therefore been removed."),this.disableStatePersistence();break;case"NON_PRODUCTION_VALID":this.adaptable.logger.consoleLogByMessageType(E("This AdapTable trial license expires in [DAYS] days. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Info");break;case"NON_PRODUCTION_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(E("This AdapTable trial license has now expired. Please contact [EMAIL] to upgrade to a commercial version of AdapTable. You can learn more about the different AdapTable license options at [LINK]."),"Warning"),this.showWatermark("AdapTable License has expired");break;case"COMMERCIAL_VALID":if(s<=c)this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} expires in [DAYS] days.  Please contact [EMAIL] to renew (giving you access to Support and Updates)`),"Info");else try{(0,r.shouldLogThankYouMessage)()&&this.adaptable.logger.consoleLogByMessageType(E(`Thank you for using a valid AdapTable license${h}. Your license will expire in [DAYS] days.`),"Info")}catch(e){}break;case"COMMERCIAL_EXPIRED_IN_SCOPE":this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} has expired.  Please contact [EMAIL] if you wish to renew (giving you access to Support and Updates)`),"Warning");break;case"COMMERCIAL_EXPIRED_OUT_OF_SCOPE":this.adaptable.logger.consoleLogByMessageType(E(`This AdapTable license${h} has expired. Adaptable version was published after the license expired. Please contact [EMAIL] if you wish to renew your license.`),"Error"),this.showNotification("Adaptable License has expired"),this.showWatermark("Adaptable License has expired")}}showNotification(e){this.adaptable.api.internalApi.dispatchReduxAction((0,t.PopupShowAlert)({alertType:"generic",header:"License Error",message:e,alertDefinition:s.default.CreateInternalAlertDefinitionForMessages("Error")}))}showWatermark(e){this.adaptable.api.internalApi.dispatchReduxAction((0,a.LicenseShowWatermark)(e))}disableStatePersistence(){this.adaptable.api.internalApi.dispatchReduxAction((0,a.LicenseDisablePersistence)())}destroy(){}}exports.LicenseService=O;

package/src/Utilities/Services/RowSummaryService.d.ts

@@ -19,7 +19,7 @@ export declare class RowSummaryService {
      *
      * @param colId optional to evaluate only one column
      */
-    _throttledEvaluateRowSummary: import("../utils/debounce").DebouncedFunction<(reason?: {
+    _throttledEvaluateRowSummary: import("../Helpers/TimingHelper").DebouncedFunction<(reason?: {
         columnIds: string[];
     }) => void>;
     private evaluateRowSummary;

package/src/Utilities/Services/RowSummaryService.js

@@ -5,11 +5,11 @@ const tslib_1 = require("tslib");
 const RowSummary_1 = require("../../AdaptableState/Common/RowSummary");
 const InternalRedux_1 = require("../../Redux/ActionsReducers/InternalRedux");
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
-const Helper_1 = tslib_1.__importDefault(require("../Helpers/Helper"));
+const NumberExtensions_1 = require("../Extensions/NumberExtensions");
 const AggregatedScalarLiveValue_1 = require("./AggregatedScalarLiveValue");
 const ObjectExtensions_1 = require("../Extensions/ObjectExtensions");
-const throttle_1 = tslib_1.__importDefault(require("../utils/throttle"));
-const isEqual_1 = tslib_1.__importDefault(require("../utils/isEqual"));
+const TimingHelper_1 = require("../Helpers/TimingHelper");
+const ObjectExtensions_2 = require("../Extensions/ObjectExtensions");
 /**
  * The logic is extracted here to make it easier to follow
  */
@@ -78,7 +78,7 @@ class RowSummaryService {
      *
      * @param colId optional to evaluate only one column
      */
-    _throttledEvaluateRowSummary = (0, throttle_1.default)(this.evaluateRowSummary, 300);
+    _throttledEvaluateRowSummary = (0, TimingHelper_1.throttle)(this.evaluateRowSummary, 300);
     evaluateRowSummary(reason) {
         if (this._throttleAcumulatedColumnsThatChanged.size > 0) {
             const columnIds = Array.from(this._throttleAcumulatedColumnsThatChanged.values());
@@ -159,7 +159,7 @@ class RowSummaryService {
                     if (expressionLiveValue) {
                         value = expressionLiveValue.getGlobalAggregatedValue();
                         if (typeof value === 'number' && !isNaN(value)) {
-                            value = Helper_1.default.roundNumber(value, 2);
+                            value = (0, NumberExtensions_1.roundNumber)(value, 2);
                         }
                     }
                     const column = this.api.columnApi.getColumnWithColumnId(columnId);
@@ -171,7 +171,7 @@ class RowSummaryService {
                 }),
             };
         });
-        if (this.previousRowSummaries && (0, isEqual_1.default)(rowSummariesResults, this.previousRowSummaries)) {
+        if (this.previousRowSummaries && (0, ObjectExtensions_2.isEqual)(rowSummariesResults, this.previousRowSummaries)) {
             return;
         }
         this.api.internalApi.dispatchReduxAction((0, InternalRedux_1.RowSummarySet)(rowSummariesResults));

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ColumnsList.js

@@ -12,7 +12,7 @@ const react_1 = require("react");
 const StringExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/StringExtensions"));
 const InfiniteTable_1 = require("../../../components/InfiniteTable");
 const Flex_1 = require("../../../components/Flex");
-const throttle_1 = tslib_1.__importDefault(require("../../../Utilities/utils/throttle"));
+const TimingHelper_1 = require("../../../Utilities/Helpers/TimingHelper");
 const twMerge_1 = require("../../../twMerge");
 const dataTypes = [
     {
@@ -42,7 +42,7 @@ const useForceRender = () => {
 };
 const ThrottledInput = React.memo((props) => {
     const [stateValue, setStateValue] = (0, react_1.useState)(props.value);
-    const throttleOnChange = React.useRef((0, throttle_1.default)(props.onChange, 600, { leading: false }));
+    const throttleOnChange = React.useRef((0, TimingHelper_1.throttle)(props.onChange, 600, { leading: false }));
     const handleChange = React.useCallback((event) => {
         const newValue = event.target.value;
         setStateValue(newValue);

package/src/View/Alert/Utilities/getAlertType.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAlertTypeText = exports.getAlertType = exports.AlertType = void 0;
 const GeneralConstants_1 = require("./../../../Utilities/Constants/GeneralConstants");
-const ScheduledAlertHelper_1 = require("../../../Utilities/Helpers/ScheduledAlertHelper");
+const ScheduledAlertHelper_1 = require("../../../Utilities/Helpers/Scheduling/ScheduledAlertHelper");
 var AlertType;
 (function (AlertType) {
     AlertType["DataChange"] = "DataChange";

package/src/View/Alert/Utilities/getDefaultAlertDefinition.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDefaultAlertDefinition = void 0;
 const tslib_1 = require("tslib");
 const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/ObjectFactory"));
-const ScheduledAlertHelper_1 = require("../../../Utilities/Helpers/ScheduledAlertHelper");
+const ScheduledAlertHelper_1 = require("../../../Utilities/Helpers/Scheduling/ScheduledAlertHelper");
 const getAlertType_1 = require("./getAlertType");
 /**
  * This logic should be moved into Object factory once we have types on alert definitions

package/src/View/Alert/Utilities/mapAlertDefinition.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapAlertDefinition = void 0;
-const ScheduledAlertHelper_1 = require("../../../Utilities/Helpers/ScheduledAlertHelper");
+const ScheduledAlertHelper_1 = require("../../../Utilities/Helpers/Scheduling/ScheduledAlertHelper");
 const mapAlertDefinition = (api, alertDefinition) => {
     if (!(0, ScheduledAlertHelper_1.isRuleBasedAlertDefinition)(alertDefinition)) {
         return alertDefinition;