@lcap/nasl 3.4.0-beta.5 → 3.4.0-beta.6

package/out/server/naslServer.js

@@ -184,7 +184,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             handleMessage: async ({ data }) => {
                 if (data && data.event === 'publishDiagnostics') {
                     const records = await this._resolveDiagnosticRecords(data.records);
-                    this.diagnosticManager.pushAll(records);
+                    await this.diagnosticManager.pushAll(records);
                     try {
                         // 结束诊断和标注
                         (0, common_1.invokeCommand)('naslServer:endWork');
@@ -268,323 +268,103 @@ let NaslServer = NaslServer_1 = class NaslServer {
         // 全部文件加载完毕开始初始化
         await this.getDiagnosticRecordsAndPushAll();
     }
-    contentToFile(module, results) {
-        // 禁用的依赖库不生成代码 区分 undefined 和 false
-        if (module instanceof concepts_1.Module && module.type === 'extension' && module.enable === false) {
-            return;
+    *contentToFile(module) {
+        if (!module) {
+            return [];
         }
-        module.structures.forEach((structure) => {
-            try {
-                const result = structure.toEmbeddedTSFile();
-                results.push(result);
-                // sourceMap都存在目录级别内容下，在页面层级下去找
-                structure.sourceMap = result.sourceMap;
-                this.file2NodeMap.set(result.filePath, structure);
-            }
-            catch (err) { }
-        });
-        module.metadataTypes?.forEach((metadataType) => {
+        const self = this;
+        const results = [];
+        const getTsFile = function* getTsFile(node, name, pre) {
+            const isContinue = pre ? (input) => input instanceof pre : () => true;
             try {
-                const result = metadataType.toEmbeddedTSFile();
-                results.push(result);
-                // sourceMap都存在目录级别内容下，在页面层级下去找
-                metadataType.sourceMap = result.sourceMap;
-                this.file2NodeMap.set(result.filePath, metadataType);
-            }
-            catch (err) { }
-        });
-        if (module instanceof concepts_1.App) {
-            module.overriddenLogics?.forEach?.((logic) => {
-                try {
-                    if (!(logic instanceof concepts_1.OverriddenLogic))
-                        return;
-                    const result = logic.toEmbeddedTSFile();
-                    results.push(result);
-                    logic.sourceMap = result.sourceMap;
-                    this.file2NodeMap.set(result.filePath, logic);
-                }
-                catch (err) {
-                    console.error('err: ', err);
-                }
-            });
-            module?.backend?.variables?.forEach((backdndVariable) => {
-                try {
-                    const result = backdndVariable.toEmbeddedTSFile();
-                    results.push(result);
-                    // sourceMap都存在目录级别内容下，在页面层级下去找
-                    backdndVariable.sourceMap = result.sourceMap;
-                    this.file2NodeMap.set(result.filePath, backdndVariable);
-                }
-                catch (err) {
-                    console.error(err);
-                }
-            });
-            module.frontends?.forEach((frontend) => {
-                try {
-                    const result = frontend.toEmbeddedTSFile();
-                    results.push(result);
-                    // sourceMap都存在目录级别内容下，在页面层级下去找
-                    frontend.sourceMap = result.sourceMap;
-                    this.file2NodeMap.set(result.filePath, frontend);
-                }
-                catch (err) {
-                    console.log(err);
-                }
-                frontend.variables?.forEach((frontendVariable) => {
-                    try {
-                        const result = frontendVariable.toEmbeddedTSFile();
-                        results.push(result);
-                        // sourceMap都存在目录级别内容下，在页面层级下去找
-                        frontendVariable.sourceMap = result.sourceMap;
-                        this.file2NodeMap.set(result.filePath, frontendVariable);
-                    }
-                    catch (err) {
-                        console.log(err);
-                    }
-                });
-                frontend.bindEvents?.forEach((bindEvent) => {
-                    if (bindEvent?.logics && bindEvent?.logics?.length > 0) {
-                        bindEvent.logics.forEach((logic) => {
-                            try {
-                                const result = logic.toEmbeddedTSFile();
-                                results.push(result);
-                                logic.sourceMap = result.sourceMap;
-                                this.file2NodeMap.set(result.filePath, logic);
-                            }
-                            catch (err) {
-                                console.error('err: ', err);
-                            }
-                        });
-                    }
-                });
-                // view的生成
-                if (!config_1.config.closeViews) {
-                    this.view2TSFile(frontend.views, results);
-                }
-                frontend.componentDependencies?.forEach((item) => this.contentToFile(item, results));
-            });
-        }
-        else {
-            module.frontends?.forEach((frontend) => {
-                try {
-                    frontend.logics.forEach((logic) => {
-                        const result = logic.toEmbeddedTSFile();
-                        results.push(result);
-                        // sourceMap都存在目录级别内容下，在页面层级下去找
-                        logic.sourceMap = result.sourceMap;
-                        this.file2NodeMap.set(result.filePath, logic);
-                    });
-                }
-                catch (err) {
-                    console.log(err);
+                if (!isContinue(node)) {
+                    return;
                 }
-            });
-        }
-        module.dataSources?.forEach((dataSource) => {
-            // 本身dataSource也要生成一个文件用于改名
-            try {
-                const result = dataSource.toEmbeddedTSFile();
+                const result = yield* node.toEmbeddedTSFile();
                 results.push(result);
-                // sourceMap都存在目录级别内容下，在页面层级下去找
-                dataSource.sourceMap = result.sourceMap;
-                this.file2NodeMap.set(result.filePath, dataSource);
+                node.sourceMap = result.sourceMap;
+                self.file2NodeMap.set(result.filePath, node);
             }
-            catch (err) { }
-            dataSource.entities.forEach((entity) => {
-                try {
-                    const result = entity.toEmbeddedTSFile();
-                    results.push(result);
-                    // sourceMap都存在目录级别内容下，在页面层级下去找
-                    entity.sourceMap = result.sourceMap;
-                    this.file2NodeMap.set(result.filePath, entity);
-                }
-                catch (err) { }
-            });
-        });
-        module?.interfaces?.forEach((_itf) => {
-            try {
-                // interface 接口可能为 InterfaceFromExample 类型，因此这里需要做兼容
-                let _interface;
-                if (_itf instanceof concepts_1.InterfaceFromExample) {
-                    _interface = _itf.inter;
-                }
-                else {
-                    _interface = _itf;
+            catch (err) {
+                if (process.env.NODE_ENV === 'development') {
+                    console.warn(node.nodePath ? node.nodePath : name, '代码转换失败', err);
                 }
-                const result = _interface.toEmbeddedTSFile();
-                results.push(result);
-                // sourceMap都存在目录级别内容下，在页面层级下去找
-                _interface.sourceMap = result.sourceMap;
-                this.file2NodeMap.set(result.filePath, _interface);
-            }
-            catch (err) { }
-        });
-        module?.enums?.forEach((_enum) => {
-            try {
-                const result = _enum.toEmbeddedTSFile();
-                results.push(result);
-                // sourceMap都存在目录级别内容下，在页面层级下去找
-                _enum.sourceMap = result.sourceMap;
-                this.file2NodeMap.set(result.filePath, _enum);
             }
-            catch (err) { }
-        });
-        module?.logics?.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) { }
-        });
-        module?.authLogics?.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) { }
-        });
-        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) { }
-        });
-        module.processes?.forEach((process) => {
-            try {
-                const result = process.toEmbeddedTSFile();
-                results.push(result);
-                process.sourceMap = result.sourceMap;
-                this.file2NodeMap.set(result.filePath, process);
+        };
+        const getTsFiles = function* getTsFiles(nodes, name, pre) {
+            for (const node of nodes ?? []) {
+                yield* getTsFile(node, name, pre);
             }
-            catch (err) { }
-        });
-        if (module instanceof concepts_1.Connector) {
-            try {
-                module.triggerLaunchers?.forEach((launcher) => {
-                    const result = launcher.toEmbeddedTSFile();
-                    results.push(result);
-                    // sourceMap都存在目录级别内容下，在页面层级下去找
-                    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) { }
-                });
+        };
+        const concat = (arr, key) => {
+            return arr.reduce((ans, item) => ans.concat(item[key]), []);
+        };
+        const view2TSFile = function* view2TSFile(views) {
+            if (!views || views.length === 0) {
+                return;
             }
-            catch (error) {
-                console.error(error);
+            for (const view of views) {
+                yield* getTsFile(view, 'view');
+                if (view.children) {
+                    yield* view2TSFile(view.children);
+                }
             }
+        };
+        // 禁用的依赖库不生成代码 区分 undefined 和 false
+        if (module instanceof concepts_1.Module && module.type === 'extension' && module.enable === false) {
+            return [];
         }
+        const { structures = [], metadataTypes = [], frontends = [], interfaces = [], enums = [], logics = [], authLogics = [], authLogicsForCallInterface = [], processes = [], dataSources = [], triggerLaunchers = [], connections = [], roles = [], overriddenLogics = [], backend, configuration, } = module;
+        const { namespaces = [], } = module;
+        yield* getTsFiles(structures, 'structure');
+        yield* getTsFiles(metadataTypes, 'metadataType');
         if (module instanceof concepts_1.App) {
-            module?.roles?.forEach((role) => {
-                try {
-                    const result = role.toEmbeddedTSFile();
-                    results.push(result);
-                    // sourceMap都存在目录级别内容下，在页面层级下去找
-                    role.sourceMap = result.sourceMap;
-                    this.file2NodeMap.set(result.filePath, role);
+            yield* getTsFiles(overriddenLogics, 'overriddenLogic', concepts_1.OverriddenLogic);
+            yield* getTsFiles(backend?.variables ?? [], 'backend_variable');
+            for (const frontend of frontends) {
+                yield* getTsFile(frontend, 'frontend');
+                yield* getTsFiles(frontend.variables, 'frontend_variable');
+                yield* getTsFiles(concat(frontend.bindEvents, 'logics'), 'frontend_bindEvent_logic');
+                if (!config_1.config.closeViews) {
+                    yield* view2TSFile(frontend.views);
                 }
-                catch (err) { }
-            });
+                for (const dep of frontend.componentDependencies) {
+                    results.push(...(yield* self.contentToFile(dep)));
+                }
+            }
+        }
+        else {
+            yield* getTsFiles(concat(frontends, 'logics'), 'frontend_logic');
+        }
+        yield* getTsFiles(dataSources, 'dataSource');
+        yield* getTsFiles(concat(dataSources, 'entities'), 'dataSource_entity');
+        yield* getTsFiles(interfaces, 'interface');
+        yield* getTsFiles(enums, 'enum');
+        yield* getTsFiles(logics, 'logic');
+        yield* getTsFiles(authLogics, 'authLogic', concepts_1.Logic);
+        yield* getTsFiles(authLogicsForCallInterface, 'authLogicForCallInterface', concepts_1.Logic);
+        yield* getTsFiles(processes, 'process');
+        if (module instanceof concepts_1.Connector) {
+            yield* getTsFiles(triggerLaunchers, 'triggerLauncher');
+            yield* getTsFiles(authLogicsForCallInterface, 'authLogicForCallInterface');
+            yield* getTsFiles(concat(namespaces, 'logics'), 'namespaces_logic');
         }
         if (module instanceof concepts_1.App) {
-            module.connections?.forEach?.((connection) => {
-                try {
-                    const result = connection.toEmbeddedTSFile();
-                    results.push(result);
-                    // sourceMap都存在目录级别内容下，在页面层级下去找
-                    connection.sourceMap = result.sourceMap;
-                    this.file2NodeMap.set(result.filePath, connection);
-                }
-                catch (err) { }
-            });
-            module.triggerLaunchers?.forEach?.((triggerLauncher) => {
-                try {
-                    const result = triggerLauncher.toEmbeddedTSFile();
-                    results.push(result);
-                    // sourceMap都存在目录级别内容下，在页面层级下去找
-                    triggerLauncher.sourceMap = result.sourceMap;
-                    this.file2NodeMap.set(result.filePath, triggerLauncher);
-                }
-                catch (err) { }
-            });
+            yield* getTsFiles(roles, 'role');
+            yield* getTsFiles(connections, 'connection');
+            yield* getTsFiles(triggerLaunchers, 'triggerLauncher');
         }
-        module.configuration?.groups?.forEach((_group) => {
-            if (_group.name === 'custom') {
-                _group.properties.forEach((_property) => {
-                    try {
-                        const result = _property.toEmbeddedTSFile();
-                        results.push(result);
-                        // sourceMap都存在目录级别内容下，在页面层级下去找
-                        _property.sourceMap = result.sourceMap;
-                        this.file2NodeMap.set(result.filePath, _property);
-                    }
-                    catch (err) { }
-                });
+        for (const group of configuration?.groups ?? []) {
+            if (group.name === 'custom') {
+                yield* getTsFiles(group?.properties ?? [], 'configuration_group_property');
             }
-        });
-    }
-    view2TSFile(viewsChildren, results) {
-        // 如果有子页面
-        if (viewsChildren && viewsChildren.length) {
-            viewsChildren.forEach((view) => {
-                try {
-                    const result = view.toEmbeddedTSFile();
-                    results.push(result);
-                    view.sourceMap = result.sourceMap;
-                    this.file2NodeMap.set(result.filePath, view);
-                    if (view.children.length) {
-                        this.view2TSFile(view.children, results);
-                    }
-                }
-                catch (err) { }
-            });
         }
+        return results;
     }
     async openApp(app) {
         console.time('生成 TS 文件');
-        const results = [];
-        try {
-            // app的创建内容
-            this.contentToFile(app, results);
-            // 其他模块的创建内容
-            app.integration?.connectors?.forEach((item) => this.contentToFile(item, results));
-            app.dependencies.forEach((item) => this.contentToFile(item, results));
-            app.interfaceDependencies.forEach((item) => this.contentToFile(item, results));
-        }
-        catch (err) {
-            console.log(err);
-        }
+        const self = this;
+        const results = await utils.timeSlicingWithGenerator(getAllTsFiles());
         const files = results.map((result) => ({
             file: result.filePath,
             fileContent: result.code,
@@ -600,6 +380,18 @@ let NaslServer = NaslServer_1 = class NaslServer {
             callback();
         });
         console.timeEnd('生成 TS 文件');
+        function* getAllTsFiles() {
+            const files = yield* self.contentToFile(app);
+            const otherModules = [
+                ...app.integration?.connectors ?? [],
+                ...app.dependencies ?? [],
+                ...app.interfaceDependencies ?? [],
+            ];
+            for (const item of otherModules) {
+                files.push(...yield* self.contentToFile(item));
+            }
+            return files;
+        }
     }
     async refreshApp(app) {
         // 清除所有问题
@@ -626,13 +418,19 @@ let NaslServer = NaslServer_1 = class NaslServer {
     cacheFile(options) {
         __naslStdlibFileCacheMap.set(options.file, options);
     }
-    /** u
+    /**
      * 只新增文件
      * @param {*} files
      */
     writeFiles(files) {
         files.forEach(({ file, fileContent }) => this.tsFiles.set(file, fileContent));
-        return this.messager.requestCommand('writeFiles', files);
+        const noRepeatFiles = Array.from(this.tsFiles.entries()).map(([key, value]) => ({
+            file: key,
+            fileContent: value,
+        }));
+        // const newFiles = require('/Users/sufangzhou/dev/neteast/lcap-ide/packages/nasl/tmp/files-original.json');
+        // debugger;
+        return this.messager.requestCommand('writeFiles', noRepeatFiles);
     }
     /**
      * 新增、修改
@@ -955,48 +753,48 @@ let NaslServer = NaslServer_1 = class NaslServer {
             return;
         node.tsErrorDetail = tsErrorDetail;
     }
-    /**
-     * 处理诊断结果
-     * @param records 结果
-     * @returns 过滤或者转换后的诊断结果
-     */
-    async _resolveDiagnosticRecords(records) {
+    *_resolveDiagnosticRecordsWithGenerator(records) {
         // 热更新类型标注
         if (records.length) {
-            await this.IncrementalAnnotationJSON(records);
+            yield* this._incrementalAnnotationJSONWithGenerator(records);
         }
-        await Promise.all(records.map(async (record) => {
-            const { node } = record;
-            if (!node)
+        const self = this;
+        console.time('处理诊断数据');
+        yield* utils.wrapForEachToGenerator(records, function* resolveRecord(record) {
+            if (!record || !record.node) {
                 return;
+            }
+            const { node } = record;
             // 先获取原来的节点先清除一下之前有异常的节点，下面重新赋值
-            const oldRecord = this.diagnosticManager.getRecord?.(record.id);
-            oldRecord?.semanticDiagnostics.forEach((item) => {
-                if (item.node) {
-                    delete item.node.tsErrorDetail;
-                    // 如果logic中有报错就把标识置为true
-                    if (item.node?.logic?.haveError) {
-                        item.node.logic.haveError = false;
+            const oldRecord = self.diagnosticManager.getRecord?.(record.id);
+            // 处理旧数据
+            if (oldRecord) {
+                yield* utils.wrapForEachToGenerator(oldRecord.semanticDiagnostics, (item) => {
+                    if (item.node) {
+                        delete item.node.tsErrorDetail;
+                        // 如果logic中有报错就把标识置为true
+                        if (item.node?.logic?.haveError) {
+                            item.node.logic.haveError = false;
+                        }
                     }
-                }
-            });
-            // 清空一些状态
-            oldRecord?.suggestionDiagnostics.forEach((item) => {
-                if (item.node) {
-                    delete item.node.tsErrorDetail;
-                    if (item.node && item.node instanceof concepts_1.Logic) {
-                        item.node.isSmpty = false;
+                });
+                yield* utils.wrapForEachToGenerator(oldRecord.suggestionDiagnostics, (item) => {
+                    if (item.node) {
+                        delete item.node.tsErrorDetail;
+                        if (item.node && item.node instanceof concepts_1.Logic) {
+                            item.node.isSmpty = false;
+                        }
                     }
-                }
-            });
+                });
+            }
             // 语义诊断
             if (isChangeInterface) {
-                this.existStructureFix(record.semanticDiagnostics, record.node, this);
+                yield* self.existStructureFix(record.semanticDiagnostics, record.node, self);
             }
             // 单独处理 oql 语义错误提示
             if (record.node instanceof concepts_1.Logic) {
-                record?.syntaxDiagnostics.forEach((item) => {
-                    const minRange = this._findMinRange(item, record.node);
+                yield* utils.wrapForEachToGenerator(record?.syntaxDiagnostics, function* test(item) {
+                    const minRange = yield* self._findMinRangeWithGenerator(item, record.node);
                     if (minRange?.node instanceof concepts_1.OqlQueryComponent) {
                         if (item.text === 'Invalid character.') {
                             record.semanticDiagnostics.push(item);
@@ -1005,14 +803,15 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 });
             }
             // 记录结构体数据
-            record.semanticDiagnostics.forEach((diag) => (0, translator_2.checkAStructure_)(diag.text));
-            record.semanticDiagnostics = record.semanticDiagnostics
-                .map((diag) => this._resolveDiagnostic(diag, record.node, record))
-                .filter((diag) => !!diag);
-            record.semanticDiagnostics.push(...(await this._attachDiagnostics(node)));
+            yield* utils.wrapForEachToGenerator(record.semanticDiagnostics, (diag) => {
+                (0, translator_2.checkAStructure_)(diag.text);
+            });
+            record.semanticDiagnostics = (yield* utils.wrapMapToGenerator(record.semanticDiagnostics, function* (diag) {
+                return yield* self._resolveDiagnosticWithGenerator(diag, record.node, record);
+            })).filter((diag) => !!diag);
+            record.semanticDiagnostics.push(...(yield* self._attachDiagnosticsWithGenerator(node)));
             // 报错降级逻辑
-            record.semanticDiagnostics = record.semanticDiagnostics
-                .map((diagnostic) => {
+            record.semanticDiagnostics = (yield* utils.wrapMapToGenerator(record.semanticDiagnostics, (diagnostic) => {
                 // 错误降级如果属于草稿态的就降级
                 if (diagnostic?.node) {
                     let currentNode = diagnostic.node;
@@ -1054,11 +853,10 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     }
                 }
                 return diagnostic;
-            })
+            }))
                 .filter((diag) => !!diag);
             // 处理后的警告异常提示信息
-            record.suggestionDiagnostics = record.suggestionDiagnostics
-                .map((diag) => {
+            record.suggestionDiagnostics = (yield* utils.wrapMapToGenerator(record.suggestionDiagnostics, function* resolveSuggestionDiagnostic(diag) {
                 // 上面错误降级下来的
                 if (diag?.node) {
                     return diag;
@@ -1071,7 +869,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     `'__onlineConfigValueEmpty' is declared but its value is never read.`,
                     `'__UpdateNoProperty__' is declared but its value is never read.`,
                 ].includes(diag.text)) {
-                    return this._resolveDiagnostic(diag, record.node, record);
+                    return yield* self._resolveDiagnosticWithGenerator(diag, record.node, record);
                 }
                 if (diag.text.includes(` is declared but its value is never read.`)) {
                     // 局部变量和输入变量未使用的警告
@@ -1081,10 +879,10 @@ let NaslServer = NaslServer_1 = class NaslServer {
                         /**
                          * javalogic不用提示
                          */
-                        if (record.node.concept === 'Logic' && this._isJavalogic(record.node)) {
+                        if (record.node.concept === 'Logic' && self._isJavalogic(record.node)) {
                             return null;
                         }
-                        const minRange = this._findMinRange(diag, record.node);
+                        const minRange = yield* self._findMinRangeWithGenerator(diag, record.node);
                         if (minRange) {
                             /**
                              * 如果节点是入参类型
@@ -1113,12 +911,21 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     }
                 }
                 return null;
-            })
+            }))
                 .filter((diag) => !!diag);
-            record.suggestionDiagnostics.push(...this._attachSuggestionDiagnostics(node));
-        }));
+            record.suggestionDiagnostics.push(...yield* self._attachSuggestionDiagnosticsWithGenerator(node));
+        });
+        console.timeEnd('处理诊断数据');
         return records;
     }
+    /**
+     * 处理诊断结果
+     * @param records 结果
+     * @returns 过滤或者转换后的诊断结果
+     */
+    _resolveDiagnosticRecords(records) {
+        return utils.timeSlicingWithGenerator(this._resolveDiagnosticRecordsWithGenerator(records));
+    }
     /**
      * 判断是否是Javalogic
      */
@@ -1134,7 +941,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
      * @param fileNode 文件级别的节点
      * @returns 诊断结果
      */
-    _attachSuggestionDiagnostics(fileNode) {
+    *_attachSuggestionDiagnosticsWithGenerator(fileNode) {
         const diagnostics = [];
         if (fileNode instanceof concepts_1.Logic || fileNode instanceof concepts_1.View) {
             fileNode?.sourceMap.forEach((value, node) => {
@@ -1496,29 +1303,51 @@ let NaslServer = NaslServer_1 = class NaslServer {
         return flag;
     }
     /** 是否被 触发器依赖, 如果存在，返回第一个触发器对应的名称 */
-    async isRefedByTriggerAndReturnFirstRef(fileNode) {
-        const refs = await this._isHaveRef(fileNode);
-        const basePath = concepts_1.TriggerLauncher.getEmbeddedFileBasePath(fileNode.rootNode);
-        let flag = false;
-        let fRefName = '';
-        try {
-            for (const ref of refs) {
-                const { file } = ref;
-                if (file.startsWith(basePath)) {
-                    flag = true;
-                    // file: /embedded/tttta/triggerLaunchers/订阅配置_asd.ts
-                    fRefName = file.split(basePath)[1].split('.')[0];
-                    break;
+    isRefedByTriggerAndReturnFirstRef(fileNode) {
+        return this._isHaveRef(fileNode).then((refs) => {
+            const basePath = concepts_1.TriggerLauncher.getEmbeddedFileBasePath(fileNode.rootNode);
+            let flag = false;
+            let fRefName = '';
+            try {
+                for (const ref of refs) {
+                    const { file } = ref;
+                    if (file.startsWith(basePath)) {
+                        flag = true;
+                        // file: /embedded/tttta/triggerLaunchers/订阅配置_asd.ts
+                        fRefName = file.split(basePath)[1].split('.')[0];
+                        break;
+                    }
                 }
             }
-        }
-        catch (error) {
-            console.error(error, refs);
-        }
-        return {
-            isRefedByTrigger: flag,
-            fRefName,
-        };
+            catch (error) {
+                console.error(error, refs);
+            }
+            return {
+                isRefedByTrigger: flag,
+                fRefName,
+            };
+        });
+        // const refs = await this._isHaveRef(fileNode);
+        // const basePath = TriggerLauncher.getEmbeddedFileBasePath(fileNode.rootNode as App);
+        // let flag = false;
+        // let fRefName = '';
+        // try {
+        //   for (const ref of refs) {
+        //     const { file } = ref;
+        //     if (file.startsWith(basePath)) {
+        //       flag = true;
+        //       // file: /embedded/tttta/triggerLaunchers/订阅配置_asd.ts
+        //       fRefName = file.split(basePath)[1].split('.')[0];
+        //       break;
+        //     }
+        //   }
+        // } catch (error) {
+        //   console.error(error, refs);
+        // }
+        // return {
+        //   isRefedByTrigger: flag,
+        //   fRefName,
+        // };
     }
     /**
      * 是否符合 触发器规则
@@ -1547,15 +1376,16 @@ let NaslServer = NaslServer_1 = class NaslServer {
      * @param fileNode 文件级别的节点
      * @returns 诊断结果
      */
-    async _attachDiagnostics(fileNode) {
+    *_attachDiagnosticsWithGenerator(fileNode) {
         // 每次诊断前先清空这个Set
         this.logicSetWithComponentLogic = new Set();
+        const self = this;
         const diagnostics = [];
         if (fileNode instanceof concepts_1.View) {
-            fileNode?.sourceMap.forEach((value, node) => {
+            yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), function* attachView([node, value]) {
                 if (node instanceof concepts_1.ViewElement && node.view === fileNode) {
                     if (node.tag) {
-                        node.bindAttrs.forEach((bindAttr) => {
+                        yield* utils.wrapForEachToGenerator(node.bindAttrs, (bindAttr) => {
                             if ((bindAttr.model || bindAttr.sync) && bindAttr.expression) {
                                 const bindExpression = bindAttr.expression;
                                 let diagnostic;
@@ -1601,7 +1431,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     if (!node.typeAnnotation && !node.__TypeAnnotation) {
                         const nodeTypeName = node.concept === 'Return' ? '输出参数' : '局部变量';
                         let msg;
-                        fileNode.traverseChildren((nodeIn) => {
+                        yield* fileNode.traverseChildrenGenerator((nodeIn) => {
                             if (nodeIn && (nodeIn instanceof concepts_1.BatchAssignment || (nodeIn instanceof concepts_1.Assignment && nodeIn.left?.name))) {
                                 // 子页面内部逻辑过滤
                                 if (nodeIn.view !== fileNode)
@@ -1662,11 +1492,11 @@ let NaslServer = NaslServer_1 = class NaslServer {
                         node.tsErrorDetail = diagnostic;
                         diagnostics.push(diagnostic);
                     }
-                    const fileSourceCode = this.getNodeCode(fileNode, value);
+                    const fileSourceCode = self.getNodeCode(fileNode, value);
                     if (fileSourceCode.includes('|') && fileSourceCode.includes('.metadataTypes.')) {
                         const typeAnnotation = node.typeAnnotation.toJSON();
-                        this._treeMetadataType2CoreType(typeAnnotation, node.rootNode);
-                        const isDuplicate = this._isDuplicateCoreType(typeAnnotation);
+                        self._treeMetadataType2CoreType(typeAnnotation, node.rootNode);
+                        const isDuplicate = self._isDuplicateCoreType(typeAnnotation);
                         if (isDuplicate) {
                             const diagnostic = {
                                 node: node,
@@ -1679,7 +1509,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 }
                 else if (node instanceof concepts_1.BindAttribute || node instanceof concepts_1.BindDirective || node instanceof concepts_1.BindStyle) {
                     if (Array.isArray(node.bindExpressions)) {
-                        const exp = node.bindExpressions.find((bindExpression) => this.hasComponentLogics(bindExpression));
+                        const exp = node.bindExpressions.find((bindExpression) => self.hasComponentLogics(bindExpression));
                         if (exp) {
                             // const element: any = node.getAncestor('ViewElement');
                             // const api = config.allNodesAPI[element?.tag];
@@ -1703,7 +1533,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     }
                 }
                 else if (node instanceof concepts_1.CallInterface) {
-                    const isAuthInterface = this.hasAuth(node);
+                    const isAuthInterface = self.hasAuth(node);
                     const interfaceName = node.calleewholeKey.slice(node.calleewholeKey.lastIndexOf('.') + 1);
                     if (isAuthInterface) {
                         const errorMsg = `${interfaceName} 接口有鉴权方式，不支持在前端调用`;
@@ -1731,7 +1561,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     }
                 }
                 else {
-                    this.checkNodeError(node, diagnostics);
+                    self.checkNodeError(node, diagnostics);
                 }
             });
         }
@@ -1740,7 +1570,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             if (dataSourceGroup) {
                 const property = dataSourceGroup.getProperty(fileNode.name);
                 if (property && property.values) {
-                    property.values.forEach((propertyValue) => {
+                    yield* utils.wrapForEachToGenerator(property.values, (propertyValue) => {
                         if (!propertyValue.value && fileNode.name !== 'defaultDS') {
                             const diagnostic = {
                                 node: fileNode,
@@ -2044,8 +1874,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 });
             }
         }
-        if (fileNode instanceof concepts_1.Logic || fileNode instanceof concepts_1.OverriddenLogic) {
-            const { isRefedByTrigger, fRefName } = await this.isRefedByTriggerAndReturnFirstRef(fileNode);
+        else if (fileNode instanceof concepts_1.Logic || fileNode instanceof concepts_1.OverriddenLogic) {
+            const { isRefedByTrigger, fRefName } = yield this.isRefedByTriggerAndReturnFirstRef(fileNode);
             if (isRefedByTrigger && !this.isTriggerRule(fileNode)) {
                 const diagnostic = {
                     node: fileNode,
@@ -2054,18 +1884,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 };
                 diagnostics.push(diagnostic);
             }
-            fileNode?.sourceMap.forEach((value, node) => {
-                // OQL支持返回复合类型数据了
-                // SqlQueryComponent内部返回值类型，如果是嵌套的就需要报错
-                // if ((node instanceof OqlQueryComponent || node instanceof SqlQueryComponent) && (node as SqlQueryComponent).getTypeBanError()) {
-                //     const diagnostic = {
-                //         node,
-                //         severity: 'error',
-                //         message: 'SQL查询：返回类型内部,不支持复杂类型。',
-                //     };
-                //     node.tsErrorDetail = diagnostic;
-                //     diagnostics.push(diagnostic);
-                // }
+            yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), ([node, value]) => {
                 if (node instanceof concepts_1.OqlQueryComponent) {
                     // 自动推导情况
                     const typeAnnotation = (0, formatTsUtils_1.type2TypeAnnotation)(node.__nodeType);
@@ -2084,7 +1903,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                         }
                     }
                 }
-                if (node instanceof concepts_1.Return || node instanceof concepts_1.Variable) {
+                else if (node instanceof concepts_1.Return || node instanceof concepts_1.Variable) {
                     const nodeTypeName = node.concept === 'Return' ? '输出参数' : '局部变量';
                     if (!node.typeAnnotation && !node.__TypeAnnotation) {
                         let used = false;
@@ -2138,7 +1957,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                         }
                     }
                 }
-                if (node instanceof concepts_1.Param) {
+                else if (node instanceof concepts_1.Param) {
                     const fileSourceCode = this.getNodeCode(fileNode, value);
                     if (fileSourceCode.includes('|') && fileSourceCode.includes('.metadataTypes.')) {
                         const typeAnnotation = node.typeAnnotation.toJSON();
@@ -2158,7 +1977,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             });
         }
         else if (fileNode instanceof concepts_1.Process) {
-            fileNode?.sourceMap.forEach((value, node) => {
+            yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), ([node, value]) => {
                 this.checkNodeError(node, diagnostics);
             });
         }
@@ -2539,9 +2358,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
         return tInterface instanceof concepts_1.AuthInterface;
     }
     /* 接口导入查找 */
-    existStructureFix(semanticDiagnostics, node, that) {
+    *existStructureFix(semanticDiagnostics, node, that) {
         let module;
-        semanticDiagnostics.map((diag) => {
+        yield* utils.wrapForEachToGenerator(semanticDiagnostics, (diag) => {
             const minRange = this._findMinRange(diag, node);
             if (diag.text?.includes('has no exported member named')) {
                 if (minRange.node instanceof concepts_1.Logic) {
@@ -2571,7 +2390,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 }
                 return null;
             }
-            return diag;
         });
         if (actionArr.length) {
             if (timer)
@@ -2599,45 +2417,43 @@ let NaslServer = NaslServer_1 = class NaslServer {
      * @param fileNode 页面节点
      * @returns 处理后的结果
      */
-    _resolveDiagnostic(diagnostic, fileNode, record) {
+    *_resolveDiagnosticWithGenerator(diagnostic, fileNode, record) {
         // 拓展模块中的翻译先过滤掉，因为有错用户也不能修改
         if ((fileNode.module || fileNode.connector) && !(fileNode instanceof concepts_1.ConfigProperty)) {
             return;
         }
-        // 过滤掉java依赖库的报错
-        // if ('compilerInfoMap' in fileNode && (fileNode as any).compilerInfoMap?.java) {
-        //     return;
-        // }
         if (fileNode.concept === 'OverriddenLogic' && diagnostic.text === `'__LogicEmpty' is declared but its value is never read.`) {
             return;
         }
-        const minRange = this._findMinRange(diagnostic, fileNode);
+        const minRange = yield* this._findMinRangeWithGenerator(diagnostic, fileNode);
         const tsErrorDetail = {
             severity: diagnostic.category === 'error' ? 'error' : 'warning',
             message: (0, translator_2.translateDiagnosticMessage)(diagnostic.text),
             // 保留原来的内容方便查询一些问题
             originalDiagnostic: diagnostic,
         };
+        yield;
         let result;
         if (minRange) {
             // 节点的error要置为true
             result = (0, translator_2.naslNodeTranslateMessage)(minRange, tsErrorDetail);
+            yield;
         }
         else {
             // 没找到节点， 先把问题暴露出来
             result = tsErrorDetail;
         }
-        if (result)
+        if (result) {
             result.id = record.filePath + (result ? JSON.stringify({ start: result.originalDiagnostic.start, end: result.originalDiagnostic.end }) : '');
+        }
         return result;
     }
     /**
-     * 通过节点诊断反过来查找节点
-     * @param diagnostic 诊断信息
-     * @param fileNode 文件级别节点
-     * @returns 找到的节点
+     * 查找节点
+     *
+     * @description 生成器原型函数
      */
-    _findMinRange(diagnostic, fileNode) {
+    *_findMinRangeWithGenerator(diagnostic, fileNode) {
         let minRange;
         const { sourceMap } = fileNode;
         // 是否找到了行内准确的，是的话，就不走多行的
@@ -2699,15 +2515,26 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     }
                 }
             }
+            yield;
         }
         if (!minRange) {
             if (fileNode instanceof concepts_1.View) {
                 return { node: fileNode, item: sourceMap.get(fileNode) };
             }
-            console.log(minRange, '需要特殊看下，为什么没找到内容-------------');
+            if (process.env.NODE_ENV === 'development') {
+                console.log(minRange, '需要特殊看下，为什么没找到内容-------------');
+            }
         }
         return minRange;
     }
+    /**
+     * 查找节点
+     *
+     * @description 同步模式
+     */
+    _findMinRange(...args) {
+        return utils.runGeneratorSync(this._findMinRangeWithGenerator(...args));
+    }
     /**
      * 查看当前节点是不是有引用
      * @param node 节点
@@ -2749,7 +2576,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             // Conenctor 虽为 Module 的子类，但是具体引用逻辑与Module 并不一致，因此这边单独处理
             // 由于 在与后端定义 Connector Namespace 前缀时， Logics 相关定义为 connector,
             // 其余定义为 extension, 因此这边查找引用时，需要分别查找并去重复
-            // 这里选择 logic 与 interface 作为 查找源，因为一个 Connector 必定至少含有一个 logic 和 interface  
+            // 这里选择 logic 与 interface 作为 查找源，因为一个 Connector 必定至少含有一个 logic 和 interface
             const logicList = node.namespaces.find((ns) => ns.logics.length > 0)?.logics || [];
             const interfaceList = node.interfaces;
             const moduleName = fileNode.getEmbeddedFilePath();
@@ -3795,6 +3622,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
             return { fileNode: null };
         let { sourceMap } = node;
         let fileNode = node;
+        // 连接器 操作，上层结构是 Namespace， Namespace 并无含义，因此需要过滤掉
+        const isConnectorLogic = node.getAncestor('Connector') && node.concept === 'Logic' && node.parentNode instanceof concepts_1.Namespace;
         // 如果没有sourceMap,就继续向上找 ,或者到module结束
         // 如果 节点找到 app 或者module 停止 或者entity找到DataSource为止
         // 如果当前节点是view就不要向上查找了
@@ -3807,7 +3636,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             !(fileNode.parentNode instanceof concepts_1.DataSource) &&
             !(fileNode.parentNode instanceof concepts_1.Frontend) &&
             !(fileNode.parentNode instanceof concepts_1.Backend) &&
-            !(fileNode.parentNode instanceof concepts_1.Namespace) &&
+            !isConnectorLogic &&
             !(fileNode instanceof concepts_1.View) &&
             !(fileNode instanceof concepts_1.ConfigProperty)) {
             fileNode = fileNode.parentNode;
@@ -3921,6 +3750,10 @@ let NaslServer = NaslServer_1 = class NaslServer {
             }
             return concepts_1.TypeAnnotation.createPrimitive(type);
         }
+        // 如果是一元表达式，那么就是布尔值
+        if (node instanceof concepts_1.UnaryExpression) {
+            return concepts_1.TypeAnnotation.createPrimitive('Boolean');
+        }
         // 这些原有类型的 比较的 返回值肯定就是布尔值，就不去调用ls
         if (node instanceof concepts_1.BinaryExpression && ['==', '!=', '>', '<', '>=', '<='].includes(node.operator)) {
             return concepts_1.TypeAnnotation.createPrimitive('Boolean');
@@ -3956,26 +3789,25 @@ let NaslServer = NaslServer_1 = class NaslServer {
         }
     }
     /**
-     * 获取传入节点的TypeAnnotation
-     * @param nodes {filePath: string, node: BaseNode, item: SourceMapItem}
-     * @returns Map<BaseNode, TypeAnnotation | { typeAnnotation: TypeAnnotation, option: any }>
-     * 普通的TypeAnnotation，额外的可能携带 option
-     * 这里会处理callloigc callinterface 和 callfuntion 的 argment的参数一起携带回去，
-     * 也就是说如果 只传入了这个也会一起返回argment的节点，所以返回map最好去get结果
+     * 获取传入节点的 TypeAnnotation
+     *
+     * @description 生成器模式原型
      */
-    async getQuickInfoNodesTypeMap(nodes, lotFlag) {
+    *_getQuickInfoNodesTypeMapWithGenerator(nodes) {
+        const self = this;
         const args = [];
         // 要通过自己或者依赖关系拿的
         const getFromOthers = new Map();
         // 总共要返回出去的
         const types = new Map();
         const newQuickInfoNodes = [];
-        await utils.timeSlicing(nodes, (itemDetail) => {
+        yield* utils.wrapForEachToGenerator(nodes, function* getQuickInfoPosition(itemDetail, index) {
             const { node, filePath, item } = itemDetail;
             // 先按照顺序占位
             types.set(node, null);
             // 获取已知节点类型的类型
-            const nodeTypeAnnotation = this.getCurrentNodeKnownTypeAnnotation(node);
+            const nodeTypeAnnotation = self.getCurrentNodeKnownTypeAnnotation(node);
+            yield;
             if (nodeTypeAnnotation) {
                 types.set(node, nodeTypeAnnotation);
                 return;
@@ -3995,7 +3827,6 @@ let NaslServer = NaslServer_1 = class NaslServer {
             }
             if (![
                 'Identifier',
-                'UnaryExpression',
                 'BinaryExpression',
                 'CallLogic',
                 'CallFunction',
@@ -4023,12 +3854,13 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 offset: (0, translator_1.lsp2tspNumber)(item.start.character),
             };
             const getCode = (range) => {
-                return this.tsFiles.get(filePath)?.slice(range.start.offset, range.end.offset) ?? '';
+                return self.tsFiles.get(filePath)?.slice(range.start.offset, range.end.offset) ?? '';
             };
             // 位置计算偏移
             if ('getQuickInfoOffset' in node) {
                 Object.assign(fileDetail, node.getQuickInfoOffset(fileDetail, getCode(item)));
             }
+            yield;
             // 位置计算偏移2
             // TODO: 之后考虑把这些偏移量计算全都挪到节点内部去
             if (node.concept === 'BinaryExpression' ||
@@ -4108,9 +3940,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 fileDetail.offset += 10;
             }
             args.push(fileDetail);
-        }, { minimum: 1000 });
-        const resultMap = (await this.getNaslNodeTypeFull(args))?.response;
-        await utils.timeSlicing(args, ({ file, line, offset }, index) => {
+        });
+        const resultMap = (yield this.getNaslNodeTypeFull(args))?.response;
+        yield* utils.wrapForEachToGenerator(args, ({ file, line, offset }, index) => {
             const item = resultMap?.[file]?.[line]?.[offset];
             const itemType = item?.[0]?.nodeType;
             const nodeTypeAnnotation = (0, formatTsUtils_1.type2TypeAnnotation)(itemType);
@@ -4123,8 +3955,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
             else {
                 delete node.__nodeType;
             }
-        }, { minimum: 100 });
-        await utils.timeSlicing(Array.from(getFromOthers.entries()), ([node]) => {
+        });
+        yield* utils.wrapIteratorToGenerator(getFromOthers.entries(), function* ([node]) {
             if (node instanceof concepts_1.Assignment) {
                 if (!types.get(node.left)) {
                     types.set(node.left, types.get(node.right));
@@ -4132,7 +3964,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             }
             else if (node instanceof concepts_1.Argument) {
                 // 如果Argument，但是没可以用的类型，就用原来logic的参数类型
-                const argType = this.getArgumentTypeAnnotation(node, newQuickInfoNodes, types);
+                const argType = yield* self.getArgumentTypeAnnotationWithGenerator(node, newQuickInfoNodes, types);
                 types.set(node, argType);
             }
             else if (node instanceof concepts_1.MatchCase) {
@@ -4145,8 +3977,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     }
                 }
             }
-        }, { minimum: 100 });
-        await utils.timeSlicing(Array.from(types.entries()), ([node, value]) => {
+        });
+        yield* utils.wrapIteratorToGenerator(types.entries(), ([node, value]) => {
             try {
                 // 因为node可能是经过处理的TypeAnnotation
                 node.__isCorrectTypeAnnotation = true;
@@ -4181,9 +4013,15 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 //   console.log(err);
                 // }
             }
-        }, { minimum: 100 });
+        });
         return types;
     }
+    /**
+     * 获取传入节点的 TypeAnnotation
+     */
+    getQuickInfoNodesTypeMap(nodes, flag) {
+        return utils.runGeneratorAsync(this._getQuickInfoNodesTypeMapWithGenerator(nodes));
+    }
     // 全量标注并且返回json
     async getNaslAnnotatedJSON(app, releaseFlag) {
         if (this.changeStackList?.length) {
@@ -4206,6 +4044,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         const typesMap = await this.getQuickInfoNodesTypeMap(nodes, true);
         console.timeEnd('全量标注');
         const json = app.toJSON();
+        console.log(json);
         if (releaseFlag) {
             // 全量标注后对json进行一些修改，为了服务端翻译处理
             this.annotationToJson(typesMap, json);
@@ -4213,27 +4052,29 @@ let NaslServer = NaslServer_1 = class NaslServer {
         return json;
     }
     // 增量标注
-    async IncrementalAnnotationJSON(records) {
+    *_incrementalAnnotationJSONWithGenerator(records) {
         console.time('增量标注');
         const nodes = [];
-        records.forEach((record) => {
-            const fileNode = this.file2NodeMap.get(record.filePath);
-            if (!fileNode)
+        const self = this;
+        yield* utils.wrapForEachToGenerator(records, function* findNodePosition(record) {
+            const fileNode = self.file2NodeMap.get(record.filePath);
+            if (!fileNode) {
                 return;
+            }
             record.id = fileNode.id;
             record.node = fileNode;
-            if (!['Structure', 'DataSource', 'Entity', 'Enum', 'Role', 'MetadataType'].includes(fileNode.concept)) {
-                fileNode.sourceMap &&
-                    fileNode.sourceMap.forEach((item, nodeItem) => {
-                        nodes.push({
-                            filePath: record.filePath,
-                            node: nodeItem,
-                            item,
-                        });
-                    });
+            if (['Structure', 'DataSource', 'Entity', 'Enum', 'Role', 'MetadataType'].includes(fileNode.concept) || !fileNode.sourceMap) {
+                return;
             }
+            yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), ([nodeItem, item]) => {
+                nodes.push({
+                    filePath: record.filePath,
+                    node: nodeItem,
+                    item,
+                });
+            });
         });
-        await this.getQuickInfoNodesTypeMap(nodes);
+        yield* this._getQuickInfoNodesTypeMapWithGenerator(nodes);
         console.timeEnd('增量标注');
     }
     annotationToJson(typesMap, json) {
@@ -4241,6 +4082,12 @@ let NaslServer = NaslServer_1 = class NaslServer {
             // 如果节点本身有类型就不去在塞一遍了
             // 有值而且没有类型再去设置
             // 但是Identifier 和 MemberExpression 都用标注出来的因为本身是变量，有类型也需要覆盖一下
+            if (value && (node instanceof concepts_1.Argument) && node.getAncestor('Connector')?.concept === 'Connector') {
+                const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+                if (jsonNode) {
+                    jsonNode.typeAnnotation = value?.toJSON();
+                }
+            }
             if (value && (!node.typeAnnotation || node instanceof concepts_1.Identifier || node instanceof concepts_1.MemberExpression)) {
                 const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
                 if (jsonNode) {
@@ -4353,7 +4200,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
      * 如果内部表达式的，就用表达式的，如果没有就试试用默认值的
      * 获取logic的默认值和原来Arg的类型和默认值对应
      */
-    getArgumentTypeAnnotation(node, QuickInfoNodes, types) {
+    *getArgumentTypeAnnotationWithGenerator(node, QuickInfoNodes, types) {
         // 直接复用内部expression的type类型
         if (node.parentNode instanceof concepts_1.CallLogic &&
             node.parentNode.calleeNamespace?.includes('entities') &&
@@ -4368,6 +4215,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     return nodeTypeAnnotation;
                 }
             }
+            yield;
         }
         // 获取返回值结果里找到父级的callLogic || CallInterface的类型填充进去Argument
         const App = node.app;
@@ -4380,6 +4228,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         }
         // 用户自己声明的用用户的
         const callObj = App.findNodeByCompleteName(`${parent.calleeNamespace}.${parent.calleeName}`);
+        yield;
         const index = parent.arguments.indexOf(node);
         const param = callObj?.params?.[index] || {};
         // 取出参数的类型
@@ -4640,7 +4489,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 const fileNodeChildren = [...fileNode.views, ...fileNode.variables];
                 for (let i = 0; i < fileNodeChildren.length; i++) {
                     const fileNodeItem = fileNodeChildren[i];
-                    const result = fileNodeItem.toEmbeddedTSFile();
+                    const result = await utils.timeSlicingWithGenerator(fileNodeItem.toEmbeddedTSFile());
                     fileNodeItem.sourceMap = result.sourceMap;
                     if (action === 'create') {
                         await this.handleChange(fileNodeItem, fileNodeItem, result, action);
@@ -4665,7 +4514,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 const fileNodeChildren = fileNode.children;
                 for (let i = 0; i < fileNodeChildren.length; i++) {
                     const fileNodeItem = fileNodeChildren[i];
-                    const result = fileNodeItem.toEmbeddedTSFile();
+                    const result = await utils.timeSlicingWithGenerator(fileNodeItem.toEmbeddedTSFile());
                     fileNodeItem.sourceMap = result.sourceMap;
                     if (action === 'create') {
                         await this.handleChange(fileNodeItem, fileNodeItem, result, action);
@@ -4691,8 +4540,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     isChangeInterface = true;
                 }
                 const module = targetNode;
-                const results = [];
-                this.contentToFile(module, results);
+                const results = await utils.timeSlicingWithGenerator(this.contentToFile(module));
                 for (let i = 0; i < results.length; i++) {
                     const result = results[i];
                     const node = this.file2NodeMap.get(result.filePath);
@@ -4720,7 +4568,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             if (fileNode instanceof concepts_1.DataSource) {
                 fileNode.entities.forEach(async (entity) => {
                     try {
-                        const result = entity.toEmbeddedTSFile();
+                        const result = await utils.timeSlicingWithGenerator(entity.toEmbeddedTSFile());
                         const parentPath = oldpath.replace('.ts', '/');
                         const currentOldPath = `${parentPath}/entities/${entity.name}.ts`;
                         // 因为重命名这里只有当前修改父级的 旧名称, 所以他的子集也要根据旧名称去查依赖 更新内容
@@ -4736,9 +4584,35 @@ let NaslServer = NaslServer_1 = class NaslServer {
     async receiveHandleChange($event) {
         this.singleFileChangeIng = true;
         // 行为
-        const { action } = $event;
+        const { action, oldObject = {}, object = {} } = $event;
+        // 根据行为跳过更新文件
+        // 如果更新国际化key，不需要修改ts文件
+        if (Object.keys(object || {}).length === 1 && Object.keys(oldObject).length === 1) {
+            if (object.i18nKey && !oldObject.i18nKey) {
+                return;
+            }
+            else if (object.i18nInfo && !oldObject.i18nInfo) {
+                return;
+            }
+            else if (!object.i18nKey && oldObject.i18nKey) {
+                // 撤销重做 也跳过更新
+                return;
+            }
+            else if (!object.i18nInfo && oldObject.i18nInfo) {
+                // 撤销重做 也跳过更新
+                return;
+            }
+        }
         const targetNode = $event.target;
         console.log(targetNode, 'targetNode');
+        // 连接器namespace 没有真实文件，不需要走删除
+        if (targetNode instanceof concepts_1.Namespace && targetNode.parentNode instanceof concepts_1.Connector) {
+            return;
+        }
+        // 连接器本身没有真实文件，也不需要删除
+        if (targetNode instanceof concepts_1.Connector) {
+            return;
+        }
         // Connection 相关配置的更新不需要写入文件
         // i18nInfo 更新不需要写入文件
         if (targetNode?.parentNode instanceof concepts_1.Connection || targetNode instanceof concepts_1.I18nInfo) {
@@ -4758,18 +4632,19 @@ let NaslServer = NaslServer_1 = class NaslServer {
             }
             return;
         }
+        // debugger;
         if (process.env.NODE_ENV === 'development') {
             console.time('重新生成 TS 文件');
         }
-        // 部分节点如 Namespace 可能不存在对应的方法
-        const result = fileNode?.toEmbeddedTSFile();
+        const fileTsPath = fileNode.getEmbeddedFilePath();
+        const result = await utils.timeSlicingWithGenerator(fileNode.toEmbeddedTSFile());
         if (process.env.NODE_ENV === 'development') {
             console.timeEnd('重新生成 TS 文件');
-            console.log('重新生成 TS 文件', fileNode.getEmbeddedFilePath());
+            console.log('重新生成 TS 文件', fileTsPath);
         }
         // 当前操作的节点
         // 如果当前没有生成tsFile
-        if (!result) {
+        if (!result.sourceMap) {
             return;
         }
         // 修改触发修改文件
@@ -4844,9 +4719,6 @@ __decorate([
 __decorate([
     (0, decorators_1.withQueueExecute)('annotation')
 ], NaslServer.prototype, "getNaslAnnotatedJSON", null);
-__decorate([
-    (0, decorators_1.withQueueExecute)('annotation')
-], NaslServer.prototype, "IncrementalAnnotationJSON", null);
 NaslServer = NaslServer_1 = __decorate([
     sentry_1.sentryMonitorNaslServer
 ], NaslServer);