@lcap/nasl 3.4.0-beta.3 → 3.4.0-beta.4

package/src/concepts/NewComposite__.ts

@@ -32,6 +32,9 @@ export class NewComposite extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'NewComposite';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -698,7 +701,8 @@ export class NewComposite extends LogicItem {
       // @ts-ignore
       const n = typeAnnotation.__v_raw || typeAnnotation;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -750,7 +754,8 @@ export class NewComposite extends LogicItem {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -802,7 +807,8 @@ export class NewComposite extends LogicItem {
       // @ts-ignore
       const n = selectMembers.__v_raw || selectMembers;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -854,7 +860,8 @@ export class NewComposite extends LogicItem {
       // @ts-ignore
       const n = assignmentLine.__v_raw || assignmentLine;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -923,7 +930,7 @@ export class NewComposite extends LogicItem {
           }
           members.forEach((rightMember: any, rightSecondIndex: number) => {
             const rightName = rightMember.property.name;
-            if (rightLineSet.has(rightSecondIndex)) return;
+            if (rightLineSet.has(rightSecondIndex) || leftLineSet.has(leftSecondIndex)) return;
 
             if (leftName === rightName) {
               const rightTypeAnnotation = rightMember.__TypeAnnotation;
@@ -1106,7 +1113,7 @@ export class NewComposite extends LogicItem {
     return this.rights[firstIndex].members[secondIndex];
   }
 
-  toUI(state?: TranslatorState): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     let code = '{ ';
     if (this.typeAnnotation) {
       const leftAssignmentMap = new Map();
@@ -1122,7 +1129,7 @@ export class NewComposite extends LogicItem {
           code += ', ';
         }
         const rightItem = leftAssignmentMap.get(leftItem);
-        const value = rightItem ? rightItem.toUI(shiftState(state, code)) : 'undefined';
+        const value = rightItem ? rightItem.toUI(shiftState(state, code)) : 'null';
         code += `${leftItem.name}: ${value}`;
       });
     }
@@ -1290,7 +1297,7 @@ export class NewComposite extends LogicItem {
           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 += `${leftItem.toEmbeddedTS(shiftState(state, code, { inline: true }), { isNewcomposite: true})});\n`;
         });
       }
       code += `${indent2}return __obj;\n`;
@@ -1329,26 +1336,41 @@ export class NewComposite extends LogicItem {
         });
         code += right.members.length ? '\n' : '';
       });
+      // 先把连线的变量定义出来，否则匿名数据结构属性名称与变量名称相同时会报错,
+      this.properties.forEach((property, index) => {
+        const temp = `temp${index}__`;
+        const { name } = property;
+        const rightItem = nameMap.get(name);
+        const ts = rightMap.get(rightItem);
+        if (ts !== undefined) {
+          if (['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts)) {
+            code += `${indent1}let ${temp}: void = null; \n`;
+          } else {
+            code += `${indent1}let ${temp}${ts === 'null' ? ':void' : ''} = ${ts}; \n`;
+          }
+        }
+      });
       // 方便ts报错检查
       code += `${indent1}function __newComposite() {\n`;
       this.properties.forEach((property, index) => {
-        const temp = `temp${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 += `${indent2}let ${temp}: void = null; `;
+          code += `${indent2}let `;
+          code += `${property.toEmbeddedTS(shiftState(state, code, { inline: true }))}: `;
+          if (propertyType) {
+            const typeTs = propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }));
+            code += typeTs;
+            code += ` = ${temp};\n`;
+            // 如果是字段是union类型，且赋值的是当前union允许的类型，会导致property.name类型推断成temp的类型
+            code += `${indent2}${property.name} = ${property.name} as ${typeTs};\n`;
           } else {
-            code += `${indent2}let ${temp}${ts === 'null' ? ':void' : ''} = ${ts}; `;
+            code += `nasl.core.Incompatible<typeof ${temp}, void>`;
+            code += ` = ${temp};\n`;
           }
-          code += `const `;
-          code += `${property.toEmbeddedTS(shiftState(state, code, { inline: true }))}: `;
-          code += propertyType
-            ? propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }))
-            : `nasl.core.Incompatible<typeof ${temp}, void>`;
-          code += ` = ${temp};\n`;
         } else if (propertyType) {
           code += `${indent2}let ${property.name}: `;
           code += `${propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }))}; `;
@@ -1377,93 +1399,22 @@ export class NewComposite extends LogicItem {
   }
 
   @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;
+  toNaturalTS(): string {
+    let code = 'nasl.util.';
+    code +=
+      this?.typeAnnotation?.typeKind === 'anonymousStructure'
+        ? 'NewAnonymityStructure'
+        : `NewEntity<${this?.typeAnnotation?.typeName || '__IDENTIFIER__'}>`;
+    let params = '';
+    this?.properties?.forEach((item, index) => {
+      if (item) {
+        params += `${item?.toNaturalTS()}: ${this?.rights?.[index]?.expression?.toNaturalTS()}`;
+        if (index !== this.properties.length - 1) {
+          params += ';';
         }
-        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}}`;
-    }
+    });
+    code += `(${params ? `{${params}}` : '__IDENTIFIER__'})`;
     return code;
   }
 

package/src/concepts/NewList__.ts

@@ -24,6 +24,9 @@ export class NewList extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'NewList';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -284,7 +287,8 @@ export class NewList extends LogicItem {
       // @ts-ignore
       const n = typeAnnotation.__v_raw || typeAnnotation;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -336,7 +340,8 @@ export class NewList extends LogicItem {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -366,11 +371,11 @@ export class NewList extends LogicItem {
     return code;
   }
 
-  toUI(state?: TranslatorState): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     let code = '';
     code += '[';
     this.items.forEach((item, index) => {
-      code += item.toUI(shiftState(state, code, { inline: true }));
+      code += item.toUI(state, hideDetails);
       if (index + 1 < this.items.length) code += ', ';
     });
     code += ']';
@@ -412,7 +417,7 @@ export class NewList extends LogicItem {
     if (this.typeAnnotation) {
       code += `${indent0}(() => { \n`;
       // ts报错检查
-      code += `${indent1}function __newComposite() {\n`;
+      code += `${indent1}function __newList() {\n`;
       this.items.forEach((item) => {
         code += `${indent2}nasl.util.Add(`;
         code = `${typeCode(code)}, `;
@@ -424,7 +429,7 @@ export class NewList extends LogicItem {
       code = `${typeCode(code)};\n`;
       code += `${indent1}};\n`;
 
-      code += `${indent1}return __newComposite();\n`;
+      code += `${indent1}return __newList();\n`;
       code += `${indent0}})()`;
     } else {
       code += `${indent0}(() => { \n`;
@@ -440,7 +445,7 @@ export class NewList extends LogicItem {
       if (!arr.length || arr.every((item: any) => ['__IDENTIFIER__', '__IDENTIFIER__()', 'null'].includes(item)))
         code += `${indent1}__IDENTIFIER__;\n`;
       // ts报错检查
-      code += `${indent1}function __newComposite() {\n`;
+      code += `${indent1}function __newList() {\n`;
       if (this.items.length === 0) {
         code += `${indent2}return nasl.util.NewList();\n`;
       } else {
@@ -454,7 +459,7 @@ export class NewList extends LogicItem {
       }
       code += `${indent1}};\n`;
 
-      code += `${indent1}return __newComposite();\n`;
+      code += `${indent1}return __newList();\n`;
       code += `${indent0}})()`;
     }
     return code;
@@ -477,14 +482,18 @@ export class NewList extends LogicItem {
   toNaturalTS(state = createCompilerState()): string {
     const indent0 = indent(state?.tabSize || 0);
     let code = '';
-    if (this.typeAnnotation) {
-      code += `new ${this.typeAnnotation.typeName}(\n`;
-      this.items.forEach((item) => {
-        code += item.toNaturalTS(shiftState(state, code, { inline: true }));
-        code += ',\n';
-      });
-      code += `${indent0})\n`;
-    }
+    const typeAnnotation =
+      this?.typeAnnotation?.typeArguments?.map((item) => item?.toNaturalTS())?.join(', ') || '__IDENTIFIER__';
+    let params = '';
+    this?.items?.forEach((item, index) => {
+      if (item) {
+        params += item.toNaturalTS(shiftState(state, code, { inline: true }));
+        if (index !== this.items.length - 1) {
+          params += ', ';
+        }
+      }
+    });
+    code += `nasl.util.NewList<${typeAnnotation}>(${params ? `{${params}}` : '__IDENTIFIER__'})`;
     return code;
   }
 
@@ -494,7 +503,7 @@ export class NewList extends LogicItem {
     const indent3 = indent((state?.tabSize || 0) + 3);
     let code = '';
     code += '(() => { \n';
-    code += `${indent2}function __newComposite() {\n`;
+    code += `${indent2}function __newList() {\n`;
     if (this.items.length === 0) {
       code += `${indent3}return nasl.util.NewList();\n`;
     } else {
@@ -510,7 +519,7 @@ export class NewList extends LogicItem {
     }
     code += `${indent2}};\n`;
 
-    code += `${indent2}return __newComposite();\n`;
+    code += `${indent2}return __newList();\n`;
     code += `${indent1}})()`;
     return code;
   }

package/src/concepts/NewMap__.ts

@@ -25,6 +25,9 @@ export class NewMap extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'NewMap';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -452,7 +455,8 @@ export class NewMap extends LogicItem {
       // @ts-ignore
       const n = typeAnnotation.__v_raw || typeAnnotation;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -529,7 +533,8 @@ export class NewMap extends LogicItem {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -585,7 +590,7 @@ export class NewMap extends LogicItem {
     return code;
   }
 
-  toUI(state?: TranslatorState): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     let code = '';
     code += '{ ';
     this.keys.forEach((key, index) => {
@@ -593,8 +598,8 @@ export class NewMap extends LogicItem {
         code += ', ';
       }
       const value: any = this.values[index];
-      code += `${key ? key.toUI(shiftState(state, code, { inline: true })) : undefined}`;
-      code += `: ${value ? value.toUI(shiftState(state, code, { inline: true })) : undefined}`;
+      code += `${key ? key.toUI(state, hideDetails) : undefined}`;
+      code += `: ${value ? value.toUI(state, hideDetails) : undefined}`;
     });
     code += ' }';
     return code;
@@ -639,7 +644,7 @@ export class NewMap extends LogicItem {
     if (this.typeAnnotation) {
       code += `${indent0}(() => { \n`;
       // 方便ts报错检查
-      code += `${indent1}function __newComposite() {\n`;
+      code += `${indent1}function __newMap() {\n`;
       this.keys.forEach((item, index) => {
         const key = item;
         code += `${indent2}nasl.util.MapPut(`;
@@ -659,7 +664,7 @@ export class NewMap extends LogicItem {
       code = `${typeCode(code)};\n`;
       code += `${indent1}};\n`;
 
-      code += `${indent1}return __newComposite();\n`;
+      code += `${indent1}return __newMap();\n`;
       code += `${indent0}})()`;
     } else if (this.keys.some((key) => key) || this.values.some((value) => value)) {
       code += `${indent0}(() => { \n`;
@@ -690,7 +695,7 @@ export class NewMap extends LogicItem {
         code += `${indent1}__IDENTIFIER__;\n`;
       }
       // 方便ts报错检查
-      code += `${indent1}function __newComposite() {\n`;
+      code += `${indent1}function __newMap() {\n`;
       this.keys.forEach((key: any) => {
         if (!key) return;
         code += `${indent2}nasl.core.compareNew(${keyTs}, `;
@@ -711,27 +716,36 @@ export class NewMap extends LogicItem {
 
       code += `${indent1}};\n`;
 
-      code += `${indent1}return __newComposite();\n`;
+      code += `${indent1}return __newMap();\n`;
       code += `${indent0}})()`;
     } else {
       code += `(() => {\n`;
       code += `${indent1}__IDENTIFIER__;\n`;
-      code += `${indent1}function __newComposite() {\n`;
+      code += `${indent1}function __newMap() {\n`;
       code += `${indent2}return nasl.util.NewMap(${null}, ${null});\n`;
       code += `${indent1}};\n`;
 
-      code += `${indent1}return __newComposite();\n`;
+      code += `${indent1}return __newMap();\n`;
       code += `${indent0}})()`;
     }
     return code;
   }
 
   @withSourceMap()
-  toNaturalTS(state = createCompilerState()): string {
+  toNaturalTS(): string {
     let code = '';
-    if (this.typeAnnotation) {
-      code += `new ${this.typeAnnotation.sortedTypeKey}()`;
-    }
+    const typeAnnotation =
+      this?.typeAnnotation?.typeArguments?.map((item) => item?.toNaturalTS())?.join(', ') || '__IDENTIFIER__';
+    let params = '';
+    this?.keys?.forEach((item, index) => {
+      if (item) {
+        params += `${item?.toNaturalTS()}: ${this?.values?.[index]?.toNaturalTS()}`;
+        if (index !== this.keys.length - 1) {
+          params += ';';
+        }
+      }
+    });
+    code += `nasl.util.NewMap<${typeAnnotation}>(${params ? `{${params}}` : '__IDENTIFIER__'})`;
     return code;
   }
 

package/src/concepts/New__.ts

@@ -21,6 +21,9 @@ export class New extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'New';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */

package/src/concepts/NullLiteral__.ts

@@ -23,6 +23,9 @@ export class NullLiteral extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'NullLiteral';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -51,7 +54,7 @@ export class NullLiteral extends LogicItem {
     return 'undefined';
   }
 
-  toUI(): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     return 'null';
   }
 

package/src/concepts/NumericLiteral__.ts

@@ -24,6 +24,9 @@ export class NumericLiteral extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'NumericLiteral';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -101,7 +104,8 @@ export class NumericLiteral extends LogicItem {
       // @ts-ignore
       const n = typeAnnotation.__v_raw || typeAnnotation;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -122,7 +126,7 @@ export class NumericLiteral extends LogicItem {
     return code;
   }
 
-  toUI(): string {
+  toUI(state?: TranslatorState, hideDetails?: boolean): string {
     const code = this.value ? String(this.value) : '';
     return code;
   }

package/src/concepts/OqlQueryComponent__.ts

@@ -30,6 +30,9 @@ export class OqlQueryComponent extends LogicItem {
   /** 类名 */
   static readonly ConceptName = 'OqlQueryComponent';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -132,7 +135,8 @@ export class OqlQueryComponent extends LogicItem {
       // @ts-ignore
       const n = typeAnnotation.__v_raw || typeAnnotation;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -348,6 +352,9 @@ export class OqlQueryComponent extends LogicItem {
         })
         .then((res: any) => {
           this.codeSourceMap = res || { typescript: '', lexicalErrorCode: 1001 };
+        })
+        .catch(() => {
+          this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
         });
     }
     this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };

package/src/concepts/OverriddenLogic__.ts

@@ -21,6 +21,8 @@ import TypeAnnotation from './TypeAnnotation__';
 import CallInterface from './CallInterface__';
 import CallLogic from './CallLogic__';
 import Logic from './Logic__';
+import type Interface from './Interface__';
+
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -55,6 +57,9 @@ export class OverriddenLogic extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'OverriddenLogic';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -1144,7 +1149,8 @@ export class OverriddenLogic extends BaseNode {
       // @ts-ignore
       const n = transactional.__v_raw || transactional;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -1196,7 +1202,8 @@ export class OverriddenLogic extends BaseNode {
       // @ts-ignore
       const n = typeParam.__v_raw || typeParam;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -1248,7 +1255,8 @@ export class OverriddenLogic extends BaseNode {
       // @ts-ignore
       const n = param.__v_raw || param;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -1300,7 +1308,8 @@ export class OverriddenLogic extends BaseNode {
       // @ts-ignore
       const n = ret.__v_raw || ret;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -1352,7 +1361,8 @@ export class OverriddenLogic extends BaseNode {
       // @ts-ignore
       const n = variable.__v_raw || variable;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -1401,7 +1411,8 @@ export class OverriddenLogic extends BaseNode {
       // @ts-ignore
       const n = logicItem.__v_raw || logicItem;
       if (Array.isArray((t as any)[parentKey])) {
-        const index = (t as any)[parentKey].indexOf(n);
+        // @ts-ignore
+        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) {
@@ -1955,7 +1966,7 @@ export class OverriddenLogic extends BaseNode {
     // 调用接口，参数替换成 null
     if (rightNode instanceof CallInterface) {
       const { _interface } = rightNode.getModuleInterface();
-      return _interface ? `${rightNode.tsCalleeKey}(${_interface.params.map(() => 'null').join(',')})` : null;
+      return _interface ? `${rightNode.tsCalleeKey}(${(_interface as Interface).params.map(() => 'null').join(',')})` : null;
     }
 
     // 调用服务端逻辑，参数替换成 null