@lcap/nasl 3.3.0-alpha.2 → 3.3.0-beta.0

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,15 +70,14 @@ const EmbeddedTSFileOffsetMap = {
     ConfigProperty: 12,
 };
 const SentryMessager = (0, sentry_1.sentryMonitorTSWorkerMessager)(Messager_1.default);
-let isChangeInterface = false; // 判断是否导入接口
-let actionArr = []; // 用于导入接口收集更改的节点
-let timer = null; // 超时器用于收集导入接口相关
-const __naslStdlibFileCacheMap = new Map(); // naslStdlib文件缓存
+let isChangeInterface = false; //判断是否导入接口
+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,21 +86,23 @@ 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;
         }
-        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);
@@ -109,19 +111,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;
@@ -187,7 +198,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 +209,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 +242,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 });
         });
@@ -431,6 +444,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);
@@ -449,7 +482,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 +492,7 @@ let NaslServer = class NaslServer {
                 }
                 catch (err) { }
             });
-            module.triggerLaunchers.forEach((triggerLauncher) => {
+            module.triggerLaunchers?.forEach?.((triggerLauncher) => {
                 try {
                     const result = triggerLauncher.toEmbeddedTSFile();
                     results.push(result);
@@ -511,6 +544,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);
@@ -554,13 +588,14 @@ let NaslServer = class NaslServer {
     }
     // 缓存添加过的文件
     cacheFile(options) {
-        __naslStdlibFileCacheMap.set(options.file, options);
+        this.naslStdlibFileCacheMap.set(options.file, options);
     }
-    /** u
+    /**u
      * 只新增文件
      * @param {*} files
      */
     writeFiles(files) {
+        files.forEach(({ file, fileContent }) => this.tsFiles.set(file, fileContent));
         return this.messager.requestCommand('writeFiles', files);
     }
     /**
@@ -569,38 +604,40 @@ 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;
-                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;
                     }));
                 }
             }
             catch (e) {
-                // 出现错误之后不再调用
-                openDebugEmbedded = false;
+                // ..
             }
         }
         /// #endif
@@ -635,14 +672,16 @@ 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,
             });
         }
-        console.log('没找到节点', node, currentSource, fileNode);
+        else {
+            console.log('没找到节点', node, currentSource, fileNode);
+        }
     }
     _getValueSelectCompletion(args) {
         return this.messager.requestCommand('getValueSelectCompletion', args);
@@ -667,8 +706,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 || '';
@@ -686,7 +725,9 @@ let NaslServer = class NaslServer {
                     if (!res.length) {
                         return [];
                     }
-                    return [{ title: '基础类型', children: res }];
+                    else {
+                        return [{ title: '基础类型', children: res }];
+                    }
                 }
             }
             catch (err) {
@@ -715,8 +756,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 || '';
@@ -732,7 +773,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;
@@ -775,8 +816,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 || '';
@@ -785,7 +826,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 +848,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}`);
         }
     }
@@ -859,13 +900,15 @@ 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,
             });
         }
-        console.log('没找到节点', currentSource, fileNode);
+        else {
+            console.log('没找到节点', currentSource, fileNode);
+        }
     }
     _getSelectNextCompletion(args) {
         return this.messager.requestCommand('getSelectNextCompletion', args);
@@ -893,14 +936,14 @@ 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;
             // 先获取原来的节点先清除一下之前有异常的节点，下面重新赋值
             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;
@@ -910,7 +953,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;
                     }
@@ -924,7 +967,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);
                         }
@@ -947,7 +990,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 +1034,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 +1043,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 +1071,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 +1252,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 +1306,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,
@@ -1361,6 +1404,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);
+                        }
                     });
                 }
             });
@@ -1535,17 +1587,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 +1637,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',
@@ -1620,6 +1672,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);
                 }
@@ -1767,7 +1833,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': {
@@ -1797,6 +1863,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;
@@ -1866,7 +1943,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 +2011,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 +2027,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 +2053,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 = {
@@ -2000,7 +2077,7 @@ let NaslServer = class NaslServer {
                         diagnostics.push(diagnostic);
                     }
                     else {
-                        node.tsErrorDetail = undefined;
+                        delete node.tsErrorDetail;
                     }
                 }
                 this.checkNodeError(node, diagnostics);
@@ -2011,7 +2088,6 @@ let NaslServer = class NaslServer {
                 this.checkNodeError(node, diagnostics);
             });
         }
-        console.timeEnd('_attachDiagnostics');
         return diagnostics;
     }
     checkNodeError(node, diagnostics) {
@@ -2157,6 +2233,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 +2322,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 +2359,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 +2376,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,24 +2446,27 @@ 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()) {
             /**
              * 当前内容的开始行 <= 诊断开始的行 &&
              * 当前内容的结束行 >= 诊断结束的行
              */
-            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;
                         }
                     }
                 }
@@ -2384,28 +2476,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.start.line) === diagnostic.start.line &&
+                            diagnostic.start.offset >= (0, translator_1.lsp2tspNumber)(item.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.start.character)) {
+                                    minRange = { node, item };
+                                }
+                            }
                         }
-                        else {
-                            minRange = { node, item };
+                        else if (item.end.line - item.start.line <= minRange.item.end.line - minRange.item.start.line) {
+                            // 行都一致 ，比较列
+                            if (minRange.item.start.line === item.start.line && minRange.item.end.line === item.end.line) {
+                                // 如果两个起始和结束的行都一样，那么就比较开始列， 要比原来大，说明更精准
+                                if (item.start.character > minRange.item.start.character) {
+                                    minRange = { node, item };
+                                }
+                            }
+                            else {
+                                minRange = { node, item };
+                            }
                         }
                     }
                 }
@@ -2433,26 +2529,28 @@ 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];
         }
-        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]);
+                    }
                 }
             }
         }
@@ -2475,7 +2573,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;
                     }
                 }
@@ -2505,28 +2603,31 @@ 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') {
                                 // 拿到 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;
                                 }
                                 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,
                                 });
@@ -2552,21 +2653,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) {
@@ -2590,8 +2691,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];
         // }
@@ -2600,14 +2701,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) => {
@@ -2625,7 +2726,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);
@@ -2638,8 +2739,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) => {
@@ -2648,9 +2749,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);
@@ -2667,8 +2768,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) => {
@@ -2678,7 +2779,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);
@@ -2690,8 +2791,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) => {
@@ -2700,9 +2801,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);
@@ -2722,8 +2823,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) => {
@@ -2766,13 +2867,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 +2893,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 +2930,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 +2967,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 +3007,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 +3047,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 +3069,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 +3093,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 +3105,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 +3171,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 +3297,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 +3425,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 +3545,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为止
@@ -3470,8 +3574,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 };
             }
         }
     }
@@ -3479,16 +3583,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.start.line),
+                offset: (0, translator_1.lsp2tspNumber)(currentSource.start.character),
+            };
+            // foreach 在最后一行自动补全
+            if (node.concept === 'ForEachStatement') {
+                range.line = currentSource.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 +3654,7 @@ let NaslServer = class NaslServer {
         });
         return [...fileNodes];
     }
-    /** 获取当前节点的已知类型
+    /**获取当前节点的已知类型
      * @param node 当前要获取类型的节点
      * @returns 不需要去查就可以返回类型的节点
      */
@@ -3625,7 +3743,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 (![
@@ -3657,69 +3775,75 @@ 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;
                 }
-                fileDetail.offset += indexOf;
+                fileDetail.offset = fileDetail.offset + indexOf;
             }
             else if (node.concept === 'MemberExpression' ||
                 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;
             }
@@ -3733,9 +3857,15 @@ 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;
+            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) {
@@ -3769,9 +3899,9 @@ 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;
+                                    delete node.__TypeAnnotation;
                                     return;
                                 }
                             }
@@ -3786,13 +3916,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;
@@ -3800,7 +3930,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) => {
@@ -3927,7 +4057,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;
                         }
@@ -3985,7 +4115,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] || {};
         // 取出参数的类型
@@ -4219,16 +4349,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));
             }
@@ -4245,7 +4375,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 +4393,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 +4417,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 +4462,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 +4476,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) {
@@ -4366,9 +4496,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) {
@@ -4414,13 +4549,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')