@adaptabletools/adaptable-cjs 22.0.0-canary.1 → 22.0.0-canary.3

package/src/migration/AdaptableUpgradeHelper.js

@@ -6,7 +6,11 @@ const VersionUpgrade18_1 = require("./VersionUpgrade18");
 const EnvVars_1 = require("../EnvVars");
 const VersionUpgrade20_1 = require("./VersionUpgrade20");
 const VersionUpgrade21_1 = require("./VersionUpgrade21");
+const VersionUpgrade22_1 = require("./VersionUpgrade22");
 class AdaptableUpgradeHelper {
+    currentMajorVersion;
+    versionUpgrades;
+    logger;
     constructor(logger) {
         this.currentMajorVersion = this.getCurrentMajorVersion(EnvVars_1.ADAPTABLE_VERSION);
         this.logger = logger || this.getConsoleLogger();
@@ -15,6 +19,7 @@ class AdaptableUpgradeHelper {
         this.versionUpgrades.set(18, new VersionUpgrade18_1.VersionUpgrade18(this.logger));
         this.versionUpgrades.set(20, new VersionUpgrade20_1.VersionUpgrade20(this.logger));
         this.versionUpgrades.set(21, new VersionUpgrade21_1.VersionUpgrade21(this.logger));
+        this.versionUpgrades.set(22, new VersionUpgrade22_1.VersionUpgrade22(this.logger));
     }
     static migrateAdaptableState(state, config) {
         const upgradeHelper = new AdaptableUpgradeHelper(config.logger);

package/src/migration/VersionUpgrade.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VersionUpgrade = void 0;
 class VersionUpgrade {
+    logger;
     constructor(logger) {
         this.logger = logger;
     }

package/src/migration/VersionUpgrade17.js

@@ -245,7 +245,6 @@ class VersionUpgrade17 extends VersionUpgrade_1.VersionUpgrade {
         return state;
     }
     migrateStyledColumnState(state) {
-        var _a;
         const formatColumnsWithColumnStyles = state.FormatColumn?.FormatColumns?.filter((fc) => fc.ColumnStyle) || [];
         if (!formatColumnsWithColumnStyles.length) {
             return state;
@@ -265,7 +264,7 @@ class VersionUpgrade17 extends VersionUpgrade_1.VersionUpgrade {
             };
         })
             .filter(Boolean);
-        (_a = state.StyledColumn).StyledColumns ?? (_a.StyledColumns = []);
+        state.StyledColumn.StyledColumns ??= [];
         styledColumns.forEach((styledColumn) => {
             state.StyledColumn.StyledColumns.push(styledColumn);
         });

package/src/migration/VersionUpgrade22.d.ts

@@ -0,0 +1,6 @@
+import { VersionUpgrade } from './VersionUpgrade';
+import { AdaptableState } from '../AdaptableState/AdaptableState';
+export declare class VersionUpgrade22 extends VersionUpgrade {
+    migrateState(state: AdaptableState): AdaptableState;
+    private migrateFormatColumnState;
+}

package/src/migration/VersionUpgrade22.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VersionUpgrade22 = void 0;
+const VersionUpgrade_1 = require("./VersionUpgrade");
+class VersionUpgrade22 extends VersionUpgrade_1.VersionUpgrade {
+    migrateState(state) {
+        this.migrateFormatColumnState(state);
+        return state;
+    }
+    // We have moved CellAlignment (renamed Alignment) from independent property into Style
+    migrateFormatColumnState(state) {
+        const formatColumnState = state.FormatColumn;
+        if (formatColumnState && formatColumnState.FormatColumns) {
+            formatColumnState.FormatColumns = formatColumnState.FormatColumns.map((formatColumn) => {
+                //@ts-ignore
+                if (formatColumn.CellAlignment) {
+                    formatColumn.Style = {
+                        ...formatColumn.Style,
+                        //@ts-ignore
+                        Alignment: formatColumn.CellAlignment,
+                    };
+                    //@ts-ignore
+                    delete formatColumn.CellAlignment;
+                }
+                return formatColumn;
+            });
+        }
+        return state;
+    }
+}
+exports.VersionUpgrade22 = VersionUpgrade22;

package/src/parser/src/ExpressionEvaluationError.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpressionEvaluationError = void 0;
 class ExpressionEvaluationError extends Error {
+    expressionFnName;
     constructor(expressionFnName, message) {
         super(message);
         this.expressionFnName = expressionFnName;

package/src/types.d.ts

@@ -188,7 +188,7 @@ export type { DashboardState, DashboardTab, AdaptableCoordinate, } from './Adapt
 export type { ExportState, Report, ReportData, ReportColumn, ReportSchedule, SystemReportName, SystemReportNames, SystemReportFormat, ReportRowScope, ReportColumnScope, ReportNameType, ReportFormatType, } from './AdaptableState/ExportState';
 export type { ColumnFilter, ColumnFilterPredicate, SystemFilterPredicateIds, SystemFilterPredicateId, PredicatesOperator, } from './AdaptableState/Common/ColumnFilter';
 export type { GridFilter } from './AdaptableState/Common/GridFilter';
-export type { FormatColumn, FormatColumnState, FormatColumnRule, FormatColumnPredicate, SystemFormatColumnPredicateId, SystemFormatColumnPredicateIds, CellAlignment, ColumnGroupScope, FormatColumnTarget, FormatColumnConfig, } from './AdaptableState/FormatColumnState';
+export type { FormatColumn, FormatColumnState, FormatColumnRule, FormatColumnPredicate, SystemFormatColumnPredicateId, SystemFormatColumnPredicateIds, ColumnGroupScope, FormatColumnTarget, FormatColumnConfig, } from './AdaptableState/FormatColumnState';
 export type { StyledColumn, StyledColumnState, PercentBarStyle, GradientStyle, CellColorRange, ColumnComparison, CellTextOptions, CellTextOption, NumericStyledColumn, RangeValueType, SparklineStyle, BadgeStyle, BadgeStyleDefinition, BadgeStylePredicate, SystemBadgeStylePredicateId, SystemBadgeStylePredicateIds, } from './AdaptableState/StyledColumnState';
 export type { FreeTextColumn, FreeTextColumnState, FreeTextStoredValue, FreeTextColumnSettings, } from './AdaptableState/FreeTextColumnState';
 export type { StatusBarState, AdaptableStatusBar } from './AdaptableState/StatusBarState';