@cloudbase/cals 1.0.0 → 1.0.1-2.beta.0

package/lib/parser/cals/index.js

@@ -10,9 +10,17 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseVersion = exports.processRuntimeCodeResources = 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.generateDefaultCode = exports.getUsedComps = void 0;
-const lodash_1 = require("lodash");
+exports.processListeners = exports.parseVersion = exports.processRuntimeCodeResources = exports.deserializeComponentLibraryMeta = exports.deserializeRuntimeComponent = exports.serializeRuntimeComponent = exports.serializeRuntimeDataset = exports.serializeRuntimePage = exports.deserializePlatformApp = exports.serializePlatformApp = exports.deserializePage = exports.serializePage = exports.deserializeComponent = exports.serializeComponent = exports.deserializeDataVariables = exports.normalizeQuery = exports.deserializeDataset = exports.serializeDataset = exports.deserializeAttributes = exports.serializeAttributes = exports.deserializeDynamicMap = exports.serializeDynamicMap = exports.deserializeValue = exports.serializeValue = exports.generateDefaultCode = exports.getUsedComps = void 0;
+const get_1 = __importDefault(require("lodash/get"));
+const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
+const unset_1 = __importDefault(require("lodash/unset"));
+const set_1 = __importDefault(require("lodash/set"));
+const isArray_1 = __importDefault(require("lodash/isArray"));
+const isObject_1 = __importDefault(require("lodash/isObject"));
 const common_1 = require("../../types/platform/common");
 const expression_1 = require("../expression");
 const common_2 = require("./utils/common");
@@ -21,6 +29,7 @@ const runtime_1 = require("./utils/runtime");
 const config_1 = require("./utils/version/config");
 const template_1 = require("./utils/template");
 const featureChecker_1 = require("../../utils/version/featureChecker");
+const utils_1 = require("../../utils");
 var common_3 = require("./utils/common");
 Object.defineProperty(exports, "getUsedComps", { enumerable: true, get: function () { return common_3.getUsedComps; } });
 var template_2 = require("./utils/template");
@@ -175,13 +184,16 @@ function serializeDynamicMapWithExtra({ ctx, map = {}, scope = 'page', streamlin
         let originKey = processedKey;
         if (matched) {
             originKey = matched[1];
-            (0, lodash_1.unset)(data, originKey);
+            if (!originKey) {
+                return;
+            }
+            (0, unset_1.default)(data, originKey);
         }
         const originKeyArr = originKey.split('.');
-        if ((0, lodash_1.get)(data, processedKey) == undefined) {
+        if ((0, get_1.default)(data, processedKey) == undefined) {
             /* 选区结构处理 [formily] to [CALS] */
             if (Array.isArray(processedValue) && (processedValue === null || processedValue === void 0 ? void 0 : processedValue.some((item) => !!(item === null || item === void 0 ? void 0 : item.selectableBlock)))) {
-                let valueTmp = (0, lodash_1.cloneDeep)(processedValue);
+                let valueTmp = (0, cloneDeep_1.default)(processedValue);
                 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'];
@@ -198,10 +210,10 @@ function serializeDynamicMapWithExtra({ ctx, map = {}, scope = 'page', streamlin
             }
             // 为动态数据且有多级，将{":range.0.label": "$page.dataset.state.test1"}转为{ range: [{ label: "$page.dataset.state.test1"}] }
             if (matched && originKeyArr.length >= 2) {
-                (0, lodash_1.set)(data, replaceWithColon(originKey), (0, lodash_1.cloneDeep)(processedValue));
+                (0, set_1.default)(data, replaceWithColon(originKey), (0, cloneDeep_1.default)(processedValue));
             }
             else {
-                data[processedKey] = (0, lodash_1.cloneDeep)(processedValue);
+                data[processedKey] = (0, cloneDeep_1.default)(processedValue);
             }
         }
         extra[originKey] = processedExtra;
@@ -231,19 +243,19 @@ function replaceWithColon(key) {
 function recoverSynamicMap(parent, current, path = '') {
     Object.keys(current).forEach((key) => {
         let value = current[key];
-        if ((0, lodash_1.isArray)(value)) {
+        if ((0, isArray_1.default)(value)) {
             // 注意如果是 selectableBlock 独立处理
             if (value === null || value === void 0 ? void 0 : value.some((item) => !!(item === null || item === void 0 ? void 0 : item.selectableBlock))) {
                 return;
             }
             // 数组必须在前面
             value.forEach((valueItem, valueIndex) => {
-                if ((0, lodash_1.isObject)(valueItem)) {
+                if ((0, isObject_1.default)(valueItem)) {
                     valueItem = recoverSynamicMap(parent, valueItem, `${path === '' ? '' : `${path}.`}${key}.${valueIndex}`);
                 }
             });
         }
-        else if ((0, lodash_1.isObject)(value)) {
+        else if ((0, isObject_1.default)(value)) {
             value = recoverSynamicMap(parent, value, `${path === '' ? '' : `${path}.`}${key}`);
         }
         else {
@@ -252,7 +264,7 @@ function recoverSynamicMap(parent, current, path = '') {
                 parent[`:${path === '' ? '' : `${path}.`}${matched[1]}`] = current[key];
                 if (current !== parent) {
                     // 如果是第一层级，说明current和parent相等，不unset
-                    (0, lodash_1.unset)(current, key);
+                    (0, unset_1.default)(current, key);
                 }
             }
         }
@@ -262,12 +274,15 @@ function recoverSynamicMap(parent, current, path = '') {
 function deserializeDynamicMap(ctx, map, extraMap) {
     var _a, _b;
     let data = {};
-    const clonedMap = (0, lodash_1.cloneDeep)(map);
+    const clonedMap = (0, cloneDeep_1.default)(map);
     // 还原flatten path
     map = recoverSynamicMap(clonedMap, clonedMap, '');
     for (let key in map || {}) {
         let value = map === null || map === void 0 ? void 0 : map[key];
         let matched = key.match(DYNAMIC_KEY_REG);
+        if (matched && !matched[1]) {
+            continue;
+        }
         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) && ((_a = processedValue === null || processedValue === void 0 ? void 0 : processedValue.value) === null || _a === void 0 ? void 0 : _a.some((item) => !!(item === null || item === void 0 ? void 0 : item.selectableBlock)))) {
@@ -327,10 +342,11 @@ exports.deserializeAttributes = deserializeAttributes;
  *  目前仅转换 state 中的 initMethod.params 和 updateMethod.params
  */
 function serializeDataset(ctx, dataset) {
-    if (!isDatasetNeedToProcess(dataset))
+    if (!dataset) {
         return dataset;
-    const result = JSON.parse(JSON.stringify(dataset));
-    Object.values(result.state).forEach((state) => {
+    }
+    const result = JSON.parse(JSON.stringify(dataset || {}));
+    Object.values(result.state || {}).forEach((state) => {
         var _a, _b, _c, _d;
         if (state.varType !== 'datasource')
             return;
@@ -347,18 +363,47 @@ function serializeDataset(ctx, dataset) {
             })) === null || _d === void 0 ? void 0 : _d.data;
         }
     });
+    Object.entries(result.query || {}).forEach(([key, query]) => {
+        var _a, _b, _c;
+        let { dataSourceName, method, listeners, handler, data } = query, restQuery = __rest(query, ["dataSourceName", "method", "listeners", "handler", "data"]);
+        let mergedData = (_a = serializeDynamicMapWithExtra({
+            ctx,
+            map: data || {},
+        })) === null || _a === void 0 ? void 0 : _a.data;
+        if (dataSourceName && !handler) {
+            handler = {
+                moduleName: 'platform',
+                name: 'cloud.callDataSource',
+            };
+            mergedData = {
+                dataSourceName,
+                methodName: method === null || method === void 0 ? void 0 : method.name,
+                params: (_b = serializeDynamicMapWithExtra({
+                    ctx,
+                    map: (method === null || method === void 0 ? void 0 : method.params) || {},
+                })) === null || _b === void 0 ? void 0 : _b.data,
+            };
+        }
+        result.query[key] = Object.assign(Object.assign({}, restQuery), { handler: {
+                module: handler === null || handler === void 0 ? void 0 : handler.moduleName,
+                name: handler === null || handler === void 0 ? void 0 : handler.name,
+                params: mergedData,
+            }, listeners: (_c = listeners === null || listeners === void 0 ? void 0 : listeners.map) === null || _c === void 0 ? void 0 : _c.call(listeners, (listener) => serializeListener(ctx, listener)) });
+    });
     return result;
 }
+exports.serializeDataset = serializeDataset;
 /**
  * 将dataset({state: {}, params: {}})从 cals 结构转换为weapp结构
  *  目前仅转换 state 中的 initMethod.params 和 updateMethod.params
  */
 function deserializeDataset(ctx, dataset) {
-    if (!isDatasetNeedToProcess(dataset))
+    if (!dataset) {
         return dataset;
+    }
     // 克隆, 避免引用问题
-    const result = JSON.parse(JSON.stringify(dataset));
-    Object.values(result.state).forEach((state) => {
+    const result = JSON.parse(JSON.stringify(dataset || {}));
+    Object.values(result.state || {}).forEach((state) => {
         var _a, _b;
         if (state.varType !== 'datasource')
             return;
@@ -369,23 +414,35 @@ function deserializeDataset(ctx, dataset) {
             state.updateMethod.params = deserializeDynamicMap(ctx, state.updateMethod.params);
         }
     });
+    Object.entries(result.query || {}).forEach(([key, query]) => {
+        var _a;
+        const _b = normalizeQuery(query), { handler, listeners } = _b, restQuery = __rest(_b, ["handler", "listeners"]);
+        result.query[key] = Object.assign(Object.assign({}, restQuery), { handler: {
+                moduleName: handler === null || handler === void 0 ? void 0 : handler.module,
+                name: (handler === null || handler === void 0 ? void 0 : handler.name) || '',
+            }, data: deserializeDynamicMap(ctx, (handler === null || handler === void 0 ? void 0 : handler.params) || {}), listeners: (_a = listeners === null || listeners === void 0 ? void 0 : listeners.map) === null || _a === void 0 ? void 0 : _a.call(listeners, (listener) => {
+                return deserializeListener(ctx, listener);
+            }) });
+    });
     return result;
 }
-/**
- * dataset 是否需要转换处理
- *  dataset 为空, 或者无数据源变量, 或者变量中未使用入参, 则不需要进行转换
- */
-function isDatasetNeedToProcess(dataset) {
-    if (!dataset || !dataset.state)
-        return false;
-    const hasNoParams = Object.values(dataset.state).every((item) => {
-        var _a, _b;
-        return item.varType !== 'datasource' || !(((_a = item.initMethod) === null || _a === void 0 ? void 0 : _a.params) || ((_b = item.updateMethod) === null || _b === void 0 ? void 0 : _b.params));
-    });
-    if (hasNoParams)
-        return false;
-    return true;
+exports.deserializeDataset = deserializeDataset;
+function normalizeQuery(query) {
+    let { dataSourceName, method, handler } = query, restQuery = __rest(query, ["dataSourceName", "method", "handler"]);
+    if (dataSourceName && !handler) {
+        handler = {
+            module: 'platform',
+            name: 'cloud.callDataSource',
+            params: {
+                dataSourceName,
+                methodName: (method === null || method === void 0 ? void 0 : method.name) || '',
+                params: (method === null || method === void 0 ? void 0 : method.params) || {},
+            },
+        };
+    }
+    return Object.assign(Object.assign({}, restQuery), { handler });
 }
+exports.normalizeQuery = normalizeQuery;
 function serializeDirecties(ctx, directives, scope = 'page') {
     var _a;
     let processed = {
@@ -520,30 +577,9 @@ function deserializeCodeResource(ctx, data) {
     return Object.assign(Object.assign({}, resData), { type: codeType });
 }
 function serializeModuleName(ctx, moduleName, componentName) {
-    var _a, _b;
     let { dependencies = [], dependenciesMap = {} } = ctx;
-    if (ctx.streamlineModuleName) {
-        if (moduleName === ((_a = dependencies[0]) === null || _a === void 0 ? void 0 : _a.name)) {
-            moduleName = undefined;
-        }
-        let find = undefined;
-        for (let i = dependencies.length - 1; i > 0; i--) {
-            let lib = dependencies[i];
-            let currentModuleName = lib.name;
-            let key = `${currentModuleName}:${componentName}`;
-            if (!!dependenciesMap[key]) {
-                find = lib;
-                break;
-            }
-        }
-        if (find) {
-            if ((find === null || find === void 0 ? void 0 : find.name) === moduleName) {
-                return undefined;
-            }
-        }
-        else if (((_b = dependencies[0]) === null || _b === void 0 ? void 0 : _b.name) === moduleName) {
-            return undefined;
-        }
+    if (moduleName === utils_1.OFFICIAL_LIB_KEY) {
+        moduleName = undefined;
     }
     else if (moduleName &&
         !/-lcap-spinoff$/.test(moduleName) &&
@@ -554,22 +590,12 @@ function serializeModuleName(ctx, moduleName, componentName) {
     return moduleName;
 }
 function deserializeModuleName(ctx, componentName, moduleName) {
-    var _a;
-    let { dependencies = [], dependenciesMap = {} } = ctx;
-    let defaultModuleName = (_a = dependencies[0]) === null || _a === void 0 ? void 0 : _a.name;
-    // 补充默认的 moduleName 按照依赖反序查找
-    if (!moduleName) {
-        let find = undefined;
-        for (let i = dependencies.length - 1; i > 0; i--) {
-            let lib = dependencies[i];
-            let { name } = lib;
-            let key = `${name}:${componentName}`;
-            if (!!dependenciesMap[key]) {
-                find = lib;
-                break;
-            }
-        }
-        return find ? find === null || find === void 0 ? void 0 : find.name : defaultModuleName;
+    let { dependenciesMap = {} } = ctx;
+    /**
+     * 无组件库名 且 有组件名
+     */
+    if (!moduleName && componentName) {
+        return utils_1.OFFICIAL_LIB_KEY;
     }
     else if (moduleName &&
         !/-lcap-spinoff$/.test(moduleName) &&
@@ -579,6 +605,15 @@ function deserializeModuleName(ctx, componentName, moduleName) {
     }
     return moduleName;
 }
+function serializeXIndex(ctx, list) {
+    return list
+        .sort((a, b) => { var _a, _b; return (((_a = a.extra) === null || _a === void 0 ? void 0 : _a.xIndex) || 0) - (((_b = b.extra) === null || _b === void 0 ? void 0 : _b.xIndex) || 0); })
+        .map((component) => {
+        const { extra } = component, restComponent = __rest(component, ["extra"]);
+        const _a = extra || {}, { xIndex } = _a, restExtra = __rest(_a, ["xIndex"]);
+        return Object.assign(Object.assign({}, restComponent), { extra: extra ? restExtra : undefined });
+    });
+}
 function serializeComponent(ctx, component, scope = 'page') {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     // const scope = ctx.component?.id ? 'component' : 'page'
@@ -626,10 +661,10 @@ function serializeComponent(ctx, component, scope = 'page') {
         attributes: (0, runtime_1.getValidValue)(component.xProps
             ? Object.assign(Object.assign({}, attributes), { style: (_j = component.xProps) === null || _j === void 0 ? void 0 : _j.style, class: (_l = (_k = component.xProps) === null || _k === void 0 ? void 0 : _k.classList) === null || _l === void 0 ? void 0 : _l.join(' ') }) : undefined),
         items: component.properties
-            ? Object.keys(component.properties).map((key) => {
+            ? serializeXIndex(componentCtx, 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)((_o = (_m = component.xProps) === null || _m === void 0 ? void 0 : _m.listeners) === null || _o === void 0 ? void 0 : _o.map((listener) => {
             return serializeListener(componentCtx, listener);
@@ -650,7 +685,7 @@ function serializeComponent(ctx, component, scope = 'page') {
 }
 exports.serializeComponent = serializeComponent;
 function deserializeComponent(ctx, components) {
-    let componentMap = components.reduce((map, item) => {
+    let componentMap = components.reduce((map, item, index) => {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const { attributeExtraData = {} } = item.extra || {};
         let dynamicStyle = item[':style']
@@ -696,15 +731,12 @@ function deserializeComponent(ctx, components) {
                 if (Array.isArray(item)) {
                     return !!item.length;
                 }
-                return item != undefined && !(0, common_2.isEmptyObj)(item);
+                return item !== undefined && !(0, common_2.isEmptyObj)(item);
             })
                 ? xProps
                 : undefined,
-            /**
-             * TODO
-             */
-            xIndex: ((_h = item.extra) === null || _h === void 0 ? void 0 : _h.xIndex) !== undefined ? (_j = item.extra) === null || _j === void 0 ? void 0 : _j.xIndex : undefined /* 0*/,
-            label: (item === null || item === void 0 ? void 0 : item.label) !== undefined ? item === null || item === void 0 ? void 0 : item.label : undefined /* 0*/,
+            xIndex: ((_h = item.extra) === null || _h === void 0 ? void 0 : _h.xIndex) !== undefined ? (_j = item.extra) === null || _j === void 0 ? void 0 : _j.xIndex : index,
+            label: (item === null || item === void 0 ? void 0 : item.label) !== undefined ? item === null || item === void 0 ? void 0 : item.label : undefined,
             properties: item.items ? deserializeComponent(ctx, item.items) : undefined,
         };
         map[item.id] = processed;
@@ -714,7 +746,7 @@ function deserializeComponent(ctx, components) {
 }
 exports.deserializeComponent = deserializeComponent;
 function serializePage(ctx, page) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const pageCtx = Object.assign(Object.assign({}, ctx), { page });
     if (pageCtx.dependencies && !pageCtx.dependenciesMap) {
         pageCtx.dependenciesMap = processDependenciesMap(pageCtx.dependencies || []);
@@ -724,18 +756,22 @@ function serializePage(ctx, page) {
         type: 'PAGE',
         component: 'Page',
         attributes: (0, runtime_1.getValidValue)((_a = serializeAttributesWithExtra(pageCtx, 'page', page.data)) === null || _a === void 0 ? void 0 : _a.data),
-        items: Object.keys(page.componentInstances || {}).map((id) => {
+        items: serializeXIndex(pageCtx, Object.keys(page.componentInstances || {}).map((id) => {
             return serializeComponent(pageCtx, Object.assign({ id }, page.componentInstances[id]));
-        }),
+        })),
         directives: {
             ':if': true,
         },
         resources: (_b = page === null || page === void 0 ? void 0 : page.lowCodes) === null || _b === void 0 ? void 0 : _b.map((item) => serializeCodeSource(pageCtx, item)),
         dataset: serializeDataset(ctx, page === null || page === void 0 ? void 0 : page.dataset),
         dataVariables: (0, runtime_1.getValidValue)((_d = (_c = page === null || page === void 0 ? void 0 : page.vars) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.map((item) => serializeDataVariables(pageCtx, item))),
-        listeners: (0, runtime_1.getValidValue)((_e = page === null || page === void 0 ? void 0 : page.listeners) === null || _e === void 0 ? void 0 : _e.map((item) => {
+        listeners: (0, runtime_1.getValidValue)((_e = ((page === null || page === void 0 ? void 0 : page.listeners) || [])) === null || _e === void 0 ? void 0 : _e.map((item) => {
             return serializeListener(pageCtx, item);
-        })),
+        }).concat(((_f = page === null || page === void 0 ? void 0 : page.eventFlows) === null || _f === void 0 ? void 0 : _f.reduce((list, flow) => {
+            var _a;
+            list.push(...(((_a = flow.listeners) === null || _a === void 0 ? void 0 : _a.map((item) => serializeListener(pageCtx, item))) || []));
+            return list;
+        }, [])) || [])),
         extra: {
             commonStyle: page === null || page === void 0 ? void 0 : page.commonStyle,
             xIndex: page.xIndex,
@@ -761,8 +797,9 @@ function serializePage(ctx, page) {
 }
 exports.serializePage = serializePage;
 function deserializePage(ctx, page) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f;
     let pageCtx = Object.assign(Object.assign({}, ctx), { page });
+    const { listeners = [], eventFlows } = processListeners((page === null || page === void 0 ? void 0 : page.listeners) || []);
     return {
         id: page.id,
         isHome: page.id === ctx.homePageId,
@@ -777,10 +814,16 @@ function deserializePage(ctx, page) {
         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,
-        lowCodes: (_f = page === null || page === void 0 ? void 0 : page.resources) === null || _f === void 0 ? void 0 : _f.filter((item) => item.type === common_1.EResourceType.CODE).map((item) => deserializeCodeResource(pageCtx, item)),
-        listeners: ((_g = page === null || page === void 0 ? void 0 : page.listeners) === null || _g === void 0 ? void 0 : _g.map((item) => {
+        lowCodes: (_f = page === null || page === void 0 ? void 0 : page.resources) === null || _f === void 0 ? void 0 : _f.filter((item) => item.type === common_1.EResourceType.CODE && item.name !== common_1.ECodeName.PLACEHOLDER).map((item) => deserializeCodeResource(pageCtx, item)),
+        listeners: (listeners === null || listeners === void 0 ? void 0 : listeners.map((item) => {
             return deserializeListener(pageCtx, item);
         })) || [],
+        eventFlows: (eventFlows === null || eventFlows === void 0 ? void 0 : eventFlows.map((eventFlow) => {
+            var _a, _b;
+            return Object.assign(Object.assign({}, eventFlow), { listeners: ((_b = (_a = eventFlow.listeners) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, (item) => {
+                    return deserializeListener(pageCtx, item);
+                })) || [] });
+        })) || [],
         // TODO
         // children: [],
         // styleBindPath: item.styleBindPath,
@@ -851,7 +894,7 @@ function deserializePlatformApp(data, optsions) {
         pageInstanceList: (data.items || []).map((page) => deserializePage(ctx, page)),
         // lowCodes: data.resources || [],
         lowCodes: (data.resources || [])
-            .filter((item) => item.type === common_1.EResourceType.CODE)
+            .filter((item) => item.type === common_1.EResourceType.CODE && item.name !== common_1.ECodeName.PLACEHOLDER)
             .map((item) => deserializeCodeResource(ctx, item)),
         datasources: data.dataSources,
         dataset: deserializeDataset(ctx, data.dataset),
@@ -896,7 +939,10 @@ function serializeRuntimePage(ctx, page) {
             return serializeRuntimeComponent(pageCtx, Object.assign({ id }, (_a = page.componentSchemaJson) === null || _a === void 0 ? void 0 : _a.properties[id]));
         })),
         resources: (_c = page === null || page === void 0 ? void 0 : page.codeModules) === null || _c === void 0 ? void 0 : _c.map((item) => serializeCodeSource(pageCtx, item)),
-        dataset: page === null || page === void 0 ? void 0 : page.dataset,
+        /**
+         * 感觉此处有问题，状态应该无法直接透传才对
+         */
+        dataset: serializeRuntimeDataset(pageCtx, page === null || page === void 0 ? void 0 : page.dataset),
         dataVariables: (0, runtime_1.getValidValue)((_e = (_d = page === null || page === void 0 ? void 0 : page.vars) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.map((item) => serializeDataVariables(pageCtx, item))),
         listeners: (0, runtime_1.getValidValue)((0, runtime_1.readListeners)(page.listenerInstances || []).map((item) => {
             return serializeListener(pageCtx, item);
@@ -925,6 +971,42 @@ function serializeRuntimePage(ctx, page) {
     return processedPage;
 }
 exports.serializeRuntimePage = serializeRuntimePage;
+function serializeRuntimeDataset(ctx, dataset) {
+    if (!dataset) {
+        return dataset;
+    }
+    const { query } = dataset, resetDataset = __rest(dataset, ["query"]);
+    return Object.assign(Object.assign({}, resetDataset), { query: query
+            ? Object.entries(query).reduce((map, [key, query]) => {
+                var _a;
+                let { dataSourceName, listenerInstances, method, handler, data, dataTypes, dataBinds } = query, restQuey = __rest(query, ["dataSourceName", "listenerInstances", "method", "handler", "data", "dataTypes", "dataBinds"]);
+                if (dataSourceName && !handler) {
+                    let { data: paramsData, dataBinds: paramsDataBinds = [], dataTypes: paramsDataTypes = [] } = method || {};
+                    handler = {
+                        moduleName: 'platform',
+                        name: 'cloud.callDataSource',
+                    };
+                    data = {
+                        dataSourceName,
+                        methodName: method === null || method === void 0 ? void 0 : method.name,
+                        params: paramsData,
+                    };
+                    dataTypes =
+                        paramsDataTypes.map((item) => (Object.assign(Object.assign({}, item), { propertyPath: `params.${item.propertyPath}` }))) || [];
+                    dataBinds = paramsDataBinds === null || paramsDataBinds === void 0 ? void 0 : paramsDataBinds.map((bind) => (Object.assign(Object.assign({}, bind), { propertyPath: `params.${bind.propertyPath}` })));
+                }
+                map[key] = Object.assign(Object.assign({}, restQuey), { handler: {
+                        module: 'platform',
+                        name: 'cloud.callDataSource',
+                        params: serializeAttributesWithExtra(ctx, 'page', (0, runtime_1.getValidValue)((0, runtime_1.readDynamicData)({ data, dataTypes, dataBinds })) || {}).data || {},
+                    }, listeners: (_a = (0, runtime_1.getValidValue)((0, runtime_1.readListeners)(listenerInstances || []))) === null || _a === void 0 ? void 0 : _a.map((listener /* IEventListener */) => {
+                        return serializeListener(ctx, listener);
+                    }) });
+                return map;
+            }, {})
+            : query });
+}
+exports.serializeRuntimeDataset = serializeRuntimeDataset;
 // /**
 //  * page
 //  * [CALS] to [formily]
@@ -1057,7 +1139,7 @@ function deserializeComponentLibraryMeta(meta) {
         dependencies, components: processedComponents, actions });
 }
 exports.deserializeComponentLibraryMeta = deserializeComponentLibraryMeta;
-function processRuntimeCodeResources(ctx, resources /* : IWeappCode[]*/ = [], scope) {
+function processRuntimeCodeResources(ctx, resources = [], scope) {
     const { id } = ctx;
     const fileTypes = [common_1.ECodeType.STYLE, common_1.ECodeType.STATE, common_1.ECodeType.LIFECYCLE, common_1.ECodeType.COMPUTEDN];
     const CODE_TYPE_NAME_MAP = {
@@ -1110,12 +1192,79 @@ function parseVersion(version = '', dependencies = []) {
          * 以及对根节点加 id
          */
         enablePageRoot: false,
+        /**
+         * 是否依赖 数据源 profile
+         */
+        staticDatasourceProfile: true,
     };
     if (list[0] === '4' || version === 'latest') {
         FEATURE_MAP.defaultDynamicCssUnit = false;
     }
     FEATURE_MAP.enableObserverRef = (0, featureChecker_1.isEnbaleObserverVersion)(dependencies);
     FEATURE_MAP.enablePageRoot = (0, featureChecker_1.isEnablePageRoot)(dependencies);
+    FEATURE_MAP.staticDatasourceProfile = !(0, featureChecker_1.isEnablePageRoot)(dependencies);
     return FEATURE_MAP;
 }
 exports.parseVersion = parseVersion;
+function processListeners(listeners, options) {
+    const { strict = false } = options || {};
+    const listenerEventNameMap = listeners.reduce((map, listener) => {
+        const { eventName } = listener;
+        if (!map[eventName]) {
+            map[eventName] = [];
+        }
+        map[eventName].push(listener);
+        return map;
+    }, {});
+    const flowListenerIdMap = {};
+    const eventFlowMap = {};
+    listeners.forEach((listener) => {
+        const { id, eventName } = listener;
+        if (flowListenerIdMap[id]) {
+            return;
+        }
+        const [_, eventFlowId] = eventName.match(/(.*?)\.start/) || [];
+        const evnetTree = [];
+        let eventFlow = { id: '', listeners: [] };
+        if (eventFlowId) {
+            eventFlow.id = eventFlowId;
+            if (listener.description) {
+                eventFlow.description = listener.description;
+            }
+            if (listener.label) {
+                eventFlow.label = listener.label;
+            }
+            eventFlowMap[eventFlowId] = eventFlow;
+            evnetTree.push(eventName);
+        }
+        for (let eventName of evnetTree) {
+            const list = listenerEventNameMap[eventName] || [];
+            if (strict && list.length > 1) {
+                throw new Error(`事件流 ${eventFlowId} 中 ${eventName} 事件存在并发调用`);
+            }
+            list.forEach((item) => {
+                flowListenerIdMap[item.id] = eventFlowId;
+                const successEventName = `${item.id}.success`;
+                const failEventName = `${item.id}.fail`;
+                if (listenerEventNameMap[successEventName]) {
+                    evnetTree.push(successEventName);
+                }
+                if (listenerEventNameMap[failEventName]) {
+                    evnetTree.push(failEventName);
+                }
+            });
+        }
+    });
+    const rawListeners = [];
+    listeners.forEach((listener) => {
+        const flowId = flowListenerIdMap[listener.id];
+        if (flowId && eventFlowMap[flowId]) {
+            eventFlowMap[flowId].listeners.push(listener);
+        }
+        else {
+            rawListeners.push(listener);
+        }
+    });
+    return { listeners: rawListeners, eventFlows: Object.values(eventFlowMap) };
+}
+exports.processListeners = processListeners;

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,iBAAiB,EAAE,eAAe,EAAqB,MAAM,mBAAmB,CAAC;AAI1F,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,eAAe,GAAG,iBAAiB,GAAG,aAAa,CAyD/G"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/block/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAqB,MAAM,mBAAmB,CAAC;AAK1F,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,eAAe,GAAG,iBAAiB,GAAG,aAAa,CAyD/G"}

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

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseComponentCals = void 0;
-const lodash_1 = require("lodash");
+const get_1 = __importDefault(require("lodash/get"));
+const set_1 = __importDefault(require("lodash/set"));
 const expression_1 = require("../../../expression");
 function parseComponentCals(ctx, cals) {
     if (!ctx.datasetMap) {
@@ -23,8 +27,8 @@ function parseComponentCals(ctx, cals) {
         id: cals.id || '',
     };
     const { component, module, attributes = {}, items = [], listeners = [], directives = {}, [':class']: dynamicClassList, [':style']: dynamicStyle, } = cals;
-    if (module && component && !(0, lodash_1.get)(ctx.componentMap, `${module}.${component}`)) {
-        (0, lodash_1.set)(ctx.componentMap, `${module}.${component}`, true);
+    if (module && component && !(0, get_1.default)(ctx.componentMap, `${module}.${component}`)) {
+        (0, set_1.default)(ctx.componentMap, `${module}.${component}`, true);
         ctx.componentLibMap[module] = true;
     }
     // 优先处理 directives 因为其他绑定会用到for

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/code/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAsE,MAAM,mBAAmB,CAAC;AAGrH,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,SAAS,EAAE,CAwL3F;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,YAAY,CA+J3F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CA6BlF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/code/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAsE,MAAM,mBAAmB,CAAC;AAKrH,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,SAAS,EAAE,CAwL3F;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,YAAY,CA+J3F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CA6BlF"}