@lcap/nasl 3.3.3-beta.2 → 3.3.3-beta.3

package/src/concepts/ProcessOutcomes__.ts

@@ -1,4 +1,5 @@
-import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
+import { indent, withSourceMap, createCompilerState } from '../translator';
+import { getFlowAfterElements } from '../server/getProcesses';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -71,7 +72,21 @@ export class ProcessOutcomes extends LogicItem {
   //================================================================================
   @withSourceMap()
   toEmbeddedTS(state = createCompilerState()): string {
-    const code = `return () => ${this.flowRefs?.length > 0 ? `"${this.flowRefs}"` : '__IDENTIFIER__'}`;
+    const tab0 = indent(state?.tabSize || 0);
+    const tab1 = indent((state?.tabSize || 0) + 1);
+    let code = ''
+
+    const afterLinkValues = getFlowAfterElements(this.processElement).map((l) => l.flowValue);
+    code += `return () => `
+    if (this.flowRefs.length > 0) {
+      code += `{\n`;
+      code += `${tab1}let afterLinks: ${afterLinkValues.map((item) => `'${item}'`).join(' | ')};\n`;
+      code += `${tab1}let outComes: ${this.flowRefs.map((item) => `'${item}'`).join(' | ')};\n`;
+      code += `${tab1}nasl.core.assign(afterLinks, outComes);\n`;
+      code += `${tab0}};\n`;
+    } else {
+      code += `__IDENTIFIER__`;
+    }
     return code;
   }
   //================================================================================

package/src/concepts/Process__.ts

@@ -167,7 +167,7 @@ export class Process extends BaseNode {
 
   getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.bindEvents as BindEvent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.bindEvents as BindEvent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getBindEventUniqueName(name = 'bindEvent1') {
     return utils.unique(name, this.getBindEventExistingNames(), undefined, false);
@@ -320,7 +320,7 @@ export class Process extends BaseNode {
 
   getParamExistingNames(excludedList: Array<Param> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.params as Param[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.params as Param[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getParamUniqueName(name = 'param1') {
     return utils.unique(name, this.getParamExistingNames(), undefined, false);
@@ -473,7 +473,7 @@ export class Process extends BaseNode {
 
   getReturnExistingNames(excludedList: Array<Return> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.returns as Return[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.returns as Return[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getReturnUniqueName(name = 'ret1') {
     return utils.unique(name, this.getReturnExistingNames(), undefined, false);
@@ -626,7 +626,7 @@ export class Process extends BaseNode {
 
   getConstantExistingNames(excludedList: Array<Constant> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.constants as Constant[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.constants as Constant[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getConstantUniqueName(name = 'constant1') {
     return utils.unique(name, this.getConstantExistingNames(), undefined, false);
@@ -781,7 +781,7 @@ export class Process extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.elements as ProcessElement[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getElementUniqueName(name = 'element1') {
     return utils.unique(name, this.getElementExistingNames(), undefined, false);
@@ -973,7 +973,8 @@ export class Process extends BaseNode {
       // @ts-ignore
       const n = bindEvent.__v_raw || bindEvent;
       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) {
@@ -1025,7 +1026,8 @@ export class Process 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) {
@@ -1077,7 +1079,8 @@ export class Process 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) {
@@ -1129,7 +1132,8 @@ export class Process extends BaseNode {
       // @ts-ignore
       const n = constant.__v_raw || constant;
       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) {
@@ -1181,7 +1185,8 @@ export class Process extends BaseNode {
       // @ts-ignore
       const n = element.__v_raw || element;
       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) {

package/src/concepts/QueryAggregateExpression__.ts

@@ -104,7 +104,8 @@ export class QueryAggregateExpression 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) {

package/src/concepts/QueryFromExpression__.ts

@@ -209,7 +209,8 @@ export class QueryFromExpression 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) {

package/src/concepts/QueryGroupByExpression__.ts

@@ -107,7 +107,8 @@ export class QueryGroupByExpression 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) {

package/src/concepts/QueryJoinExpression__.ts

@@ -99,7 +99,7 @@ export class QueryJoinExpression extends LogicItem {
     const excludedSet = new Set(excludedList);
     return ((this.onExpressions as BinaryExpression[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getBinaryExpressionUniqueName(name = 'binaryExpression1') {
     return utils.unique(name, this.getBinaryExpressionExistingNames(), undefined, false);
@@ -420,7 +420,8 @@ export class QueryJoinExpression 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) {

package/src/concepts/QueryLimitExpression__.ts

@@ -151,7 +151,8 @@ export class QueryLimitExpression 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) {

package/src/concepts/QueryOrderByExpression__.ts

@@ -151,7 +151,8 @@ export class QueryOrderByExpression 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) {

package/src/concepts/QuerySelectExpression__.ts

@@ -76,7 +76,7 @@ export class QuerySelectExpression extends LogicItem {
     const excludedSet = new Set(excludedList);
     return ((this.selectElements as QueryAggregateExpression[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getQueryAggregateExpressionUniqueName(name = 'queryAggregateExpression1') {
     return utils.unique(name, this.getQueryAggregateExpressionExistingNames(), undefined, false);
@@ -492,7 +492,8 @@ export class QuerySelectExpression 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) {

package/src/concepts/Return__.ts

@@ -8,7 +8,7 @@ function tryJSONParse(str: string) {
 
   try {
     result = JSON.parse(str);
-  } catch (e) { }
+  } catch (e) {}
 
   return result;
 }
@@ -229,7 +229,8 @@ export class Return extends BaseNode {
       // @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) {
@@ -269,8 +270,8 @@ export class Return extends BaseNode {
     const { defaultValue } = this;
     const defaultValueType = Object.prototype.toString.call(defaultValue);
     const { typeKind, typeNamespace, typeName } = typeAnnotation || {};
-    const isDecimal = typeKind === 'primitive' && ['Decimal', "Double"].includes(typeName)
-    const isInteger = typeKind === 'primitive' && ['Long', "Integer"].includes(typeName)
+    const isDecimal = typeKind === 'primitive' && ['Decimal', 'Double'].includes(typeName);
+    const isInteger = typeKind === 'primitive' && ['Long', 'Integer'].includes(typeName);
 
     // 设置成null，才能同步给后端清除该值，但是null对checkbox组件是一种特殊状态
     let parsedValue = defaultValue ?? undefined;
@@ -298,10 +299,10 @@ export class Return extends BaseNode {
       }
     }
     if (isDecimal) {
-      parsedValue = `new NaslDecimal('${defaultValue}')`
+      parsedValue = `new NaslDecimal('${defaultValue}')`;
       code += `${parsedValue}`;
     } else if (isInteger) {
-      parsedValue = `new NaslLong('${defaultValue}')`
+      parsedValue = `new NaslLong('${defaultValue}')`;
       code += `${parsedValue}`;
     } else {
       code += `${JSON.stringify(parsedValue)}`;

package/src/concepts/SelectMembers__.ts

@@ -114,7 +114,7 @@ export class SelectMembers extends BaseNode {
 
   getLogicItemExistingNames(excludedList: Array<LogicItem> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.members as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.members as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getLogicItemUniqueName(name = 'logicItem1') {
     return utils.unique(name, this.getLogicItemExistingNames(), undefined, false);
@@ -331,7 +331,8 @@ export class SelectMembers 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) {

package/src/concepts/Slot__.ts

@@ -157,7 +157,8 @@ export class Slot 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) {

package/src/concepts/SqlQueryComponent__.ts

@@ -135,7 +135,8 @@ export class SqlQueryComponent 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) {

package/src/concepts/StringInterpolation__.ts

@@ -1,4 +1,11 @@
-import { TranslatorState, shiftState, withSourceMap, createCompilerState, transfromMetadataType } from '../translator';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  createCompilerState,
+  transfromMetadataType,
+  transfromUnionTypeAnnotation,
+} from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 import { StringLiteral } from './StringLiteral__';
 //================================================================================
@@ -63,7 +70,7 @@ export class StringInterpolation extends LogicItem {
 
   getItemExistingNames(excludedList: Array<LogicItem> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.expressions as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.expressions as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getItemUniqueName(name = 'logicItem1') {
     return utils.unique(name, this.getItemExistingNames(), undefined, false);
@@ -255,7 +262,8 @@ export class StringInterpolation 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) {
@@ -286,6 +294,7 @@ export class StringInterpolation extends LogicItem {
         let expCode = exp.toVue();
         if (options?.finalCode !== false) {
           const expTypeAnnotation = exp.typeAnnotation || exp.__TypeAnnotation;
+          transfromUnionTypeAnnotation(expTypeAnnotation, this.app);
           const { sortedTypeKey } = transfromMetadataType(expTypeAnnotation, this.app);
           expCode = `$utils['ToString']('${sortedTypeKey}', ${expCode})`;
         }
@@ -303,6 +312,7 @@ export class StringInterpolation extends LogicItem {
     return this.expressions
       .map((exp: any) => {
         const expTypeAnnotation = exp.typeAnnotation || exp.__TypeAnnotation;
+        transfromUnionTypeAnnotation(expTypeAnnotation, this.app);
         const { sortedTypeKey } = transfromMetadataType(expTypeAnnotation, this.app);
         return `this.$utils['ToString']('${sortedTypeKey}', ${exp.toJS()})`;
       })

package/src/concepts/StructureProperty__.ts

@@ -239,7 +239,8 @@ export class StructureProperty extends BaseNode {
       // @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) {

package/src/concepts/Structure__.ts

@@ -129,7 +129,7 @@ export class Structure extends BaseNode {
 
   getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.typeParams as TypeParam[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.typeParams as TypeParam[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getTypeParamUniqueName(name = 'typeParam1') {
     return utils.unique(name, this.getTypeParamExistingNames(), undefined, false);
@@ -284,7 +284,7 @@ export class Structure extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.properties as StructureProperty[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getPropertyUniqueName(name = 'property1') {
     return utils.unique(name, this.getPropertyExistingNames(), undefined, false);
@@ -476,7 +476,8 @@ export class Structure 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) {
@@ -528,7 +529,8 @@ export class Structure extends BaseNode {
       // @ts-ignore
       const n = property.__v_raw || property;
       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) {

package/src/concepts/SwitchCase__.ts

@@ -221,7 +221,8 @@ export class SwitchCase 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) {

package/src/concepts/SwitchStatement__.ts

@@ -176,7 +176,8 @@ export class SwitchStatement 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) {

package/src/concepts/TriggerEvent__.ts

@@ -93,7 +93,7 @@ export class TriggerEvent extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.callBackLogic as TypeAnnotation[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getTypeAnnotationUniqueName(name = 'typeAnnotation1') {
     return utils.unique(name, this.getTypeAnnotationExistingNames(), undefined, false);
@@ -285,7 +285,8 @@ export class TriggerEvent extends BaseNode {
       // @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) {

package/src/concepts/TypeAnnotation__.ts

@@ -543,7 +543,8 @@ export class TypeAnnotation extends BaseNode {
       // @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) {
@@ -581,7 +582,8 @@ export class TypeAnnotation extends BaseNode {
       // @ts-ignore
       const n = structureProperty.__v_raw || structureProperty;
       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) {
@@ -1071,30 +1073,33 @@ export class TypeAnnotation extends BaseNode {
     if (this.typeKind === 'primitive') {
       if (this.typeName === 'String') {
         code = `   new nasl.core.String("${value}") `;
-      }  else if (this.typeNamespace.endsWith('.metadataTypes')) {
-          const app = this.getAncestor('App') as App
-          let originType = {} as TypeAnnotation
-          if (this.typeNamespace === 'app.metadataTypes') {
-            originType = app.metadataTypes.find((metadataType) => metadataType.name === this.typeName)?.typeAnnotation;
-          } else if (this.typeNamespace.startsWith('extensions.') && this.typeNamespace.endsWith('.metadataTypes')) {
-            const dependencyName = this.typeNamespace.replace('extensions.', '').replace('.metadataTypes', '')
-            originType = app.dependencies?.find((item) => item.name === dependencyName)?.metadataTypes?.find((ele) => ele.name === this.typeName)?.typeAnnotation ?? {} as TypeAnnotation
-          }
-          const coreType = {
-            typeNamespace: 'nasl.core',
-            typeName: originType.typeName
-          }
-          if (coreType.typeName === 'String') {
-            code = `   new nasl.core.String("${value}") `;
+      } else if (this.typeNamespace.endsWith('.metadataTypes')) {
+        const app = this.getAncestor('App') as App;
+        let originType = {} as TypeAnnotation;
+        if (this.typeNamespace === 'app.metadataTypes') {
+          originType = app.metadataTypes.find((metadataType) => metadataType.name === this.typeName)?.typeAnnotation;
+        } else if (this.typeNamespace.startsWith('extensions.') && this.typeNamespace.endsWith('.metadataTypes')) {
+          const dependencyName = this.typeNamespace.replace('extensions.', '').replace('.metadataTypes', '');
+          originType =
+            app.dependencies
+              ?.find((item) => item.name === dependencyName)
+              ?.metadataTypes?.find((ele) => ele.name === this.typeName)?.typeAnnotation ?? ({} as TypeAnnotation);
+        }
+        const coreType = {
+          typeNamespace: 'nasl.core',
+          typeName: originType.typeName,
+        };
+        if (coreType.typeName === 'String') {
+          code = `   new nasl.core.String("${value}") `;
+        } else {
+          if (['Text'].includes(coreType.typeName)) {
+            code = `  new ${coreType.typeNamespace}.${coreType.typeName}("${value}")`;
+          } else if (['Boolean'].includes(coreType.typeName)) {
+            code = value;
           } else {
-            if (['Text'].includes(coreType.typeName)) {
-              code = `  new ${coreType.typeNamespace}.${coreType.typeName}("${value}")`;
-            } else if (['Boolean'].includes(coreType.typeName)) {
-              code = value;
-            } else {
-              code = ` new ${coreType.typeNamespace}.${coreType.typeName}(${value})`;
-            }
+            code = ` new ${coreType.typeNamespace}.${coreType.typeName}(${value})`;
           }
+        }
       } else {
         if (['Text'].includes(this.typeName)) {
           code = `  new ${this.typeNamespace}.${this.typeName}("${value}")`;
@@ -1234,14 +1239,16 @@ export class TypeAnnotation extends BaseNode {
         if (structureCache.has(structure)) {
           return true;
         }
-        structureCache.add(structure)
-        const res = structure?.properties.some((prop: StructureProperty) => prop.typeAnnotation.hasSystemType(app, structureCache));
+        structureCache.add(structure);
+        const res = structure?.properties.some((prop: StructureProperty) =>
+          prop.typeAnnotation.hasSystemType(app, structureCache),
+        );
         // 如果有系统类型，则终止遍历
         if (res === true) {
           result = true;
-          return false
+          return false;
         }
-        return true
+        return true;
       }
       // 如果是系统类型，则终止遍历
       if (node.isSystemType()) {

package/src/concepts/UnaryExpression__.ts

@@ -113,7 +113,8 @@ export class UnaryExpression 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) {

package/src/concepts/ValidationRule__.ts

@@ -313,7 +313,8 @@ export class ValidationRule 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) {

package/src/concepts/Variable__.ts

@@ -12,7 +12,7 @@ function tryJSONParse(str: string) {
 
   try {
     result = JSON.parse(str);
-  } catch (e) { }
+  } catch (e) {}
 
   return result;
 }
@@ -247,7 +247,8 @@ export class Variable extends BaseNode {
       // @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) {
@@ -290,8 +291,8 @@ export class Variable extends BaseNode {
     const { typeKind, typeNamespace, typeName } = typeAnnotation || {};
     // 设置成null，才能同步给后端清除该值，但是null对checkbox组件是一种特殊状态
     let parsedValue = defaultValue ?? undefined;
-    const isDecimal = typeKind === 'primitive' && ['Decimal', "Double"].includes(typeName)
-    const isInteger = typeKind === 'primitive' && ['Long', "Integer"].includes(typeName)
+    const isDecimal = typeKind === 'primitive' && ['Decimal', 'Double'].includes(typeName);
+    const isInteger = typeKind === 'primitive' && ['Long', 'Integer'].includes(typeName);
     if (
       defaultValueType === '[object String]' &&
       !(typeKind === 'primitive' && typeNamespace === 'nasl.core' && ['String', 'Text', 'Email'].includes(typeName)) &&
@@ -316,10 +317,10 @@ export class Variable extends BaseNode {
       }
     }
     if (isDecimal) {
-      parsedValue = `new NaslDecimal('${defaultValue}')`
+      parsedValue = `new NaslDecimal('${defaultValue}')`;
       code += `${parsedValue}`;
     } else if (isInteger) {
-      parsedValue = `new NaslLong('${defaultValue}')`
+      parsedValue = `new NaslLong('${defaultValue}')`;
       code += `${parsedValue}`;
     } else {
       code += `${JSON.stringify(parsedValue)}`;