@lcap/nasl 3.3.3-beta.5 → 3.3.3-beta.7

package/src/concepts/Namespace__.ts

@@ -2040,9 +2040,12 @@ export class Namespace extends BaseNode {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -2093,9 +2096,12 @@ export class Namespace extends BaseNode {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -2146,9 +2152,12 @@ export class Namespace extends BaseNode {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -2199,9 +2208,12 @@ export class Namespace extends BaseNode {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -2252,9 +2264,12 @@ export class Namespace extends BaseNode {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -2305,9 +2320,12 @@ export class Namespace extends BaseNode {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -2358,9 +2376,12 @@ export class Namespace extends BaseNode {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -2411,9 +2432,12 @@ export class Namespace extends BaseNode {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -2489,9 +2513,12 @@ export class Namespace extends BaseNode {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -2542,9 +2569,12 @@ export class Namespace extends BaseNode {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -2595,9 +2625,12 @@ export class Namespace extends BaseNode {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;

package/src/concepts/NewComposite__.ts

@@ -1,4 +1,14 @@
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  indent,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import MemberExpression from './MemberExpression__';
 import StructureProperty from './StructureProperty__';
@@ -688,9 +698,12 @@ export class NewComposite extends LogicItem {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -741,9 +754,12 @@ export class NewComposite extends LogicItem {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -794,9 +810,12 @@ export class NewComposite extends LogicItem {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -847,9 +866,12 @@ export class NewComposite extends LogicItem {
         const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((t as any)[parentKey] === n) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
       }
     }
     return params;
@@ -1216,29 +1238,30 @@ export class NewComposite extends LogicItem {
     return code;
   }
 
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
     const indent0 = indent(state?.tabSize || 0);
     const indent1 = indent((state?.tabSize || 0) + 1);
     const indent2 = indent((state?.tabSize || 0) + 2);
     const indent3 = indent((state?.tabSize || 0) + 3);
     let code = '';
-    if (!this.typeAnnotation) {
+    if (!self.typeAnnotation) {
       code += '__IDENTIFIER__';
-    } else if (this.typeAnnotation.typeKind !== 'anonymousStructure') {
+    } else if (self.typeAnnotation.typeKind !== 'anonymousStructure') {
       const rightMap = new Map();
       code += `${indent0}(() => { \n`;
       // 提供sourcemap，获取类型标注和上下文可选变量
-      this.rights.forEach((right) => {
+      yield* wrapForEach(self.rights, function* warpForEachGenerator(right) {
         code += indent1;
-        rightMap.set(right.expression, right.expression.toEmbeddedTS(shiftState(state, code, { inline: true })));
+        rightMap.set(right.expression, yield* right.expression.toEmbeddedTS(shiftState(state, code, { inline: true })));
         code += rightMap.get(right.expression);
         code += ';\n';
         if (right.members?.length) {
           code += indent2;
         }
-        right.members.forEach((member) => {
-          rightMap.set(member, member.toEmbeddedTS(shiftState(state, code, { inline: true })));
+        yield* wrapForEach(right.members, function* warpForEachGenerator(member) {
+          rightMap.set(member, yield* member.toEmbeddedTS(shiftState(state, code, { inline: true })));
           code += rightMap.get(member);
           code += '; ';
         });
@@ -1246,93 +1269,92 @@ export class NewComposite extends LogicItem {
       });
       // 方便ts报错检查
       code += `${indent1}function __newComposite() {\n`;
-      const { typeAnnotation } = this;
+      const { typeAnnotation } = self;
       if (
         ['nasl.ui', 'nasl.interface', 'nasl.http'].includes(typeAnnotation.typeNamespace) &&
         typeAnnotation.typeKind === 'generic'
       ) {
         code += `${indent2}let __obj = new ${typeAnnotation.typeNamespace}.${typeAnnotation.typeName}`;
         code += '({';
-        this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
+        yield* wrapForEach(self.assignmentLines, function* warpForEachGenerator({ leftIndex, rightIndex }) {
           const leftSecondIndex = leftIndex[1];
           const [rightFirst, rightSecond] = [rightIndex[0], rightIndex[1]];
-          const leftItem = this.properties[leftSecondIndex];
+          const leftItem = self.properties[leftSecondIndex];
           const rightItem =
             rightSecond !== undefined
-              ? this.rights[rightFirst].members[rightSecond]
-              : this.rights[rightFirst].expression;
+              ? self.rights[rightFirst].members[rightSecond]
+              : self.rights[rightFirst].expression;
           const rightTs = rightMap.get(rightItem);
-          code += `${leftItem.toEmbeddedTS(shiftState(state, code, { inline: true }))}:`;
+          code += `${yield* leftItem.toEmbeddedTS(shiftState(state, code, { inline: true }))}:`;
           code += `${['__IDENTIFIER__', '__IDENTIFIER__()'].includes(rightTs) ? 'null' : rightMap.get(rightItem)},\n `;
         });
         code += '})\n';
       } else {
         code += `${indent2}let __obj = nasl.util.New<`;
-        code += this.typeAnnotation.toEmbeddedTS(shiftState(state, code, { inline: true }));
+        code += yield* self.typeAnnotation.toEmbeddedTS(shiftState(state, code, { inline: true }));
         code += `>();\n`;
       }
       // 是否是左边的顶层连线
-      const leftTopIndex = this.assignmentLines.findIndex(({ leftIndex }) => leftIndex[1] === undefined);
+      const leftTopIndex = self.assignmentLines.findIndex(({ leftIndex }) => leftIndex[1] === undefined);
       if (leftTopIndex !== -1) {
-        const { rightIndex } = this.assignmentLines[leftTopIndex];
+        const { rightIndex } = self.assignmentLines[leftTopIndex];
         const rightExpression =
           rightIndex[1] !== undefined
-            ? this.rights[rightIndex[0]].members[rightIndex[1]]
-            : this.rights[rightIndex[0]].expression;
-        code += `__obj = ${rightExpression.toEmbeddedTS(shiftState(state, code, { inline: true }))};`;
+            ? self.rights[rightIndex[0]].members[rightIndex[1]]
+            : self.rights[rightIndex[0]].expression;
+        code += `__obj = ${yield* rightExpression.toEmbeddedTS(shiftState(state, code, { inline: true }))};`;
         code += '\n';
       } else {
         // 左侧properties的identifier的类型标注
         code += `${indent2}const { `;
-        this.properties.forEach((item, index) => {
-          code += item.toEmbeddedTS(shiftState(state, code, { inline: true }));
-          if (index < this.properties.length - 1) code += ', ';
+        yield* wrapForEach(self.properties, function* warpForEachGenerator(item, index) {
+          code += yield* item.toEmbeddedTS(shiftState(state, code, { inline: true }));
+          if (index < self.properties.length - 1) code += ', ';
         });
         code += ' } = __obj;\n';
-        this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
+        yield* wrapForEach(self.assignmentLines, function* warpForEachGenerator({ leftIndex, rightIndex }) {
           const leftSecondIndex = leftIndex[1];
           const [rightFirst, rightSecond] = [rightIndex[0], rightIndex[1]];
-          const leftItem = this.properties[leftSecondIndex];
+          const leftItem = self.properties[leftSecondIndex];
           const rightItem =
             rightSecond !== undefined
-              ? this.rights[rightFirst].members[rightSecond]
-              : this.rights[rightFirst].expression;
+              ? self.rights[rightFirst].members[rightSecond]
+              : self.rights[rightFirst].expression;
           const rightTs = rightMap.get(rightItem);
           code += `${indent2}nasl.core.compareNew(`;
           code += `${['__IDENTIFIER__', '__IDENTIFIER__()'].includes(rightTs) ? 'null' : rightMap.get(rightItem)}, `;
-          code += `${leftItem.toEmbeddedTS(shiftState(state, code, { inline: true }))});\n`;
+          code += `${yield* leftItem.toEmbeddedTS(shiftState(state, code, { inline: true }), { isNewcomposite: true })});\n`;
         });
       }
       code += `${indent2}return __obj;\n`;
       code += `${indent1}};\n`;
-
       code += `${indent1}return __newComposite();\n`;
       code += `${indent0}})()`;
     } else {
       const nameMap = new Map();
       const rightMap = new Map();
-      this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
+      yield* wrapForEach(self.assignmentLines, function* warpForEachGenerator({ leftIndex, rightIndex }) {
         const leftSecondIndex = leftIndex[1];
         const [rightFirst, rightSecond] = [rightIndex[0], rightIndex[1]];
-        const leftItem = this.properties[leftSecondIndex];
+        const leftItem = self.properties[leftSecondIndex];
         const rightItem =
-          rightSecond !== undefined ? this.rights[rightFirst].members[rightSecond] : this.rights[rightFirst].expression;
+          rightSecond !== undefined ? self.rights[rightFirst].members[rightSecond] : self.rights[rightFirst].expression;
         nameMap.set(leftItem.name, rightItem);
         rightMap.set(rightItem, null);
       });
       code += `${indent0}(() => { \n`;
       // 提供sourcemap，获取类型标注和上下文可选变量
-      this.rights.forEach((right) => {
+      yield* wrapForEach(self.rights, function* warpForEachGenerator(right) {
         code += indent1;
-        let ts = right.expression.toEmbeddedTS(shiftState(state, code, { inline: true }));
+        let ts = yield* right.expression.toEmbeddedTS(shiftState(state, code, { inline: true }));
         if (rightMap.has(right.expression)) rightMap.set(right.expression, ts);
         code += ts;
         code += ';\n';
         if (right.members?.length) {
           code += indent2;
         }
-        right.members.forEach((member) => {
-          ts = member.toEmbeddedTS(shiftState(state, code, { inline: true }));
+        yield* wrapForEach(right.members, function* warpForEachGenerator(member) {
+          ts = yield* member.toEmbeddedTS(shiftState(state, code, { inline: true }));
           if (rightMap.has(member)) rightMap.set(member, ts);
           code += ts;
           code += '; ';
@@ -1341,9 +1363,9 @@ export class NewComposite extends LogicItem {
       });
       // 方便ts报错检查
       code += `${indent1}function __newComposite() {\n`;
-      this.properties.forEach((property, index) => {
+      yield* wrapForEach(self.properties, function* warpForEachGenerator(property, index) {
         const temp = `temp${index}`;
-        const propertyType = this.typeAnnotation.properties[index]?.typeAnnotation;
+        const propertyType = self.typeAnnotation.properties[index]?.typeAnnotation;
         const { name } = property;
         const rightItem = nameMap.get(name);
         const ts = rightMap.get(rightItem);
@@ -1354,9 +1376,9 @@ export class NewComposite extends LogicItem {
             code += `${indent2}let ${temp}${ts === 'null' ? ':void' : ''} = ${ts}; `;
           }
           code += `let `;
-          code += `${property.toEmbeddedTS(shiftState(state, code, { inline: true }))}: `;
+          code += `${yield* property.toEmbeddedTS(shiftState(state, code, { inline: true }))}: `;
           if (propertyType) {
-            const typeTs = propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }));
+            const typeTs = yield* propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }));
             code += typeTs;
             code += ` = ${temp};\n`;
             // 如果是字段是union类型，且赋值的是当前union允许的类型，会导致property.name类型推断成temp的类型
@@ -1367,25 +1389,23 @@ export class NewComposite extends LogicItem {
           }
         } else if (propertyType) {
           code += `${indent2}let ${property.name}: `;
-          code += `${propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }))}; `;
+          code += `${yield* propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }))}; `;
           code += `<`;
-          code += `${property.toEmbeddedTS(shiftState(state, code, { inline: true }))}`;
+          code += `${yield* property.toEmbeddedTS(shiftState(state, code, { inline: true }))}`;
           code += `>${property.name};\n`;
         } else {
           code += `${indent2}const `;
-          code += property.toEmbeddedTS(shiftState(state, code, { inline: true }));
+          code += yield* property.toEmbeddedTS(shiftState(state, code, { inline: true }));
           code += ';\n';
         }
       });
       code += `${indent2}return {\n`;
-      this.properties.forEach((property) => {
+      yield* wrapForEach(self.properties, function* warpForEachGenerator(property) {
         code += `${indent3}${property.name},\n`;
       });
       code += `${indent3}__name: "AStructure_${genHash(JSON.stringify(this))}" as const,\n`;
       code += `${indent2}}\n`;
-
       code += `${indent1}};\n`;
-
       code += `${indent1}return __newComposite();\n`;
       code += `${indent0}})()`;
     }
@@ -1412,7 +1432,8 @@ export class NewComposite extends LogicItem {
     return code;
   }
 
-  getInitCode(state?: TranslatorState): string {
+  *getInitCode(state?: TranslatorState) {
+    const self = this;
     const indent1 = indent((state?.tabSize || 0) + 1);
     const indent2 = indent((state?.tabSize || 0) + 2);
     const indent3 = indent((state?.tabSize || 0) + 3);
@@ -1420,7 +1441,7 @@ export class NewComposite extends LogicItem {
     let code = '';
     const nameMap = new Map();
     const rightMap = new Map();
-    this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
+    yield* wrapForEach(self.assignmentLines, ({ leftIndex, rightIndex }) => {
       const leftSecondIndex = leftIndex[1];
       const [rightFirst, rightSecond] = [rightIndex[0], rightIndex[1]];
       const leftItem = this.properties[leftSecondIndex];
@@ -1431,24 +1452,26 @@ export class NewComposite extends LogicItem {
     });
     code += '(() => { ';
     // 提供sourcemap，获取类型标注和上下文可选变量
-    this.rights.forEach((right) => {
-      let ts = right.expression.toEmbeddedTS(shiftState(state, code, { inline: true }));
+    yield* wrapForEach(this.rights, function* wrapForEach(right) {
+      let ts = yield* right.expression.toEmbeddedTS(shiftState(state, code, { inline: true }));
       if (rightMap.has(right.expression)) rightMap.set(right.expression, ts);
-      right.members.forEach((member) => {
-        ts = member.toEmbeddedTS(shiftState(state, code, { inline: true }));
-        if (rightMap.has(member)) rightMap.set(member, ts);
-      });
+      for (const member of right.members) {
+        ts = yield* member.toEmbeddedTS(shiftState(state, code, { inline: true }));
+        if (rightMap.has(member)) {
+          rightMap.set(member, ts);
+        }
+      }
     });
     // 方便ts报错检查
     code += 'function __newComposite() { ';
-    this.properties.forEach((property, index) => {
+    yield* wrapForEach(this.properties, function* wrapForEach(property, index) {
       const { name } = property;
-      const propertyType = this.typeAnnotation.properties[index]?.typeAnnotation;
+      const propertyType = self.typeAnnotation.properties[index]?.typeAnnotation;
       const rightItem = nameMap.get(name);
       let ts = rightMap.get(rightItem);
-      ts = this.getForeachCode(ts);
+      ts = yield* self.getForeachCode(ts);
       if (propertyType) {
-        code += `const ${name}: ${propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }))}; `;
+        code += `const ${name}: ${yield* propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }))}; `;
       } else if (ts !== undefined) {
         code += `const ${name} = ${['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts) ? null : ts}; `;
       } else {
@@ -1469,7 +1492,7 @@ export class NewComposite extends LogicItem {
     return code;
   }
 
-  getNewCompositeCode(state?: TranslatorState): string {
+  *getNewCompositeCode(state?: TranslatorState) {
     const indent0 = indent(state?.tabSize || 0);
     const indent1 = indent((state?.tabSize || 0) + 1);
     const indent2 = indent((state?.tabSize || 0) + 2);
@@ -1478,42 +1501,38 @@ export class NewComposite extends LogicItem {
     const rightMap = new Map();
     code += `${indent0}(() => { \n`;
     // 提供sourcemap，获取类型标注和上下文可选变量
-    this.rights.forEach((right) => {
+    for (const right of this.rights) {
       code += indent1;
-      rightMap.set(right.expression, right.expression.toEmbeddedTS(shiftState(state, code, { inline: true })));
+      rightMap.set(right.expression, yield* right.expression.toEmbeddedTS(shiftState(state, code, { inline: true })));
       // code += rightMap.get(right.expression);
       // code += ';\n';
       if (right.members?.length) {
         code += indent2;
       }
-      right.members.forEach((member) => {
-        rightMap.set(member, member.toEmbeddedTS(shiftState(state, code, { inline: true })));
-        // code += rightMap.get(member);
-        // code += '; ';
-      });
-      // code += right.members.length ? '\n' : '';
-    });
+      for (const member of right.members) {
+        rightMap.set(member, yield* member.toEmbeddedTS(shiftState(state, code, { inline: true })));
+      }
+    }
     // 方便ts报错检查
     code += `${indent1}function __newComposite() {\n`;
     const { typeAnnotation } = this;
     if (['nasl.ui', 'nasl.interface', 'nasl.http'].includes(typeAnnotation.typeNamespace)) {
       code += `${indent2}let __obj = new ${typeAnnotation.typeNamespace}.${typeAnnotation.typeName}`;
       code += '({';
-      this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
+      for (const { leftIndex, rightIndex } of this.assignmentLines) {
         const leftSecondIndex = leftIndex[1];
         const [rightFirst, rightSecond] = [rightIndex[0], rightIndex[1]];
         const leftItem = this.properties[leftSecondIndex];
         const rightItem =
           rightSecond !== undefined ? this.rights[rightFirst].members[rightSecond] : this.rights[rightFirst].expression;
         const rightTs = rightMap.get(rightItem);
-        code += `${leftItem.toEmbeddedTS(shiftState(state, code, { inline: true }))}:`;
+        code += `${yield* leftItem.toEmbeddedTS(shiftState(state, code, { inline: true }))}:`;
         code += `${['__IDENTIFIER__', '__IDENTIFIER__()'].includes(rightTs) ? 'null' : rightMap.get(rightItem)},\n `;
-      });
+      }
       code += '})\n';
     }
     code += `${indent2}return __obj;\n`;
     code += `${indent1}};\n`;
-
     code += `${indent1}return __newComposite();\n`;
     code += `${indent0}})()`;
     return code;
@@ -1558,12 +1577,12 @@ export class NewComposite extends LogicItem {
     this.app.emit('collect:end');
   }
 
-  getForeachCode(code: string): string {
+  *getForeachCode(code: string) {
     // ForEachStatement 内部变量需要替换处理，如 item、index
     const forEachStatement = this.getAncestor('ForEachStatement') as ForEachStatement;
     if (forEachStatement && code) {
       code = code.replaceAll('\n', ' ');
-      code = new Logic().handleForEachCode(code, forEachStatement);
+      code = yield* new Logic().handleForEachCode(code, forEachStatement);
     }
     return code;
   }