@lcap/nasl 4.3.0-rc.5 → 4.4.0-beta.3

package/out/natural/getContext/nasl2Files.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nasl2Files = void 0;
+const index_1 = require("../../index");
+/**
+ * 将 NASL 对象转换为文件
+ * @param params - 包含 NASL 应用对象的参数
+ * @param params.app - NASL 应用实例
+ * @returns 生成的文件列表，每个文件包含路径和内容
+ */
+const nasl2Files = ({ app }) => {
+    const result = [];
+    const state = (0, index_1.createCompilerState)('', { descriptionComment: true });
+    try {
+        // 处理枚举
+        if (app.enums && app.enums.length > 0) {
+            app.enums.forEach((item) => {
+                const path = `app.enums.${item.name}.ts`;
+                const content = item.toNaturalTS((0, index_1.shiftState)(state, '', { tabSize: 0 }));
+                result.push({ path, content });
+            });
+        }
+        // 处理结构体
+        if (app.structures && app.structures.length > 0) {
+            app.structures.forEach((item) => {
+                const path = `app.structures.${item.name}.ts`;
+                const content = item.toNaturalTS((0, index_1.shiftState)(state, '', { tabSize: 0 }));
+                result.push({ path, content });
+            });
+        }
+        // 处理数据源实体
+        if (app.dataSources && app.dataSources.length > 0 && app.dataSources[0]?.entities) {
+            app.dataSources[0].entities.forEach((item) => {
+                const path = `app.dataSources.defaultDS.entities.${item.name}.ts`;
+                const content = item.toNaturalTS((0, index_1.shiftState)(state, '', { tabSize: 0 }));
+                result.push({ path, content });
+            });
+        }
+        // 处理逻辑
+        if (app.logics && app.logics.length > 0) {
+            app.logics.forEach((item) => {
+                const path = `app.logics.${item.name}.ts`;
+                const content = item.toNaturalTS((0, index_1.shiftState)(state, '', { tabSize: 0, functionPrefix: 'export' }));
+                result.push({ path, content });
+            });
+        }
+        // 处理前端视图
+        if (app.frontendTypes?.[0]?.frontends[0]?.views) {
+            // 递归处理视图及其子视图的函数
+            const processView = (view, pathPrefix) => {
+                const path = `${pathPrefix}.${view.name}.tsx`;
+                const content = view.toNaturalTSX((0, index_1.shiftState)(state, '', { tabSize: 0 }));
+                result.push({ path, content });
+                // 如果视图有 children，递归处理子视图
+                if (view.children && view.children.length > 0) {
+                    view.children.forEach((childView) => {
+                        processView(childView, `${pathPrefix}.${view.name}.views`);
+                    });
+                }
+            };
+            app.frontendTypes[0].frontends[0].views.forEach((item) => {
+                processView(item, 'app.frontendTypes.pc.frontends.pc.views');
+            });
+        }
+    }
+    catch (error) {
+        console.error('Error in nasl2File:', error);
+        return [];
+    }
+    // 输出结果
+    console.log('Generated files count:', result.length);
+    return result;
+};
+exports.nasl2Files = nasl2Files;
+//# sourceMappingURL=nasl2Files.js.map

package/out/natural/getContext/nasl2Files.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nasl2Files.js","sourceRoot":"","sources":["../../../src/natural/getContext/nasl2Files.ts"],"names":[],"mappings":"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"}

package/out/natural/index.d.ts

@@ -3,7 +3,11 @@ export * from './genTextualNASL';
 export * from './transformTSCode';
 export * from './transformTS2UI';
 export * from './parseNaturalTS';
-export * from './getContext/getUILib';
+export * from './parseNaturalTSXView';
 export * from './getContext';
+export * from './getContext/getUILib';
+export * from './getContext/nasl2Files';
 export * from './tools';
+export * from './transform2BatchActions';
+export { parseNaturalTSErrorMap } from './transforms/utils';
 //# sourceMappingURL=index.d.ts.map

package/out/natural/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/natural/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/natural/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,SAAS,CAAC;AACxB,cAAc,0BAA0B,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC"}

package/out/natural/index.js

@@ -14,12 +14,18 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseNaturalTSErrorMap = void 0;
 __exportStar(require("./genNaturalTS"), exports);
 __exportStar(require("./genTextualNASL"), exports);
 __exportStar(require("./transformTSCode"), exports);
 __exportStar(require("./transformTS2UI"), exports);
 __exportStar(require("./parseNaturalTS"), exports);
-__exportStar(require("./getContext/getUILib"), exports);
+__exportStar(require("./parseNaturalTSXView"), exports);
 __exportStar(require("./getContext"), exports);
+__exportStar(require("./getContext/getUILib"), exports);
+__exportStar(require("./getContext/nasl2Files"), exports);
 __exportStar(require("./tools"), exports);
+__exportStar(require("./transform2BatchActions"), exports);
+var utils_1 = require("./transforms/utils");
+Object.defineProperty(exports, "parseNaturalTSErrorMap", { enumerable: true, get: function () { return utils_1.parseNaturalTSErrorMap; } });
 //# sourceMappingURL=index.js.map

package/out/natural/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/natural/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,mDAAiC;AACjC,oDAAkC;AAClC,mDAAiC;AACjC,mDAAiC;AACjC,wDAAsC;AACtC,+CAA6B;AAC7B,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/natural/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,mDAAiC;AACjC,oDAAkC;AAClC,mDAAiC;AACjC,mDAAiC;AACjC,wDAAsC;AACtC,+CAA6B;AAC7B,wDAAsC;AACtC,0DAAwC;AACxC,0CAAwB;AACxB,2DAAyC;AACzC,4CAA4D;AAAnD,+GAAA,sBAAsB,OAAA"}

package/out/natural/parseNaturalTS.d.ts

@@ -1,15 +1,13 @@
 import { naslTypes } from './transforms/utils';
-interface PartialAppInfo {
-    name?: string;
-    title?: string;
-    ideVersion?: string;
-}
 type HeadNamespace = 'app' | 'extensions' | 'apis' | 'connectors';
-type TypeInNamespace = 'structures' | 'enums' | 'logics' | 'interfaces';
+type TypeInNamespace = 'structures' | 'enums' | 'metadataTypes' | 'logics' | 'interfaces';
 /**
  * 添加到指定命名空间中
  */
-export declare function addType2Namespace(app: naslTypes.App, node: any, namespacePrefix: HeadNamespace, type: TypeInNamespace, options?: any): void;
-export declare function parseNaturalTS(tsCode: string, appInfo?: PartialAppInfo): naslTypes.App;
+export declare function addType2Namespace(app: naslTypes.App, node: any, namespacePrefix: HeadNamespace, type: TypeInNamespace, opts?: any): void;
+export declare function parseNaturalTS(tsCode: string, options?: {
+    parsingId?: number;
+    source?: string;
+}): naslTypes.App;
 export {};
 //# sourceMappingURL=parseNaturalTS.d.ts.map

package/out/natural/parseNaturalTS.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseNaturalTS.d.ts","sourceRoot":"","sources":["../../src/natural/parseNaturalTS.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,SAAS,EAA2C,MAAM,oBAAoB,CAAC;AAQpG,UAAU,cAAc;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAyGD,KAAK,aAAa,GAAG,KAAK,GAAG,YAAY,GAAG,MAAM,GAAG,YAAY,CAAC;AAClE,KAAK,eAAe,GAAG,YAAY,GAAG,OAAO,GAAG,QAAQ,GAAG,YAAY,CAAC;AAIxE;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,eAAe,EAAE,aAAa,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,GAAG,QA+BpI;AASD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,iBA4H1E"}
+{"version":3,"file":"parseNaturalTS.d.ts","sourceRoot":"","sources":["../../src/natural/parseNaturalTS.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,SAAS,EAAiF,MAAM,oBAAoB,CAAC;AA4H1I,KAAK,aAAa,GAAG,KAAK,GAAG,YAAY,GAAG,MAAM,GAAG,YAAY,CAAC;AAClE,KAAK,eAAe,GAAG,YAAY,GAAG,OAAO,GAAG,eAAe,GAAG,QAAQ,GAAG,YAAY,CAAC;AAI1F;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,eAAe,EAAE,aAAa,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,CAAC,EAAE,GAAG,QA+BjI;AASD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAA0B,iBAkQtH"}

package/out/natural/parseNaturalTS.js

@@ -32,8 +32,12 @@ const transform2GlobalLogicDeclaration_1 = require("./transforms/transform2Globa
 const transform2Enum_1 = require("./transforms/transform2Enum");
 const transform2Logic_1 = require("./transforms/transform2Logic");
 const transform2Variable_1 = require("./transforms/transform2Variable");
+const parseNaturalTSXView_1 = require("./parseNaturalTSXView");
+const transform2MetadataType_1 = require("./transforms/transform2MetadataType");
+const transformThemeAndStyle_1 = require("./transforms/transformThemeAndStyle");
 /**
  * 铺平命名空间
+ * 会将连续嵌套的命令空间铺平
  */
 function flatNamespace(node) {
     const sub = node.body;
@@ -55,22 +59,24 @@ function flatNamespace(node) {
  * ids: apis.myInterface.interfaces statement: TSDeclareFunction
  * ids: apis.myInterface.interfaces statement: FunctionDeclaration
  */
-function flatMapNamespaceStatements(nodes, isInner = false) {
+function flatMapNamespaceStatements(nodes, isInner = false, parseState) {
     const result = [];
     nodes.forEach((node) => {
         let statement = node;
         if (node.type === 'ExportNamedDeclaration') {
-            // if (!isInner) throwError('顶层不应该导出：' + node.declaration.type);
+            // if (!isInner) return throwError(options?.parsingId, '顶层不应该导出：' + node.declaration.type);
             statement = node.declaration;
             statement.leadingComments = node.leadingComments;
         }
         else {
-            if (isInner)
-                (0, utils_1.throwError)('内层必须使用导出：' + node.type);
+            if (isInner && !(node.type === 'ExpressionStatement' && ['CallExpression', 'TaggedTemplateExpression'].includes(node.expression.type))) // && node.expression.callee.type === 'Identifier' && /^[@$]/.test(node.expression.callee.name)))
+                return (0, utils_1.throwError)(parseState, '必须使用 export', node.type, node);
         }
         if (statement.type === 'TSModuleDeclaration') {
             const curr = flatNamespace(statement);
-            const subResult = flatMapNamespaceStatements(curr.block.body, true);
+            const nodeNamespace = curr.ids.map((id) => id.name).join('.');
+            // console.log('nodeNamespace in flatMapNamespaceStatements:', nodeNamespace);
+            const subResult = flatMapNamespaceStatements(curr.block.body, true, { ...parseState, nodeNamespace });
             subResult.forEach((item) => {
                 result.push({ ids: [...curr.ids, ...item.ids], statement: item.statement });
             });
@@ -81,19 +87,19 @@ function flatMapNamespaceStatements(nodes, isInner = false) {
     });
     return result;
 }
-function handleDependency({ dependencies, moduleType, listName, options, node }) {
-    let dependency = dependencies.find((d) => d.name === options?.moduleName);
+function handleDependency({ dependencies, moduleType, listName, opts, node }) {
+    let dependency = dependencies.find((d) => d.name === opts?.moduleName);
     if (!dependency) {
         if (moduleType === 'connector') {
             dependency = new utils_1.naslTypes.Connector({
                 type: moduleType,
-                name: options.moduleName,
+                name: opts.moduleName,
             });
         }
         else {
             dependency = new utils_1.naslTypes.Module({
                 type: moduleType,
-                name: options.moduleName,
+                name: opts.moduleName,
             });
         }
         dependencies.push(dependency);
@@ -118,13 +124,13 @@ function handleDependency({ dependencies, moduleType, listName, options, node })
             }
         }
         const hasLogicIndex = logicList.findIndex((item) => item.name === node.name);
-        if (options.logicType === 'declare') {
+        if (opts.logicKind === 'declare') {
             // 逻辑不存在时添加
             if (hasLogicIndex === -1) {
                 logicList.push(node);
             }
         }
-        else if (options.logicType === 'export') {
+        else if (opts.logicKind === 'export') {
             if (hasLogicIndex !== -1) {
                 // 覆盖
                 logicList[hasLogicIndex] = node;
@@ -137,19 +143,19 @@ function handleDependency({ dependencies, moduleType, listName, options, node })
     }
 }
 const HEAD_NAMESPACES = ['app', 'extensions', 'apis', 'connectors'];
-const TYPE_IN_NAMESPACES = ['structures', 'enums', 'logics', 'interfaces'];
+const TYPE_IN_NAMESPACES = ['structures', 'enums', 'metadataTypes', 'logics', 'interfaces'];
 /**
  * 添加到指定命名空间中
  */
-function addType2Namespace(app, node, namespacePrefix, type, options) {
+function addType2Namespace(app, node, namespacePrefix, type, opts) {
     if (namespacePrefix === 'app') {
         app[type].push(node);
     }
     if (namespacePrefix === 'extensions') {
-        handleDependency({ dependencies: app.dependencies, moduleType: 'extension', listName: type, options, node });
+        handleDependency({ dependencies: app.dependencies, moduleType: 'extension', listName: type, opts, node });
     }
     else if (namespacePrefix === 'connectors') {
-        handleDependency({ dependencies: app.connectorDependencies, moduleType: 'connector', listName: type, options, node });
+        handleDependency({ dependencies: app.connectorDependencies, moduleType: 'connector', listName: type, opts, node });
     }
     else if (namespacePrefix === 'apis') {
         if (type === 'interfaces') {
@@ -172,7 +178,7 @@ function addType2Namespace(app, node, namespacePrefix, type, options) {
                 params: interfaceParams
             });
         }
-        handleDependency({ dependencies: app.interfaceDependencies, moduleType: 'interface', listName: type, options, node });
+        handleDependency({ dependencies: app.interfaceDependencies, moduleType: 'interface', listName: type, opts, node });
     }
 }
 exports.addType2Namespace = addType2Namespace;
@@ -182,23 +188,32 @@ function addConnectionByName(app, connectionName, connectorName) {
         namespace: `connector.${connectorName}`,
     }));
 }
-function parseNaturalTS(tsCode, appInfo = {}) {
+function parseNaturalTS(tsCode, options = { source: 'creator' }) {
     const plugins = [
-        ['@babel/plugin-proposal-decorators', { legacy: true }],
-        '@babel/plugin-proposal-class-properties'
+        [require('@babel/plugin-proposal-decorators'), { legacy: true }],
+        require('@babel/plugin-proposal-class-properties'),
     ];
     const root = babel.parseSync(tsCode, {
-        filename: 'result.ts',
+        filename: 'result.tsx',
         presets: [require('@babel/preset-typescript')],
         plugins
     });
     const app = new utils_1.naslTypes.App();
-    const namespaceStatements = flatMapNamespaceStatements(root.program.body);
-    namespaceStatements.forEach(({ ids: _ids, statement }) => {
+    const namespaceStatements = flatMapNamespaceStatements(root.program.body, false, { $$beacon: true, parsingId: options?.parsingId });
+    let viewCacheMap = {};
+    namespaceStatements.forEach(({ ids: _ids, statement }, index) => {
         const idNames = _ids.map((id) => id.name);
         const idNamesStr = idNames.join('.');
+        // console.log('nodeNamespace in namespaceStatements:', idNamesStr);
+        const parseState = {
+            $$beacon: true,
+            parsingId: options?.parsingId,
+            nodeNamespace: idNamesStr,
+            nodeName: '',
+            appendExtName: true,
+        };
         if (!HEAD_NAMESPACES.includes(idNames[0]))
-            (0, utils_1.throwError)(`不支持命名空间以${idNames[0]}开头`);
+            return (0, utils_1.throwError)(parseState, `不支持命名空间以${idNames[0]}开头`);
         let headNamespace = idNames[0];
         let typeInNamespace;
         if (headNamespace === 'app') {
@@ -214,16 +229,16 @@ function parseNaturalTS(tsCode, appInfo = {}) {
                         return;
                     }
                     else if (paramType.type !== 'TSUnionType')
-                        (0, utils_1.throwError)('连接必须使用字符串联合类型');
+                        return (0, utils_1.throwError)(parseState, '连接必须使用字符串联合类型');
                     else {
                         const connectionNames = paramType.types.map((type) => {
                             if (type.type === 'TSLiteralType' && type.literal.type === 'StringLiteral') {
                                 return type.literal.value;
                             }
                             else {
-                                (0, utils_1.throwError)('连接必须使用字符串字面量');
+                                return (0, utils_1.throwError)(parseState, '连接必须使用字符串字面量');
                             }
-                        });
+                        }).filter(Boolean);
                         connectionNames.forEach((connectionName) => {
                             addConnectionByName(app, connectionName, idNames[1]);
                         });
@@ -231,7 +246,7 @@ function parseNaturalTS(tsCode, appInfo = {}) {
                     }
                 }
                 else {
-                    (0, utils_1.throwError)(`不支持的命名空间：${idNamesStr}`);
+                    return (0, utils_1.throwError)(parseState, `不支持的命名空间：${idNamesStr}`);
                 }
             }
             else {
@@ -239,13 +254,12 @@ function parseNaturalTS(tsCode, appInfo = {}) {
             }
         }
         let tailNamespace = idNames[idNames.length - 1];
-        let moduleName = headNamespace === 'app' ? '' : idNames[1];
-        const options = { moduleName };
+        parseState.moduleName = headNamespace === 'app' ? '' : idNames[1];
         if (idNames[1] === 'dataSources' && idNames[3] === 'entities') {
             let dataSource = app.dataSources[0];
             if (dataSource) {
                 if (dataSource.name !== idNames[2])
-                    (0, utils_1.throwError)(`暂时不支持多数据源${dataSource.name},${idNames[2]}`);
+                    return (0, utils_1.throwError)(parseState, `暂时不支持多数据源${dataSource.name},${idNames[2]}`);
             }
             else {
                 dataSource = new utils_1.naslTypes.DataSource({
@@ -254,63 +268,82 @@ function parseNaturalTS(tsCode, appInfo = {}) {
                 app.dataSources.push(dataSource);
             }
             if (statement.type === 'ClassDeclaration') {
-                dataSource.entities.push((0, transform2Entity_1.transform2Entity)(statement));
+                dataSource.entities.push((0, transform2Entity_1.transform2Entity)(statement, { ...parseState }));
             }
             else if (statement.type === 'VariableDeclaration') { }
+            else if (statement.type === 'ExpressionStatement' && statement.expression.type === 'CallExpression' && statement.expression.callee.type === 'MemberExpression' && statement.expression.callee.property.type === 'Identifier' && statement.expression.callee.property.name === '$mockData') {
+                if (statement.expression.arguments.length > 0) {
+                    const firstArg = statement.expression.arguments[0];
+                    try {
+                        const argCode = (0, utils_1.generate)(firstArg).code;
+                        JSON.parse(argCode);
+                    }
+                    catch (error) {
+                        return (0, utils_1.throwError)({ ...parseState, nodeName: dataSource.entities[dataSource.entities.length - 1]?.name }, '$mockData的参数不是有效的JSON格式', firstArg.type, statement);
+                    }
+                }
+            }
             else
-                (0, utils_1.throwError)('实体命名空间中不支持的节点类型：' + statement.type);
+                return (0, utils_1.throwError)(parseState, '实体命名空间中不支持的节点类型', statement.type, statement);
         }
         else if (typeInNamespace === 'structures') {
             if (statement.type === 'ClassDeclaration') {
-                addType2Namespace(app, (0, transform2Structure_1.transform2Structure)(statement), headNamespace, typeInNamespace, options);
+                addType2Namespace(app, (0, transform2Structure_1.transform2Structure)(statement, { ...parseState }), headNamespace, typeInNamespace, { ...parseState });
             }
             else
-                (0, utils_1.throwError)('数据结构命名空间中不支持的节点类型：' + statement.type);
+                return (0, utils_1.throwError)(parseState, '数据结构命名空间中不支持的节点类型', statement.type, statement);
         }
         else if (typeInNamespace === 'enums') {
             if (statement.type === 'ClassDeclaration') {
-                addType2Namespace(app, (0, transform2Enum_1.transform2Enum)(statement, statement.leadingComments), headNamespace, typeInNamespace, options);
+                addType2Namespace(app, (0, transform2Enum_1.transform2Enum)(statement, statement.leadingComments, { ...parseState }), headNamespace, typeInNamespace, { ...parseState });
             }
             else
-                (0, utils_1.throwError)('枚举命名空间中不支持的节点类型：' + statement.type);
+                return (0, utils_1.throwError)(parseState, '枚举命名空间中不支持的节点类型', statement.type, statement);
+        }
+        else if (typeInNamespace === 'metadataTypes') {
+            if (statement.type === 'TSTypeAliasDeclaration') {
+                addType2Namespace(app, (0, transform2MetadataType_1.transform2MetadataType)(statement, statement.leadingComments, { ...parseState }), headNamespace, typeInNamespace, { ...parseState });
+            }
+            else
+                return (0, utils_1.throwError)(parseState, '元数据类型命名空间中不支持的节点类型', statement.type, statement);
         }
         else if (typeInNamespace === 'logics') {
-            options.logicType = statement.type === 'TSDeclareFunction' ? 'declare' : 'export';
+            const logicParseState = { ...parseState, logicKind: statement.type === 'TSDeclareFunction' ? 'declare' : 'export' };
             if (statement.type === 'TSDeclareFunction') {
-                addType2Namespace(app, (0, transform2GlobalLogicDeclaration_1.transform2GlobalLogicDeclaration)(statement), headNamespace, typeInNamespace, options);
+                addType2Namespace(app, (0, transform2GlobalLogicDeclaration_1.transform2GlobalLogicDeclaration)(statement, { ...parseState }), headNamespace, typeInNamespace, logicParseState);
             }
             else if (statement.type === 'FunctionDeclaration') {
-                addType2Namespace(app, (0, transform2Logic_1.transform2Logic)(statement), headNamespace, typeInNamespace, options);
+                addType2Namespace(app, (0, transform2Logic_1.transform2Logic)(statement, undefined, { ...parseState }), headNamespace, typeInNamespace, logicParseState);
             }
             else
-                (0, utils_1.throwError)('逻辑命名空间中不支持的节点类型：' + statement.type);
+                return (0, utils_1.throwError)(parseState, '逻辑命名空间中不支持的节点类型', statement.type, statement);
         }
         else if (['apis', 'extensions', 'connectors'].includes(headNamespace)) {
             // logics / interfaces
             if (tailNamespace === 'logics' || tailNamespace === 'interfaces') {
-                options.logicType = statement.type === 'TSDeclareFunction' ? 'declare' : 'export';
-                const logic = (0, transform2Logic_1.transform2Logic)(statement);
-                if (options.logicType === 'declare') {
+                const logicParseState = { ...parseState, logicKind: statement.type === 'TSDeclareFunction' ? 'declare' : 'export' };
+                const logic = (0, transform2Logic_1.transform2Logic)(statement, undefined, logicParseState);
+                if (logicParseState.logicKind === 'declare') {
                     logic.body = [];
                 }
-                addType2Namespace(app, logic, headNamespace, tailNamespace, options);
+                addType2Namespace(app, logic, headNamespace, tailNamespace, logicParseState);
             }
             else if (tailNamespace === 'enums' && statement.type === 'ClassDeclaration') {
-                addType2Namespace(app, (0, transform2Enum_1.transform2Enum)(statement, statement.leadingComments), headNamespace, tailNamespace, options);
+                addType2Namespace(app, (0, transform2Enum_1.transform2Enum)(statement, statement.leadingComments, { ...parseState }), headNamespace, tailNamespace, parseState);
             }
             else if (tailNamespace === 'structures' && statement.type === 'ClassDeclaration') {
-                addType2Namespace(app, (0, transform2Structure_1.transform2Structure)(statement), headNamespace, tailNamespace, options);
+                addType2Namespace(app, (0, transform2Structure_1.transform2Structure)(statement, { ...parseState }), headNamespace, tailNamespace, parseState);
             }
             else if (headNamespace === 'connectors') {
-                options.logicType = statement.type === 'TSDeclareFunction' ? 'declare' : 'export';
-                const logic = (0, transform2Logic_1.transform2Logic)(statement);
-                if (options.logicType === 'declare') {
+                const logicParseState = { ...parseState, logicKind: statement.type === 'TSDeclareFunction' ? 'declare' : 'export' };
+                const logic = (0, transform2Logic_1.transform2Logic)(statement, undefined, logicParseState);
+                if (logicParseState.logicKind === 'declare') {
                     logic.body = [];
                 }
-                addType2Namespace(app, logic, headNamespace, tailNamespace, options);
+                addType2Namespace(app, logic, headNamespace, tailNamespace, logicParseState);
             }
             else {
-                (0, utils_1.throwError)('不支持的命名空间：' + idNamesStr);
+                return (0, utils_1.throwError)(parseState, '不支持的命名空间：' + idNamesStr);
             }
         }
         else if (idNamesStr === 'app.backend.variables') {
@@ -318,13 +351,131 @@ function parseNaturalTS(tsCode, appInfo = {}) {
                 if (!app.backend) {
                     app.backend = new utils_1.naslTypes.Backend();
                 }
-                app.backend.variables.push((0, transform2Variable_1.transform2BackendVariable)(statement));
+                const variable = (0, transform2Variable_1.transform2BackendVariable)(statement, { ...parseState });
+                variable && app.backend.variables.push(variable);
             }
             else
-                (0, utils_1.throwError)('变量命名空间中不支持的节点类型：' + statement.type);
+                return (0, utils_1.throwError)(parseState, '变量命名空间中不支持的节点类型', statement.type, statement);
+        }
+        else if (idNames[1] === 'frontendTypes' && idNames[3] === 'frontends') {
+            let frontendType = app.frontendTypes.find((item) => item.name === idNames[2]);
+            if (!frontendType) {
+                frontendType = new utils_1.naslTypes.FrontendType({
+                    name: idNames[2],
+                    kind: idNames[2],
+                    frameworkKind: "vue3",
+                    frameworkUI: "ElementPlus",
+                });
+                app.frontendTypes.push(frontendType);
+            }
+            let frontend = frontendType.frontends.find((item) => item.name === idNames[4]);
+            if (!frontend) {
+                frontend = new utils_1.naslTypes.Frontend({
+                    type: idNames[2],
+                    name: idNames[4],
+                    title: idNames[4].toUpperCase() + '端',
+                    path: '/',
+                    theme: new utils_1.naslTypes.Theme({
+                        name: 'default',
+                        title: '默认主题样式',
+                    })
+                });
+                frontendType.frontends.push(frontend);
+            }
+            if (idNames[5] === 'variables') {
+                if (statement.type === 'VariableDeclaration') {
+                    const variable = (0, transform2Variable_1.transform2FrontendVariable)(statement, { ...parseState });
+                    variable && frontend.variables.push(variable);
+                }
+                else
+                    return (0, utils_1.throwError)(parseState, '前端变量命名空间中不支持的节点类型', statement.type, statement);
+            }
+            else if (idNames[5] === 'views') {
+                if (statement.type === 'FunctionDeclaration' || statement.type === 'TSDeclareFunction') {
+                    let decorator;
+                    let prevStatement = namespaceStatements[index - 1]?.statement;
+                    if (prevStatement?.type === 'ExpressionStatement' && prevStatement.expression.type === 'CallExpression' && prevStatement.expression.callee.type === 'Identifier' && prevStatement.expression.callee.name === '$View') {
+                        decorator = prevStatement.expression;
+                    }
+                    const newOptions = { ...parseState, isInFrontend: true };
+                    const view = statement.type === 'FunctionDeclaration' ? (0, parseNaturalTSXView_1.transform2View)(statement, decorator, newOptions) : (0, parseNaturalTSXView_1.transformTSDeclareFunction2View)(statement, decorator, newOptions);
+                    newOptions.nodeName = view.name;
+                    const parentPathSegments = []; // ['dashboard', 'abc']
+                    for (let i = 6; i < idNames.length - 1; i += 2) {
+                        if (idNames[i + 1] === 'views') {
+                            parentPathSegments.push(idNames[i]);
+                        }
+                        else {
+                            return (0, utils_1.throwError)(newOptions, `页面没有按 .views. 间隔，不支持的命名空间：${idNamesStr}`);
+                        }
+                    }
+                    // 现在传过来时，需要先排序了，不然可能找不到父页面
+                    function findViewByPath(views, pathSegments) {
+                        if (pathSegments.length === 0)
+                            return null;
+                        const targetName = pathSegments[0];
+                        const foundView = views.find(v => v.name === targetName);
+                        if (!foundView)
+                            return null;
+                        if (pathSegments.length === 1)
+                            return foundView;
+                        return findViewByPath(foundView.children || [], pathSegments.slice(1));
+                    }
+                    let parentViewList;
+                    if (parentPathSegments.length === 0) {
+                        parentViewList = frontend.views;
+                    }
+                    else {
+                        let parentView = viewCacheMap[parentPathSegments.join('/')];
+                        if (!parentView)
+                            parentView = findViewByPath(frontend.views, parentPathSegments);
+                        if (!parentView)
+                            return (0, utils_1.throwError)(newOptions, `找不到父级页面：${idNames.slice(0, -1).join('.')}`);
+                        parentViewList = parentView.children;
+                    }
+                    if (view) {
+                        const existingView = parentViewList.find((item) => item.name === view.name);
+                        if (existingView) {
+                            if (utils_1.DEBUG) {
+                                return (0, utils_1.throwError)(newOptions, `${idNamesStr} 中存在同名页面：${view.name}`);
+                            }
+                            else { // 存在则保留原来页面的子页面，其他内容覆盖
+                                delete view.children;
+                                Object.assign(existingView, view);
+                            }
+                        }
+                        else {
+                            parentViewList.push(view);
+                            viewCacheMap[[...parentPathSegments, view.name].join('/')] = view;
+                        }
+                    }
+                }
+            }
+            else if (statement.type === 'ExpressionStatement' && statement.expression.type === 'TaggedTemplateExpression') {
+                const expression = statement.expression;
+                if (expression.tag.type === 'Identifier' && expression.tag.name === '$theme') {
+                    if (expression.quasi.expressions.length > 0) {
+                        return (0, utils_1.throwError)(parseState, '不支持在 $theme 中使用动态表达式');
+                    }
+                    const css = expression.quasi.quasis[0].value.raw;
+                    const variableMap = (0, transformThemeAndStyle_1.transformTheme)(css, { ...parseState });
+                    frontend.theme.scopeVariableMap = variableMap;
+                }
+                else if (expression.tag.type === 'Identifier' && expression.tag.name === '$extraStyle') {
+                    if (expression.quasi.expressions.length > 0) {
+                        return (0, utils_1.throwError)(parseState, '不支持在 $style 中使用动态表达式');
+                    }
+                    const css = expression.quasi.quasis[0].value.raw;
+                    const cssRules = (0, transformThemeAndStyle_1.transformStyle)(css, { ...parseState });
+                    frontend.theme.cssRules = cssRules;
+                }
+            }
+            else {
+                return (0, utils_1.throwError)(parseState, '不支持的命名空间：' + idNamesStr);
+            }
         }
         else {
-            (0, utils_1.throwError)('不支持的命名空间：' + idNamesStr);
+            return (0, utils_1.throwError)(parseState, '不支持的命名空间：' + idNamesStr);
         }
     });
     return app;