@cloudbase/cals 1.0.72-alpha.1 → 1.0.72-alpha.3

package/lib/parser/cals/utils/block/helpers/merge-dataset.d.ts

@@ -0,0 +1,6 @@
+import { type IPlatformDataset } from '../../../../../types';
+/**
+ * 合并 dataset (如遇同名，保留前者)
+ */
+export declare function mergeDataset(first?: IPlatformDataset, second?: IPlatformDataset): IPlatformDataset;
+//# sourceMappingURL=merge-dataset.d.ts.map

package/lib/parser/cals/utils/block/helpers/merge-dataset.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-dataset.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/cals/utils/block/helpers/merge-dataset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D;;GAEG;AACH,wBAAgB,YAAY,CAAC,KAAK,GAAE,gBAAqB,EAAE,MAAM,GAAE,gBAAqB,oBAYvF"}

package/lib/parser/cals/utils/block/helpers/merge-dataset.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeDataset = void 0;
+/**
+ * 合并 dataset (如遇同名，保留前者)
+ */
+function mergeDataset(first = {}, second = {}) {
+    const dataset = {};
+    for (const key of ['state', 'params', 'query']) {
+        const value = Object.assign(Object.assign({}, second[key]), first[key]);
+        if (Object.keys(value).length) {
+            dataset[key] = value;
+        }
+    }
+    return Object.keys(dataset).length ? dataset : undefined;
+}
+exports.mergeDataset = mergeDataset;

package/lib/parser/cals/utils/block/helpers/merge-listeners.d.ts

@@ -0,0 +1,6 @@
+import { type IPlatformListener } from '../../../../../types';
+/**
+ * 合并监听器 (如遇同名，保留前者)
+ */
+export declare function mergeListeners(first?: IPlatformListener[], second?: IPlatformListener[]): IPlatformListener[];
+//# sourceMappingURL=merge-listeners.d.ts.map

package/lib/parser/cals/utils/block/helpers/merge-listeners.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-listeners.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/cals/utils/block/helpers/merge-listeners.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,GAAE,iBAAiB,EAAO,EAAE,MAAM,GAAE,iBAAiB,EAAO,uBAQ/F"}

package/lib/parser/cals/utils/block/helpers/merge-listeners.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeListeners = void 0;
+/**
+ * 合并监听器 (如遇同名，保留前者)
+ */
+function mergeListeners(first = [], second = []) {
+    const listenerMap = new Map();
+    for (const listener of [...second, ...first]) {
+        listenerMap.set(listener.id, listener);
+    }
+    return listenerMap.size > 0 ? [...listenerMap.values()] : undefined;
+}
+exports.mergeListeners = mergeListeners;

package/lib/parser/cals/utils/block/helpers/merge-resources.d.ts

@@ -0,0 +1,6 @@
+import { type ICodeResource } from '../../../../../types';
+/**
+ * 合并代码资源 (如遇同名，保留前者)
+ */
+export declare function mergeResources(first?: ICodeResource[], second?: ICodeResource[]): ICodeResource[];
+//# sourceMappingURL=merge-resources.d.ts.map

package/lib/parser/cals/utils/block/helpers/merge-resources.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-resources.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/cals/utils/block/helpers/merge-resources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErE;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,GAAE,aAAa,EAAO,EAAE,MAAM,GAAE,aAAa,EAAO,mBAwBvF"}

package/lib/parser/cals/utils/block/helpers/merge-resources.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeResources = void 0;
+const types_1 = require("../../../../../types");
+/**
+ * 合并代码资源 (如遇同名，保留前者)
+ */
+function mergeResources(first = [], second = []) {
+    const resourceMap = new Map();
+    for (const resource of first) {
+        const { codeType, name } = resource;
+        const key = `${codeType}/${name}`;
+        resourceMap.set(key, resource);
+    }
+    for (const resource of second) {
+        const { codeType, name } = resource;
+        const key = `${codeType}/${name}`;
+        if (!resourceMap.has(key)) {
+            resourceMap.set(key, resource);
+        }
+        else if (codeType === types_1.ECodeType.STYLE) {
+            // 合并样式内容
+            const existResource = resourceMap.get(key);
+            existResource.code = [existResource.code, resource.code].join('\n');
+        }
+    }
+    return resourceMap.size > 0 ? [...resourceMap.values()] : undefined;
+}
+exports.mergeResources = mergeResources;

package/lib/parser/cals/utils/block/helpers/remap-component-ids.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remap-component-ids.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/cals/utils/block/helpers/remap-component-ids.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAK1D,aAAK,kBAAkB,GAAG,MAAM,CAAC;AACjC,aAAK,WAAW,GAAG,MAAM,CAAC;AAE1B,MAAM,WAAW,eAAe;IAC9B,sCAAsC;IACtC,QAAQ,EAAE,UAAU,CAAC;IAErB,wCAAwC;IACxC,QAAQ,EAAE,UAAU,CAAC;CACtB;AAED,qBAAa,UAAU;;;IAMrB,GAAG,CAAC,GAAG,IAAI,OAAA;IAIX,GAAG,CAAC,SAAS,EAAE,kBAAkB;IAGjC,GAAG,CAAC,SAAS,EAAE,kBAAkB,EAAE,EAAE,EAAE,WAAW;IAOlD,IAAI,IAAI,WAEP;CACF;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,kBAAkB,EAAE,EAAE,cAAc,EAAE,eAAe;;EAmClG;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE;IAAE,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EAAE,SAAS,EAAE,kBAAkB,OAoD9G"}
+{"version":3,"file":"remap-component-ids.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/cals/utils/block/helpers/remap-component-ids.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAK1D,aAAK,kBAAkB,GAAG,MAAM,CAAC;AACjC,aAAK,WAAW,GAAG,MAAM,CAAC;AAE1B,MAAM,WAAW,eAAe;IAC9B,sCAAsC;IACtC,QAAQ,EAAE,UAAU,CAAC;IAErB,wCAAwC;IACxC,QAAQ,EAAE,UAAU,CAAC;CACtB;AAED,qBAAa,UAAU;;;IAMrB,GAAG,CAAC,GAAG,IAAI,OAAA;IAIX,GAAG,CAAC,SAAS,EAAE,kBAAkB;IAGjC,GAAG,CAAC,SAAS,EAAE,kBAAkB,EAAE,EAAE,EAAE,WAAW;IAOlD,IAAI,IAAI,WAEP;CACF;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,kBAAkB,EAAE,EAAE,cAAc,EAAE,eAAe;;EAkClG;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE;IAAE,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EAAE,SAAS,EAAE,kBAAkB,OAoD9G"}

package/lib/parser/cals/utils/block/helpers/remap-component-ids.js

@@ -56,7 +56,6 @@ function remapComponentIds(components, visitedContext) {
             return item;
         }
         const namespace = (0, get_component_namespace_1.getComponentNamespace)(item.component);
-        console.log('>>>>>untilNow', item.id);
         if (untilNow.has(item.id)) {
             let nextCodeId = `${namespace}1`;
             let seq = 0;

package/lib/parser/cals/utils/block/helpers/renew-id-in-code.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renew-id-in-code.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/cals/utils/block/helpers/renew-id-in-code.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,UAS9E"}
+{"version":3,"file":"renew-id-in-code.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/cals/utils/block/helpers/renew-id-in-code.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,UAE9E"}

package/lib/parser/cals/utils/block/helpers/renew-id-in-code.js

@@ -1,19 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renewIdInCode = void 0;
-const resolve_new_id_1 = require("./resolve-new-id");
+const renew_id_in_expr_1 = require("./renew-id-in-expr");
 /**
  * 按需将代码中引用的组件旧 ID 更新为新 ID
  * @param expr　表达式
  * @param componentIdMap 映射: 组件原始 ID => 新生成 ID
  */
 function renewIdInCode(code, componentIdMap) {
-    return code.replace(/(\$w\.)(\w+)/g, (match, p1, p2) => {
-        const newId = (0, resolve_new_id_1.resolveNewId)(p2, componentIdMap);
-        if (newId) {
-            return `${p1}${newId}`;
-        }
-        return match;
-    });
+    return (0, renew_id_in_expr_1.renewIdWithRegexp)(code, componentIdMap);
 }
 exports.renewIdInCode = renewIdInCode;

package/lib/parser/cals/utils/block/helpers/renew-id-in-expr.d.ts

@@ -3,5 +3,6 @@
  * @param expr　表达式
  * @param componentIdMap 映射: 组件原始 ID => 新生成 ID
  */
-export declare function renewIdInExpr(expr: string, componentIdMap: Map<string, string>): any;
+export declare function renewIdInExpr(expr: string, componentIdMap: Map<string, string>): string;
+export declare function renewIdWithRegexp(str: string, componentIdMap: Map<string, string>): string;
 //# sourceMappingURL=renew-id-in-expr.d.ts.map

package/lib/parser/cals/utils/block/helpers/renew-id-in-expr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renew-id-in-expr.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/cals/utils/block/helpers/renew-id-in-expr.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAwC9E"}
+{"version":3,"file":"renew-id-in-expr.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/cals/utils/block/helpers/renew-id-in-expr.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,UA0C9E;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,UAejF"}

package/lib/parser/cals/utils/block/helpers/renew-id-in-expr.js

@@ -1,30 +1,7 @@
 "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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renewIdInExpr = void 0;
-const Babel = __importStar(require("@babel/standalone"));
+exports.renewIdWithRegexp = exports.renewIdInExpr = void 0;
+// import * as Babel from '@babel/standalone';
 const resolve_new_id_1 = require("./resolve-new-id");
 /**
  * 按需将表达式中引用的组件旧 ID 更新为新 ID
@@ -35,35 +12,52 @@ function renewIdInExpr(expr, componentIdMap) {
     if (typeof expr !== 'string' || expr.length === 0 || !expr.includes('$w')) {
         return expr;
     }
-    const output = Babel.transform(expr, {
-        plugins: [
-            ({ types: t }) => {
-                return {
-                    visitor: {
-                        MemberExpression({ node }) {
-                            const { object, property } = node;
-                            if (object.name === '$w') {
-                                const newId = (0, resolve_new_id_1.resolveNewId)(property.name || '', componentIdMap);
-                                if (newId) {
-                                    node.property = t.identifier(newId);
-                                }
-                            }
-                        },
-                    },
-                };
-            },
-        ],
-    });
-    let code = output.code.replace(/;\s$/, '');
-    // code wrapped in `()`
-    // TODO: 是否有必要？
-    {
-        const match = code.match(/^\((.*?)\)$/);
-        if (match === null || match === void 0 ? void 0 : match[1]) {
-            // eslint-disable-next-line prefer-destructuring
-            code = match[1];
-        }
-    }
-    return code;
+    return renewIdWithRegexp(expr, componentIdMap);
+    // const output = Babel.transform(expr, {
+    //   plugins: [
+    //     ({ types: t }) => {
+    //       return {
+    //         visitor: {
+    //           MemberExpression({ node }) {
+    //             const { object, property } = node;
+    //             if (object.name === '$w') {
+    //               const newId = resolveNewId(property.name || '', componentIdMap);
+    //               if (newId) {
+    //                 node.property = t.identifier(newId);
+    //               }
+    //             }
+    //           },
+    //         },
+    //       };
+    //     },
+    //   ],
+    // });
+    // let code = output.code.replace(/;\s$/, '');
+    // // code wrapped in `()`
+    // // TODO: 是否有必要？
+    // {
+    //   const match = code.match(/^\((.*?)\)$/);
+    //   if (match?.[1]) {
+    //     // eslint-disable-next-line prefer-destructuring
+    //     code = match[1];
+    //   }
+    // }
+    // return code;
 }
 exports.renewIdInExpr = renewIdInExpr;
+function renewIdWithRegexp(str, componentIdMap) {
+    return str.replace(/(\$w\.)(\w+)/g, (match, p1, p2, offset) => {
+        const before = str[offset - 1];
+        const newId = (0, resolve_new_id_1.resolveNewId)(p2, componentIdMap);
+        /**
+         * 前向匹配
+         * 前一个字符存在，且前一个字符费变量安全字 a-z、A-Z、0-9、_、$起始
+         * 且前一字符非 . 表示成员访问
+         */
+        if (newId && !(before && /[a-zA-Z0-9_$.]/.test(before))) {
+            return `${p1}${newId}`;
+        }
+        return match;
+    });
+}
+exports.renewIdWithRegexp = renewIdWithRegexp;

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

@@ -1,4 +1,4 @@
-import { IPlatformComponent } from '../../../../types';
+import { IPlatformApp, IPlatformComponent } from '../../../../types';
 import { IVisitedContext } from './helpers/remap-component-ids';
 export { renewIdInResource } from './helpers/renew-id-in-resource';
 export { remapComponentIds, refreshComponentIds } from './helpers/remap-component-ids';
@@ -17,5 +17,13 @@ interface IParseContext {
 export declare function parseComponentCals(ctx: IParseContext, cals: IPlatformComponent): IParseContext;
 export declare function regenBlockTemplateComponents(ctx: {
     visiting: IVisitedContext;
+    componentIdMap?: Map<string, string>;
 }, components: IPlatformComponent[]): IPlatformComponent[];
+interface IMergeCalsMeta {
+    cals: IPlatformApp;
+    targetOptions?: {
+        mode: 'before' | 'after' | 'head' | 'tail';
+    };
+}
+export declare function mergeCals(list: IMergeCalsMeta[]): IPlatformApp;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/block/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAqB,MAAM,mBAAmB,CAAC;AAI1E,OAAO,EAAE,eAAe,EAA0C,MAAM,+BAA+B,CAAC;AAExG,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,UAAU,aAAa;IACrB,SAAS,CAAC,EAAE;QACV,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;IACF,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACtC;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,kBAAkB,GAAG,aAAa,CAyD9F;AA+GD,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE;IAAE,QAAQ,EAAE,eAAe,CAAA;CAAE,EAClC,UAAU,EAAE,kBAAkB,EAAE,GAC/B,kBAAkB,EAAE,CAgBtB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/block/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAqC,MAAM,mBAAmB,CAAC;AAIxG,OAAO,EAAE,eAAe,EAAsD,MAAM,+BAA+B,CAAC;AAQpH,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,UAAU,aAAa;IACrB,SAAS,CAAC,EAAE;QACV,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;IACF,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACtC;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,kBAAkB,GAAG,aAAa,CAyD9F;AA+GD,wBAAgB,4BAA4B,CAC1C,GAAG,EAAE;IAAE,QAAQ,EAAE,eAAe,CAAC;IAAC,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EACxE,UAAU,EAAE,kBAAkB,EAAE,GAC/B,kBAAkB,EAAE,CAmBtB;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,YAAY,CAAC;IACnB,aAAa,CAAC,EAAE;QACd,IAAI,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;KAC5C,CAAC;CACH;AACD,wBAAgB,SAAS,CAAC,IAAI,EAAE,cAAc,EAAE,gBA4E/C"}

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

@@ -3,13 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.regenBlockTemplateComponents = exports.parseComponentCals = exports.VisitedMap = exports.refreshComponentIds = exports.remapComponentIds = exports.renewIdInResource = void 0;
+exports.mergeCals = exports.regenBlockTemplateComponents = exports.parseComponentCals = exports.VisitedMap = exports.refreshComponentIds = exports.remapComponentIds = exports.renewIdInResource = void 0;
 const get_1 = __importDefault(require("lodash/get"));
 const set_1 = __importDefault(require("lodash/set"));
 const expression_1 = require("../../../expression");
 const remap_component_ids_1 = require("./helpers/remap-component-ids");
-var renew_id_in_resource_1 = require("./helpers/renew-id-in-resource");
-Object.defineProperty(exports, "renewIdInResource", { enumerable: true, get: function () { return renew_id_in_resource_1.renewIdInResource; } });
+const common_1 = require("../common");
+const get_component_namespace_1 = require("./helpers/get-component-namespace");
+const renew_id_in_resource_1 = require("./helpers/renew-id-in-resource");
+const merge_resources_1 = require("./helpers/merge-resources");
+const merge_dataset_1 = require("./helpers/merge-dataset");
+const merge_listeners_1 = require("./helpers/merge-listeners");
+var renew_id_in_resource_2 = require("./helpers/renew-id-in-resource");
+Object.defineProperty(exports, "renewIdInResource", { enumerable: true, get: function () { return renew_id_in_resource_2.renewIdInResource; } });
 var remap_component_ids_2 = require("./helpers/remap-component-ids");
 Object.defineProperty(exports, "remapComponentIds", { enumerable: true, get: function () { return remap_component_ids_2.remapComponentIds; } });
 Object.defineProperty(exports, "refreshComponentIds", { enumerable: true, get: function () { return remap_component_ids_2.refreshComponentIds; } });
@@ -158,7 +164,10 @@ function parseValueCals(ctx, value) {
     }
 }
 function regenBlockTemplateComponents(ctx, components) {
-    const { componentIdMap } = (0, remap_component_ids_1.remapComponentIds)(components, ctx.visiting);
+    let { componentIdMap } = ctx;
+    if (!componentIdMap) {
+        componentIdMap = (0, remap_component_ids_1.remapComponentIds)(components, ctx.visiting).componentIdMap;
+    }
     return components.map((component) => {
         const processed = (0, remap_component_ids_1.refreshComponentIds)({ componentIdMap }, component);
         // todo: 需要处理extra.dataForm
@@ -166,3 +175,56 @@ function regenBlockTemplateComponents(ctx, components) {
     });
 }
 exports.regenBlockTemplateComponents = regenBlockTemplateComponents;
+function mergeCals(list) {
+    var _a, _b;
+    const visitedContext = {
+        existing: new remap_component_ids_1.VisitedMap(),
+        untilNow: new remap_component_ids_1.VisitedMap(),
+    };
+    // 不修改原始数据
+    const clonedCalsList = JSON.parse(JSON.stringify(list));
+    // 初始化 `visitedContext.existing` 数据
+    for (const { cals } of clonedCalsList) {
+        if (cals.items.length > 1) {
+            throw new Error('不支持对多页面的 CALS 进行合并');
+        }
+        // 区块只有一个页面
+        const page = cals.items[0];
+        page.items = (0, common_1.walkThroughComponents)(page.items, (item) => {
+            var _a;
+            (_a = item.extra) === null || _a === void 0 ? true : delete _a.xIndex;
+            if (!item.component || typeof item.component !== 'string') {
+                return;
+            }
+            const namespace = (0, get_component_namespace_1.getComponentNamespace)(item.component);
+            visitedContext.existing.get(namespace).add(namespace, item.id);
+            return item;
+        });
+    }
+    /**
+     * 根据　`visitedContext` 收集的信息，按需更新组件 ID
+     * 组件id是页面隔离的，因此限制约定，只处理 0 号页面
+     */
+    for (const { cals } of clonedCalsList) {
+        const page = cals.items[0];
+        const { componentIdMap } = (0, remap_component_ids_1.remapComponentIds)(page.items, visitedContext);
+        page.items = regenBlockTemplateComponents({ visiting: visitedContext, componentIdMap }, page.items);
+        // 应用资源更新 ID
+        cals.resources = (_a = cals.resources) === null || _a === void 0 ? void 0 : _a.map((resource) => (0, renew_id_in_resource_1.renewIdInResource)(resource, componentIdMap));
+        // 页面资源更新 ID
+        page.resources = (_b = page.resources) === null || _b === void 0 ? void 0 : _b.map((resource) => (0, renew_id_in_resource_1.renewIdInResource)(resource, componentIdMap));
+    }
+    const mergedCals = clonedCalsList
+        .map((meta) => meta.cals)
+        .reduce((first, second) => {
+        const firstPage = first.items[0];
+        const secondPage = second.items[0];
+        const mergedPage = Object.assign(Object.assign(Object.assign({}, secondPage), firstPage), { items: [...firstPage.items, ...secondPage.items], resources: (0, merge_resources_1.mergeResources)(firstPage.resources, secondPage.resources) || [], dataset: (0, merge_dataset_1.mergeDataset)(firstPage.dataset, secondPage.dataset) || {}, listeners: (0, merge_listeners_1.mergeListeners)(firstPage.listeners, secondPage.listeners) });
+        if (!mergedPage.listeners) {
+            delete mergedPage.listeners;
+        }
+        return Object.assign(Object.assign(Object.assign({}, second), first), { items: [mergedPage], resources: (0, merge_resources_1.mergeResources)(first.resources, second.resources) || [], dataset: (0, merge_dataset_1.mergeDataset)(first.dataset, second.dataset) || {} });
+    });
+    return mergedCals;
+}
+exports.mergeCals = mergeCals;

package/lib/parser/index.d.ts

@@ -2,7 +2,7 @@ export * from './cals/index';
 export { upgrageToVersion2 } from './cals/utils/version';
 export { processComponentModule } from './cals/utils/spinoff';
 export { calsToCode, codeToCals, type ICodeItem, checkForConflicts, autoResolveConflicts, findAllConflicts, } from './cals/utils/code';
-export { parseComponentCals, regenBlockTemplateComponents, renewIdInResource, VisitedMap } from './cals/utils/block';
+export { parseComponentCals, regenBlockTemplateComponents, renewIdInResource, VisitedMap, remapComponentIds, refreshComponentIds, mergeCals, } from './cals/utils/block';
 export { ActionType, type IDataBind, PropBindType } from './expression/index';
 export { processCommonStyle2CSSProperties, processCSSProperties2Rem, processCSSPropertiesUnit, } from './cals/utils/style';
 export { getUsedResources, getNavUsedStaticResource, _simpleGetUsedResourceOfComponent, } from './cals/utils/getUsedResources';

package/lib/parser/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/parser/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EACL,UAAU,EACV,UAAU,EACV,KAAK,SAAS,EACd,iBAAiB,EACjB,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrH,OAAO,EAAE,UAAU,EAAE,KAAK,SAAS,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EACL,gCAAgC,EAChC,wBAAwB,EACxB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/parser/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EACL,UAAU,EACV,UAAU,EACV,KAAK,SAAS,EACd,iBAAiB,EACjB,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,kBAAkB,EAClB,4BAA4B,EAC5B,iBAAiB,EACjB,UAAU,EACV,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,GACV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,KAAK,SAAS,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EACL,gCAAgC,EAChC,wBAAwB,EACxB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC"}

package/lib/parser/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DYNAMIC_KEY_REG = exports.walkThroughComponents = exports.Dependencies = exports.PostcssRpx2Calc = exports.getUsedReference = exports._simpleGetUsedResourceOfComponent = exports.getNavUsedStaticResource = exports.getUsedResources = exports.processCSSPropertiesUnit = exports.processCSSProperties2Rem = exports.processCommonStyle2CSSProperties = exports.PropBindType = exports.ActionType = exports.VisitedMap = exports.renewIdInResource = exports.regenBlockTemplateComponents = exports.parseComponentCals = exports.findAllConflicts = exports.autoResolveConflicts = exports.checkForConflicts = exports.codeToCals = exports.calsToCode = exports.processComponentModule = exports.upgrageToVersion2 = void 0;
+exports.DYNAMIC_KEY_REG = exports.walkThroughComponents = exports.Dependencies = exports.PostcssRpx2Calc = exports.getUsedReference = exports._simpleGetUsedResourceOfComponent = exports.getNavUsedStaticResource = exports.getUsedResources = exports.processCSSPropertiesUnit = exports.processCSSProperties2Rem = exports.processCommonStyle2CSSProperties = exports.PropBindType = exports.ActionType = exports.mergeCals = exports.refreshComponentIds = exports.remapComponentIds = exports.VisitedMap = exports.renewIdInResource = exports.regenBlockTemplateComponents = exports.parseComponentCals = exports.findAllConflicts = exports.autoResolveConflicts = exports.checkForConflicts = exports.codeToCals = exports.calsToCode = exports.processComponentModule = exports.upgrageToVersion2 = void 0;
 __exportStar(require("./cals/index"), exports);
 var version_1 = require("./cals/utils/version");
 Object.defineProperty(exports, "upgrageToVersion2", { enumerable: true, get: function () { return version_1.upgrageToVersion2; } });
@@ -34,6 +34,9 @@ Object.defineProperty(exports, "parseComponentCals", { enumerable: true, get: fu
 Object.defineProperty(exports, "regenBlockTemplateComponents", { enumerable: true, get: function () { return block_1.regenBlockTemplateComponents; } });
 Object.defineProperty(exports, "renewIdInResource", { enumerable: true, get: function () { return block_1.renewIdInResource; } });
 Object.defineProperty(exports, "VisitedMap", { enumerable: true, get: function () { return block_1.VisitedMap; } });
+Object.defineProperty(exports, "remapComponentIds", { enumerable: true, get: function () { return block_1.remapComponentIds; } });
+Object.defineProperty(exports, "refreshComponentIds", { enumerable: true, get: function () { return block_1.refreshComponentIds; } });
+Object.defineProperty(exports, "mergeCals", { enumerable: true, get: function () { return block_1.mergeCals; } });
 var index_1 = require("./expression/index");
 Object.defineProperty(exports, "ActionType", { enumerable: true, get: function () { return index_1.ActionType; } });
 Object.defineProperty(exports, "PropBindType", { enumerable: true, get: function () { return index_1.PropBindType; } });

package/package.json

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