@cloudbase/cals 1.0.3-alpha.15 → 1.0.3-alpha.17

package/lib/utils/dts/index.js

@@ -8,8 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileJSONToDTS = exports.jsonToDTSWorkerCode = exports.transpileToDTS = exports.workerCode = exports.generateWeDaAppDTS = exports.WeDaDTS = exports.IInputDataType = void 0;
+const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
+const pick_1 = __importDefault(require("lodash/pick"));
+const set_1 = __importDefault(require("lodash/set"));
+const json_easy_filter_1 = __importDefault(require("json-easy-filter"));
 const auto_generated_1 = require("./auto-generated");
 var IInputDataType;
 (function (IInputDataType) {
@@ -26,6 +33,7 @@ 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",
@@ -40,23 +48,34 @@ 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.repeaterScope]: "// repeater scope - Don't touch me",
+    [IInputDataType.redefineAnyType]: "// Redefine Any Type - Don't touch me",
 };
 const DtsInnerSign = {
-    [IInputDataType.globalState]: "Global State Inner",
-    [IInputDataType.pageState]: "Page State Inner",
-    [IInputDataType.compState]: "Comp State Inner",
-    [IInputDataType.pageParams]: "Page Param Inner",
-    [IInputDataType.forState]: "Global For Inner",
-    [IInputDataType.globalCommonCodes]: "Global Common Inner",
-    [IInputDataType.pageHandlerCodes]: "Page Handler Inner",
-    [IInputDataType.compHandlerCodes]: "Comp Handler Inner",
-    [IInputDataType.compPropData]: "Comp Prop Data Inner",
-    [IInputDataType.compPropEvents]: "Comp Prop Events Inner",
-    [IInputDataType.usedComponents]: "Used Components Inner",
-    [IInputDataType.usedWidgets]: "used widgets Inner",
-    [IInputDataType.repeaterScope]: "repeater scope Inner"
+    [IInputDataType.globalState]: 'Global State Inner',
+    [IInputDataType.pageState]: 'Page State Inner',
+    [IInputDataType.compState]: 'Comp State Inner',
+    [IInputDataType.pageParams]: 'Page Param Inner',
+    [IInputDataType.forState]: 'Global For Inner',
+    [IInputDataType.globalCommonCodes]: 'Global Common Inner',
+    [IInputDataType.pageHandlerCodes]: 'Page Handler Inner',
+    [IInputDataType.compHandlerCodes]: 'Comp Handler Inner',
+    [IInputDataType.compPropData]: 'Comp Prop Data Inner',
+    [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',
 };
+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 重复地解析
@@ -75,19 +94,25 @@ class WeDaDTS {
      */
     static updateDTSPartial(inputData, itemType, options = { setEmptyIfError: false }) {
         return __awaiter(this, void 0, void 0, function* () {
-            let dts = '';
             try {
-                dts = yield _generateOneItemDTS(inputData, itemType);
+                const [dts, replaceRules] = yield _generateOneItemDTS(inputData, itemType);
+                replaceRules.forEach((rule) => {
+                    WeDaDTS._dts = WeDaDTS._dts.replace(rule.from, rule.to);
+                });
                 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${dts}\n$2`);
+                    WeDaDTS._dts = WeDaDTS._dts.replace(new RegExp(`^(\\s*\\/\\/ ${DtsInnerSign[itemType]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DtsInnerSign[itemType]} End)`, 'm'), `$1\n${''}\n$2`);
                 }
             }
         });
     }
-    static getDTS(options = { needGlobalFormula: false, needGlobalFor: false, needRepeaterScope: false }) {
+    static getDTS(options = {
+        needGlobalFormula: false,
+        needGlobalFor: false,
+        needRepeaterScope: false,
+    }) {
         let resultDts = WeDaDTS._dts;
         if (!options.needGlobalFormula) {
             resultDts = resultDts.replace(/^\/\/ Global Formula Begin[\s\S]*^\/\/ Global Formula End$/m, '');
@@ -114,8 +139,11 @@ function generateWeDaAppDTS(inputData = {}, options = { isCompMode: false, needG
             if (placeholder) {
                 // 防止某项错误导致全部都错误
                 try {
-                    const dts = yield _generateOneItemDTS(inputData[key], key);
-                    resultDts = resultDts.replace(placeholder, dts + placeholder);
+                    const [dts, replaceRules] = yield _generateOneItemDTS(inputData[key], key);
+                    replaceRules.forEach((rule) => {
+                        resultDts = resultDts.replace(rule.from, rule.to);
+                    });
+                    resultDts = resultDts.replace(placeholder, dts + '\n' + placeholder);
                 }
                 catch (e) {
                     console.error(e);
@@ -141,17 +169,151 @@ 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, dataFieldInfo, group, schema, subGroup, baseClass, datasource, }) {
+    const desc = title || fieldName ? `${title || fieldName}\n${description || ''}` : '';
+    return (desc +
+        `\n@privateForWeDa\n${JSON.stringify({
+            group,
+            displayType: type,
+            displayName: title || '',
+            schema,
+            subGroup,
+            baseClass,
+            datasource,
+            dataFieldInfo,
+        })}`);
+}
 /**
  * 生成指定类型的 DTS
  */
 function _generateOneItemDTS(inputData, itemType) {
     return __awaiter(this, void 0, void 0, function* () {
+        const replaceRules = [];
+        /**
+         * 获取数据字段的类型
+         */
+        function getDataFieldDisplayType(format) {
+            const nameMap = {
+                email: 'email',
+                url: 'url',
+                tel: 'tel',
+                phone: 'phone',
+                'x-image': 'image',
+                'x-rtf': 'rtf',
+                datetime: 'datetime',
+                date: 'date',
+                time: 'time',
+                'x-enum': 'enum',
+                'x-location': 'location',
+                'x-file': 'file',
+                related: 'related',
+                'father-son': 'father-son',
+                'x-autonumber': 'autonumber',
+                'x-area-code': 'area-code',
+                function: 'function',
+            };
+            return nameMap[format];
+        }
+        /**
+         * 处理注释信息
+         */
+        function _handleComment(inputData, group, needKeepSchema) {
+            const _inputData = (0, cloneDeep_1.default)(inputData);
+            json_easy_filter_1.default.traverse(_inputData, function (key, value, path) {
+                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
+                    let schema = null;
+                    if (needKeepSchema) {
+                        const isFirstLevel = path.length === 2 && (path === null || path === void 0 ? void 0 : path[0]) === 'properties';
+                        if (isFirstLevel) {
+                            // 只需要第一级属性需要保存，且只保存子信息（对象或数组的子项）
+                            schema = value.properties || value.items ? value : null;
+                        }
+                    }
+                    // 特殊处理数据字段的类型
+                    let type = value.type;
+                    if (group === GroupEnum.DATA_FIELD) {
+                        type = getDataFieldDisplayType(value.format) || type;
+                    }
+                    value.description = genWeDaCodeComment({
+                        fieldName: key,
+                        title: value.title,
+                        description: value.description,
+                        group,
+                        type,
+                        dataFieldInfo: (0, pick_1.default)(value, ['type', 'format', 'x-system']),
+                        schema,
+                    });
+                }
+            });
+            _inputData.description = ''; // 避免第一层出现注释
+            return _inputData;
+        }
+        /**
+         * 获取用于显示的数据类型（仅有 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, true);
+                    return yield _compile(handledInputData);
+                });
+            },
+            [IInputDataType.pageState]: function (inputData) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    // 完善注释信息
+                    const handledInputData = _handleComment(inputData, GroupEnum.PAGE_VAR, true);
+                    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* () {
@@ -195,17 +357,36 @@ function _generateOneItemDTS(inputData, itemType) {
             },
             [IInputDataType.compPropEvents]: function (inputData) {
                 const IData = `any`;
-                return inputData.map(eventName => {
+                return inputData
+                    .map((eventName) => {
                     return `function ${eventName}(data?: ${IData}): void`;
-                }).join('\n');
+                })
+                    .join('\n');
             },
             [IInputDataType.usedComponents]: function (inputData) {
                 return __awaiter(this, void 0, void 0, function* () {
+                    // 组件系统属性（在 framework/weda-framework.d.ts 的 UserWidget 中筛选一部分）
+                    const commonProperties = {
+                        id: {
+                            type: 'string',
+                            title: '组件 ID',
+                            describe: '组件 ID，微搭中一般由编辑器生成',
+                        },
+                        module: {
+                            type: 'string',
+                            title: '组件库名',
+                        },
+                        component: {
+                            type: 'string',
+                            title: '组件名',
+                        },
+                    };
                     const results = yield Promise.all(inputData.map((item) => __awaiter(this, void 0, void 0, function* () {
                         // 属性
                         let exportPropertiesDTS = '';
                         if (item.exportProperties) {
-                            exportPropertiesDTS = yield _compile(item.exportProperties);
+                            const handledProperties = _handleComment(item.exportProperties);
+                            exportPropertiesDTS = yield _compile(handledProperties);
                         }
                         // 方法
                         let exportMethodsDTS = '';
@@ -238,8 +419,25 @@ function _generateOneItemDTS(inputData, itemType) {
                         //   ${exportMethodsDTS}
                         // }
                         // `
+                        const interfaceName = _genCompInterfaceName(item.module, item.component);
+                        if (!item.exportProperties) {
+                            item.exportProperties = {
+                                type: 'object',
+                                properties: {},
+                            };
+                        }
+                        item.exportProperties.properties = Object.assign({}, commonProperties, item.exportProperties.properties);
                         return `
-        declare class ${_genCompInterfaceName(item.module, item.component)} extends UserWidget {
+        /**
+        ${genWeDaCodeComment({
+                            fieldName: interfaceName,
+                            schema: item.exportProperties,
+                        })
+                            .split('\n')
+                            .map((item) => `* ${item}`)
+                            .join('\n')}
+        */
+        declare class ${interfaceName} extends UserWidget {
 
           ${exportPropertiesDTS}
 
@@ -251,21 +449,162 @@ function _generateOneItemDTS(inputData, itemType) {
                 });
             },
             [IInputDataType.usedWidgets]: function (inputData) {
-                return inputData.map(item => {
+                return inputData
+                    .map((item) => {
                     if (item.idList && item.idList.length > 0) {
                         const interfaceName = _genCompInterfaceName(item.module, item.component);
-                        return item.idList.map(id => `const ${id}: ${interfaceName}`).join('\n');
+                        return item.idList
+                            .map((id) => `
+          /**
+          ${genWeDaCodeComment({
+                            fieldName: id,
+                            title: '',
+                            description: '',
+                            group: GroupEnum.COMPONENT,
+                            type: 'component',
+                            baseClass: interfaceName,
+                            datasource: `$${id}_start$ $${id}_end$`,
+                        })
+                            .split('\n')
+                            .map((item) => `* ${item}`)
+                            .join('\n')}
+           */
+          const ${id}: ${interfaceName}`)
+                            .join('\n');
                     }
                     return '';
-                }).join('\n');
+                })
+                    .join('\n');
             },
             [IInputDataType.repeaterScope]: 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* () {
-                        let itemDataDTS = yield _compile(item.itemData, true);
+                        let itemDataDTS = '';
+                        if (item.itemData.title) {
+                            // 特殊场景：数据字段
+                            const handledInputData = _handleComment(item.itemData, GroupEnum.DATA_FIELD);
+                            itemDataDTS = yield _compile(handledInputData, true);
+                        }
+                        else {
+                            // 普通的循环项数据
+                            itemDataDTS = yield _compile(item.itemData, true);
+                        }
                         return `
+        /**
+        ${genWeDaCodeComment({
+                            fieldName: item.currentItemAlias,
+                            title: '当前项值',
+                            description: '',
+                            group: GroupEnum.REPEATER,
+                            type: getDisplayReturnType(itemDataDTS),
+                            schema: item.itemData,
+                            subGroup: item.widgetId,
+                        })
+                            .split('\n')
+                            .map((item) => `* ${item}`)
+                            .join('\n')}
+        */
         const ${item.currentItemAlias}: ${itemDataDTS}
+        /**
+        ${genWeDaCodeComment({
+                            fieldName: item.currentIndexAlias,
+                            title: '当前下标',
+                            description: '',
+                            group: GroupEnum.REPEATER,
+                            type: 'number',
+                            subGroup: item.widgetId,
+                        })
+                            .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}`;
+                        /**
+                         * 更新 widget 的类型名
+                         */
+                        replaceRules.push({
+                            from: new RegExp(`(const ${item.widgetId}): .*`),
+                            to: `$1: ${widgetInterfaceName}`,
+                        });
+                        /**
+                         * 增加类
+                         */
+                        const datasources = {};
+                        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);
+                            // 同个数据源，有可能是数组类型，所以需要区分开
+                            const id = `${prop.datasource.name}_${prop.widgetPropTypeSchema.type}`;
+                            if (!datasources[id]) {
+                                datasources[id] = {
+                                    fields: [{ name: prop.widgetPropName, title: prop.widgetPropTitle }],
+                                    schema: prop.widgetPropTypeSchema,
+                                    name: prop.datasource.name,
+                                    title: prop.datasource.title,
+                                    id: prop.datasource.id,
+                                    type: prop.datasource.type,
+                                };
+                            }
+                            else {
+                                datasources[id].fields.push({ name: prop.widgetPropName, title: prop.widgetPropTitle });
+                            }
+                            // 是否是多层级字段，如 "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, set_1.default)(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}`}
+          `;
+                        })));
+                        /**
+                         *  更新数据源信息
+                         */
+                        const datasourceInfoList = Object.values(datasources);
+                        if (datasourceInfoList.length > 0) {
+                            replaceRules.push({
+                                from: new RegExp(`(\\$${item.widgetId}_start\\$).*(\\$${item.widgetId}_end\\$)`),
+                                // encodeURIComponent 是为了能正常 parse 成 JSON
+                                to: `$1${encodeURIComponent(JSON.stringify(datasourceInfoList))}$2`,
+                            });
+                        }
+                        return `
+        declare class ${widgetInterfaceName} extends ${compInterfaceName} {
+          ${propDefinitions.join('\n')}
+        }
         `;
                     })));
                     return results.join('\n');
@@ -274,33 +613,14 @@ function _generateOneItemDTS(inputData, itemType) {
         };
         let dts = '';
         if (!inputData)
-            return dts;
+            return [dts, replaceRules];
         const handler = hanlderMap[itemType];
         // 优先判断是否有独立的处理逻辑
         if (handler) {
             dts = yield handler.call(hanlderMap, inputData);
         }
         dts = dts || (yield _compile(inputData));
-        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;
-            });
-        }
+        return [dts, replaceRules];
     });
 }
 // 仅仅为了与 unittest 共享，外部请不要使用
@@ -380,20 +700,18 @@ function TypescriptWorker(workerId, workerCode) {
             typescriptWorker.onmessage = function (event) {
                 const { action } = event.data;
                 if (action === 'dts_back') {
-                    const { data: { id, dts } } = event.data;
+                    const { data: { id, dts }, } = event.data;
                     sendMessageCallbackFn[id] && sendMessageCallbackFn[id](dts);
                 }
             };
             typescriptWorkerMap[workerId] = {
                 typescriptWorker,
-                sendMessageCallbackFn
+                sendMessageCallbackFn,
             };
         }
         function sendMessage(msgData, callbackFn) {
             const { typescriptWorker, sendMessageCallbackFn } = typescriptWorkerMap[workerId];
-            const id = Math.random()
-                .toString(36)
-                .substring(2, 5);
+            const id = Math.random().toString(36).substring(2, 5);
             msgData.data.id = id;
             sendMessageCallbackFn[id] = callbackFn;
             typescriptWorker.postMessage(msgData);
@@ -402,22 +720,22 @@ function TypescriptWorker(workerId, workerCode) {
     };
 }
 /**
-* 使用：
-* const typescriptWorker = getTypescriptWorker();
-* typescriptWorker.sendMessage({ action: 'dts', data: { code } }, dts => {
-*
-* })
-* // 以下暂未实现
-* typescriptWorker.sendMessage({ action: 'ts', data: { code } }, ts => {
-*
-* })
-*/
+ * 使用：
+ * const typescriptWorker = getTypescriptWorker();
+ * typescriptWorker.sendMessage({ action: 'dts', data: { code } }, dts => {
+ *
+ * })
+ * // 以下暂未实现
+ * typescriptWorker.sendMessage({ action: 'ts', data: { code } }, ts => {
+ *
+ * })
+ */
 const getTypescriptWorker = TypescriptWorker('transpileToDTS', exports.workerCode);
 /**
  * 通过 js/ts 代码生成 dts
  */
 function transpileToDTS(code) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
         const typescriptWorker = getTypescriptWorker();
         typescriptWorker.sendMessage({ action: 'dts', data: { code } }, (dts) => {
             resolve(dts);

package/lib/utils/version/migrations/version4.js

@@ -15,7 +15,7 @@ exports.version4 = version4;
 const transformPxLowcodeCompAndSourceComp = (cals, isUpgrade, setSchemaVersionCallback) => {
     var _a, _b, _c, _d;
     {
-        function transformCals(items, isUpgradeToPx) {
+        const transformCals = (items, isUpgradeToPx) => {
             return items.map((item) => {
                 var _a;
                 // 对于表单操作区的按钮组件的父容器添加.wd-form__action, 兼容组件规范化按钮升级样式
@@ -52,7 +52,7 @@ const transformPxLowcodeCompAndSourceComp = (cals, isUpgrade, setSchemaVersionCa
                 }
                 return item;
             });
-        }
+        };
         let pages = cals['items'];
         let isDivision;
         if (isUpgrade && (0, common_1.semverComp)((_a = cals['schemaVersion']) !== null && _a !== void 0 ? _a : '3.0.0', '4.0.0') < 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/cals",
-  "version": "1.0.3-alpha.15",
+  "version": "1.0.3-alpha.17",
   "description": "Common application specifications",
   "main": "lib/utils/index.js",
   "source": "src/utils/index.ts",
@@ -30,6 +30,7 @@
   "license": "MIT",
   "dependencies": {
     "acorn": "^8.0.4",
+    "json-easy-filter": "^0.3.1",
     "json-schema-to-typescript-for-browser": "^11.0.3",
     "lodash": "^4.17.20",
     "postcss": "^8.4.20",