@cloudbase/cals 1.0.49 → 1.0.50

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

@@ -134,11 +134,11 @@ export default function({event, data}) {
     // 普通模块-没有上下文，无法直接获取 state 信息
     [types_1.ECodeType.NORMAL_MODULE]: `
 /*
-* 函数里面访问：通过 app.common.[name].xxx 访问这里定义的方法或值
-* 函数外面访问：通过 import（如在页面的 handler 引用的例子：import { xxx } from '../../common/[name]'）
+* 函数里面访问：通过 app.common.[name] 访问这里定义的方法或值
+* 函数外面访问：通过 import（如在页面的 handler 引用的例子：import sayHi from '../../common/[name]'）
 */
 
-export function sayHi() {
+export default function sayHi() {
   console.log('Hi LowCode')
 }
 `,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/cals",
-  "version": "1.0.49",
+  "version": "1.0.50",
   "description": "Common application specifications",
   "main": "lib/utils/index.js",
   "source": "src/utils/index.ts",
@@ -44,7 +44,7 @@
     "postcss-less": "^6.0.0"
   },
   "devDependencies": {
-    "@tcwd/dev-tools": "workspace:^",
+    "@tcwd/dev-tools": "^1.0.1",
     "@types/acorn": "^4.0.5",
     "@types/jest": "^27.4.0",
     "@types/lodash": "^4.14.168",
@@ -63,4 +63,4 @@
     "typescript": "^4.7.4",
     "typescript-json-schema": "^0.53.0"
   }
-}
+}

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

@@ -1,151 +0,0 @@
-"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 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) {
-        ctx.datasetMap = {};
-    }
-    if (!ctx.dataSourceMap) {
-        ctx.dataSourceMap = {};
-    }
-    if (!ctx.componentMap) {
-        ctx.componentMap = {};
-    }
-    if (!ctx.lowcodeMap) {
-        ctx.lowcodeMap = {};
-    }
-    if (!ctx.componentLibMap) {
-        ctx.componentLibMap = {};
-    }
-    ctx.component = {
-        id: cals.id || '',
-    };
-    const { component, module, attributes = {}, items = [], listeners = [], directives = {}, [':class']: dynamicClassList, [':style']: dynamicStyle, } = cals;
-    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
-    parseDirectivesCals(ctx, directives);
-    pasrseDynamicMapCals(ctx, attributes);
-    for (let item of listeners) {
-        parseListenertCals(ctx, item);
-    }
-    if (dynamicClassList) {
-        parseValueCals(ctx, dynamicClassList);
-    }
-    if (dynamicStyle) {
-        parseValueCals(ctx, dynamicStyle);
-    }
-    for (let item of items) {
-        parseComponentCals(ctx, item);
-    }
-    return ctx;
-}
-exports.parseComponentCals = parseComponentCals;
-function parseListenertCals(ctx, listener) {
-    let { type, handler } = listener;
-    switch (type) {
-        case expression_1.ActionType.Rematch: {
-            if (handler === null || handler === void 0 ? void 0 : handler.name) {
-                ctx.lowcodeMap[handler === null || handler === void 0 ? void 0 : handler.name] = true;
-            }
-            pasrseDynamicMapCals(ctx, handler === null || handler === void 0 ? void 0 : handler.params);
-            break;
-        }
-        case expression_1.ActionType.DataSource: {
-            let params = handler === null || handler === void 0 ? void 0 : handler.params;
-            pasrseDynamicMapCals(params);
-            if (params === null || params === void 0 ? void 0 : params.dataSourceName) {
-                ctx.dataSourceMap[params === null || params === void 0 ? void 0 : params.dataSourceName] = true;
-            }
-            break;
-        }
-        case expression_1.ActionType.Material: {
-            if (handler === null || handler === void 0 ? void 0 : handler.module) {
-                ctx.componentLibMap[handler === null || handler === void 0 ? void 0 : handler.module] = true;
-            }
-            pasrseDynamicMapCals(ctx, handler === null || handler === void 0 ? void 0 : handler.params);
-            break;
-        }
-        case expression_1.ActionType.Platform: {
-            pasrseDynamicMapCals(ctx, handler === null || handler === void 0 ? void 0 : handler.params);
-            break;
-        }
-    }
-}
-function pasrseDynamicMapCals(ctx, map = {}) {
-    for (let key in map) {
-        if (/^:/.test(key) && typeof map[key] === 'string') {
-            parseValueCals(ctx, map[key]);
-        }
-    }
-}
-function parseDirectivesCals(ctx, directives) {
-    var _a;
-    // 优先处理for，因为其他的可能会用到 foritem
-    let forValue = directives[':for'];
-    if (typeof forValue === 'string') {
-        parseValueCals(ctx, forValue);
-        if (!ctx.forContext) {
-            ctx.forContext = {};
-        }
-        if ((_a = ctx.component) === null || _a === void 0 ? void 0 : _a.id) {
-            ctx.forContext[ctx.component.id] = true;
-        }
-    }
-    let visibleValue = directives[':if'];
-    if (typeof visibleValue === 'string') {
-        parseValueCals(ctx, visibleValue);
-    }
-}
-function parseValueCals(ctx, value) {
-    var _a, _b;
-    try {
-        let parser = new expression_1.DynamicValueParser(value, { pageId: '$page' });
-        let res = parser.parse();
-        switch (res.type) {
-            case expression_1.PropBindType.params:
-            case expression_1.PropBindType.stateData: {
-                const TYPE_MAP = {
-                    [expression_1.PropBindType.params]: 'params',
-                    [expression_1.PropBindType.stateData]: 'state',
-                };
-                const type = TYPE_MAP[res.type];
-                const path = ((_a = res.value) === null || _a === void 0 ? void 0 : _a.split('.')) || [];
-                let key = path[0];
-                if (!ctx.datasetMap[key]) {
-                    ctx.datasetMap[key] = {};
-                }
-                if (path.length === 1) {
-                    ctx.datasetMap[key][type] = true;
-                }
-                else {
-                    ctx.datasetMap[key][`${type}.${path[1].replace(/\[.*/, '')}`] = true;
-                }
-                break;
-            }
-            case expression_1.PropBindType.forItem: {
-                const [id] = ((_b = res.value) === null || _b === void 0 ? void 0 : _b.split('.')) || [];
-                if (!ctx.forContext[id]) {
-                    throw {
-                        code: 'INVALID_FOR_CONTEXT',
-                        message: '缺少循环上下文，无法保存为区块',
-                    };
-                }
-                break;
-            }
-        }
-    }
-    catch (e) {
-        if ((e === null || e === void 0 ? void 0 : e.code) === 'INVALID_FOR_CONTEXT') {
-            throw e;
-        }
-    }
-}

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

@@ -1,393 +0,0 @@
-"use strict";
-/**
- * cals 与 code 互转
- * 这里的 code 是中间状态的 code，即非最终生成的可运行的项目代码
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAllConflicts = exports.autoResolveConflicts = exports.checkForConflicts = exports.codeToCals = exports.calsToCode = void 0;
-const types_1 = require("../../../../types");
-const pick_1 = __importDefault(require("lodash/pick"));
-const omit_1 = __importDefault(require("lodash/omit"));
-const concat_1 = __importDefault(require("lodash/concat"));
-/**
- * CALS 转成 中间状态的代码
- *
- * @params version: v0 - 没有 pages 目录； v1 - 有 pages 目录
- */
-function calsToCode(calsJSON, version = 'v1') {
-    // 边界处理
-    if (!calsJSON)
-        return [];
-    const versionMap = {
-        v0: {
-            pageDir: '',
-        },
-        v1: {
-            pageDir: 'pages',
-        },
-    };
-    const versionConfig = versionMap[version];
-    if (!versionConfig)
-        throw "version' value must be v0 or v1";
-    const codeList = [];
-    /**
-     * 生成 pages
-     */
-    const pagePaths = [];
-    calsJSON.items.forEach((pageItem) => {
-        const pagePath = versionConfig.pageDir ? `${versionConfig.pageDir}/${pageItem.id}` : pageItem.id;
-        /**
-         * 生成 page-config.json
-         */
-        // 来自 IPageComponent
-        // :class, :style, component, dataVariables, directives, id, module, type 忽略，所以这里不包含
-        const pageConfigFields = ['attributes', 'dataset', 'extra', 'label', 'name', 'listeners'];
-        genConfig(pageItem, pageConfigFields, `${pagePath}/page-config.json`);
-        /**
-         * 生成 page.json
-         */
-        addCodeItem(`${pagePath}/page.json`, JSON.stringify(pageItem.items, null, 2));
-        /**
-         * 生成页面代码
-         */
-        genCode(pageItem.resources, pagePath);
-        // 记录页面目录路径
-        pagePaths.push(pagePath);
-    });
-    /**
-     * 生成 app-config.json
-     */
-    // 来自 Interface IPlatformApp
-    // dataSources, dataVariables 忽略，所以这里不包含
-    const appConfigFields = [
-        'author',
-        'dataset',
-        'dependencies',
-        'description',
-        'envId',
-        'extra',
-        'id',
-        'label',
-        'main',
-        'name',
-        'version',
-        'schemaVersion',
-        'externalResources',
-        'theme',
-    ];
-    const otherConfigFields = {
-        // 来自 Interface IPlatformAppExtra
-        extra: [
-            'appConfig',
-            'compHiddenConfig',
-            'domain',
-            'historyType',
-            'maxID',
-            'miniprogramPlugins',
-            'npmDependencies',
-            'plugins',
-            'presetColors',
-            'rootPath',
-            'themeVars',
-            'originHistoryId',
-            // 额外添加，非标准
-            'pages',
-            'processPages',
-        ],
-    };
-    // @ts-ignore
-    calsJSON.extra.pages = pagePaths;
-    genConfig(calsJSON, appConfigFields, 'app-config.json', otherConfigFields);
-    /**
-     * 生成全局代码
-     */
-    genCode(calsJSON.resources);
-    /**
-     * 生成 package.json 文件
-     */
-    addCodeItem('package.json', JSON.stringify({
-        name: calsJSON.name,
-        description: calsJSON.description,
-        version: calsJSON.version,
-    }, null, 2), '');
-    return codeList;
-    function addCodeItem(path, code, parentDir = 'src') {
-        codeList.push({
-            path: parentDir ? `${parentDir}/${path}` : path,
-            code,
-        });
-    }
-    function genConfig(itemJSON, configFields, configPath, otherConfigFields) {
-        var _a;
-        const config = (0, pick_1.default)(itemJSON, configFields);
-        if (otherConfigFields) {
-            Object.keys(otherConfigFields).forEach((key) => {
-                config[key] = (0, pick_1.default)(config[key], otherConfigFields[key]);
-            });
-        }
-        // state, computed 类型以及名称为 ____index____ 的都不生成代码
-        config._ignoreResources =
-            ((_a = itemJSON.resources) === null || _a === void 0 ? void 0 : _a.filter((item) => [types_1.ECodeType.STATE, types_1.ECodeType.COMPUTEDN].includes(item.codeType) ||
-                item.name === types_1.ECodeName.PLACEHOLDER)) || [];
-        // 按 key 排序，这样确保每次生成都一样的顺序，减少冲突
-        const newConfig = {};
-        Object.keys(config)
-            .sort()
-            .forEach((key) => (newConfig[key] = config[key]));
-        addCodeItem(configPath, JSON.stringify(config, null, 2));
-    }
-    function genCode(resources, basePath = '') {
-        const codeResources = (resources || []).filter((item) => item.type === types_1.EResourceType.CODE && item.name !== types_1.ECodeName.PLACEHOLDER);
-        codeResources.forEach((codeItem) => {
-            let codePath = '';
-            let realBasePath = basePath ? `${basePath}/` : basePath;
-            switch (codeItem.codeType) {
-                case types_1.ECodeType.THEME:
-                    codePath = `${realBasePath}${types_1.ECodeName.THEME}.less`;
-                    break;
-                case types_1.ECodeType.STYLE:
-                    codePath = `${realBasePath}${types_1.ECodeName.STYLE}.less`;
-                    break;
-                case types_1.ECodeType.LIFECYCLE:
-                    codePath = `${realBasePath}${types_1.ECodeName.LIFECYCLE}.js`;
-                    break;
-                // 这两种类型的文件现在不生成文件，需要存放在 config 中
-                case types_1.ECodeType.STATE:
-                    // codePath = `${realBasePath}state.js`;
-                    break;
-                case types_1.ECodeType.COMPUTEDN:
-                    // codePath = `${realBasePath}computed.js`;
-                    break;
-                case types_1.ECodeType.NORMAL_MODULE:
-                    codePath = `${types_1.ECodeName.NORMAL_MODULE}/${codeItem.name}.js`;
-                    break;
-                case types_1.ECodeType.HANDLER_FN:
-                    codePath = `${realBasePath}${types_1.ECodeName.HANDLER_FN}/${codeItem.name}.js`;
-                    break;
-            }
-            if (codePath) {
-                addCodeItem(codePath, codeItem.code);
-            }
-        });
-    }
-}
-exports.calsToCode = calsToCode;
-/**
- * 中间状态的代码 转成 CALS
- *
- * @params version: v0 - 没有 pages 目录； v1 - 有 pages 目录
- */
-function codeToCals(codeList, version = 'v1') {
-    // 边界处理
-    if (!codeList || codeList.length === 0)
-        return {};
-    const versionMap = {
-        v0: {
-            pageDir: 'src',
-            pageIdRegExp: /src\/(.*?)\/.*/,
-            pageConfigRegExp: /src\/.*?\/page-config.json$/,
-            pageJSONRegExp: /src\/.*?\/page.json/,
-        },
-        v1: {
-            pageDir: 'src/pages',
-            pageIdRegExp: /src\/pages\/(.*?)\/.*/,
-            pageConfigRegExp: /src\/pages\/.*?\/page-config.json$/,
-            pageJSONRegExp: /src\/pages\/.*?\/page.json/,
-        },
-    };
-    const versionConfig = versionMap[version];
-    if (!versionConfig)
-        throw "version' value must be v0 or v1";
-    // @ts-ignore
-    const calsJSON = {
-        items: [],
-        resources: [],
-    };
-    const appConfigCodeItem = codeList.find((item) => item.path === 'src/app-config.json');
-    const appConfig = JSON.parse((appConfigCodeItem === null || appConfigCodeItem === void 0 ? void 0 : appConfigCodeItem.code) || '{}');
-    let pagePaths = appConfig.extra.pages;
-    codeList.forEach((codeItem) => {
-        if (codeItem.path === 'src/app-config.json') {
-            /**
-             * app-config.json
-             */
-            const config = appConfig;
-            Object.assign(calsJSON, (0, omit_1.default)(config, ['_ignoreResources', 'extra.pages']));
-            calsJSON.resources = (0, concat_1.default)(calsJSON.resources, config._ignoreResources);
-        }
-        else if (isPageFile(codeItem.path)) {
-            /**
-             * page
-             */
-            const [, pageId] = codeItem.path.match(versionConfig.pageIdRegExp) || [];
-            let pageItem = calsJSON.items.find((item) => item.id === pageId);
-            if (!pageItem) {
-                pageItem = {
-                    id: pageId,
-                    type: 'PAGE',
-                    resources: [],
-                };
-                calsJSON.items.push(pageItem);
-            }
-            if (!pageItem.resources) {
-                pageItem.resources = [];
-            }
-            if (versionConfig.pageConfigRegExp.test(codeItem.path)) {
-                /**
-                 * page-config.json
-                 */
-                const config = JSON.parse(codeItem.code);
-                const propsConfig = (0, omit_1.default)(config, ['_ignoreResources']);
-                Object.assign(pageItem, propsConfig);
-                pageItem.resources = (0, concat_1.default)(pageItem.resources, config._ignoreResources);
-            }
-            else if (versionConfig.pageJSONRegExp.test(codeItem.path)) {
-                /**
-                 * page.json
-                 */
-                pageItem.items = JSON.parse(codeItem.code);
-            }
-            else {
-                /**
-                 * page normal codes
-                 */
-                handleNormalCodes(codeItem, pageId, pageItem.resources);
-            }
-        }
-        else if (codeItem.path.indexOf('src/') === 0) {
-            /**
-             * global normal codes
-             */
-            handleNormalCodes(codeItem, '', calsJSON.resources || []);
-        }
-    });
-    return calsJSON;
-    function handleNormalCodes(codeItem, pageId, resources) {
-        var _a, _b;
-        const relativePath = !pageId
-            ? codeItem.path.replace('src/', '')
-            : codeItem.path.replace(`${versionConfig.pageDir}/${pageId}/`, '');
-        const _pageId = !pageId ? 'global' : pageId;
-        const commonVal = {
-            code: codeItem.code,
-            type: types_1.EResourceType.CODE,
-            system: true,
-        };
-        /**
-         * 只处理 path 为 src/theme.less, src/style.less, src/lifecycle.js, src/common/xxx.js, src/pages/xxx/handler/xxx.js
-         * 其它视为无效文件忽略
-         */
-        switch (relativePath) {
-            case 'theme.less':
-                (_a = calsJSON.resources) === null || _a === void 0 ? void 0 : _a.push(Object.assign({ name: types_1.ECodeType.THEME, path: `${_pageId}/${types_1.ECodeType.THEME}`, codeType: types_1.ECodeType.THEME }, commonVal));
-                break;
-            case 'style.less':
-                resources.push(Object.assign({ name: types_1.ECodeType.STYLE, path: `${_pageId}/${types_1.ECodeType.STYLE}`, codeType: types_1.ECodeType.STYLE }, commonVal));
-                break;
-            case 'lifecycle.js':
-                resources.push(Object.assign({ name: types_1.ECodeType.LIFECYCLE, path: `${_pageId}/${types_1.ECodeType.LIFECYCLE}`, codeType: types_1.ECodeType.LIFECYCLE }, commonVal));
-                break;
-            default:
-                // page handler
-                const handlerMatches = relativePath.match(/^handler\/([^/]*?).js$/);
-                if (handlerMatches) {
-                    const [, name] = handlerMatches;
-                    resources.push(Object.assign(Object.assign({ name, path: `${_pageId}/handler/${name}`, codeType: types_1.ECodeType.HANDLER_FN }, commonVal), { system: false }));
-                }
-                // globa common
-                const commonMatches = relativePath.match(/^common\/([^/]*?).js$/);
-                if (commonMatches) {
-                    const [, name] = commonMatches;
-                    (_b = calsJSON.resources) === null || _b === void 0 ? void 0 : _b.push(Object.assign({ name, path: `${_pageId}/common/${name}`, codeType: types_1.ECodeType.NORMAL_MODULE }, commonVal));
-                }
-                break;
-        }
-    }
-    function isPageFile(filePath) {
-        return pagePaths.map((pagePath) => `src/${pagePath}`).some((pagePath) => filePath.indexOf(pagePath) === 0);
-    }
-}
-exports.codeToCals = codeToCals;
-/**
- * 指定代码内容是否存在冲突未解决
- */
-function checkForConflicts(code) {
-    return findAllConflicts(code, true).length > 0;
-}
-exports.checkForConflicts = checkForConflicts;
-/**
- * 以 from 为准自动解决冲突
- */
-function autoResolveConflicts(code, from) {
-    const allConflicts = findAllConflicts(code);
-    const lines = code.split('\n');
-    const result = [];
-    const removeLines = [];
-    allConflicts.forEach((conflictItem) => {
-        if (from === 'theirs') {
-            // 删除上面的
-            removeLines.push([conflictItem.start, conflictItem.middle], conflictItem.end);
-        }
-        else {
-            // default is ours
-            // 删除下面的
-            removeLines.push(conflictItem.start, [conflictItem.middle, conflictItem.end]);
-        }
-    });
-    lines.forEach((line, idx) => {
-        const matched = removeLines.some((rmIdx) => {
-            if (Array.isArray(rmIdx)) {
-                return idx >= rmIdx[0] && idx <= rmIdx[1];
-            }
-            else {
-                return idx === rmIdx;
-            }
-        });
-        if (!matched)
-            result.push(line);
-    });
-    return result.join('\n');
-}
-exports.autoResolveConflicts = autoResolveConflicts;
-function findAllConflicts(code, onlyFindFirstOne = false) {
-    let allConflicts = [];
-    const lines = code.split('\n');
-    let oneConflict = { start: -1, middle: -1, end: -1 };
-    for (let i = 0, leng = lines.length; i < leng; i++) {
-        const line = lines[i];
-        if (/^<<<<<<<.*/.test(line)) {
-            if (oneConflict.start === -1) {
-                // 起点
-                oneConflict.start = i;
-            }
-            else {
-                // 非起点：一个完整的冲突还未结束，出现起点符号，下边的内容冲突全部无效
-                break;
-            }
-        }
-        else if (/^=======$/.test(line)) {
-            if (oneConflict.start !== -1) {
-                // 有 <<<<<<< 起点符号
-                if (oneConflict.middle === -1) {
-                    // 未有 ======= 中间符号
-                    oneConflict.middle = i;
-                }
-            }
-        }
-        else if (/^>>>>>>>.*/.test(line)) {
-            if (oneConflict.start !== -1 && oneConflict.middle !== -1) {
-                oneConflict.end = i;
-                allConflicts.push(oneConflict);
-                // 重置
-                oneConflict = { start: -1, middle: -1, end: -1 };
-                if (onlyFindFirstOne)
-                    break;
-            }
-        }
-    }
-    return allConflicts;
-}
-exports.findAllConflicts = findAllConflicts;