@lcap/nasl 3.3.2-beta.4 → 3.3.2-beta.5

package/src/concepts/QuerySelectExpression__.ts

@@ -25,6 +25,7 @@ export class QuerySelectExpression extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'QuerySelectExpression';
 
@@ -75,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);
@@ -486,11 +487,16 @@ export class QuerySelectExpression extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/Rect__.ts

@@ -22,6 +22,7 @@ export class Rect extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Rect';
 

package/src/concepts/Return__.ts

@@ -46,6 +46,7 @@ export class Return extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Return';
 
@@ -223,11 +224,16 @@ export class Return extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(typeAnnotation);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = typeAnnotation.__v_raw || typeAnnotation;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === typeAnnotation) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/Role__.ts

@@ -25,6 +25,7 @@ export class Role extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Role';
 

package/src/concepts/SelectMembers__.ts

@@ -26,6 +26,7 @@ export class SelectMembers extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'SelectMembers';
 
@@ -113,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);
@@ -325,11 +326,16 @@ export class SelectMembers extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/Slot__.ts

@@ -26,6 +26,7 @@ export class Slot extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Slot';
 
@@ -151,11 +152,16 @@ export class Slot extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(param);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = param.__v_raw || param;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === param) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/SqlQueryComponent__.ts

@@ -31,6 +31,7 @@ export class SqlQueryComponent extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'SqlQueryComponent';
 
@@ -129,11 +130,16 @@ export class SqlQueryComponent extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(typeAnnotation);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = typeAnnotation.__v_raw || typeAnnotation;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === typeAnnotation) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/Start__.ts

@@ -24,6 +24,7 @@ export class Start extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Start';
 

package/src/concepts/StringInterpolation__.ts

@@ -26,6 +26,7 @@ export class StringInterpolation extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'StringInterpolation';
 
@@ -62,7 +63,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);
@@ -249,11 +250,16 @@ export class StringInterpolation extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -335,7 +341,7 @@ export class StringInterpolation extends LogicItem {
     return code;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/StringLiteral__.ts

@@ -25,6 +25,7 @@ export class StringLiteral extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'StringLiteral';
 

package/src/concepts/StructureProperty__.ts

@@ -29,6 +29,7 @@ export class StructureProperty extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'StructureProperty';
 
@@ -233,11 +234,16 @@ export class StructureProperty extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(typeAnnotation);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = typeAnnotation.__v_raw || typeAnnotation;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === typeAnnotation) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/Structure__.ts

@@ -28,6 +28,7 @@ export class Structure extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Structure';
 
@@ -128,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);
@@ -283,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);
@@ -470,11 +471,16 @@ export class Structure extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(typeParam);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = typeParam.__v_raw || typeParam;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === typeParam) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -518,11 +524,16 @@ export class Structure extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(property);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = property.__v_raw || property;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === property) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/SwitchCase__.ts

@@ -1,4 +1,3 @@
-import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -8,6 +7,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import LogicItem from './LogicItem__';
 
@@ -24,6 +24,7 @@ export class SwitchCase extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'SwitchCase';
 
@@ -44,7 +45,7 @@ export class SwitchCase extends LogicItem {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<SwitchCase>) {
-    source = { ...SwitchCase.getDefaultOptions(), ...source};
+    source = Object.assign({}, SwitchCase.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
@@ -185,7 +186,7 @@ export class SwitchCase extends LogicItem {
     if (typeof options === 'string') {
       test = this.test;
       if (!test) {
-        throw new Error(`找不到逻辑项 ${  options}`);
+        throw new Error('找不到逻辑项 ' + options);
       }
     } else {
       test = options;
@@ -200,12 +201,12 @@ export class SwitchCase extends LogicItem {
   removeItemInConsequent(logicItem: LogicItem): void;
 
   removeItemInConsequent(options: LogicItem) {
-    const logicItem: LogicItem = options;
+    let logicItem: LogicItem = options;
     return logicItem.delete();
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const {parentKey} = logicItem;
+    const parentKey = logicItem.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -215,11 +216,16 @@ export class SwitchCase extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -350,7 +356,7 @@ export class SwitchCase extends LogicItem {
     return code;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/SwitchStatement__.ts

@@ -26,6 +26,7 @@ export class SwitchStatement extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'SwitchStatement';
 
@@ -170,11 +171,16 @@ export class SwitchStatement extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -237,21 +243,21 @@ export class SwitchStatement extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-      let code = '';
-      // 最后一项是else
-      this.cases.forEach((item, index) => {
-          // 如果是最后一项
-          if (index === this.cases.length - 1) {
-              code += item.toNaturalTS(shiftState(state, code, { inline: true }), true);
-          } else {
-              code += item.toNaturalTS(shiftState(state, code, { inline: true }), false, index === 0);
-          }
-      });
-      code += '\n';
-      return code;
+    let code = '';
+    // 最后一项是else
+    this.cases.forEach((item, index) => {
+      // 如果是最后一项
+      if (index === this.cases.length - 1) {
+        code += item.toNaturalTS(shiftState(state, code, { inline: true }), true);
+      } else {
+        code += item.toNaturalTS(shiftState(state, code, { inline: true }), false, index === 0);
+      }
+    });
+    code += '\n';
+    return code;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/Theme__.ts

@@ -22,6 +22,7 @@ export class Theme extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Theme';
 

package/src/concepts/Transactional__.ts

@@ -30,6 +30,7 @@ export class Transactional extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Transactional';
 

package/src/concepts/TriggerEvent__.ts

@@ -23,6 +23,7 @@ export class TriggerEvent extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'TriggerEvent' | 'MsgTriggerEvent';
 
@@ -92,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);
@@ -279,11 +280,16 @@ export class TriggerEvent extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(typeAnnotation);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = typeAnnotation.__v_raw || typeAnnotation;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @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 ((this as any)[parentKey] === typeAnnotation) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/TriggerLauncher__.ts

@@ -29,6 +29,7 @@ export class TriggerLauncher extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'TriggerLauncher' | 'MsgTriggerLauncher';