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

package/src/concepts/TriggerEvent__.ts

@@ -1,53 +1,56 @@
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//= ===============================================================================
-import { v4 as uuidv4 } from 'uuid';
+//================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property } from '../decorators';
+import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import classMap from '../common/classMap';
 import TypeAnnotation from './TypeAnnotation__';
 
 /**
  * 触发器事件
  */
+@className
 @concept('触发器事件')
+// @ts-ignore
 export class TriggerEvent extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName = 'TriggerEvent';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'TriggerEvent' | 'MsgTriggerEvent' = 'TriggerEvent';
+  // @ts-ignore
+  readonly concept!: 'TriggerEvent' | 'MsgTriggerEvent';
 
   /**
    * 触发器事件名称
    */
   @property()
-  name: string = undefined;
+  // @ts-ignore
+  name!: string;
 
   /**
    * 类型标注列表
    */
-  @property('TypeAnnotation')
+  @property({
+    objectRef: 'TypeAnnotation',
+    isArray: true,
+  })
   callBackLogic: Array<TypeAnnotation> = [];
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<TriggerEvent>) {
-    // @ts-ignore
-    source = { ...TriggerEvent.getDefaultOptions(), ...source };
+    source = Object.assign({}, TriggerEvent.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'TriggerEvent';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): TriggerEvent {
     return super.from(source, parentNode, parentKey) as TriggerEvent;
   }
@@ -63,7 +66,6 @@ export class TriggerEvent extends BaseNode {
     }
     return params;
   }
-
   /**
    * 设置触发器事件名称
    */
@@ -91,9 +93,10 @@ export class TriggerEvent extends BaseNode {
 
   getTypeAnnotationExistingNames(excludedList: Array<TypeAnnotation> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.callBackLogic as TypeAnnotation[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.callBackLogic as TypeAnnotation[]) || [])
+      .filter((item) => !excludedSet.has(item))
+      .map((item) => item.name);
   }
-
   getTypeAnnotationUniqueName(name = 'typeAnnotation1') {
     return utils.unique(name, this.getTypeAnnotationExistingNames(), undefined, false);
   }
@@ -130,7 +133,7 @@ export class TriggerEvent extends BaseNode {
           name: this.getTypeAnnotationUniqueName(),
         },
         this,
-        'callBackLogic'
+        'callBackLogic',
       );
     } else if (typeof options === 'string') {
       typeAnnotation = TypeAnnotation.from(
@@ -139,7 +142,7 @@ export class TriggerEvent extends BaseNode {
           name: options,
         },
         this,
-        'callBackLogic'
+        'callBackLogic',
       );
     } else if (options instanceof TypeAnnotation) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -152,7 +155,7 @@ export class TriggerEvent extends BaseNode {
           ...options,
         },
         this,
-        'callBackLogic'
+        'callBackLogic',
       );
     }
     this.callBackLogic.splice(index, 0, typeAnnotation);
@@ -260,7 +263,7 @@ export class TriggerEvent extends BaseNode {
     if (typeof options === 'string') {
       typeAnnotation = (this.callBackLogic as TypeAnnotation[]).find((item) => item.name === options);
       if (!typeAnnotation) {
-        throw new Error(`找不到类型标注 ${options}`);
+        throw new Error('找不到类型标注 ' + options);
       }
     } else {
       typeAnnotation = options;
@@ -269,7 +272,7 @@ export class TriggerEvent extends BaseNode {
   }
 
   __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const { parentKey } = typeAnnotation;
+    const parentKey = typeAnnotation.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -291,20 +294,19 @@ export class TriggerEvent extends BaseNode {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.TriggerEvent = TriggerEvent;
 export default TriggerEvent;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================

package/src/concepts/TriggerLauncher__.ts

@@ -1,55 +1,64 @@
-import { v4 as uuidv4 } from 'uuid';
 import { createCompilerState, withSourceMap, TranslatorState, shiftState } from '../translator';
 import Connector from './Connector__';
 import LogicItem from './LogicItem__';
-//= ===============================================================================
+import Identifier from './Identifier__';
+
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//= ===============================================================================
+//================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property } from '../decorators';
+import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import classMap from '../common/classMap';
-import Identifier from './Identifier__';
 import Module from './Module__';
 import App from './App__';
 
 /**
  * 触发器启动器
  */
+@className
 @concept('触发器启动器')
+// @ts-ignore
 export class TriggerLauncher extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName = 'TriggerLauncher';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'TriggerLauncher' | 'MsgTriggerLauncher' = 'TriggerLauncher';
+  // @ts-ignore
+  readonly concept!: 'TriggerLauncher' | 'MsgTriggerLauncher';
 
   /**
    * 触发器启动器名称
    */
   @property()
-  name: string = undefined;
+  // @ts-ignore
+  name!: string;
 
   /**
    * calleeNamespace
    */
   @property()
-  calleeNamespace: string = undefined;
+  // @ts-ignore
+  calleeNamespace!: string;
 
   /**
    * calleeName
    */
   @property()
-  calleeName: string = undefined;
+  // @ts-ignore
+  calleeName!: string;
 
   /**
-   * 标识符
+   * callBackLogic
    */
-  @property('Identifier')
-  callBackLogic: Identifier = undefined;
+  @property()
+  // @ts-ignore
+  callBackLogic!: Identifier;
 
   /**
    * 祖先 Module
@@ -57,7 +66,6 @@ export class TriggerLauncher extends BaseNode {
   get module() {
     return this.getAncestor('Module') as Module;
   }
-
   /**
    * 祖先 App
    */
@@ -69,16 +77,11 @@ export class TriggerLauncher extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<TriggerLauncher>) {
-    // @ts-ignore
-    source = { ...TriggerLauncher.getDefaultOptions(), ...source };
+    source = Object.assign({}, TriggerLauncher.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'TriggerLauncher';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): TriggerLauncher {
     return super.from(source, parentNode, parentKey) as TriggerLauncher;
   }
@@ -94,7 +97,6 @@ export class TriggerLauncher extends BaseNode {
     }
     return params;
   }
-
   /**
    * 设置触发器启动器名称
    */
@@ -133,12 +135,9 @@ export class TriggerLauncher extends BaseNode {
   }
 
   /**
-   * 设置标识符
+   * 设置callBackLogic
    */
   setCallBackLogic(callBackLogic: Identifier) {
-    callBackLogic._delete();
-    const relationOptions = { parentNode: this, parentKey: 'callBackLogic' };
-    Object.assign(callBackLogic, relationOptions);
     const object = {
       callBackLogic,
     };
@@ -147,58 +146,10 @@ export class TriggerLauncher extends BaseNode {
     });
   }
 
-  /**
-   * 删除标识符
-   * @param name 标识符名称
-   */
-  removeCallBackLogic(name: string): void;
-
-  /**
-   * 删除标识符
-   * @param callBackLogic 已有的标识符实例
-   */
-  removeCallBackLogic(callBackLogic: Identifier): void;
-
-  removeCallBackLogic(options: string | Identifier) {
-    let callBackLogic: Identifier;
-    if (typeof options === 'string') {
-      callBackLogic = this.callBackLogic;
-      if (!callBackLogic) {
-        throw new Error(`找不到标识符 ${options}`);
-      }
-    } else {
-      callBackLogic = options;
-    }
-    return callBackLogic.delete();
-  }
-
-  __removeLogicItem(logicItem: LogicItem) {
-    const { parentKey } = logicItem;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: logicItem,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
-        ~index && (this as any)[parentKey].splice(index, 1);
-        params.index = index;
-      } else if ((this as any)[parentKey] === logicItem) {
-        params.index = 0;
-        (this as any)[parentKey] = undefined;
-      }
-    }
-    return params;
-  }
-
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
 
   @withSourceMap()
   toEmbeddedTS(state = createCompilerState()): string {
@@ -266,15 +217,14 @@ export class TriggerLauncher extends BaseNode {
     return `${TriggerLauncher.getEmbeddedFileBasePath(this.app)}${name}.ts`;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.TriggerLauncher = TriggerLauncher;
 export default TriggerLauncher;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================