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

package/out/concepts/Logic__.d.ts

@@ -1,4 +1,5 @@
-import { TranslatorState } from '../translator';
+import type { EmbeddedTSFileGenerator } from '../utils';
+import { TranslatorState, TranslatorGenerator } from '../translator';
 import ForEachStatement from './ForEachStatement__';
 import Assignment from './Assignment__';
 import BatchAssignment from './BatchAssignment__';
@@ -604,15 +605,15 @@ export declare class Logic extends BaseNode {
             path: string;
         };
     };
-    toEmbeddedTSInProcess(state?: TranslatorState, prependCode?: string, noName?: boolean, prefix?: boolean): string;
+    toEmbeddedTSInProcess(state?: TranslatorState, prependCode?: string, noName?: boolean, prefix?: boolean): TranslatorGenerator;
     toEmbeddedTSNoExport(state?: TranslatorState): string;
     get tsName(): string;
-    toEmbeddedTS(state?: TranslatorState, prefix?: string, hideDefaultValue?: boolean): string;
+    toEmbeddedTS(state?: TranslatorState, prefix?: string, hideDefaultValue?: boolean): TranslatorGenerator;
     toNaturalTS(state?: TranslatorState, prefix?: string, logicName?: string, currentNode?: BaseNode): string;
-    getRightCode(code: string, assignment: Assignment | BatchAssignment, rightNode: any): string;
+    getRightCode(code: string, assignment: Assignment | BatchAssignment, rightNode: any): Generator<any, string, any>;
     handleReplaceCode(code: string, variable: string, replaceCode: string): string;
-    handleForEachCode(code: string, forEachStatement: ForEachStatement): string;
-    handleMatchCaseCode(code: string, matchCase: MatchCase): string;
+    handleForEachCode(code: string, forEachStatement: ForEachStatement): Generator<any, string, any>;
+    handleMatchCaseCode(code: string, matchCase: MatchCase): Generator<any, string, any>;
     getNamespace(): string;
     getTsNamespace(): string;
     /**
@@ -620,11 +621,7 @@ export declare class Logic extends BaseNode {
      * @param name 一般不用传，用于 rename
      */
     getEmbeddedFilePath(name?: string): string;
-    toEmbeddedTSFile(): {
-        code: string;
-        filePath: string;
-        sourceMap: import("../translator").SourceMap;
-    };
+    toEmbeddedTSFile(): EmbeddedTSFileGenerator;
     static getDefaultOptions(): Partial<{
         body: Array<any>;
         params: Array<any>;

package/out/concepts/Logic__.js

@@ -34,6 +34,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var Logic_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Logic = void 0;
+const time_slicing_1 = require("../utils/time-slicing");
+const common_1 = require("../common");
 const FrontendLibrary__1 = require("./FrontendLibrary__");
 const translator_1 = require("../translator");
 const Namespace__1 = __importDefault(require("./Namespace__"));
@@ -42,7 +44,6 @@ const Assignment__1 = __importDefault(require("./Assignment__"));
 const Identifier__1 = __importDefault(require("./Identifier__"));
 const BindEvent__1 = __importDefault(require("./BindEvent__"));
 const BatchAssignment__1 = __importDefault(require("./BatchAssignment__"));
-const OqlQueryComponent__1 = __importDefault(require("./OqlQueryComponent__"));
 const TypeAnnotation__1 = __importDefault(require("./TypeAnnotation__"));
 const CallInterface__1 = __importDefault(require("./CallInterface__"));
 const CallLogic__1 = __importDefault(require("./CallLogic__"));
@@ -1068,54 +1069,55 @@ class Logic extends BaseNode_1.default {
             },
         };
     }
-    toEmbeddedTSInProcess(state, prependCode, noName, prefix) {
+    *toEmbeddedTSInProcess(state = (0, translator_1.createCompilerState)(), prependCode, noName, prefix) {
+        const self = this;
         let code = '';
         if (!prefix)
-            code += `${noName ? '' : `${this.name}:`} function(`;
+            code += `${noName ? '' : `${self.name}:`} function(`;
         else
-            code += `function ${this.name}(`; // 加空格会导致无法查询到引用
-        this.params.forEach((param, index) => {
-            code += param.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }), null, true);
-            if (index !== this.params.length - 1)
+            code += `function ${self.name}(`; // 加空格会导致无法查询到引用
+        yield* (0, time_slicing_1.wrapForEachToGenerator)(self.params, function* warpForEachGenerator(param, index) {
+            code += yield* param.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+            if (index !== self.params.length - 1)
                 code += ', ';
         });
         code += `) {\n`;
         code += prependCode || '';
         code += '\n';
-        this.variables.forEach((variable) => {
+        yield* (0, time_slicing_1.wrapForEachToGenerator)(self.variables, function* warpForEachGenerator(variable) {
             code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
-            code += variable.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+            code += yield* variable.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
             code += ';\n';
         });
-        this.returns.forEach((ret) => {
+        yield* (0, time_slicing_1.wrapForEachToGenerator)(self.returns, function* warpForEachGenerator(ret) {
             code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
-            code += ret.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+            code += yield* ret.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
             code += ';\n';
         });
-        if (!this.body.length && this.returns.length) {
-            code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}return ${this.returns[0].name};\n`;
+        if (!self.body.length && self.returns.length) {
+            code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}return ${self.returns[0].name};\n`;
         }
         else {
-            if (this.parentNode.type === 'ExclusiveGateway') {
-                if (this.body.length <= 1) {
+            if (self.parentNode.type === 'ExclusiveGateway') {
+                if (self.body.length <= 1) {
                     code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
                     code += 'const __LogicEmpty: any = null;';
                 }
             }
-            else if (this.body.length <= 2 &&
-                !(this.parentNode instanceof Namespace__1.default) &&
-                !(this.parentNode instanceof Process__1.default)) {
+            else if (self.body.length <= 2 &&
+                !(self.parentNode instanceof Namespace__1.default) &&
+                !(self.parentNode instanceof Process__1.default)) {
                 code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
                 code += `${(0, translator_1.indent)(state?.tabSize || 0 + 4)}const __LogicEmpty: any = null;`;
             }
-            this.body.forEach((item) => {
-                code += item.toEmbeddedTS && item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(self.body, function* warpForEachGenerator(item) {
+                code += yield* item.toEmbeddedTS?.((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 1 })) ?? (0, time_slicing_1.returnOrigin)('');
                 code += ';\n';
             });
         }
         // 在body渲染完成之后把其余的节点放到下面
-        this.playground.forEach((item) => {
-            code += item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+        yield* (0, time_slicing_1.wrapForEachToGenerator)(self.playground, function* warpForEachGenerator(item) {
+            code += yield* item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
             code += '\n';
         });
         code += `${(0, translator_1.indent)(state?.tabSize || 0 + 4)}}`;
@@ -1123,7 +1125,7 @@ class Logic extends BaseNode_1.default {
         return code;
     }
     toEmbeddedTSNoExport(state) {
-        return this.toEmbeddedTS(state, 'noExport');
+        return (0, time_slicing_1.runGeneratorSync)(this.toEmbeddedTS(state, 'noExport'));
     }
     get tsName() {
         // 来自集成中心，且是连接内部的逻辑，则认为是编辑态的，需要加上后缀
@@ -1133,35 +1135,38 @@ class Logic extends BaseNode_1.default {
         // 由于Logic name 已经是符合函数预期的，因此不再需要做格式化
         return this.name;
     }
-    toEmbeddedTS(state, prefix, hideDefaultValue) {
+    *toEmbeddedTS(state = (0, translator_1.createCompilerState)(), prefix, hideDefaultValue) {
+        const self = this;
+        // 等待 oql 查询返回内容
+        yield (0, common_1.waitOqlQueryComponentChildrenFinish)(self);
         // 如果传了不要前缀那就为空， 要不用传进来的，要是都没有就默认导出
         let code = '';
         // 用来储存默认值翻译结构是__IDENTIFIER__或者__IDENTIFIER__()的节点
         const IDENTIFIERMAP = new Set();
         if (!prefix) {
-            code += `export function ${this.tsName}`;
+            code += `export function ${self.name}`;
         }
         else if (prefix === 'noExport') {
-            code += `function ${this.tsName}`;
+            code += `function ${self.name}`;
         }
         else if (prefix === 'inObject') {
-            code += `${this.tsName}`;
+            code += `${self.name}`;
         }
-        if (this.typeParams?.length) {
+        if (self.typeParams?.length) {
             code += '<';
-            this.typeParams.forEach((typeParam, typeParamIndex) => {
-                code += typeParam.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
-                if (typeParamIndex !== this.typeParams.length - 1)
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(self.typeParams, function* warpForEachGenerator(typeParam, typeParamIndex) {
+                code += yield* typeParam.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+                if (typeParamIndex !== self.typeParams.length - 1)
                     code += ', ';
             });
             code += '>';
         }
         // 有参数长度
-        if (this.params.length) {
+        if (self.params.length) {
             code += '(';
-            this.params.forEach((param, index) => {
-                code += param.toEmbeddedTS((0, translator_1.shiftState)(state, code));
-                if (index !== this.params.length - 1)
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(self.params, function* warpForEachGenerator(param, index) {
+                code += yield* param.toEmbeddedTS((0, translator_1.shiftState)(state, code));
+                if (index !== self.params.length - 1)
                     code += ', ';
             });
             code += ')';
@@ -1172,108 +1177,87 @@ class Logic extends BaseNode_1.default {
         }
         // 需要类型推导的局部变量/返回值需要调整申明顺序
         const advanceMap = new Map();
-        const needGetSourceMapOqlList = [];
-        this.traverseChildren((el) => {
+        // const needGetSourceMapOqlList: Promise<any>[] = [];
+        yield* self.traverseChildrenGenerator(function* traverseChildrenGenerator(el) {
             if (el && (el instanceof BatchAssignment__1.default || (el instanceof Assignment__1.default && el.left?.name))) {
                 if (el instanceof Assignment__1.default) {
-                    const advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && el.left?.name === variable.name);
+                    const advanceVar = self.variables?.find((variable) => !variable.typeAnnotation && el.left?.name === variable.name);
                     if (advanceVar && !advanceMap.get(advanceVar)) {
                         advanceMap.set(advanceVar, el);
                     }
-                    const advanceRn = this.returns?.find((ret) => !ret.typeAnnotation && el.left?.name === ret.name);
+                    const advanceRn = self.returns?.find((ret) => !ret.typeAnnotation && el.left?.name === ret.name);
                     if (advanceRn && !advanceMap.get(advanceRn)) {
                         advanceMap.set(advanceRn, el);
                     }
                 }
                 else if (el instanceof BatchAssignment__1.default) {
-                    el.assignmentLines.forEach(({ leftIndex }) => {
+                    yield* (0, time_slicing_1.wrapForEachToGenerator)(el.assignmentLines, function* warpForEachGenerator({ leftIndex }) {
                         const leftCode = leftIndex.length === 1
-                            ? el.left.expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
-                            : el.left.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
-                        const advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && leftCode === variable.name);
+                            ? yield* el.left.expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
+                            : yield* el.left.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) ?? (0, time_slicing_1.returnOrigin)('');
+                        const advanceVar = self.variables?.find((variable) => !variable.typeAnnotation && leftCode === variable.name);
                         if (advanceVar && !advanceMap.get(advanceVar)) {
                             advanceMap.set(advanceVar, el);
                         }
-                        const advanceRn = this.returns?.find((ret) => !ret.typeAnnotation && leftCode === ret.name);
+                        const advanceRn = self.returns?.find((ret) => !ret.typeAnnotation && leftCode === ret.name);
                         if (advanceRn && !advanceMap.get(advanceRn)) {
                             advanceMap.set(advanceRn, el);
                         }
                     });
                 }
             }
-            // 如果有sql查询组件就需要把他们存起来
-            if (el instanceof OqlQueryComponent__1.default) {
-                if (!el.codeSourceMap) {
-                    needGetSourceMapOqlList.push(el.requestEmbeddedTS());
-                }
-            }
         });
-        if (needGetSourceMapOqlList.length) {
-            Promise.all(needGetSourceMapOqlList).then(() => {
-                // 触发一下更新重新生成代码
-                this.app?.naslServer?.embeddedTSEmitter.emit('change', {
-                    value: [
-                        {
-                            originEvent: {
-                                action: 'update',
-                                target: this,
-                            },
-                        },
-                    ],
-                });
-            });
-        }
         // 兼容 return 没有类型情况
-        if (this.returns.length && this.returns[0].typeAnnotation) {
+        if (self.returns.length && self.returns[0].typeAnnotation) {
             code += ': ';
-            code += this.returns[0].typeAnnotation?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+            code += yield* self.returns[0].typeAnnotation?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) ?? (0, time_slicing_1.returnOrigin)('');
         }
         code += '{\n';
         // 用于虚拟节点的查找引用
-        this.virtualParams &&
-            Array.isArray(this.virtualParams) &&
-            this.virtualParams.forEach((param) => {
+        if (Array.isArray(self.virtualParams)) {
+            for (const param of self.virtualParams) {
                 code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
-                code += param.toEmbeddedNameTS((0, translator_1.shiftState)(state, code, { inline: true }));
+                code += yield* param.toEmbeddedNameTS((0, translator_1.shiftState)(state, code, { inline: true }));
                 code += '\n';
-            });
-        this.variables.forEach((variable) => {
-            const ts = variable.defaultValue?.toEmbeddedTS();
+            }
+        }
+        for (const variable of self.variables) {
+            const ts = yield* variable.defaultValue?.toEmbeddedTS?.() ?? utils.returnOrigin('');
             if (['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts)) {
                 IDENTIFIERMAP.add(variable);
             }
             if (!advanceMap.get(variable)) {
                 code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
-                code += variable.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+                code += yield* variable.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
                 code += ';\n';
             }
-        });
-        this.returns.forEach((ret) => {
-            const ts = ret.defaultValue?.toEmbeddedTS();
+        }
+        for (const ret of self.returns) {
+            const ts = yield* ret.defaultValue?.toEmbeddedTS?.() ?? (0, time_slicing_1.returnOrigin)('');
             if (['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts)) {
                 IDENTIFIERMAP.add(ret);
             }
             if (!advanceMap.get(ret)) {
                 code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
-                code += ret.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+                code += yield* ret.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
                 code += ';\n';
             }
-        });
-        advanceMap.forEach((assignment, node) => {
+        }
+        yield* (0, time_slicing_1.wrapIteratorToGenerator)(advanceMap.entries(), function* warpForEachGenerator([node, assignment]) {
             // 有默认值的用默认值来推导类型, 但是如果是__IDENTIFIER__或者__IDENTIFIER__()，就不需要默认值来推导了
             if (node.defaultValue?.expression && !IDENTIFIERMAP.has(node)) {
                 code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
-                code += node.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+                code += yield* node.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
                 return;
             }
             code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}// @ts-ignore\n`;
             code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
-            code += node.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+            code += yield* node.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
             if (assignment instanceof BatchAssignment__1.default) {
-                assignment.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
+                yield* (0, time_slicing_1.wrapForEachToGenerator)(assignment.assignmentLines, function* warpForEachGenerator({ leftIndex, rightIndex }) {
                     const leftCode = leftIndex.length === 1
-                        ? assignment.left.expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
-                        : assignment.left.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+                        ? yield* assignment.left.expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
+                        : yield* assignment.left.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) ?? (0, time_slicing_1.returnOrigin)('');
                     if (leftCode === node.name) {
                         const rightNode = rightIndex.length === 1
                             ? assignment.rights[rightIndex[0]]?.expression
@@ -1282,21 +1266,21 @@ class Logic extends BaseNode_1.default {
                         if (rightNode?.typeAnnotation && !(rightNode instanceof CallQueryComponent__1.default && !rightNode.isAutoInfer())) {
                             if (rightNode.concept === 'NewComposite' && rightNode.typeAnnotation?.typeKind === 'anonymousStructure') {
                                 code += '= ';
-                                code += rightNode.getInitCode((0, translator_1.shiftState)(state, code, { inline: true })) || 'null';
+                                code += (yield* rightNode.getInitCode((0, translator_1.shiftState)(state, code, { inline: true }))) || 'null';
                             }
                             else if (rightNode.concept === 'NewComposite' && rightNode.typeAnnotation?.typeKind === 'generic') {
                                 code += '= ';
-                                code += rightNode.getNewCompositeCode((0, translator_1.shiftState)(state, code, { inline: true })) || 'null';
+                                code += (yield* rightNode.getNewCompositeCode((0, translator_1.shiftState)(state, code, { inline: true }))) || 'null';
                             }
                             else {
                                 code += ': ';
-                                code += rightNode.typeAnnotation?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) || 'null';
+                                code += yield* rightNode.typeAnnotation?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) ?? (0, time_slicing_1.returnOrigin)('null');
                             }
                         }
                         else {
                             code += ' = ';
-                            const rightCode = rightNode?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
-                            code += this.getRightCode(rightCode, assignment, rightNode);
+                            const rightCode = yield* rightNode?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) ?? (0, time_slicing_1.returnOrigin)('');
+                            code += yield* self.getRightCode(rightCode, assignment, rightNode);
                         }
                     }
                 });
@@ -1305,26 +1289,26 @@ class Logic extends BaseNode_1.default {
                 !assignment.right?.typeAnnotation) {
                 const rightNode = assignment.right;
                 code += ' = ';
-                code += rightNode.getInitCode((0, translator_1.shiftState)(state, code, { inline: true }));
+                code += yield* rightNode.getInitCode((0, translator_1.shiftState)(state, code, { inline: true }));
             }
             else if (assignment.right?.concept === 'NewComposite' &&
                 assignment.right?.typeAnnotation?.typeKind === 'anonymousStructure') {
                 const rightNode = assignment.right;
                 code += ' = ';
-                code += rightNode.getInitCode((0, translator_1.shiftState)(state, code, { inline: true }));
+                code += yield* rightNode.getInitCode((0, translator_1.shiftState)(state, code, { inline: true }));
             }
             else if (assignment.right?.concept === 'NewComposite' &&
                 assignment.right?.typeAnnotation?.typeKind === 'generic') {
                 const rightNode = assignment.right;
                 code += ' = ';
-                code += rightNode.getNewCompositeCode((0, translator_1.shiftState)(state, code, { inline: true }));
+                code += (yield* rightNode.getNewCompositeCode((0, translator_1.shiftState)(state, code, { inline: true })));
             }
             else {
                 const rightNode = assignment.right;
                 // 当右边有明确类型时，直接使用其类型。旧版本数据查询不能直接使用其 typeAnnotation
                 if (rightNode?.typeAnnotation && !(rightNode instanceof CallQueryComponent__1.default && !rightNode.isAutoInfer())) {
                     code += ': ';
-                    code += rightNode.typeAnnotation?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) || 'null';
+                    code += yield* rightNode.typeAnnotation?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) ?? (0, time_slicing_1.returnOrigin)('null');
                 }
                 else {
                     code += ' = ';
@@ -1338,19 +1322,19 @@ class Logic extends BaseNode_1.default {
                     }
                     rightCode +=
                         rightNode && rightNode.toEmbeddedTS
-                            ? rightNode.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
+                            ? yield* rightNode.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
                             : '__RIGHT__';
-                    code += this.getRightCode(rightCode, assignment, rightNode);
+                    code += yield* self.getRightCode(rightCode, assignment, rightNode);
                 }
             }
             code += ';\n';
         });
         // 参数的默认值是__IDENTIFIER__或者__IDENTIFIER__()时不赋默认值，但是需要ts翻译出来进行报错校验
         if (!hideDefaultValue) {
-            IDENTIFIERMAP.forEach((node) => {
-                code += node.defaultValue.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+            for (const node of IDENTIFIERMAP.values()) {
+                code += yield* node.defaultValue.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
                 code += '; ';
-            });
+            }
             code += '\n';
         }
         if (!this.body.length && this.returns.length) {
@@ -1358,8 +1342,8 @@ class Logic extends BaseNode_1.default {
         }
         else {
             // 如果长度小于2 并且不是虚拟节点就 加 报错，
-            if (this.body.length <= 2 && !(this.parentNode instanceof Namespace__1.default)) {
-                if (this.body.length && this.body[0].concept === 'JavaLogic') {
+            if (self.body.length <= 2 && !(self.parentNode instanceof Namespace__1.default)) {
+                if (self.body.length && self.body[0].concept === 'JavaLogic') {
                     code += '';
                 }
                 else {
@@ -1367,50 +1351,31 @@ class Logic extends BaseNode_1.default {
                     code += 'const __LogicEmpty: any = null;';
                 }
             }
-            this.body.forEach((item) => {
-                code += item.toEmbeddedTS && item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(self.body, function* warpForEachGenerator(item) {
+                code += yield* item.toEmbeddedTS?.((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 1 })) ?? (0, time_slicing_1.returnOrigin)('');
                 code += ';\n';
             });
         }
         // 在body渲染完成之后把其余的节点放到下面
-        this.playground.forEach((item) => {
-            code += item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+        yield* (0, time_slicing_1.wrapForEachToGenerator)(self.playground, function* warpForEachGenerator(item) {
+            code += yield* item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
             code += ';\n';
         });
         if (!hideDefaultValue) {
-            if (this.variables.length) {
-                code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}/* -----以下是variable的默认值草稿------ */\n`;
-            }
-            this.variables.forEach((variable) => {
-                if (variable.defaultValue) {
-                    variable.defaultValue.playground?.forEach((item) => {
-                        code += item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
-                        code += ';\n';
-                    });
+            function* setPlaygroundCode(arr, name) {
+                if (arr.length) {
+                    code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}/* -----以下是 ${name} 的默认值草稿------ */\n`;
                 }
-            });
-            if (this.returns.length) {
-                code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}/* -----以下是returns的默认值草稿------ */\n`;
-            }
-            this.returns.forEach((return_) => {
-                if (return_.defaultValue) {
-                    return_.defaultValue.playground?.forEach((item) => {
-                        code += item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
+                for (const item1 of arr) {
+                    for (const item of item1.defaultValue?.playground ?? []) {
+                        code += yield* item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
                         code += ';\n';
-                    });
+                    }
                 }
-            });
-            if (this.params.length) {
-                code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}/* -----以下是params的默认值草稿------ */\n`;
             }
-            this.params.forEach((param) => {
-                if (param.defaultValue) {
-                    param.defaultValue.playground?.forEach((item) => {
-                        code += item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
-                        code += ';\n';
-                    });
-                }
-            });
+            yield* setPlaygroundCode(self.variables, 'variables');
+            yield* setPlaygroundCode(self.returns, 'returns');
+            yield* setPlaygroundCode(self.params, 'params');
         }
         code += `${(0, translator_1.indent)(state?.tabSize || 0)}}`;
         if (prefix === 'inObject') {
@@ -1514,7 +1479,7 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
                         partialCode = item.toNaturalTS((0, translator_1.shiftState)(state, code, { tabSize: state.tabSize + 1 }));
                     }
                     else if (item.toEmbeddedTS) {
-                        partialCode = item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: state.tabSize + 1 }));
+                        partialCode = (0, time_slicing_1.runGeneratorSync)(item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: state.tabSize + 1 })));
                     }
                     if (partialCode.trim()) {
                         code += partialCode;
@@ -1530,7 +1495,7 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
         code += '\n';
         return code;
     }
-    getRightCode(code, assignment, rightNode) {
+    *getRightCode(code, assignment, rightNode) {
         code = code.replaceAll('\n', ' ');
         if (assignment instanceof Assignment__1.default && !assignment.right)
             return code;
@@ -1550,12 +1515,12 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
         // ForEachStatement 内部变量需要替换处理，如 item、index
         const forEachStatement = assignment.getAncestor('ForEachStatement');
         if (forEachStatement) {
-            code = this.handleForEachCode(code, forEachStatement);
+            code = yield* this.handleForEachCode(code, forEachStatement);
         }
         // Match 需要针对分支缩小类型范围
         const matchCase = assignment.getAncestor('MatchCase');
         if (matchCase) {
-            code = this.handleMatchCaseCode(code, matchCase);
+            code = yield* this.handleMatchCaseCode(code, matchCase);
         }
         return code;
     }
@@ -1587,33 +1552,34 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
             return fnCode;
         });
     }
-    handleForEachCode(code, forEachStatement) {
+    *handleForEachCode(code, forEachStatement) {
         const { item, index, each } = forEachStatement;
         if (code.includes(item.name)) {
-            const eachTSCode = each ? each.toEmbeddedTS() : '__IDENTIFIER__';
+            const eachTSCode = each ? yield* each.toEmbeddedTS() : '__IDENTIFIER__';
             code = this.handleReplaceCode(code, item.name, eachTSCode === '__IDENTIFIER__' ? eachTSCode : `${eachTSCode}.__get(0)`);
         }
-        if (code.includes(index.name))
+        if (code.includes(index.name)) {
             code = this.handleReplaceCode(code, index.name, 'new nasl.core.Long(0)');
+        }
         const parentForEachStatement = forEachStatement.getAncestor('ForEachStatement');
         if (parentForEachStatement) {
-            this.handleForEachCode(code, parentForEachStatement);
+            code = yield* this.handleForEachCode(code, parentForEachStatement);
         }
         return code;
     }
-    handleMatchCaseCode(code, matchCase) {
+    *handleMatchCaseCode(code, matchCase) {
         const match = matchCase.getAncestor('Match');
-        const expressionTsCode = match.expression.toEmbeddedTS();
+        const expressionTsCode = yield* match.expression.toEmbeddedTS();
         if (code.includes(expressionTsCode)) {
             let typeCode = '';
-            matchCase.patterns.forEach((pattern, index) => {
+            yield* (0, time_slicing_1.wrapForEachToGenerator)(matchCase.patterns, function* wrapForEach(pattern, index) {
                 if (pattern instanceof TypeAnnotation__1.default) {
                     if (index === 0) {
-                        typeCode += pattern.toEmbeddedTS();
+                        typeCode += yield* pattern.toEmbeddedTS();
                     }
                     else {
                         typeCode += '|';
-                        typeCode += pattern.toEmbeddedTS();
+                        typeCode += yield* pattern.toEmbeddedTS();
                     }
                 }
             });
@@ -1623,7 +1589,7 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
         }
         const parentMatchCase = match.getAncestor('MatchCase');
         if (parentMatchCase) {
-            code = this.handleMatchCaseCode(code, parentMatchCase);
+            code = yield* this.handleMatchCaseCode(code, parentMatchCase);
         }
         return code;
     }
@@ -1705,7 +1671,9 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
         if (this.module) {
             _path = `/${this.module.parentKey}/${this.module.name}`;
         }
-        else if (this.connector) {
+        // 由于 getAncestor逻辑变更导致现在在module 上也可以获取 connector ，导致之前的 else if 逻辑失效
+        // 现断层处理
+        if (this.connector) {
             // 自定义连接器 编辑态文件对应parentKey 为 connectors，
             // 稳定态文件对应parentKey 为 dependencies
             // 自定义连接器有分组的概念因此，需要做文件夹处理
@@ -1724,11 +1692,11 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
         }
         return `/embedded/${this.app.name}${_path}/logics/${name}.ts`;
     }
-    toEmbeddedTSFile() {
+    *toEmbeddedTSFile() {
         let code = `namespace ${this.getTsNamespace()} {\n`;
         const state = (0, translator_1.createCompilerState)(code, { tabSize: 1 });
         try {
-            code += this.toEmbeddedTS(state);
+            code += yield* this.toEmbeddedTS(state);
         }
         catch (err) {
             console.log(err, `有问题翻译失败:${this.getTsNamespace()}.${this.name}`);
@@ -1800,13 +1768,12 @@ ${(0, translator_1.indent)(state.tabSize)} */\n`;
             const connector = el?.getAncestor?.('Connector');
             if (['CallAuthInterface', 'CallInterface'].includes(el?.concept) && connector) {
                 const { calleeName } = el;
-                const targetInterface = connector.interfaces.find((i) => i.inter.name === calleeName);
+                const targetInterface = connector.interfaces.find((i) => i.name === calleeName);
                 if (targetInterface) {
                     const refs = await this.app?.naslServer?._isHaveRef(targetInterface);
                     // 如果只有两个引用，则必然为自身以及当前logic引用，需要删除此接口
                     if (refs?.length <= 2) {
-                        console.log('走到这里了么');
-                        targetInterface.deleteInterfaceFromExample();
+                        targetInterface.deleteInterface();
                     }
                 }
             }
@@ -1969,10 +1936,10 @@ __decorate([
     })
 ], Logic.prototype, "playground", void 0);
 __decorate([
-    (0, translator_1.withSourceMap)()
+    translator_1.withSourceMapGenerator
 ], Logic.prototype, "toEmbeddedTSInProcess", null);
 __decorate([
-    (0, translator_1.withSourceMap)()
+    translator_1.withSourceMapGenerator
 ], Logic.prototype, "toEmbeddedTS", null);
 __decorate([
     (0, translator_1.withSourceMap)()