@cloudbase/cals 1.0.72-alpha.0 → 1.0.72-alpha.2

package/lib/parser/cals/index.js

@@ -1622,7 +1622,7 @@ function expandComponentReference(ctx, component) {
              * 先根遍历
              * 先安装当前的区块，不展开，接着展开安装子级别区块
              */
-            (0, index_1.regenBlockTemplateComponent)(ctx, Object.assign({}, (_d = (_c = (_b = blockTemplateMap[ref].items) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.items) === null || _d === void 0 ? void 0 : _d[0])));
+            (_d = (0, index_1.regenBlockTemplateComponents)(ctx, (_c = (_b = blockTemplateMap[ref].items) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.items)) === null || _d === void 0 ? void 0 : _d[0]);
             const { attributes: blockAttributes = {} } = blockContent;
             return Object.assign(Object.assign({}, blockContent), { 
                 // todo: 这里合并有问题，无法简单的合并

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

@@ -1,6 +1,7 @@
 import { 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';
 export { VisitedMap } from './helpers/remap-component-ids';
 interface IParseContext {
     component?: {
@@ -14,7 +15,7 @@ interface IParseContext {
     componentLibMap: Record<string, any>;
 }
 export declare function parseComponentCals(ctx: IParseContext, cals: IPlatformComponent): IParseContext;
-export declare function regenBlockTemplateComponent(ctx: {
+export declare function regenBlockTemplateComponents(ctx: {
     visiting: IVisitedContext;
-}, component: IPlatformComponent): IPlatformComponent;
+}, components: IPlatformComponent[]): IPlatformComponent[];
 //# 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,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,2BAA2B,CACzC,GAAG,EAAE;IAAE,QAAQ,EAAE,eAAe,CAAA;CAAE,EAClC,SAAS,EAAE,kBAAkB,GAC5B,kBAAkB,CAepB"}
+{"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"}

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.regenBlockTemplateComponent = exports.parseComponentCals = exports.VisitedMap = exports.renewIdInResource = void 0;
+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");
@@ -11,7 +11,10 @@ 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; } });
 var remap_component_ids_2 = require("./helpers/remap-component-ids");
-Object.defineProperty(exports, "VisitedMap", { enumerable: true, get: function () { return remap_component_ids_2.VisitedMap; } });
+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; } });
+var remap_component_ids_3 = require("./helpers/remap-component-ids");
+Object.defineProperty(exports, "VisitedMap", { enumerable: true, get: function () { return remap_component_ids_3.VisitedMap; } });
 function parseComponentCals(ctx, cals) {
     if (!ctx.datasetMap) {
         ctx.datasetMap = {};
@@ -154,10 +157,12 @@ function parseValueCals(ctx, value) {
         }
     }
 }
-function regenBlockTemplateComponent(ctx, component) {
-    const { componentIdMap } = (0, remap_component_ids_1.remapComponentIds)([component], ctx.visiting);
-    const processed = (0, remap_component_ids_1.refreshComponentIds)({ componentIdMap }, component);
-    // todo: 需要处理extra.dataForm
-    return Object.assign(Object.assign({}, processed), { extra: Object.assign(Object.assign({}, processed.extra), { xIndex: undefined, anchored: true }) });
+function regenBlockTemplateComponents(ctx, components) {
+    const { componentIdMap } = (0, remap_component_ids_1.remapComponentIds)(components, ctx.visiting);
+    return components.map((component) => {
+        const processed = (0, remap_component_ids_1.refreshComponentIds)({ componentIdMap }, component);
+        // todo: 需要处理extra.dataForm
+        return Object.assign(Object.assign({}, processed), { extra: Object.assign(Object.assign({}, processed.extra), { xIndex: undefined, anchored: true }) });
+    });
 }
-exports.regenBlockTemplateComponent = regenBlockTemplateComponent;
+exports.regenBlockTemplateComponents = regenBlockTemplateComponents;

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, regenBlockTemplateComponent, renewIdInResource, VisitedMap } from './cals/utils/block';
+export { parseComponentCals, regenBlockTemplateComponents, renewIdInResource, VisitedMap, remapComponentIds, refreshComponentIds, } 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,2BAA2B,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACpH,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,GACpB,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.regenBlockTemplateComponent = 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.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; } });
@@ -31,9 +31,11 @@ Object.defineProperty(exports, "autoResolveConflicts", { enumerable: true, get:
 Object.defineProperty(exports, "findAllConflicts", { enumerable: true, get: function () { return code_1.findAllConflicts; } });
 var block_1 = require("./cals/utils/block");
 Object.defineProperty(exports, "parseComponentCals", { enumerable: true, get: function () { return block_1.parseComponentCals; } });
-Object.defineProperty(exports, "regenBlockTemplateComponent", { enumerable: true, get: function () { return block_1.regenBlockTemplateComponent; } });
+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; } });
 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.0",
+  "version": "1.0.72-alpha.2",
   "description": "Common application specifications",
   "main": "lib/utils/index.js",
   "source": "src/utils/index.ts",