@cloudbase/cals 0.3.35 → 0.4.0

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

@@ -301,6 +301,7 @@ export declare function deserializePlatformApp(data: IPlatformApp, optsions: {
         author: string;
         description: string;
         domain?: string;
+        originHistoryId?: string;
     };
     dependencies: IDependencies;
 };

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

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

package/lib/parser/cals/index.js

@@ -228,6 +228,10 @@ function recoverSynamicMap(parent, current, path = '') {
     Object.keys(current).forEach((key) => {
         let value = current[key];
         if ((0, lodash_1.isArray)(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)) {
@@ -252,18 +256,18 @@ function recoverSynamicMap(parent, current, path = '') {
     return current;
 }
 function deserializeDynamicMap(ctx, map, extraMap) {
-    var _a, _b, _c;
+    var _a, _b;
     let data = {};
     const clonedMap = (0, lodash_1.cloneDeep)(map);
     // 还原flatten path
     map = recoverSynamicMap(clonedMap, clonedMap, '');
     for (let key in map || {}) {
-        let value = (_a = map) === null || _a === void 0 ? void 0 : _a[key];
+        let value = map === null || map === void 0 ? void 0 : map[key];
         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 === null || item === void 0 ? void 0 : item.selectableBlock)))) {
-            (_c = processedValue === null || processedValue === void 0 ? void 0 : processedValue.value) === null || _c === void 0 ? void 0 : _c.forEach((_value) => {
+        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)))) {
+            (_b = processedValue === null || processedValue === void 0 ? void 0 : processedValue.value) === null || _b === void 0 ? void 0 : _b.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();

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

@@ -0,0 +1,31 @@
+/**
+ * cals 与 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 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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/code/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAA2D,MAAM,mBAAmB,CAAC;AAG1G,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,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

@@ -0,0 +1,376 @@
+"use strict";
+/**
+ * cals 与 code 互转
+ * 这里的 code 是中间状态的 code，即非最终生成的可运行的项目代码
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.autoResolveConflicts = exports.checkForConflicts = exports.codeToCals = exports.calsToCode = void 0;
+const types_1 = require("../../../../types");
+const lodash_1 = require("lodash");
+/**
+ * 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) => [types_1.ECodeType.STATE, types_1.ECodeType.COMPUTEDN].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 === types_1.EResourceType.CODE && item.name !== '____index____');
+        codeResources.forEach((codeItem) => {
+            let codePath = '';
+            let realBasePath = basePath ? `${basePath}/` : basePath;
+            switch (codeItem.codeType) {
+                case types_1.ECodeType.THEME:
+                    codePath = `${realBasePath}theme.less`;
+                    break;
+                case types_1.ECodeType.STYLE:
+                    codePath = `${realBasePath}style.less`;
+                    break;
+                case types_1.ECodeType.LIFECYCLE:
+                    codePath = `${realBasePath}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 = `common/${codeItem.name}.js`;
+                    break;
+                case types_1.ECodeType.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: 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':
+                calsJSON.resources.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;
+                    calsJSON.resources.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;
+}

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

@@ -7,7 +7,7 @@ const common_1 = require("./common");
 const lodash_1 = require("lodash");
 function readComponents(properties = {}, excludeKeys = []) {
     var _a;
-    const cmps = {};
+    const cmps /* IWeAppPage['componentInstances'] */ = {};
     for (const key in properties) {
         if (excludeKeys.indexOf(key) > -1) {
             continue;
@@ -62,7 +62,7 @@ function readComponents(properties = {}, excludeKeys = []) {
 exports.readComponents = readComponents;
 function readDirectives(cmp) {
     var _a, _b;
-    const directives = {};
+    const directives /* IWeAppComponentInstance['xProps']['directives'] */ = {};
     // 默认为 true，节省体积不记录
     if (cmp.data && cmp.data._visible !== true) {
         directives.waIf = {

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/parser/cals/utils/version/parses.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/parser/index.d.ts

@@ -1,6 +1,7 @@
 export * from './cals/index';
 export { upgrageToVersion2 } from './cals/utils/version';
 export { processComponentModule } from './cals/utils/spinoff';
+export { calsToCode, codeToCals, ICodeItem, checkForConflicts, autoResolveConflicts, } from './cals/utils/code';
 export { parseComponentCals } from './cals/utils/block';
 export { ActionType, IDataBind, PropBindType } from './expression/index';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/parser/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/parser/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EACL,UAAU,EACV,UAAU,EACV,SAAS,EACT,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC"}