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

package/out/server/naslServer.js

@@ -70,14 +70,13 @@ const EmbeddedTSFileOffsetMap = {
 };
 const SentryMessager = (0, sentry_1.sentryMonitorTSWorkerMessager)(Messager_1.default);
 let isChangeInterface = false; // 判断是否导入接口
-let actionArr = []; // 用于导入接口收集更改的节点
-let timer = null; // 超时器用于收集导入接口相关
-const __naslStdlibFileCacheMap = new Map(); // naslStdlib文件缓存
+let actionArr = []; //用于导入接口收集更改的节点
+let timer = null; //超时器用于收集导入接口相关
 // 联合类型切割取出类型
 function getDisplayString2Type(displayString) {
-    const targetString = displayString.match(/value:\s(\S+)\)/)?.[1] ?? '';
+    const targetString = displayString.match(/value:\s(\S+)\)/)?.[1];
     let targetType = null;
-    if (targetString.startsWith('nasl.core.')) {
+    if (targetString?.startsWith('nasl.core.')) {
         targetType = targetString.slice(10);
     }
     // 取出匹配的内容
@@ -86,7 +85,7 @@ function getDisplayString2Type(displayString) {
     displayString = displayString?.replace('T extends ', '') || '';
     const types = reg.exec(displayString);
     // 取出提示的类型，组成是数组
-    const typeList = types[1].split(' | ').map((item) => {
+    const typeList = (types?.[1].split(' | ') ?? []).map((item) => {
         if (/<([^()]+)>/g.exec(item)) {
             return item;
         }
@@ -109,19 +108,28 @@ function getDisplayString2Type(displayString) {
 }
 exports.getDisplayString2Type = getDisplayString2Type;
 let NaslServer = class NaslServer {
-    naslStdlibFileCacheMap = __naslStdlibFileCacheMap;
-    messager = undefined;
-    worker = undefined;
+    /** naslStdlib文件缓存 */
+    naslStdlibFileCacheMap = new Map();
+    messager;
+    worker;
     /**
      * 按道理 fileSourceMap: new Map<string, SourceMap>() 比较合理，
      * 但是要多维护一层 vertex 增删 -> file 增删的关系问题，
      * 先用挂在点上面，简单的方法实现，后期再考虑解耦
      */
     file2NodeMap = new Map();
+    /** TS 翻译的源码 */
+    tsFiles = new Map();
+    /// #if process.env.NODE_ENV === 'development'
+    /**
+     * 调试时是否储存 ts 文件
+     */
+    openDebugEmbedded = true;
+    /// #endif
     elementsLogic = {};
     // 错误日志收集
-    diagnosticManager = undefined;
-    embeddedTSEmitter = undefined;
+    diagnosticManager;
+    embeddedTSEmitter;
     // 需要执行修改的文件
     changeStackList = [];
     filesToCheck;
@@ -433,6 +441,26 @@ let NaslServer = 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 concepts_1.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);
@@ -513,6 +541,7 @@ let NaslServer = 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);
@@ -556,13 +585,14 @@ let NaslServer = class NaslServer {
     }
     // 缓存添加过的文件
     cacheFile(options) {
-        __naslStdlibFileCacheMap.set(options.file, options);
+        this.naslStdlibFileCacheMap.set(options.file, options);
     }
     /** u
      * 只新增文件
      * @param {*} files
      */
     writeFiles(files) {
+        files.forEach(({ file, fileContent }) => this.tsFiles.set(file, fileContent));
         return this.messager.requestCommand('writeFiles', files);
     }
     /**
@@ -571,24 +601,27 @@ let NaslServer = class NaslServer {
      * @param {*} args
      */
     updateFiles(args) {
+        args.outputFiles.forEach(({ file, fileContent }) => this.tsFiles.set(file, fileContent));
         return this.messager.requestCommand('updateFiles', args);
     }
     /**
      * 清除一个目录下的所有文件
      */
     deleteDirectoryFiles(args) {
+        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, openFiles) {
         let app = node;
-        let openDebugEmbedded = true;
         if (node.concept !== 'App') {
             app = node.rootNode || node.app;
         }
         /// #if process.env.NODE_ENV === 'development'
         // 首次尝试请求
-        await storage_1.default.post(`/api/App/debugEmbedded?id=${app.id}`, openFiles[0]).catch(() => (openDebugEmbedded = false));
-        if (openDebugEmbedded && globalThis.window) {
+        await storage_1.default.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;
@@ -601,8 +634,7 @@ let NaslServer = class NaslServer {
                 }
             }
             catch (e) {
-                // 出现错误之后不再调用
-                openDebugEmbedded = false;
+                // ..
             }
         }
         /// #endif
@@ -637,8 +669,8 @@ let NaslServer = class NaslServer {
             return this._getValueSelectCompletion({
                 file: fileNode.getEmbeddedFilePath(),
                 range: {
-                    line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-                    offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character),
+                    line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+                    offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character),
                 },
                 value,
                 noFilterList,
@@ -669,8 +701,8 @@ let NaslServer = class NaslServer {
             try {
                 const quickInfo = await this._getTypeQuickinfo({
                     file: fileNode.getEmbeddedFilePath(),
-                    line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-                    offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character) + `nasl.util.C`.length,
+                    line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+                    offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character) + `nasl.util.C`.length,
                 });
                 if (quickInfo.responseRequired) {
                     const displayString = quickInfo?.response?.displayString || '';
@@ -717,8 +749,8 @@ let NaslServer = class NaslServer {
         }
         const quickInfo = await this._getTypeQuickinfo({
             file: fileNode.getEmbeddedFilePath(),
-            line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-            offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character) + `new nasl.ui.`.length,
+            line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+            offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character) + `new nasl.ui.`.length,
         });
         if (quickInfo.responseRequired) {
             const displayString = quickInfo?.response?.displayString || '';
@@ -777,8 +809,8 @@ let NaslServer = class NaslServer {
         }
         const quickInfo = await this._getTypeQuickinfo({
             file: fileNode.getEmbeddedFilePath(),
-            line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-            offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character) + `new nasl.ui.`.length,
+            line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+            offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character) + `new nasl.ui.`.length,
         });
         if (quickInfo.responseRequired) {
             const displayString = quickInfo?.response?.displayString || '';
@@ -861,8 +893,8 @@ let NaslServer = class NaslServer {
             return this._getSelectNextCompletion({
                 file: fileNode.getEmbeddedFilePath(),
                 range: {
-                    line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-                    offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character),
+                    line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+                    offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character),
                 },
                 noFilterList,
             });
@@ -902,7 +934,7 @@ let NaslServer = class NaslServer {
             const oldRecord = this.diagnosticManager.getRecord?.(record.id);
             oldRecord?.semanticDiagnostics.forEach((item) => {
                 if (item.node) {
-                    item.node.tsErrorDetail = undefined;
+                    delete item.node.tsErrorDetail;
                     // 如果logic中有报错就把标识置为true
                     if (item.node?.logic?.haveError) {
                         item.node.logic.haveError = false;
@@ -912,7 +944,7 @@ let NaslServer = class NaslServer {
             // 清空一些状态
             oldRecord?.suggestionDiagnostics.forEach((item) => {
                 if (item.node) {
-                    item.node.tsErrorDetail = undefined;
+                    delete item.node.tsErrorDetail;
                     if (item.node && item.node instanceof concepts_1.Logic) {
                         item.node.isSmpty = false;
                     }
@@ -926,7 +958,7 @@ let NaslServer = class NaslServer {
             if (record.node instanceof concepts_1.Logic) {
                 record?.syntaxDiagnostics.forEach((item) => {
                     const minRange = this._findMinRange(item, record.node);
-                    if (minRange.node instanceof concepts_1.OqlQueryComponent) {
+                    if (minRange?.node instanceof concepts_1.OqlQueryComponent) {
                         if (item.text === 'Invalid character.') {
                             record.semanticDiagnostics.push(item);
                         }
@@ -1363,6 +1395,15 @@ let NaslServer = 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);
+                        }
                     });
                 }
             });
@@ -1622,6 +1663,20 @@ let NaslServer = class NaslServer {
                         node.tsErrorDetail = diagnostic;
                     }
                 }
+                else if (node instanceof concepts_1.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);
                 }
@@ -1799,6 +1854,17 @@ let NaslServer = class NaslServer {
                                                 }
                                             });
                                         }
+                                        else if (rulesMap?.maxLength && +dataBaseTyp?.max && +rulesMap.maxLength > +dataBaseTyp.max) {
+                                            // 判断当前 最大长度 是不是比 数据库类型的最大长度 长，超过就报错
+                                            const errorMsg = `最大长度超出存储长度`;
+                                            const diag = {
+                                                node: property,
+                                                severity: 'warning',
+                                                message: errorMsg,
+                                            };
+                                            diagnostics.push(diag);
+                                            typeAnnotationErrorDetail.errorPos.maxLength = errorMsg;
+                                        }
                                     }
                                     case 'Long': {
                                         const { min: ruleMin, max: ruleMax } = dataBaseTyp;
@@ -2002,7 +2068,7 @@ let NaslServer = class NaslServer {
                         diagnostics.push(diagnostic);
                     }
                     else {
-                        node.tsErrorDetail = undefined;
+                        delete node.tsErrorDetail;
                     }
                 }
                 this.checkNodeError(node, diagnostics);
@@ -2377,17 +2443,17 @@ let NaslServer = class NaslServer {
              * 当前内容的开始行 <= 诊断开始的行 &&
              * 当前内容的结束行 >= 诊断结束的行
              */
-            if ((0, translator_1.lsp2tspNumber)(item.range.start.line) <= diagnostic.start.line && (0, translator_1.lsp2tspNumber)(item.range.end.line) >= diagnostic.end.line) {
+            if ((0, translator_1.lsp2tspNumber)(item.start.line) <= diagnostic.start.line && (0, translator_1.lsp2tspNumber)(item.end.line) >= diagnostic.end.line) {
                 // 如果找到某一行
-                if ((0, translator_1.lsp2tspNumber)(item.range.start.line) === diagnostic.start.line && (0, translator_1.lsp2tspNumber)(item.range.end.line) === diagnostic.end.line) {
+                if ((0, translator_1.lsp2tspNumber)(item.start.line) === diagnostic.start.line && (0, translator_1.lsp2tspNumber)(item.end.line) === diagnostic.end.line) {
                     // 在行的范围但是又不在列的范围，不用给默认值，给了反而不对，
                     // 需要在列的范围内
-                    if ((0, translator_1.lsp2tspNumber)(item.range.start.character) <= diagnostic.start.offset &&
-                        (0, translator_1.lsp2tspNumber)(item.range.end.character) >= diagnostic.end.offset) {
+                    if ((0, translator_1.lsp2tspNumber)(item.start.character) <= diagnostic.start.offset &&
+                        (0, translator_1.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;
                         }
@@ -2400,23 +2466,25 @@ let NaslServer = class NaslServer {
                         minRange = { node, item };
                     }
                     else if (!haveLineNode) {
-                        if ((0, translator_1.lsp2tspNumber)(item.range.start.line) === diagnostic.start.line &&
-                            diagnostic.start.offset >= (0, translator_1.lsp2tspNumber)(item.range.start.character)) {
+                        if ((0, translator_1.lsp2tspNumber)(item.start.line) === diagnostic.start.line &&
+                            diagnostic.start.offset >= (0, translator_1.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 < (0, translator_1.lsp2tspNumber)(minRange.item.range.start.character)) {
-                                minRange = { node, item };
+                            else {
+                                if (diagnostic.start.offset < (0, translator_1.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 };
                                 }
                             }
@@ -2450,8 +2518,8 @@ let NaslServer = class NaslServer {
         if (currentSource) {
             const newRefs = await this.references({
                 file: fileNode.getEmbeddedFilePath(),
-                line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-                offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character),
+                line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+                offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character),
             });
             refsList = [...newRefs.refs];
         }
@@ -2492,7 +2560,7 @@ let NaslServer = 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;
                     }
                 }
@@ -2522,8 +2590,8 @@ let NaslServer = 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) => item.aggregateName && item.asName).length;
                             const groupByLength = callQueryComponent.groupBy.filter((item) => item.groupElement?.propertyName && item.groupElement.asName).length;
                             if (!groupByLength && !aggregateLength && callQueryComponentTypeAnnotation.typeKind === 'anonymousStructure') {
@@ -2535,15 +2603,18 @@ let NaslServer = 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.getEmbeddedFilePath();
+                                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.getEmbeddedFilePath(),
+                                    file: qcTypeCurrentFilePath,
                                     line: line + 2,
                                     offset: character + 1 + propertyOffset,
                                 });
@@ -2569,21 +2640,21 @@ let NaslServer = class NaslServer {
             const { currentSource } = this.getCurrentSource(logicNode);
             const parentRefs = await this.references({
                 file: fileNode.getEmbeddedFilePath(),
-                line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-                offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character),
+                line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+                offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character),
             });
             refsList = [...refsList, ...parentRefs.refs];
         }
         // 如果是参数修改, 就需要把logic的引用 都查找出来就需要把他的父级的引用全部查找出来
         if (node instanceof concepts_1.Param && (node.parentNode instanceof concepts_1.View || node.parentNode instanceof concepts_1.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.getEmbeddedFilePath(),
-                line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-                offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character + viewIndex),
+                line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+                offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character + viewIndex),
             });
             let filterViewRefs = [];
             if (node.parentNode instanceof concepts_1.View) {
@@ -2607,8 +2678,8 @@ let NaslServer = 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];
         // }
@@ -2617,14 +2688,14 @@ let NaslServer = class NaslServer {
          */
         if (node instanceof concepts_1.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.getEmbeddedFilePath(),
-                    line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-                    offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character + methodsNameIndex),
+                    line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+                    offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character + methodsNameIndex),
                 });
                 const methodRefs = [];
                 methods.refs.forEach((item) => {
@@ -2642,7 +2713,7 @@ let NaslServer = class NaslServer {
         }
         if (node instanceof concepts_1.Process) {
             if (currentSource) {
-                const { code } = currentSource;
+                const code = this.getNodeCode(fileNode, currentSource);
                 const prefix = '__ProcessIdentification__';
                 let positions = [];
                 let pos = code.indexOf(prefix);
@@ -2655,8 +2726,8 @@ let NaslServer = class NaslServer {
                 positions = positions.map((position) => code.indexOf('const', position + prefix.length));
                 const promises = positions.map((item) => this.references({
                     file: fileNode.getEmbeddedFilePath(),
-                    line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-                    offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character + item),
+                    line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+                    offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character + item),
                 }));
                 const results = await Promise.all(promises);
                 results.forEach((constRefs) => {
@@ -2665,9 +2736,9 @@ let NaslServer = class NaslServer {
             }
         }
         if ((node instanceof concepts_1.Param || node instanceof concepts_1.Return) && node.parentNode instanceof concepts_1.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);
@@ -2684,8 +2755,8 @@ let NaslServer = class NaslServer {
                 // 拿到标识下定义的参数名字
                 const promises = positions.map((item) => this.references({
                     file: fileNode.getEmbeddedFilePath(),
-                    line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-                    offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character + item),
+                    line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+                    offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character + item),
                 }));
                 const results = await Promise.all(promises);
                 results.forEach((constRefs) => {
@@ -2695,7 +2766,7 @@ let NaslServer = class NaslServer {
         }
         if (node instanceof concepts_1.ProcessElement) {
             if (currentSource) {
-                const { code } = currentSource;
+                const code = this.getNodeCode(fileNode, currentSource);
                 const prefix = '__ProcessIdentification__';
                 let positions = [];
                 let pos = code.indexOf(prefix);
@@ -2707,8 +2778,8 @@ let NaslServer = class NaslServer {
                 positions = positions.map((position) => code.indexOf(`${node.name}:`, position + prefix.length));
                 const promises = positions.map((item) => this.references({
                     file: fileNode.getEmbeddedFilePath(),
-                    line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-                    offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character + item),
+                    line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+                    offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character + item),
                 }));
                 const results = await Promise.all(promises);
                 results.forEach((constRefs) => {
@@ -2717,9 +2788,9 @@ let NaslServer = class NaslServer {
             }
         }
         if (node instanceof concepts_1.Return && node.parentNode instanceof concepts_1.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);
@@ -2739,8 +2810,8 @@ let NaslServer = class NaslServer {
                 // 拿到标识下定义的参数名字
                 const promises = positions.map((item) => this.references({
                     file: fileNode.getEmbeddedFilePath(),
-                    line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-                    offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character + item),
+                    line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+                    offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character + item),
                 }));
                 const results = await Promise.all(promises);
                 results.forEach((constRefs) => {
@@ -3490,8 +3561,8 @@ let NaslServer = class NaslServer {
     handlingCurrentSourceException(currentSource, node) {
         // 如果有前面的一些注解，元素在最后一行输出的值就给最后一行
         if (node instanceof concepts_1.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 };
             }
         }
     }
@@ -3500,12 +3571,12 @@ let NaslServer = class NaslServer {
         const { currentSource, fileNode } = this.getCurrentSource(node);
         if (currentSource && fileNode) {
             const range = {
-                line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-                offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character),
+                line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+                offset: (0, translator_1.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') {
@@ -3657,7 +3728,7 @@ let NaslServer = 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 (![
@@ -3689,34 +3760,37 @@ let NaslServer = class NaslServer {
             newQuickInfoNodes.push(itemDetail);
             const fileDetail = {
                 file: filePath,
-                line: (0, translator_1.lsp2tspNumber)(item.range.start.line),
-                offset: (0, translator_1.lsp2tspNumber)(item.range.start.character),
+                line: (0, translator_1.lsp2tspNumber)(item.start.line),
+                offset: (0, translator_1.lsp2tspNumber)(item.start.character),
+            };
+            const getCode = (range) => {
+                return this.tsFiles.get(filePath)?.slice(range.start.offset, range.end.offset) ?? '';
             };
             // 位置计算偏移
             if ('getQuickInfoOffset' in node) {
-                Object.assign(fileDetail, node.getQuickInfoOffset(fileDetail, item.code));
+                Object.assign(fileDetail, node.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;
@@ -3727,31 +3801,34 @@ let NaslServer = class NaslServer {
                 node.concept === 'Identifier' ||
                 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;
             }
@@ -3767,7 +3844,13 @@ let NaslServer = class NaslServer {
             const nodeTypeAnnotation = (0, formatTsUtils_1.type2TypeAnnotation)(itemType);
             const { node } = newQuickInfoNodes[index];
             types.set(node, Object.freeze(nodeTypeAnnotation));
-            node.__nodeType = itemType ? (Object.isFrozen(itemType) ? itemType : Object.freeze(itemType)) : null;
+            const type = itemType ? (Object.isFrozen(itemType) ? itemType : Object.freeze(itemType)) : null;
+            if (type) {
+                node.__nodeType = type;
+            }
+            else {
+                delete node.__nodeType;
+            }
         });
         await utils.timeSlicing(Array.from(getFromOthers.entries()), ([node]) => {
             if (node instanceof concepts_1.Assignment) {
@@ -3803,7 +3886,7 @@ let NaslServer = 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;
                                 }
                             }
@@ -3818,13 +3901,13 @@ let NaslServer = 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;
@@ -3959,7 +4042,7 @@ let NaslServer = class NaslServer {
                     (matchExpression instanceof concepts_1.Identifier || matchExpression instanceof concepts_1.MemberExpression)) {
                     const { currentSource, fileNode } = matchExpression?.getCurrentSource();
                     fileNode.sourceMap.forEach((item, itemNode) => {
-                        if (itemNode.concept === matchExpression.concept && item.code === currentSource.code) {
+                        if (itemNode.concept === matchExpression.concept && (0, translator_1.isSameRange)(item, currentSource)) {
                             const jsonNode = jsoner.queryNodeByPath(json, itemNode.getNodePath(false));
                             jsonNode.typeAnnotation = matchExpression.__TypeAnnotation;
                         }
@@ -4251,16 +4334,16 @@ let NaslServer = class NaslServer {
                  */
                 const oldRefs = await this.references({
                     file: fileNode.getEmbeddedFilePath(),
-                    line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-                    offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character),
+                    line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+                    offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character),
                 });
                 oldRefs.refs.forEach((ref) => this.filesToCheck.add(ref.file));
                 // 更新文件之后
                 await this.updateFiles({ outputFiles });
                 const newRefs2 = await this.references({
                     file: fileNode.getEmbeddedFilePath(),
-                    line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-                    offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character),
+                    line: (0, translator_1.lsp2tspNumber)(currentSource.start.line),
+                    offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character),
                 });
                 newRefs2.refs.forEach((ref) => this.filesToCheck.add(ref.file));
             }
@@ -4398,9 +4481,14 @@ let NaslServer = class NaslServer {
             }
             return;
         }
-        console.time('重新生成 TS 文件');
+        if (process.env.NODE_ENV === 'development') {
+            console.time('重新生成 TS 文件');
+        }
         const result = fileNode.toEmbeddedTSFile();
-        console.timeEnd('重新生成 TS 文件');
+        if (process.env.NODE_ENV === 'development') {
+            console.timeEnd('重新生成 TS 文件');
+            console.log('重新生成 TS 文件', fileNode.getEmbeddedFilePath());
+        }
         // 当前操作的节点
         // 如果当前没有生成tsFile
         if (!result) {
@@ -4446,13 +4534,18 @@ let NaslServer = class NaslServer {
                     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();
                 }
             });
         }
     }
+    getNodeCode(fileNode, range) {
+        return (this.tsFiles.get(fileNode.getEmbeddedFilePath()) ?? '').slice(range.start.offset, range.end.offset);
+    }
 };
 __decorate([
     (0, decorators_1.withQueueExecute)('diagnostic')