@cloudbase/cals 0.5.4-beta.0 → 0.5.5-alpha.0

package/lib/utils/dts/index.js

@@ -48,6 +48,9 @@ var IInputDataType;
     IInputDataType["compHandlerCodes"] = "compHandlerCodes";
     IInputDataType["compPropData"] = "compPropData";
     IInputDataType["compPropEvents"] = "compPropEvents";
+    IInputDataType["usedComponents"] = "usedComponents";
+    IInputDataType["usedWidgets"] = "usedWidgets";
+    IInputDataType["repeaterScope"] = "repeaterScope";
 })(IInputDataType = exports.IInputDataType || (exports.IInputDataType = {}));
 const DtsPlaceholder = {
     [IInputDataType.globalState]: "// Global State 全局变量 - Don't touch me",
@@ -60,18 +63,24 @@ const DtsPlaceholder = {
     [IInputDataType.compHandlerCodes]: "// Comp Handler 组件方法 - Don't touch me",
     [IInputDataType.compPropData]: "// Comp Prop Data 组件属性 - Don't touch me",
     [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"
 };
 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.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"
 };
 /**
  * 通过该类可以共享同个dts。
@@ -83,7 +92,7 @@ class WeDaDTS {
      */
     static updateDTS(inputData = {}, options = { isCompMode: false }) {
         return __awaiter(this, void 0, void 0, function* () {
-            WeDaDTS._dts = yield generateWeDaAppDTS(inputData, Object.assign(Object.assign({}, options), { needGlobalFormula: true, needGlobalFor: true }));
+            WeDaDTS._dts = yield generateWeDaAppDTS(inputData, Object.assign(Object.assign({}, options), { needGlobalFormula: true, needGlobalFor: true, needRepeaterScope: true }));
         });
     }
     /**
@@ -103,7 +112,7 @@ class WeDaDTS {
             }
         });
     }
-    static getDTS(options = { needGlobalFormula: false, needGlobalFor: 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, '');
@@ -111,6 +120,9 @@ class WeDaDTS {
         if (!options.needGlobalFor) {
             resultDts = resultDts.replace(/^\/\/ Global For Begin[\s\S]*^\/\/ Global For End$/m, '');
         }
+        if (!options.needRepeaterScope) {
+            resultDts = resultDts.replace(/\/\/ repeater scope Inner Begin[\s\S]*\/\/ repeater scope Inner End$/m, '');
+        }
         return resultDts;
     }
 }
@@ -119,7 +131,7 @@ WeDaDTS._dts = '';
 /**
  * 生成 WeDa 应用的低码代码提示的 dts 类型声明内容
  */
-function generateWeDaAppDTS(inputData = {}, options = { isCompMode: false, needGlobalFormula: false, needGlobalFor: false }) {
+function generateWeDaAppDTS(inputData = {}, options = { isCompMode: false, needGlobalFormula: false, needGlobalFor: false, needRepeaterScope: false }) {
     return __awaiter(this, void 0, void 0, function* () {
         let resultDts = auto_generated_1.wedaDTS;
         yield Promise.all(Object.keys(inputData).map((key) => __awaiter(this, void 0, void 0, function* () {
@@ -150,6 +162,10 @@ function generateWeDaAppDTS(inputData = {}, options = { isCompMode: false, needG
         if (!(options === null || options === void 0 ? void 0 : options.needGlobalFor)) {
             resultDts = resultDts.replace(/^\/\/ Global For Begin[\s\S]*^\/\/ Global For End$/m, '');
         }
+        // 根据是否需要 Repeater 作用域来删除一些类型定义
+        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;
     });
@@ -204,18 +220,86 @@ 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* () {
+                    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);
+                        }
+                        // 方法
+                        let exportMethodsDTS = '';
+                        if (item.exportMethods) {
+                            const results = yield Promise.all(item.exportMethods.map((item) => __awaiter(this, void 0, void 0, function* () {
+                                let inputDTS = '';
+                                if (item.input) {
+                                    inputDTS = yield _compile(item.input);
+                                }
+                                let outputDTS = 'void';
+                                if (item.output) {
+                                    outputDTS = yield _compile(item.output, true);
+                                }
+                                return `${item.name}: (${inputDTS.trim().replace(/\n/g, ',')}) => ${outputDTS}`;
+                            })));
+                            exportMethodsDTS = results.join('\n');
+                        }
+                        return `
+        declare class ${item.module + item.component} extends UserWidget {
+          get custom(): {
+            ${exportPropertiesDTS}
+
+            ${exportMethodsDTS}
+          };
+
+          ${exportPropertiesDTS}
+
+          ${exportMethodsDTS}
+        }
+        `;
+                    })));
+                    return results.join('\n');
+                });
+            },
+            [IInputDataType.usedWidgets]: function (inputData) {
+                return inputData.map(item => {
+                    if (item.idList && item.idList.length > 0) {
+                        const interfaceName = item.module + item.component;
+                        return item.idList.map(id => `const ${id}: ${interfaceName}`).join('\n');
+                    }
+                    return '';
+                }).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);
+                        return `
+        const ${item.currentItemAlias}: ${itemDataDTS}
+        const ${item.currentIndexAlias}: number
+        `;
+                    })));
+                    return results.join('\n');
+                });
             },
         };
-        function _compile(jsonschema) {
+        function _compile(jsonschema, isObjNeedWrapper = false) {
             return __awaiter(this, void 0, void 0, function* () {
                 let dts = yield compile(jsonschema, 'IWeDa', { additionalProperties: false, bannerComment: '', format: false });
-                dts = dts.replace(/^export interface.*$/m, '');
-                dts = dts.substring(0, dts.length - 2);
+                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;
             });
         }
@@ -234,17 +318,60 @@ function _generateOneItemDTS(inputData, itemType) {
 // 仅仅为了与 unittest 共享，外部请不要使用
 exports.workerCode = `
 importScripts('https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_url/devtools/typescriptServices.min.js');
+importScripts('https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_url/devtools/ts-lib.min.js');
+
+const files = {
+  "foo.ts": '',
+  "lib.d.ts": libFileMap['lib.es5.d.ts']
+};
+
+function createLanguageService() {
+  return ts.createLanguageService({
+      getCompilationSettings() {
+          return {};
+      },
+      getScriptFileNames() {
+          return ["foo.ts", "lib.d.ts"];
+      },
+      getScriptVersion(_fileName) {
+          // 这样可避免使用缓存
+          if (_fileName === 'foo.ts')
+              return 'v_' + Math.random();
+          return ''
+      },
+      getScriptSnapshot(fileName) {
+          if (fileName === ".ts") {
+              return ts.ScriptSnapshot.fromString("");
+          }
+          return ts.ScriptSnapshot.fromString(files[fileName] || "");
+      },
+      getCurrentDirectory: () => ".",
+      getDefaultLibFileName(options) {
+          return 'lib.d.ts'
+      },
+      fileExists: name => !!files[name],
+      readFile: name => {
+          return files[name]
+      }
+  });
+}
+const languageService = createLanguageService();
+
+function transpile(code) {
+  files["foo.ts"] = code
+  const result = languageService.getEmitOutput(
+      "foo.ts",
+      /*emitOnlyDtsFiles*/ true,
+      /*forceDtsEmit*/ true
+  )
+  return result.outputFiles[0].text.trim()
+}
 
-ts.transpileOptionValueCompilerOptions.forEach(item => {
-    if (['emitDeclarationOnly', 'declaration'].includes(item.name)) {
-        item.transpileOptionValue = true
-    }
-})
 addEventListener('message', (message) => {
     const {action, data: {id, code}} = message.data
     switch(action) {
         case 'dts':
-            const dts = ts.transpile(code, {})
+            const dts = transpile(code)
             postMessage({action: 'dts_back', data: {id, dts}})
             break
         default:
@@ -262,13 +389,15 @@ function TypescriptWorker() {
             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);
                 }
             };
         }
         function sendMessage(msgData, callbackFn) {
-            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);
@@ -277,22 +406,22 @@ function TypescriptWorker() {
     };
 }
 /**
- * 使用：
- * 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();
 /**
  * 通过 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/index.d.ts

@@ -1,5 +1,6 @@
 export * from '../parser';
 export * from '../types/index';
 export * from './constant';
+export * from './dts/index';
 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;AAE3B,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,gBAAgB,EAAE,MAAM,eAAe,CAAC"}

package/lib/utils/index.js

@@ -18,6 +18,6 @@ exports.isUnitlessNumber = void 0;
 __exportStar(require("../parser"), exports);
 __exportStar(require("../types/index"), exports);
 __exportStar(require("./constant"), exports);
-// export * from './dts/index';
+__exportStar(require("./dts/index"), exports);
 var CSSProperty_1 = require("./CSSProperty");
 Object.defineProperty(exports, "isUnitlessNumber", { enumerable: true, get: function () { return CSSProperty_1.isUnitlessNumber; } });

package/package.json

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

package/lib/parser/plugins/postcss-rpx2clac.d.ts

@@ -1,18 +0,0 @@
-declare function Plugin(opt?: {
-    root?: string;
-    zoom?: number;
-    precision?: number;
-    outUnit?: string;
-    exclude?: string;
-}): {
-    postcssPlugin: string;
-    Once(root: any, { result }: {
-        result: any;
-    }): void;
-};
-declare namespace Plugin {
-    var postcss: boolean;
-    var CALC_RPX_ROOT_VAL_NAME: string;
-}
-export default Plugin;
-//# sourceMappingURL=postcss-rpx2clac.d.ts.map

package/lib/parser/plugins/postcss-rpx2clac.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"postcss-rpx2clac.d.ts","sourceRoot":"","sources":["../../../src/parser/plugins/postcss-rpx2clac.ts"],"names":[],"mappings":"AA+BA,iBAAS,MAAM,CAAC,GAAG,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;EAqC7G;kBArCQ,MAAM;;;;AA0Cf,eAAe,MAAM,CAAC"}

package/lib/parser/plugins/postcss-rpx2clac.js

@@ -1,68 +0,0 @@
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const DEFAULT_CONFIG = {
-    root: '2',
-    /**
-     * 缩放比例
-     */
-    zoom: 1,
-    /**
-     * 配置精度
-     */
-    precision: 5,
-    /**
-     * 输出单位
-     */
-    outUnit: 'px',
-    /**
-     * 配置忽略文件，正则匹配
-     */
-    exclude: '',
-};
-/**
- * https://github.com/cuth/postcss-pxtorem/blob/122649015322214f8e9d1ac852eb11c0791b634b/index.js#L56
- */
-function toFixed(number, precision) {
-    const multiplier = Math.pow(10, precision + 1), wholeNumber = Math.floor(number * multiplier);
-    return (Math.round(wholeNumber / 10) * 10) / multiplier;
-}
-function Plugin(opt) {
-    opt = Object.assign(Object.assign({}, DEFAULT_CONFIG), (opt || {}));
-    const { root: rootValue, zoom, precision, outUnit, exclude } = opt;
-    return {
-        postcssPlugin: 'postcss-rpx2calc',
-        Once(root, { result }) {
-            if (exclude && root.source.input.file.match(exclude) !== null) {
-                result.root = root;
-                return;
-            }
-            root.walkRules(function (rule) {
-                rule.walkDecls(function (decl) {
-                    if (decl.value.includes('rpx')) {
-                        /**
-                         * copy form
-                         * https://github.com/cuth/postcss-pxtorem/blob/122649015322214f8e9d1ac852eb11c0791b634b/lib/pixel-unit-regex.js#L9
-                         * 不处理 var()rpx 的情况
-                         */
-                        const r2 = /"[^"]+"|'[^']+'|url\([^)]+\)|var\([^)]+\)|(\d*\.?\d+)rpx/g;
-                        decl.value = decl.value.replace(r2, (str, num1) => {
-                            if (num1 == undefined)
-                                return str;
-                            if (num1 == '0')
-                                return '0';
-                            const v = +num1 / zoom;
-                            if (isNaN(v)) {
-                                return str;
-                            }
-                            const value = Number.isInteger(v) ? v.toString() : toFixed(v, precision);
-                            return `calc(${value}${outUnit}/${rootValue})`;
-                        });
-                    }
-                });
-            });
-        },
-    };
-}
-Plugin.postcss = true;
-Plugin.CALC_RPX_ROOT_VAL_NAME = '--wd-rpx-radio';
-exports.default = Plugin;