@cloudbase/cals 0.3.33-alpha.2 → 0.3.35

package/lib/utils/build.js

@@ -37,9 +37,9 @@ const compilerOptions = {
 };
 // optionally pass a base path
 const basePath = '.';
-const calsProgram = TJS.getProgramFromFiles([(0, path_1.resolve)(process.cwd(), 'types/basic/app.ts')], compilerOptions, basePath);
-const platformCalsProgram = TJS.getProgramFromFiles([(0, path_1.resolve)(process.cwd(), 'types/platform/app.ts')], compilerOptions, basePath);
-const lcdsProgram = TJS.getProgramFromFiles([(0, path_1.resolve)(process.cwd(), 'types/lcds.ts')], compilerOptions, basePath);
+const calsProgram = TJS.getProgramFromFiles([(0, path_1.resolve)(process.cwd(), 'src/types/basic/app.ts')], compilerOptions, basePath);
+const platformCalsProgram = TJS.getProgramFromFiles([(0, path_1.resolve)(process.cwd(), 'src/types/platform/app.ts')], compilerOptions, basePath);
+const lcdsProgram = TJS.getProgramFromFiles([(0, path_1.resolve)(process.cwd(), 'src/types/lcds.ts')], compilerOptions, basePath);
 // ... or a generator that lets us incrementally get more schemas
 const calsGenerator = TJS.buildGenerator(calsProgram, settings);
 const platformCalsGenerator = TJS.buildGenerator(platformCalsProgram, settings);

package/lib/utils/constant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../utils/constant.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,oBAAY,iBAAiB;IAC3B,UAAU,eAAe;CAC1B;AACD;;GAEG;AACH,eAAO,MAAM,aAAa,SAAS,CAAC;AAEpC,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAEhD;;GAEG;AACH,eAAO,MAAM,6BAA6B,QAAqD,CAAC"}
+{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../src/utils/constant.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,oBAAY,iBAAiB;IAC3B,UAAU,eAAe;CAC1B;AACD;;GAEG;AACH,eAAO,MAAM,aAAa,SAAS,CAAC;AAEpC,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAEhD;;GAEG;AACH,eAAO,MAAM,6BAA6B,QAAqD,CAAC"}

package/lib/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC"}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@cloudbase/cals",
-  "version": "0.3.33-alpha.2",
+  "version": "0.3.35",
   "description": "Common application specifications",
   "main": "lib/utils/index.js",
-  "typedocMain": "types/index.ts",
+  "typedocMain": "src/types/index.ts",
   "files": [
     "lib"
   ],
   "scripts": {
     "build": "tsc",
-    "build:schema": "node lib/utils/build.js",
+    "build:schema": "ts-node src/utils/build.ts",
     "develop": "tsc --watch",
     "docs": "typedoc --options typedoc.json types",
     "test": "jest"

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

@@ -1,35 +0,0 @@
-/**
- * clas 与 code 互转
- * 这里的 code 是中间状态的 code，即非最终生成的可运行的项目代码
- */
-import { IPlatformApp } from '../../../../types';
-export interface ICodeItem {
-    path: string;
-    code: string;
-    conflict?: boolean;
-}
-/**
- * CALS 转成 中间状态的代码
- *
- * @params version: v0 - 没有 pages 目录； v1 - 有 pages 目录
- */
-export declare function calsToCode(calsJSON: IPlatformApp, version?: 'v0' | 'v1'): ICodeItem[];
-/**
- * 中间状态的代码 转成 CALS
- *
- * @params version: v0 - 没有 pages 目录； v1 - 有 pages 目录
- */
-export declare function codeToCals(codeList: ICodeItem[], version?: 'v0' | 'v1'): IPlatformApp;
-/**
- * 指定目录下的文件转代码
- */
-export declare function fileToCode(dirPath: string, onlyPath?: boolean): Promise<ICodeItem[]>;
-/**
- * 指定代码内容是否存在冲突未解决
- */
-export declare function checkForConflicts(code: string): boolean;
-/**
- * 以 from 为准自动解决冲突
- */
-export declare function autoResolveConflicts(code: string, from: 'theirs' | 'ours'): string;
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../parser/cals/utils/code/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAiC,MAAM,mBAAmB,CAAC;AAMhF,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,CAiL3F;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,OAAO,GAAE,IAAI,GAAG,IAAW,GAAG,YAAY,CA4J3F;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAqBjG;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"}

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

@@ -1,419 +0,0 @@
-"use strict";
-/**
- * clas 与 code 互转
- * 这里的 code 是中间状态的 code，即非最终生成的可运行的项目代码
- */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.autoResolveConflicts = exports.checkForConflicts = exports.fileToCode = exports.codeToCals = exports.calsToCode = void 0;
-const lodash_1 = require("lodash");
-const glob_1 = __importDefault(require("glob"));
-const path_1 = __importDefault(require("path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-/**
- * 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, listeners, module, type 忽略，所以这里不包含
-        const pageConfigFields = ['attributes', 'dataset', 'extra', 'label', 'name'];
-        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',
-    ];
-    const otherConfigFields = {
-        // 来自 Interface IPlatformAppExtra
-        extra: [
-            'appConfig',
-            'compHiddenConfig',
-            'domain',
-            'historyType',
-            'maxID',
-            'miniprogramPlugins',
-            'npmDependencies',
-            'plugins',
-            'presetColors',
-            'rootPath',
-            'themeVars',
-            'originHistoryId',
-            // 额外添加，非标准
-            'pages',
-        ],
-    };
-    // @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) {
-        const config = (0, lodash_1.pick)(itemJSON, configFields);
-        if (otherConfigFields) {
-            Object.keys(otherConfigFields).forEach((key) => {
-                config[key] = (0, lodash_1.pick)(config[key], otherConfigFields[key]);
-            });
-        }
-        // state, computed 类型以及名称为 ____index____ 的都不生成代码
-        config._ignoreResources = itemJSON.resources.filter((item) => ['state', 'computed'].includes(item.codeType) || item.name === '____index____');
-        // 按 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 === 'CODE' && item.name !== '____index____');
-        codeResources.forEach((codeItem) => {
-            let codePath = '';
-            let realBasePath = basePath ? `${basePath}/` : basePath;
-            switch (codeItem.codeType) {
-                case 'theme':
-                    codePath = `${realBasePath}theme.less`;
-                    break;
-                case 'style':
-                    codePath = `${realBasePath}style.less`;
-                    break;
-                case 'lifecycle':
-                    codePath = `${realBasePath}lifecycle.js`;
-                    break;
-                // 这两种类型的文件现在不生成文件，需要存放在 config 中
-                case 'state':
-                    // codePath = `${realBasePath}state.js`;
-                    break;
-                case 'computed':
-                    // codePath = `${realBasePath}computed.js`;
-                    break;
-                case 'normal-module':
-                    codePath = `common/${codeItem.name}.js`;
-                    break;
-                case 'handler-fn':
-                    codePath = `${realBasePath}handler/${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.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, lodash_1.omit)(config, ['_ignoreResources', 'extra.pages']));
-            calsJSON.resources = (0, lodash_1.concat)(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 (versionConfig.pageConfigRegExp.test(codeItem.path)) {
-                /**
-                 * page-config.json
-                 */
-                const config = JSON.parse(codeItem.code);
-                const propsConfig = (0, lodash_1.omit)(config, ['_ignoreResources']);
-                Object.assign(pageItem, propsConfig);
-                pageItem.resources = (0, lodash_1.concat)(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) {
-        const relativePath = !pageId
-            ? codeItem.path.replace('src/', '')
-            : codeItem.path.replace(`${versionConfig.pageDir}/${pageId}/`, '');
-        const _pageId = !pageId ? 'global' : pageId;
-        const commonVal = {
-            code: codeItem.code,
-            type: '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':
-                calsJSON.resources.push(Object.assign({ name: 'theme', path: `${_pageId}/theme`, codeType: 'theme' }, commonVal));
-                break;
-            case 'style.less':
-                resources.push(Object.assign({ name: 'style', path: `${_pageId}/style`, codeType: 'style' }, commonVal));
-                break;
-            case 'lifecycle.js':
-                resources.push(Object.assign({ name: 'lifecycle', path: `${_pageId}/lifecycle`, codeType: '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: 'handler-fn' }, commonVal), { system: false }));
-                }
-                // globa common
-                const commonMatches = relativePath.match(/^common\/([^/]*?).js$/);
-                if (commonMatches) {
-                    const [, name] = commonMatches;
-                    calsJSON.resources.push(Object.assign({ name, path: `${_pageId}/common/${name}`, codeType: 'normal-module' }, commonVal));
-                }
-                break;
-        }
-    }
-    function isPageFile(filePath) {
-        return pagePaths.map((pagePath) => `src/${pagePath}`).some((pagePath) => filePath.indexOf(pagePath) === 0);
-    }
-}
-exports.codeToCals = codeToCals;
-/**
- * 指定目录下的文件转代码
- */
-function fileToCode(dirPath, onlyPath = false) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const result = yield new Promise((resolve, reject) => {
-            // 只包含 js, json, less 文件，其它忽略（因为不属于 weda 的文件）
-            (0, glob_1.default)(path_1.default.resolve(dirPath, '**', '*.@(js|json|less)'), {}, function (err, files) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    if (err)
-                        reject(err);
-                    else {
-                        const codeList = yield Promise.all(files.map((filePath) => __awaiter(this, void 0, void 0, function* () {
-                            const codePath = path_1.default.relative(dirPath, filePath);
-                            const codeContent = onlyPath ? '' : yield fs_extra_1.default.readFile(filePath, 'utf8');
-                            return {
-                                path: codePath,
-                                code: codeContent,
-                            };
-                        })));
-                        resolve(codeList);
-                    }
-                });
-            });
-        });
-        return result;
-    });
-}
-exports.fileToCode = fileToCode;
-/**
- * 指定代码内容是否存在冲突未解决
- */
-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;
-}