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

package/src/concepts/MsgTriggerEvent__.ts

@@ -27,6 +27,9 @@ export class MsgTriggerEvent extends TriggerEvent {
   /** 类名 */
   static readonly ConceptName = 'MsgTriggerEvent';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['TriggerEvent', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -300,7 +303,8 @@ export class MsgTriggerEvent extends TriggerEvent {
       // @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/MsgTriggerLauncher__.ts

@@ -1,4 +1,3 @@
-import LogicItem from './LogicItem__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -12,6 +11,7 @@ import BaseNode from '../common/BaseNode';
 import Argument from './Argument__';
 import Module from './Module__';
 import App from './App__';
+import LogicItem from './LogicItem__';
 import TriggerLauncher from './TriggerLauncher__';
 
 /**
@@ -24,6 +24,9 @@ export class MsgTriggerLauncher extends TriggerLauncher {
   /** 类名 */
   static readonly ConceptName = 'MsgTriggerLauncher';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['TriggerLauncher', 'BaseNode'];
+
   /**
    * 产品概念
    */
@@ -292,7 +295,8 @@ export class MsgTriggerLauncher extends TriggerLauncher {
       // @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/Namespace__.ts

@@ -1,3 +1,4 @@
+import Interface from './Interface__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -13,7 +14,7 @@ import Structure from './Structure__';
 import Enum from './Enum__';
 import Logic from './Logic__';
 import Function from './Function__';
-import Interface from './Interface__';
+import AbstractInterface from './AbstractInterface__';
 import View from './View__';
 import Variable from './Variable__';
 import ViewComponent from './ViewComponent__';
@@ -29,6 +30,9 @@ export class Namespace extends BaseNode {
   /** 类名 */
   static readonly ConceptName = 'Namespace';
 
+  /** 继承链 */
+  static readonly inheritanceChain = ['BaseNode'];
+
   /**
    * 产品概念
    */
@@ -128,11 +132,11 @@ export class Namespace extends BaseNode {
    * 接口列表
    */
   @property({
-    objectRef: 'Interface',
+    objectRef: 'AbstractInterface',
     isArray: true,
     defaultValue: [],
   })
-  interfaces: Array<Interface> = [];
+  interfaces: Array<AbstractInterface> = [];
 
   /**
    * 页面列表
@@ -1127,157 +1131,14 @@ export class Namespace extends BaseNode {
     return node;
   }
 
-  getInterfaceExistingNames(excludedList: Array<Interface> = []) {
+  getAbstractInterfaceExistingNames(excludedList: Array<AbstractInterface> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.interfaces as Interface[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
-  }
-  getInterfaceUniqueName(name = 'Interface1') {
-    return utils.unique(name, this.getInterfaceExistingNames(), undefined, false);
-  }
-
-  /**
-   * 插入接口
-   * @internal
-   * @param name 接口名称，如果不填会自动生成一个唯一名称
-   */
-  _insertInterfaceAt(name: string, index: number): Interface;
-
-  /**
-   * 插入接口
-   * @internal
-   * @param itfaceOptions 接口参数
-   */
-  _insertInterfaceAt(itfaceOptions: Partial<Interface>, index: number): Interface;
-
-  /**
-   * 插入接口
-   * @internal
-   * @param itface 已有的接口实例
-   */
-  _insertInterfaceAt(itface: Interface, index: number): Interface;
-
-  _insertInterfaceAt(options: string | Partial<Interface> | Interface, index: number) {
-    const itfaceOptions: any = {};
-    const relationOptions = { parentNode: this, parentKey: 'interfaces' };
-    let itface: Interface;
-    if (!options) {
-      itface = Interface.from(
-        {
-          ...itfaceOptions,
-          name: this.getInterfaceUniqueName(),
-        },
-        this,
-        'interfaces',
-      );
-    } else if (typeof options === 'string') {
-      itface = Interface.from(
-        {
-          ...itfaceOptions,
-          name: options,
-        },
-        this,
-        'interfaces',
-      );
-    } else if (options instanceof Interface) {
-      options.ensureDelete(); // 同一实例不支持多处存在
-      itface = options;
-      Object.assign(itface, relationOptions);
-    } else {
-      itface = Interface.from(
-        {
-          ...itfaceOptions,
-          ...options,
-        },
-        this,
-        'interfaces',
-      );
-    }
-    this.interfaces.splice(index, 0, itface);
-    return itface;
-  }
-
-  /**
-   * 插入接口
-   * @param name 接口名称，如果不填会自动生成一个唯一名称
-   */
-  insertInterfaceAt(name: string, index: number): Interface;
-
-  /**
-   * 插入接口
-   * @param itfaceOptions 接口参数
-   */
-  insertInterfaceAt(itfaceOptions: Partial<Interface>, index: number): Interface;
-
-  /**
-   * 插入接口
-   * @param itface 已有的接口实例
-   */
-  insertInterfaceAt(itface: Interface, index: number): Interface;
-
-  insertInterfaceAt(options: string | Partial<Interface> | Interface, index: number) {
-    const node = this._insertInterfaceAt(options as any, index);
-    node.create({
-      index,
-      parentNode: this,
-      parentKey: 'interfaces',
-    });
-    return node;
-  }
-
-  /**
-   * 添加接口
-   * @internal
-   * @param name 接口名称，如果不填会自动生成一个唯一名称
-   */
-  _addInterface(name?: string): Interface;
-
-  /**
-   * 添加接口
-   * @internal
-   * @param itfaceOptions 接口参数
-   */
-  _addInterface(itfaceOptions: Partial<Interface>): Interface;
-
-  /**
-   * 添加接口
-   * @internal
-   * @param itface 已有的接口实例
-   */
-  _addInterface(itface: Interface): Interface;
-
-  _addInterface(options?: string | Partial<Interface> | Interface) {
-    const index = 0;
-    return this._insertInterfaceAt(options as any, index);
+    return ((this.interfaces as AbstractInterface[]) || [])
+      .filter((item) => !excludedSet.has(item))
+      .map((item) => item.name);
   }
-
-  /**
-   * 添加接口
-   * @internal
-   * @param name 接口名称，如果不填会自动生成一个唯一名称
-   */
-  addInterface(name?: string): Interface;
-
-  /**
-   * 添加接口
-   * @param itfaceOptions 接口参数
-   */
-  addInterface(itfaceOptions: Partial<Interface>): Interface;
-
-  /**
-   * 添加接口
-   * @param itface 已有的接口实例
-   */
-  addInterface(itface: Interface): Interface;
-
-  addInterface(options?: string | Partial<Interface> | Interface) {
-    const node = this._addInterface(options as any);
-    const index = this.interfaces.indexOf(node);
-    node.create({
-      index,
-      parentNode: this,
-      parentKey: 'interfaces',
-    });
-    return node;
+  getAbstractInterfaceUniqueName(name = 'Interface1') {
+    return utils.unique(name, this.getAbstractInterfaceExistingNames(), undefined, false);
   }
 
   getViewExistingNames(excludedList: Array<View> = []) {
@@ -2084,7 +1945,8 @@ export class Namespace extends BaseNode {
       // @ts-ignore
       const n = namespace.__v_raw || namespace;
       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) {
@@ -2136,7 +1998,8 @@ export class Namespace extends BaseNode {
       // @ts-ignore
       const n = process.__v_raw || process;
       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) {
@@ -2188,7 +2051,8 @@ export class Namespace extends BaseNode {
       // @ts-ignore
       const n = structure.__v_raw || structure;
       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) {
@@ -2240,7 +2104,8 @@ export class Namespace extends BaseNode {
       // @ts-ignore
       const n = enumeration.__v_raw || enumeration;
       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) {
@@ -2292,7 +2157,8 @@ export class Namespace extends BaseNode {
       // @ts-ignore
       const n = logic.__v_raw || logic;
       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) {
@@ -2344,7 +2210,8 @@ export class Namespace extends BaseNode {
       // @ts-ignore
       const n = func.__v_raw || func;
       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) {
@@ -2359,18 +2226,18 @@ export class Namespace extends BaseNode {
    * 删除接口
    * @param name 接口名称
    */
-  removeInterface(name: string): void;
+  removeAbstractInterface(name: string): void;
 
   /**
    * 删除接口
    * @param itface 已有的接口实例
    */
-  removeInterface(itface: Interface): void;
+  removeAbstractInterface(itface: AbstractInterface): void;
 
-  removeInterface(options: string | Interface) {
-    let itface: Interface;
+  removeAbstractInterface(options: string | AbstractInterface) {
+    let itface: AbstractInterface;
     if (typeof options === 'string') {
-      itface = (this.interfaces as Interface[]).find((item) => item.name === options);
+      itface = (this.interfaces as AbstractInterface[]).find((item) => item.name === options);
       if (!itface) {
         throw new Error('找不到接口 ' + options);
       }
@@ -2380,7 +2247,7 @@ export class Namespace extends BaseNode {
     return itface.delete();
   }
 
-  __removeInterface(itface: Interface) {
+  __removeAbstractInterface(itface: AbstractInterface) {
     const parentKey = itface.parentKey;
     const params: Params = {
       parentNode: this,
@@ -2396,7 +2263,8 @@ export class Namespace extends BaseNode {
       // @ts-ignore
       const n = itface.__v_raw || itface;
       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) {
@@ -2448,7 +2316,8 @@ export class Namespace extends BaseNode {
       // @ts-ignore
       const n = view.__v_raw || view;
       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) {
@@ -2525,7 +2394,8 @@ export class Namespace 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) {
@@ -2577,7 +2447,8 @@ export class Namespace extends BaseNode {
       // @ts-ignore
       const n = viewComponent.__v_raw || viewComponent;
       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) {
@@ -2629,7 +2500,8 @@ export class Namespace extends BaseNode {
       // @ts-ignore
       const n = processComponent.__v_raw || processComponent;
       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) {
@@ -2665,8 +2537,8 @@ export class Namespace extends BaseNode {
    */
   getNamespace(): string {
     if (this.path) return this.path;
-    if (this.parentNode.concept === 'Connector') {
-      return `${(this.parentNode as any).getNamespace()}`;
+    if ((this.parentNode as BaseNode).concept === 'Connector') {
+      return `${(this.parentNode as Namespace).getNamespace()}`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getNamespace)
       return `${(this.parentNode as Namespace).getNamespace()}`;
@@ -2678,8 +2550,8 @@ export class Namespace extends BaseNode {
    */
   getTsNamespace(): string {
     if (this.path) return this.path;
-    if (this.parentNode.concept === 'Connector') {
-      return `${(this.parentNode as any).getNamespace()}`;
+    if ((this.parentNode as BaseNode).concept === 'Connector') {
+      return `${(this.parentNode as Namespace).getNamespace()}`;
     }
     if (this.parentNode && (this.parentNode as Namespace).getNamespace)
       return `${(this.parentNode as Namespace).getNamespace()}.${this.tsName}`;
@@ -2699,6 +2571,207 @@ export class Namespace extends BaseNode {
     return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.title);
   }
 
+  //todo 集合替换
+  getInterfaceExistingNames(excludedList: Array<Interface> = []) {
+    const excludedSet = new Set(excludedList);
+    return ((this.interfaces as Interface[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+  }
+  getInterfaceUniqueName(name = 'Interface1') {
+    return utils.unique(name, this.getInterfaceExistingNames(), undefined, false);
+  }
+
+  /**
+   * 插入接口
+   * @internal
+   * @param name 接口名称，如果不填会自动生成一个唯一名称
+   */
+  _insertInterfaceAt(name: string, index: number): Interface;
+
+  /**
+   * 插入接口
+   * @internal
+   * @param itfaceOptions 接口参数
+   */
+  _insertInterfaceAt(itfaceOptions: Partial<Interface>, index: number): Interface;
+
+  /**
+   * 插入接口
+   * @internal
+   * @param itface 已有的接口实例
+   */
+  _insertInterfaceAt(itface: Interface, index: number): Interface;
+
+  _insertInterfaceAt(options: string | Partial<Interface> | Interface, index: number) {
+    const itfaceOptions: any = {};
+    const relationOptions = { parentNode: this, parentKey: 'interfaces' };
+    let itface: Interface;
+    if (!options) {
+      itface = Interface.from(
+        {
+          ...itfaceOptions,
+          name: this.getInterfaceUniqueName(),
+        },
+        this,
+        'interfaces',
+      );
+    } else if (typeof options === 'string') {
+      itface = Interface.from(
+        {
+          ...itfaceOptions,
+          name: options,
+        },
+        this,
+        'interfaces',
+      );
+    } else if (options instanceof Interface) {
+      options.ensureDelete(); // 同一实例不支持多处存在
+      itface = options;
+      Object.assign(itface, relationOptions);
+    } else {
+      itface = Interface.from(
+        {
+          ...itfaceOptions,
+          ...options,
+        },
+        this,
+        'interfaces',
+      );
+    }
+    this.interfaces.splice(index, 0, itface);
+    return itface;
+  }
+
+  /**
+   * 插入接口
+   * @param name 接口名称，如果不填会自动生成一个唯一名称
+   */
+  insertInterfaceAt(name: string, index: number): Interface;
+
+  /**
+   * 插入接口
+   * @param itfaceOptions 接口参数
+   */
+  insertInterfaceAt(itfaceOptions: Partial<Interface>, index: number): Interface;
+
+  /**
+   * 插入接口
+   * @param itface 已有的接口实例
+   */
+  insertInterfaceAt(itface: Interface, index: number): Interface;
+
+  insertInterfaceAt(options: string | Partial<Interface> | Interface, index: number) {
+    const node = this._insertInterfaceAt(options as any, index);
+    node.create({
+      index,
+      parentNode: this,
+      parentKey: 'interfaces',
+    });
+    return node;
+  }
+
+  /**
+   * 添加接口
+   * @internal
+   * @param name 接口名称，如果不填会自动生成一个唯一名称
+   */
+  _addInterface(name?: string): Interface;
+
+  /**
+   * 添加接口
+   * @internal
+   * @param itfaceOptions 接口参数
+   */
+  _addInterface(itfaceOptions: Partial<Interface>): Interface;
+
+  /**
+   * 添加接口
+   * @internal
+   * @param itface 已有的接口实例
+   */
+  _addInterface(itface: Interface): Interface;
+
+  _addInterface(options?: string | Partial<Interface> | Interface) {
+    const index = 0;
+    return this._insertInterfaceAt(options as any, index);
+  }
+
+  /**
+   * 添加接口
+   * @internal
+   * @param name 接口名称，如果不填会自动生成一个唯一名称
+   */
+  addInterface(name?: string): Interface;
+
+  /**
+   * 添加接口
+   * @param itfaceOptions 接口参数
+   */
+  addInterface(itfaceOptions: Partial<Interface>): Interface;
+
+  /**
+   * 添加接口
+   * @param itface 已有的接口实例
+   */
+  addInterface(itface: Interface): Interface;
+
+  addInterface(options?: string | Partial<Interface> | Interface) {
+    const node = this._addInterface(options as any);
+    const index = this.interfaces.indexOf(node);
+    node.create({
+      index,
+      parentNode: this,
+      parentKey: 'interfaces',
+    });
+    return node;
+  }
+  /**
+   * 删除接口
+   * @param name 接口名称
+   */
+  removeInterface(name: string): void;
+
+  /**
+   * 删除接口
+   * @param itface 已有的接口实例
+   */
+  removeInterface(itface: Interface): void;
+
+  removeInterface(options: string | Interface) {
+    let itface: Interface;
+    if (typeof options === 'string') {
+      itface = (this.interfaces as Interface[]).find((item) => item.name === options);
+      if (!itface) {
+        throw new Error('找不到接口 ' + options);
+      }
+    } else {
+      itface = options;
+    }
+    return itface.delete();
+  }
+
+  __removeInterface(itface: Interface) {
+    const parentKey = itface.parentKey;
+    const params: Params = {
+      parentNode: this,
+      parentKey,
+      index: -1,
+      object: null,
+      oldObject: itface,
+    };
+    if (parentKey) {
+      params.parentKey = parentKey;
+      if (Array.isArray((this as any)[parentKey])) {
+        const index = (this as any)[parentKey].indexOf(itface);
+        ~index && (this as any)[parentKey].splice(index, 1);
+        params.index = index;
+      } else if ((this as any)[parentKey] === itface) {
+        params.index = 0;
+        (this as any)[parentKey] = undefined;
+      }
+    }
+    return params;
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓