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

package/src/concepts/ProcessComponent__.ts

@@ -3,28 +3,28 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import Attribute from './Attribute__';
-import Logic from './Logic__';
-import Module from './Module__';
-import App from './App__';
+import type Attribute from './Attribute__';
+import type Logic from './Logic__';
+import type Module from './Module__';
+import type App from './App__';
 
 /**
  * 流程组件
  */
-@className
 @concept('流程组件')
-// @ts-ignore
 export class ProcessComponent extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'ProcessComponent';
+  static readonly ConceptName: string = 'ProcessComponent';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -37,28 +37,24 @@ export class ProcessComponent extends BaseNode {
    * 流程组件名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 流程组件标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * 流程组件描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
    * category
    */
   @property()
-  // @ts-ignore
   category!: string;
 
   /**
@@ -151,6 +147,7 @@ export class ProcessComponent extends BaseNode {
   _insertAttributeAt(options: string | Partial<Attribute> | Attribute, index: number) {
     const attributeOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'attrs' };
+    const Attribute = getConceptConstructor('Attribute');
     let attribute: Attribute;
     if (!options) {
       attribute = Attribute.from(
@@ -170,7 +167,7 @@ export class ProcessComponent extends BaseNode {
         this,
         'attrs',
       );
-    } else if (options instanceof Attribute) {
+    } else if (asserts.isAttribute(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       attribute = options;
       Object.assign(attribute, relationOptions);
@@ -304,6 +301,7 @@ export class ProcessComponent extends BaseNode {
   _insertLogicAt(options: string | Partial<Logic> | Logic, index: number) {
     const logicOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'logics' };
+    const Logic = getConceptConstructor('Logic');
     let logic: Logic;
     if (!options) {
       logic = Logic.from(
@@ -323,7 +321,7 @@ export class ProcessComponent extends BaseNode {
         this,
         'logics',
       );
-    } else if (options instanceof Logic) {
+    } else if (asserts.isLogic(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       logic = options;
       Object.assign(logic, relationOptions);

package/src/concepts/ProcessElement__.ts

@@ -17,42 +17,43 @@ import {
   isFromStartNode,
   getFlowBeforeElements,
 } from '../server/getProcesses';
-import Namespace from './Namespace__';
-import View from './View__';
+import type Namespace from './Namespace__';
+import type View from './View__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import BindEvent from './BindEvent__';
-import Rect from './Rect__';
-import Point from './Point__';
-import Logic from './Logic__';
-import Variable from './Variable__';
-import Return from './Return__';
-import Constant from './Constant__';
-import BindAttribute from './BindAttribute__';
-import Process from './Process__';
-import Module from './Module__';
-import App from './App__';
+import type BindEvent from './BindEvent__';
+import type Rect from './Rect__';
+import type Point from './Point__';
+import type Logic from './Logic__';
+import type Variable from './Variable__';
+import type Return from './Return__';
+import type Constant from './Constant__';
+import type BindAttribute from './BindAttribute__';
+import type MultiApprovalPolicy from './MultiApprovalPolicy__';
+import type Process from './Process__';
+import type Module from './Module__';
+import type App from './App__';
 
 /**
  * 流程元素
  */
-@className
 @concept('流程元素')
-// @ts-ignore
 export class ProcessElement extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'ProcessElement';
+  static readonly ConceptName: string = 'ProcessElement';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -65,21 +66,18 @@ export class ProcessElement extends BaseNode {
    * 流程元素名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 流程元素标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * 流程元素描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -96,21 +94,18 @@ export class ProcessElement extends BaseNode {
    * type
    */
   @property()
-  // @ts-ignore
   type!: string;
 
   /**
    * sourceRef
    */
   @property()
-  // @ts-ignore
   sourceRef!: string;
 
   /**
    * targetRef
    */
   @property()
-  // @ts-ignore
   targetRef!: string;
 
   /**
@@ -119,7 +114,6 @@ export class ProcessElement extends BaseNode {
   @property({
     objectRef: 'Rect',
   })
-  // @ts-ignore
   bounds!: Rect;
 
   /**
@@ -136,7 +130,6 @@ export class ProcessElement extends BaseNode {
    * flowValue
    */
   @property()
-  // @ts-ignore
   flowValue!: string;
 
   /**
@@ -145,7 +138,6 @@ export class ProcessElement extends BaseNode {
   @property({
     objectRef: 'Logic',
   })
-  // @ts-ignore
   logic!: Logic;
 
   /**
@@ -188,6 +180,14 @@ export class ProcessElement extends BaseNode {
   })
   bindAttrs: Array<BindAttribute> = [];
 
+  /**
+   * 多人审批任务
+   */
+  @property({
+    objectRef: 'MultiApprovalPolicy',
+  })
+  multiApprovalPolicy!: MultiApprovalPolicy;
+
   /**
    * 祖先 Process
    */
@@ -351,6 +351,7 @@ export class ProcessElement extends BaseNode {
   _insertBindEventAt(options: string | Partial<BindEvent> | BindEvent, index: number) {
     const bindEventOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'bindEvents' };
+    const BindEvent = getConceptConstructor('BindEvent');
     let bindEvent: BindEvent;
     if (!options) {
       bindEvent = BindEvent.from(
@@ -370,7 +371,7 @@ export class ProcessElement extends BaseNode {
         this,
         'bindEvents',
       );
-    } else if (options instanceof BindEvent) {
+    } else if (asserts.isBindEvent(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       bindEvent = options;
       Object.assign(bindEvent, relationOptions);
@@ -504,6 +505,7 @@ export class ProcessElement extends BaseNode {
   _insertPointAt(options: string | Partial<Point> | Point, index: number) {
     const pointOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'waypoints' };
+    const Point = getConceptConstructor('Point');
     let point: Point;
     if (!options) {
       point = Point.from(
@@ -523,7 +525,7 @@ export class ProcessElement extends BaseNode {
         this,
         'waypoints',
       );
-    } else if (options instanceof Point) {
+    } else if (asserts.isPoint(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       point = options;
       Object.assign(point, relationOptions);
@@ -657,6 +659,7 @@ export class ProcessElement extends BaseNode {
   _insertVariableAt(options: string | Partial<Variable> | Variable, index: number) {
     const variableOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'variables' };
+    const Variable = getConceptConstructor('Variable');
     let variable: Variable;
     if (!options) {
       variable = Variable.from(
@@ -676,7 +679,7 @@ export class ProcessElement extends BaseNode {
         this,
         'variables',
       );
-    } else if (options instanceof Variable) {
+    } else if (asserts.isVariable(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       variable = options;
       Object.assign(variable, relationOptions);
@@ -810,6 +813,7 @@ export class ProcessElement extends BaseNode {
   _insertReturnAt(options: string | Partial<Return> | Return, index: number) {
     const retOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'returns' };
+    const Return = getConceptConstructor('Return');
     let ret: Return;
     if (!options) {
       ret = Return.from(
@@ -829,7 +833,7 @@ export class ProcessElement extends BaseNode {
         this,
         'returns',
       );
-    } else if (options instanceof Return) {
+    } else if (asserts.isReturn(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       ret = options;
       Object.assign(ret, relationOptions);
@@ -963,6 +967,7 @@ export class ProcessElement extends BaseNode {
   _insertConstantAt(options: string | Partial<Constant> | Constant, index: number) {
     const constantOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'constants' };
+    const Constant = getConceptConstructor('Constant');
     let constant: Constant;
     if (!options) {
       constant = Constant.from(
@@ -982,7 +987,7 @@ export class ProcessElement extends BaseNode {
         this,
         'constants',
       );
-    } else if (options instanceof Constant) {
+    } else if (asserts.isConstant(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       constant = options;
       Object.assign(constant, relationOptions);
@@ -1118,6 +1123,7 @@ export class ProcessElement extends BaseNode {
   _insertBindAttributeAt(options: string | Partial<BindAttribute> | BindAttribute, index: number) {
     const bindAttributeOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'bindAttrs' };
+    const BindAttribute = getConceptConstructor('BindAttribute');
     let bindAttribute: BindAttribute;
     if (!options) {
       bindAttribute = BindAttribute.from(
@@ -1137,7 +1143,7 @@ export class ProcessElement extends BaseNode {
         this,
         'bindAttrs',
       );
-    } else if (options instanceof BindAttribute) {
+    } else if (asserts.isBindAttribute(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       bindAttribute = options;
       Object.assign(bindAttribute, relationOptions);
@@ -1687,6 +1693,62 @@ export class ProcessElement extends BaseNode {
     return params;
   }
 
+  /**
+   * 删除多人审批任务
+   * @param name 多人审批任务名称
+   */
+  removeMultiApprovalPolicy(name: string): void;
+
+  /**
+   * 删除多人审批任务
+   * @param multiApprovalPolicy 已有的多人审批任务实例
+   */
+  removeMultiApprovalPolicy(multiApprovalPolicy: MultiApprovalPolicy): void;
+
+  removeMultiApprovalPolicy(options: string | MultiApprovalPolicy) {
+    let multiApprovalPolicy: MultiApprovalPolicy;
+    if (typeof options === 'string') {
+      multiApprovalPolicy = this.multiApprovalPolicy;
+      if (!multiApprovalPolicy) {
+        throw new Error('找不到多人审批任务 ' + options);
+      }
+    } else {
+      multiApprovalPolicy = options;
+    }
+    return multiApprovalPolicy.delete();
+  }
+
+  __removeMultiApprovalPolicy(multiApprovalPolicy: MultiApprovalPolicy) {
+    const parentKey = multiApprovalPolicy.parentKey;
+    const params: Params = {
+      parentNode: this,
+      parentKey,
+      index: -1,
+      object: null,
+      oldObject: multiApprovalPolicy,
+    };
+    if (parentKey) {
+      params.parentKey = parentKey;
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = multiApprovalPolicy.__v_raw || multiApprovalPolicy;
+      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 {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
+      }
+    }
+    return params;
+  }
+
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
@@ -1699,7 +1761,12 @@ export class ProcessElement extends BaseNode {
   }
 
   get isUserTask() {
-    return this.type === 'UserTask' || this.type === 'ApprovalTask' || this.type === 'InitiateTask';
+    return (
+      this.type === 'UserTask' ||
+      this.type === 'ApprovalTask' ||
+      this.type === 'MultiApprovalTask' ||
+      this.type === 'InitiateTask'
+    );
   }
 
   get logics() {

package/src/concepts/ProcessOutcome__.ts

@@ -14,25 +14,24 @@ import { getFlowAfterElements } from '../server/getProcesses';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
-import BaseNode from '../common/BaseNode';
 import LogicItem from './LogicItem__';
 
 /**
  * 判断结果
  */
-@className
 @concept('判断结果')
-// @ts-ignore
 export class ProcessOutcome extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'ProcessOutcome';
+  static readonly ConceptName: string = 'ProcessOutcome';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念
@@ -51,7 +50,6 @@ export class ProcessOutcome extends LogicItem {
    * 关联连接器
    */
   @property()
-  // @ts-ignore
   flowRef!: string;
 
   /**

package/src/concepts/ProcessOutcomes__.ts

@@ -13,25 +13,24 @@ import { getFlowAfterElements } from '../server/getProcesses';
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
-import BaseNode from '../common/BaseNode';
 import LogicItem from './LogicItem__';
 
 /**
  * 判断结果数组
  */
-@className
 @concept('判断结果数组')
-// @ts-ignore
 export class ProcessOutcomes extends LogicItem {
   /** 类名 */
-  static readonly ConceptName = 'ProcessOutcomes';
+  static readonly ConceptName: string = 'ProcessOutcomes';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['LogicItem', 'BaseNode'];
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/Process__.ts

@@ -12,40 +12,40 @@ import {
 } from '../translator';
 import { genLaunchProcess, syncMemberExpression } from '../server/getProcesses';
 import { process2LogicNamespace } from '../server/process2LogicNamespace';
-import Namespace from './Namespace__';
-import Logic from './Logic__';
-import Variable from './Variable__';
-import Identifier from './Identifier__';
+import type Namespace from './Namespace__';
+import type Logic from './Logic__';
+import type Variable from './Variable__';
+import type Identifier from './Identifier__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
 
 import * as utils from '../utils';
+import * as types from './utils/types';
+import * as asserts from './utils/asserts';
 import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import BindEvent from './BindEvent__';
-import Param from './Param__';
-import Return from './Return__';
-import Constant from './Constant__';
-import ProcessElement from './ProcessElement__';
-import Module from './Module__';
-import App from './App__';
+import type BindEvent from './BindEvent__';
+import type Param from './Param__';
+import type Return from './Return__';
+import type Constant from './Constant__';
+import type ProcessElement from './ProcessElement__';
+import type Module from './Module__';
+import type App from './App__';
 
 /**
  * 流程
  */
-@className
 @concept('流程')
-// @ts-ignore
 export class Process extends BaseNode {
   /** 类名 */
-  static readonly ConceptName = 'Process';
+  static readonly ConceptName: string = 'Process';
 
   /** 继承链 */
-  static readonly inheritanceChain = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -58,21 +58,18 @@ export class Process extends BaseNode {
    * 流程名称
    */
   @property()
-  // @ts-ignore
   name!: string;
 
   /**
    * 流程标题
    */
   @property()
-  // @ts-ignore
   title!: string;
 
   /**
    * 流程描述
    */
   @property()
-  // @ts-ignore
   description!: string;
 
   /**
@@ -231,6 +228,7 @@ export class Process extends BaseNode {
   _insertBindEventAt(options: string | Partial<BindEvent> | BindEvent, index: number) {
     const bindEventOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'bindEvents' };
+    const BindEvent = getConceptConstructor('BindEvent');
     let bindEvent: BindEvent;
     if (!options) {
       bindEvent = BindEvent.from(
@@ -250,7 +248,7 @@ export class Process extends BaseNode {
         this,
         'bindEvents',
       );
-    } else if (options instanceof BindEvent) {
+    } else if (asserts.isBindEvent(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       bindEvent = options;
       Object.assign(bindEvent, relationOptions);
@@ -384,6 +382,7 @@ export class Process extends BaseNode {
   _insertParamAt(options: string | Partial<Param> | Param, index: number) {
     const paramOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'params' };
+    const Param = getConceptConstructor('Param');
     let param: Param;
     if (!options) {
       param = Param.from(
@@ -403,7 +402,7 @@ export class Process extends BaseNode {
         this,
         'params',
       );
-    } else if (options instanceof Param) {
+    } else if (asserts.isParam(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       param = options;
       Object.assign(param, relationOptions);
@@ -537,6 +536,7 @@ export class Process extends BaseNode {
   _insertReturnAt(options: string | Partial<Return> | Return, index: number) {
     const retOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'returns' };
+    const Return = getConceptConstructor('Return');
     let ret: Return;
     if (!options) {
       ret = Return.from(
@@ -556,7 +556,7 @@ export class Process extends BaseNode {
         this,
         'returns',
       );
-    } else if (options instanceof Return) {
+    } else if (asserts.isReturn(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       ret = options;
       Object.assign(ret, relationOptions);
@@ -690,6 +690,7 @@ export class Process extends BaseNode {
   _insertConstantAt(options: string | Partial<Constant> | Constant, index: number) {
     const constantOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'constants' };
+    const Constant = getConceptConstructor('Constant');
     let constant: Constant;
     if (!options) {
       constant = Constant.from(
@@ -709,7 +710,7 @@ export class Process extends BaseNode {
         this,
         'constants',
       );
-    } else if (options instanceof Constant) {
+    } else if (asserts.isConstant(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       constant = options;
       Object.assign(constant, relationOptions);
@@ -845,6 +846,7 @@ export class Process extends BaseNode {
   _insertElementAt(options: string | Partial<ProcessElement> | ProcessElement, index: number) {
     const elementOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'elements' };
+    const ProcessElement = getConceptConstructor('ProcessElement');
     let element: ProcessElement;
     if (!options) {
       element = ProcessElement.from(
@@ -864,7 +866,7 @@ export class Process extends BaseNode {
         this,
         'elements',
       );
-    } else if (options instanceof ProcessElement) {
+    } else if (asserts.isProcessElement(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
       element = options;
       Object.assign(element, relationOptions);
@@ -1542,6 +1544,7 @@ export class Process extends BaseNode {
           concept: 'ProcessElement',
           name: 'Start',
           type: 'StartNoneEvent',
+          title: '开始',
           bounds: {
             concept: 'Rect',
             x: 0,
@@ -1600,6 +1603,7 @@ export class Process extends BaseNode {
           concept: 'ProcessElement',
           name: 'End',
           type: 'EndNoneEvent',
+          title: '结束',
           bounds: {
             concept: 'Rect',
             x: 0,
@@ -1660,7 +1664,7 @@ Process.prototype.setName = function (name: string) {
     actionMsg: '设置名称',
   });
   syncMemberExpression(this, (node) => {
-    if (node.object instanceof Identifier && node.object.name === oldName) {
+    if (asserts.isIdentifier(node.object) && node.object.name === oldName) {
       node.object.update({
         name,
       });