@cloudbase/cals 0.3.33-alpha.1 → 0.3.33-alpha.2

package/lib/parser/cals/utils/code/index.d.ts

@@ -10,12 +10,16 @@ export interface ICodeItem {
 }
 /**
  * CALS 转成 中间状态的代码
+ *
+ * @params version: v0 - 没有 pages 目录； v1 - 有 pages 目录
  */
-export declare function calsToCode(calsJSON: IPlatformApp): ICodeItem[];
+export declare function calsToCode(calsJSON: IPlatformApp, version?: 'v0' | 'v1'): ICodeItem[];
 /**
  * 中间状态的代码 转成 CALS
+ *
+ * @params version: v0 - 没有 pages 目录； v1 - 有 pages 目录
  */
-export declare function codeToCals(codeList: ICodeItem[]): IPlatformApp;
+export declare function codeToCals(codeList: ICodeItem[], version?: 'v0' | 'v1'): IPlatformApp;
 /**
  * 指定目录下的文件转代码
  */

package/lib/parser/cals/utils/code/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/code/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAiC,MAAM,mBAAmB,CAAC;AAMhF,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,EAAE,CA8J9D;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,YAAY,CAmI9D;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAqBjG;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CA6BlF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/code/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAiC,MAAM,mBAAmB,CAAC;AAMhF,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,SAAS,EAAE,CAiL3F;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,YAAY,CA4J3F;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAqBjG;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CA6BlF"}

package/lib/parser/cals/utils/code/index.js

@@ -23,12 +23,49 @@ const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 /**
  * CALS 转成 中间状态的代码
+ *
+ * @params version: v0 - 没有 pages 目录； v1 - 有 pages 目录
  */
-function calsToCode(calsJSON) {
+function calsToCode(calsJSON, version = 'v1') {
     // 边界处理
     if (!calsJSON)
         return [];
+    const versionMap = {
+        v0: {
+            pageDir: '',
+        },
+        v1: {
+            pageDir: 'pages',
+        },
+    };
+    const versionConfig = versionMap[version];
+    if (!versionConfig)
+        throw "version' value must be v0 or v1";
     const codeList = [];
+    /**
+     * 生成 pages
+     */
+    const pagePaths = [];
+    calsJSON.items.forEach((pageItem) => {
+        const pagePath = versionConfig.pageDir ? `${versionConfig.pageDir}/${pageItem.id}` : pageItem.id;
+        /**
+         * 生成 page-config.json
+         */
+        // 来自 IPageComponent
+        // :class, :style, component, dataVariables, directives, id, listeners, module, type 忽略，所以这里不包含
+        const pageConfigFields = ['attributes', 'dataset', 'extra', 'label', 'name'];
+        genConfig(pageItem, pageConfigFields, `${pagePath}/page-config.json`);
+        /**
+         * 生成 page.json
+         */
+        addCodeItem(`${pagePath}/page.json`, JSON.stringify(pageItem.items, null, 2));
+        /**
+         * 生成页面代码
+         */
+        genCode(pageItem.resources, pagePath);
+        // 记录页面目录路径
+        pagePaths.push(pagePath);
+    });
     /**
      * 生成 app-config.json
      */
@@ -62,30 +99,13 @@ function calsToCode(calsJSON) {
             'rootPath',
             'themeVars',
             'originHistoryId',
+            // 额外添加，非标准
+            'pages',
         ],
     };
+    // @ts-ignore
+    calsJSON.extra.pages = pagePaths;
     genConfig(calsJSON, appConfigFields, 'app-config.json', otherConfigFields);
-    /**
-     * 生成 pages
-     */
-    calsJSON.items.forEach((pageItem) => {
-        const pagePath = `pages/${pageItem.id}`;
-        /**
-         * 生成 page-config.json
-         */
-        // 来自 IPageComponent
-        // :class, :style, component, dataVariables, directives, id, listeners, module, type 忽略，所以这里不包含
-        const pageConfigFields = ['attributes', 'dataset', 'extra', 'label', 'name'];
-        genConfig(pageItem, pageConfigFields, `${pagePath}/page-config.json`);
-        /**
-         * 生成 page.json
-         */
-        addCodeItem(`${pagePath}/page.json`, JSON.stringify(pageItem.items, null, 2));
-        /**
-         * 生成页面代码
-         */
-        genCode(pageItem.resources, pagePath);
-    });
     /**
      * 生成全局代码
      */
@@ -159,30 +179,52 @@ function calsToCode(calsJSON) {
 exports.calsToCode = calsToCode;
 /**
  * 中间状态的代码 转成 CALS
+ *
+ * @params version: v0 - 没有 pages 目录； v1 - 有 pages 目录
  */
-function codeToCals(codeList) {
+function codeToCals(codeList, version = 'v1') {
     // 边界处理
     if (!codeList || codeList.length === 0)
         return {};
+    const versionMap = {
+        v0: {
+            pageDir: 'src',
+            pageIdRegExp: /src\/(.*?)\/.*/,
+            pageConfigRegExp: /src\/.*?\/page-config.json$/,
+            pageJSONRegExp: /src\/.*?\/page.json/,
+        },
+        v1: {
+            pageDir: 'src/pages',
+            pageIdRegExp: /src\/pages\/(.*?)\/.*/,
+            pageConfigRegExp: /src\/pages\/.*?\/page-config.json$/,
+            pageJSONRegExp: /src\/pages\/.*?\/page.json/,
+        },
+    };
+    const versionConfig = versionMap[version];
+    if (!versionConfig)
+        throw "version' value must be v0 or v1";
     // @ts-ignore
     const calsJSON = {
         items: [],
         resources: [],
     };
+    const appConfigCodeItem = codeList.find((item) => item.path === 'src/app-config.json');
+    const appConfig = JSON.parse(appConfigCodeItem.code);
+    let pagePaths = appConfig.extra.pages;
     codeList.forEach((codeItem) => {
         if (codeItem.path === 'src/app-config.json') {
             /**
              * app-config.json
              */
-            const config = JSON.parse(codeItem.code);
-            Object.assign(calsJSON, (0, lodash_1.omit)(config, ['_ignoreResources']));
+            const config = appConfig;
+            Object.assign(calsJSON, (0, lodash_1.omit)(config, ['_ignoreResources', 'extra.pages']));
             calsJSON.resources = (0, lodash_1.concat)(calsJSON.resources, config._ignoreResources);
         }
-        else if (codeItem.path.indexOf('src/pages/') === 0) {
+        else if (isPageFile(codeItem.path)) {
             /**
              * page
              */
-            const [, pageId] = codeItem.path.match(/src\/pages\/(.*?)\/.*/);
+            const [, pageId] = codeItem.path.match(versionConfig.pageIdRegExp);
             let pageItem = calsJSON.items.find((item) => item.id === pageId);
             if (!pageItem) {
                 pageItem = {
@@ -192,7 +234,7 @@ function codeToCals(codeList) {
                 };
                 calsJSON.items.push(pageItem);
             }
-            if (/src\/pages\/.*?\/page-config.json/.test(codeItem.path)) {
+            if (versionConfig.pageConfigRegExp.test(codeItem.path)) {
                 /**
                  * page-config.json
                  */
@@ -201,7 +243,7 @@ function codeToCals(codeList) {
                 Object.assign(pageItem, propsConfig);
                 pageItem.resources = (0, lodash_1.concat)(pageItem.resources, config._ignoreResources);
             }
-            else if (/src\/pages\/.*?\/page.json/.test(codeItem.path)) {
+            else if (versionConfig.pageJSONRegExp.test(codeItem.path)) {
                 /**
                  * page.json
                  */
@@ -225,7 +267,7 @@ function codeToCals(codeList) {
     function handleNormalCodes(codeItem, pageId, resources) {
         const relativePath = !pageId
             ? codeItem.path.replace('src/', '')
-            : codeItem.path.replace(`src/pages/${pageId}/`, '');
+            : codeItem.path.replace(`${versionConfig.pageDir}/${pageId}/`, '');
         const _pageId = !pageId ? 'global' : pageId;
         const commonVal = {
             code: codeItem.code,
@@ -262,6 +304,9 @@ function codeToCals(codeList) {
                 break;
         }
     }
+    function isPageFile(filePath) {
+        return pagePaths.map((pagePath) => `src/${pagePath}`).some((pagePath) => filePath.indexOf(pagePath) === 0);
+    }
 }
 exports.codeToCals = codeToCals;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/cals",
-  "version": "0.3.33-alpha.1",
+  "version": "0.3.33-alpha.2",
   "description": "Common application specifications",
   "main": "lib/utils/index.js",
   "typedocMain": "types/index.ts",