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

package/src/concepts/Process__.ts

@@ -1,4 +1,3 @@
-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';
@@ -6,16 +5,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 } 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 BindEvent from './BindEvent__';
 import Param from './Param__';
 import Return from './Return__';
@@ -27,60 +26,83 @@ import App from './App__';
 /**
  * 流程
  */
+@className
 @concept('流程')
+// @ts-ignore
 export class Process extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName = 'Process';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'Process' = 'Process';
+  // @ts-ignore
+  readonly concept!: 'Process';
 
   /**
    * 流程名称
    */
   @property()
-  name: string = undefined;
+  // @ts-ignore
+  name!: string;
 
   /**
    * 流程标题
    */
   @property()
-  title: string = undefined;
+  // @ts-ignore
+  title!: string;
 
   /**
    * 流程描述
    */
   @property()
-  description: string = undefined;
+  // @ts-ignore
+  description!: string;
 
   /**
    * 元素绑定事件列表
    */
-  @property('BindEvent')
+  @property({
+    objectRef: 'BindEvent',
+    isArray: true,
+  })
   bindEvents: Array<BindEvent> = [];
 
   /**
    * 输入参数列表
    */
-  @property('Param')
+  @property({
+    objectRef: 'Param',
+    isArray: true,
+  })
   params: Array<Param> = [];
 
   /**
    * 输出参数列表
    */
-  @property('Return')
+  @property({
+    objectRef: 'Return',
+    isArray: true,
+  })
   returns: Array<Return> = [];
 
   /**
    * 常量列表
    */
-  @property('Constant')
+  @property({
+    objectRef: 'Constant',
+    isArray: true,
+  })
   constants: Array<Constant> = [];
 
   /**
    * 流程元素列表
    */
-  @property('ProcessElement')
+  @property({
+    objectRef: 'ProcessElement',
+    isArray: true,
+  })
   elements: Array<ProcessElement> = [];
 
   /**
@@ -89,7 +111,6 @@ export class Process extends BaseNode {
   get module() {
     return this.getAncestor('Module') as Module;
   }
-
   /**
    * 祖先 App
    */
@@ -101,16 +122,11 @@ export class Process extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Process>) {
-    // @ts-ignore
-    source = { ...Process.getDefaultOptions(), ...source };
+    source = Object.assign({}, 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;
   }
@@ -126,7 +142,6 @@ export class Process extends BaseNode {
     }
     return params;
   }
-
   /**
    * 设置流程名称
    */
@@ -168,7 +183,6 @@ 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);
   }
@@ -205,7 +219,7 @@ export class Process extends BaseNode {
           name: this.getBindEventUniqueName(),
         },
         this,
-        'bindEvents'
+        'bindEvents',
       );
     } else if (typeof options === 'string') {
       bindEvent = BindEvent.from(
@@ -214,7 +228,7 @@ export class Process extends BaseNode {
           name: options,
         },
         this,
-        'bindEvents'
+        'bindEvents',
       );
     } else if (options instanceof BindEvent) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -227,7 +241,7 @@ export class Process extends BaseNode {
           ...options,
         },
         this,
-        'bindEvents'
+        'bindEvents',
       );
     }
     this.bindEvents.splice(index, 0, bindEvent);
@@ -322,7 +336,6 @@ 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);
   }
@@ -359,7 +372,7 @@ export class Process extends BaseNode {
           name: this.getParamUniqueName(),
         },
         this,
-        'params'
+        'params',
       );
     } else if (typeof options === 'string') {
       param = Param.from(
@@ -368,7 +381,7 @@ export class Process extends BaseNode {
           name: options,
         },
         this,
-        'params'
+        'params',
       );
     } else if (options instanceof Param) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -381,7 +394,7 @@ export class Process extends BaseNode {
           ...options,
         },
         this,
-        'params'
+        'params',
       );
     }
     this.params.splice(index, 0, param);
@@ -476,7 +489,6 @@ 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);
   }
@@ -513,7 +525,7 @@ export class Process extends BaseNode {
           name: this.getReturnUniqueName(),
         },
         this,
-        'returns'
+        'returns',
       );
     } else if (typeof options === 'string') {
       ret = Return.from(
@@ -522,7 +534,7 @@ export class Process extends BaseNode {
           name: options,
         },
         this,
-        'returns'
+        'returns',
       );
     } else if (options instanceof Return) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -535,7 +547,7 @@ export class Process extends BaseNode {
           ...options,
         },
         this,
-        'returns'
+        'returns',
       );
     }
     this.returns.splice(index, 0, ret);
@@ -630,7 +642,6 @@ 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);
   }
@@ -667,7 +678,7 @@ export class Process extends BaseNode {
           name: this.getConstantUniqueName(),
         },
         this,
-        'constants'
+        'constants',
       );
     } else if (typeof options === 'string') {
       constant = Constant.from(
@@ -676,7 +687,7 @@ export class Process extends BaseNode {
           name: options,
         },
         this,
-        'constants'
+        'constants',
       );
     } else if (options instanceof Constant) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -689,7 +700,7 @@ export class Process extends BaseNode {
           ...options,
         },
         this,
-        'constants'
+        'constants',
       );
     }
     this.constants.splice(index, 0, constant);
@@ -782,9 +793,10 @@ 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);
   }
@@ -821,7 +833,7 @@ export class Process extends BaseNode {
           name: this.getElementUniqueName(),
         },
         this,
-        'elements'
+        'elements',
       );
     } else if (typeof options === 'string') {
       element = ProcessElement.from(
@@ -830,7 +842,7 @@ export class Process extends BaseNode {
           name: options,
         },
         this,
-        'elements'
+        'elements',
       );
     } else if (options instanceof ProcessElement) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -843,7 +855,7 @@ export class Process extends BaseNode {
           ...options,
         },
         this,
-        'elements'
+        'elements',
       );
     }
     this.elements.splice(index, 0, element);
@@ -951,7 +963,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;
@@ -960,7 +972,7 @@ export class Process extends BaseNode {
   }
 
   __removeBindEvent(bindEvent: BindEvent) {
-    const { parentKey } = bindEvent;
+    const parentKey = bindEvent.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -999,7 +1011,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;
@@ -1008,7 +1020,7 @@ export class Process extends BaseNode {
   }
 
   __removeParam(param: Param) {
-    const { parentKey } = param;
+    const parentKey = param.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -1047,7 +1059,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;
@@ -1056,7 +1068,7 @@ export class Process extends BaseNode {
   }
 
   __removeReturn(ret: Return) {
-    const { parentKey } = ret;
+    const parentKey = ret.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -1095,7 +1107,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;
@@ -1104,7 +1116,7 @@ export class Process extends BaseNode {
   }
 
   __removeConstant(constant: Constant) {
-    const { parentKey } = constant;
+    const parentKey = constant.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -1143,7 +1155,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;
@@ -1152,7 +1164,7 @@ export class Process extends BaseNode {
   }
 
   __removeProcessElement(element: ProcessElement) {
-    const { parentKey } = element;
+    const parentKey = element.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -1174,10 +1186,10 @@ export class Process extends BaseNode {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
   onChange($event?: EventPayload): void {
     this.emit('change', $event);
   }
@@ -1207,7 +1219,9 @@ 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) {
@@ -1258,7 +1272,9 @@ export class Process extends BaseNode {
   /**
    * 获取当前逻辑下所有elements上bindEvents下的logic
    */
-  get elementLogicRoot() {
+  elementLogicRoot: any[] = [];
+
+  getElementLogicRoot() {
     const logics: Array<Logic> = [];
     // 页面上的绑定的事件
     this.bindEvents.forEach((bindEvent) => {
@@ -1276,14 +1292,16 @@ export class Process extends BaseNode {
               });
             });
           },
-          { node: item }
+          { node: item },
         );
       }
     });
-    return [
+    const expanded = (this.elementLogicRoot.length && this.elementLogicRoot[0].expanded) || false;
+    this.elementLogicRoot = [
       {
         concept: 'elementLogicRoot',
-        expanded: false,
+        id: 'elementLogicRoot',
+        expanded,
         children: logics,
       },
     ];
@@ -1294,7 +1312,11 @@ export class Process extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  toEmbeddedTS(state?: TranslatorState): string {
+    // 获取虚拟logic的参数和内容
+    // 用作展示和tots查找引用
+    this.getElementLogicRoot();
+
     let code = `export namespace ${this.name} {\n`;
     const tab0 = indent(state?.tabSize || 0);
     const tab1 = indent((state?.tabSize || 0) + 1);
@@ -1342,7 +1364,7 @@ export class Process extends BaseNode {
         code += event.toEmbeddedTS(
           shiftState(state, code, {
             tabSize: state?.tabSize || 0,
-          })
+          }),
         );
         code += '\n';
       });
@@ -1522,18 +1544,17 @@ 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;

package/src/concepts/QueryAggregateExpression__.ts

@@ -1,61 +1,65 @@
-import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 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 QueryFieldExpression from './QueryFieldExpression__';
 import LogicItem from './LogicItem__';
 
 /**
  * 查询聚合函数
  */
+@className
 @concept('查询聚合函数')
+// @ts-ignore
 export class QueryAggregateExpression extends LogicItem {
+  /** 类名 */
+  static readonly ConceptName = 'QueryAggregateExpression';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'QueryAggregateExpression' = 'QueryAggregateExpression';
+  // @ts-ignore
+  readonly concept!: 'QueryAggregateExpression';
 
   /**
    * 聚合属性别名
    */
   @property()
-  asName: string = undefined;
+  // @ts-ignore
+  asName!: string;
 
   /**
    * 聚合函数名称
    */
   @property()
-  aggregateName: 'COUNT' | 'COUNTD' | 'SUM' | 'AVG' | 'MAX' | 'MIN' = undefined;
+  // @ts-ignore
+  aggregateName!: 'COUNT' | 'COUNTD' | 'SUM' | 'AVG' | 'MAX' | 'MIN';
 
   /**
    * 聚合函数参数
    */
-  @property('QueryFieldExpression')
-  aggregateParam: QueryFieldExpression = undefined;
+  @property({
+    objectRef: 'QueryFieldExpression',
+  })
+  // @ts-ignore
+  aggregateParam!: QueryFieldExpression;
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<QueryAggregateExpression>) {
-    // @ts-ignore
-    source = { ...QueryAggregateExpression.getDefaultOptions(), ...source };
+    source = Object.assign({}, QueryAggregateExpression.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'QueryAggregateExpression';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): QueryAggregateExpression {
     return super.from(source, parentNode, parentKey) as QueryAggregateExpression;
   }
@@ -77,7 +81,7 @@ export class QueryAggregateExpression extends LogicItem {
     if (typeof options === 'string') {
       aggregateParam = this.aggregateParam;
       if (!aggregateParam) {
-        throw new Error(`找不到查询属性 ${options}`);
+        throw new Error('找不到查询属性 ' + options);
       }
     } else {
       aggregateParam = options;
@@ -86,7 +90,7 @@ export class QueryAggregateExpression extends LogicItem {
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const { parentKey } = logicItem;
+    const parentKey = logicItem.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -108,10 +112,10 @@ export class QueryAggregateExpression extends LogicItem {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
   public static getDefaultOptions() {
     return {
       aggregateName: '',
@@ -146,15 +150,14 @@ export class QueryAggregateExpression extends LogicItem {
     });
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.QueryAggregateExpression = QueryAggregateExpression;
 export default QueryAggregateExpression;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================