@lcap/nasl 3.9.0-beta.2 → 3.9.0-beta.20

package/out/server/naslServer.js

@@ -54,7 +54,7 @@ const diagnostic_1 = require("../manager/diagnostic");
 const naslStdlibMap_1 = __importDefault(require("./naslStdlibMap"));
 const utils_1 = require("../utils");
 const decorators_1 = require("../decorators");
-const utils_2 = require("../automate/engine/utils");
+const nasl_concepts_1 = require("@lcap/nasl-concepts");
 const EmbeddedTSFileLineMap = {
     Entity: 3,
 };
@@ -129,16 +129,6 @@ function isFunctionWithFixedTimeZoneParam(calleeName) {
     const fns = ['CurrDateTime', 'CurrDate', 'CurrTime', 'FormatDateTime'];
     return fns.includes(calleeName);
 }
-const timeZoneArgumentIndexMap = new Map([
-    ['ToString', 1],
-    ['CurrDateTime', 0],
-    ['CurrDate', 0],
-    ['CurrTime', 0],
-    ['FormatDateTime', 2],
-    ['jsonSerialize', 1],
-    ['GetDateCount', 2],
-    ['GetSpecificDaysOfWeek', 3]
-]);
 const allComponent = {};
 let NaslServer = NaslServer_1 = class NaslServer {
     constructor(opt) {
@@ -163,6 +153,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         this.changeStackList = [];
         // 包含组件逻辑调用的逻辑map
         this.logicSetWithComponentLogic = new Set();
+        this.isFirstScreen = true;
         /// #if process.env.BUILD_TARGET === 'node'
         if (globalThis.process)
             // For TS build
@@ -195,7 +186,13 @@ let NaslServer = NaslServer_1 = class NaslServer {
             handleMessage: async ({ data }) => {
                 if (data && data.event === 'publishDiagnostics') {
                     const records = await this._resolveDiagnosticRecords(data.records, data.versions);
-                    await this.diagnosticManager.pushAll(records);
+                    if (this.isFirstScreen) {
+                        await this.diagnosticManager.setInitialDiagData(records);
+                        this.isFirstScreen = false;
+                    }
+                    else {
+                        await this.diagnosticManager.pushAll(records);
+                    }
                     try {
                         // 结束诊断和标注
                         (0, common_1.invokeCommand)('naslServer:endWork');
@@ -224,6 +221,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
                  */
                 try {
                     const changeEvent = item.originEvent;
+                    // 设置国际化相关内容传标识过来，不需要进入语言服务
+                    if (changeEvent?.field === 'setI18n')
+                        return;
                     const changeNode = changeEvent.target;
                     const { fileNode } = this.getCurrentSource(changeNode);
                     // 这个方法是 5.0 加入标准库的，但是这里 ts 版本是 4.x，ci 会挂，所以需要忽略
@@ -260,7 +260,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         return this.messager.requestCommand('start');
     }
     terminate() {
-        this.worker.terminate();
+        return this.worker.terminate();
     }
     async createUiTs(components, optinos) {
         const { standardUIComponents, // 标准组件（带有ts类型定义文件的组件）
@@ -269,6 +269,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         const { code, elementsLogic } = await (0, createUiTs_1.default)(allComponent);
         // 处理一堆api.ts的类型
         const convertTsCode = (code) => {
+            code = code || '';
             code = code.replace(/nasl.core.Integer/g, 'nasl.core.Long');
             // 匹配union类型的正则
             const unionReg = /\s*['"].*['"](\s*\|\s*['"].*['"])+/g;
@@ -429,11 +430,15 @@ let NaslServer = NaslServer_1 = class NaslServer {
     }
     async openApp(app, performance = false, needRegisterCommand = true) {
         this.logger.time('生成 TS 文件');
+        this.logger.time('简单语义分析');
+        await utils.runGeneratorSync(nasl_concepts_1.semantics.collectAllSemanticCtx(app));
+        this.logger.timeEnd('简单语义分析');
+        // semantics.printSemanticDataInfo();
         (0, common_1.invokeCommand)('naslServer:startWork');
         app.naslServer = this;
         const self = this;
         this.performance = performance;
-        const results = await utils.timeSlicingWithGenerator(getAllTsFiles());
+        const results = await utils.runGeneratorAsync(getAllTsFiles());
         const files = results.map((result) => ({
             file: result.filePath,
             fileContent: result.code,
@@ -454,6 +459,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 callback();
             });
         }
+        nasl_concepts_1.semantics.clearSemanticData();
         this.logger.timeEnd('生成 TS 文件');
         function* getAllTsFiles() {
             const files = yield* self.contentToFile(app);
@@ -528,15 +534,15 @@ let NaslServer = NaslServer_1 = class NaslServer {
         const url = `/proxy/nasl-storage/api/App/debugEmbedded?id=${app.id}`;
         /// #if process.env.NODE_ENV === 'development'
         // 首次尝试请求
-        await this.http.post(`/proxy/nasl-storage/api/App/debugEmbedded?id=${app.id}`, openFiles[0]).catch(() => (this.openDebugEmbedded = false));
+        await this.http.post(url, openFiles[0]).catch(() => (this.openDebugEmbedded = false));
         if (this.openDebugEmbedded && globalThis.window) {
             // For TS build
             try {
                 let canDebug = true;
-                await this.http.post(`/proxy/nasl-storage/api/App/debugEmbedded?id=${app.id}`, openFiles[0]).catch(() => (canDebug = false));
+                await this.http.post(url, openFiles[0]).catch(() => (canDebug = false));
                 if (canDebug) {
                     await Promise.all(openFiles.map(async (file) => {
-                        const res = await this.http.post(`/proxy/nasl-storage/api/App/debugEmbedded?id=${app.id}`, file);
+                        const res = await this.http.post(url, file);
                         return res.data;
                     }));
                 }
@@ -547,7 +553,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         }
         /// #endif
         /// #if process.env.BUILD_TARGET === 'node'
-        if (globalThis.process) {
+        if (globalThis.process && process.env.NODE_ENV === 'development') {
             // For TS build
             try {
                 await Promise.all(openFiles.map(async (file) => fs.outputFile(path.join(__dirname, '../debug/apps', app.id, file.file), file.fileContent)));
@@ -855,7 +861,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
             if (!record || !record.node) {
                 return;
             }
-            const { node } = record;
+            let { node } = record;
+            // @ts-ignore
+            let nodeRaw = node.__v_raw || node; // 暂时先这样提速
             // 先获取原来的节点先清除一下之前有异常的节点，下面重新赋值
             const oldRecord = self.diagnosticManager.getRecord?.(record.id);
             // 处理旧数据
@@ -880,12 +888,12 @@ let NaslServer = NaslServer_1 = class NaslServer {
             }
             // 语义诊断
             if (isChangeInterface) {
-                yield* self.existStructureFix(record.semanticDiagnostics, record.node, self);
+                yield* self.existStructureFix(record.semanticDiagnostics, node, self);
             }
             // 单独处理 oql 语义错误提示
-            if (record.node instanceof concepts_1.Logic) {
+            if (nodeRaw instanceof concepts_1.Logic) {
                 yield* utils.wrapForEachToGenerator(record?.syntaxDiagnostics, function* test(item) {
-                    const minRange = yield* self._findMinRangeWithGenerator(item, record.node);
+                    const minRange = yield* self._findMinRangeWithGenerator(item, node);
                     if (minRange?.node instanceof concepts_1.OqlQueryComponent) {
                         if (item.text === 'Invalid character.') {
                             record.semanticDiagnostics.push(item);
@@ -898,7 +906,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 (0, translator_2.checkAStructure_)(diag.text);
             });
             record.semanticDiagnostics = (yield* utils.wrapMapToGenerator(record.semanticDiagnostics, function* (diag) {
-                return yield* self._resolveDiagnosticWithGenerator(diag, record.node, record);
+                return yield* self._resolveDiagnosticWithGenerator(diag, node, record);
             })).filter((diag) => !!diag);
             record.semanticDiagnostics.push(...(yield* self._attachDiagnosticsWithGenerator(node)));
             // 报错降级逻辑
@@ -979,21 +987,21 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     `'__onlineConfigValueEmpty' is declared but its value is never read.`,
                     `'__UpdateNoProperty__' is declared but its value is never read.`,
                 ].includes(diag.text)) {
-                    return yield* self._resolveDiagnosticWithGenerator(diag, record.node, record);
+                    return yield* self._resolveDiagnosticWithGenerator(diag, node, record);
                 }
                 if (diag.text.includes(` is declared but its value is never read.`)) {
                     // 局部变量和输入变量未使用的警告
-                    const fromModule = record.node.parentNode.concept === 'Module';
-                    const fromConnector = record.node.parentNode.concept === 'Connector';
-                    if ((concepts_1.asserts.isStrictView(record.node) || concepts_1.asserts.isStrictLogic(record.node)) && !(fromModule || fromConnector)) {
+                    const fromModule = nodeRaw.parentNode.concept === 'Module' || nodeRaw.module;
+                    const fromConnector = nodeRaw.parentNode.concept === 'Connector';
+                    if ((concepts_1.asserts.isStrictView(nodeRaw) || concepts_1.asserts.isStrictLogic(nodeRaw)) && !(fromModule || fromConnector)) {
                         /**
                          * javalogic不用提示
                          */
-                        if (concepts_1.asserts.isStrictLogic(record.node) && self._isJavalogic(record.node)) {
+                        if (concepts_1.asserts.isStrictLogic(nodeRaw) && self._isJavalogic(nodeRaw)) {
                             return null;
                         }
-                        concepts_1.asserts.assertFileNode(record.node);
-                        const minRange = yield* self._findMinRangeWithGenerator(diag, record.node);
+                        concepts_1.asserts.assertFileNode(nodeRaw);
+                        const minRange = yield* self._findMinRangeWithGenerator(diag, node);
                         if (minRange) {
                             /**
                              * 如果节点是入参类型
@@ -1510,13 +1518,15 @@ let NaslServer = NaslServer_1 = class NaslServer {
      */
     *_attachDiagnosticsWithGenerator(fileNode) {
         // 每次诊断前先清空这个Set
+        // @ts-ignore
+        let fileNodeRaw = fileNode.__v_raw || fileNode; // 暂时先这样提速
         this.logicSetWithComponentLogic = new Set();
         const self = this;
         const diagnostics = [];
-        if (fileNode instanceof concepts_1.View || fileNode instanceof concepts_1.BusinessComponent) {
-            yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), function* attachView([node, value]) {
+        if (fileNodeRaw instanceof concepts_1.View || fileNodeRaw instanceof concepts_1.BusinessComponent) {
+            yield* utils.wrapIteratorToGenerator(fileNodeRaw.sourceMap.entries(), function* attachView([node, value]) {
                 const likeComponent = node.getAncestor('View') || node.getAncestor('BusinessComponent');
-                if (node instanceof concepts_1.ViewElement && likeComponent === fileNode) {
+                if (node instanceof concepts_1.ViewElement && likeComponent === fileNodeRaw) {
                     if (node.tag) {
                         yield* utils.wrapForEachToGenerator(node.bindAttrs, (bindAttr) => {
                             if ((bindAttr.model || bindAttr.sync) && bindAttr.expression) {
@@ -1560,14 +1570,14 @@ let NaslServer = NaslServer_1 = class NaslServer {
                         });
                     }
                 }
-                else if ((node instanceof concepts_1.Variable || node instanceof concepts_1.Return) && likeComponent === fileNode) {
+                else if ((node instanceof concepts_1.Variable || node instanceof concepts_1.Return) && likeComponent === fileNodeRaw) {
                     if (!node.typeAnnotation && !node.__TypeAnnotation) {
                         const nodeTypeName = node.concept === 'Return' ? '输出参数' : '局部变量';
                         let msg;
-                        yield* fileNode.traverseChildrenGenerator((nodeIn) => {
+                        yield* fileNodeRaw.traverseChildrenGenerator((nodeIn) => {
                             if (nodeIn && (nodeIn instanceof concepts_1.BatchAssignment || (nodeIn instanceof concepts_1.Assignment && nodeIn.left?.name))) {
                                 // 子页面内部逻辑过滤
-                                if ((nodeIn.view || nodeIn.getAncestor('BusinessComponent')) !== fileNode)
+                                if ((nodeIn.view || nodeIn.getAncestor('BusinessComponent')) !== fileNodeRaw)
                                     return;
                                 // 当局部变量、输出参数属于页面内逻辑时，需过滤同页面下不同逻辑下的同名变量
                                 if (node.logic && node.logic !== nodeIn.logic)
@@ -1627,7 +1637,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                         node.tsErrorDetail = diagnostic;
                         diagnostics.push(diagnostic);
                     }
-                    const fileSourceCode = self.getNodeCode(fileNode, value);
+                    const fileSourceCode = self.getNodeCode(fileNodeRaw, value);
                     if (fileSourceCode.includes('|') && fileSourceCode.includes('.metadataTypes.')) {
                         const typeAnnotation = node.typeAnnotation.toJSON();
                         yield* self._treeMetadataType2CoreType(typeAnnotation, node.rootNode);
@@ -1695,18 +1705,41 @@ let NaslServer = NaslServer_1 = class NaslServer {
                         node.tsErrorDetail = diagnostic;
                     }
                 }
+                else if (node instanceof concepts_1.CallLogic) {
+                    const viewElement = node.getAncestor('ViewElement');
+                    if (viewElement && viewElement.tag === 'u-download' && node.parentNode.name === "dataSource") {
+                        // node.Pa
+                        const args = ['page', 'size'];
+                        const values = [];
+                        node.arguments && node.arguments.forEach((arg) => {
+                            const expression = arg.expression;
+                            if (expression && expression.concept === "Identifier" && expression.namespace === "backend") {
+                                values.push(expression.name);
+                            }
+                        });
+                        if (args.length !== values.length || new Set(values).size !== values.length) {
+                            const diagnostic = {
+                                node,
+                                severity: 'error',
+                                message: `下载组件必须为page和size指定入参,且不能重复`,
+                            };
+                            diagnostics.push(diagnostic);
+                            node.tsErrorDetail = diagnostic;
+                        }
+                    }
+                }
                 else {
                     self.checkNodeError(node, diagnostics);
                 }
             });
         }
-        else if (fileNode instanceof concepts_1.DataSource) {
-            const dataSourceGroup = fileNode.rootNode.configuration?.getGroup('dataSource');
+        else if (fileNodeRaw instanceof concepts_1.DataSource) {
+            const dataSourceGroup = fileNodeRaw.rootNode.configuration?.getGroup('dataSource');
             if (dataSourceGroup) {
-                const property = dataSourceGroup.getProperty(fileNode.name);
+                const property = dataSourceGroup.getProperty(fileNodeRaw.name);
                 if (property && property.values) {
                     yield* utils.wrapForEachToGenerator(property.values, (propertyValue) => {
-                        if (!propertyValue.value && fileNode.name !== 'defaultDS') {
+                        if (!propertyValue.value && fileNodeRaw.name !== 'defaultDS') {
                             // prod 环境数据源未配置数据信息 时，不再给出其他提示
                             // https://projectmanage.netease-official.lcap.163yun.com/dashboard/FeatureDetail?id=2782461488301056
                             if (propertyValue.env === 'online')
@@ -1727,7 +1760,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                             diagnostics.push(diagnostic);
                         }
                         else if (propertyValue.value) {
-                            const dataSource = fileNode;
+                            const dataSource = fileNodeRaw;
                             // 数据源有连接错误
                             let envText;
                             if (propertyValue.env === 'dev') {
@@ -1768,18 +1801,18 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 }
             }
             // 检查实体重名
-            const duplidateEntities = this._getDuplicateNames(fileNode, (dataSource) => dataSource.entities, (entity) => entity.name);
+            const duplidateEntities = this._getDuplicateNames(fileNodeRaw, (dataSource) => dataSource.entities, (entity) => entity.name);
             if (duplidateEntities.length) {
                 diagnostics.push({
                     node: fileNode,
                     severity: 'error',
-                    message: `数据源${fileNode.name}存在重名实体：${duplidateEntities.join(', ')}`,
+                    message: `数据源${fileNodeRaw.name}存在重名实体：${duplidateEntities.join(', ')}`,
                 });
             }
         }
         // 加上对实体属性存储类型的校验规则
-        else if (fileNode instanceof concepts_1.Entity) {
-            const entity = fileNode;
+        else if (fileNodeRaw instanceof concepts_1.Entity) {
+            const entity = fileNodeRaw;
             const dbType = entity.dataSource.dataSourceSqlType;
             const { origin, properties } = entity || {};
             if (dbType && !['excel', 'table'].includes(origin) && Array.isArray(properties) && properties.length) {
@@ -2035,12 +2068,12 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 });
             }
         }
-        else if (fileNode instanceof concepts_1.Logic || fileNode instanceof concepts_1.OverriddenLogic) {
-            const { isRefedByTrigger, fRefNames } = yield this.isRefedByTriggerAndReturnFirstRef(fileNode);
-            if (fileNode instanceof concepts_1.Logic && fileNode?.exportInterface && fileNode.calleewholeKey.startsWith('app.logics')) {
+        else if (fileNodeRaw instanceof concepts_1.Logic || fileNodeRaw instanceof concepts_1.OverriddenLogic) {
+            const { isRefedByTrigger, fRefNames } = yield this.isRefedByTriggerAndReturnFirstRef(fileNodeRaw);
+            if (fileNodeRaw instanceof concepts_1.Logic && fileNodeRaw?.exportInterface && fileNodeRaw.calleewholeKey.startsWith('app.logics')) {
                 let isSame = true;
-                const itf = fileNode.exportInterface;
-                const { params: logicParams, returns: logicReturns } = fileNode;
+                const itf = fileNodeRaw.exportInterface;
+                const { params: logicParams, returns: logicReturns } = fileNodeRaw;
                 const { params: itfParams, returns: itfReturns } = itf;
                 if (logicParams?.length !== itfParams?.length || logicReturns?.length !== itfReturns?.length) {
                     isSame = false;
@@ -2084,29 +2117,29 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     diagnostics.push(diagnostic);
                 }
             }
-            if (fileNode instanceof concepts_1.Logic && fileNode.calleewholeKey.startsWith('app.logics')) {
-                const duplicateLogics = this._getDuplicateNames(fileNode.rootNode, (app) => app.logics, (logic) => logic.name);
-                if (duplicateLogics.includes(fileNode.name)) {
+            if (fileNodeRaw instanceof concepts_1.Logic && fileNodeRaw.calleewholeKey.startsWith('app.logics')) {
+                const duplicateLogics = this._getDuplicateNames(fileNodeRaw.rootNode, (app) => app.logics, (logic) => logic.name);
+                if (duplicateLogics.includes(fileNodeRaw.name)) {
                     const diagnostic = {
                         node: fileNode,
                         severity: 'error',
-                        message: `存在重名服务端逻辑${fileNode.name}`,
+                        message: `存在重名服务端逻辑${fileNodeRaw.name}`,
                     };
                     diagnostics.push(diagnostic);
                 }
             }
             if (isRefedByTrigger) {
-                const { isTriggerRule, errorFRefNames } = this.isTriggerRule(fileNode, fRefNames);
+                const { isTriggerRule, errorFRefNames } = this.isTriggerRule(fileNodeRaw, fRefNames);
                 if (!isTriggerRule) {
                     const diagnostic = {
                         node: fileNode,
                         severity: 'error',
-                        message: `${fileNode.name} 已被消息订阅配置 ${errorFRefNames.join(',')} 引用，但出入参数类型不匹配，或数量不一致`,
+                        message: `${fileNodeRaw.name} 已被消息订阅配置 ${errorFRefNames.join(',')} 引用，但出入参数类型不匹配，或数量不一致`,
                     };
                     diagnostics.push(diagnostic);
                 }
             }
-            yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), function* wrapIterator([node, value]) {
+            yield* utils.wrapIteratorToGenerator(fileNodeRaw.sourceMap.entries(), function* wrapIterator([node, value]) {
                 if (node instanceof concepts_1.OqlQueryComponent) {
                     // 自动推导情况
                     const typeAnnotation = yield* (0, service_1.type2TypeAnnotation)(node.__nodeType);
@@ -2171,7 +2204,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     else {
                         node.__aStructureError = null;
                     }
-                    const fileSourceCode = self.getNodeCode(fileNode, value);
+                    const fileSourceCode = self.getNodeCode(fileNodeRaw, value);
                     if (fileSourceCode.includes('|') && fileSourceCode.includes('.metadataTypes.')) {
                         const typeAnnotation = node.typeAnnotation.toJSON();
                         yield* self._treeMetadataType2CoreType(typeAnnotation, node.rootNode);
@@ -2187,7 +2220,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     }
                 }
                 else if (node instanceof concepts_1.Param) {
-                    const fileSourceCode = self.getNodeCode(fileNode, value);
+                    const fileSourceCode = self.getNodeCode(fileNodeRaw, value);
                     if (fileSourceCode.includes('|') && fileSourceCode.includes('.metadataTypes.')) {
                         const typeAnnotation = node.typeAnnotation.toJSON();
                         yield* self._treeMetadataType2CoreType(typeAnnotation, node.rootNode);
@@ -2205,13 +2238,13 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 self.checkNodeError(node, diagnostics);
             });
         }
-        else if (fileNode instanceof concepts_1.Process) {
-            yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), ([node, value]) => {
+        else if (fileNodeRaw instanceof concepts_1.Process) {
+            yield* utils.wrapIteratorToGenerator(fileNodeRaw.sourceMap.entries(), ([node, value]) => {
                 this.checkNodeError(node, diagnostics);
             });
         }
-        else if (fileNode instanceof concepts_1.ProcessV2) {
-            yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), function* wrapIterator([node, value]) {
+        else if (fileNodeRaw instanceof concepts_1.ProcessV2) {
+            yield* utils.wrapIteratorToGenerator(fileNodeRaw.sourceMap.entries(), function* wrapIterator([node, value]) {
                 if (node instanceof concepts_1.Return || node instanceof concepts_1.Variable) {
                     const nodeTypeName = node.concept === 'Return' ? '输出参数' : '局部变量';
                     if (!node.typeAnnotation && !node.__TypeAnnotation) {
@@ -2254,13 +2287,13 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 }
             });
         }
-        else if (fileNode instanceof concepts_1.Connection) {
-            const connectorPropertyNames = NaslServer_1.getPropertyNames(fileNode);
-            const connectionPropertyNames = NaslServer_1.getPropertyNames(fileNode?.connector);
+        else if (fileNodeRaw instanceof concepts_1.Connection) {
+            const connectorPropertyNames = NaslServer_1.getPropertyNames(fileNodeRaw);
+            const connectionPropertyNames = NaslServer_1.getPropertyNames(fileNodeRaw?.connector);
             const diagnostic = {
                 node: fileNode,
                 severity: 'error',
-                message: `连接器 ${fileNode.name} 参数配置有更新`,
+                message: `连接器 ${fileNodeRaw.name} 参数配置有更新`,
                 // 保留原来的内容方便查询一些问题
                 originalDiagnostic: {
                     fileName: '',
@@ -2286,12 +2319,12 @@ let NaslServer = NaslServer_1 = class NaslServer {
             else if (!isSameConfig) {
                 diagnostics.push(diagnostic);
             }
-            else if (hasEmptyConfig(fileNode)) {
+            else if (hasEmptyConfig(fileNodeRaw)) {
                 diagnostics.push(diagnostic);
             }
         }
-        else if (fileNode instanceof concepts_1.MetadataType) {
-            fileNode?.sourceMap.forEach((value, node) => {
+        else if (fileNodeRaw instanceof concepts_1.MetadataType) {
+            fileNodeRaw?.sourceMap.forEach((value, node) => {
                 const rulesMap = {};
                 const { rules, typeAnnotation } = node;
                 if (Array.isArray(rules)) {
@@ -2336,19 +2369,19 @@ let NaslServer = NaslServer_1 = class NaslServer {
             });
         }
         // TODO need reset when process support hoc & spread param & type annotation
-        const isInProcess = fileNode instanceof concepts_1.Process ||
-            fileNode instanceof concepts_1.ProcessV2 ||
-            !!fileNode?.getAncestor('Process') ||
-            !!fileNode?.getAncestor('ProcessV2');
+        const isInProcess = fileNodeRaw instanceof concepts_1.Process ||
+            fileNodeRaw instanceof concepts_1.ProcessV2 ||
+            !!fileNodeRaw?.getAncestor('Process') ||
+            !!fileNodeRaw?.getAncestor('ProcessV2');
         if (isInProcess) {
             // 查找计算过 subLogic 的节点。（目前只有 Logic、ProcessElement、ProcessElementV2）
-            let targetNode = fileNode;
-            if ((0, asserts_1.isProcess)(fileNode) ||
-                (0, asserts_1.isProcessV2)(fileNode)) {
-                targetNode = fileNode;
+            let targetNode = fileNodeRaw;
+            if ((0, asserts_1.isProcess)(fileNodeRaw) ||
+                (0, asserts_1.isProcessV2)(fileNodeRaw)) {
+                targetNode = fileNodeRaw;
             }
             else {
-                targetNode = fileNode.getAncestor('Process') || fileNode.getAncestor('ProcessV2');
+                targetNode = fileNodeRaw.getAncestor('Process') || fileNodeRaw.getAncestor('ProcessV2');
             }
             if (targetNode?.subLogics?.length) {
                 const diagnostic = {
@@ -2627,7 +2660,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 // calllogic 中别的类型会强校验，但是内置函数，不会强制校验，下面这几个其实是走的内置函数的实现，所以需要手动增加一下校验
                 const { calleeNamespace, calleeName } = node.parentNode.parentNode;
                 if ((calleeNamespace === 'nasl.ui' || calleeNamespace === 'nasl.util') &&
-                    (['showMessage', 'consoleLog', 'jsonDeserialize',
+                    (['showMessage', 'jsonDeserialize',
                         'jsonSerialize'].includes(calleeName))) {
                     showErr = true;
                 }
@@ -2790,7 +2823,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
      * 判断当前CallInterface 对应的 Interface 是否含有鉴权方式
      */
     hasAuth(node) {
-        const tInterface = (0, utils_2.getNodeByNodeCallee)(node.rootNode, node.calleewholeKey);
+        const tInterface = (0, service_1.getNodeByNodeCallee)(node.rootNode, node.calleewholeKey);
         return tInterface instanceof concepts_1.AuthInterface;
     }
     /* 接口导入查找 */
@@ -2896,10 +2929,12 @@ let NaslServer = NaslServer_1 = class NaslServer {
      */
     *_findMinRangeWithGenerator(diagnostic, fileNode) {
         let minRange;
-        const { sourceMap } = fileNode;
+        // @ts-ignore
+        let fileNodeRaw = fileNode.__v_raw || fileNode; // 暂时先这样提速
+        const { sourceMap } = fileNodeRaw;
         // 是否找到了行内准确的，是的话，就不走多行的
         let haveLineNode = false;
-        for (const [node, item] of sourceMap.entries()) {
+        for (let [node, item] of sourceMap.entries()) {
             /**
              * 当前内容的开始行 <= 诊断开始的行 &&
              * 当前内容的结束行 >= 诊断结束的行
@@ -2957,7 +2992,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             yield;
         }
         if (!minRange) {
-            if (fileNode instanceof concepts_1.View || fileNode instanceof concepts_1.BusinessComponent) {
+            if (fileNodeRaw instanceof concepts_1.View || fileNodeRaw instanceof concepts_1.BusinessComponent) {
                 return { node: fileNode, item: sourceMap.get(fileNode) };
             }
             if (process.env.NODE_ENV === 'development') {
@@ -2994,7 +3029,13 @@ let NaslServer = NaslServer_1 = class NaslServer {
             refsList = [...newRefs.refs];
         }
         else if (node instanceof concepts_1.Module && !(node instanceof concepts_1.Connector)) {
-            const lists = node.logics || node.structures || node.enums;
+            // 数组有长度的情况下，才去查找
+            const { logics, structures, enums, interfaces } = node;
+            const lists = (logics?.length && logics) ||
+                (structures?.length && structures) ||
+                (enums?.length && enums) ||
+                (interfaces?.length && interfaces);
+            // const lists = node.logics || node.structures || node.enums;
             const moduleName = fileNode.getEmbeddedFilePath();
             if (lists.length) {
                 const item = lists[0];
@@ -4305,7 +4346,15 @@ let NaslServer = NaslServer_1 = class NaslServer {
         // 总共要返回出去的
         const types = new Map();
         const newQuickInfoNodes = [];
+        let nCount = 0;
         yield* utils.wrapForEachToGenerator(nodes, function* getQuickInfoPosition(itemDetail, index) {
+            ++nCount;
+            if (nCount === 30000) {
+                // console.log('tick')
+                nCount = 0;
+                // 预留时间做 minor gc，减少峰值内存占用
+                (async () => await new Promise(resolve => setTimeout(resolve, 55)))();
+            }
             const { node, filePath, item } = itemDetail;
             // 先按照顺序占位
             types.set(node, null);
@@ -4335,6 +4384,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 'CallLogic',
                 'CallFunction',
                 'CallInterface',
+                'CallMicroserviceInterface',
                 'MemberExpression',
                 'Return',
                 'Variable',
@@ -4342,6 +4392,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 'NewComposite',
                 'NewList',
                 'NewMap',
+                'NewStructure',
                 'OqlQueryComponent',
                 'QueryFieldExpression',
                 'QueryGroupByExpression',
@@ -4349,7 +4400,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 'Paginate',
                 'BackendVariable',
                 'CallAuthInterface',
-                'CallConnector'
+                'CallConnector',
+                'StructureProperty',
             ].includes(node.concept))
                 return;
             // 要去ls那边获取的
@@ -4462,6 +4514,13 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     else if (value.typeAnnotation) {
                         node.__TypeAnnotation = value.typeAnnotation;
                     }
+                    // 节点有函数返回时候 返回类型作为typeAnnotation
+                    const nodeType = node.__nodeType;
+                    if (nodeType) {
+                        if (nodeType.typeName === "__function" && nodeType.fnReturnType) {
+                            node.__TypeAnnotation = nodeType.fnReturnType;
+                        }
+                    }
                 }
                 else {
                     // 清空原来已经赋值上去的类型，可能原来有现在没有了
@@ -4513,6 +4572,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 // }
             }
         });
+        // 预留时间做 minor gc，减少峰值内存占用
+        (async () => await new Promise(resolve => setTimeout(resolve, 55)))();
         return types;
     }
     *_getQuickInfoBindAttributeTypeWithGenerator(itemDetail) {
@@ -4555,45 +4616,82 @@ let NaslServer = NaslServer_1 = class NaslServer {
         return utils.runGeneratorAsync(this._getQuickInfoNodesTypeMapWithGenerator(nodes));
     }
     // 全量标注并且返回json
-    async getNaslAnnotatedJSON(app, releaseFlag) {
+    async getNaslAnnotatedJSON(naslNode, releaseFlag) {
+        // eslint-disable-next-line @typescript-eslint/no-shadow
+        const isApp = concepts_1.asserts.isApp(naslNode);
         if (this.changeStackList?.length) {
             throw new Error(`当前还有${this.changeStackList.length}个文件还在执行更新操作`);
         }
-        this.logger.time('全量标注');
+        this.logger.time(`${isApp ? '全量' : '单文件'}标注`);
         const nodes = [];
-        this.file2NodeMap.forEach((fileNode, filePath) => {
-            // 先不排除view，传递给后端的时候，去除views下的标注
-            if (!['DataSource', 'Enum', 'Role'].includes(fileNode.concept)) {
-                fileNode.sourceMap.forEach((item, node) => {
-                    nodes.push({
-                        filePath,
-                        node,
-                        item,
-                    });
+        if (!isApp) {
+            const filePath = naslNode?.getEmbeddedFilePath();
+            naslNode.sourceMap.forEach((item, node) => {
+                nodes.push({
+                    filePath,
+                    node,
+                    item,
                 });
-            }
-        });
+            });
+        }
+        else {
+            this.file2NodeMap.forEach((fileNode, filePath) => {
+                // 先不排除view，传递给后端的时候，去除views下的标注
+                if (!['DataSource', 'Enum', 'Role'].includes(fileNode.concept)) {
+                    fileNode.sourceMap.forEach((item, node) => {
+                        nodes.push({
+                            filePath,
+                            node,
+                            item,
+                        });
+                    });
+                }
+            });
+        }
         const typesMap = await this.getQuickInfoNodesTypeMap(nodes, true);
-        console.time('app toJSON');
+        this.logger.time('app to AnnotatedJSON');
         const jsonMap = new Map();
-        const json = app._toJSON((source, instance) => {
+        const json = naslNode._toJSON((source, instance) => {
             jsonMap.set(instance, source);
             return source;
         });
-        console.timeEnd('app toJSON');
-        this.logger.timeEnd('全量标注');
+        this.logger.timeEnd('app to AnnotatedJSON');
+        this.logger.timeEnd(`${isApp ? '全量' : '单文件'}标注`);
         // 测试环境或者是调试模式打印数据
         if (utils.isDebugMode || utils.isTestBrowser) {
-            this.logger.info('全量标注数据', json);
+            this.logger.info(`${isApp ? '全量' : '单文件'}标注数据`, json);
         }
         if (releaseFlag) {
-            console.time('annotationToJson');
+            this.logger.time('annotationToJson');
             // 全量标注后对json进行一些修改，为了服务端翻译处理
             this.annotationToJson(typesMap, json, jsonMap);
-            console.timeEnd('annotationToJson');
+            this.logger.timeEnd('annotationToJson');
         }
         return json;
     }
+    /**
+     * 标注指定文件
+     *
+     * @description 会进行 TS 翻译
+     */
+    annotationFiles(fileNodes) {
+        const nodes = [];
+        const files = fileNodes.filter((node) => !(0, service_1.isIgnoreAnnotationFileNode)(node));
+        for (const node of files) {
+            if (!node.sourceMap) {
+                continue;
+            }
+            const filePath = node.getEmbeddedFilePath();
+            node.sourceMap.forEach((item, node) => {
+                nodes.push({
+                    filePath: filePath,
+                    node,
+                    item,
+                });
+            });
+        }
+        return this.getQuickInfoNodesTypeMap(nodes, true);
+    }
     // 增量标注
     *_incrementalAnnotationJSONWithGenerator(records) {
         this.logger.time('增量标注');
@@ -4606,7 +4704,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             }
             record.id = fileNode.id;
             record.node = fileNode;
-            if (['Structure', 'DataSource', 'Entity', 'Enum', 'Role', 'MetadataType'].includes(fileNode.concept) || !fileNode.sourceMap) {
+            if ((0, service_1.isIgnoreAnnotationFileNode)(fileNode)) {
                 return;
             }
             yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), ([nodeItem, item]) => {
@@ -4621,6 +4719,16 @@ let NaslServer = NaslServer_1 = class NaslServer {
         this.logger.timeEnd('增量标注');
     }
     annotationToJson(typesMap, json, jsonMap) {
+        const timeZoneArgumentIndexMap = new Map([
+            ['ToString', 1],
+            ['CurrDateTime', 0],
+            ['CurrDate', 0],
+            ['CurrTime', 0],
+            ['FormatDateTime', 2],
+            ['jsonSerialize', 1],
+            ['GetDateCount', 2],
+            ['GetSpecificDaysOfWeek', 3]
+        ]);
         typesMap.forEach((value, node) => {
             // 如果节点本身有类型就不去在塞一遍了
             // 有值而且没有类型再去设置
@@ -5169,6 +5277,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 for (let i = 0; i < fileNodeChildren.length; i++) {
                     const fileNodeItem = fileNodeChildren[i];
                     const result = await utils.timeSlicingWithGenerator(fileNodeItem.toEmbeddedTSFile());
+                    // @ts-ignore
                     fileNodeItem.sourceMap = result.sourceMap;
                     if (action === 'create') {
                         await this.handleChange(fileNodeItem, fileNodeItem, result, action);
@@ -5186,6 +5295,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 for (let i = 0; i < fileNodeChildren.length; i++) {
                     const fileNodeItem = fileNodeChildren[i];
                     const result = await utils.timeSlicingWithGenerator(fileNodeItem.toEmbeddedTSFile());
+                    // @ts-ignore
                     fileNodeItem.sourceMap = result.sourceMap;
                     if (action === 'create') {
                         await this.handleChange(fileNodeItem, fileNodeItem, result, action);
@@ -5211,6 +5321,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 for (let i = 0; i < fileNodeChildren.length; i++) {
                     const fileNodeItem = fileNodeChildren[i];
                     const result = await utils.timeSlicingWithGenerator(fileNodeItem.toEmbeddedTSFile());
+                    // @ts-ignore
                     fileNodeItem.sourceMap = result.sourceMap;
                     if (action === 'create') {
                         await this.handleChange(fileNodeItem, fileNodeItem, result, action);
@@ -5285,24 +5396,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
         this.singleFileChangeIng = true;
         // 行为
         const { action, oldObject = {}, object = {} } = $event;
-        // 根据行为跳过更新文件
-        // 如果更新国际化key，不需要修改ts文件
-        if (Object.keys(object || {}).length === 1 && Object.keys(oldObject).length === 1) {
-            if (object.i18nKey && !oldObject.i18nKey) {
-                return;
-            }
-            if (object.i18nInfo && !oldObject.i18nInfo) {
-                return;
-            }
-            if (!object.i18nKey && oldObject.i18nKey) {
-                // 撤销重做 也跳过更新
-                return;
-            }
-            if (!object.i18nInfo && oldObject.i18nInfo) {
-                // 撤销重做 也跳过更新
-                return;
-            }
-        }
         const targetNode = $event.target;
         this.logger.info(targetNode, 'targetNode');
         // 连接器namespace 没有真实文件，不需要走删除
@@ -5347,6 +5440,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 fileContent: result.code,
             },
         ]);
+        // @ts-ignore
         fileNode.sourceMap = result.sourceMap;
         if (action === 'update' || action === 'create') {
             if ($event?.field !== 'name') {
@@ -5368,6 +5462,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
     }
     changeFileNext() {
         if (!this.singleFileChangeIng) {
+            // SHIFT IS O(n) AND SLOW
             const item = this.changeStackList.shift();
             this.receiveHandleChange(item)
                 .catch((err) => {