@lcap/nasl 3.3.0-alpha.1 → 3.3.0-alpha.3

package/src/server/naslServer.ts

@@ -4,12 +4,11 @@ import * as path from 'path';
 import { Worker } from 'worker_threads';
 /// #endif
 
-import * as tsProtocol from 'typescript/lib/protocol';
-import { Decimal } from 'decimal.js';
 import { config } from '../config';
 import { sentryMonitorNaslServer, sentryMonitorTSWorkerMessager } from '../sentry';
 import Messager from '../common/Messager';
-import { formatEnums } from './getMemberIdentifier';
+import * as tsProtocol from 'typescript/lib/protocol';
+import { formatEnums } from '../server/getMemberIdentifier';
 
 import {
   Module,
@@ -83,6 +82,7 @@ import {
   SynatxNode,
   Connection,
   TriggerLauncher,
+  CallConnector,
 } from '../concepts';
 import { lsp2tspNumber, SourceMap, SourceMapItem } from '../translator';
 import axios from '../service/storage';
@@ -100,6 +100,7 @@ import { EventEmitter } from '../common/EventEmitter';
 import { traverse } from '../utils';
 import { withQueueExecute } from '../decorators';
 
+import { Decimal } from 'decimal.js';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
 
 const EmbeddedTSFileLineMap: { [name: string]: number } = {
@@ -140,10 +141,10 @@ interface QuoteNode {
 // 批量查找节点位置的节点信息类型
 type QuickInfoNodes = Array<{ filePath: string; node: BaseNode; item: SourceMapItem }>;
 
-let isChangeInterface = false; // 判断是否导入接口
+let isChangeInterface = false; //判断是否导入接口
 type ActionNode = { target: Variable; typeannotation: TypeAnnotation };
-let actionArr: Array<ActionNode> = []; // 用于导入接口收集更改的节点
-let timer: number = null; // 超时器用于收集导入接口相关
+let actionArr: Array<ActionNode> = []; //用于导入接口收集更改的节点
+let timer: number = null; //超时器用于收集导入接口相关
 const __naslStdlibFileCacheMap: Map<tsProtocol.OpenRequestArgs['file'], tsProtocol.OpenRequestArgs> = new Map(); // naslStdlib文件缓存
 
 // 联合类型切割取出类型
@@ -163,18 +164,17 @@ export function getDisplayString2Type(displayString: string) {
   const typeList: string[] = types[1].split(' | ').map((item: string) => {
     if (/<([^()]+)>/g.exec(item)) {
       return item;
-    }
-    if (item.includes(' ')) {
+    } else if (item.includes(' ')) {
       const strs = item.split(' ');
       const type = strs[strs.length - 1];
       return type;
-    }
-    if (item.includes('.')) {
+    } else if (item.includes('.')) {
       const strs = item.split('.');
       const type = strs[strs.length - 1];
       return type;
+    } else {
+      return item;
     }
-    return item;
   });
 
   if (targetType) {
@@ -186,7 +186,6 @@ export function getDisplayString2Type(displayString: string) {
 @sentryMonitorNaslServer
 class NaslServer {
   naslStdlibFileCacheMap = __naslStdlibFileCacheMap;
-
   messager: Messager = undefined;
 
   worker: Worker = undefined;
@@ -278,7 +277,7 @@ class NaslServer {
           // 这个方法是 5.0 加入标准库的，但是这里 ts 版本是 4.x，ci 会挂，所以需要忽略
           // @ts-ignore
           const findLastIndex = this.changeStackList.findLastIndex((changeStackItem: EventPayload) => {
-            const { target } = changeStackItem;
+            const target = changeStackItem.target;
             const { fileNode: targetFileNode } = this.getCurrentSource(target);
             return targetFileNode === fileNode;
           });
@@ -288,9 +287,10 @@ class NaslServer {
             if (this.changeStackList[findLastIndex]?.field) {
               // 如果当前列表里有，这个文件节点，最后一个是field的话，直接return掉，不用塞这个update了
               return;
+            } else {
+              // 如果最后一项是普通的update的话，就可以去掉，后面那个会在塞过来
+              this.changeStackList.pop();
             }
-            // 如果最后一项是普通的update的话，就可以去掉，后面那个会在塞过来
-            this.changeStackList.pop();
           }
           this.changeStackList.push(item.originEvent);
         } catch (err) {
@@ -327,7 +327,7 @@ class NaslServer {
     Object.keys(naslStdlibMap).forEach(async (libFileName: string) => {
       await this.addFile(
         {
-          file: `/${libFileName}`,
+          file: '/' + libFileName,
           fileContent: naslStdlibMap[libFileName],
         },
         { cache: true }
@@ -536,7 +536,7 @@ class NaslServer {
     }
 
     if (module instanceof App) {
-      module.connections.forEach((connection) => {
+      module.connections?.forEach?.((connection) => {
         try {
           const result = connection.toEmbeddedTSFile();
           results.push(result);
@@ -545,7 +545,7 @@ class NaslServer {
           this.file2NodeMap.set(result.filePath, connection);
         } catch (err) {}
       });
-      module.triggerLaunchers.forEach((triggerLauncher) => {
+      module.triggerLaunchers?.forEach?.((triggerLauncher) => {
         try {
           const result = triggerLauncher.toEmbeddedTSFile();
           results.push(result);
@@ -640,13 +640,12 @@ class NaslServer {
     cache && this.cacheFile(file);
     return this.messager.requestCommand('addFile', file);
   }
-
   // 缓存添加过的文件
   cacheFile(options: tsProtocol.OpenRequestArgs) {
     __naslStdlibFileCacheMap.set(options.file, options);
   }
 
-  /** u
+  /**u
    * 只新增文件
    * @param {*} files
    */
@@ -678,18 +677,18 @@ class NaslServer {
     }
     /// #if process.env.NODE_ENV === 'development'
     // 首次尝试请求
-    await axios.post(`/api/App/debugEmbedded?id=${app.id}`, openFiles[0]).catch(() => (openDebugEmbedded = false));
+    await axios.post('/api/App/debugEmbedded?id=' + app.id, openFiles[0]).catch(() => (openDebugEmbedded = false));
 
     if (openDebugEmbedded && globalThis.window) {
       // For TS build
       try {
         let canDebug = true;
-        await axios.post(`/api/App/debugEmbedded?id=${app.id}`, openFiles[0]).catch(() => (canDebug = false));
+        await axios.post('/api/App/debugEmbedded?id=' + app.id, openFiles[0]).catch(() => (canDebug = false));
 
         if (canDebug) {
           await Promise.all(
             openFiles.map(async (file) => {
-              const res = await axios.post(`/api/App/debugEmbedded?id=${app.id}`, file);
+              const res = await axios.post('/api/App/debugEmbedded?id=' + app.id, file);
               return res.data;
             })
           );
@@ -741,8 +740,9 @@ class NaslServer {
         value,
         noFilterList,
       });
+    } else {
+      console.log('没找到节点', node, currentSource, fileNode);
     }
-    console.log('没找到节点', node, currentSource, fileNode);
   }
 
   _getValueSelectCompletion(args: any) {
@@ -786,8 +786,9 @@ class NaslServer {
           });
           if (!res.length) {
             return [];
+          } else {
+            return [{ title: '基础类型', children: res }];
           }
-          return [{ title: '基础类型', children: res }];
         }
       } catch (err) {
         console.log(err);
@@ -831,8 +832,7 @@ class NaslServer {
             .replaceAll('\n', '')
             .replace(/__name:"AStructure_\w{8}";/g, '')
             .replace(/dataSources.([^.]+).entities.([^;]+)/g, ($1, $2, $3) => `${$3}(${$2})`);
-        }
-        if (typeStr.startsWith('{') && typeStr.endsWith('}')) {
+        } else if (typeStr.startsWith('{') && typeStr.endsWith('}')) {
           /**
                      *  {
                             text: nasl.core.String;
@@ -864,7 +864,6 @@ class NaslServer {
     }
     return '';
   }
-
   async getDataSchemaStructureOrTypeAnnotation(node: ViewElement) {
     if (!(node instanceof ViewElement)) return;
 
@@ -884,7 +883,7 @@ class NaslServer {
 
       const types = /<([^()]+)>/g.exec(displayString);
       const typeStr = types && types[1];
-      const { app } = node;
+      const app = node.app;
       if (typeStr.includes('__name: "AStructure_')) {
         const properties: StructureProperty[] = [];
         typeStr.replace(/([^:\s]+):\s+([^;]+);/g, ($1, name, typeKey) => {
@@ -907,8 +906,7 @@ class NaslServer {
           return '';
         });
         return TypeAnnotation.createTypeAnonymousStructure(properties);
-      }
-      if (typeStr.startsWith('structures')) return app.findNodeByCompleteName(`app.${typeStr}`);
+      } else if (typeStr.startsWith('structures')) return app.findNodeByCompleteName(`app.${typeStr}`);
     }
   }
 
@@ -975,8 +973,9 @@ class NaslServer {
         },
         noFilterList,
       });
+    } else {
+      console.log('没找到节点', currentSource, fileNode);
     }
-    console.log('没找到节点', currentSource, fileNode);
   }
 
   _getSelectNextCompletion(args: any) {
@@ -995,7 +994,6 @@ class NaslServer {
     if (node.tsErrorDetail) return;
     node.tsErrorDetail = tsErrorDetail;
   }
-
   /**
    * 处理诊断结果
    * @param records 结果
@@ -1009,7 +1007,7 @@ class NaslServer {
     }
     await Promise.all(
       records.map(async (record) => {
-        const { node } = record;
+        const node = record.node;
         if (!node) return;
 
         // 先获取原来的节点先清除一下之前有异常的节点，下面重新赋值
@@ -1069,8 +1067,7 @@ class NaslServer {
               if (diagnostic.severity === 'warning') {
                 record.suggestionDiagnostics.push(diagnostic);
                 return null;
-              }
-              if (currentNode.concept === 'OqlQueryComponent') {
+              } else if (currentNode.concept === 'OqlQueryComponent') {
                 // OQL别名错误降级为警告
                 if (diagnostic.originalDiagnostic && diagnostic.originalDiagnostic?.text.includes('__OQL_ALIAS_WARNING__')) {
                   // 重置 图标和错误等级
@@ -1115,8 +1112,7 @@ class NaslServer {
             if (diag?.node) {
               return diag;
               // 一些已知警告的单独处理
-            }
-            if (
+            } else if (
               [
                 `'__LogicEmpty' is declared but its value is never read.`,
                 `'__destinationEmpty__' is declared but its value is never read.`,
@@ -1126,8 +1122,7 @@ class NaslServer {
               ].includes(diag.text)
             ) {
               return this._resolveDiagnostic(diag as unknown as tsProtocol.DiagnosticWithFileName, record.node as FileNode, record);
-            }
-            if (diag.text.includes(` is declared but its value is never read.`)) {
+            } else 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';
@@ -1156,8 +1151,7 @@ class NaslServer {
                       message: `未使用的输入参数${minRange.node.name}`,
                     };
                     return diagnostic;
-                  }
-                  if (minRange.node instanceof Variable) {
+                  } else if (minRange.node instanceof Variable) {
                     const diagnostic = {
                       node: minRange.node,
                       severity: 'warning',
@@ -1341,7 +1335,7 @@ class NaslServer {
               const typeAnnotation = item.__TypeAnnotation;
               // 仅处理有类型的情况，返回类型为void的情况由其他地方处理成报错
               if (typeAnnotation) {
-                const { sortedTypeKey } = typeAnnotation;
+                const sortedTypeKey = typeAnnotation.sortedTypeKey;
                 if (!typeAnnotationMap[sortedTypeKey]) {
                   typeAnnotationMap[sortedTypeKey] = {
                     typeAnnotation,
@@ -1393,7 +1387,7 @@ class NaslServer {
               const typeAnnotation = value.__TypeAnnotation;
               // 仅处理有类型的情况，返回类型为void的情况由其他地方处理成报错
               if (typeAnnotation) {
-                const { sortedTypeKey } = typeAnnotation;
+                const sortedTypeKey = typeAnnotation.sortedTypeKey;
                 if (!typeAnnotationMap[sortedTypeKey]) {
                   typeAnnotationMap[sortedTypeKey] = {
                     typeAnnotation,
@@ -1668,16 +1662,16 @@ class NaslServer {
                 } catch (err) {
                   console.log(err);
                 }
-                if (!jsCode.includes(`${node.name} = `)) return;
+                if (!jsCode.startsWith(`${node.name} = `)) return;
                 // 页面局部变量
                 if (node instanceof Variable && node.parentNode instanceof View) {
                   // 跟页面局部变量无关的赋值过滤
-                  if (!jsCode.includes(`this.${node.name} = `)) return;
+                  if (!jsCode.startsWith(`this.${node.name} = `)) return;
                   // 直接赋值 logic 内局部变量、输入参数直接提示系统无法推断类型
                   if (
-                    nodeIn.logic?.params.find((param) => jsCode.includes(param.name)) ||
-                    nodeIn.logic?.virtualParams.find((vParam) => jsCode.includes(vParam.name)) ||
-                    nodeIn.logic?.variables.find((variable) => jsCode.includes(variable.name))
+                    nodeIn.logic?.params.find((param) => jsCode.startsWith(param.name)) ||
+                    nodeIn.logic?.virtualParams.find((vParam) => jsCode.startsWith(vParam.name)) ||
+                    nodeIn.logic?.variables.find((variable) => jsCode.startsWith(variable.name))
                   ) {
                     if (!nodeIn.tsErrorDetail) {
                       const diagnostic = {
@@ -1716,17 +1710,17 @@ class NaslServer {
           if (Array.isArray(node.bindExpressions)) {
             const exp = node.bindExpressions.find((bindExpression) => this.hasComponentLogics(bindExpression));
             if (exp) {
-              // const element: any = node.getAncestor('ViewElement');
-              // const api = config.allNodesAPI[element?.tag];
-              // const attr = api?.attrs?.find?.((attr) => {
+              //const element: any = node.getAncestor('ViewElement');
+              //const api = config.allNodesAPI[element?.tag];
+              //const attr = api?.attrs?.find?.((attr) => {
               //    return attr.name === node.name;
-              // });
+              //});
               const map = {
                 BindAttribute: '属性',
                 BindDirective: '指令',
                 BindStyle: '样式属性',
               };
-              // “${attr?.title || node.title || node.name}”
+              //“${attr?.title || node.title || node.name}”
               const diagnostic = {
                 node,
                 severity: 'error',
@@ -1888,7 +1882,7 @@ class NaslServer {
                 const { default: defaultVal } = precisionOption || {};
                 const precision = databaseTypeAnnotation ? (databaseTypeAnnotation.arguments as any)?.precision : defaultVal;
                 const ruleScale = (typeAnnotation?.ruleMap as any)?.scale;
-                const scale = ruleScale !== undefined ? `${ruleScale}` : '';
+                const scale = ruleScale !== undefined ? ruleScale + '' : '';
                 let ensureScale = true;
                 switch (typeName) {
                   case 'String': {
@@ -1987,7 +1981,7 @@ class NaslServer {
                   // 储存小数部分
                   const memoryScaleStr = memoryStr.slice(0, +(scale || '0'));
                   // 储存绝对值
-                  const memoryAbsVal = memoryIntAbsStr + (memoryScaleStr ? `.${memoryScaleStr}` : '');
+                  const memoryAbsVal = memoryIntAbsStr + (memoryScaleStr ? '.' + memoryScaleStr : '');
                   const decimalMemoryAbsVal = new Decimal(memoryAbsVal);
                   [
                     {
@@ -2055,7 +2049,7 @@ class NaslServer {
         diagnostics.push(diagnostic);
       }
       fileNode?.sourceMap.forEach((value, node) => {
-        // OQL支持返回复合类型数据了
+        //OQL支持返回复合类型数据了
         // SqlQueryComponent内部返回值类型，如果是嵌套的就需要报错
         // if ((node instanceof OqlQueryComponent || node instanceof SqlQueryComponent) && (node as SqlQueryComponent).getTypeBanError()) {
         //     const diagnostic = {
@@ -2071,7 +2065,7 @@ class NaslServer {
           const typeAnnotation = type2TypeAnnotation((node as any).__nodeType);
           if (!node.typeAnnotation && typeAnnotation) {
             if (typeAnnotation.typeName === 'List' && typeAnnotation.typeKind === 'generic') {
-              const { typeArguments } = typeAnnotation;
+              const typeArguments = typeAnnotation.typeArguments;
               if (typeArguments.length && typeArguments[0].isComplexType()) {
                 const diagnostic = {
                   node,
@@ -2096,7 +2090,7 @@ class NaslServer {
                 } catch (err) {
                   console.log(err);
                 }
-                if (jsCode.includes(`${node.name} = `)) {
+                if (jsCode.startsWith(`${node.name} = `)) {
                   used = true;
                   if (!nodeIn.tsErrorDetail) {
                     const diagnostic = {
@@ -2266,6 +2260,17 @@ class NaslServer {
       node.tsErrorDetail = diagnostic;
       diagnostics.push(diagnostic);
     }
+    if (node instanceof ForEachStatement && !node.end && node.each) {
+      if (!['List'].includes(node.each.__TypeAnnotation?.typeName)) {
+        const diagnostic = {
+          node,
+          severity: 'error',
+          message: `ForEac1：循环列表：参数类型不匹配！结束值自动推导失败。`,
+        };
+        node.tsErrorDetail = diagnostic;
+        diagnostics.push(diagnostic);
+      }
+    }
     /**
      * 如果节点是内置函数
      * 穷举在线上的情况，不在线上就void报错， callinterface 因为原来有报错，所以就忽略掉
@@ -2349,8 +2354,7 @@ class NaslServer {
           // 先特殊处理等 类型合并后就可以去掉了
           if (excludeList.includes(leftType.sortedTypeKey) && excludeList.includes(rightType.sortedTypeKey)) {
             return null;
-          }
-          if (excludeList2.includes(leftType.sortedTypeKey) || excludeList2.includes(rightType.sortedTypeKey)) {
+          } else if (excludeList2.includes(leftType.sortedTypeKey) || excludeList2.includes(rightType.sortedTypeKey)) {
             return null;
           }
           const diagnostic = {
@@ -2390,7 +2394,7 @@ class NaslServer {
         if (typeKeyArr[0] === 'apis') {
           const structureName = typeKeyArr[3];
           const moduleName = typeKeyArr[1];
-          const { app } = typeAnnotation.upperNode as Variable;
+          const app = (typeAnnotation.upperNode as Variable).app;
           if (!app) {
             return null;
           }
@@ -2406,13 +2410,14 @@ class NaslServer {
           }
         }
         return null;
+      } else {
+        return diag;
       }
-      return diag;
     });
     if (actionArr.length) {
       if (timer) return;
       timer = window.setTimeout(() => {
-        const { app } = actionArr[0].target;
+        const app = actionArr[0].target.app;
         app.emit('collect:start', {
           actionMsg: '设置导入接口数据类型错误',
         });
@@ -2476,8 +2481,9 @@ class NaslServer {
    */
   _findMinRange(diagnostic: tsProtocol.DiagnosticWithFileName | tsProtocol.ReferencesResponseItem, fileNode: FileNode) {
     let minRange: MinRange;
-    const { sourceMap } = fileNode;
-
+    const sourceMap: SourceMap = fileNode.sourceMap;
+    // 是否找到了行内准确的，是的话，就不走多行的
+    let haveLineNode = false;
     for (const [node, item] of sourceMap.entries()) {
       /**
        * 当前内容的开始行 <= 诊断开始的行 &&
@@ -2497,6 +2503,7 @@ class NaslServer {
             // if for的内容也是包括当前的所以会重新赋值
             if (!minRange || item.code.length < minRange.item.code.length) {
               minRange = { item, node };
+              haveLineNode = true;
             }
           }
         } else {
@@ -2504,27 +2511,31 @@ class NaslServer {
           // 一般出现在一大块上，多半是if for 等等没有参数
           if (!minRange) {
             minRange = { node, item };
-          } else if (
-            lsp2tspNumber(item.range.start.line) === diagnostic.start.line &&
-            diagnostic.start.offset >= lsp2tspNumber(item.range.start.character)
-          ) {
-            // 如果当前遍历的内容的行和列都 小于之前的， 而且是有效的
-            // 如果两个内容位置行数是一样的，就比较下找到内容的位置信息
-            // 找到的内容的开始位置， 要大于申明内容开始的位置，要不就不包含在内了
-            if (diagnostic.start.offset - item.range.start.character <= diagnostic.start.offset - minRange.item.range.start.character) {
-              minRange = { node, item };
-            } else if (diagnostic.start.offset < lsp2tspNumber(minRange.item.range.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) {
-            // 行都一致 ，比较列
-            if (minRange.item.range.start.line === item.range.start.line && minRange.item.range.end.line === item.range.end.line) {
-              // 如果两个起始和结束的行都一样，那么就比较开始列， 要比原来大，说明更精准
-              if (item.range.start.character > minRange.item.range.start.character) {
+          } else if (!haveLineNode) {
+            if (
+              lsp2tspNumber(item.range.start.line) === diagnostic.start.line &&
+              diagnostic.start.offset >= lsp2tspNumber(item.range.start.character)
+            ) {
+              // 如果当前遍历的内容的行和列都 小于之前的， 而且是有效的
+              // 如果两个内容位置行数是一样的，就比较下找到内容的位置信息
+              // 找到的内容的开始位置， 要大于申明内容开始的位置，要不就不包含在内了
+              if (diagnostic.start.offset - item.range.start.character <= diagnostic.start.offset - minRange.item.range.start.character) {
+                minRange = { node, item };
+              } else {
+                if (diagnostic.start.offset < lsp2tspNumber(minRange.item.range.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) {
+              // 行都一致 ，比较列
+              if (minRange.item.range.start.line === item.range.start.line && minRange.item.range.end.line === item.range.end.line) {
+                // 如果两个起始和结束的行都一样，那么就比较开始列， 要比原来大，说明更精准
+                if (item.range.start.character > minRange.item.range.start.character) {
+                  minRange = { node, item };
+                }
+              } else {
                 minRange = { node, item };
               }
-            } else {
-              minRange = { node, item };
             }
           }
         }
@@ -2557,21 +2568,23 @@ class NaslServer {
         offset: lsp2tspNumber(currentSource.range.start.character),
       });
       refsList = [...newRefs.refs];
-    } else if (node instanceof Module) {
-      const lists = node.logics || node.structures || node.enums;
-      const moduleName = (fileNode as FileNode).getEmbeddedFilePath();
-      if (lists.length) {
-        const item = lists[0];
-        const { fileNode } = this.getCurrentSource(item);
-        if (fileNode) {
-          const newRefs = await this.references({
-            file: (fileNode as FileNode).getEmbeddedFilePath(),
-            line: 1,
-            offset: 22, // 固定的位置，module的位置信息
-          });
-          refsList = newRefs.refs.filter((item) => !item.file.startsWith(moduleName));
-          // 多塞一个 ，删除的时候就有值了， 上面过滤了之后可能是空的
-          refsList.unshift(newRefs.refs[0]);
+    } else {
+      if (node instanceof Module) {
+        const lists = node.logics || node.structures || node.enums;
+        const moduleName = (fileNode as FileNode).getEmbeddedFilePath();
+        if (lists.length) {
+          const item = lists[0];
+          const { fileNode } = this.getCurrentSource(item);
+          if (fileNode) {
+            const newRefs = await this.references({
+              file: (fileNode as FileNode).getEmbeddedFilePath(),
+              line: 1,
+              offset: 22, //固定的位置，module的位置信息
+            });
+            refsList = newRefs.refs.filter((item) => !item.file.startsWith(moduleName));
+            // 多塞一个 ，删除的时候就有值了， 上面过滤了之后可能是空的
+            refsList.unshift(newRefs.refs[0]);
+          }
         }
       }
     }
@@ -2634,7 +2647,7 @@ class NaslServer {
               ).length;
               if (!groupByLength && !aggregateLength && callQueryComponentTypeAnnotation.typeKind === 'anonymousStructure') {
                 // 拿到 List 的泛型（匿名数据结构）的所有属性
-                const { properties } = callQueryComponentTypeAnnotation.properties[0].typeAnnotation.typeArguments[0];
+                const properties = callQueryComponentTypeAnnotation.properties[0].typeAnnotation.typeArguments[0].properties;
                 const targetProperty = properties.find((p) => p.name === utils.firstLowerCase(node.name));
                 if (!targetProperty) {
                   continue;
@@ -2686,7 +2699,7 @@ class NaslServer {
     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 code = currentSource.code;
       const viewIndex = code.indexOf(' {');
       const viewRefs = await this.references({
         file: (fileNode as FileNode).getEmbeddedFilePath(),
@@ -2724,7 +2737,7 @@ class NaslServer {
      */
     if (node instanceof ViewElement) {
       if (currentSource) {
-        const { code } = currentSource;
+        const code = currentSource.code;
         const prefix = '__elements.';
         const prefixIndex = code.indexOf(prefix) !== -1 ? code.indexOf(prefix) : 0;
         const methodsNameIndex = prefixIndex + prefix.length;
@@ -2750,7 +2763,7 @@ class NaslServer {
     }
     if (node instanceof Process) {
       if (currentSource) {
-        const { code } = currentSource;
+        const code = currentSource.code;
         const prefix = '__ProcessIdentification__';
         let positions = [];
         let pos = code.indexOf(prefix);
@@ -2777,7 +2790,7 @@ class NaslServer {
     if ((node instanceof Param || node instanceof Return) && node.parentNode instanceof Process) {
       const { currentSource } = this.getCurrentSource(node.parentNode);
       if (currentSource) {
-        const { code } = currentSource;
+        const code = currentSource.code;
         const prefix = '__ProcessIdentification__';
         const positions = [];
         let pos = code.indexOf(prefix);
@@ -2807,7 +2820,7 @@ class NaslServer {
     }
     if (node instanceof ProcessElement) {
       if (currentSource) {
-        const { code } = currentSource;
+        const code = currentSource.code;
         const prefix = '__ProcessIdentification__';
         let positions = [];
         let pos = code.indexOf(prefix);
@@ -2833,7 +2846,7 @@ class NaslServer {
     if (node instanceof Return && node.parentNode instanceof ProcessElement) {
       const { currentSource } = this.getCurrentSource(node.parentNode);
       if (currentSource) {
-        const { code } = currentSource;
+        const code = currentSource.code;
         const prefix = '__ProcessIdentification__';
         const positions = [];
         let pos = code.indexOf(prefix);
@@ -2899,13 +2912,16 @@ class NaslServer {
             // }
             minRange.setTypeMethods = 'setTypeName';
           }
+          if (minRange.node instanceof CallConnector) {
+            minRange.setTypeMethods = 'setCalleeConnectionName';
+          }
           // 如果节点是logic修改引发calllogic修改
           if (minRange.node instanceof CallLogic && node instanceof Logic) {
             minRange.setTypeMethods = 'setCalleeName';
           }
           if (minRange.node instanceof CallLogic && node instanceof ViewElement) {
             minRange.setTypeMethods = 'setCalleeNamespace';
-            minRange.newValue = `elements.${newValue}.logics`;
+            minRange.newValue = 'elements.' + newValue + '.logics';
           }
           // 如果节点是实体修改引发calllogic修改
           if (
@@ -2924,9 +2940,9 @@ class NaslServer {
              * 3.然后把namespace中的 $替换成 ''
              *
              */
-            const { tsCalleeNamespace } = minRange.node;
+            const tsCalleeNamespace = minRange.node.tsCalleeNamespace;
             // 先看下标位置
-            const { lineText } = record;
+            const lineText = record.lineText;
             const index = lineText.indexOf(tsCalleeNamespace);
             // 在把开始结束位置的-开始位置，来知道是哪里要替换
             const start = record.start.offset - index - 1;
@@ -2961,12 +2977,12 @@ class NaslServer {
           if (minRange.node instanceof Identifier) {
             // 匹配到的内容，当前这一行的内容；
             // 因为要用下面的点位信息
-            const { name } = minRange.node;
+            const name = minRange.node.name;
             // 如果name不改，那就是要改命名空间
             if (node instanceof Frontend || newValue === name) {
-              const { namespace } = minRange.node;
+              const namespace = minRange.node.namespace;
               // 先看下标位置
-              const { lineText } = record;
+              const lineText = record.lineText;
               const index = lineText.indexOf(namespace);
               // 在把开始结束位置的-开始位置，来知道是哪里要替换
               const start = record.start.offset - index - 1;
@@ -2997,7 +3013,7 @@ class NaslServer {
             // 枚举key的特殊性，因为它不是原来的key+value形式的
             // 是加了中括号啥的，所以直接赋值新值
             if (node instanceof EnumItem) {
-              const newTextValue = `${node.parentNode.name}.${newValue}`;
+              const newTextValue = node.parentNode.name + '.' + newValue;
               minRange.newValue = newTextValue;
             } else {
               // 匹配到的内容，当前这一行的内容；
@@ -3032,7 +3048,7 @@ class NaslServer {
               minRange.setTypeMethods = 'setEntityNameAndEffect';
             } else if (minRange.node instanceof BindAttribute && minRange.node.name === 'url') {
               // 如果是查找到 上传地址的链接引用
-              let newName = newValue.replace(/[A-Z]/g, (item) => `-${item.toLowerCase()}`);
+              let newName = newValue.replace(/[A-Z]/g, (item) => '-' + item.toLowerCase());
               newName = newName[0] === '-' ? newName.slice(1) : newName;
               const newTextValue = node.parentNode.name === 'defaultDS' ? `/api/${newName}/import` : `/api/${node.parentNode.name}/${newName}/import`;
               minRange.setTypeMethods = 'setUrlValue';
@@ -3074,11 +3090,11 @@ class NaslServer {
              * 3.然后把namespace中的 $替换成 ''
              *
              */
-            const { tsCalleeNamespace } = minRange.node;
-            const { tsName } = minRange.node;
-            const oldValue = `${tsCalleeNamespace}.${tsName}`;
+            const tsCalleeNamespace = minRange.node.tsCalleeNamespace;
+            const tsName = minRange.node.tsName;
+            const oldValue = tsCalleeNamespace + '.' + tsName;
             // 先看下标位置
-            const { lineText } = record;
+            const lineText = record.lineText;
             const index = lineText.indexOf(oldValue);
             // 在把开始结束位置的-开始位置，来知道是哪里要替换
             const start = record.start.offset - index - 1;
@@ -3095,11 +3111,11 @@ class NaslServer {
             }
           }
           if (node instanceof Frontend && minRange.node instanceof Destination) {
-            const { tsCalleeNamespace } = minRange.node;
-            const { tsName } = minRange.node;
-            const oldValue = `${tsCalleeNamespace}.${tsName}`;
+            const tsCalleeNamespace = minRange.node.tsCalleeNamespace;
+            const tsName = minRange.node.tsName;
+            const oldValue = tsCalleeNamespace + '.' + tsName;
             // 先看下标位置
-            const { lineText } = record;
+            const lineText = record.lineText;
             const index = lineText.indexOf(oldValue);
             // 在把开始结束位置的-开始位置，来知道是哪里要替换
             const start = record.start.offset - index - 1;
@@ -3119,7 +3135,7 @@ class NaslServer {
             // 页面逻辑直接赋值就可以, 因为是相对路径
             if (node instanceof ViewElement) {
               minRange.setTypeMethods = 'setCalleeNamespace';
-              minRange.newValue = `elements.${newValue}.logics`;
+              minRange.newValue = 'elements.' + newValue + '.logics';
             } else {
               /**
                * 如果namespce是 'app.views.Student.views.404.views.505.views.update'
@@ -3130,11 +3146,11 @@ class NaslServer {
                * 2.在匹配到的内容中取转后的namespace的位置
                * 3.然后把namespace中的 $替换成 ''
                */
-              const { tsCalleeNamespace } = minRange.node;
+              const tsCalleeNamespace = minRange.node.tsCalleeNamespace;
               const oldValue = tsCalleeNamespace;
 
               // 先看下标位置
-              const { lineText } = record;
+              const lineText = record.lineText;
               const index = lineText.indexOf(oldValue);
 
               // 在把开始结束位置的-开始位置，来知道是哪里要替换
@@ -3197,7 +3213,7 @@ class NaslServer {
           if (node instanceof DataSource) {
             const setTypeNamespace = (typeNamespace: string, record: any) => {
               // 先看下标位置
-              const { lineText } = record;
+              const lineText = record.lineText;
               const index = lineText.indexOf(typeNamespace);
               // 在把开始结束位置的-开始位置，来知道是哪里要替换
               const start = record.start.offset - index - 1;
@@ -3322,8 +3338,7 @@ class NaslServer {
       .sort((a, b) => {
         if (a.node.concept === 'QueryFieldExpression') {
           return 1;
-        }
-        if (b.node.concept === 'QueryFieldExpression') {
+        } else if (b.node.concept === 'QueryFieldExpression') {
           return -1;
         }
         return 0;
@@ -3454,7 +3469,7 @@ class NaslServer {
     const queue: any[] = [];
     // 先插入自己,如果没有在往上找,
     // 一直到file节点的父级
-    while (!(parantNode instanceof App)) {
+    while (parantNode && !(parantNode instanceof App)) {
       // 找到上一级 在map对象中构造出他的子集
       currentNode = parantNode;
       parantNode = parantNode.parentNode;
@@ -3565,7 +3580,7 @@ class NaslServer {
    */
   getCurrentSource(node: BaseNode) {
     if (node instanceof App || node instanceof Theme) return { fileNode: null };
-    let { sourceMap } = node;
+    let sourceMap = node.sourceMap;
     let fileNode = node;
     // 如果没有sourceMap,就继续向上找 ,或者到module结束
     // 如果 节点找到 app 或者module 停止 或者entity找到DataSource为止
@@ -3607,16 +3622,27 @@ class NaslServer {
   getFieldKeySelectCompletion(node: BaseNode, fieldKey?: string) {
     const { currentSource, fileNode } = this.getCurrentSource(node);
     if (currentSource && fileNode) {
+      const range = {
+        line: lsp2tspNumber(currentSource.range.start.line),
+        offset: lsp2tspNumber(currentSource.range.start.character),
+      };
+      // foreach 在最后一行自动补全
+      if (node.concept === 'ForEachStatement') {
+        range.line = currentSource.range.end.line;
+        range.offset = 0;
+      } else if (node.concept === 'BindAttribute') {
+        range.offset = range.offset + 7;
+      } else if (node.concept === 'BindDirective') {
+        range.offset = range.offset + 5;
+      }
       return this._getFieldKeySelectCompletion({
         file: (fileNode as FileNode).getEmbeddedFilePath(),
-        range: {
-          line: lsp2tspNumber(currentSource.range.start.line),
-          offset: lsp2tspNumber(currentSource.range.start.character),
-        },
+        range,
         getFieldKey: fieldKey,
       });
+    } else {
+      console.log('没找到节点', currentSource, fileNode);
     }
-    console.log('没找到节点', currentSource, fileNode);
   }
 
   _getFieldKeySelectCompletion(args: any) {
@@ -3666,7 +3692,7 @@ class NaslServer {
     return [...fileNodes];
   }
 
-  /** 获取当前节点的已知类型
+  /**获取当前节点的已知类型
    * @param node 当前要获取类型的节点
    * @returns 不需要去查就可以返回类型的节点
    */
@@ -3838,7 +3864,7 @@ class NaslServer {
             const lastLen = codeArr?.[codeArr.length - 1]?.length;
             indexOf = subStr.length - lastLen;
           }
-          fileDetail.offset += indexOf;
+          fileDetail.offset = fileDetail.offset + indexOf;
         } else if (
           node.concept === 'MemberExpression' ||
           node.concept === 'Identifier' ||
@@ -3850,7 +3876,7 @@ class NaslServer {
             const lastLen = codeArr?.[codeArr.length - 1]?.length;
             // MemberExpression取最后一位当做类型
             const indexOf = item.code.length - lastLen;
-            fileDetail.offset += indexOf;
+            fileDetail.offset = fileDetail.offset + indexOf;
           }
         } else if (node.concept === 'Match') {
           // 去查return 后面的返回值，变成函数调用
@@ -3882,7 +3908,7 @@ class NaslServer {
       const item = (resultMap as any)?.[file]?.[line]?.[offset];
       const itemType = item?.[0]?.nodeType;
       const nodeTypeAnnotation = type2TypeAnnotation(itemType);
-      const { node } = newQuickInfoNodes[index];
+      const node = newQuickInfoNodes[index].node;
 
       types.set(node, Object.freeze(nodeTypeAnnotation) as TypeAnnotation);
 
@@ -3919,7 +3945,7 @@ class NaslServer {
             const typeAnnotation = value as TypeAnnotation;
             if (!node.typeAnnotation && typeAnnotation) {
               if (typeAnnotation.typeName === 'List' && typeAnnotation.typeKind === 'generic') {
-                const { typeArguments } = typeAnnotation;
+                const typeArguments = typeAnnotation.typeArguments;
                 if (typeArguments.length && typeArguments[0].isComplexType()) {
                   node.__TypeAnnotation = null;
                   return;
@@ -3949,7 +3975,7 @@ class NaslServer {
   @withQueueExecute('annotation')
   async getNaslAnnotatedJSON(app: App, releaseFlag: boolean) {
     if (this.changeStackList?.length) {
-      throw new Error(`当前还有${this.changeStackList.length}个文件还在执行更新操作，请稍后再试！或刷新后重试！`);
+      throw new Error(`当前还有${this.changeStackList.length}个文件还在执行更新操作`);
     }
     const nodes: QuickInfoNodes = [];
     this.file2NodeMap.forEach((fileNode, filePath) => {
@@ -4154,7 +4180,7 @@ class NaslServer {
       }
     }
     // 用户自己声明的用用户的
-    const callObj = App.findNodeByCompleteName(`${parent.calleeNamespace}.${parent.calleeName}`);
+    const callObj = App.findNodeByCompleteName(parent.calleeNamespace + '.' + parent.calleeName);
     const index = parent.arguments.indexOf(node);
     const param = callObj?.params?.[index] || {};
     // 取出参数的类型
@@ -4430,7 +4456,7 @@ class NaslServer {
    */
   async incidentalAction(action: string, fileNode: BaseNode, targetNode: BaseNode, oldpath?: string) {
     if ((action === 'create' || action === 'delete' || (action === 'update' && oldpath)) && fileNode === targetNode) {
-      // 删除、更改、新增端
+      //删除、更改、新增端
       if (fileNode instanceof Frontend && (fileNode.views?.length || fileNode.variables?.length)) {
         const fileNodeChildren = [...fileNode.views, ...fileNode.variables];
         for (let i = 0; i < fileNodeChildren.length; i++) {
@@ -4446,7 +4472,7 @@ class NaslServer {
           } else if (action === 'update' && oldpath) {
             const parentPath = oldpath.replace('.ts', '/');
             const foldName = fileNodeItem.concept === 'View' ? 'views' : 'variables';
-            const currentOldPath = `${parentPath + foldName}/${fileNodeItem.name}.ts`;
+            const currentOldPath = parentPath + foldName + '/' + fileNodeItem.name + '.ts';
             // 因为重命名这里只有当前修改父级的 旧名称, 所以他的子集也要根据旧名称去查依赖 更新内容
             await this.handleRename(fileNodeItem, fileNodeItem, result, currentOldPath);
             await this.incidentalAction(action, fileNodeItem, fileNodeItem, currentOldPath);
@@ -4468,7 +4494,7 @@ class NaslServer {
             await this.incidentalAction(action, fileNodeItem, fileNodeItem);
           } else if (action === 'update' && oldpath) {
             const parentPath = oldpath.replace('.ts', '/');
-            const currentOldPath = `${parentPath + fileNodeItem.name}.ts`;
+            const currentOldPath = parentPath + fileNodeItem.name + '.ts';
             // 因为重命名这里只有当前修改父级的 旧名称, 所以他的子集也要根据旧名称去查依赖 更新内容
             await this.handleRename(fileNodeItem, fileNodeItem, result, currentOldPath);
             await this.incidentalAction(action, fileNodeItem, fileNodeItem, currentOldPath);
@@ -4512,7 +4538,7 @@ class NaslServer {
           try {
             const result = entity.toEmbeddedTSFile();
             const parentPath = oldpath.replace('.ts', '/');
-            const currentOldPath = `${parentPath}/entities/${entity.name}.ts`;
+            const currentOldPath = parentPath + '/entities/' + entity.name + '.ts';
             // 因为重命名这里只有当前修改父级的 旧名称, 所以他的子集也要根据旧名称去查依赖 更新内容
             await this.handleRename(entity, entity, result, currentOldPath);
           } catch (err) {
@@ -4526,7 +4552,7 @@ class NaslServer {
   async receiveHandleChange($event: EventPayload) {
     this.singleFileChangeIng = true;
     // 行为
-    const { action } = $event;
+    const action = $event.action;
     const targetNode = $event.target;
     // Connection 相关配置的更新不需要写入文件
     if (targetNode?.parentNode instanceof Connection) {