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

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

@@ -1,17 +1,39 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 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.collapseComponentReference = exports.expandComponentReference = 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 isEqual_1 = __importDefault(require("lodash/isEqual"));
 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");
+const lodash_1 = require("lodash");
+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, "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 +176,149 @@ 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) {
+    let { componentIdMap } = ctx, restContext = __rest(ctx, ["componentIdMap"]);
+    if (!componentIdMap) {
+        componentIdMap = (0, remap_component_ids_1.remapComponentIds)(components, ctx.visiting).componentIdMap;
+    }
+    return components.map((component) => {
+        let processed = (0, remap_component_ids_1.refreshComponentIds)({ componentIdMap }, component);
+        return expandComponentReference(restContext, Object.assign(Object.assign({}, processed), { extra: Object.assign(Object.assign({}, processed.extra), { xIndex: undefined, anchored: true }) }));
+    });
+}
+exports.regenBlockTemplateComponents = regenBlockTemplateComponents;
+/**
+ * todo: dataForm 追加
+ */
+function mergeCals(ctx, 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];
+        (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.add(namespace, item.id);
+        });
+    }
+    /**
+     * 根据　`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, blockTemplateMap: ctx.blockTemplateMap }, 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;
+function expandComponentReference(ctx, component) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    const { blockTemplateMap, strict } = ctx;
+    const { extra = {}, id, component: componentName } = component;
+    const { ref } = extra;
+    if (ref) {
+        if (blockTemplateMap[ref]) {
+            if ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.referenceMap) === null || _a === void 0 ? void 0 : _a[ref]) {
+                if (strict) {
+                    throw new Error(`存在循环引用：${ref}`);
+                }
+                else {
+                    return undefined;
+                }
+            }
+            const block = blockTemplateMap[ref];
+            const blockContent = (_d = regenBlockTemplateComponents(Object.assign(Object.assign({}, ctx), { referenceMap: Object.assign(Object.assign({}, ctx.referenceMap), { [ref]: true }) }), (0, lodash_1.cloneDeep)(((_c = (_b = block.content.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];
+            /**
+             * 动态配置协议有修改未定
+             * 因此先写死限制
+             */
+            if (!((_e = blockContent === null || blockContent === void 0 ? void 0 : blockContent.extra) === null || _e === void 0 ? void 0 : _e.dataForm) &&
+                blockContent.component === 'Container' &&
+                (((_f = blockContent.attributes) === null || _f === void 0 ? void 0 : _f.data) || ((_g = blockContent.attributes) === null || _g === void 0 ? void 0 : _g[':data'])) &&
+                ((_h = block.dynamicConfig) === null || _h === void 0 ? void 0 : _h.type) === 'object' &&
+                ((_j = block.dynamicConfig) === null || _j === void 0 ? void 0 : _j.properties.configs)) {
+                blockContent.extra = Object.assign(Object.assign({}, blockContent.extra), { dataForm: { data: (_k = block.dynamicConfig) === null || _k === void 0 ? void 0 : _k.properties.configs } });
+            }
+            const { attributes: blockAttributes = {} } = blockContent;
+            return Object.assign(Object.assign({}, blockContent), { 
+                // todo: 这里合并有问题，无法简单的合并
+                attributes: Object.assign(Object.assign({}, blockAttributes), component.attributes), ':style': component[':style'] || blockContent[':style'], ':class': component[':class'] || blockContent[':class'], extra: Object.assign(Object.assign({}, blockContent.extra), { refAttributes: Object.keys(blockAttributes) ? blockAttributes : undefined, ref }) });
+        }
+        else {
+            if (strict) {
+                throw new Error(`未找到引用：${ref}`);
+            }
+            else {
+                return undefined;
+            }
+        }
+    }
+    return Object.assign(Object.assign({}, component), { items: (_m = (_l = component.items) === null || _l === void 0 ? void 0 : _l.map) === null || _m === void 0 ? void 0 : _m.call(_l, (item) => expandComponentReference(ctx, item)) });
+}
+exports.expandComponentReference = expandComponentReference;
+function collapseComponentReference(ctx, component) {
+    var _a, _b, _c;
+    const { extra, attributes = {}, ':style': styleBind, ':class': classBind } = component;
+    const { blockTemplateMap } = ctx;
+    const _d = extra || {}, { ref, anchored, dataForm, refAttributes } = _d, restExtra = __rest(_d, ["ref", "anchored", "dataForm", "refAttributes"]);
+    if (ref && blockTemplateMap[ref]) {
+        const processed = {};
+        const blockContent = (_c = (_b = (_a = blockTemplateMap[ref].content.items) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.items) === null || _c === void 0 ? void 0 : _c[0];
+        restExtra.ref = ref;
+        processed.attributes = filterMap(attributes, refAttributes);
+        if (styleBind !== blockContent[':style']) {
+            processed[':style'] = styleBind;
+        }
+        if (classBind !== blockContent[':class']) {
+            processed[':class'] = classBind;
+        }
+        processed.extra = filterMap(restExtra, blockContent === null || blockContent === void 0 ? void 0 : blockContent.extra);
+        return processed;
+    }
+    else {
+        const _e = (component === null || component === void 0 ? void 0 : component.extra) || {}, { ref, refAttributes, dataForm } = _e, rest = __rest(_e, ["ref", "refAttributes", "dataForm"]);
+        return Object.assign(Object.assign({}, component), { extra: (component === null || component === void 0 ? void 0 : component.extra) ? rest : component === null || component === void 0 ? void 0 : component.extra });
+    }
+}
+exports.collapseComponentReference = collapseComponentReference;
+function filterMap(current = {}, base = {}) {
+    const filtered = {};
+    Object.entries(current).forEach(([key, value]) => {
+        // todo: 变量绑定key与非绑定key应为相同key
+        if (!(0, isEqual_1.default)(base[key], value)) {
+            filtered[key] = value;
+        }
+    });
+    return filtered;
 }
-exports.regenBlockTemplateComponent = regenBlockTemplateComponent;

package/lib/parser/cals/utils/common.d.ts

@@ -22,7 +22,7 @@ export declare function generateCustomLoginConfigPathname({ appId, version }: {
     appId: string;
     version: string;
 }): string;
-export declare function walkThroughComponents(components: IPlatformComponent[], visit: any): any[];
+export declare function walkThroughComponents(components: IPlatformComponent[], visit: any): void;
 export declare const DYNAMIC_KEY_REG: RegExp;
 export {};
 //# sourceMappingURL=common.d.ts.map

package/lib/parser/cals/utils/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/parser/cals/utils/common.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEnG,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAsBnD,aAAK,uBAAuB,GAAG;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC;AAOlE,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,UAAQ,UAQ5D;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,WAErC;AAED,eAAO,MAAM,UAAU,QAAS,MAAM,YAUrC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,WAQpD;AAED,wBAAgB,wBAAwB,CAAC,iBAAiB,EAAE,SAAS,WAQpE;AAyJD,wBAAgB,YAAY,CAE1B,IAAI,EAAE,CAAC,YAAY,GAAG,eAAe,CAAC,EAAE,EAExC,YAAY,EAAE,GAAG,EAAE,EACnB,OAAO,CAAC,EAAE;IACR,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC;CACrB,GACA,uBAAuB,GAAG;IAAE,SAAS,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;CAAE,CA+EvG;AAED,wBAAgB,iCAAiC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,UASvG;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,kBAAkB,EAAO,EAAE,KAAK,KAAA,SAUjF;AAED,eAAO,MAAM,eAAe,QAAY,CAAC"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/parser/cals/utils/common.ts"],"names":[],"mappings":"AACA,OAAO,EAAkB,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEnG,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAsBnD,aAAK,uBAAuB,GAAG;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC;AAOlE,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,UAAQ,UAQ5D;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,WAErC;AAED,eAAO,MAAM,UAAU,QAAS,MAAM,YAUrC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,WAQpD;AAED,wBAAgB,wBAAwB,CAAC,iBAAiB,EAAE,SAAS,WAQpE;AAyJD,wBAAgB,YAAY,CAE1B,IAAI,EAAE,CAAC,YAAY,GAAG,eAAe,CAAC,EAAE,EAExC,YAAY,EAAE,GAAG,EAAE,EACnB,OAAO,CAAC,EAAE;IACR,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC;CACrB,GACA,uBAAuB,GAAG;IAAE,SAAS,EAAE,uBAAuB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;CAAE,CA+EvG;AAED,wBAAgB,iCAAiC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,UASvG;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,kBAAkB,EAAO,EAAE,KAAK,KAAA,QAKjF;AAED,eAAO,MAAM,eAAe,QAAY,CAAC"}

package/lib/parser/cals/utils/common.js

@@ -276,15 +276,10 @@ function generateCustomLoginConfigPathname({ appId, version }) {
 }
 exports.generateCustomLoginConfigPathname = generateCustomLoginConfigPathname;
 function walkThroughComponents(components = [], visit) {
-    return components
-        .map((component) => {
-        const visiteComponent = visit(component);
-        if (visiteComponent.items) {
-            visiteComponent.items = walkThroughComponents(visiteComponent.items || [], visit);
-        }
-        return visiteComponent;
-    })
-        .filter((item) => !!item);
+    components.forEach((component) => {
+        visit(component);
+        walkThroughComponents(component.items || [], visit);
+    });
 }
 exports.walkThroughComponents = walkThroughComponents;
 exports.DYNAMIC_KEY_REG = /^:(.*)$/;

package/lib/parser/cals/utils/getUsedReference.d.ts

@@ -1,6 +1,7 @@
 import { IPlatformApp } from '../../../utils';
-export declare function generateBlockTemplateMap(blockTemplates?: any[]): any;
-export declare function getUsedReference(apps?: IPlatformApp[], templates?: any[]): {
+import { IBlockTemplate } from './block';
+export declare function generateBlockTemplateMap(blockTemplates?: IBlockTemplate[]): {};
+export declare function getUsedReference(apps?: IPlatformApp[], templates?: IBlockTemplate[]): {
     includes: Set<any>;
     refs: Set<any>;
 };

package/lib/parser/cals/utils/getUsedReference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUsedReference.d.ts","sourceRoot":"","sources":["../../../../src/parser/cals/utils/getUsedReference.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,wBAAgB,wBAAwB,CAAC,cAAc,QAAK,OAU3D;AAQD,wBAAgB,gBAAgB,CAAC,IAAI,GAAE,YAAY,EAAO,EAAE,SAAS,GAAE,GAAG,EAAO;;;EAqBhF"}
+{"version":3,"file":"getUsedReference.d.ts","sourceRoot":"","sources":["../../../../src/parser/cals/utils/getUsedReference.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,YAAY,EAAsB,MAAM,gBAAgB,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,wBAAgB,wBAAwB,CAAC,cAAc,GAAE,cAAc,EAAO,MAU7E;AAQD,wBAAgB,gBAAgB,CAAC,IAAI,GAAE,YAAY,EAAO,EAAE,SAAS,GAAE,cAAc,EAAO;;;EAmB3F"}

package/lib/parser/cals/utils/getUsedReference.js

@@ -14,7 +14,7 @@ function generateBlockTemplateMap(blockTemplates = []) {
 }
 exports.generateBlockTemplateMap = generateBlockTemplateMap;
 function getUsedReference(apps = [], templates = []) {
-    const templateMap = generateBlockTemplateMap(templates);
+    const blockTemplateMap = generateBlockTemplateMap(templates);
     const includes = new Set([]);
     const refs = new Set([]);
     apps.forEach((cals) => {
@@ -27,14 +27,14 @@ function getUsedReference(apps = [], templates = []) {
             include.forEach((path) => {
                 includes.add(path);
             });
-            page === null || page === void 0 ? void 0 : page.items.forEach((component) => getComponentUsedReference({ includes, refs, blockTemplateMap: templateMap }, component));
+            page === null || page === void 0 ? void 0 : page.items.forEach((component) => getComponentUsedReference({ includes, refs, blockTemplateMap }, component));
         });
     });
     return { includes, refs };
 }
 exports.getUsedReference = getUsedReference;
 function getComponentUsedReference(ctx, component) {
-    var _a;
+    var _a, _b;
     const { blockTemplateMap } = ctx;
     if (!component) {
         return;
@@ -47,10 +47,13 @@ function getComponentUsedReference(ctx, component) {
     if (ref) {
         if (!ctx.refs.has(ref) && blockTemplateMap[ref]) {
             ctx.refs.add(ref);
-            getComponentUsedReference(ctx, blockTemplateMap[ref]);
+            const components = ((_a = blockTemplateMap[ref].content.items) === null || _a === void 0 ? void 0 : _a[0].items) || [];
+            components.forEach((component) => {
+                getComponentUsedReference(ctx, component);
+            });
         }
     }
     else {
-        (_a = component.items) === null || _a === void 0 ? void 0 : _a.forEach((component) => getComponentUsedReference(ctx, component));
+        (_b = component.items) === null || _b === void 0 ? void 0 : _b.forEach((component) => getComponentUsedReference(ctx, component));
     }
 }

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, 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,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,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.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.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; } });
@@ -31,9 +31,12 @@ 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; } });
+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/lib/types/platform/datasource.d.ts

@@ -84,6 +84,11 @@ export interface ICloudIntegrationConfig extends IConfigurationBase {
         values: IHttpField;
     };
 }
+/** 数据模型对应的db类型 */
+export declare enum IDatabaseDataSourceDbType {
+    MYSQL = "MYSQL",
+    FLEXDB = "FLEXDB"
+}
 /**
  * 内建数据源
  */
@@ -100,6 +105,7 @@ export interface IDatabaseDataSource extends IDataSourceBase {
     subType?: 'database' | 'system';
     configuration: IConfigurationBase;
     schema: IDatabaseSchema;
+    dbInstanceType?: IDatabaseDataSourceDbType;
 }
 /** 自建数据源模型信息 */
 export interface IDatabaseSchema extends IJsonSchemaObject {

package/lib/types/platform/datasource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../../src/types/platform/datasource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../../src/types/platform/datasource.ts"],"names":[],"mappings":"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"}

package/lib/types/platform/datasource.js

@@ -1,2 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.IDatabaseDataSourceDbType = void 0;
+/** 数据模型对应的db类型 */
+var IDatabaseDataSourceDbType;
+(function (IDatabaseDataSourceDbType) {
+    IDatabaseDataSourceDbType["MYSQL"] = "MYSQL";
+    IDatabaseDataSourceDbType["FLEXDB"] = "FLEXDB";
+})(IDatabaseDataSourceDbType = exports.IDatabaseDataSourceDbType || (exports.IDatabaseDataSourceDbType = {}));