@cloudbase/cals 0.5.11-beta3 → 0.5.12-alpha.0

package/lib/utils/dts/index.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -32,19 +9,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transpileToDTS = exports.workerCode = exports.generateWeDaAppDTS = exports.WeDaDTS = exports.IInputDataType = void 0;
-const jstt = __importStar(require("json-schema-to-typescript-for-browser/dist/bundle.js"));
+exports.compileJSONToDTS = exports.jsonToDTSWorkerCode = exports.transpileToDTS = exports.workerCode = exports.generateWeDaAppDTS = exports.WeDaDTS = exports.IInputDataType = void 0;
 const auto_generated_1 = require("./auto-generated");
-const compile = jstt.compile;
 var IInputDataType;
 (function (IInputDataType) {
     IInputDataType["globalState"] = "globalState";
+    IInputDataType["wGlobalState"] = "wGlobalState";
     IInputDataType["pageState"] = "pageState";
+    IInputDataType["wPageState"] = "wPageState";
     IInputDataType["compState"] = "compState";
     IInputDataType["pageParams"] = "pageParams";
+    IInputDataType["wPageParams"] = "wPageParams";
     IInputDataType["forState"] = "forState";
     IInputDataType["globalCommonCodes"] = "globalCommonCodes";
+    IInputDataType["wGlobalCommonCodes"] = "wGlobalCommonCodes";
     IInputDataType["pageHandlerCodes"] = "pageHandlerCodes";
+    IInputDataType["wPageHandlerCodes"] = "wPageHandlerCodes";
     IInputDataType["compHandlerCodes"] = "compHandlerCodes";
     IInputDataType["compPropData"] = "compPropData";
     IInputDataType["compPropEvents"] = "compPropEvents";
@@ -69,12 +49,17 @@ const DtsPlaceholder = {
 };
 const DtsInnerSign = {
     [IInputDataType.globalState]: "Global State Inner",
+    [IInputDataType.wGlobalState]: "wGlobal State Inner",
     [IInputDataType.pageState]: "Page State Inner",
+    [IInputDataType.wPageState]: "wPage State Inner",
     [IInputDataType.compState]: "Comp State Inner",
     [IInputDataType.pageParams]: "Page Param Inner",
+    [IInputDataType.wPageParams]: "wPage Param Inner",
     [IInputDataType.forState]: "Global For Inner",
     [IInputDataType.globalCommonCodes]: "Global Common Inner",
+    [IInputDataType.wGlobalCommonCodes]: "wGlobal Common Inner",
     [IInputDataType.pageHandlerCodes]: "Page Handler Inner",
+    [IInputDataType.wPageHandlerCodes]: "wPage Handler Inner",
     [IInputDataType.compHandlerCodes]: "Comp Handler Inner",
     [IInputDataType.compPropData]: "Comp Prop Data Inner",
     [IInputDataType.compPropEvents]: "Comp Prop Events Inner",
@@ -101,13 +86,30 @@ class WeDaDTS {
     static updateDTSPartial(inputData, itemType, options = { setEmptyIfError: false }) {
         return __awaiter(this, void 0, void 0, function* () {
             let dts = '';
+            // 必须区分$w下的和$page、$app下的，否则replace Inner Begin和Inner End的时候会有问题
+            const DTSMap = {
+                [DtsInnerSign[IInputDataType.globalState]]: DtsInnerSign[IInputDataType.wGlobalState],
+                [DtsInnerSign[IInputDataType.pageState]]: DtsInnerSign[IInputDataType.wPageState],
+                [DtsInnerSign[IInputDataType.pageParams]]: DtsInnerSign[IInputDataType.wPageParams],
+                [DtsInnerSign[IInputDataType.globalCommonCodes]]: DtsInnerSign[IInputDataType.wGlobalCommonCodes],
+                [DtsInnerSign[IInputDataType.pageHandlerCodes]]: DtsInnerSign[IInputDataType.wPageHandlerCodes],
+            };
+            const reg = new RegExp(`^(\\s*\\/\\/ ${DtsInnerSign[itemType]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DtsInnerSign[itemType]} End)`, 'm');
             try {
                 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`);
+                WeDaDTS._dts = WeDaDTS._dts.replace(reg, `$1\n${dts}\n$2`);
+                if (DTSMap[DtsInnerSign[itemType]]) {
+                    const reg = new RegExp(`^(\\s*\\/\\/ ${DTSMap[DtsInnerSign[itemType]]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DTSMap[DtsInnerSign[itemType]]} End)`, 'm');
+                    WeDaDTS._dts = WeDaDTS._dts.replace(reg, `$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(reg, `$1\n${dts}\n$2`);
+                    if (DTSMap[DtsInnerSign[itemType]]) {
+                        const reg = new RegExp(`^(\\s*\\/\\/ ${DTSMap[DtsInnerSign[itemType]]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DTSMap[DtsInnerSign[itemType]]} End)`, 'm');
+                        WeDaDTS._dts = WeDaDTS._dts.replace(reg, `$1\n${dts}\n$2`);
+                    }
                 }
             }
         });
@@ -140,7 +142,7 @@ function generateWeDaAppDTS(inputData = {}, options = { isCompMode: false, needG
                 // 防止某项错误导致全部都错误
                 try {
                     const dts = yield _generateOneItemDTS(inputData[key], key);
-                    resultDts = resultDts.replace(placeholder, dts + placeholder);
+                    resultDts = resultDts.replaceAll(placeholder, dts + placeholder);
                 }
                 catch (e) {
                     console.error(e);
@@ -312,7 +314,7 @@ function _generateOneItemDTS(inputData, itemType) {
         }
         function _compile(jsonschema, isObjNeedWrapper = false) {
             return __awaiter(this, void 0, void 0, function* () {
-                let dts = yield compile(jsonschema, 'IWeDa', { additionalProperties: false, bannerComment: '', format: false });
+                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);
@@ -392,13 +394,16 @@ addEventListener('message', (message) => {
     }
 })
 `;
-function TypescriptWorker() {
-    let typescriptWorker = null;
-    let sendMessageCallbackFn = {};
+function TypescriptWorker(workerId, workerCode) {
+    let typescriptWorkerMap = {};
     return function getInstance() {
+        var _a;
+        let typescriptWorker = (_a = typescriptWorkerMap[workerId]) === null || _a === void 0 ? void 0 : _a.typescriptWorker;
         if (!typescriptWorker) {
-            const workerURL = URL.createObjectURL(new Blob([exports.workerCode]));
-            typescriptWorker = new Worker(workerURL);
+            const sendMessageCallbackFn = {};
+            const workerURL = URL.createObjectURL(new Blob([workerCode]));
+            // 在 node 环境 unittest 时增加 name 参数用于辨别是哪个 worker
+            typescriptWorker = new Worker(workerURL + (workerURL.search('blob:http://localhost') === 0 ? '?name=' + workerId : ''));
             typescriptWorker.onmessage = function (event) {
                 const { action } = event.data;
                 if (action === 'dts_back') {
@@ -406,8 +411,13 @@ function TypescriptWorker() {
                     sendMessageCallbackFn[id] && sendMessageCallbackFn[id](dts);
                 }
             };
+            typescriptWorkerMap[workerId] = {
+                typescriptWorker,
+                sendMessageCallbackFn
+            };
         }
         function sendMessage(msgData, callbackFn) {
+            const { typescriptWorker, sendMessageCallbackFn } = typescriptWorkerMap[workerId];
             const id = Math.random()
                 .toString(36)
                 .substring(2, 5);
@@ -429,7 +439,7 @@ function TypescriptWorker() {
 *
 * })
 */
-const getTypescriptWorker = TypescriptWorker();
+const getTypescriptWorker = TypescriptWorker('transpileToDTS', exports.workerCode);
 /**
  * 通过 js/ts 代码生成 dts
  */
@@ -442,3 +452,39 @@ function transpileToDTS(code) {
     });
 }
 exports.transpileToDTS = transpileToDTS;
+exports.jsonToDTSWorkerCode = `
+importScripts('https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_url/devtools/json-schema-to-typescript-for-browser.min.js');
+
+function transpile(jsonschema) {
+  return jstt.compile(jsonschema, 'IWeDa', { additionalProperties: false, bannerComment: '', format: false })
+}
+
+addEventListener('message', (message) => {
+    const {action, data: {id, jsonschema}} = message.data
+    switch(action) {
+        case 'dts':
+            transpile(jsonschema).then(dts => {
+              postMessage({action: 'dts_back', data: {id, dts}})
+            }).catch(err => postMessage({action: 'dts_back', data: {id, dts: 'Parse error:' + err.message}}))
+            break
+        default:
+            break
+    }
+})
+`;
+const getCompileJSONToDTSWorker = TypescriptWorker('compileJSONToDTS', exports.jsonToDTSWorkerCode);
+/**
+ * Webworker 版本的 JSON to DTS
+ */
+function compileJSONToDTS(jsonschema) {
+    return new Promise((resolve, reject) => {
+        const worker = getCompileJSONToDTSWorker();
+        worker.sendMessage({ action: 'dts', data: { jsonschema } }, (dts) => {
+            if (dts.search('Parse error:') === 0)
+                reject(dts);
+            else
+                resolve(dts);
+        });
+    });
+}
+exports.compileJSONToDTS = compileJSONToDTS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/cals",
-  "version": "0.5.11-beta3",
+  "version": "0.5.12-alpha.0",
   "description": "Common application specifications",
   "main": "lib/utils/index.js",
   "source": "src/utils/index.ts",
@@ -53,4 +53,4 @@
     "typescript": "^4.7.4",
     "typescript-json-schema": "^0.53.0"
   }
-}
+}