@cloudbase/cals 1.0.2 → 1.0.3-alpha.1

package/lib/utils/dts/build.js

@@ -42,10 +42,7 @@ function buildFormulaDTS() {
                 const dts = yield fs_extra_1.default.readFile(tempDtsPath, 'utf8');
                 yield fs_extra_1.default.remove(tempDtsPath);
                 // 去掉最外层的模块声明
-                return dts
-                    .replace(/^declare module.*$/m, '')
-                    .replace(/^\}$/m, '')
-                    .replace(/^\s+/gm, '');
+                return dts.replace(/^declare module.*$/m, '').replace(/^\}$/m, '').replace(/^\s+/mg, '');
             });
         }
     });

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

@@ -1,4 +1,22 @@
 import { IJsonSchemaAny, IJsonSchemaObject } from '../../types';
+export interface IPrivateForWeDa {
+    displayType: string;
+    displayName: string;
+    dataFieldInfo?: {
+        type?: string;
+        format?: string;
+        'x-system': boolean;
+    };
+    insertText: string;
+    group?: string;
+    subGroup?: string;
+    doc?: string;
+    description?: string;
+    definition?: string;
+    schema?: IJsonSchemaAny;
+    baseClass?: string;
+    datasource?: string;
+}
 export interface IDTSCodeItem {
     name: string;
     code: string;
@@ -19,10 +37,27 @@ export interface IInputDataWidgetItem {
     idList: string[];
 }
 export interface IInputDataRepeaterItem {
+    widgetId: string;
     currentItemAlias: string;
     currentIndexAlias: string;
     itemData: IJsonSchemaAny;
 }
+export interface IInputDataRedefineAnyType {
+    module: string;
+    component: string;
+    widgetId: string;
+    updateProps: {
+        widgetPropName: string;
+        widgetPropTitle: string;
+        widgetPropTypeSchema: IJsonSchemaAny;
+        datasource: {
+            id: string;
+            name: string;
+            title: string;
+            type: 'ds' | 'apis';
+        };
+    }[];
+}
 export interface IOptions {
     isCompMode?: boolean;
     needGlobalFormula?: boolean;
@@ -42,7 +77,8 @@ export declare enum IInputDataType {
     compPropEvents = "compPropEvents",
     usedComponents = "usedComponents",
     usedWidgets = "usedWidgets",
-    repeaterScope = "repeaterScope"
+    repeaterScope = "repeaterScope",
+    redefineAnyType = "redefineAnyType"
 }
 export interface IInputData {
     [IInputDataType.globalState]?: IJsonSchemaObject;
@@ -58,6 +94,7 @@ export interface IInputData {
     [IInputDataType.usedComponents]?: IInputDataUsedComponents[];
     [IInputDataType.usedWidgets]?: IInputDataWidgetItem[];
     [IInputDataType.repeaterScope]?: IInputDataRepeaterItem[];
+    [IInputDataType.redefineAnyType]?: IInputDataRedefineAnyType[];
 }
 /**
  * 通过该类可以共享同个dts。
@@ -72,7 +109,7 @@ export declare class WeDaDTS {
     /**
      * 部分更新 - 只更新一种类型
      */
-    static updateDTSPartial(inputData: IJsonSchemaObject | IDTSCodeItem[] | string[] | IInputDataUsedComponents[] | IInputDataWidgetItem[] | IInputDataRepeaterItem[], itemType: IInputDataType, options?: {
+    static updateDTSPartial(inputData: IJsonSchemaObject | IDTSCodeItem[] | string[] | IInputDataUsedComponents[] | IInputDataWidgetItem[] | IInputDataRepeaterItem[] | IInputDataRedefineAnyType[], itemType: IInputDataType, options?: {
         setEmptyIfError: boolean;
     }): Promise<void>;
     static getDTS(options?: Omit<IOptions, "isCompMode">): string;

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

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

package/lib/utils/dts/index.js

@@ -8,8 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.compileJSONToDTS = exports.jsonToDTSWorkerCode = exports.transpileToDTS = exports.workerCode = exports.generateWeDaAppDTS = exports.WeDaDTS = exports.IInputDataType = void 0;
+const lodash_1 = require("lodash");
+const json_easy_filter_1 = __importDefault(require("json-easy-filter"));
 const auto_generated_1 = require("./auto-generated");
 var IInputDataType;
 (function (IInputDataType) {
@@ -26,6 +31,7 @@ var IInputDataType;
     IInputDataType["usedComponents"] = "usedComponents";
     IInputDataType["usedWidgets"] = "usedWidgets";
     IInputDataType["repeaterScope"] = "repeaterScope";
+    IInputDataType["redefineAnyType"] = "redefineAnyType";
 })(IInputDataType = exports.IInputDataType || (exports.IInputDataType = {}));
 const DtsPlaceholder = {
     [IInputDataType.globalState]: "// Global State 全局变量 - Don't touch me",
@@ -40,7 +46,8 @@ const DtsPlaceholder = {
     [IInputDataType.compPropEvents]: "// Comp Prop Events 组件事件 - Don't touch me",
     [IInputDataType.usedComponents]: "// Used Components - Don't touch me",
     [IInputDataType.usedWidgets]: "// used widgets - Don't touch me",
-    [IInputDataType.repeaterScope]: "// repeater scope - Don't touch me"
+    [IInputDataType.repeaterScope]: "// repeater scope - Don't touch me",
+    [IInputDataType.redefineAnyType]: "// Redefine Any Type - Don't touch me",
 };
 const DtsInnerSign = {
     [IInputDataType.globalState]: "Global State Inner",
@@ -55,8 +62,18 @@ const DtsInnerSign = {
     [IInputDataType.compPropEvents]: "Comp Prop Events Inner",
     [IInputDataType.usedComponents]: "Used Components Inner",
     [IInputDataType.usedWidgets]: "used widgets Inner",
-    [IInputDataType.repeaterScope]: "repeater scope Inner"
+    [IInputDataType.repeaterScope]: "repeater scope Inner",
+    [IInputDataType.redefineAnyType]: "Redefine Any Type Inner",
 };
+var GroupEnum;
+(function (GroupEnum) {
+    GroupEnum["GLOBAL_VAR"] = "globalVar";
+    GroupEnum["PAGE_VAR"] = "pageVar";
+    GroupEnum["PAGE_PARAM"] = "pageParam";
+    GroupEnum["COMPONENT"] = "component";
+    GroupEnum["REPEATER"] = "repeater";
+    GroupEnum["DATA_FIELD"] = "dataField";
+})(GroupEnum || (GroupEnum = {}));
 /**
  * 通过该类可以共享同个dts。
  * 场景：在 weda 中，低代码的变更会通知更改 dts，而低码编辑器和表达式编辑器对 dts 的需求是不一样的，这样不同的 dts 共享的是同一份全的 dts。如果直接调用 generateWeDaAppDTS 会导致 dts 重复地解析
@@ -75,14 +92,16 @@ class WeDaDTS {
      */
     static updateDTSPartial(inputData, itemType, options = { setEmptyIfError: false }) {
         return __awaiter(this, void 0, void 0, function* () {
-            let dts = '';
             try {
-                dts = yield _generateOneItemDTS(inputData, itemType);
+                const [dts, replaceRules] = yield _generateOneItemDTS(inputData, itemType);
+                replaceRules.forEach(rule => {
+                    WeDaDTS._dts = WeDaDTS._dts.replace(rule.from, rule.to);
+                });
                 WeDaDTS._dts = WeDaDTS._dts.replace(new RegExp(`^(\\s*\\/\\/ ${DtsInnerSign[itemType]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DtsInnerSign[itemType]} End)`, 'm'), `$1\n${dts}\n$2`);
             }
             catch (e) {
                 if (options.setEmptyIfError) {
-                    WeDaDTS._dts = WeDaDTS._dts.replace(new RegExp(`^(\\s*\\/\\/ ${DtsInnerSign[itemType]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DtsInnerSign[itemType]} End)`, 'm'), `$1\n${dts}\n$2`);
+                    WeDaDTS._dts = WeDaDTS._dts.replace(new RegExp(`^(\\s*\\/\\/ ${DtsInnerSign[itemType]} Begin)[\\s\\S]*(^\\s*\\/\\/ ${DtsInnerSign[itemType]} End)`, 'm'), `$1\n${''}\n$2`);
                 }
             }
         });
@@ -114,8 +133,11 @@ function generateWeDaAppDTS(inputData = {}, options = { isCompMode: false, needG
             if (placeholder) {
                 // 防止某项错误导致全部都错误
                 try {
-                    const dts = yield _generateOneItemDTS(inputData[key], key);
-                    resultDts = resultDts.replace(placeholder, dts + placeholder);
+                    const [dts, replaceRules] = yield _generateOneItemDTS(inputData[key], key);
+                    replaceRules.forEach(rule => {
+                        resultDts = resultDts.replace(rule.from, rule.to);
+                    });
+                    resultDts = resultDts.replace(placeholder, dts + '\n' + placeholder);
                 }
                 catch (e) {
                     console.error(e);
@@ -141,17 +163,141 @@ function generateWeDaAppDTS(inputData = {}, options = { isCompMode: false, needG
         if (!(options === null || options === void 0 ? void 0 : options.needRepeaterScope)) {
             resultDts = resultDts.replace(/\/\/ repeater scope Inner Begin[\s\S]*\/\/ repeater scope Inner End$/m, '');
         }
-        // console.log(resultDts)
         return resultDts;
     });
 }
 exports.generateWeDaAppDTS = generateWeDaAppDTS;
+/**
+ * 生成 weda 专有的注释信息
+ */
+function genWeDaCodeComment({ fieldName, title, description, type, dataFieldInfo, group, schema, subGroup, baseClass, datasource, }) {
+    const desc = (title || fieldName) ? `${title || fieldName}\n${description || ''}` : '';
+    return desc + `\n@privateForWeDa\n${JSON.stringify({ group, displayType: type, displayName: title || '', schema, subGroup, baseClass, datasource, dataFieldInfo })}`;
+}
 /**
  * 生成指定类型的 DTS
  */
 function _generateOneItemDTS(inputData, itemType) {
     return __awaiter(this, void 0, void 0, function* () {
+        const replaceRules = [];
+        /**
+         * 获取数据字段的类型
+         */
+        function getDataFieldDisplayType(format) {
+            const nameMap = {
+                "email": "email",
+                "url": "url",
+                "tel": "tel",
+                "phone": "phone",
+                "x-image": "image",
+                "x-rtf": "rtf",
+                "datetime": "datetime",
+                "date": "date",
+                "time": "time",
+                "x-enum": "enum",
+                "x-location": "location",
+                "x-file": "file",
+                "related": "related",
+                "father-son": "father-son",
+                "x-autonumber": "autonumber",
+                "x-area-code": "area-code",
+                "function": "function"
+            };
+            return nameMap[format];
+        }
+        /**
+         * 处理注释信息
+         */
+        function _handleComment(inputData, group, needKeepSchema) {
+            const _inputData = (0, lodash_1.cloneDeep)(inputData);
+            json_easy_filter_1.default.traverse(_inputData, function (key, value, path) {
+                var _a;
+                if ((value === null || value === void 0 ? void 0 : value.type) && !((_a = value === null || value === void 0 ? void 0 : value.type) === null || _a === void 0 ? void 0 : _a.type)) {
+                    // value?.type?.type 有值，则证明 type 是自定义的字段，而非 JSONSchema 中的 type
+                    let schema = null;
+                    if (needKeepSchema) {
+                        const isFirstLevel = path.length === 2 && (path === null || path === void 0 ? void 0 : path[0]) === 'properties';
+                        if (isFirstLevel) {
+                            // 只需要第一级属性需要保存，且只保存子信息（对象或数组的子项）
+                            schema = (value.properties || value.items) ? value : null;
+                        }
+                    }
+                    // 特殊处理数据字段的类型
+                    let type = value.type;
+                    if (group === GroupEnum.DATA_FIELD) {
+                        type = getDataFieldDisplayType(value.format) || type;
+                    }
+                    value.description = genWeDaCodeComment({
+                        fieldName: key,
+                        title: value.title,
+                        description: value.description,
+                        group,
+                        type,
+                        dataFieldInfo: (0, lodash_1.pick)(value, ['type', 'format', 'x-system']),
+                        schema
+                    });
+                }
+            });
+            _inputData.description = ''; // 避免第一层出现注释
+            return _inputData;
+        }
+        /**
+         * 获取用于显示的数据类型（仅有 number, string , boolean, array, object 等内置基础类型）
+         */
+        function getDisplayReturnType(typeStr) {
+            let displayType = typeStr.trim();
+            if (displayType.endsWith('[]')) {
+                displayType = 'array';
+            }
+            else if (displayType.endsWith('}')) {
+                displayType = 'object';
+            }
+            return displayType;
+        }
+        /**
+         * 获取组件接口定义名称
+         */
+        function _genCompInterfaceName(module, component) {
+            return `${module.replace(/-/g, '_')}_${component}`;
+        }
+        function _compile(jsonschema, isObjNeedWrapper = false) {
+            return __awaiter(this, void 0, void 0, function* () {
+                let dts = yield compileJSONToDTS(jsonschema);
+                if (dts.search(/^export interface IWeDa/) >= 0) {
+                    dts = dts.replace(/^export interface.*$/m, '');
+                    dts = dts.substring(0, dts.length - 2);
+                    if (isObjNeedWrapper) {
+                        dts = `{${dts}}`;
+                    }
+                }
+                else {
+                    dts = dts.replace(/^export type IWeDa =/m, '');
+                }
+                return dts;
+            });
+        }
         const hanlderMap = {
+            [IInputDataType.globalState]: function (inputData) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    // 完善注释信息
+                    const handledInputData = _handleComment(inputData, GroupEnum.GLOBAL_VAR, true);
+                    return yield _compile(handledInputData);
+                });
+            },
+            [IInputDataType.pageState]: function (inputData) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    // 完善注释信息
+                    const handledInputData = _handleComment(inputData, GroupEnum.PAGE_VAR, true);
+                    return yield _compile(handledInputData);
+                });
+            },
+            [IInputDataType.pageParams]: function (inputData) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    // 完善注释信息
+                    const handledInputData = _handleComment(inputData, GroupEnum.PAGE_PARAM);
+                    return yield _compile(handledInputData);
+                });
+            },
             [IInputDataType.globalCommonCodes]: function (inputData) {
                 return __awaiter(this, void 0, void 0, function* () {
                     const dts = yield Promise.all(inputData.map((item) => __awaiter(this, void 0, void 0, function* () {
@@ -205,7 +351,8 @@ function _generateOneItemDTS(inputData, itemType) {
                         // 属性
                         let exportPropertiesDTS = '';
                         if (item.exportProperties) {
-                            exportPropertiesDTS = yield _compile(item.exportProperties);
+                            const handledProperties = _handleComment(item.exportProperties);
+                            exportPropertiesDTS = yield _compile(handledProperties);
                         }
                         // 方法
                         let exportMethodsDTS = '';
@@ -238,8 +385,15 @@ function _generateOneItemDTS(inputData, itemType) {
                         //   ${exportMethodsDTS}
                         // }
                         // `
+                        const interfaceName = _genCompInterfaceName(item.module, item.component);
                         return `
-        declare class ${_genCompInterfaceName(item.module, item.component)} extends UserWidget {
+        /**
+        ${genWeDaCodeComment({
+                            fieldName: interfaceName,
+                            schema: item.exportProperties,
+                        }).split('\n').map(item => `* ${item}`).join('\n')}
+        */
+        declare class ${interfaceName} extends UserWidget {
 
           ${exportPropertiesDTS}
 
@@ -254,7 +408,19 @@ function _generateOneItemDTS(inputData, itemType) {
                 return inputData.map(item => {
                     if (item.idList && item.idList.length > 0) {
                         const interfaceName = _genCompInterfaceName(item.module, item.component);
-                        return item.idList.map(id => `const ${id}: ${interfaceName}`).join('\n');
+                        return item.idList.map(id => `
+          /**
+          ${genWeDaCodeComment({
+                            fieldName: id,
+                            title: '',
+                            description: '',
+                            group: GroupEnum.COMPONENT,
+                            type: 'component',
+                            baseClass: interfaceName,
+                            datasource: `$${id}_start$ $${id}_end$`
+                        }).split('\n').map(item => `* ${item}`).join('\n')}
+           */
+          const ${id}: ${interfaceName}`).join('\n');
                     }
                     return '';
                 }).join('\n');
@@ -262,45 +428,134 @@ function _generateOneItemDTS(inputData, itemType) {
             [IInputDataType.repeaterScope]: function (inputData) {
                 return __awaiter(this, void 0, void 0, function* () {
                     const results = yield Promise.all(inputData.map((item) => __awaiter(this, void 0, void 0, function* () {
-                        let itemDataDTS = yield _compile(item.itemData, true);
+                        let itemDataDTS = '';
+                        if (item.itemData.title) {
+                            // 特殊场景：数据字段
+                            const handledInputData = _handleComment(item.itemData, GroupEnum.DATA_FIELD);
+                            itemDataDTS = yield _compile(handledInputData, true);
+                        }
+                        else {
+                            // 普通的循环项数据
+                            itemDataDTS = yield _compile(item.itemData, true);
+                        }
                         return `
+        /**
+        ${genWeDaCodeComment({
+                            fieldName: item.currentItemAlias,
+                            title: '当前项值',
+                            description: '',
+                            group: GroupEnum.REPEATER,
+                            type: getDisplayReturnType(itemDataDTS),
+                            schema: item.itemData,
+                            subGroup: item.widgetId
+                        }).split('\n').map(item => `* ${item}`).join('\n')}
+        */
         const ${item.currentItemAlias}: ${itemDataDTS}
+        /**
+        ${genWeDaCodeComment({
+                            fieldName: item.currentIndexAlias,
+                            title: '当前下标',
+                            description: '',
+                            group: GroupEnum.REPEATER,
+                            type: 'number',
+                            subGroup: item.widgetId
+                        }).split('\n').map(item => `* ${item}`).join('\n')}
+          */
         const ${item.currentIndexAlias}: number
         `;
                     })));
                     return results.join('\n');
                 });
             },
+            [IInputDataType.redefineAnyType]: function (inputData) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    const results = yield Promise.all(inputData.map((item) => __awaiter(this, void 0, void 0, function* () {
+                        const compInterfaceName = _genCompInterfaceName(item.module, item.component);
+                        const widgetInterfaceName = `${item.widgetId}_${compInterfaceName}`;
+                        /**
+                         * 更新 widget 的类型名
+                         */
+                        replaceRules.push({
+                            from: new RegExp(`(const ${item.widgetId}): .*`),
+                            to: `$1: ${widgetInterfaceName}`
+                        });
+                        /**
+                         * 增加类
+                         */
+                        const datasources = {};
+                        const propDefinitions = yield Promise.all(item.updateProps.map((prop) => __awaiter(this, void 0, void 0, function* () {
+                            const properties = _handleComment(prop.widgetPropTypeSchema, GroupEnum.DATA_FIELD);
+                            const widgetPropTypeDTS = yield _compile(Object.assign(Object.assign({}, prop.widgetPropTypeSchema), properties), true);
+                            // 同个数据源，有可能是数组类型，所以需要区分开
+                            const id = `${prop.datasource.name}_${prop.widgetPropTypeSchema.type}`;
+                            if (!datasources[id]) {
+                                datasources[id] = {
+                                    fields: [{ name: prop.widgetPropName, title: prop.widgetPropTitle }],
+                                    schema: prop.widgetPropTypeSchema,
+                                    name: prop.datasource.name, title: prop.datasource.title, id: prop.datasource.id, type: prop.datasource.type
+                                };
+                            }
+                            else {
+                                datasources[id].fields.push({ name: prop.widgetPropName, title: prop.widgetPropTitle });
+                            }
+                            // 是否是多层级字段，如 "a.b"
+                            // FIXME: 当前只支持 a.b 这种形式，不支持 a[].b
+                            const multiLevelField = prop.widgetPropName.includes('.');
+                            let multiLevelFields = [];
+                            let multiLevelFieldObj = {};
+                            let firstField = '';
+                            let othersFields = [];
+                            if (multiLevelField) {
+                                multiLevelFields = prop.widgetPropName.split('.');
+                                (0, lodash_1.set)(multiLevelFieldObj, prop.widgetPropName, "$$schema$$");
+                                const [_firstField, ..._othersFields] = multiLevelFields;
+                                firstField = _firstField;
+                                othersFields = _othersFields;
+                            }
+                            return `
+          /**
+           ${genWeDaCodeComment({
+                                fieldName: prop.widgetPropName,
+                                title: prop.widgetPropTypeSchema.title,
+                                description: prop.widgetPropTypeSchema.description,
+                                group: undefined,
+                                type: getDisplayReturnType(widgetPropTypeDTS)
+                            }).split('\n').map(item => `* ${item}`).join('\n')}
+            */
+            ${multiLevelField ? `${firstField}: Omit<${compInterfaceName}['${firstField}'], '${othersFields.join(".")}'> & ${JSON.stringify(multiLevelFieldObj[firstField]).replace('"$$schema$$"', widgetPropTypeDTS)}` : `${prop.widgetPropName}: ${widgetPropTypeDTS}`}
+          `;
+                        })));
+                        /**
+                         *  更新数据源信息
+                         */
+                        const datasourceInfoList = Object.values(datasources);
+                        if (datasourceInfoList.length > 0) {
+                            replaceRules.push({
+                                from: new RegExp(`(\\$${item.widgetId}_start\\$).*(\\$${item.widgetId}_end\\$)`),
+                                // encodeURIComponent 是为了能正常 parse 成 JSON
+                                to: `$1${encodeURIComponent(JSON.stringify(datasourceInfoList))}$2`
+                            });
+                        }
+                        return `
+        declare class ${widgetInterfaceName} extends ${compInterfaceName} {
+          ${propDefinitions.join('\n')}
+        }
+        `;
+                    })));
+                    return results.join('\n');
+                });
+            }
         };
         let dts = '';
         if (!inputData)
-            return dts;
+            return [dts, replaceRules];
         const handler = hanlderMap[itemType];
         // 优先判断是否有独立的处理逻辑
         if (handler) {
             dts = yield handler.call(hanlderMap, inputData);
         }
         dts = dts || (yield _compile(inputData));
-        return dts;
-        function _genCompInterfaceName(module, component) {
-            return `${module.replace(/-/g, '_')}_${component}`;
-        }
-        function _compile(jsonschema, isObjNeedWrapper = false) {
-            return __awaiter(this, void 0, void 0, function* () {
-                let dts = yield compileJSONToDTS(jsonschema);
-                if (dts.search(/^export interface IWeDa/) >= 0) {
-                    dts = dts.replace(/^export interface.*$/m, '');
-                    dts = dts.substring(0, dts.length - 2);
-                    if (isObjNeedWrapper) {
-                        dts = `{${dts}}`;
-                    }
-                }
-                else {
-                    dts = dts.replace(/^export type IWeDa =/m, '');
-                }
-                return dts;
-            });
-        }
+        return [dts, replaceRules];
     });
 }
 // 仅仅为了与 unittest 共享，外部请不要使用

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/cals",
-  "version": "1.0.2",
+  "version": "1.0.3-alpha.1",
   "description": "Common application specifications",
   "main": "lib/utils/index.js",
   "source": "src/utils/index.ts",
@@ -30,6 +30,7 @@
   "license": "MIT",
   "dependencies": {
     "acorn": "^8.0.4",
+    "json-easy-filter": "^0.3.1",
     "json-schema-to-typescript-for-browser": "^11.0.3",
     "lodash": "^4.17.20",
     "postcss": "^8.4.20",

package/lib/parser/constants.d.ts

@@ -1,2 +0,0 @@
-export declare const OFFICIAL_LIB_KEY = "gsd-h5-react";
-//# sourceMappingURL=constants.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/parser/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,iBAAiB,CAAC"}

package/lib/parser/constants.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OFFICIAL_LIB_KEY = void 0;
-exports.OFFICIAL_LIB_KEY = 'gsd-h5-react';