@lcap/nasl 3.4.0-alpha.1 → 3.4.0-alpha.2

package/src/server/naslServer.ts

@@ -85,7 +85,8 @@ import {
   TriggerLauncher,
   CallConnector,
 } from '../concepts';
-import { lsp2tspNumber, SourceMap, SourceMapItem } from '../translator';
+
+import { lsp2tspNumber, SourceMap, SourceMapItem, isSameRange } from '../translator';
 import axios from '../service/storage';
 import { translateDiagnosticMessage, naslNodeTranslateMessage, MinRange, checkAStructure_ } from './translator';
 import { EventPayload, invokeCommand, registerCommand } from '../common';
@@ -143,15 +144,14 @@ type QuickInfoNodes = Array<{ filePath: string; node: BaseNode; item: SourceMapI
 
 let isChangeInterface = false; // 判断是否导入接口
 type ActionNode = { target: Variable; typeannotation: TypeAnnotation };
-let actionArr: Array<ActionNode> = []; // 用于导入接口收集更改的节点
-let timer: number = null; // 超时器用于收集导入接口相关
-const __naslStdlibFileCacheMap: Map<tsProtocol.OpenRequestArgs['file'], tsProtocol.OpenRequestArgs> = new Map(); // naslStdlib文件缓存
+let actionArr: Array<ActionNode> = []; //用于导入接口收集更改的节点
+let timer: number | null = null; //超时器用于收集导入接口相关
 
 // 联合类型切割取出类型
 export function getDisplayString2Type(displayString: string) {
-  const targetString = displayString.match(/value:\s(\S+)\)/)?.[1] ?? '';
-  let targetType: string = null;
-  if (targetString.startsWith('nasl.core.')) {
+  const targetString = displayString.match(/value:\s(\S+)\)/)?.[1];
+  let targetType:string | null = null;
+  if (targetString?.startsWith('nasl.core.')) {
     targetType = targetString.slice(10);
   }
 
@@ -161,7 +161,7 @@ export function getDisplayString2Type(displayString: string) {
   displayString = displayString?.replace('T extends ', '') || '';
   const types = reg.exec(displayString);
   // 取出提示的类型，组成是数组
-  const typeList: string[] = types[1].split(' | ').map((item: string) => {
+  const typeList: string[] = (types?.[1].split(' | ') ?? []).map((item: string) => {
     if (/<([^()]+)>/g.exec(item)) {
       return item;
     } if (item.includes(' ')) {
@@ -185,11 +185,12 @@ export function getDisplayString2Type(displayString: string) {
 
 @sentryMonitorNaslServer
 class NaslServer {
-  naslStdlibFileCacheMap = __naslStdlibFileCacheMap;
+  /** naslStdlib文件缓存 */
+  naslStdlibFileCacheMap: Map<tsProtocol.OpenRequestArgs['file'], tsProtocol.OpenRequestArgs> = new Map();
 
-  messager: Messager = undefined;
+  messager: Messager;
 
-  worker: Worker = undefined;
+  worker: Worker;
 
   /**
    * 按道理 fileSourceMap: new Map<string, SourceMap>() 比较合理，
@@ -198,12 +199,22 @@ class NaslServer {
    */
   file2NodeMap: Map<string, BaseNode> = new Map<string, BaseNode>();
 
+  /** TS 翻译的源码 */
+  tsFiles = new Map<string, string>();
+
+  /// #if process.env.NODE_ENV === 'development'
+  /**
+   * 调试时是否储存 ts 文件
+   */
+  openDebugEmbedded = true;
+  /// #endif
+
   elementsLogic: { [elementLogicName: string]: Array<Logic> } = {};
 
   // 错误日志收集
-  diagnosticManager: DiagnosticManager = undefined;
+  diagnosticManager: DiagnosticManager;
 
-  embeddedTSEmitter: EventEmitter = undefined;
+  embeddedTSEmitter: EventEmitter;
 
   // 需要执行修改的文件
   changeStackList: Array<EventPayload> = [];
@@ -521,6 +532,24 @@ class NaslServer {
           launcher.sourceMap = result.sourceMap;
           this.file2NodeMap.set(result.filePath, launcher);
         });
+        module.namespaces?.forEach?.((namespace) => {
+          namespace.logics.forEach((logic) => {
+              const result = logic.toEmbeddedTSFile();
+              results.push(result);
+              // sourceMap都存在目录级别内容下，在页面层级下去找
+              logic.sourceMap = result.sourceMap;
+              this.file2NodeMap.set(result.filePath, logic);
+          });
+        })
+        module?.authLogicsForCallInterface?.forEach?.((logic) => {
+          try {
+            if (!(logic instanceof Logic)) return;
+            const result = logic.toEmbeddedTSFile();
+            results.push(result);
+            logic.sourceMap = result.sourceMap;
+            this.file2NodeMap.set(result.filePath, logic);
+          } catch (err) {}
+        });
       } catch (error) {
         console.error(error);
       }
@@ -600,6 +629,7 @@ class NaslServer {
       // 其他模块的创建内容
       app.dependencies.forEach((item) => this.contentToFile(item, results));
       app.interfaceDependencies.forEach((item) => this.contentToFile(item, results));
+      app.integration?.connectors?.forEach((item) => this.contentToFile(item, results));
     } catch (err) {
       console.log(err);
     }
@@ -646,7 +676,7 @@ class NaslServer {
 
   // 缓存添加过的文件
   cacheFile(options: tsProtocol.OpenRequestArgs) {
-    __naslStdlibFileCacheMap.set(options.file, options);
+    this.naslStdlibFileCacheMap.set(options.file, options);
   }
 
   /** u
@@ -654,6 +684,7 @@ class NaslServer {
    * @param {*} files
    */
   writeFiles(files: Array<tsProtocol.OpenRequestArgs>) {
+    files.forEach(({ file, fileContent }) => this.tsFiles.set(file, fileContent));
     return this.messager.requestCommand('writeFiles', files);
   }
 
@@ -663,6 +694,7 @@ class NaslServer {
    * @param {*} args
    */
   updateFiles(args: { outputFiles: Array<tsProtocol.OpenRequestArgs> }) {
+    args.outputFiles.forEach(({ file, fileContent }) => this.tsFiles.set(file, fileContent));
     return this.messager.requestCommand('updateFiles', args);
   }
 
@@ -670,20 +702,22 @@ class NaslServer {
    * 清除一个目录下的所有文件
    */
   deleteDirectoryFiles(args: { directoryName: string }) {
+    Array.from(this.tsFiles.keys())
+      .filter((key) => key.startsWith(args.directoryName))
+      .forEach((key) => this.tsFiles.delete(key));
+
     return this.messager.requestCommand('deleteDirectoryFiles', args);
   }
 
   async _debugInFileStorage(node: BaseNode, openFiles: Array<tsProtocol.OpenRequestArgs>) {
     let app = node;
-    let openDebugEmbedded = true;
     if (node.concept !== 'App') {
       app = (node as any).rootNode || (node as any).app;
     }
     /// #if process.env.NODE_ENV === 'development'
     // 首次尝试请求
-    await axios.post(`/api/App/debugEmbedded?id=${  app.id}`, openFiles[0]).catch(() => (openDebugEmbedded = false));
-
-    if (openDebugEmbedded && globalThis.window) {
+    await axios.post('/api/App/debugEmbedded?id=' + app.id, openFiles[0]).catch(() => (this.openDebugEmbedded = false));
+    if (this.openDebugEmbedded && globalThis.window) {
       // For TS build
       try {
         let canDebug = true;
@@ -698,8 +732,7 @@ class NaslServer {
           );
         }
       } catch (e) {
-        // 出现错误之后不再调用
-        openDebugEmbedded = false;
+        // ..
       }
     }
     /// #endif
@@ -738,8 +771,8 @@ class NaslServer {
       return this._getValueSelectCompletion({
         file: (fileNode as FileNode).getEmbeddedFilePath(),
         range: {
-          line: lsp2tspNumber(currentSource.range.start.line),
-          offset: lsp2tspNumber(currentSource.range.start.character),
+          line: lsp2tspNumber(currentSource.start.line),
+          offset: lsp2tspNumber(currentSource.start.character),
         },
         value,
         noFilterList,
@@ -773,8 +806,8 @@ class NaslServer {
       try {
         const quickInfo = await this._getTypeQuickinfo({
           file: (fileNode as FileNode).getEmbeddedFilePath(),
-          line: lsp2tspNumber(currentSource.range.start.line),
-          offset: lsp2tspNumber(currentSource.range.start.character) + `nasl.util.C`.length,
+          line: lsp2tspNumber(currentSource.start.line),
+          offset: lsp2tspNumber(currentSource.start.character) + `nasl.util.C`.length,
         });
         if (quickInfo.responseRequired) {
           const displayString = quickInfo?.response?.displayString || '';
@@ -819,8 +852,8 @@ class NaslServer {
     }
     const quickInfo = await this._getTypeQuickinfo({
       file: (fileNode as FileNode).getEmbeddedFilePath(),
-      line: lsp2tspNumber(currentSource.range.start.line),
-      offset: lsp2tspNumber(currentSource.range.start.character) + `new nasl.ui.`.length,
+      line: lsp2tspNumber(currentSource.start.line),
+      offset: lsp2tspNumber(currentSource.start.character) + `new nasl.ui.`.length,
     });
     if (quickInfo.responseRequired) {
       const displayString = quickInfo?.response?.displayString || '';
@@ -878,8 +911,8 @@ class NaslServer {
     }
     const quickInfo = await this._getTypeQuickinfo({
       file: (fileNode as FileNode).getEmbeddedFilePath(),
-      line: lsp2tspNumber(currentSource.range.start.line),
-      offset: lsp2tspNumber(currentSource.range.start.character) + `new nasl.ui.`.length,
+      line: lsp2tspNumber(currentSource.start.line),
+      offset: lsp2tspNumber(currentSource.start.character) + `new nasl.ui.`.length,
     });
     if (quickInfo.responseRequired) {
       const displayString = quickInfo?.response?.displayString || '';
@@ -973,8 +1006,8 @@ class NaslServer {
       return this._getSelectNextCompletion({
         file: (fileNode as FileNode).getEmbeddedFilePath(),
         range: {
-          line: lsp2tspNumber(currentSource.range.start.line),
-          offset: lsp2tspNumber(currentSource.range.start.character),
+          line: lsp2tspNumber(currentSource.start.line),
+          offset: lsp2tspNumber(currentSource.start.character),
         },
         noFilterList,
       });
@@ -1021,7 +1054,7 @@ class NaslServer {
 
         oldRecord?.semanticDiagnostics.forEach((item) => {
           if (item.node) {
-            item.node.tsErrorDetail = undefined;
+            delete item.node.tsErrorDetail;
             // 如果logic中有报错就把标识置为true
             if ((item.node as any)?.logic?.haveError) {
               (item.node as any).logic.haveError = false;
@@ -1032,7 +1065,7 @@ class NaslServer {
         // 清空一些状态
         oldRecord?.suggestionDiagnostics.forEach((item) => {
           if (item.node) {
-            item.node.tsErrorDetail = undefined;
+            delete item.node.tsErrorDetail;
             if (item.node && item.node instanceof Logic) {
               item.node.isSmpty = false;
             }
@@ -1048,7 +1081,7 @@ class NaslServer {
         if (record.node instanceof Logic) {
           record?.syntaxDiagnostics.forEach((item) => {
             const minRange = this._findMinRange(item as unknown as tsProtocol.DiagnosticWithFileName, record.node as FileNode);
-            if (minRange.node instanceof OqlQueryComponent) {
+            if (minRange?.node instanceof OqlQueryComponent) {
               if (item.text === 'Invalid character.') {
                 record.semanticDiagnostics.push(item);
               }
@@ -1491,6 +1524,14 @@ class NaslServer {
               };
               this.baseNodeAssignmentTsError(variable, diagnostic);
               diagnostics.push(diagnostic);
+            } else if (variable.__TypeAnnotation?.hasSystemType(node.app)) {
+              const diagnostic = {
+                node,
+                severity: 'warning',
+                message: `数据查询中不可以使用或包含系统类型！当前类型：${variable.__TypeAnnotation?.typeChineseTitle}。`,
+              };
+              this.baseNodeAssignmentTsError(variable, diagnostic);
+              diagnostics.push(diagnostic);
             }
           });
         }
@@ -1749,6 +1790,19 @@ class NaslServer {
             diagnostics.push(diagnostic);
             node.tsErrorDetail = diagnostic;
           }
+        } else if (node instanceof Identifier) {
+          // 变量如果选到了页面，因为ts会找到兄弟的同名变量，所以需要新增报错，通过类型来判断加不加
+          // https://projectmanage.netease-official.lcap.163yun.com/dashboard/BugDetail?id=2696136968961024
+          if (node.name && node.__TypeAnnotation?.typeKind === 'reference' && node.__TypeAnnotation?.typeNamespace?.endsWith('views')) {
+            const errorMsg = `找不到 ${node.name}。`;
+            const diagnostic = {
+              node,
+              severity: 'error',
+              message: errorMsg,
+            };
+            diagnostics.push(diagnostic);
+            node.tsErrorDetail = diagnostic;
+          }
         } else {
           this.checkNodeError(node, diagnostics);
         }
@@ -1917,6 +1971,16 @@ class NaslServer {
                           typeAnnotationErrorDetail.errorPos[key] = errorMsg;
                         }
                       });
+                    } else if (rulesMap?.maxLength && +dataBaseTyp?.max && +rulesMap.maxLength > +dataBaseTyp.max) {
+                      // 判断当前 最大长度 是不是比 数据库类型的最大长度 长，超过就报错
+                      const errorMsg = `最大长度超出存储长度`;
+                      const diag: any = {
+                        node: property,
+                        severity: 'warning',
+                        message: errorMsg,
+                      };
+                      diagnostics.push(diag);
+                      typeAnnotationErrorDetail.errorPos.maxLength = errorMsg;
                     }
                   }
                   case 'Long': {
@@ -2119,7 +2183,7 @@ class NaslServer {
             node.tsErrorDetail = diagnostic;
             diagnostics.push(diagnostic);
           } else {
-            node.tsErrorDetail = undefined;
+            delete node.tsErrorDetail;
           }
         }
         this.checkNodeError(node, diagnostics);
@@ -2494,19 +2558,19 @@ class NaslServer {
        * 当前内容的开始行 <= 诊断开始的行 &&
        * 当前内容的结束行 >= 诊断结束的行
        */
-      if (lsp2tspNumber(item.range.start.line) <= diagnostic.start.line && lsp2tspNumber(item.range.end.line) >= diagnostic.end.line) {
+      if (lsp2tspNumber(item.start.line) <= diagnostic.start.line && lsp2tspNumber(item.end.line) >= diagnostic.end.line) {
         // 如果找到某一行
-        if (lsp2tspNumber(item.range.start.line) === diagnostic.start.line && lsp2tspNumber(item.range.end.line) === diagnostic.end.line) {
+        if (lsp2tspNumber(item.start.line) === diagnostic.start.line && lsp2tspNumber(item.end.line) === diagnostic.end.line) {
           // 在行的范围但是又不在列的范围，不用给默认值，给了反而不对，
           // 需要在列的范围内
           if (
-            lsp2tspNumber(item.range.start.character) <= diagnostic.start.offset &&
-            lsp2tspNumber(item.range.end.character) >= diagnostic.end.offset
+            lsp2tspNumber(item.start.character) <= diagnostic.start.offset &&
+            lsp2tspNumber(item.end.character) >= diagnostic.end.offset
           ) {
             // 比列更靠近 ，满足条件且长度更短
             // 如果先走到下面有一个默认值了就像在if for里面有个表达式
             // if for的内容也是包括当前的所以会重新赋值
-            if (!minRange || item.code.length < minRange.item.code.length) {
+            if (!minRange || (item.end.offset - item.start.offset) < (minRange.item.end.offset - minRange.item.start.offset)) {
               minRange = { item, node };
               haveLineNode = true;
             }
@@ -2518,22 +2582,24 @@ class NaslServer {
             minRange = { node, item };
           } else if (!haveLineNode) {
             if (
-              lsp2tspNumber(item.range.start.line) === diagnostic.start.line &&
-              diagnostic.start.offset >= lsp2tspNumber(item.range.start.character)
+              lsp2tspNumber(item.start.line) === diagnostic.start.line &&
+              diagnostic.start.offset >= lsp2tspNumber(item.start.character)
             ) {
               // 如果当前遍历的内容的行和列都 小于之前的， 而且是有效的
               // 如果两个内容位置行数是一样的，就比较下找到内容的位置信息
               // 找到的内容的开始位置， 要大于申明内容开始的位置，要不就不包含在内了
-              if (diagnostic.start.offset - item.range.start.character <= diagnostic.start.offset - minRange.item.range.start.character) {
+              if (diagnostic.start.offset - item.start.character <= diagnostic.start.offset - minRange.item.start.character) {
                 minRange = { node, item };
-              } else if (diagnostic.start.offset < lsp2tspNumber(minRange.item.range.start.character)) {
+              } else {
+                if (diagnostic.start.offset < lsp2tspNumber(minRange.item.start.character)) {
                   minRange = { node, item };
                 }
-            } else if (item.range.end.line - item.range.start.line <= minRange.item.range.end.line - minRange.item.range.start.line) {
+              }
+            } else if (item.end.line - item.start.line <= minRange.item.end.line - minRange.item.start.line) {
               // 行都一致 ，比较列
-              if (minRange.item.range.start.line === item.range.start.line && minRange.item.range.end.line === item.range.end.line) {
+              if (minRange.item.start.line === item.start.line && minRange.item.end.line === item.end.line) {
                 // 如果两个起始和结束的行都一样，那么就比较开始列， 要比原来大，说明更精准
-                if (item.range.start.character > minRange.item.range.start.character) {
+                if (item.start.character > minRange.item.start.character) {
                   minRange = { node, item };
                 }
               } else {
@@ -2567,8 +2633,8 @@ class NaslServer {
     if (currentSource) {
       const newRefs = await this.references({
         file: (fileNode as FileNode).getEmbeddedFilePath(),
-        line: lsp2tspNumber(currentSource.range.start.line),
-        offset: lsp2tspNumber(currentSource.range.start.character),
+        line: lsp2tspNumber(currentSource.start.line),
+        offset: lsp2tspNumber(currentSource.start.character),
       });
       refsList = [...newRefs.refs];
     } else if (node instanceof Module) {
@@ -2609,7 +2675,7 @@ class NaslServer {
           const entity = this.file2NodeMap.get(item.file);
           const { currentSource } = this.getCurrentSource(entity);
           // 42 11个函数的总行数
-          if (item.end.line < currentSource.range.end.line - 42 && item.start.line > 1) {
+          if (item.end.line < currentSource.end.line - 42 && item.start.line > 1) {
             flag = true;
           }
         }
@@ -2638,8 +2704,8 @@ class NaslServer {
                   callQueryComponentTypeAnnotation = key;
                 }
               });
-              const { currentSource: qcTypeAnnotationCurrentSource, fileNode } = callQueryComponentTypeAnnotation.getCurrentSource();
-              const { currentSource: logicCurrentSource } = fileNode.getCurrentSource();
+              const { currentSource: qcTypeAnnotationCurrentSource, fileNode: qcTypeCurrentFileNode } = callQueryComponentTypeAnnotation.getCurrentSource();
+              const { currentSource: logicCurrentSource, fileNode: logicCurrentFileNode } = fileNode.getCurrentSource();
               const aggregateLength = callQueryComponent.select.selectAggregateElements.filter(
                 (item: any) => item.aggregateName && item.asName
               ).length;
@@ -2655,15 +2721,18 @@ class NaslServer {
                 }
                 const { currentSource: propertyTypeCurrentSource } = targetProperty.typeAnnotation.getCurrentSource();
                 // 减去 ": " 2个字符、减去属性名长度
-                const propertyCharacter = propertyTypeCurrentSource.range.start.character - 2 - targetProperty.name.length;
-                const propertyOffset = propertyCharacter - qcTypeAnnotationCurrentSource.range.start.character;
-                const qcTypeAnnotationOffset = logicCurrentSource.code.indexOf(qcTypeAnnotationCurrentSource.code);
-                const declarationCodeArr = logicCurrentSource.code.slice(0, qcTypeAnnotationOffset).split('\n');
+                const propertyCharacter = propertyTypeCurrentSource.start.character - 2 - targetProperty.name.length;
+                const propertyOffset = propertyCharacter - qcTypeAnnotationCurrentSource.start.character;
+                const qcTypeCurrentFilePath = (qcTypeCurrentFileNode as any).getEmbeddedFilePath() as string;
+                const qcTypeAnnotationCurrentCode = this.getNodeCode(qcTypeCurrentFileNode, qcTypeAnnotationCurrentSource);
+                const logicCurrentCode = this.getNodeCode(qcTypeCurrentFileNode, logicCurrentSource);
+                const qcTypeAnnotationOffset = logicCurrentCode.indexOf(qcTypeAnnotationCurrentCode);
+                const declarationCodeArr = logicCurrentCode.slice(0, qcTypeAnnotationOffset).split('\n');
                 const line = declarationCodeArr.length - 1;
                 const character = declarationCodeArr[declarationCodeArr.length - 1].length;
                 // eslint-disable-next-line no-await-in-loop
                 const newRefs = await this.references({
-                  file: (fileNode as any).getEmbeddedFilePath(),
+                  file: qcTypeCurrentFilePath,
                   line: line + 2,
                   offset: character + 1 + propertyOffset,
                 });
@@ -2690,8 +2759,8 @@ class NaslServer {
       const { currentSource } = this.getCurrentSource(logicNode);
       const parentRefs = await this.references({
         file: (fileNode as FileNode).getEmbeddedFilePath(),
-        line: lsp2tspNumber(currentSource.range.start.line),
-        offset: lsp2tspNumber(currentSource.range.start.character),
+        line: lsp2tspNumber(currentSource.start.line),
+        offset: lsp2tspNumber(currentSource.start.character),
       });
       refsList = [...refsList, ...parentRefs.refs];
     }
@@ -2699,13 +2768,13 @@ class NaslServer {
     // 如果是参数修改, 就需要把logic的引用 都查找出来就需要把他的父级的引用全部查找出来
     if (node instanceof Param && (node.parentNode instanceof View || node.parentNode instanceof Process)) {
       const viewNode = node.parentNode;
-      const { currentSource } = this.getCurrentSource(viewNode);
-      const {code} = currentSource;
+      const { currentSource, fileNode } = this.getCurrentSource(viewNode);
+      const code = this.getNodeCode(fileNode, currentSource);
       const viewIndex = code.indexOf(' {');
       const viewRefs = await this.references({
         file: (fileNode as FileNode).getEmbeddedFilePath(),
-        line: lsp2tspNumber(currentSource.range.start.line),
-        offset: lsp2tspNumber(currentSource.range.start.character + viewIndex),
+        line: lsp2tspNumber(currentSource.start.line),
+        offset: lsp2tspNumber(currentSource.start.character + viewIndex),
       });
       let filterViewRefs = [];
       if (node.parentNode instanceof View) {
@@ -2728,8 +2797,8 @@ class NaslServer {
     //     const viewIndex = code.indexOf(' {');
     //     const viewRefs = await naslServer.references({
     //         file: (fileNode as FileNode).getEmbeddedFilePath(),
-    //         line: lsp2tspNumber(currentSource.range.start.line),
-    //         offset: lsp2tspNumber(currentSource.range.start.character + viewIndex),
+    //         line: lsp2tspNumber(currentSource.start.line),
+    //         offset: lsp2tspNumber(currentSource.start.character + viewIndex),
     //     });
     //     refsList = [...viewRefs.refs];
     // }
@@ -2738,14 +2807,14 @@ class NaslServer {
      */
     if (node instanceof ViewElement) {
       if (currentSource) {
-        const {code} = currentSource;
+        const code = this.getNodeCode(fileNode, currentSource);
         const prefix = '__elements.';
         const prefixIndex = code.indexOf(prefix) !== -1 ? code.indexOf(prefix) : 0;
         const methodsNameIndex = prefixIndex + prefix.length;
         const methods = await this.references({
           file: (fileNode as FileNode).getEmbeddedFilePath(),
-          line: lsp2tspNumber(currentSource.range.start.line),
-          offset: lsp2tspNumber(currentSource.range.start.character + methodsNameIndex),
+          line: lsp2tspNumber(currentSource.start.line),
+          offset: lsp2tspNumber(currentSource.start.character + methodsNameIndex),
         });
         const methodRefs: tsProtocol.ReferencesResponseItem[] = [];
         methods.refs.forEach((item) => {
@@ -2764,7 +2833,7 @@ class NaslServer {
     }
     if (node instanceof Process) {
       if (currentSource) {
-        const {code} = currentSource;
+        const code = this.getNodeCode(fileNode, currentSource);
         const prefix = '__ProcessIdentification__';
         let positions = [];
         let pos = code.indexOf(prefix);
@@ -2778,8 +2847,8 @@ class NaslServer {
         const promises = positions.map((item) =>
           this.references({
             file: (fileNode as FileNode).getEmbeddedFilePath(),
-            line: lsp2tspNumber(currentSource.range.start.line),
-            offset: lsp2tspNumber(currentSource.range.start.character + item),
+            line: lsp2tspNumber(currentSource.start.line),
+            offset: lsp2tspNumber(currentSource.start.character + item),
           })
         );
         const results = await Promise.all(promises);
@@ -2789,9 +2858,9 @@ class NaslServer {
       }
     }
     if ((node instanceof Param || node instanceof Return) && node.parentNode instanceof Process) {
-      const { currentSource } = this.getCurrentSource(node.parentNode);
+      const { currentSource, fileNode } = this.getCurrentSource(node.parentNode);
       if (currentSource) {
-        const {code} = currentSource;
+        const code = this.getNodeCode(fileNode, currentSource);
         const prefix = '__ProcessIdentification__';
         const positions = [];
         let pos = code.indexOf(prefix);
@@ -2809,8 +2878,8 @@ class NaslServer {
         const promises = positions.map((item) =>
           this.references({
             file: (fileNode as FileNode).getEmbeddedFilePath(),
-            line: lsp2tspNumber(currentSource.range.start.line),
-            offset: lsp2tspNumber(currentSource.range.start.character + item),
+            line: lsp2tspNumber(currentSource.start.line),
+            offset: lsp2tspNumber(currentSource.start.character + item),
           })
         );
         const results = await Promise.all(promises);
@@ -2821,7 +2890,7 @@ class NaslServer {
     }
     if (node instanceof ProcessElement) {
       if (currentSource) {
-        const {code} = currentSource;
+        const code = this.getNodeCode(fileNode, currentSource);
         const prefix = '__ProcessIdentification__';
         let positions = [];
         let pos = code.indexOf(prefix);
@@ -2834,8 +2903,8 @@ class NaslServer {
         const promises = positions.map((item) =>
           this.references({
             file: (fileNode as FileNode).getEmbeddedFilePath(),
-            line: lsp2tspNumber(currentSource.range.start.line),
-            offset: lsp2tspNumber(currentSource.range.start.character + item),
+            line: lsp2tspNumber(currentSource.start.line),
+            offset: lsp2tspNumber(currentSource.start.character + item),
           })
         );
         const results = await Promise.all(promises);
@@ -2845,9 +2914,9 @@ class NaslServer {
       }
     }
     if (node instanceof Return && node.parentNode instanceof ProcessElement) {
-      const { currentSource } = this.getCurrentSource(node.parentNode);
+      const { currentSource, fileNode } = this.getCurrentSource(node.parentNode);
       if (currentSource) {
-        const {code} = currentSource;
+        const code = this.getNodeCode(fileNode, currentSource);
         const prefix = '__ProcessIdentification__';
         const positions = [];
         let pos = code.indexOf(prefix);
@@ -2868,8 +2937,8 @@ class NaslServer {
         const promises = positions.map((item) =>
           this.references({
             file: (fileNode as FileNode).getEmbeddedFilePath(),
-            line: lsp2tspNumber(currentSource.range.start.line),
-            offset: lsp2tspNumber(currentSource.range.start.character + item),
+            line: lsp2tspNumber(currentSource.start.line),
+            offset: lsp2tspNumber(currentSource.start.character + item),
           })
         );
         const results = await Promise.all(promises);
@@ -3613,8 +3682,8 @@ class NaslServer {
   handlingCurrentSourceException(currentSource: SourceMapItem, node: BaseNode) {
     // 如果有前面的一些注解，元素在最后一行输出的值就给最后一行
     if (node instanceof EntityProperty) {
-      if (currentSource.range.start.line !== currentSource.range.end.line) {
-        currentSource.range.start = { ...currentSource.range.start, line: currentSource.range.end.line };
+      if (currentSource.start.line !== currentSource.end.line) {
+        currentSource.start = { ...currentSource.start, line: currentSource.end.line };
       }
     }
   }
@@ -3624,12 +3693,12 @@ class NaslServer {
     const { currentSource, fileNode } = this.getCurrentSource(node);
     if (currentSource && fileNode) {
       const range = {
-        line: lsp2tspNumber(currentSource.range.start.line),
-        offset: lsp2tspNumber(currentSource.range.start.character),
+        line: lsp2tspNumber(currentSource.start.line),
+        offset: lsp2tspNumber(currentSource.start.character),
       };
       // foreach 在最后一行自动补全
       if (node.concept === 'ForEachStatement') {
-        range.line = currentSource.range.end.line;
+        range.line = currentSource.end.line;
         range.offset = 0;
       } else if (node.concept === 'BindAttribute') {
         range.offset += 7;
@@ -3796,7 +3865,7 @@ class NaslServer {
         }
         // 如果 入参不是虚拟节点的，就不去请求类型
         // 只有虚拟节点的入参，才没有类型
-        if (node.concept === 'Param' && node.parentKey !== 'virtualParams' && node.parentKey !== 'item') {
+        if (node.concept === 'Param' && (node.parentKey !== 'virtualParams' && node.parentKey !== 'item' && node.parentNode.concept !== 'AnonymousFunction')) {
           return;
         }
         if (
@@ -3831,36 +3900,40 @@ class NaslServer {
         newQuickInfoNodes.push(itemDetail);
         const fileDetail = {
           file: filePath,
-          line: lsp2tspNumber(item.range.start.line),
-          offset: lsp2tspNumber(item.range.start.character),
+          line: lsp2tspNumber(item.start.line),
+          offset: lsp2tspNumber(item.start.character),
+        };
+
+        const getCode = (range: SourceMapItem) => {
+          return this.tsFiles.get(filePath)?.slice(range.start.offset, range.end.offset) ?? '';
         };
 
         // 位置计算偏移
         if ('getQuickInfoOffset' in node) {
-          Object.assign(fileDetail, (node as any).getQuickInfoOffset(fileDetail, item.code));
+          Object.assign(fileDetail, (node as any).getQuickInfoOffset(fileDetail, getCode(item)));
         }
 
         // 位置计算偏移2
         // TODO: 之后考虑把这些偏移量计算全都挪到节点内部去
         if (
           node.concept === 'BinaryExpression' ||
-          node.concept === 'CallLogic' ||
           node.concept === 'CallFunction' ||
           node.concept === 'CallInterface'
         ) {
+          const code = getCode(item);
           // 如果没有括号 ，括号就在外面，就 -1
           // 有括号就找到括号的位置 然后 -1
           let indexOf = 0;
-          if (!item.code.includes('(')) {
+          if (!code.includes('(')) {
             indexOf = -1;
           } else {
             // 如果有泛型先往前找一找
-            if (item.code.includes('<')) {
-              indexOf = Math.min(item.code.indexOf('<'), item.code.indexOf('('));
+            if (code.includes('<')) {
+              indexOf = Math.min(code.indexOf('<'), code.indexOf('('));
             } else {
-              indexOf = item.code.indexOf('(');
+              indexOf = code.indexOf('(');
             }
-            const subStr = item.code.substring(0, indexOf);
+            const subStr = code.substring(0, indexOf);
             const codeArr = subStr?.split('.');
             const lastLen = codeArr?.[codeArr.length - 1]?.length;
             indexOf = subStr.length - lastLen;
@@ -3872,28 +3945,31 @@ class NaslServer {
           node.concept === 'QueryFieldExpression' ||
           node.concept === 'QueryGroupByExpression'
         ) {
-          if (item.code.includes('.')) {
-            const codeArr = item.code?.split('.');
+          const code = getCode(item);
+          if (code.includes('.')) {
+            const codeArr = code?.split('.');
             const lastLen = codeArr?.[codeArr.length - 1]?.length;
             // MemberExpression取最后一位当做类型
-            const indexOf = item.code.length - lastLen;
-            fileDetail.offset += indexOf;
+            const indexOf = code.length - lastLen;
+            fileDetail.offset = fileDetail.offset + indexOf;
           }
         } else if (node.concept === 'Match') {
+          const code = getCode(item);
           // 去查return 后面的返回值，变成函数调用
-          if (item.code?.endsWith(';\n')) {
-            fileDetail.line = item.range.end.line - 1;
+          if (code?.endsWith(';\n')) {
+            fileDetail.line = item.end.line - 1;
           } else {
-            fileDetail.line = item.range.end.line;
+            fileDetail.line = item.end.line;
           }
-          const indexOf = item.code.indexOf('return __MatchExpressionFuntion');
-          let newCode = item.code.substring(0, indexOf);
+          const indexOf = code.indexOf('return __MatchExpressionFuntion');
+          let newCode = code.substring(0, indexOf);
           newCode = newCode.substring(newCode.lastIndexOf('\n'), indexOf);
           fileDetail.offset = newCode.length + 'return '.length;
         } else if (['NewComposite', 'NewList', 'NewMap'].includes(node.concept)) {
-          fileDetail.line = item.range.end.line;
-          const indexOf = item.code.indexOf('return __newComposite');
-          let newCode = item.code.substring(0, indexOf);
+          const code = getCode(item);
+          fileDetail.line = item.end.line;
+          const indexOf = code.indexOf('return __newComposite');
+          let newCode = code.substring(0, indexOf);
           newCode = newCode.substring(newCode.lastIndexOf('\n'), indexOf);
           fileDetail.offset = newCode.length + 'return '.length;
         } else if (['OqlQueryComponent'].includes(node.concept)) {
@@ -3913,7 +3989,13 @@ class NaslServer {
 
       types.set(node, Object.freeze(nodeTypeAnnotation) as TypeAnnotation);
 
-      (node as any).__nodeType = itemType ? (Object.isFrozen(itemType) ? itemType : Object.freeze(itemType)) : null;
+      const type = itemType ? (Object.isFrozen(itemType) ? itemType : Object.freeze(itemType)) : null;
+
+      if (type) {
+        (node as any).__nodeType = type;
+      } else {
+        delete (node as any).__nodeType;
+      }
     });
 
     await utils.timeSlicing(Array.from(getFromOthers.entries()), ([node]) => {
@@ -3948,7 +4030,7 @@ class NaslServer {
               if (typeAnnotation.typeName === 'List' && typeAnnotation.typeKind === 'generic') {
                 const {typeArguments} = typeAnnotation;
                 if (typeArguments.length && typeArguments[0].isComplexType()) {
-                  node.__TypeAnnotation = null;
+                  delete node.__TypeAnnotation;
                   return;
                 }
               }
@@ -3961,12 +4043,12 @@ class NaslServer {
           }
         } else {
           // 清空原来已经赋值上去的类型，可能原来有现在没有了
-          node.__TypeAnnotation = null;
+          delete node.__TypeAnnotation;
         }
       } catch (err) {
-        if (globalThis.window) {
-          // console.log(err);
-        }
+        // if (globalThis.window) {
+        //   console.log(err);
+        // }
       }
     });
     return types;
@@ -4120,7 +4202,7 @@ class NaslServer {
         ) {
           const { currentSource, fileNode } = matchExpression?.getCurrentSource();
           fileNode.sourceMap.forEach((item, itemNode) => {
-            if (itemNode.concept === matchExpression.concept && item.code === currentSource.code) {
+            if (itemNode.concept === matchExpression.concept && isSameRange(item, currentSource)) {
               const jsonNode = jsoner.queryNodeByPath(json, itemNode.getNodePath(false));
               jsonNode.typeAnnotation = matchExpression.__TypeAnnotation;
             }
@@ -4429,8 +4511,8 @@ class NaslServer {
          */
         const oldRefs = await this.references({
           file: (fileNode as FileNode).getEmbeddedFilePath(),
-          line: lsp2tspNumber(currentSource.range.start.line),
-          offset: lsp2tspNumber(currentSource.range.start.character),
+          line: lsp2tspNumber(currentSource.start.line),
+          offset: lsp2tspNumber(currentSource.start.character),
         });
         oldRefs.refs.forEach((ref) => this.filesToCheck.add(ref.file));
         // 更新文件之后
@@ -4438,8 +4520,8 @@ class NaslServer {
 
         const newRefs2 = await this.references({
           file: (fileNode as FileNode).getEmbeddedFilePath(),
-          line: lsp2tspNumber(currentSource.range.start.line),
-          offset: lsp2tspNumber(currentSource.range.start.character),
+          line: lsp2tspNumber(currentSource.start.line),
+          offset: lsp2tspNumber(currentSource.start.character),
         });
         newRefs2.refs.forEach((ref) => this.filesToCheck.add(ref.file));
       }
@@ -4574,9 +4656,14 @@ class NaslServer {
       return;
     }
 
-    console.time('重新生成 TS 文件');
+    if (process.env.NODE_ENV === 'development') {
+      console.time('重新生成 TS 文件');
+    }
     const result = (fileNode as FileNode).toEmbeddedTSFile();
-    console.timeEnd('重新生成 TS 文件');
+    if (process.env.NODE_ENV === 'development') {
+      console.timeEnd('重新生成 TS 文件');
+      console.log('重新生成 TS 文件', (fileNode as FileNode).getEmbeddedFilePath());
+    }
 
     // 当前操作的节点
     // 如果当前没有生成tsFile
@@ -4623,13 +4710,19 @@ class NaslServer {
           if (this.changeStackList.length) {
             this.changeFileNext();
           } else {
-            console.info(Array.from(this.filesToCheck));
+            if (process.env.NODE_ENV === 'development') {
+              console.info('校验以下文件', Array.from(this.filesToCheck));
+            }
             await this.getDiagnosticRecordsAndPushAll(Array.from(this.filesToCheck));
             this.filesToCheck.clear();
           }
         });
     }
   }
+
+  private getNodeCode(fileNode: BaseNode, range: SourceMapItem) {
+    return (this.tsFiles.get((fileNode as any).getEmbeddedFilePath()) ?? '').slice(range.start.offset, range.end.offset)
+  }
 }
 
 export { NaslServer };