@cloudbase/cals 0.5.12 → 0.5.13-alpha.1

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, '');
             });
         }
     });
@@ -56,13 +56,24 @@ function genWeDaAPPDTS() {
          * 获取所有的 DTS
          */
         const wedaFrameworkDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-framework.d.ts'), 'utf8'); // 低码框架
-        const wedaAPIDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-api.d.ts'), 'utf8'); // 低码 API
-        const wedaAuthDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-auth.d.ts'), 'utf8'); // Auth 信息
+        const wedaAppDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-app.d.ts'), 'utf-8'); // app对象
+        const wedaPageDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-page.d.ts'), 'utf-8'); // page对象
+        const wedaAuthDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-auth.d.ts'), 'utf8'); // auth对象
+        const wedaCloudDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-cloud.d.ts'), 'utf-8'); // cloud对象
+        const wedaUtilsDTS = yield fs_extra_1.default.readFile(path_1.default.resolve(__dirname, 'framework', 'weda-utils.d.ts'), 'utf-8'); // page对象
         const formulaDTS = yield buildFormulaDTS(); // 函数公式
         /**
          * 聚合 DTS
          */
-        const wedaDTS = groupDTSs({ wedaFrameworkDTS, wedaAPIDTS, wedaAuthDTS, formulaDTS });
+        const wedaDTS = groupDTSs({
+            wedaFrameworkDTS,
+            wedaAppDTS,
+            wedaPageDTS,
+            wedaAuthDTS,
+            wedaCloudDTS,
+            wedaUtilsDTS,
+            formulaDTS,
+        });
         /**
          * 将聚合结果保存在 auto-generated.ts
          */
@@ -73,21 +84,22 @@ function genWeDaAPPDTS() {
 /**
  * 聚合所有的 DTS（不包括动态生成的）
  */
-function groupDTSs({ wedaFrameworkDTS = '', wedaAPIDTS = '', wedaAuthDTS = '', formulaDTS = '' }) {
+function groupDTSs({ wedaFrameworkDTS = '', wedaAppDTS = '', wedaPageDTS = '', wedaAuthDTS = '', wedaCloudDTS = '', wedaUtilsDTS = '', formulaDTS = '', }) {
     let resultDts = wedaFrameworkDTS;
-    // 函数公式：$app.utils.xxx
-    resultDts = resultDts.replace("// Formula 函数公式 - Don't touch me", formulaDTS.replace(/export/g, ''));
+    // $app
+    resultDts = resultDts.replaceAll("// $app - Don't touch me", wedaAppDTS);
+    // $page
+    resultDts = resultDts.replaceAll("// $page - Don't touch me", wedaPageDTS);
+    // $w.auth
+    resultDts = resultDts.replaceAll("// $w.auth - Don't touch me", wedaAuthDTS.replace(/declare/g, ''));
+    // $w.cloud
+    resultDts = resultDts.replaceAll("// $w.cloud - Don't touch me", wedaCloudDTS.replace(/declare/g, ''));
+    // $w.utils
+    resultDts = resultDts.replaceAll("// $w.utils - Don't touch me", wedaUtilsDTS.replace(/declare/g, ''));
+    // 函数公式：$w.xxx
+    resultDts = resultDts.replaceAll("// Formula 函数公式 - Don't touch me", formulaDTS.replace(/export/g, ''));
     // 函数公式：全局变量提示
     resultDts = resultDts.replace("// Global Formula 全局函数公式- Don't touch me", formulaDTS.replace(/export/g, 'declare'));
-    // 函数公式：$w.xxx
-    resultDts = resultDts.replace("// $w global APIs - Don't touch me", formulaDTS.replace(/export/g, ''));
-    // 增加 API
-    const appAPIDTS = wedaAPIDTS.replace(/[\s\S]*\/\/ ============ App API Begin ============ \/\/([\s\S]*?)\/\/ ============ App API End ============ \/\/[\s\S]*/, '$1');
-    resultDts = resultDts.replace("// App API - Don't touch me", appAPIDTS);
-    const pageAPIDTS = wedaAPIDTS.replace(/[\s\S]*\/\/ ============ Page API Begin ============ \/\/([\s\S]*?)\/\/ ============ Page API End ============ \/\/[\s\S]*/, '$1');
-    resultDts = resultDts.replace("// Page API - Don't touch me", pageAPIDTS);
-    // 增加 Auth 信息
-    resultDts = resultDts.replace("// Auth 认证 - Don't touch me", wedaAuthDTS);
     return resultDts;
 }
 function main() {
@@ -97,8 +109,11 @@ function main() {
         if (watchArgv === '--watch') {
             console.log('Start watching mode');
             (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-framework.d.ts'), genWeDaAPPDTS);
-            (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-api.d.ts'), genWeDaAPPDTS);
+            (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-app.d.ts'), genWeDaAPPDTS);
+            (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-page.d.ts'), genWeDaAPPDTS);
             (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-auth.d.ts'), genWeDaAPPDTS);
+            (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-cloud.d.ts'), genWeDaAPPDTS);
+            (0, node_watch_1.default)(path_1.default.resolve(__dirname, 'framework', 'weda-utils.d.ts'), genWeDaAPPDTS);
         }
     });
 }

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

@@ -23,6 +23,13 @@ export interface IInputDataRepeaterItem {
     currentIndexAlias: string;
     itemData: IJsonSchemaAny;
 }
+export interface IInputDataRedefineAnyType {
+    module: string;
+    component: string;
+    widgetId: string;
+    widgetPropName: string;
+    widgetPropTypeSchema: IJsonSchemaAny;
+}
 export interface IOptions {
     isCompMode?: boolean;
     needGlobalFormula?: boolean;
@@ -42,7 +49,8 @@ export declare enum IInputDataType {
     compPropEvents = "compPropEvents",
     usedComponents = "usedComponents",
     usedWidgets = "usedWidgets",
-    repeaterScope = "repeaterScope"
+    repeaterScope = "repeaterScope",
+    redefineAnyType = "redefineAnyType"
 }
 export interface IInputData {
     [IInputDataType.globalState]?: IJsonSchemaObject;
@@ -58,6 +66,7 @@ export interface IInputData {
     [IInputDataType.usedComponents]?: IInputDataUsedComponents[];
     [IInputDataType.usedWidgets]?: IInputDataWidgetItem[];
     [IInputDataType.repeaterScope]?: IInputDataRepeaterItem[];
+    [IInputDataType.redefineAnyType]?: IInputDataRedefineAnyType[];
 }
 /**
  * 通过该类可以共享同个dts。
@@ -72,7 +81,7 @@ export declare class WeDaDTS {
     /**
      * 部分更新 - 只更新一种类型
      */
-    static updateDTSPartial(inputData: IJsonSchemaObject | IDTSCodeItem[] | string[] | IInputDataUsedComponents[] | IInputDataWidgetItem[] | IInputDataRepeaterItem[], itemType: IInputDataType, options?: {
+    static updateDTSPartial(inputData: IJsonSchemaObject | IDTSCodeItem[] | string[] | IInputDataUsedComponents[] | IInputDataWidgetItem[] | IInputDataRepeaterItem[] | IInputDataRedefineAnyType[], 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,6 +10,7 @@ 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) {
@@ -26,6 +27,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,7 +42,8 @@ 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",
@@ -55,8 +58,18 @@ const DtsInnerSign = {
     [IInputDataType.compPropEvents]: "Comp Prop Events Inner",
     [IInputDataType.usedComponents]: "Used Components Inner",
     [IInputDataType.usedWidgets]: "used widgets Inner",
-    [IInputDataType.repeaterScope]: "repeater scope 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 重复地解析
@@ -77,7 +90,7 @@ class WeDaDTS {
         return __awaiter(this, void 0, void 0, function* () {
             let dts = '';
             try {
-                dts = yield _generateOneItemDTS(inputData, itemType);
+                [dts, WeDaDTS._dts] = yield _generateOneItemDTS(inputData, itemType, WeDaDTS._dts);
                 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) {
@@ -114,8 +127,8 @@ 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] = yield _generateOneItemDTS(inputData[key], key);
+                    resultDts = resultDts.replace(placeholder, dts + '\n' + placeholder);
                 }
                 catch (e) {
                     console.error(e);
@@ -141,17 +154,99 @@ 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) {
+function _generateOneItemDTS(inputData, itemType, currentWholdDTS) {
     return __awaiter(this, void 0, void 0, function* () {
+        /**
+         * 处理注释信息
+         */
+        function _handleComment(inputData, group) {
+            const _inputData = (0, lodash_1.cloneDeep)(inputData);
+            const schema = JSON.parse(JSON.stringify(_inputData, (key, value) => {
+                if (value === null || value === void 0 ? void 0 : value.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* () {
@@ -205,7 +300,8 @@ function _generateOneItemDTS(inputData, itemType) {
                         // 属性
                         let exportPropertiesDTS = '';
                         if (item.exportProperties) {
-                            exportPropertiesDTS = yield _compile(item.exportProperties);
+                            const handledProperties = _handleComment(item.exportProperties);
+                            exportPropertiesDTS = yield _compile(handledProperties);
                         }
                         // 方法
                         let exportMethodsDTS = '';
@@ -254,7 +350,17 @@ 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 => `const ${id}: ${interfaceName}`).join('\n');
+                        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 '';
                 }).join('\n');
@@ -264,13 +370,60 @@ 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}`;
+                        // 更新
+                        currentWholdDTS = currentWholdDTS.replace(new RegExp(`(const ${item.widgetId}): .*`), `$1: ${widgetInterfaceName}`);
+                        // 增加类
+                        const properties = _handleComment(item.widgetPropTypeSchema, GroupEnum.DATA_FIELD);
+                        const widgetPropTypeDTS = yield _compile(Object.assign(Object.assign({}, item.widgetPropTypeSchema), properties), true);
+                        return `
+        declare class ${widgetInterfaceName} extends ${compInterfaceName} {
+
+        /**
+         ${genWeDaCodeComment({
+                            fieldName: item.widgetPropName,
+                            title: item.widgetPropTypeSchema.title,
+                            description: item.widgetPropTypeSchema.description,
+                            group: undefined,
+                            type: getDisplayReturnType(widgetPropTypeDTS)
+                        }).split('\n').map(item => `* ${item}`).join('\n')}
+          */
+          ${item.widgetPropName}: ${widgetPropTypeDTS}
+        }
+        `;
+                    })));
+                    return results.join('\n');
+                });
+            }
         };
         let dts = '';
         if (!inputData)
@@ -281,26 +434,7 @@ function _generateOneItemDTS(inputData, itemType) {
             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, currentWholdDTS];
     });
 }
 // 仅仅为了与 unittest 共享，外部请不要使用

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/cals",
-  "version": "0.5.12",
+  "version": "0.5.13-alpha.1",
   "description": "Common application specifications",
   "main": "lib/utils/index.js",
   "source": "src/utils/index.ts",