@lcap/nasl 3.3.0-beta.0 → 3.4.0-alpha.1

package/src/concepts/NewComposite__.ts

@@ -1,21 +1,20 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { v4 as uuidv4 } from 'uuid';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import MemberExpression from './MemberExpression__';
 import StructureProperty from './StructureProperty__';
 import App from './App__';
 import { genHash } from '../generator';
-import ForEachStatement from './ForEachStatement__';
-import Logic from './Logic__';
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//================================================================================
+//= ===============================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
-import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
+import classMap from '../common/classMap';
 import TypeAnnotation from './TypeAnnotation__';
 import Identifier from './Identifier__';
 import SelectMembers from './SelectMembers__';
@@ -25,25 +24,19 @@ import LogicItem from './LogicItem__';
 /**
  * 实体/（匿名）数据结构构造器
  */
-@className
 @concept('实体/（匿名）数据结构构造器')
-// @ts-ignore
 export class NewComposite extends LogicItem {
-  /** 类名 */
-  static readonly ConceptName = 'NewComposite';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'NewComposite';
+  @property()
+  concept: 'NewComposite' = 'NewComposite';
 
   /**
    * 类型
    */
   @property('TypeAnnotation')
-  // @ts-ignore
-  typeAnnotation!: TypeAnnotation;
+  typeAnnotation: TypeAnnotation = undefined;
 
   /**
    * 左边项
@@ -85,11 +78,16 @@ export class NewComposite extends LogicItem {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<NewComposite>) {
-    source = Object.assign({}, NewComposite.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...NewComposite.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'NewComposite';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): NewComposite {
     return super.from(source, parentNode, parentKey) as NewComposite;
   }
@@ -185,6 +183,7 @@ export class NewComposite extends LogicItem {
     const excludedSet = new Set(excludedList);
     return ((this.properties as Identifier[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
+
   getIdentifierUniqueName(name = 'identifier1') {
     return utils.unique(name, this.getIdentifierExistingNames(), undefined, false);
   }
@@ -221,7 +220,7 @@ export class NewComposite extends LogicItem {
           name: this.getIdentifierUniqueName(),
         },
         this,
-        'properties',
+        'properties'
       );
     } else if (typeof options === 'string') {
       identifier = Identifier.from(
@@ -230,7 +229,7 @@ export class NewComposite extends LogicItem {
           name: options,
         },
         this,
-        'properties',
+        'properties'
       );
     } else if (options instanceof Identifier) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -243,7 +242,7 @@ export class NewComposite extends LogicItem {
           ...options,
         },
         this,
-        'properties',
+        'properties'
       );
     }
     this.properties.splice(index, 0, identifier);
@@ -338,6 +337,7 @@ export class NewComposite extends LogicItem {
     const excludedSet = new Set(excludedList);
     return ((this.rights as SelectMembers[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
+
   getSelectMembersUniqueName(name = 'selectMembers1') {
     return utils.unique(name, this.getSelectMembersExistingNames(), undefined, false);
   }
@@ -374,7 +374,7 @@ export class NewComposite extends LogicItem {
           name: this.getSelectMembersUniqueName(),
         },
         this,
-        'rights',
+        'rights'
       );
     } else if (typeof options === 'string') {
       selectMembers = SelectMembers.from(
@@ -383,7 +383,7 @@ export class NewComposite extends LogicItem {
           name: options,
         },
         this,
-        'rights',
+        'rights'
       );
     } else if (options instanceof SelectMembers) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -396,7 +396,7 @@ export class NewComposite extends LogicItem {
           ...options,
         },
         this,
-        'rights',
+        'rights'
       );
     }
     this.rights.splice(index, 0, selectMembers);
@@ -489,10 +489,9 @@ export class NewComposite extends LogicItem {
 
   getAssignmentLineExistingNames(excludedList: Array<AssignmentLine> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.assignmentLines as AssignmentLine[]) || [])
-      .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+    return ((this.assignmentLines as AssignmentLine[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
+
   getAssignmentLineUniqueName(name = 'assignmentLine1') {
     return utils.unique(name, this.getAssignmentLineExistingNames(), undefined, false);
   }
@@ -529,7 +528,7 @@ export class NewComposite extends LogicItem {
           name: this.getAssignmentLineUniqueName(),
         },
         this,
-        'assignmentLines',
+        'assignmentLines'
       );
     } else if (typeof options === 'string') {
       assignmentLine = AssignmentLine.from(
@@ -538,7 +537,7 @@ export class NewComposite extends LogicItem {
           name: options,
         },
         this,
-        'assignmentLines',
+        'assignmentLines'
       );
     } else if (options instanceof AssignmentLine) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -551,7 +550,7 @@ export class NewComposite extends LogicItem {
           ...options,
         },
         this,
-        'assignmentLines',
+        'assignmentLines'
       );
     }
     this.assignmentLines.splice(index, 0, assignmentLine);
@@ -659,7 +658,7 @@ export class NewComposite extends LogicItem {
     if (typeof options === 'string') {
       typeAnnotation = this.typeAnnotation;
       if (!typeAnnotation) {
-        throw new Error('找不到类型标注 ' + options);
+        throw new Error(`找不到类型标注 ${options}`);
       }
     } else {
       typeAnnotation = options;
@@ -668,7 +667,7 @@ export class NewComposite extends LogicItem {
   }
 
   __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const parentKey = typeAnnotation.parentKey;
+    const { parentKey } = typeAnnotation;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -707,7 +706,7 @@ export class NewComposite extends LogicItem {
     if (typeof options === 'string') {
       identifier = (this.properties as Identifier[]).find((item) => item.name === options);
       if (!identifier) {
-        throw new Error('找不到标识符 ' + options);
+        throw new Error(`找不到标识符 ${options}`);
       }
     } else {
       identifier = options;
@@ -716,7 +715,7 @@ export class NewComposite extends LogicItem {
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
+    const { parentKey } = logicItem;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -755,7 +754,7 @@ export class NewComposite extends LogicItem {
     if (typeof options === 'string') {
       selectMembers = (this.rights as SelectMembers[]).find((item) => item.name === options);
       if (!selectMembers) {
-        throw new Error('找不到选择成员 ' + options);
+        throw new Error(`找不到选择成员 ${options}`);
       }
     } else {
       selectMembers = options;
@@ -764,7 +763,7 @@ export class NewComposite extends LogicItem {
   }
 
   __removeSelectMembers(selectMembers: SelectMembers) {
-    const parentKey = selectMembers.parentKey;
+    const { parentKey } = selectMembers;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -803,7 +802,7 @@ export class NewComposite extends LogicItem {
     if (typeof options === 'string') {
       assignmentLine = (this.assignmentLines as AssignmentLine[]).find((item) => item.name === options);
       if (!assignmentLine) {
-        throw new Error('找不到赋值连线 ' + options);
+        throw new Error(`找不到赋值连线 ${options}`);
       }
     } else {
       assignmentLine = options;
@@ -812,7 +811,7 @@ export class NewComposite extends LogicItem {
   }
 
   __removeAssignmentLine(assignmentLine: AssignmentLine) {
-    const parentKey = assignmentLine.parentKey;
+    const { parentKey } = assignmentLine;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -834,10 +833,10 @@ export class NewComposite extends LogicItem {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
   get lines() {
     return this.assignmentLines.length;
   }
@@ -871,17 +870,10 @@ export class NewComposite extends LogicItem {
           for (let i = 0; i < members.length - 1; i++) {
             const { completeName } = members[i];
             const preCompleteName = members[i + 1].completeName;
-            if (
-              preCompleteName.includes(completeName) &&
-              completeName.split('.').length !== preCompleteName.split('.').length
-            )
-              rightLineSet.add(i);
+            if (preCompleteName.includes(completeName) && completeName.split('.').length !== preCompleteName.split('.').length) rightLineSet.add(i);
           }
 
-          if (
-            leftName === expression.name &&
-            (isAnnotation || expression.__TypeAnnotation.typeKind === leftTypeAnnotation.typeKind)
-          ) {
+          if (leftName === expression.name && (isAnnotation || expression.__TypeAnnotation.typeKind === leftTypeAnnotation.typeKind)) {
             const Line: AssignmentLine = new AssignmentLine({
               leftIndex: [0, leftSecondIndex],
               rightIndex: [rightFirstIndex],
@@ -914,8 +906,7 @@ export class NewComposite extends LogicItem {
     const typeAnnotationEnd = () => {
       const l = this.properties.every((item) => item.__isCorrectTypeAnnotation);
       const r = this.rights.every(
-        (right) =>
-          right.members.every((item) => item.__isCorrectTypeAnnotation) && right.expression.__isCorrectTypeAnnotation,
+        (right) => right.members.every((item) => item.__isCorrectTypeAnnotation) && right.expression.__isCorrectTypeAnnotation
       );
       count++;
       if (r && l) {
@@ -953,9 +944,7 @@ export class NewComposite extends LogicItem {
     }
     // 左边同一个属性只能有一个连线
     if (rightToLeft) {
-      newLines = newLines.filter(
-        ({ leftIndex: index }) => !(newLeftIndex[0] === index[0] && newLeftIndex[1] === index[1]),
-      );
+      newLines = newLines.filter(({ leftIndex: index }) => !(newLeftIndex[0] === index[0] && newLeftIndex[1] === index[1]));
     }
     const Line: AssignmentLine = new AssignmentLine({
       leftIndex: newLeftIndex,
@@ -987,10 +976,10 @@ export class NewComposite extends LogicItem {
       filterLine.forEach((line) => {
         if (line.rightIndex[0] > index) {
           if (line.rightIndex[1] === undefined) {
-            const newLine = { ...line?.toJSON(), rightIndex: [line.rightIndex[0] - 1] };
+            const newLine = { ...line, rightIndex: [line.rightIndex[0] - 1] };
             newLines.push(newLine as AssignmentLine);
           } else {
-            const newLine = { ...line?.toJSON(), rightIndex: [line.rightIndex[0] - 1, line.rightIndex[1]] };
+            const newLine = { ...line, rightIndex: [line.rightIndex[0] - 1, line.rightIndex[1]] };
             newLines.push(newLine as AssignmentLine);
           }
         } else {
@@ -1010,7 +999,7 @@ export class NewComposite extends LogicItem {
     });
     const selectMember = oldNode.parentNode;
     const autoConnectionIndex = this.rights.findIndex((right) => right === selectMember);
-    const newSelectMember = { ...selectMember?.toJSON?.() ?? selectMember, expression, members };
+    const newSelectMember = { ...selectMember, expression, members };
     const splitIndex = this.rights.findIndex((right) => selectMember === right);
     const newLines: AssignmentLine[] = this.assignmentLines.filter(({ rightIndex }) => rightIndex[0] !== splitIndex);
     let oldLines: AssignmentLine[] = this.assignmentLines.filter(({ rightIndex }) => rightIndex[0] === splitIndex);
@@ -1019,7 +1008,7 @@ export class NewComposite extends LogicItem {
       if (keepMembers?.has(item.completeName)) {
         const lines = this.findlines(item, selectMember);
         lines.forEach((line) => {
-          const newLine = { ...line?.toJSON()?.toJSON?.() ?? line, rightIndex: [line.rightIndex[0], index] };
+          const newLine = { ...line, rightIndex: [line.rightIndex[0], index] };
           newLines.push(newLine as AssignmentLine);
           oldLines = oldLines.filter(({ leftIndex }) => leftIndex[1] !== line.leftIndex[1]);
         });
@@ -1028,11 +1017,7 @@ export class NewComposite extends LogicItem {
 
     this.update({
       assignmentLines: newLines,
-      rights: [
-        ...this.rights.slice(0, splitIndex),
-        newSelectMember,
-        ...this.rights.slice(splitIndex + 1, this.rights.length),
-      ],
+      rights: [...this.rights.slice(0, splitIndex), newSelectMember, ...this.rights.slice(splitIndex + 1, this.rights.length)],
     });
     this.autoConnection && this.newConnection(autoConnectionIndex);
     this.app.emit('collect:end');
@@ -1050,9 +1035,7 @@ export class NewComposite extends LogicItem {
       });
     } else {
       const index1 = this.rights.findIndex((right) => right === selectMember);
-      const index2 = selectMember.members.findIndex(
-        (item: MemberExpression) => item.completeName === member.completeName,
-      );
+      const index2 = selectMember.members.findIndex((item: MemberExpression) => item.completeName === member.completeName);
       this.assignmentLines.forEach((line) => {
         if (line.rightIndex[0] === index1 && line.rightIndex[1] === index2) lines.push(line);
       });
@@ -1084,21 +1067,17 @@ export class NewComposite extends LogicItem {
     code += 'await (async () => { \n';
     if (leftTopIndex !== -1) {
       const { rightIndex } = this.assignmentLines[leftTopIndex];
-      const obj =
-        rightIndex[1] !== undefined
-          ? this.rights[rightIndex[0]].members[rightIndex[1]]
-          : this.rights[rightIndex[0]].expression;
+      const obj = rightIndex[1] !== undefined ? this.rights[rightIndex[0]].members[rightIndex[1]] : this.rights[rightIndex[0]].expression;
       code += `return ${obj};\n`;
     } else if (typeAnnotation.typeKind !== 'anonymousStructure') {
-      code += `const obj = this.$genInitFromSchema('${
-        typeAnnotation.sortedTypeKey
-      }', this.$utils['New'](${typeAnnotation.toUI(shiftState(state, code, { inline: true }))}));\n`;
+      code += `const obj = this.$genInitFromSchema('${typeAnnotation.sortedTypeKey}', this.$utils['New'](${typeAnnotation.toUI(
+        shiftState(state, code, { inline: true })
+      )}));\n`;
       this.assignmentLines.forEach(({ leftIndex, rightIndex }, index) => {
         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 rightItem = rightSecond !== undefined ? this.rights[rightFirst].members[rightSecond] : this.rights[rightFirst].expression;
         code += `obj.${leftItem.name} = ${rightItem.toUI(shiftState(state, code, { inline: true }))}`;
         code += ';\n';
       });
@@ -1112,8 +1091,7 @@ export class NewComposite extends LogicItem {
         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 rightItem = rightSecond !== undefined ? this.rights[rightFirst].members[rightSecond] : this.rights[rightFirst].expression;
         code += `obj.${leftItem.name} = ${rightItem.toUI(shiftState(state, code, { inline: true }))}`;
         code += ';\n';
       });
@@ -1132,20 +1110,15 @@ export class NewComposite extends LogicItem {
     code += 'await (async () => { \n';
     if (leftTopIndex !== -1) {
       const { rightIndex } = this.assignmentLines[leftTopIndex];
-      const obj =
-        rightIndex[1] !== undefined
-          ? this.rights[rightIndex[0]].members[rightIndex[1]]
-          : this.rights[rightIndex[0]].expression;
+      const obj = rightIndex[1] !== undefined ? this.rights[rightIndex[0]].members[rightIndex[1]] : this.rights[rightIndex[0]].expression;
       code += `return ${obj.toJS(shiftState(state, code, { inline: true }))};\n`;
     } else if (typeAnnotation.typeKind !== 'anonymousStructure') {
-      code += `const obj = this.$genInitFromSchema('${
-        typeAnnotation.sortedTypeKey
-      }', this.$utils['New'](${typeAnnotation.toJS(shiftState(state, code, { inline: true }))}));\n`;
+      code += `const obj = this.$genInitFromSchema('${typeAnnotation.sortedTypeKey}', this.$utils['New'](${typeAnnotation.toJS(shiftState(state, code, { inline: true }))}));\n`;
       const rightMap = new Map();
       this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
         const rightIndexJson = JSON.stringify(rightIndex);
         if (rightMap.has(rightIndexJson)) {
-          rightMap.set(rightIndexJson, [...rightMap.get(rightIndexJson), leftIndex]);
+          rightMap.set(rightIndexJson, [...rightMap.get(rightIndexJson), leftIndex])
         } else {
           rightMap.set(rightIndexJson, [leftIndex]);
         }
@@ -1154,11 +1127,10 @@ export class NewComposite extends LogicItem {
         const rightIndex = JSON.parse(rightIndexJson) || [];
         const leftItems = leftIndexs.map((leftIndex: Array<number>) => this.properties[leftIndex[1]]);
         const [rightFirst, rightSecond] = [rightIndex[0], rightIndex[1]];
-        const rightItem =
-          rightSecond !== undefined ? this.rights[rightFirst].members[rightSecond] : this.rights[rightFirst].expression;
+        const rightItem = rightSecond !== undefined ? this.rights[rightFirst].members[rightSecond] : this.rights[rightFirst].expression;
         leftItems.forEach((leftItem: Identifier) => {
           code += `obj.${leftItem.name} = `;
-        });
+        })
         code += `${rightItem.toJS(shiftState(state, code, { inline: true }))}`;
         code += ';\n';
       });
@@ -1172,7 +1144,7 @@ export class NewComposite extends LogicItem {
       this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
         const rightIndexJson = JSON.stringify(rightIndex);
         if (rightMap.has(rightIndexJson)) {
-          rightMap.set(rightIndexJson, [...rightMap.get(rightIndexJson), leftIndex]);
+          rightMap.set(rightIndexJson, [...rightMap.get(rightIndexJson), leftIndex])
         } else {
           rightMap.set(rightIndexJson, [leftIndex]);
         }
@@ -1181,11 +1153,10 @@ export class NewComposite extends LogicItem {
         const rightIndex = JSON.parse(rightIndexJson) || [];
         const leftItems = leftIndexs.map((leftIndex: Array<number>) => this.properties[leftIndex[1]]);
         const [rightFirst, rightSecond] = [rightIndex[0], rightIndex[1]];
-        const rightItem =
-          rightSecond !== undefined ? this.rights[rightFirst].members[rightSecond] : this.rights[rightFirst].expression;
+        const rightItem = rightSecond !== undefined ? this.rights[rightFirst].members[rightSecond] : this.rights[rightFirst].expression;
         leftItems.forEach((leftItem: Identifier) => {
           code += `obj.${leftItem.name} = `;
-        });
+        })
         code += `${rightItem.toJS(shiftState(state, code, { inline: true }))}`;
         code += ';\n';
       });
@@ -1196,7 +1167,7 @@ export class NewComposite extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const indent0 = indent(state?.tabSize || 0);
     const indent1 = indent((state?.tabSize || 0) + 1);
     const indent2 = indent((state?.tabSize || 0) + 2);
@@ -1226,20 +1197,14 @@ export class NewComposite extends LogicItem {
       // 方便ts报错检查
       code += `${indent1}function __newComposite() {\n`;
       const { typeAnnotation } = this;
-      if (
-        ['nasl.ui', 'nasl.interface', 'nasl.http'].includes(typeAnnotation.typeNamespace) &&
-        typeAnnotation.typeKind === 'generic'
-      ) {
+      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 }) => {
           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 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 += `${['__IDENTIFIER__', '__IDENTIFIER__()'].includes(rightTs) ? 'null' : rightMap.get(rightItem)},\n `;
@@ -1255,9 +1220,7 @@ export class NewComposite extends LogicItem {
       if (leftTopIndex !== -1) {
         const { rightIndex } = this.assignmentLines[leftTopIndex];
         const rightExpression =
-          rightIndex[1] !== undefined
-            ? this.rights[rightIndex[0]].members[rightIndex[1]]
-            : this.rights[rightIndex[0]].expression;
+          rightIndex[1] !== undefined ? this.rights[rightIndex[0]].members[rightIndex[1]] : this.rights[rightIndex[0]].expression;
         code += `__obj = ${rightExpression.toEmbeddedTS(shiftState(state, code, { inline: true }))};`;
         code += '\n';
       } else {
@@ -1272,10 +1235,7 @@ export class NewComposite extends LogicItem {
           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 rightItem = rightSecond !== undefined ? this.rights[rightFirst].members[rightSecond] : this.rights[rightFirst].expression;
           const rightTs = rightMap.get(rightItem);
           code += `${indent2}nasl.core.compareNew(`;
           code += `${['__IDENTIFIER__', '__IDENTIFIER__()'].includes(rightTs) ? 'null' : rightMap.get(rightItem)}, `;
@@ -1294,8 +1254,7 @@ export class NewComposite extends LogicItem {
         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 rightItem = rightSecond !== undefined ? this.rights[rightFirst].members[rightSecond] : this.rights[rightFirst].expression;
         nameMap.set(leftItem.name, rightItem);
         rightMap.set(rightItem, null);
       });
@@ -1365,6 +1324,89 @@ export class NewComposite extends LogicItem {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    const indent0 = indent((state?.tabSize || 0));
+    const indent1 = indent((state?.tabSize || 0) + 1);
+    const indent2 = indent((state?.tabSize || 0) + 2);
+    let code = '';
+    if (!this.typeAnnotation) {
+      code += '__IDENTIFIER__';
+    } else if (this.typeAnnotation.typeKind !== 'anonymousStructure') {
+      const rightMap = new Map();
+      // 提供sourcemap，获取类型标注和上下文可选变量
+      this.rights.forEach((right) => {
+        code += indent1;
+        rightMap.set(right.expression, right.expression.toNaturalTS(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.toNaturalTS(shiftState(state, code, { inline: true })));
+          code += rightMap.get(member);
+          code += '; ';
+        });
+        code += right.members.length ? '\n' : '';
+      });
+      // 方便ts报错检查
+      // 是否是左边的顶层连线
+      const leftTopIndex = this.assignmentLines.findIndex(({ leftIndex }) => leftIndex[1] === undefined);
+      if (leftTopIndex !== -1) {
+        // const rightIndex = this.assignmentLines[leftTopIndex].rightIndex;
+        // const rightExpression = rightIndex[1] !== undefined ? this.rights[rightIndex[0]].members[rightIndex[1]] : this.rights[rightIndex[0]].expression;
+        // code += `__obj = ${rightExpression.toNaturalTS(shiftState(state, code, { inline: true }))};`;
+        // code += '\n';
+      } else {
+        code += `${indent0}new ${this.typeAnnotation.typeName}({\n`;
+        this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
+          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 += `${indent1}${leftItem.toNaturalTS(shiftState(state, code, { inline: true }))}: ${['__IDENTIFIER__', '__IDENTIFIER__()'].includes(rightTs) ? 'null' : rightMap.get(rightItem)},\n`;
+        });
+        code += `${indent0}})`;
+      }
+    } else {
+      const nameMap = new Map();
+      const rightMap = new Map();
+      this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
+        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;
+        nameMap.set(leftItem.name, rightItem);
+        rightMap.set(rightItem, null);
+      });
+      code += `${indent0}{\n`;
+      this.properties.forEach((property, index) => {
+        const temp = `temp${index}`;
+        const propertyType = this.typeAnnotation.properties[index]?.typeAnnotation;
+        const { name } = property;
+        const rightItem = nameMap.get(name);
+        const ts = rightMap.get(rightItem);
+        if (ts !== undefined) {
+          if (['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts)) {
+            code += `${indent1}${temp}: null,\n`;
+          } else {
+            code += `${indent1}${temp}: ${ts},\n`;
+          }
+        } else if (propertyType) {
+          code += `${indent1}${property.name}: ${propertyType.toNaturalTS(shiftState(state, code, { inline: true }))},\n`;
+        } else {
+          code += `${indent1}`;
+          code += property.toNaturalTS(shiftState(state, code, { inline: true }));
+          code += ',\n';
+        }
+      });
+      code += `${indent0}}`;
+    }
+    return code;
+  }
+
   getInitCode(state?: TranslatorState): string {
     const indent1 = indent((state?.tabSize || 0) + 1);
     const indent2 = indent((state?.tabSize || 0) + 2);
@@ -1377,8 +1419,7 @@ export class NewComposite extends LogicItem {
       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 rightItem = rightSecond !== undefined ? this.rights[rightFirst].members[rightSecond] : this.rights[rightFirst].expression;
       nameMap.set(leftItem.name, rightItem);
       rightMap.set(rightItem, null);
     });
@@ -1398,8 +1439,7 @@ export class NewComposite extends LogicItem {
       const { name } = property;
       const propertyType = this.typeAnnotation.properties[index]?.typeAnnotation;
       const rightItem = nameMap.get(name);
-      let ts = rightMap.get(rightItem);
-      ts = this.getForeachCode(ts);
+      const ts = rightMap.get(rightItem);
       if (propertyType) {
         code += `const ${name}: ${propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }))}; `;
       } else if (ts !== undefined) {
@@ -1426,6 +1466,7 @@ export class NewComposite extends LogicItem {
     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 = '';
 
     const rightMap = new Map();
@@ -1456,8 +1497,7 @@ export class NewComposite extends LogicItem {
         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 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 += `${['__IDENTIFIER__', '__IDENTIFIER__()'].includes(rightTs) ? 'null' : rightMap.get(rightItem)},\n `;
@@ -1496,7 +1536,7 @@ export class NewComposite extends LogicItem {
       if (leftIndex[1] < index) {
         newLines.push(line);
       } else if (leftIndex[1] > index) {
-        const newLine = { ...line?.toJSON(), leftIndex: [leftIndex[0], leftIndex[1] - 1] };
+        const newLine = { ...line, leftIndex: [leftIndex[0], leftIndex[1] - 1] };
         newLines.push(newLine as AssignmentLine);
       }
     });
@@ -1510,24 +1550,15 @@ export class NewComposite extends LogicItem {
     property.delete();
     this.app.emit('collect:end');
   }
-
-  getForeachCode(code: string): string {
-    // ForEachStatement 内部变量需要替换处理，如 item、index
-    const forEachStatement = this.getAncestor('ForEachStatement') as ForEachStatement;
-    if (forEachStatement && code) {
-      code = code.replaceAll('\n', ' ');
-      code = new Logic().handleForEachCode(code, forEachStatement);
-    }
-    return code;
-  }
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.NewComposite = NewComposite;
 export default NewComposite;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================