@cloudbase/cals 0.5.13-alpha.4 → 0.5.14

package/lib/utils/dts/build.js

@@ -44,7 +44,7 @@ function buildFormulaDTS() {
                 const dts = yield fs_extra_1.default.readFile(tempDtsPath, 'utf8');
                 yield fs_extra_1.default.remove(tempDtsPath);
                 // 去掉最外层的模块声明
-                return dts.replace(/^declare module.*$/m, '').replace(/^\}$/m, '').replace(/^\s+/mg, '');
+                return dts.replace(/^declare module.*$/m, '').replace(/\}$/m, '').replace(/^\s+/mg, '');
             });
         }
     });

package/lib/utils/dts/index.d.ts

@@ -23,15 +23,6 @@ export interface IInputDataRepeaterItem {
     currentIndexAlias: string;
     itemData: IJsonSchemaAny;
 }
-export interface IInputDataRedefineAnyType {
-    module: string;
-    component: string;
-    widgetId: string;
-    updateProps: {
-        widgetPropName: string;
-        widgetPropTypeSchema: IJsonSchemaAny;
-    }[];
-}
 export interface IOptions {
     isCompMode?: boolean;
     needGlobalFormula?: boolean;
@@ -51,8 +42,7 @@ export declare enum IInputDataType {
     compPropEvents = "compPropEvents",
     usedComponents = "usedComponents",
     usedWidgets = "usedWidgets",
-    repeaterScope = "repeaterScope",
-    redefineAnyType = "redefineAnyType"
+    repeaterScope = "repeaterScope"
 }
 export interface IInputData {
     [IInputDataType.globalState]?: IJsonSchemaObject;
@@ -68,7 +58,6 @@ export interface IInputData {
     [IInputDataType.usedComponents]?: IInputDataUsedComponents[];
     [IInputDataType.usedWidgets]?: IInputDataWidgetItem[];
     [IInputDataType.repeaterScope]?: IInputDataRepeaterItem[];
-    [IInputDataType.redefineAnyType]?: IInputDataRedefineAnyType[];
 }
 /**
  * 通过该类可以共享同个dts。
@@ -83,7 +72,7 @@ export declare class WeDaDTS {
     /**
      * 部分更新 - 只更新一种类型
      */
-    static updateDTSPartial(inputData: IJsonSchemaObject | IDTSCodeItem[] | string[] | IInputDataUsedComponents[] | IInputDataWidgetItem[] | IInputDataRepeaterItem[] | IInputDataRedefineAnyType[], itemType: IInputDataType, options?: {
+    static updateDTSPartial(inputData: IJsonSchemaObject | IDTSCodeItem[] | string[] | IInputDataUsedComponents[] | IInputDataWidgetItem[] | IInputDataRepeaterItem[], itemType: IInputDataType, options?: {
         setEmptyIfError: boolean;
     }): Promise<void>;
     static getDTS(options?: Omit<IOptions, "isCompMode">): string;

package/lib/utils/dts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/dts/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/dts/index.ts"],"names":[],"mappings":"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"}

package/lib/utils/dts/index.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileJSONToDTS = exports.jsonToDTSWorkerCode = exports.transpileToDTS = exports.workerCode = exports.generateWeDaAppDTS = exports.WeDaDTS = exports.IInputDataType = void 0;
-const lodash_1 = require("lodash");
 const auto_generated_1 = require("./auto-generated");
 var IInputDataType;
 (function (IInputDataType) {
@@ -27,7 +26,6 @@ var IInputDataType;
     IInputDataType["usedComponents"] = "usedComponents";
     IInputDataType["usedWidgets"] = "usedWidgets";
     IInputDataType["repeaterScope"] = "repeaterScope";
-    IInputDataType["redefineAnyType"] = "redefineAnyType";
 })(IInputDataType = exports.IInputDataType || (exports.IInputDataType = {}));
 const DtsPlaceholder = {
     [IInputDataType.globalState]: "// Global State 全局变量 - Don't touch me",
@@ -42,8 +40,7 @@ const DtsPlaceholder = {
     [IInputDataType.compPropEvents]: "// Comp Prop Events 组件事件 - Don't touch me",
     [IInputDataType.usedComponents]: "// Used Components - Don't touch me",
     [IInputDataType.usedWidgets]: "// used widgets - Don't touch me",
-    [IInputDataType.repeaterScope]: "// repeater scope - Don't touch me",
-    [IInputDataType.redefineAnyType]: "// Redefine Any Type - Don't touch me",
+    [IInputDataType.repeaterScope]: "// repeater scope - Don't touch me"
 };
 const DtsInnerSign = {
     [IInputDataType.globalState]: "Global State Inner",
@@ -58,18 +55,8 @@ const DtsInnerSign = {
     [IInputDataType.compPropEvents]: "Comp Prop Events Inner",
     [IInputDataType.usedComponents]: "Used Components Inner",
     [IInputDataType.usedWidgets]: "used widgets Inner",
-    [IInputDataType.repeaterScope]: "repeater scope Inner",
-    [IInputDataType.redefineAnyType]: "Redefine Any Type Inner",
+    [IInputDataType.repeaterScope]: "repeater scope Inner"
 };
-var GroupEnum;
-(function (GroupEnum) {
-    GroupEnum["GLOBAL_VAR"] = "globalVar";
-    GroupEnum["PAGE_VAR"] = "pageVar";
-    GroupEnum["PAGE_PARAM"] = "pageParam";
-    GroupEnum["COMPONENT"] = "component";
-    GroupEnum["REPEATER"] = "repeater";
-    GroupEnum["DATA_FIELD"] = "dataField";
-})(GroupEnum || (GroupEnum = {}));
 /**
  * 通过该类可以共享同个dts。
  * 场景：在 weda 中，低代码的变更会通知更改 dts，而低码编辑器和表达式编辑器对 dts 的需求是不一样的，这样不同的 dts 共享的是同一份全的 dts。如果直接调用 generateWeDaAppDTS 会导致 dts 重复地解析
@@ -88,16 +75,14 @@ class WeDaDTS {
      */
     static updateDTSPartial(inputData, itemType, options = { setEmptyIfError: false }) {
         return __awaiter(this, void 0, void 0, function* () {
+            let dts = '';
             try {
-                const [dts, replaceRules] = yield _generateOneItemDTS(inputData, itemType);
-                replaceRules.forEach(rule => {
-                    WeDaDTS._dts = WeDaDTS._dts.replace(rule.from, rule.to);
-                });
+                dts = yield _generateOneItemDTS(inputData, itemType);
                 WeDaDTS._dts = WeDaDTS._dts.replace(new RegExp(`^(\\s*\\/\\/ ${DtsInnerSign[itemType]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DtsInnerSign[itemType]} End)`, 'm'), `$1\n${dts}\n$2`);
             }
             catch (e) {
                 if (options.setEmptyIfError) {
-                    WeDaDTS._dts = WeDaDTS._dts.replace(new RegExp(`^(\\s*\\/\\/ ${DtsInnerSign[itemType]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DtsInnerSign[itemType]} End)`, 'm'), `$1\n${''}\n$2`);
+                    WeDaDTS._dts = WeDaDTS._dts.replace(new RegExp(`^(\\s*\\/\\/ ${DtsInnerSign[itemType]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DtsInnerSign[itemType]} End)`, 'm'), `$1\n${dts}\n$2`);
                 }
             }
         });
@@ -116,8 +101,8 @@ class WeDaDTS {
         return resultDts;
     }
 }
-exports.WeDaDTS = WeDaDTS;
 WeDaDTS._dts = '';
+exports.WeDaDTS = WeDaDTS;
 /**
  * 生成 WeDa 应用的低码代码提示的 dts 类型声明内容
  */
@@ -129,8 +114,8 @@ function generateWeDaAppDTS(inputData = {}, options = { isCompMode: false, needG
             if (placeholder) {
                 // 防止某项错误导致全部都错误
                 try {
-                    const [dts] = yield _generateOneItemDTS(inputData[key], key);
-                    resultDts = resultDts.replace(placeholder, dts + '\n' + placeholder);
+                    const dts = yield _generateOneItemDTS(inputData[key], key);
+                    resultDts = resultDts.replace(placeholder, dts + placeholder);
                 }
                 catch (e) {
                     console.error(e);
@@ -156,102 +141,17 @@ function generateWeDaAppDTS(inputData = {}, options = { isCompMode: false, needG
         if (!(options === null || options === void 0 ? void 0 : options.needRepeaterScope)) {
             resultDts = resultDts.replace(/\/\/ repeater scope Inner Begin[\s\S]*\/\/ repeater scope Inner End$/m, '');
         }
+        // console.log(resultDts)
         return resultDts;
     });
 }
 exports.generateWeDaAppDTS = generateWeDaAppDTS;
-/**
- * 生成 weda 专有的注释信息
- */
-function genWeDaCodeComment({ fieldName, title, description, type, group }) {
-    const desc = `${title || fieldName}\n${description || ''}`;
-    return desc + `\n@privateForWeDa\n${JSON.stringify({ group, displayType: type, displayName: title || '' })}`;
-}
 /**
  * 生成指定类型的 DTS
  */
 function _generateOneItemDTS(inputData, itemType) {
     return __awaiter(this, void 0, void 0, function* () {
-        const replaceRules = [];
-        /**
-         * 处理注释信息
-         */
-        function _handleComment(inputData, group) {
-            const _inputData = (0, lodash_1.cloneDeep)(inputData);
-            const schema = JSON.parse(JSON.stringify(_inputData, (key, value) => {
-                var _a;
-                if ((value === null || value === void 0 ? void 0 : value.type) && !((_a = value === null || value === void 0 ? void 0 : value.type) === null || _a === void 0 ? void 0 : _a.type)) {
-                    // value?.type?.type 有值，则证明 type 是自定义的字段，而非 JSONSchema 中的 type
-                    value.description = genWeDaCodeComment({
-                        fieldName: key,
-                        title: value.title,
-                        description: value.description,
-                        group: group,
-                        type: value.type
-                    });
-                }
-                return value;
-            }));
-            schema.description = ''; // 避免第一层出现注释
-            return schema;
-        }
-        /**
-         * 获取用于显示的数据类型（仅有 number, string , boolean, array, object 等内置基础类型）
-         */
-        function getDisplayReturnType(typeStr) {
-            let displayType = typeStr.trim();
-            if (displayType.endsWith('[]')) {
-                displayType = 'array';
-            }
-            else if (displayType.endsWith('}')) {
-                displayType = 'object';
-            }
-            return displayType;
-        }
-        /**
-         * 获取组件接口定义名称
-         */
-        function _genCompInterfaceName(module, component) {
-            return `${module.replace(/-/g, '_')}_${component}`;
-        }
-        function _compile(jsonschema, isObjNeedWrapper = false) {
-            return __awaiter(this, void 0, void 0, function* () {
-                let dts = yield compileJSONToDTS(jsonschema);
-                if (dts.search(/^export interface IWeDa/) >= 0) {
-                    dts = dts.replace(/^export interface.*$/m, '');
-                    dts = dts.substring(0, dts.length - 2);
-                    if (isObjNeedWrapper) {
-                        dts = `{${dts}}`;
-                    }
-                }
-                else {
-                    dts = dts.replace(/^export type IWeDa =/m, '');
-                }
-                return dts;
-            });
-        }
         const hanlderMap = {
-            [IInputDataType.globalState]: function (inputData) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    // 完善注释信息
-                    const handledInputData = _handleComment(inputData, GroupEnum.GLOBAL_VAR);
-                    return yield _compile(handledInputData);
-                });
-            },
-            [IInputDataType.pageState]: function (inputData) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    // 完善注释信息
-                    const handledInputData = _handleComment(inputData, GroupEnum.PAGE_VAR);
-                    return yield _compile(handledInputData);
-                });
-            },
-            [IInputDataType.pageParams]: function (inputData) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    // 完善注释信息
-                    const handledInputData = _handleComment(inputData, GroupEnum.PAGE_PARAM);
-                    return yield _compile(handledInputData);
-                });
-            },
             [IInputDataType.globalCommonCodes]: function (inputData) {
                 return __awaiter(this, void 0, void 0, function* () {
                     const dts = yield Promise.all(inputData.map((item) => __awaiter(this, void 0, void 0, function* () {
@@ -305,8 +205,7 @@ function _generateOneItemDTS(inputData, itemType) {
                         // 属性
                         let exportPropertiesDTS = '';
                         if (item.exportProperties) {
-                            const handledProperties = _handleComment(item.exportProperties);
-                            exportPropertiesDTS = yield _compile(handledProperties);
+                            exportPropertiesDTS = yield _compile(item.exportProperties);
                         }
                         // 方法
                         let exportMethodsDTS = '';
@@ -355,17 +254,7 @@ function _generateOneItemDTS(inputData, itemType) {
                 return inputData.map(item => {
                     if (item.idList && item.idList.length > 0) {
                         const interfaceName = _genCompInterfaceName(item.module, item.component);
-                        return item.idList.map(id => `
-          /**
-          ${genWeDaCodeComment({
-                            fieldName: id,
-                            title: '',
-                            description: '',
-                            group: GroupEnum.COMPONENT,
-                            type: 'component' // 组件显示的类型为 component
-                        }).split('\n').map(item => `* ${item}`).join('\n')}
-           */
-          const ${id}: ${interfaceName}`).join('\n');
+                        return item.idList.map(id => `const ${id}: ${interfaceName}`).join('\n');
                     }
                     return '';
                 }).join('\n');
@@ -375,96 +264,43 @@ function _generateOneItemDTS(inputData, itemType) {
                     const results = yield Promise.all(inputData.map((item) => __awaiter(this, void 0, void 0, function* () {
                         let itemDataDTS = yield _compile(item.itemData, true);
                         return `
-        /**
-        ${genWeDaCodeComment({
-                            fieldName: item.currentItemAlias,
-                            title: '',
-                            description: '',
-                            group: GroupEnum.REPEATER,
-                            type: getDisplayReturnType(itemDataDTS)
-                        }).split('\n').map(item => `* ${item}`).join('\n')}
-        */
         const ${item.currentItemAlias}: ${itemDataDTS}
-        /**
-        ${genWeDaCodeComment({
-                            fieldName: item.currentIndexAlias,
-                            title: '',
-                            description: '',
-                            group: GroupEnum.REPEATER,
-                            type: 'number'
-                        }).split('\n').map(item => `* ${item}`).join('\n')}
-          */
         const ${item.currentIndexAlias}: number
         `;
                     })));
                     return results.join('\n');
                 });
             },
-            [IInputDataType.redefineAnyType]: function (inputData) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    const results = yield Promise.all(inputData.map((item) => __awaiter(this, void 0, void 0, function* () {
-                        const compInterfaceName = _genCompInterfaceName(item.module, item.component);
-                        const widgetInterfaceName = `${item.widgetId}_${compInterfaceName}`;
-                        /**
-                         * 更新
-                         */
-                        replaceRules.push({
-                            from: new RegExp(`(const ${item.widgetId}): .*`),
-                            to: `$1: ${widgetInterfaceName}`
-                        });
-                        /**
-                         * 增加类
-                         */
-                        const propDefinitions = yield Promise.all(item.updateProps.map((prop) => __awaiter(this, void 0, void 0, function* () {
-                            const properties = _handleComment(prop.widgetPropTypeSchema, GroupEnum.DATA_FIELD);
-                            const widgetPropTypeDTS = yield _compile(Object.assign(Object.assign({}, prop.widgetPropTypeSchema), properties), true);
-                            // 是否是多层级字段，如 "a.b"
-                            // FIXME: 当前只支持 a.b 这种形式，不支持 a[].b
-                            const multiLevelField = prop.widgetPropName.includes('.');
-                            let multiLevelFields = [];
-                            let multiLevelFieldObj = {};
-                            let firstField = '';
-                            let othersFields = [];
-                            if (multiLevelField) {
-                                multiLevelFields = prop.widgetPropName.split('.');
-                                (0, lodash_1.set)(multiLevelFieldObj, prop.widgetPropName, "$$schema$$");
-                                const [_firstField, ..._othersFields] = multiLevelFields;
-                                firstField = _firstField;
-                                othersFields = _othersFields;
-                            }
-                            return `
-          /**
-           ${genWeDaCodeComment({
-                                fieldName: prop.widgetPropName,
-                                title: prop.widgetPropTypeSchema.title,
-                                description: prop.widgetPropTypeSchema.description,
-                                group: undefined,
-                                type: getDisplayReturnType(widgetPropTypeDTS)
-                            }).split('\n').map(item => `* ${item}`).join('\n')}
-            */
-            ${multiLevelField ? `${firstField}: Omit<${compInterfaceName}['${firstField}'], '${othersFields.join(".")}'> & ${JSON.stringify(multiLevelFieldObj[firstField]).replace('"$$schema$$"', widgetPropTypeDTS)}` : `${prop.widgetPropName}: ${widgetPropTypeDTS}`}
-          `;
-                        })));
-                        return `
-        declare class ${widgetInterfaceName} extends ${compInterfaceName} {
-          ${propDefinitions.join('\n')}
-        }
-        `;
-                    })));
-                    return results.join('\n');
-                });
-            }
         };
         let dts = '';
         if (!inputData)
-            return [dts, replaceRules];
+            return dts;
         const handler = hanlderMap[itemType];
         // 优先判断是否有独立的处理逻辑
         if (handler) {
             dts = yield handler.call(hanlderMap, inputData);
         }
         dts = dts || (yield _compile(inputData));
-        return [dts, replaceRules];
+        return dts;
+        function _genCompInterfaceName(module, component) {
+            return `${module.replace(/-/g, '_')}_${component}`;
+        }
+        function _compile(jsonschema, isObjNeedWrapper = false) {
+            return __awaiter(this, void 0, void 0, function* () {
+                let dts = yield compileJSONToDTS(jsonschema);
+                if (dts.search(/^export interface IWeDa/) >= 0) {
+                    dts = dts.replace(/^export interface.*$/m, '');
+                    dts = dts.substring(0, dts.length - 2);
+                    if (isObjNeedWrapper) {
+                        dts = `{${dts}}`;
+                    }
+                }
+                else {
+                    dts = dts.replace(/^export type IWeDa =/m, '');
+                }
+                return dts;
+            });
+        }
     });
 }
 // 仅仅为了与 unittest 共享，外部请不要使用

package/lib/utils/index.d.ts

@@ -2,6 +2,7 @@ export * from '../parser';
 export * from '../types/index';
 export * from './constant';
 export * from './dts/index';
-export { version4 } from './version-migrations/version4';
+export { version4 } from './version/migrations/version4';
+export { semverComp } from './version/common';
 export { isUnitlessNumber } from './CSSProperty';
 //# sourceMappingURL=index.d.ts.map

package/lib/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC"}

package/lib/utils/index.js

@@ -14,12 +14,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUnitlessNumber = exports.version4 = void 0;
+exports.isUnitlessNumber = exports.semverComp = exports.version4 = void 0;
 __exportStar(require("../parser"), exports);
 __exportStar(require("../types/index"), exports);
 __exportStar(require("./constant"), exports);
 __exportStar(require("./dts/index"), exports);
-var version4_1 = require("./version-migrations/version4");
+var version4_1 = require("./version/migrations/version4");
 Object.defineProperty(exports, "version4", { enumerable: true, get: function () { return version4_1.version4; } });
+var common_1 = require("./version/common");
+Object.defineProperty(exports, "semverComp", { enumerable: true, get: function () { return common_1.semverComp; } });
 var CSSProperty_1 = require("./CSSProperty");
 Object.defineProperty(exports, "isUnitlessNumber", { enumerable: true, get: function () { return CSSProperty_1.isUnitlessNumber; } });

package/lib/utils/version/common.d.ts

@@ -0,0 +1,3 @@
+export declare function semverComp(a: string, b: string): number;
+export declare function toFixed(num: number, precision: number): number;
+//# sourceMappingURL=common.d.ts.map

package/lib/utils/version/common.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/utils/version/common.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAYvD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAI9D"}

package/lib/utils/version/common.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toFixed = exports.semverComp = void 0;
+function semverComp(a, b) {
+    const pa = a.split('.');
+    const pb = b.split('.');
+    for (let i = 0; i < 3; i++) {
+        const na = Number(pa[i]);
+        const nb = Number(pb[i]);
+        if (na > nb)
+            return 1;
+        if (nb > na)
+            return -1;
+        if (!isNaN(na) && isNaN(nb))
+            return 1;
+        if (isNaN(na) && !isNaN(nb))
+            return -1;
+    }
+    return 0;
+}
+exports.semverComp = semverComp;
+function toFixed(num, precision) {
+    const multiplier = Math.pow(10, (precision + 1));
+    const wholeNumber = Math.floor(num * multiplier);
+    return (Math.round(wholeNumber / 10) * 10) / multiplier;
+}
+exports.toFixed = toFixed;

package/lib/utils/version/featureChecker.d.ts

@@ -0,0 +1,3 @@
+export declare function isEnbaleObserverVersion(dependencies?: any[]): boolean;
+export declare function isEnablePageRoot(dependencies: any): boolean;
+//# sourceMappingURL=featureChecker.d.ts.map

package/lib/utils/version/featureChecker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"featureChecker.d.ts","sourceRoot":"","sources":["../../../src/utils/version/featureChecker.ts"],"names":[],"mappings":"AAqBA,wBAAgB,uBAAuB,CAAC,YAAY,QAAK,WAExD;AAED,wBAAgB,gBAAgB,CAAC,YAAY,KAAA,WAE5C"}

package/lib/utils/version/featureChecker.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEnablePageRoot = exports.isEnbaleObserverVersion = void 0;
+const constant_1 = require("../constant");
+const common_1 = require("./common");
+function compareOfficialLibVersionWithVersion(dependencies, version, timesnap) {
+    const officialLib = dependencies.find((item) => item.name === constant_1.OFFICIAL_LIB_KEY);
+    if (officialLib) {
+        const { version } = officialLib;
+        if (version.includes('.')) {
+            return (0, common_1.semverComp)('2.21.3', version) <= 0;
+            // 正式版本的版本号
+        }
+        else if (Number(version) >= 1678760239346) {
+            // 测试版本的版本号
+            return true;
+        }
+        return false;
+    }
+    else {
+        return true;
+    }
+}
+function isEnbaleObserverVersion(dependencies = []) {
+    return compareOfficialLibVersionWithVersion(dependencies, '2.21.3', 1678760239346);
+}
+exports.isEnbaleObserverVersion = isEnbaleObserverVersion;
+function isEnablePageRoot(dependencies) {
+    return compareOfficialLibVersionWithVersion(dependencies, '20000.21.3', 1679640531142);
+}
+exports.isEnablePageRoot = isEnablePageRoot;

package/lib/utils/version/migrations/version4.d.ts

@@ -0,0 +1,3 @@
+import type { IPlatformApp } from '../../../types';
+export declare function version4(cals: IPlatformApp, isUpgrade: boolean, setSchemaVersionCallback?: (version: string | undefined) => void): IPlatformApp;
+//# sourceMappingURL=version4.d.ts.map

package/lib/utils/version/migrations/version4.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"version4.d.ts","sourceRoot":"","sources":["../../../../src/utils/version/migrations/version4.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAGnE,wBAAgB,QAAQ,CACtB,IAAI,EAAE,YAAY,EAClB,SAAS,EAAE,OAAO,EAClB,wBAAwB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,GAC/D,YAAY,CAEd"}