@superblocksteam/shared 0.9108.0

package/dist/pageMigrations/migrations/v6to7/adjustModalCanvases.js

@@ -0,0 +1,52 @@
+"use strict";
+// This file was moved from the `server` package to here and `server` has `strictNullChecks` disabled.
+// This code was originally written with the assumption that `widget.children` is never undefined, despite the type saying otherwise.
+// So we are using `!` to assert that `widget.children` is never undefined.
+// Note that `!` does not change the runtime behavior of the code so the code will work the same way as before.
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.adjustModalCanvases = exports.MODAL_ROWS_PRESETS_NEW = exports.ModalSize = void 0;
+const lodash_1 = require("lodash");
+var ModalSize;
+(function (ModalSize) {
+    ModalSize["EXTRA_SMALL"] = "EXTRA_SMALL";
+    ModalSize["SMALL"] = "SMALL";
+    ModalSize["MEDIUM"] = "MEDIUM";
+    ModalSize["LARGE"] = "LARGE";
+    ModalSize["FULLSCREEN"] = "FULLSCREEN";
+})(ModalSize = exports.ModalSize || (exports.ModalSize = {}));
+exports.MODAL_ROWS_PRESETS_NEW = {
+    [ModalSize.EXTRA_SMALL]: 13,
+    [ModalSize.SMALL]: 22,
+    [ModalSize.MEDIUM]: 31,
+    [ModalSize.LARGE]: 47,
+    [ModalSize.FULLSCREEN]: 72
+};
+const adjustModalCanvases = (dsl) => {
+    const newDsl = (0, lodash_1.cloneDeep)(dsl);
+    const adjustChildren = (widget, parent) => {
+        if (parent && parent.type === 'MODAL_WIDGET') {
+            const heightPreset = parent.heightPreset;
+            if (widget.type === 'CANVAS_WIDGET') {
+                const bottomChildRow = widget.children.reduce((max, child) => {
+                    if (child.bottomRow) {
+                        return Math.max(max, child.bottomRow);
+                    }
+                    return max;
+                }, 0);
+                if (bottomChildRow <= exports.MODAL_ROWS_PRESETS_NEW[heightPreset]) {
+                    widget.bottomRow = exports.MODAL_ROWS_PRESETS_NEW[heightPreset];
+                }
+            }
+        }
+        if (Array.isArray(widget.children)) {
+            for (const child of widget.children) {
+                adjustChildren(child, widget);
+            }
+        }
+    };
+    adjustChildren(newDsl);
+    return newDsl;
+};
+exports.adjustModalCanvases = adjustModalCanvases;
+//# sourceMappingURL=adjustModalCanvases.js.map

package/dist/pageMigrations/migrations/v6to7/adjustModalCanvases.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"adjustModalCanvases.js","sourceRoot":"","sources":["../../../../src/pageMigrations/migrations/v6to7/adjustModalCanvases.ts"],"names":[],"mappings":";AAAA,sGAAsG;AACtG,qIAAqI;AACrI,2EAA2E;AAC3E,+GAA+G;AAC/G,6DAA6D;;;AAE7D,mCAAmC;AAGnC,IAAY,SAMX;AAND,WAAY,SAAS;IACnB,wCAA2B,CAAA;IAC3B,4BAAe,CAAA;IACf,8BAAiB,CAAA;IACjB,4BAAe,CAAA;IACf,sCAAyB,CAAA;AAC3B,CAAC,EANW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAMpB;AAEY,QAAA,sBAAsB,GAAG;IACpC,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,EAAE;IAC3B,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE;IACrB,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE;IACtB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE;IACrB,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,EAAE;CAC3B,CAAC;AAEK,MAAM,mBAAmB,GAAG,CAAC,GAAa,EAAY,EAAE;IAC7D,MAAM,MAAM,GAAG,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,cAAc,GAAG,CAAC,MAAoB,EAAE,MAAqB,EAAE,EAAE;QACrE,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,EAAE;YAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,YAAyB,CAAC;YACtD,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,EAAE;gBACnC,MAAM,cAAc,GAAG,MAAM,CAAC,QAAS,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBAC5D,IAAI,KAAK,CAAC,SAAS,EAAE;wBACnB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;qBACvC;oBACD,OAAO,GAAG,CAAC;gBACb,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEN,IAAI,cAAc,IAAI,8BAAsB,CAAC,YAAY,CAAC,EAAE;oBAC1D,MAAM,CAAC,SAAS,GAAG,8BAAsB,CAAC,YAAY,CAAC,CAAC;iBACzD;aACF;SACF;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;YAClC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,QAAQ,EAAE;gBACnC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;aAC/B;SACF;IACH,CAAC,CAAC;IAEF,cAAc,CAAC,MAAM,CAAC,CAAC;IACvB,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA3BW,QAAA,mBAAmB,uBA2B9B"}

package/dist/pageMigrations/migrations/v6to7/adjustModalCanvases.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=adjustModalCanvases.test.d.ts.map

package/dist/pageMigrations/migrations/v6to7/adjustModalCanvases.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"adjustModalCanvases.test.d.ts","sourceRoot":"","sources":["../../../../src/pageMigrations/migrations/v6to7/adjustModalCanvases.test.ts"],"names":[],"mappings":""}

package/dist/pageMigrations/migrations/v6to7/adjustModalCanvases.test.js

@@ -0,0 +1,48 @@
+"use strict";
+// This file was moved from the `server` package to here and `server` has `strictNullChecks` disabled.
+// This code was originally written with the assumption that `widget.children` is never undefined, despite the type saying otherwise.
+// So we are using `!` to assert that `widget.children` is never undefined.
+// Note that `!` does not change the runtime behavior of the code so the code will work the same way as before.
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const lodash_1 = require("lodash");
+const with_2_modals_1 = __importDefault(require("../../../utils/pageFixtures/v6/with_2_modals"));
+const adjustModalCanvases_1 = require("./adjustModalCanvases");
+const v6to7_1 = require("./v6to7");
+describe('adjustModalCanvases', () => {
+    test('should update a modals child canvas to have the correct height unless its children are taller', () => {
+        const v8 = (0, adjustModalCanvases_1.adjustModalCanvases)((0, lodash_1.cloneDeep)(with_2_modals_1.default));
+        const mainCanvas = v8;
+        expect(mainCanvas.widgetName).toEqual('MainContainer');
+        expect(mainCanvas.children[0].widgetName).toEqual('Modal1');
+        const modalCanvas = mainCanvas.children[0].children[0];
+        expect(modalCanvas.widgetName).toEqual('Canvas1');
+        expect(modalCanvas.bottomRow).toEqual(31);
+        // This second one has a widget that is taller than the canvas
+        // so that should be the height of the canvas
+        const modalCanvas2 = mainCanvas.children[2].children[0];
+        expect(modalCanvas2.widgetName).toEqual('Canvas2');
+        expect(modalCanvas2.bottomRow).toEqual(32);
+    });
+    test('FULL - should update a modals child canvas to have the correct height unless its children are taller', () => {
+        const migrated = (0, v6to7_1.migrate6to7)(with_2_modals_1.default);
+        expect(migrated.children[0].widgetName).toEqual('Section1');
+        const mainCanvas = migrated.children[0].children[0];
+        expect(mainCanvas.widgetName).toEqual('Canvas3');
+        expect(mainCanvas.children[0].widgetName).toEqual('Modal1');
+        expect(mainCanvas.children[0].children[0].widgetName).toEqual('Body1');
+        const modalCanvas = mainCanvas.children[0].children[0].children[0];
+        expect(modalCanvas.widgetName).toEqual('Canvas1');
+        expect(modalCanvas.height).toEqual({ mode: 'gridUnit', value: 31 });
+        // This second one has a widget that is taller than the canvas
+        // so that should be the height of the canvas
+        const modalCanvas2 = mainCanvas.children[2].children[0].children[0];
+        expect(modalCanvas2.widgetName).toEqual('Canvas2');
+        expect(modalCanvas2.height).toEqual({ mode: 'gridUnit', value: 32 });
+    });
+});
+//# sourceMappingURL=adjustModalCanvases.test.js.map

package/dist/pageMigrations/migrations/v6to7/adjustModalCanvases.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"adjustModalCanvases.test.js","sourceRoot":"","sources":["../../../../src/pageMigrations/migrations/v6to7/adjustModalCanvases.test.ts"],"names":[],"mappings":"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"}

package/dist/pageMigrations/migrations/v6to7/migrateToDimensions.d.ts

@@ -0,0 +1,3 @@
+import { PageDSL6, PageDSL7 } from '../../../types';
+export declare const migrateToDimensions: (oldPage: PageDSL6) => PageDSL7;
+//# sourceMappingURL=migrateToDimensions.d.ts.map

package/dist/pageMigrations/migrations/v6to7/migrateToDimensions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrateToDimensions.d.ts","sourceRoot":"","sources":["../../../../src/pageMigrations/migrations/v6to7/migrateToDimensions.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,QAAQ,EAAE,QAAQ,EAA8B,MAAM,gBAAgB,CAAC;AAI3F,eAAO,MAAM,mBAAmB,YAAa,QAAQ,KAAG,QAEvD,CAAC"}

package/dist/pageMigrations/migrations/v6to7/migrateToDimensions.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrateToDimensions = void 0;
+const lodash_1 = require("lodash");
+const types_1 = require("../../../types");
+const SLIDEOUT_DEFAULT_COLUMNS = 80;
+const migrateToDimensions = (oldPage) => {
+    return migrateWidget(oldPage);
+};
+exports.migrateToDimensions = migrateToDimensions;
+const migrateWidget = (oldWidget) => {
+    // Don't clone children for performance reasons
+    const { children: oldChildren, ..._widget } = Object.freeze(oldWidget);
+    const newWidget = (0, lodash_1.cloneDeep)(_widget);
+    // Fix existing bug where slideout widgets get created with position and size values that are the
+    // same as the button widget that it gets created with. Previously these incorrect values in the DSL caused no issues
+    // because they were ignored, but now require these values to be correct for section widgets to function
+    if (newWidget.type === 'SLIDEOUT_WIDGET') {
+        newWidget.topRow = 0;
+        newWidget.bottomRow = 0;
+        newWidget.leftColumn = 0;
+        newWidget.rightColumn = 0;
+        newWidget.snapColumns = SLIDEOUT_DEFAULT_COLUMNS;
+    }
+    if (newWidget.type === 'CANVAS_WIDGET') {
+        newWidget.layout = 'FIXED_GRID';
+    }
+    if (newWidget.snapColumns !== undefined) {
+        newWidget.gridColumns = newWidget.snapColumns;
+    }
+    delete newWidget.snapRows;
+    delete newWidget.snapColumns;
+    // Map leftColumn, rightColumn, topRow, bottomRow to left, top, width, height
+    if (oldWidget.leftColumn !== undefined) {
+        newWidget.left = types_1.Dimension.gridUnit(oldWidget.leftColumn);
+    }
+    else {
+        newWidget.left = types_1.Dimension.gridUnit(0);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (oldWidget.topRow !== undefined) {
+        newWidget.top = types_1.Dimension.gridUnit(oldWidget.topRow);
+    }
+    else {
+        newWidget.top = types_1.Dimension.gridUnit(0);
+    }
+    if (oldWidget.rightColumn !== undefined && oldWidget.leftColumn !== undefined) {
+        newWidget.width = types_1.Dimension.gridUnit(oldWidget.rightColumn - oldWidget.leftColumn);
+    }
+    else {
+        newWidget.width = types_1.Dimension.gridUnit(0);
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (oldWidget.bottomRow !== undefined && oldWidget.topRow !== undefined) {
+        newWidget.height = types_1.Dimension.gridUnit(oldWidget.bottomRow - oldWidget.topRow);
+    }
+    else {
+        newWidget.height = types_1.Dimension.gridUnit(0);
+    }
+    delete newWidget.leftColumn;
+    delete newWidget.rightColumn;
+    delete newWidget.topRow;
+    delete newWidget.bottomRow;
+    // Map minHeight to minHeight
+    if (oldWidget.minHeight !== undefined) {
+        newWidget.minHeight = types_1.Dimension.px(oldWidget.minHeight);
+    }
+    const isContainer = oldWidget.type === 'CANVAS_WIDGET';
+    if (isContainer && !oldWidget.noContainerOffset && !oldWidget.noPad) {
+        newWidget.padding = {
+            left: types_1.Dimension.px(16),
+            right: types_1.Dimension.px(16),
+            top: types_1.Dimension.px(12),
+            bottom: types_1.Dimension.px(12)
+        };
+    }
+    else {
+        delete newWidget.padding;
+    }
+    delete newWidget.noContainerOffset;
+    delete newWidget.noPad;
+    delete newWidget.widgetLastChange;
+    // Map children
+    if (oldChildren) {
+        newWidget.children = oldChildren.map((child) => migrateWidget(child));
+    }
+    return newWidget;
+};
+//# sourceMappingURL=migrateToDimensions.js.map

package/dist/pageMigrations/migrations/v6to7/migrateToDimensions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrateToDimensions.js","sourceRoot":"","sources":["../../../../src/pageMigrations/migrations/v6to7/migrateToDimensions.ts"],"names":[],"mappings":"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"}

package/dist/pageMigrations/migrations/v6to7/migrateToDimensions.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=migrateToDimensions.test.d.ts.map

package/dist/pageMigrations/migrations/v6to7/migrateToDimensions.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrateToDimensions.test.d.ts","sourceRoot":"","sources":["../../../../src/pageMigrations/migrations/v6to7/migrateToDimensions.test.ts"],"names":[],"mappings":""}

package/dist/pageMigrations/migrations/v6to7/migrateToDimensions.test.js

@@ -0,0 +1,78 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const lodash_1 = require("lodash");
+const container_1 = __importDefault(require("../../../utils/pageFixtures/v4/container"));
+const v4to5_1 = require("../v4to5");
+const v5to6_1 = require("../v5to6");
+const migrateToDimensions_1 = require("./migrateToDimensions");
+const migrateToSections_1 = require("./migrateToSections");
+describe('version 7 to version 8', () => {
+    test('should migrate a page with a container widget', () => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const v7 = (0, migrateToSections_1.migrateToSections)((0, v5to6_1.migrate5to6)((0, v4to5_1.migrate4to5)((0, lodash_1.cloneDeep)(container_1.default))));
+        const v8 = (0, migrateToDimensions_1.migrateToDimensions)((0, lodash_1.cloneDeep)(v7));
+        // What are we testing?
+        // Check that each Widget that is a child has a left, top, width, height
+        // Check that each CanvasWidget has a layoutType, gridColumn
+        // Check that minHeight has been migrated to a Dimension object of type 'gridUnit'
+        // Check that snapColumns, snapRows have been migrated to gridColumns and don't exist anymore
+        // Do this for all children recursively
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const checkWidget = (parent, old) => {
+            if (parent.children) {
+                parent.children.forEach((child) => {
+                    const children = child.children;
+                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                    const oldChild = old.children.find((c) => c.widgetId === child.widgetId);
+                    // Use the following to debug to see what is being compared
+                    // console.log(child, oldChild);
+                    if (child.type === 'CANVAS_WIDGET') {
+                        expect(child).toHaveProperty('layout');
+                        expect(child).toHaveProperty('gridColumns');
+                    }
+                    if (parent.type === 'CANVAS_WIDGET' && parent.layout === 'FIXED_GRID') {
+                        expect(child).toHaveProperty('left');
+                        expect(child).toHaveProperty('top');
+                        expect(child).toHaveProperty('width');
+                        expect(child).toHaveProperty('height');
+                        // Assert minHeight has been migrated to a Dimension object of type 'gridUnit'
+                        if (child.minHeight) {
+                            expect(child.minHeight).toHaveProperty('mode');
+                            expect(child.minHeight.mode).toEqual('gridUnit');
+                        }
+                        // assert CONTAINERS
+                        if (parent.type === 'CONTAINER_WIDGET' || parent.type === 'FORM_WIDGET' || parent.type === 'TABS_WIDGET') {
+                            expect(child).toHaveProperty('padding');
+                            expect(child.padding?.left?.value).toEqual(16);
+                            expect(child.padding?.top?.value).toEqual(12);
+                            expect(child.padding?.right?.value).toEqual(16);
+                            expect(child.padding?.bottom?.value).toEqual(12);
+                        }
+                        else {
+                            // there should be no padding
+                            expect(child).not.toHaveProperty('padding');
+                        }
+                        // Assert left, top, width, height === old values
+                        expect(child.left.value).toEqual(oldChild.leftColumn);
+                        expect(child.left.value + child.width.value).toEqual(oldChild.rightColumn);
+                        expect(child.top.value).toEqual(oldChild.topRow);
+                        expect(child.top.value + child.height.value).toEqual(oldChild.bottomRow);
+                    }
+                    expect(child).not.toHaveProperty('snapColumns');
+                    expect(child).not.toHaveProperty('snapRows');
+                    expect(child).not.toHaveProperty('leftColumn');
+                    expect(child).not.toHaveProperty('rightColumn');
+                    expect(child).not.toHaveProperty('topRow');
+                    expect(child).not.toHaveProperty('bottomRow');
+                    expect(child).not.toHaveProperty('widgetLastChange');
+                    checkWidget({ ...child, children }, old.children.find((c) => c.widgetId === child.widgetId));
+                });
+            }
+        };
+        checkWidget({ children: [v8] }, { children: [v7] });
+    });
+});
+//# sourceMappingURL=migrateToDimensions.test.js.map

package/dist/pageMigrations/migrations/v6to7/migrateToDimensions.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrateToDimensions.test.js","sourceRoot":"","sources":["../../../../src/pageMigrations/migrations/v6to7/migrateToDimensions.test.ts"],"names":[],"mappings":"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"}

package/dist/pageMigrations/migrations/v6to7/migrateToSections.d.ts

@@ -0,0 +1,5 @@
+import { PageDSL6 } from '../../../types';
+export declare const findAllInstancesOfWidgetNameWithPrefix: (dsl: PageDSL6, prefix: string) => string[];
+export declare const findNextWidgetNameWithSuffix: (startingName: string, existingWidgetNamesWithPrefix: string[], suffix?: string) => string;
+export declare const migrateToSections: (page: PageDSL6) => PageDSL6;
+//# sourceMappingURL=migrateToSections.d.ts.map

package/dist/pageMigrations/migrations/v6to7/migrateToSections.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrateToSections.d.ts","sourceRoot":"","sources":["../../../../src/pageMigrations/migrations/v6to7/migrateToSections.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AAiFxD,eAAO,MAAM,sCAAsC,QAAS,QAAQ,UAAU,MAAM,KAAG,MAAM,EAmB5F,CAAC;AAEF,eAAO,MAAM,4BAA4B,iBAAkB,MAAM,iCAAiC,MAAM,EAAE,WAAW,MAAM,KAAG,MAwB7H,CAAC;AA8BF,eAAO,MAAM,iBAAiB,SAAU,QAAQ,KAAG,QAwDlD,CAAC"}

package/dist/pageMigrations/migrations/v6to7/migrateToSections.js

@@ -0,0 +1,203 @@
+"use strict";
+// This file was moved from the `server` package to here and `server` has `strictNullChecks` disabled.
+// This code was originally written with the assumption that `widget.children` is never undefined, despite the type saying otherwise.
+// So we are using `!` to assert that `widget.children` is never undefined.
+// Note that `!` does not change the runtime behavior of the code so the code will work the same way as before.
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrateToSections = exports.findNextWidgetNameWithSuffix = exports.findAllInstancesOfWidgetNameWithPrefix = void 0;
+const appDSL_1 = require("../../../utils/appDSL");
+const v7MainSection = () => {
+    // This needs to be consistent on each autosave, otherwise the changelog will indicate diffs
+    const firstSectionId = '7dsm1k3e8w';
+    return {
+        type: 'SECTION_WIDGET',
+        widgetId: firstSectionId,
+        parentId: '0',
+        widgetName: 'Section1',
+        detachFromLayout: true,
+        isLoading: false,
+        isVisible: true,
+        canExtend: true,
+        dragDisabled: true,
+        shouldScrollContents: true,
+        children: [
+            {
+                widgetName: 'Canvas1',
+                backgroundColor: 'none',
+                detachFromLayout: true,
+                dragDisabled: true,
+                parentId: firstSectionId,
+                widgetId: (0, appDSL_1.generatePredictableId)('Canvas1'),
+                isLoading: false,
+                isVisible: true,
+                topRow: 0,
+                bottomRow: 99,
+                containerStyle: 'none',
+                snapColumns: 96,
+                snapRows: 99,
+                minHeight: 1292,
+                type: 'CANVAS_WIDGET',
+                canExtend: true,
+                dynamicBindingPathList: [],
+                children: []
+            }
+        ],
+        // The properties below will be removed as part of Mark's migration
+        // to use the new Dimension type, but they are needed for now otherwise the
+        // DSL rendering breaks due to dependencies on these properties
+        // even though they are unused by the widget itself
+        topRow: 0,
+        bottomRow: 99,
+        snapColumns: 96,
+        snapRows: 99,
+        leftColumn: 0,
+        rightColumn: 96
+    };
+};
+const generateSectionsLayout = () => {
+    return {
+        version: 6,
+        type: 'PAGE_WIDGET',
+        // PAGE_WIDGET is always id '0'. It's the only one that exists and cannot be deleted
+        widgetId: '0',
+        widgetName: 'Page',
+        backgroundColor: 'none',
+        detachFromLayout: true,
+        children: [v7MainSection()],
+        apis: { apiMap: {} },
+        stateVars: { stateVarMap: {} },
+        timers: { timerMap: {} },
+        canExtend: true,
+        dynamicBindingPathList: [],
+        // The properties below will be removed as part of Mark's migration
+        // to use the new Dimension type, but they are needed for now otherwise the
+        // DSL rendering breaks due to dependencies on these properties
+        // even though they are unused by the widget itself
+        topRow: 0,
+        bottomRow: 99,
+        snapColumns: 96,
+        snapRows: 99
+    };
+};
+const createPage = () => generateSectionsLayout();
+const findAllInstancesOfWidgetNameWithPrefix = (dsl, prefix) => {
+    const names = [];
+    const traverseWidgets = (widget) => {
+        // Check widgetName at the root of the widget.
+        if (widget.widgetName && typeof widget.widgetName === 'string' && widget.widgetName.toLowerCase().startsWith(prefix)) {
+            names.push(widget.widgetName);
+        }
+        // Only traverse the children property if it exists.
+        if (Array.isArray(widget.children)) {
+            for (const child of widget.children) {
+                traverseWidgets(child);
+            }
+        }
+    };
+    traverseWidgets(dsl);
+    return names;
+};
+exports.findAllInstancesOfWidgetNameWithPrefix = findAllInstancesOfWidgetNameWithPrefix;
+const findNextWidgetNameWithSuffix = (startingName, existingWidgetNamesWithPrefix, suffix) => {
+    // Numbered items start at 1, not 0
+    // Suffixed items start without a suffix
+    let nextWidgetName = startingName + (suffix ? '' : 1);
+    if (existingWidgetNamesWithPrefix.length > 0) {
+        let findNextName = true;
+        let index = 1;
+        while (findNextName) {
+            if (!existingWidgetNamesWithPrefix.find((n) => n.toLocaleLowerCase() === nextWidgetName.toLowerCase())) {
+                findNextName = false;
+            }
+            else {
+                if (suffix) {
+                    nextWidgetName = `${startingName}${suffix.repeat(index)}`;
+                }
+                else {
+                    nextWidgetName = `${startingName}${index}`;
+                }
+                index++;
+            }
+        }
+    }
+    return nextWidgetName;
+};
+exports.findNextWidgetNameWithSuffix = findNextWidgetNameWithSuffix;
+const v7SlideoutOrModalSection = (nextName, children) => {
+    const id = (0, appDSL_1.generatePredictableId)(nextName);
+    return {
+        type: 'SECTION_WIDGET',
+        widgetId: id,
+        widgetName: nextName,
+        children: children.map((child) => {
+            child.parentId = id;
+            return child;
+        }),
+        detachFromLayout: true,
+        isVisible: true,
+        isLoading: true,
+        canExtend: true,
+        dragDisabled: true,
+        shouldScrollContents: true,
+        snapColumns: 96,
+        topRow: 0,
+        bottomRow: 99
+    };
+};
+// Insert a new "Page" widget at the top level.
+// This will be the new root level widget containing all other widgets.
+// Then insert a single "Section" widget into the Page children. All v7 DSL apps must have at least a single
+// Section that widgets live in.
+// Then move the v6 DSL CANVAS root widget ("MainCanvasWidget") into the Section.
+// Canvas widgets are now just a type of widget that can live inside a Section and they are considered the Section's "columns"
+const migrateToSections = (page) => {
+    const { apis, stateVars, timers, cachedData, ...originalMainCanvasWidget } = page;
+    // Rename the widgetId to a random UUID as "0" is reserved for the page
+    delete originalMainCanvasWidget.version;
+    originalMainCanvasWidget.widgetId = (0, appDSL_1.generatePredictableId)(originalMainCanvasWidget.widgetName);
+    originalMainCanvasWidget.widgetName = (0, exports.findNextWidgetNameWithSuffix)('Canvas', (0, exports.findAllInstancesOfWidgetNameWithPrefix)(page, 'canvas'));
+    const dsl = createPage();
+    // Even though our widget naming system is case sensitive, we want to make naming clear so we won't
+    // use Page if a widget with "page" (lowercase P) exists
+    dsl.widgetName = (0, exports.findNextWidgetNameWithSuffix)('Page', (0, exports.findAllInstancesOfWidgetNameWithPrefix)(page, 'page'), '_');
+    dsl.children[0].widgetId = (0, appDSL_1.generatePredictableId)(dsl.children[0].widgetName);
+    // Move the main canvas widget into the first section
+    // this will overwrite the default empty canvas that is already in the default layout
+    dsl.children[0].children = [originalMainCanvasWidget];
+    originalMainCanvasWidget.parentId = dsl.children[0].widgetId;
+    // Update parent id of all children of the original main canvas widget
+    for (const child of originalMainCanvasWidget.children) {
+        child.parentId = originalMainCanvasWidget.widgetId;
+    }
+    const upgradeModalsAndSlideouts = (widget) => {
+        for (const child of widget.children ?? []) {
+            if (child.type === 'SLIDEOUT_WIDGET' || child.type === 'MODAL_WIDGET') {
+                const firstChild = child.children?.[0];
+                const names = (0, exports.findAllInstancesOfWidgetNameWithPrefix)(dsl, 'body');
+                const nextName = (0, exports.findNextWidgetNameWithSuffix)('Body', names);
+                const bodySection = v7SlideoutOrModalSection(nextName, child.children);
+                bodySection.parentId = child.widgetId;
+                // Copy over the position properties from the first child
+                const keys = ['topRow', 'bottomRow', 'leftColumn', 'rightColumn', 'snapColumns', 'snapRows'];
+                keys.forEach((prop) => {
+                    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+                    if (firstChild?.[prop] !== undefined)
+                        bodySection[prop] = firstChild?.[prop];
+                });
+                child.children = [bodySection];
+            }
+            upgradeModalsAndSlideouts(child);
+        }
+    };
+    upgradeModalsAndSlideouts(dsl);
+    return {
+        ...dsl,
+        apis: { apiMap: apis?.apiMap ?? {} },
+        stateVars: stateVars ?? { stateVarMap: {} },
+        timers: timers ?? { timerMap: {} },
+        ...(cachedData ? { cachedData } : {})
+    };
+};
+exports.migrateToSections = migrateToSections;
+//# sourceMappingURL=migrateToSections.js.map

package/dist/pageMigrations/migrations/v6to7/migrateToSections.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrateToSections.js","sourceRoot":"","sources":["../../../../src/pageMigrations/migrations/v6to7/migrateToSections.ts"],"names":[],"mappings":"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"}

package/dist/pageMigrations/migrations/v6to7/migrateToSections.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=migrateToSections.test.d.ts.map

package/dist/pageMigrations/migrations/v6to7/migrateToSections.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrateToSections.test.d.ts","sourceRoot":"","sources":["../../../../src/pageMigrations/migrations/v6to7/migrateToSections.test.ts"],"names":[],"mappings":""}

package/dist/pageMigrations/migrations/v6to7/migrateToSections.test.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const migrateToSections_1 = require("./migrateToSections");
+describe('findNextWidgetNameWithSuffix', () => {
+    it('generates a name with a default suffix or none', () => {
+        // Numbers start at 1
+        const result = (0, migrateToSections_1.findNextWidgetNameWithSuffix)('TestWidget', []);
+        expect(result).toBe('TestWidget1');
+        const result2 = (0, migrateToSections_1.findNextWidgetNameWithSuffix)('TestWidget', ['TestWidget1']);
+        expect(result2).toBe('TestWidget2');
+        // Suffix start with no suffix
+        const result3 = (0, migrateToSections_1.findNextWidgetNameWithSuffix)('TestWidget', [], '_');
+        expect(result3).toBe('TestWidget');
+        const result4 = (0, migrateToSections_1.findNextWidgetNameWithSuffix)('TestWidget', ['TestWidget'], '_');
+        expect(result4).toBe('TestWidget_');
+    });
+    it('generates a name with the right suffix when multiple instances of the name exist', () => {
+        const existingNames = ['testwidget', 'testwidget_', 'testwidget__'];
+        const result = (0, migrateToSections_1.findNextWidgetNameWithSuffix)('TestWidget', existingNames, '_');
+        expect(result).toBe('TestWidget___');
+    });
+    it('generates a name with the right suffix when multiple instances of the name exist and the suffix string arg is undefined', () => {
+        const existingNames = ['testwidget', 'testwidget_', 'testwidget__'];
+        const result = (0, migrateToSections_1.findNextWidgetNameWithSuffix)('TestWidget', existingNames);
+        expect(result).toBe('TestWidget1');
+    });
+    it('generates a name with the right suffix when a name with a numeric suffix exists and the suffix string arg is undefined', () => {
+        const existingNames = ['TestWidget', 'TestWidget1'];
+        const result = (0, migrateToSections_1.findNextWidgetNameWithSuffix)('TestWidget', existingNames);
+        expect(result).toBe('TestWidget2');
+    });
+    it('generates a name without the suffix when one instance already exists', () => {
+        const existingNames = ['testwidget'];
+        const result = (0, migrateToSections_1.findNextWidgetNameWithSuffix)('TestWidget', existingNames, '_myfunnysuffix_');
+        expect(result).toBe('TestWidget_myfunnysuffix_');
+    });
+});
+describe('findAllInstancesOfWidgetNameWithPrefix', () => {
+    it('should find widget names with the given prefix', () => {
+        const dsl = {
+            widgetName: 'prefixOne',
+            children: [{ widgetName: 'prefixTwo' }, { widgetName: 'otherName' }]
+        };
+        const result = (0, migrateToSections_1.findAllInstancesOfWidgetNameWithPrefix)(dsl, 'prefix');
+        expect(result).toEqual(['prefixOne', 'prefixTwo']);
+    });
+    it('should handle deeply nested widget structures', () => {
+        const dsl = {
+            widgetName: 'root',
+            children: [
+                {
+                    widgetName: 'level1',
+                    children: [
+                        {
+                            widgetName: 'prefixNested',
+                            children: [{ widgetName: 'prefixDeeplyNested' }]
+                        }
+                    ]
+                }
+            ]
+        };
+        const result = (0, migrateToSections_1.findAllInstancesOfWidgetNameWithPrefix)(dsl, 'prefix');
+        expect(result).toEqual(['prefixNested', 'prefixDeeplyNested']);
+    });
+    it('should return an empty array when there are no matches', () => {
+        const dsl = {
+            widgetName: 'rootName',
+            children: [{ widgetName: 'childOne' }, { widgetName: 'childTwo' }]
+        };
+        const result = (0, migrateToSections_1.findAllInstancesOfWidgetNameWithPrefix)(dsl, 'prefix');
+        expect(result).toEqual([]);
+    });
+});
+//# sourceMappingURL=migrateToSections.test.js.map