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

package/out/server/naslServer.js

@@ -37,11 +37,11 @@ exports.NaslServer = exports.getDisplayString2Type = void 0;
 const fs = __importStar(require("fs-extra"));
 const path = __importStar(require("path"));
 const worker_threads_1 = require("worker_threads");
-const decimal_js_1 = require("decimal.js");
+/// #endif
 const config_1 = require("../config");
 const sentry_1 = require("../sentry");
 const Messager_1 = __importDefault(require("../common/Messager"));
-const getMemberIdentifier_1 = require("./getMemberIdentifier");
+const getMemberIdentifier_1 = require("../server/getMemberIdentifier");
 const concepts_1 = require("../concepts");
 const translator_1 = require("../translator");
 const storage_1 = __importDefault(require("../service/storage"));
@@ -57,6 +57,7 @@ const jsoner = __importStar(require("../service/storage/jsoner"));
 const EventEmitter_1 = require("../common/EventEmitter");
 const utils_1 = require("../utils");
 const decorators_1 = require("../decorators");
+const decimal_js_1 = require("decimal.js");
 const utils_2 = require("../automate/engine/utils");
 const EmbeddedTSFileLineMap = {
     Entity: 3,
@@ -69,9 +70,9 @@ const EmbeddedTSFileOffsetMap = {
     ConfigProperty: 12,
 };
 const SentryMessager = (0, sentry_1.sentryMonitorTSWorkerMessager)(Messager_1.default);
-let isChangeInterface = false; // 判断是否导入接口
-let actionArr = []; // 用于导入接口收集更改的节点
-let timer = null; // 超时器用于收集导入接口相关
+let isChangeInterface = false; //判断是否导入接口
+let actionArr = []; //用于导入接口收集更改的节点
+let timer = null; //超时器用于收集导入接口相关
 const __naslStdlibFileCacheMap = new Map(); // naslStdlib文件缓存
 // 联合类型切割取出类型
 function getDisplayString2Type(displayString) {
@@ -90,17 +91,19 @@ function getDisplayString2Type(displayString) {
         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;
         }
-        return item;
+        else {
+            return item;
+        }
     });
     if (targetType) {
         return typeList.filter((item) => item !== targetType);
@@ -187,7 +190,7 @@ let NaslServer = class NaslServer {
                     // 这个方法是 5.0 加入标准库的，但是这里 ts 版本是 4.x，ci 会挂，所以需要忽略
                     // @ts-ignore
                     const findLastIndex = this.changeStackList.findLastIndex((changeStackItem) => {
-                        const { target } = changeStackItem;
+                        const target = changeStackItem.target;
                         const { fileNode: targetFileNode } = this.getCurrentSource(target);
                         return targetFileNode === fileNode;
                     });
@@ -198,8 +201,10 @@ let NaslServer = class NaslServer {
                             // 如果当前列表里有，这个文件节点，最后一个是field的话，直接return掉，不用塞这个update了
                             return;
                         }
-                        // 如果最后一项是普通的update的话，就可以去掉，后面那个会在塞过来
-                        this.changeStackList.pop();
+                        else {
+                            // 如果最后一项是普通的update的话，就可以去掉，后面那个会在塞过来
+                            this.changeStackList.pop();
+                        }
                     }
                     this.changeStackList.push(item.originEvent);
                 }
@@ -229,7 +234,7 @@ let NaslServer = class NaslServer {
         }, { cache: true });
         Object.keys(naslStdlibMap_1.default).forEach(async (libFileName) => {
             await this.addFile({
-                file: `/${libFileName}`,
+                file: '/' + libFileName,
                 fileContent: naslStdlibMap_1.default[libFileName],
             }, { cache: true });
         });
@@ -449,7 +454,7 @@ let NaslServer = class NaslServer {
             });
         }
         if (module instanceof concepts_1.App) {
-            module.connections.forEach((connection) => {
+            module.connections?.forEach?.((connection) => {
                 try {
                     const result = connection.toEmbeddedTSFile();
                     results.push(result);
@@ -459,7 +464,7 @@ let NaslServer = class NaslServer {
                 }
                 catch (err) { }
             });
-            module.triggerLaunchers.forEach((triggerLauncher) => {
+            module.triggerLaunchers?.forEach?.((triggerLauncher) => {
                 try {
                     const result = triggerLauncher.toEmbeddedTSFile();
                     results.push(result);
@@ -556,7 +561,7 @@ let NaslServer = class NaslServer {
     cacheFile(options) {
         __naslStdlibFileCacheMap.set(options.file, options);
     }
-    /** u
+    /**u
      * 只新增文件
      * @param {*} files
      */
@@ -585,15 +590,15 @@ let NaslServer = class NaslServer {
         }
         /// #if process.env.NODE_ENV === 'development'
         // 首次尝试请求
-        await storage_1.default.post(`/api/App/debugEmbedded?id=${app.id}`, openFiles[0]).catch(() => (openDebugEmbedded = false));
+        await storage_1.default.post('/api/App/debugEmbedded?id=' + app.id, openFiles[0]).catch(() => (openDebugEmbedded = false));
         if (openDebugEmbedded && globalThis.window) {
             // For TS build
             try {
                 let canDebug = true;
-                await storage_1.default.post(`/api/App/debugEmbedded?id=${app.id}`, openFiles[0]).catch(() => (canDebug = false));
+                await storage_1.default.post('/api/App/debugEmbedded?id=' + app.id, openFiles[0]).catch(() => (canDebug = false));
                 if (canDebug) {
                     await Promise.all(openFiles.map(async (file) => {
-                        const res = await storage_1.default.post(`/api/App/debugEmbedded?id=${app.id}`, file);
+                        const res = await storage_1.default.post('/api/App/debugEmbedded?id=' + app.id, file);
                         return res.data;
                     }));
                 }
@@ -642,7 +647,9 @@ let NaslServer = class NaslServer {
                 noFilterList,
             });
         }
-        console.log('没找到节点', node, currentSource, fileNode);
+        else {
+            console.log('没找到节点', node, currentSource, fileNode);
+        }
     }
     _getValueSelectCompletion(args) {
         return this.messager.requestCommand('getValueSelectCompletion', args);
@@ -686,7 +693,9 @@ let NaslServer = class NaslServer {
                     if (!res.length) {
                         return [];
                     }
-                    return [{ title: '基础类型', children: res }];
+                    else {
+                        return [{ title: '基础类型', children: res }];
+                    }
                 }
             }
             catch (err) {
@@ -732,7 +741,7 @@ let NaslServer = class NaslServer {
                         .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;
@@ -785,7 +794,7 @@ let NaslServer = class NaslServer {
                 return;
             const types = /<([^()]+)>/g.exec(displayString);
             const typeStr = types && types[1];
-            const { app } = node;
+            const app = node.app;
             if (typeStr.includes('__name: "AStructure_')) {
                 const properties = [];
                 typeStr.replace(/([^:\s]+):\s+([^;]+);/g, ($1, name, typeKey) => {
@@ -807,7 +816,7 @@ let NaslServer = class NaslServer {
                 });
                 return concepts_1.TypeAnnotation.createTypeAnonymousStructure(properties);
             }
-            if (typeStr.startsWith('structures'))
+            else if (typeStr.startsWith('structures'))
                 return app.findNodeByCompleteName(`app.${typeStr}`);
         }
     }
@@ -865,7 +874,9 @@ let NaslServer = class NaslServer {
                 noFilterList,
             });
         }
-        console.log('没找到节点', currentSource, fileNode);
+        else {
+            console.log('没找到节点', currentSource, fileNode);
+        }
     }
     _getSelectNextCompletion(args) {
         return this.messager.requestCommand('getSelectNextCompletion', args);
@@ -893,7 +904,7 @@ let NaslServer = class NaslServer {
             await this.IncrementalAnnotationJSON(records);
         }
         await Promise.all(records.map(async (record) => {
-            const { node } = record;
+            const node = record.node;
             if (!node)
                 return;
             // 先获取原来的节点先清除一下之前有异常的节点，下面重新赋值
@@ -947,7 +958,7 @@ let NaslServer = class NaslServer {
                         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__')) {
                             // 重置 图标和错误等级
@@ -991,7 +1002,7 @@ let NaslServer = class NaslServer {
                     return diag;
                     // 一些已知警告的单独处理
                 }
-                if ([
+                else if ([
                     `'__LogicEmpty' is declared but its value is never read.`,
                     `'__destinationEmpty__' is declared but its value is never read.`,
                     `'__devConfigValueEmpty' is declared but its value is never read.`,
@@ -1000,7 +1011,7 @@ let NaslServer = class NaslServer {
                 ].includes(diag.text)) {
                     return this._resolveDiagnostic(diag, record.node, 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';
@@ -1028,7 +1039,7 @@ let NaslServer = class NaslServer {
                                 };
                                 return diagnostic;
                             }
-                            if (minRange.node instanceof concepts_1.Variable) {
+                            else if (minRange.node instanceof concepts_1.Variable) {
                                 const diagnostic = {
                                     node: minRange.node,
                                     severity: 'warning',
@@ -1209,7 +1220,7 @@ let NaslServer = class NaslServer {
                             const typeAnnotation = item.__TypeAnnotation;
                             // 仅处理有类型的情况，返回类型为void的情况由其他地方处理成报错
                             if (typeAnnotation) {
-                                const { sortedTypeKey } = typeAnnotation;
+                                const sortedTypeKey = typeAnnotation.sortedTypeKey;
                                 if (!typeAnnotationMap[sortedTypeKey]) {
                                     typeAnnotationMap[sortedTypeKey] = {
                                         typeAnnotation,
@@ -1263,7 +1274,7 @@ let NaslServer = class NaslServer {
                             const typeAnnotation = value.__TypeAnnotation;
                             // 仅处理有类型的情况，返回类型为void的情况由其他地方处理成报错
                             if (typeAnnotation) {
-                                const { sortedTypeKey } = typeAnnotation;
+                                const sortedTypeKey = typeAnnotation.sortedTypeKey;
                                 if (!typeAnnotationMap[sortedTypeKey]) {
                                     typeAnnotationMap[sortedTypeKey] = {
                                         typeAnnotation,
@@ -1535,17 +1546,17 @@ let NaslServer = class NaslServer {
                                 catch (err) {
                                     console.log(err);
                                 }
-                                if (!jsCode.includes(`${node.name} = `))
+                                if (!jsCode.startsWith(`${node.name} = `))
                                     return;
                                 // 页面局部变量
                                 if (node instanceof concepts_1.Variable && node.parentNode instanceof concepts_1.View) {
                                     // 跟页面局部变量无关的赋值过滤
-                                    if (!jsCode.includes(`this.${node.name} = `))
+                                    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))) {
+                                    if (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 = {
                                                 node: nodeIn,
@@ -1585,17 +1596,17 @@ let NaslServer = 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',
@@ -1767,7 +1778,7 @@ let NaslServer = class NaslServer {
                                 const { default: defaultVal } = precisionOption || {};
                                 const precision = databaseTypeAnnotation ? databaseTypeAnnotation.arguments?.precision : defaultVal;
                                 const ruleScale = typeAnnotation?.ruleMap?.scale;
-                                const scale = ruleScale !== undefined ? `${ruleScale}` : '';
+                                const scale = ruleScale !== undefined ? ruleScale + '' : '';
                                 let ensureScale = true;
                                 switch (typeName) {
                                     case 'String': {
@@ -1866,7 +1877,7 @@ let NaslServer = class NaslServer {
                                     // 储存小数部分
                                     const memoryScaleStr = memoryStr.slice(0, +(scale || '0'));
                                     // 储存绝对值
-                                    const memoryAbsVal = memoryIntAbsStr + (memoryScaleStr ? `.${memoryScaleStr}` : '');
+                                    const memoryAbsVal = memoryIntAbsStr + (memoryScaleStr ? '.' + memoryScaleStr : '');
                                     const decimalMemoryAbsVal = new decimal_js_1.Decimal(memoryAbsVal);
                                     [
                                         {
@@ -1934,7 +1945,7 @@ let NaslServer = 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 = {
@@ -1950,7 +1961,7 @@ let NaslServer = class NaslServer {
                     const typeAnnotation = (0, formatTsUtils_1.type2TypeAnnotation)(node.__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,
@@ -1976,7 +1987,7 @@ let NaslServer = class NaslServer {
                                 catch (err) {
                                     console.log(err);
                                 }
-                                if (jsCode.includes(`${node.name} = `)) {
+                                if (jsCode.startsWith(`${node.name} = `)) {
                                     used = true;
                                     if (!nodeIn.tsErrorDetail) {
                                         const diagnostic = {
@@ -2157,6 +2168,17 @@ let NaslServer = class NaslServer {
             node.tsErrorDetail = diagnostic;
             diagnostics.push(diagnostic);
         }
+        if (node instanceof concepts_1.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 因为原来有报错，所以就忽略掉
@@ -2235,7 +2257,7 @@ let NaslServer = 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 = {
@@ -2272,7 +2294,7 @@ let NaslServer = class NaslServer {
                 if (typeKeyArr[0] === 'apis') {
                     const structureName = typeKeyArr[3];
                     const moduleName = typeKeyArr[1];
-                    const { app } = typeAnnotation.upperNode;
+                    const app = typeAnnotation.upperNode.app;
                     if (!app) {
                         return null;
                     }
@@ -2289,13 +2311,15 @@ let NaslServer = class NaslServer {
                 }
                 return null;
             }
-            return diag;
+            else {
+                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: '设置导入接口数据类型错误',
                 });
@@ -2357,7 +2381,9 @@ let NaslServer = class NaslServer {
      */
     _findMinRange(diagnostic, fileNode) {
         let minRange;
-        const { sourceMap } = fileNode;
+        const sourceMap = fileNode.sourceMap;
+        // 是否找到了行内准确的，是的话，就不走多行的
+        let haveLineNode = false;
         for (const [node, item] of sourceMap.entries()) {
             /**
              * 当前内容的开始行 <= 诊断开始的行 &&
@@ -2375,6 +2401,7 @@ let NaslServer = class NaslServer {
                         // if for的内容也是包括当前的所以会重新赋值
                         if (!minRange || item.code.length < minRange.item.code.length) {
                             minRange = { item, node };
+                            haveLineNode = true;
                         }
                     }
                 }
@@ -2384,28 +2411,32 @@ let NaslServer = class NaslServer {
                     if (!minRange) {
                         minRange = { node, item };
                     }
-                    else if ((0, translator_1.lsp2tspNumber)(item.range.start.line) === diagnostic.start.line &&
-                        diagnostic.start.offset >= (0, translator_1.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 < (0, translator_1.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 ((0, translator_1.lsp2tspNumber)(item.range.start.line) === diagnostic.start.line &&
+                            diagnostic.start.offset >= (0, translator_1.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 < (0, translator_1.lsp2tspNumber)(minRange.item.range.start.character)) {
+                                    minRange = { node, item };
+                                }
+                            }
                         }
-                        else {
-                            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 };
+                            }
                         }
                     }
                 }
@@ -2438,21 +2469,23 @@ let NaslServer = class NaslServer {
             });
             refsList = [...newRefs.refs];
         }
-        else if (node instanceof concepts_1.Module) {
-            const lists = node.logics || node.structures || node.enums;
-            const moduleName = fileNode.getEmbeddedFilePath();
-            if (lists.length) {
-                const item = lists[0];
-                const { fileNode } = this.getCurrentSource(item);
-                if (fileNode) {
-                    const newRefs = await this.references({
-                        file: 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 concepts_1.Module) {
+                const lists = node.logics || node.structures || node.enums;
+                const moduleName = fileNode.getEmbeddedFilePath();
+                if (lists.length) {
+                    const item = lists[0];
+                    const { fileNode } = this.getCurrentSource(item);
+                    if (fileNode) {
+                        const newRefs = await this.references({
+                            file: fileNode.getEmbeddedFilePath(),
+                            line: 1,
+                            offset: 22, //固定的位置，module的位置信息
+                        });
+                        refsList = newRefs.refs.filter((item) => !item.file.startsWith(moduleName));
+                        // 多塞一个 ，删除的时候就有值了， 上面过滤了之后可能是空的
+                        refsList.unshift(newRefs.refs[0]);
+                    }
                 }
             }
         }
@@ -2511,7 +2544,7 @@ let NaslServer = class NaslServer {
                             const groupByLength = callQueryComponent.groupBy.filter((item) => item.groupElement?.propertyName && item.groupElement.asName).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;
@@ -2561,7 +2594,7 @@ let NaslServer = class NaslServer {
         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 code = currentSource.code;
             const viewIndex = code.indexOf(' {');
             const viewRefs = await this.references({
                 file: fileNode.getEmbeddedFilePath(),
@@ -2600,7 +2633,7 @@ let NaslServer = class NaslServer {
          */
         if (node instanceof concepts_1.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;
@@ -2625,7 +2658,7 @@ let NaslServer = class NaslServer {
         }
         if (node instanceof concepts_1.Process) {
             if (currentSource) {
-                const { code } = currentSource;
+                const code = currentSource.code;
                 const prefix = '__ProcessIdentification__';
                 let positions = [];
                 let pos = code.indexOf(prefix);
@@ -2650,7 +2683,7 @@ 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);
             if (currentSource) {
-                const { code } = currentSource;
+                const code = currentSource.code;
                 const prefix = '__ProcessIdentification__';
                 const positions = [];
                 let pos = code.indexOf(prefix);
@@ -2678,7 +2711,7 @@ let NaslServer = class NaslServer {
         }
         if (node instanceof concepts_1.ProcessElement) {
             if (currentSource) {
-                const { code } = currentSource;
+                const code = currentSource.code;
                 const prefix = '__ProcessIdentification__';
                 let positions = [];
                 let pos = code.indexOf(prefix);
@@ -2702,7 +2735,7 @@ let NaslServer = class NaslServer {
         if (node instanceof concepts_1.Return && node.parentNode instanceof concepts_1.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);
@@ -2766,13 +2799,16 @@ let NaslServer = class NaslServer {
                     // }
                     minRange.setTypeMethods = 'setTypeName';
                 }
+                if (minRange.node instanceof concepts_1.CallConnector) {
+                    minRange.setTypeMethods = 'setCalleeConnectionName';
+                }
                 // 如果节点是logic修改引发calllogic修改
                 if (minRange.node instanceof concepts_1.CallLogic && node instanceof concepts_1.Logic) {
                     minRange.setTypeMethods = 'setCalleeName';
                 }
                 if (minRange.node instanceof concepts_1.CallLogic && node instanceof concepts_1.ViewElement) {
                     minRange.setTypeMethods = 'setCalleeNamespace';
-                    minRange.newValue = `elements.${newValue}.logics`;
+                    minRange.newValue = 'elements.' + newValue + '.logics';
                 }
                 // 如果节点是实体修改引发calllogic修改
                 if (minRange.node instanceof concepts_1.CallLogic &&
@@ -2789,9 +2825,9 @@ let NaslServer = 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;
@@ -2826,12 +2862,12 @@ let NaslServer = class NaslServer {
                 if (minRange.node instanceof concepts_1.Identifier) {
                     // 匹配到的内容，当前这一行的内容；
                     // 因为要用下面的点位信息
-                    const { name } = minRange.node;
+                    const name = minRange.node.name;
                     // 如果name不改，那就是要改命名空间
                     if (node instanceof concepts_1.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;
@@ -2863,7 +2899,7 @@ let NaslServer = class NaslServer {
                     // 枚举key的特殊性，因为它不是原来的key+value形式的
                     // 是加了中括号啥的，所以直接赋值新值
                     if (node instanceof concepts_1.EnumItem) {
-                        const newTextValue = `${node.parentNode.name}.${newValue}`;
+                        const newTextValue = node.parentNode.name + '.' + newValue;
                         minRange.newValue = newTextValue;
                     }
                     else {
@@ -2903,7 +2939,7 @@ let NaslServer = class NaslServer {
                     }
                     else if (minRange.node instanceof concepts_1.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';
@@ -2943,11 +2979,11 @@ let NaslServer = 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;
@@ -2965,11 +3001,11 @@ let NaslServer = class NaslServer {
                     }
                 }
                 if (node instanceof concepts_1.Frontend && minRange.node instanceof concepts_1.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;
@@ -2989,7 +3025,7 @@ let NaslServer = class NaslServer {
                     // 页面逻辑直接赋值就可以, 因为是相对路径
                     if (node instanceof concepts_1.ViewElement) {
                         minRange.setTypeMethods = 'setCalleeNamespace';
-                        minRange.newValue = `elements.${newValue}.logics`;
+                        minRange.newValue = 'elements.' + newValue + '.logics';
                     }
                     else {
                         /**
@@ -3001,10 +3037,10 @@ let NaslServer = 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);
                         // 在把开始结束位置的-开始位置，来知道是哪里要替换
                         const start = record.start.offset - index - 1;
@@ -3067,7 +3103,7 @@ let NaslServer = class NaslServer {
                 if (node instanceof concepts_1.DataSource) {
                     const setTypeNamespace = (typeNamespace, record) => {
                         // 先看下标位置
-                        const { lineText } = record;
+                        const lineText = record.lineText;
                         const index = lineText.indexOf(typeNamespace);
                         // 在把开始结束位置的-开始位置，来知道是哪里要替换
                         const start = record.start.offset - index - 1;
@@ -3193,7 +3229,7 @@ let NaslServer = class NaslServer {
             if (a.node.concept === 'QueryFieldExpression') {
                 return 1;
             }
-            if (b.node.concept === 'QueryFieldExpression') {
+            else if (b.node.concept === 'QueryFieldExpression') {
                 return -1;
             }
             return 0;
@@ -3321,7 +3357,7 @@ let NaslServer = class NaslServer {
         const queue = [];
         // 先插入自己,如果没有在往上找,
         // 一直到file节点的父级
-        while (!(parantNode instanceof concepts_1.App)) {
+        while (parantNode && !(parantNode instanceof concepts_1.App)) {
             // 找到上一级 在map对象中构造出他的子集
             currentNode = parantNode;
             parantNode = parantNode.parentNode;
@@ -3441,7 +3477,7 @@ let NaslServer = class NaslServer {
     getCurrentSource(node) {
         if (node instanceof concepts_1.App || node instanceof concepts_1.Theme)
             return { fileNode: null };
-        let { sourceMap } = node;
+        let sourceMap = node.sourceMap;
         let fileNode = node;
         // 如果没有sourceMap,就继续向上找 ,或者到module结束
         // 如果 节点找到 app 或者module 停止 或者entity找到DataSource为止
@@ -3479,16 +3515,30 @@ let NaslServer = class NaslServer {
     getFieldKeySelectCompletion(node, fieldKey) {
         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),
+            };
+            // 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.getEmbeddedFilePath(),
-                range: {
-                    line: (0, translator_1.lsp2tspNumber)(currentSource.range.start.line),
-                    offset: (0, translator_1.lsp2tspNumber)(currentSource.range.start.character),
-                },
+                range,
                 getFieldKey: fieldKey,
             });
         }
-        console.log('没找到节点', currentSource, fileNode);
+        else {
+            console.log('没找到节点', currentSource, fileNode);
+        }
     }
     _getFieldKeySelectCompletion(args) {
         return this.messager.requestCommand('getFieldKeySelectCompletion', args);
@@ -3536,7 +3586,7 @@ let NaslServer = class NaslServer {
         });
         return [...fileNodes];
     }
-    /** 获取当前节点的已知类型
+    /**获取当前节点的已知类型
      * @param node 当前要获取类型的节点
      * @returns 不需要去查就可以返回类型的节点
      */
@@ -3689,7 +3739,7 @@ let NaslServer = 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' ||
@@ -3700,7 +3750,7 @@ let NaslServer = 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') {
@@ -3733,7 +3783,7 @@ let NaslServer = class NaslServer {
             const item = resultMap?.[file]?.[line]?.[offset];
             const itemType = item?.[0]?.nodeType;
             const nodeTypeAnnotation = (0, formatTsUtils_1.type2TypeAnnotation)(itemType);
-            const { node } = newQuickInfoNodes[index];
+            const node = newQuickInfoNodes[index].node;
             types.set(node, Object.freeze(nodeTypeAnnotation));
             node.__nodeType = itemType ? (Object.isFrozen(itemType) ? itemType : Object.freeze(itemType)) : null;
         });
@@ -3769,7 +3819,7 @@ let NaslServer = class NaslServer {
                         const typeAnnotation = value;
                         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;
@@ -3800,7 +3850,7 @@ let NaslServer = class NaslServer {
     // 全量标注并且返回json
     async getNaslAnnotatedJSON(app, releaseFlag) {
         if (this.changeStackList?.length) {
-            throw new Error(`当前还有${this.changeStackList.length}个文件还在执行更新操作，请稍后再试！或刷新后重试！`);
+            throw new Error(`当前还有${this.changeStackList.length}个文件还在执行更新操作`);
         }
         const nodes = [];
         this.file2NodeMap.forEach((fileNode, filePath) => {
@@ -3985,7 +4035,7 @@ let NaslServer = 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] || {};
         // 取出参数的类型
@@ -4245,7 +4295,7 @@ let NaslServer = class NaslServer {
      */
     async incidentalAction(action, fileNode, targetNode, oldpath) {
         if ((action === 'create' || action === 'delete' || (action === 'update' && oldpath)) && fileNode === targetNode) {
-            // 删除、更改、新增端
+            //删除、更改、新增端
             if (fileNode instanceof concepts_1.Frontend && (fileNode.views?.length || fileNode.variables?.length)) {
                 const fileNodeChildren = [...fileNode.views, ...fileNode.variables];
                 for (let i = 0; i < fileNodeChildren.length; i++) {
@@ -4263,7 +4313,7 @@ let NaslServer = 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);
@@ -4287,7 +4337,7 @@ let NaslServer = class NaslServer {
                     }
                     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);
@@ -4332,7 +4382,7 @@ let NaslServer = 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);
                     }
@@ -4346,7 +4396,7 @@ let NaslServer = class NaslServer {
     async receiveHandleChange($event) {
         this.singleFileChangeIng = true;
         // 行为
-        const { action } = $event;
+        const action = $event.action;
         const targetNode = $event.target;
         // Connection 相关配置的更新不需要写入文件
         if (targetNode?.parentNode instanceof concepts_1.Connection) {