@cloudbase/cals 0.3.19 → 0.3.22-alpha.1

package/lib/parser/cals/index.js

@@ -11,12 +11,13 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deserializeComponentLibraryMeta = exports.deserializeRuntimeComponent = exports.serializeRuntimeComponent = exports.serializeRuntimePage = exports.deserializePlatformApp = exports.serializePlatformApp = exports.deserializePage = exports.serializePage = exports.deserializeComponent = exports.serializeComponent = exports.deserializeDataVariables = exports.deserializeAttributes = exports.serializeAttributes = exports.deserializeDynamicMap = exports.serializeDynamicMap = exports.deserializeValue = exports.serializeValue = void 0;
+exports.deserializeComponentLibraryMeta = exports.deserializeRuntimeComponent = exports.serializeRuntimeComponent = exports.serializeRuntimePage = exports.deserializePlatformApp = exports.serializePlatformApp = exports.deserializePage = exports.serializePage = exports.deserializeComponent = exports.serializeComponent = exports.deserializeDataVariables = exports.deserializeAttributes = exports.serializeAttributes = exports.deserializeDynamicMap = exports.serializeDynamicMap = exports.deserializeValue = exports.serializeValue = exports.getUsedComps = void 0;
 const lodash_1 = require("lodash");
 const common_1 = require("../../types/platform/common");
-const types_1 = require("../../types");
+var common_2 = require("./utils/common");
+Object.defineProperty(exports, "getUsedComps", { enumerable: true, get: function () { return common_2.getUsedComps; } });
 const expression_1 = require("../expression");
-const common_2 = require("./utils/common");
+const common_3 = require("./utils/common");
 const style_1 = require("./utils/style");
 const runtime_1 = require("./utils/runtime");
 const config_1 = require("./utils/version/config");
@@ -32,14 +33,14 @@ function serializeValue({ ctx, key, dynamicValue, scope = 'page', streamlineDefa
             case expression_1.PropBindType.computed:
             case expression_1.PropBindType.dataVar:
             case expression_1.PropBindType.stateData:
-            case expression_1.PropBindType.paramData: {
+            case expression_1.PropBindType.params: {
                 const TYPE_MAP = {
                     [expression_1.PropBindType.prop]: 'props',
                     [expression_1.PropBindType.state]: 'state',
                     [expression_1.PropBindType.computed]: 'computed',
                     [expression_1.PropBindType.dataVar]: 'dataVar',
                     [expression_1.PropBindType.stateData]: 'dataset.state',
-                    [expression_1.PropBindType.paramData]: 'dataset.params',
+                    [expression_1.PropBindType.params]: 'dataset.params',
                 };
                 let exp = dynamicValue.value;
                 let reg = /^(.*?)\./;
@@ -84,12 +85,13 @@ function serializeValue({ ctx, key, dynamicValue, scope = 'page', streamlineDefa
             value = undefined;
         }
     }
-    return { key, value };
+    return { key, value, extra: dynamicValue.extra };
 }
 exports.serializeValue = serializeValue;
-function deserializeValue(ctx, key, value) {
+const DYNAMIC_KEY_REG = /^:(.*)$/;
+function deserializeValue(ctx, key, value, extra) {
     var _a;
-    let matched = key.match(/^:(.*)$/);
+    let matched = key.match(DYNAMIC_KEY_REG);
     if (matched) {
         let key = matched[1];
         let type = expression_1.PropBindType.expression;
@@ -117,7 +119,7 @@ function deserializeValue(ctx, key, value) {
         }
         return {
             key,
-            value: { type, value },
+            value: { type, value, extra },
         };
     }
     else {
@@ -128,13 +130,19 @@ function deserializeValue(ctx, key, value) {
                 : {
                     type: undefined /*'static'*/,
                     value,
+                    extra,
                 },
         };
     }
 }
 exports.deserializeValue = deserializeValue;
-function serializeDynamicMap({ ctx, map = {}, scope = 'page', streamlineDefaultValue, }) {
+function serializeDynamicMap(props) {
+    return serializeDynamicMapWithExtra(props).data;
+}
+exports.serializeDynamicMap = serializeDynamicMap;
+function serializeDynamicMapWithExtra({ ctx, map = {}, scope = 'page', streamlineDefaultValue, }) {
     let data = {};
+    let extra = {};
     Object.keys(map)
         .sort((a, b) => {
         const aPath = a.split('.');
@@ -149,7 +157,7 @@ function serializeDynamicMap({ ctx, map = {}, scope = 'page', streamlineDefaultV
         }
     })
         .forEach((key) => {
-        let { key: processedKey, value: processedValue } = serializeValue({
+        let { key: processedKey, value: processedValue, extra: processedExtra, } = serializeValue({
             ctx,
             key,
             dynamicValue: map[key],
@@ -157,17 +165,17 @@ function serializeDynamicMap({ ctx, map = {}, scope = 'page', streamlineDefaultV
             streamlineDefaultValue,
         });
         let matched = processedKey.match(/^:(.*)$/);
+        let originKey = processedKey;
         if (matched) {
-            const originValue = matched[1];
-            (0, lodash_1.unset)(data, originValue);
+            originKey = matched[1];
+            (0, lodash_1.unset)(data, originKey);
         }
         if ((0, lodash_1.get)(data, processedKey) == undefined) {
-            let ValueTmp = processedValue;
             /* 选区结构处理 [formily] to [CALS] */
-            if (Array.isArray(ValueTmp) &&
-                (ValueTmp === null || ValueTmp === void 0 ? void 0 : ValueTmp.some((item) => item && item.selectableBlock))) {
-                ValueTmp = (0, lodash_1.cloneDeep)(processedValue);
-                ValueTmp === null || ValueTmp === void 0 ? void 0 : ValueTmp.map((_value) => {
+            if (Array.isArray(processedValue) &&
+                (processedValue === null || processedValue === void 0 ? void 0 : processedValue.some((item) => item && item.selectableBlock))) {
+                let valueTmp = (0, lodash_1.cloneDeep)(processedValue);
+                valueTmp === null || valueTmp === void 0 ? void 0 : valueTmp.map((_value) => {
                     var _a, _b, _c;
                     const xProp = (_a = _value === null || _value === void 0 ? void 0 : _value.selectableBlock) === null || _a === void 0 ? void 0 : _a['x-props'];
                     const xComponent = (_c = (_b = _value === null || _value === void 0 ? void 0 : _value.selectableBlock) === null || _b === void 0 ? void 0 : _b['x-component']) === null || _c === void 0 ? void 0 : _c.toLowerCase();
@@ -181,24 +189,24 @@ function serializeDynamicMap({ ctx, map = {}, scope = 'page', streamlineDefaultV
                     return _value;
                 });
             }
-            data[processedKey] = ValueTmp;
+            data[processedKey] = processedValue;
         }
+        extra[originKey] = processedExtra;
     });
-    return data;
+    return { data, extra };
 }
-exports.serializeDynamicMap = serializeDynamicMap;
-function deserializeDynamicMap(ctx, map) {
+function deserializeDynamicMap(ctx, map, extraMap) {
     var _a, _b, _c;
     let data = {};
     for (let key in map || {}) {
         let value = (_a = map) === null || _a === void 0 ? void 0 : _a[key];
-        let { key: processedKey, value: processedValue } = deserializeValue(ctx, key, value);
-        let ValueTmp = processedValue;
+        let matched = key.match(DYNAMIC_KEY_REG);
+        let { key: processedKey, value: processedValue } = deserializeValue(ctx, key, value, extraMap === null || extraMap === void 0 ? void 0 : extraMap[matched ? matched[1] : key]);
         /* 选区结构处理 [CALS] to [formily] */
         if (Array.isArray(processedValue === null || processedValue === void 0 ? void 0 : processedValue.value) &&
             ((_b = processedValue === null || processedValue === void 0 ? void 0 : processedValue.value) === null || _b === void 0 ? void 0 : _b.some((item) => item && item.selectableBlock))) {
-            ValueTmp = (0, lodash_1.cloneDeep)(processedValue);
-            (_c = ValueTmp === null || ValueTmp === void 0 ? void 0 : ValueTmp.value) === null || _c === void 0 ? void 0 : _c.map((_value) => {
+            let valueTmp = (0, lodash_1.cloneDeep)(processedValue);
+            (_c = valueTmp === null || valueTmp === void 0 ? void 0 : valueTmp.value) === null || _c === void 0 ? void 0 : _c.forEach((_value) => {
                 var _a, _b, _c, _d;
                 const module = (_b = (_a = _value === null || _value === void 0 ? void 0 : _value.selectableBlock) === null || _a === void 0 ? void 0 : _a.module) === null || _b === void 0 ? void 0 : _b.toLowerCase();
                 const component = (_d = (_c = _value === null || _value === void 0 ? void 0 : _value.selectableBlock) === null || _c === void 0 ? void 0 : _c.component) === null || _d === void 0 ? void 0 : _d.toLowerCase();
@@ -210,21 +218,24 @@ function deserializeDynamicMap(ctx, map) {
                 return _value;
             });
         }
-        data[processedKey] = ValueTmp;
+        data[processedKey] = processedValue;
     }
     return data;
 }
 exports.deserializeDynamicMap = deserializeDynamicMap;
 function serializeAttributes(ctx, scope, attributes = {}) {
-    return serializeDynamicMap({
+    return serializeAttributesWithExtra(ctx, scope, attributes).data;
+}
+exports.serializeAttributes = serializeAttributes;
+function serializeAttributesWithExtra(ctx, scope, attributes = {}) {
+    return serializeDynamicMapWithExtra({
         ctx,
         scope,
         map: attributes,
         streamlineDefaultValue: ctx.streamlineDefaultValue,
     });
 }
-exports.serializeAttributes = serializeAttributes;
-function deserializeAttributes(ctx, attributes = {}) {
+function deserializeAttributes(ctx, attributes = {}, attributesExtraData = {}) {
     const reservedAttributes = ['style', 'commonStyle', 'class'];
     const reservedAttributesMap = reservedAttributes.reduce((map, key) => {
         map[key] = true;
@@ -240,7 +251,7 @@ function deserializeAttributes(ctx, attributes = {}) {
             restAttributes[key] = attributes[key];
         }
     }
-    return deserializeDynamicMap(ctx, restAttributes);
+    return deserializeDynamicMap(ctx, restAttributes, attributesExtraData);
 }
 exports.deserializeAttributes = deserializeAttributes;
 /**
@@ -252,20 +263,20 @@ function serializeDataset(ctx, dataset) {
         return dataset;
     const result = JSON.parse(JSON.stringify(dataset));
     Object.values(result.state).forEach((state) => {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (state.varType !== 'datasource')
             return;
         if ((_a = state.initMethod) === null || _a === void 0 ? void 0 : _a.params) {
-            state.initMethod.params = serializeDynamicMap({
+            state.initMethod.params = (_b = serializeDynamicMapWithExtra({
                 ctx,
                 map: state.initMethod.params,
-            });
+            })) === null || _b === void 0 ? void 0 : _b.data;
         }
-        if ((_b = state.updateMethod) === null || _b === void 0 ? void 0 : _b.params) {
-            state.updateMethod.params = serializeDynamicMap({
+        if ((_c = state.updateMethod) === null || _c === void 0 ? void 0 : _c.params) {
+            state.updateMethod.params = (_d = serializeDynamicMapWithExtra({
                 ctx,
                 map: state.updateMethod.params,
-            });
+            })) === null || _d === void 0 ? void 0 : _d.data;
         }
     });
     return result;
@@ -375,10 +386,10 @@ function serializeListener(ctx, listener) {
             module: /^comp\-\w+$/.test(listener.handler.moduleName)
                 ? '$comp'
                 : listener.handler.moduleName,
-            params: serializeDynamicMap({
+            params: serializeDynamicMapWithExtra({
                 ctx,
                 map: listener.data,
-            }),
+            }).data,
         },
         isCapturePhase: listener.isCapturePhase,
     };
@@ -490,45 +501,59 @@ function serializeComponent(ctx, component, scope = 'page') {
     if (componentCtx.dependencies && !componentCtx.dependenciesMap) {
         componentCtx.dependenciesMap = processDependenciesMap(componentCtx.dependencies || []);
     }
+    const { data: attributes = {}, extra: attributeExtraData = {}, } = serializeAttributesWithExtra(componentCtx, scope, (component.xProps.data || {}));
+    let classListBindData = null;
+    let styleBindData = null;
+    if ((_d = component === null || component === void 0 ? void 0 : component.xProps) === null || _d === void 0 ? void 0 : _d.classListBind) {
+        classListBindData = serializeValue({
+            ctx: componentCtx,
+            key: 'classListBind',
+            dynamicValue: (_e = component === null || component === void 0 ? void 0 : component.xProps) === null || _e === void 0 ? void 0 : _e.classListBind,
+            scope,
+        });
+        if (classListBindData.extra) {
+            attributeExtraData['class'] = classListBindData.extra;
+        }
+    }
+    if ((_f = component === null || component === void 0 ? void 0 : component.xProps) === null || _f === void 0 ? void 0 : _f.styleBind) {
+        styleBindData = serializeValue({
+            ctx: componentCtx,
+            key: 'styleBind',
+            dynamicValue: (_g = component === null || component === void 0 ? void 0 : component.xProps) === null || _g === void 0 ? void 0 : _g.styleBind,
+        });
+        if (styleBindData.extra) {
+            attributeExtraData['style'] = styleBindData.extra;
+        }
+    }
     return {
         id: component.id,
         type: undefined,
         module: serializeModuleName(componentCtx, moduleName, componentName),
         component: componentName,
         attributes: (0, runtime_1.getValidValue)(component.xProps
-            ? Object.assign(Object.assign({}, serializeAttributes(componentCtx, scope, (component.xProps.data || {}))), { style: (_d = component.xProps) === null || _d === void 0 ? void 0 : _d.style, class: (_f = (_e = component.xProps) === null || _e === void 0 ? void 0 : _e.classList) === null || _f === void 0 ? void 0 : _f.join(' ') }) : undefined),
+            ? Object.assign(Object.assign({}, attributes), { style: (_h = component.xProps) === null || _h === void 0 ? void 0 : _h.style, class: (_k = (_j = component.xProps) === null || _j === void 0 ? void 0 : _j.classList) === null || _k === void 0 ? void 0 : _k.join(' ') }) : undefined),
         items: component.properties
             ? Object.keys(component.properties).map((key) => {
                 var _a;
                 return serializeComponent(componentCtx, Object.assign({ id: key }, (_a = component.properties) === null || _a === void 0 ? void 0 : _a[key]), scope);
             })
             : undefined,
-        listeners: (0, runtime_1.getValidValue)((_h = (_g = component.xProps) === null || _g === void 0 ? void 0 : _g.listeners) === null || _h === void 0 ? void 0 : _h.map((listener) => {
+        listeners: (0, runtime_1.getValidValue)((_m = (_l = component.xProps) === null || _l === void 0 ? void 0 : _l.listeners) === null || _m === void 0 ? void 0 : _m.map((listener) => {
             return serializeListener(componentCtx, listener);
         })),
-        directives: serializeDirecties(componentCtx, (((_j = component.xProps) === null || _j === void 0 ? void 0 : _j.directives) || {}), scope) || {
+        directives: serializeDirecties(componentCtx, (((_o = component.xProps) === null || _o === void 0 ? void 0 : _o.directives) || {}), scope) || {
             ':if': true,
         },
-        ':class': ((_k = component === null || component === void 0 ? void 0 : component.xProps) === null || _k === void 0 ? void 0 : _k.classListBind)
-            ? serializeValue({
-                ctx: componentCtx,
-                key: 'classListBind',
-                dynamicValue: (_l = component === null || component === void 0 ? void 0 : component.xProps) === null || _l === void 0 ? void 0 : _l.classListBind,
-                scope,
-            }).value
-            : undefined,
-        ':style': ((_m = component === null || component === void 0 ? void 0 : component.xProps) === null || _m === void 0 ? void 0 : _m.styleBind)
-            ? serializeValue({
-                ctx: componentCtx,
-                key: 'styleBind',
-                dynamicValue: (_o = component === null || component === void 0 ? void 0 : component.xProps) === null || _o === void 0 ? void 0 : _o.styleBind,
-            }).value
-            : undefined,
+        ':class': classListBindData ? classListBindData.value : undefined,
+        ':style': styleBindData ? styleBindData.value : undefined,
         extra: {
             commonStyle: (_p = component.xProps) === null || _p === void 0 ? void 0 : _p.commonStyle,
             xIndex: component.xIndex,
             styleBindPath: (_q = component === null || component === void 0 ? void 0 : component.xProps) === null || _q === void 0 ? void 0 : _q.styleBindPath,
             staticResourceAttribute: (_r = component === null || component === void 0 ? void 0 : component.xProps) === null || _r === void 0 ? void 0 : _r.staticResourceAttribute,
+            attributeExtraData: (0, common_3.isEmptyObj)(attributeExtraData)
+                ? undefined
+                : attributeExtraData,
         },
     };
 }
@@ -536,11 +561,14 @@ exports.serializeComponent = serializeComponent;
 function deserializeComponent(ctx, components) {
     let componentMap = components.reduce((map, item) => {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        const { attributeExtraData = {} } = item.extra || {};
         let dynamicStyle = item[':style']
-            ? deserializeValue(ctx, ':style', item[':style']).value
+            ? deserializeValue(ctx, ':style', item[':style'], attributeExtraData['style'] // 此处就是 style，取的是原始的属性
+            ).value
             : undefined;
         let dynamicClassList = item[':class']
-            ? deserializeValue(ctx, ':class', item[':class']).value
+            ? deserializeValue(ctx, ':class', item[':class'], attributeExtraData['class'] // 此处就是 class，取的是原始的属性
+            ).value
             : undefined;
         const xComponent = {
             moduleName: item.module,
@@ -552,7 +580,7 @@ function deserializeComponent(ctx, components) {
                     xComponent.moduleName;
         }
         const xProps = {
-            data: deserializeAttributes(ctx, item.attributes),
+            data: deserializeAttributes(ctx, item.attributes, attributeExtraData),
             directives: deserializeDirecties(ctx, item.directives || {}),
             style: (_a = item.attributes) === null || _a === void 0 ? void 0 : _a.style,
             styleBind: dynamicStyle
@@ -561,9 +589,6 @@ function deserializeComponent(ctx, components) {
                     value: dynamicStyle.value,
                 }
                 : undefined,
-            //   styleBindPath: item.styleBindPath
-            //     ? deserializeValue('styleBindPath', item.styleBindPath).value
-            //     : undefined, // 含义未知
             commonStyle: (_b = item === null || item === void 0 ? void 0 : item.extra) === null || _b === void 0 ? void 0 : _b.commonStyle,
             staticResourceAttribute: (_c = item === null || item === void 0 ? void 0 : item.extra) === null || _c === void 0 ? void 0 : _c.staticResourceAttribute,
             classList: (_f = (_e = (_d = item.attributes) === null || _d === void 0 ? void 0 : _d.class) === null || _e === void 0 ? void 0 : _e.split(/\s/g)) === null || _f === void 0 ? void 0 : _f.filter((className) => !!className),
@@ -585,7 +610,7 @@ function deserializeComponent(ctx, components) {
                 if (Array.isArray(item)) {
                     return !!item.length;
                 }
-                return item != undefined && !(0, common_2.isEmptyObj)(item);
+                return item != undefined && !(0, common_3.isEmptyObj)(item);
             })
                 ? xProps
                 : undefined,
@@ -613,9 +638,9 @@ function serializePage(ctx, page) {
     }
     let processedPage = {
         id: page.id,
-        type: types_1.EComponentType.PAGE,
+        type: 'PAGE',
         component: 'Page',
-        attributes: (0, runtime_1.getValidValue)(serializeAttributes(pageCtx, 'page', page.data)),
+        attributes: (0, runtime_1.getValidValue)(serializeAttributesWithExtra(pageCtx, 'page', page.data).data),
         items: Object.keys(page.componentInstances || {}).map((id) => {
             return serializeComponent(pageCtx, Object.assign({ id }, page.componentInstances[id]));
         }),
@@ -629,7 +654,6 @@ function serializePage(ctx, page) {
             return serializeListener(pageCtx, item);
         })),
         extra: {
-            pluginInstances: page === null || page === void 0 ? void 0 : page.pluginInstances,
             commonStyle: page === null || page === void 0 ? void 0 : page.commonStyle,
             xIndex: page.xIndex,
             staticResourceAttribute: page === null || page === void 0 ? void 0 : page.staticResourceAttribute,
@@ -665,9 +689,8 @@ function deserializePage(ctx, page) {
                 return deserializeDataVariables(pageCtx, item);
             })) || [],
         },
-        data: deserializeAttributes(pageCtx, page.attributes),
+        data: deserializeAttributes(pageCtx, page.attributes, (_b = page === null || page === void 0 ? void 0 : page.extra) === null || _b === void 0 ? void 0 : _b.attributeExtraData),
         componentInstances: deserializeComponent(pageCtx, page.items || []),
-        pluginInstances: (_b = page.extra) === null || _b === void 0 ? void 0 : _b.pluginInstances,
         commonStyle: (_c = page === null || page === void 0 ? void 0 : page.extra) === null || _c === void 0 ? void 0 : _c.commonStyle,
         staticResourceAttribute: (_d = page === null || page === void 0 ? void 0 : page.extra) === null || _d === void 0 ? void 0 : _d.staticResourceAttribute,
         hideAdminPortalMenu: (_e = page === null || page === void 0 ? void 0 : page.extra) === null || _e === void 0 ? void 0 : _e.hideAdminPortalMenu,
@@ -724,7 +747,7 @@ function deserializePlatformApp(data, optsions) {
     var _a, _b;
     let homePageId = data.main || ((_a = data.items[0]) === null || _a === void 0 ? void 0 : _a.id) || '';
     let extra = data.extra || {};
-    const { historyType, npmDependencies, plugins, maxID, rootPath, themeVars, presetColors, appConfig, miniprogramPlugins } = extra, restExtra = __rest(extra, ["historyType", "npmDependencies", "plugins", "maxID", "rootPath", "themeVars", "presetColors", "appConfig", "miniprogramPlugins"]);
+    const { historyType, npmDependencies, plugins, maxID, rootPath, themeVars, presetColors, appConfig, miniprogramPlugins, compHiddenConfig } = extra, restExtra = __rest(extra, ["historyType", "npmDependencies", "plugins", "maxID", "rootPath", "themeVars", "presetColors", "appConfig", "miniprogramPlugins", "compHiddenConfig"]);
     const ctx = {
         app: data,
         dependencies: (optsions === null || optsions === void 0 ? void 0 : optsions.dependencies) || [],
@@ -752,6 +775,7 @@ function deserializePlatformApp(data, optsions) {
                 return deserializeDataVariables(ctx, item);
             })) || [],
         },
+        compHiddenConfig: compHiddenConfig || {},
         npmDependencies: npmDependencies || {},
         plugins: plugins || [],
         maxID: maxID,
@@ -778,9 +802,9 @@ function serializeRuntimePage(ctx, page //IPageInstance
     const pageCtx = Object.assign(Object.assign({}, ctx), { dependenciesMap: processDependenciesMap(ctx.dependencies || []), page: { id: page.id } });
     let processedPage = {
         id: page.id,
-        type: types_1.EComponentType.PAGE,
+        type: 'PAGE',
         component: 'Page',
-        attributes: serializeAttributes(pageCtx, 'page', (0, runtime_1.readDynamicData)(page)),
+        attributes: serializeAttributesWithExtra(pageCtx, 'page', (0, runtime_1.readDynamicData)(page)).data,
         items: (0, runtime_1.getValidValue)(Object.keys(((_a = page.componentSchemaJson) === null || _a === void 0 ? void 0 : _a.properties) || {}).map((id) => {
             var _a;
             return serializeRuntimeComponent(pageCtx, Object.assign({ id }, (_a = page.componentSchemaJson) === null || _a === void 0 ? void 0 : _a.properties[id]));
@@ -792,21 +816,20 @@ function serializeRuntimePage(ctx, page //IPageInstance
             return serializeListener(pageCtx, item);
         })),
         extra: {
-            pluginInstances: (0, runtime_1.getValidValue)(page === null || page === void 0 ? void 0 : page.pluginInstances),
             commonStyle: (0, runtime_1.getValidValue)((0, style_1.removeInvalidStyleFormValue)(page.style)),
             styleBindPath: (0, runtime_1.getValidValue)(page.styleBindPath),
             xIndex: page.xIndex,
             children: (0, runtime_1.getValidValue)((_e = page.children) === null || _e === void 0 ? void 0 : _e.map((child) => serializeRuntimePage(ctx, child))),
         },
     };
-    if ((0, common_2.isValidStyleBind)(page.styleBind) && (0, runtime_1.getValidValue)(page.styleBind)) {
+    if ((0, common_3.isValidStyleBind)(page.styleBind) && (0, runtime_1.getValidValue)(page.styleBind)) {
         page[':style'] = serializeValue({
             ctx: pageCtx,
             key: 'styleBind',
             dynamicValue: page.styleBind,
         }).value;
     }
-    if ((0, common_2.isValidClassNameListBind)(page.classListBind) &&
+    if ((0, common_3.isValidClassNameListBind)(page.classListBind) &&
         (0, runtime_1.getValidValue)(page.classListBind)) {
         page[':class'] = serializeValue({
             ctx: pageCtx,
@@ -852,33 +875,48 @@ function serializeRuntimeComponent(ctx, component //IComponentSchemaJson
             .filter((dataType) => dataType.type !== 'slot')
             .map((dataType) => dataType.propertyPath);
         let properties = component.properties || {};
-        processed = Object.assign(Object.assign({}, processed), { module: serializeModuleName(componentCtx, moduleName, name), component: name, attributes: Object.assign(Object.assign({}, serializeAttributes(componentCtx, 'page', ((0, runtime_1.getValidValue)((0, runtime_1.readDynamicData)(props)) || {}))), { style: (0, runtime_1.getValidValue)(props.style), class: (_a = (0, runtime_1.getValidValue)(props.classNameList)) === null || _a === void 0 ? void 0 : _a.join(' ') }), items: (0, runtime_1.getValidValue)(Object.keys(properties)
+        const { data: attributes = {}, extra: attributeExtraData = {}, } = serializeAttributesWithExtra(componentCtx, 'page', (0, runtime_1.getValidValue)((0, runtime_1.readDynamicData)(props)) || {});
+        let styleBindData = null;
+        let classListBindData = null;
+        if ((_a = props === null || props === void 0 ? void 0 : props.styleBind) === null || _a === void 0 ? void 0 : _a.bindDataPath) {
+            styleBindData = serializeValue({
+                ctx: componentCtx,
+                key: 'styleBind',
+                dynamicValue: {
+                    type: props.styleBind.type,
+                    value: props.styleBind.bindDataPath,
+                    extra: props.styleBind.extra,
+                },
+            });
+            if (styleBindData === null || styleBindData === void 0 ? void 0 : styleBindData.extra) {
+                attributeExtraData.style = styleBindData === null || styleBindData === void 0 ? void 0 : styleBindData.extra;
+            }
+        }
+        if ((0, common_3.isValidClassNameListBind)(props.classNameListBind)) {
+            classListBindData = serializeValue({
+                ctx: componentCtx,
+                key: 'classListBind',
+                dynamicValue: (0, runtime_1.getValidValue)({
+                    type: props.classNameListBind.type,
+                    value: props.classNameListBind.bindDataPath,
+                }),
+            });
+            if (classListBindData === null || classListBindData === void 0 ? void 0 : classListBindData.extra) {
+                attributeExtraData.class = classListBindData === null || classListBindData === void 0 ? void 0 : classListBindData.extra;
+            }
+        }
+        processed = Object.assign(Object.assign({}, processed), { module: serializeModuleName(componentCtx, moduleName, name), component: name, attributes: Object.assign(Object.assign({}, attributes), { style: (0, runtime_1.getValidValue)(props.style), class: (_b = (0, runtime_1.getValidValue)(props.classNameList)) === null || _b === void 0 ? void 0 : _b.join(' ') }), items: (0, runtime_1.getValidValue)(Object.keys(properties)
                 .filter((key) => !excludeKeys.includes(key))
-                .map((key) => serializeRuntimeComponent(ctx, Object.assign({ id: key }, properties[key])))), listeners: (_b = (0, runtime_1.getValidValue)((0, runtime_1.readListeners)(props.listenerInstances))) === null || _b === void 0 ? void 0 : _b.map((listener /* IEventListener */) => {
+                .map((key) => serializeRuntimeComponent(ctx, Object.assign({ id: key }, properties[key])))), listeners: (_c = (0, runtime_1.getValidValue)((0, runtime_1.readListeners)(props.listenerInstances))) === null || _c === void 0 ? void 0 : _c.map((listener /* IEventListener */) => {
                 return serializeListener(componentCtx, listener);
-            }), directives: serializeDirecties(componentCtx, ((0, runtime_1.getValidValue)((0, runtime_1.readDirectives)(props)) || {})) || undefined, ':class': (0, common_2.isValidClassNameListBind)(props.classNameListBind)
-                ? serializeValue({
-                    ctx: componentCtx,
-                    key: 'classListBind',
-                    dynamicValue: (0, runtime_1.getValidValue)({
-                        type: props.classNameListBind.type,
-                        value: props.classNameListBind.bindDataPath,
-                    }),
-                }).value
-                : undefined, ':style': ((_c = props === null || props === void 0 ? void 0 : props.styleBind) === null || _c === void 0 ? void 0 : _c.bindDataPath)
-                ? serializeValue({
-                    ctx: componentCtx,
-                    key: 'styleBind',
-                    dynamicValue: {
-                        type: props.styleBind.type,
-                        value: props.styleBind.bindDataPath,
-                    },
-                }).value
-                : undefined, extra: {
+            }), directives: serializeDirecties(componentCtx, ((0, runtime_1.getValidValue)((0, runtime_1.readDirectives)(props)) || {})) || undefined, ':class': (classListBindData === null || classListBindData === void 0 ? void 0 : classListBindData.value) || undefined, ':style': (styleBindData === null || styleBindData === void 0 ? void 0 : styleBindData.value) || undefined, extra: {
                 commonStyle: (0, runtime_1.getValidValue)((0, style_1.removeInvalidStyleFormValue)(props.commonStyle)),
                 xIndex: (0, runtime_1.getValidValue)(component['x-index']),
                 styleBindPath: (0, runtime_1.getValidValue)(props.styleBindPath),
                 staticResourceAttribute: (0, runtime_1.getValidValue)(props.staticResourceAttribute),
+                attributeExtraData: (0, common_3.isEmptyObj)(attributeExtraData)
+                    ? undefined
+                    : attributeExtraData,
             } });
     }
     else {

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

@@ -108,10 +108,10 @@ function parseValueCals(ctx, value) {
         let parser = new expression_1.DynamicValueParser(value, { pageId: '$page' });
         let res = parser.parse();
         switch (res.type) {
-            case expression_1.PropBindType.paramData:
+            case expression_1.PropBindType.params:
             case expression_1.PropBindType.stateData: {
                 const TYPE_MAP = {
-                    [expression_1.PropBindType.paramData]: 'params',
+                    [expression_1.PropBindType.params]: 'params',
                     [expression_1.PropBindType.stateData]: 'state',
                 };
                 const type = TYPE_MAP[res.type];

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

@@ -1,7 +1,12 @@
 import { IDataBind } from '../../expression/index';
+declare type IUsedComps = {
+    [libName: string]: Set<string>;
+};
 export declare function camelcase(str: string, firstUpperCase?: boolean): string;
 export declare function isPlainObject(src: any): boolean;
 export declare const isEmptyObj: (obj: object) => boolean;
 export declare function isValidStyleBind(styleBind: IDataBind): boolean;
 export declare function isValidClassNameListBind(classNameListBind: IDataBind): boolean;
+export declare function getUsedComps(apps: any[], comps: any[]): IUsedComps;
+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":["../../../../parser/cals/utils/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAElD,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,CAAA;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,WAQpD;AAED,wBAAgB,wBAAwB,CAAC,iBAAiB,EAAE,SAAS,WAQpE"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../parser/cals/utils/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAYlD,aAAK,UAAU,GAAG;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,CAAA;AAGpD,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,CAAA;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,WAQpD;AAED,wBAAgB,wBAAwB,CAAC,iBAAiB,EAAE,SAAS,WAQpE;AAmFD,wBAAgB,YAAY,CAExB,IAAI,EAAE,GAAG,EAAE,EAEX,KAAK,EAAE,GAAG,EAAE,GACb,UAAU,CAwDZ"}