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

package/src/concepts/ProcessOutcome__.ts

@@ -1,32 +1,28 @@
-import { TranslatorState, withSourceMap } from '../translator';
+import { v4 as uuidv4 } from 'uuid';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
 
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//================================================================================
+//= ===============================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
-import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
+import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
 
 /**
  * 判断结果
  */
-@className
 @concept('判断结果')
-// @ts-ignore
 export class ProcessOutcome extends LogicItem {
-  /** 类名 */
-  static readonly ConceptName = 'ProcessOutcome';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'ProcessOutcome';
+  @property()
+  concept: 'ProcessOutcome' = 'ProcessOutcome';
 
   /**
    * 判断结果标题
@@ -38,18 +34,22 @@ export class ProcessOutcome extends LogicItem {
    * 关联连接器
    */
   @property()
-  // @ts-ignore
-  flowRef!: string;
+  flowRef: string = undefined;
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<ProcessOutcome>) {
-    source = Object.assign({}, ProcessOutcome.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...ProcessOutcome.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'ProcessOutcome';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): ProcessOutcome {
     return super.from(source, parentNode, parentKey) as ProcessOutcome;
   }
@@ -66,24 +66,25 @@ export class ProcessOutcome extends LogicItem {
     });
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const code = `return () => ${this.flowRef ? `"${this.flowRef}"` : '__IDENTIFIER__'}`;
     return code;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.ProcessOutcome = ProcessOutcome;
 export default ProcessOutcome;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================

package/src/concepts/ProcessOutcomes__.ts

@@ -1,31 +1,27 @@
-import { TranslatorState, withSourceMap } from '../translator';
-//================================================================================
+import { v4 as uuidv4 } from 'uuid';
+import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//================================================================================
+//= ===============================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
-import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
+import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
 
 /**
  * 判断结果数组
  */
-@className
 @concept('判断结果数组')
-// @ts-ignore
 export class ProcessOutcomes extends LogicItem {
-  /** 类名 */
-  static readonly ConceptName = 'ProcessOutcomes';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'ProcessOutcomes';
+  @property()
+  concept: 'ProcessOutcomes' = 'ProcessOutcomes';
 
   /**
    * 判断结果数组标题
@@ -43,11 +39,16 @@ export class ProcessOutcomes extends LogicItem {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<ProcessOutcomes>) {
-    source = Object.assign({}, ProcessOutcomes.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...ProcessOutcomes.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'ProcessOutcomes';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): ProcessOutcomes {
     return super.from(source, parentNode, parentKey) as ProcessOutcomes;
   }
@@ -64,23 +65,24 @@ export class ProcessOutcomes extends LogicItem {
     });
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const code = `return () => ${this.flowRefs?.length > 0 ? `"${this.flowRefs}"` : '__IDENTIFIER__'}`;
     return code;
   }
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.ProcessOutcomes = ProcessOutcomes;
 export default ProcessOutcomes;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================

package/src/concepts/Process__.ts

@@ -1,3 +1,4 @@
+import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import { genLaunchProcess, syncMemberExpression } from '../server/getProcesses';
 import { process2LogicNamespace } from '../server/process2LogicNamespace';
@@ -5,16 +6,16 @@ import Namespace from './Namespace__';
 import Logic from './Logic__';
 import Variable from './Variable__';
 import Identifier from './Identifier__';
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//================================================================================
+//= ===============================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
-import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
+import classMap from '../common/classMap';
 import BindEvent from './BindEvent__';
 import Param from './Param__';
 import Return from './Return__';
@@ -26,39 +27,31 @@ import App from './App__';
 /**
  * 流程
  */
-@className
 @concept('流程')
-// @ts-ignore
 export class Process extends BaseNode {
-  /** 类名 */
-  static readonly ConceptName = 'Process';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'Process';
+  @property()
+  concept: 'Process' = 'Process';
 
   /**
    * 流程名称
    */
   @property()
-  // @ts-ignore
-  name!: string;
+  name: string = undefined;
 
   /**
    * 流程标题
    */
   @property()
-  // @ts-ignore
-  title!: string;
+  title: string = undefined;
 
   /**
    * 流程描述
    */
   @property()
-  // @ts-ignore
-  description!: string;
+  description: string = undefined;
 
   /**
    * 元素绑定事件列表
@@ -96,6 +89,7 @@ export class Process extends BaseNode {
   get module() {
     return this.getAncestor('Module') as Module;
   }
+
   /**
    * 祖先 App
    */
@@ -107,11 +101,16 @@ export class Process extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Process>) {
-    source = Object.assign({}, Process.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...Process.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'Process';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): Process {
     return super.from(source, parentNode, parentKey) as Process;
   }
@@ -127,6 +126,7 @@ export class Process extends BaseNode {
     }
     return params;
   }
+
   /**
    * 设置流程名称
    */
@@ -168,6 +168,7 @@ export class Process extends BaseNode {
     const excludedSet = new Set(excludedList);
     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);
   }
@@ -204,7 +205,7 @@ export class Process extends BaseNode {
           name: this.getBindEventUniqueName(),
         },
         this,
-        'bindEvents',
+        'bindEvents'
       );
     } else if (typeof options === 'string') {
       bindEvent = BindEvent.from(
@@ -213,7 +214,7 @@ export class Process extends BaseNode {
           name: options,
         },
         this,
-        'bindEvents',
+        'bindEvents'
       );
     } else if (options instanceof BindEvent) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -226,7 +227,7 @@ export class Process extends BaseNode {
           ...options,
         },
         this,
-        'bindEvents',
+        'bindEvents'
       );
     }
     this.bindEvents.splice(index, 0, bindEvent);
@@ -321,6 +322,7 @@ export class Process extends BaseNode {
     const excludedSet = new Set(excludedList);
     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);
   }
@@ -357,7 +359,7 @@ export class Process extends BaseNode {
           name: this.getParamUniqueName(),
         },
         this,
-        'params',
+        'params'
       );
     } else if (typeof options === 'string') {
       param = Param.from(
@@ -366,7 +368,7 @@ export class Process extends BaseNode {
           name: options,
         },
         this,
-        'params',
+        'params'
       );
     } else if (options instanceof Param) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -379,7 +381,7 @@ export class Process extends BaseNode {
           ...options,
         },
         this,
-        'params',
+        'params'
       );
     }
     this.params.splice(index, 0, param);
@@ -474,6 +476,7 @@ export class Process extends BaseNode {
     const excludedSet = new Set(excludedList);
     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);
   }
@@ -510,7 +513,7 @@ export class Process extends BaseNode {
           name: this.getReturnUniqueName(),
         },
         this,
-        'returns',
+        'returns'
       );
     } else if (typeof options === 'string') {
       ret = Return.from(
@@ -519,7 +522,7 @@ export class Process extends BaseNode {
           name: options,
         },
         this,
-        'returns',
+        'returns'
       );
     } else if (options instanceof Return) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -532,7 +535,7 @@ export class Process extends BaseNode {
           ...options,
         },
         this,
-        'returns',
+        'returns'
       );
     }
     this.returns.splice(index, 0, ret);
@@ -627,6 +630,7 @@ export class Process extends BaseNode {
     const excludedSet = new Set(excludedList);
     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);
   }
@@ -663,7 +667,7 @@ export class Process extends BaseNode {
           name: this.getConstantUniqueName(),
         },
         this,
-        'constants',
+        'constants'
       );
     } else if (typeof options === 'string') {
       constant = Constant.from(
@@ -672,7 +676,7 @@ export class Process extends BaseNode {
           name: options,
         },
         this,
-        'constants',
+        'constants'
       );
     } else if (options instanceof Constant) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -685,7 +689,7 @@ export class Process extends BaseNode {
           ...options,
         },
         this,
-        'constants',
+        'constants'
       );
     }
     this.constants.splice(index, 0, constant);
@@ -778,10 +782,9 @@ export class Process extends BaseNode {
 
   getElementExistingNames(excludedList: Array<ProcessElement> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.elements as ProcessElement[]) || [])
-      .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+    return ((this.elements as ProcessElement[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
+
   getElementUniqueName(name = 'element1') {
     return utils.unique(name, this.getElementExistingNames(), undefined, false);
   }
@@ -818,7 +821,7 @@ export class Process extends BaseNode {
           name: this.getElementUniqueName(),
         },
         this,
-        'elements',
+        'elements'
       );
     } else if (typeof options === 'string') {
       element = ProcessElement.from(
@@ -827,7 +830,7 @@ export class Process extends BaseNode {
           name: options,
         },
         this,
-        'elements',
+        'elements'
       );
     } else if (options instanceof ProcessElement) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -840,7 +843,7 @@ export class Process extends BaseNode {
           ...options,
         },
         this,
-        'elements',
+        'elements'
       );
     }
     this.elements.splice(index, 0, element);
@@ -948,7 +951,7 @@ export class Process extends BaseNode {
     if (typeof options === 'string') {
       bindEvent = (this.bindEvents as BindEvent[]).find((item) => item.name === options);
       if (!bindEvent) {
-        throw new Error('找不到元素绑定事件 ' + options);
+        throw new Error(`找不到元素绑定事件 ${options}`);
       }
     } else {
       bindEvent = options;
@@ -957,7 +960,7 @@ export class Process extends BaseNode {
   }
 
   __removeBindEvent(bindEvent: BindEvent) {
-    const parentKey = bindEvent.parentKey;
+    const { parentKey } = bindEvent;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -996,7 +999,7 @@ export class Process extends BaseNode {
     if (typeof options === 'string') {
       param = (this.params as Param[]).find((item) => item.name === options);
       if (!param) {
-        throw new Error('找不到输入参数 ' + options);
+        throw new Error(`找不到输入参数 ${options}`);
       }
     } else {
       param = options;
@@ -1005,7 +1008,7 @@ export class Process extends BaseNode {
   }
 
   __removeParam(param: Param) {
-    const parentKey = param.parentKey;
+    const { parentKey } = param;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -1044,7 +1047,7 @@ export class Process extends BaseNode {
     if (typeof options === 'string') {
       ret = (this.returns as Return[]).find((item) => item.name === options);
       if (!ret) {
-        throw new Error('找不到输出参数 ' + options);
+        throw new Error(`找不到输出参数 ${options}`);
       }
     } else {
       ret = options;
@@ -1053,7 +1056,7 @@ export class Process extends BaseNode {
   }
 
   __removeReturn(ret: Return) {
-    const parentKey = ret.parentKey;
+    const { parentKey } = ret;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -1092,7 +1095,7 @@ export class Process extends BaseNode {
     if (typeof options === 'string') {
       constant = (this.constants as Constant[]).find((item) => item.name === options);
       if (!constant) {
-        throw new Error('找不到常量 ' + options);
+        throw new Error(`找不到常量 ${options}`);
       }
     } else {
       constant = options;
@@ -1101,7 +1104,7 @@ export class Process extends BaseNode {
   }
 
   __removeConstant(constant: Constant) {
-    const parentKey = constant.parentKey;
+    const { parentKey } = constant;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -1140,7 +1143,7 @@ export class Process extends BaseNode {
     if (typeof options === 'string') {
       element = (this.elements as ProcessElement[]).find((item) => item.name === options);
       if (!element) {
-        throw new Error('找不到流程元素 ' + options);
+        throw new Error(`找不到流程元素 ${options}`);
       }
     } else {
       element = options;
@@ -1149,7 +1152,7 @@ export class Process extends BaseNode {
   }
 
   __removeProcessElement(element: ProcessElement) {
-    const parentKey = element.parentKey;
+    const { parentKey } = element;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -1171,10 +1174,10 @@ export class Process extends BaseNode {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
   onChange($event?: EventPayload): void {
     this.emit('change', $event);
   }
@@ -1204,9 +1207,7 @@ export class Process extends BaseNode {
 
   getVarExistingNames(excludedList: Array<Param | Return | Constant | ProcessElement> = []) {
     const excludedSet = new Set(excludedList);
-    return [...this.params, ...this.returns, ...this.constants, ...this.elements]
-      .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+    return [...this.params, ...this.returns, ...this.constants, ...this.elements].filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
 
   getNamespace(ns: string) {
@@ -1257,9 +1258,7 @@ export class Process extends BaseNode {
   /**
    * 获取当前逻辑下所有elements上bindEvents下的logic
    */
-  elementLogicRoot: any[] = [];
-
-  getElementLogicRoot() {
+  get elementLogicRoot() {
     const logics: Array<Logic> = [];
     // 页面上的绑定的事件
     this.bindEvents.forEach((bindEvent) => {
@@ -1277,16 +1276,14 @@ export class Process extends BaseNode {
               });
             });
           },
-          { node: item },
+          { node: item }
         );
       }
     });
-    const expanded = (this.elementLogicRoot.length && this.elementLogicRoot[0].expanded) || false;
-    this.elementLogicRoot = [
+    return [
       {
         concept: 'elementLogicRoot',
-        id: 'elementLogicRoot',
-        expanded,
+        expanded: false,
         children: logics,
       },
     ];
@@ -1297,11 +1294,7 @@ export class Process extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
-    // 获取虚拟logic的参数和内容
-    // 用作展示和tots查找引用
-    this.getElementLogicRoot();
-
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = `export namespace ${this.name} {\n`;
     const tab0 = indent(state?.tabSize || 0);
     const tab1 = indent((state?.tabSize || 0) + 1);
@@ -1349,7 +1342,7 @@ export class Process extends BaseNode {
         code += event.toEmbeddedTS(
           shiftState(state, code, {
             tabSize: state?.tabSize || 0,
-          }),
+          })
         );
         code += '\n';
       });
@@ -1529,17 +1522,18 @@ export class Process extends BaseNode {
       ],
     };
   }
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.Process = Process;
 export default Process;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================
 Process.prototype.setName = function (name: string) {
   const App = this.rootNode;
   const oldName = this.name;