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

package/src/concepts/QuerySelectExpression__.ts

@@ -1,14 +1,13 @@
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 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 QueryAggregateExpression from './QueryAggregateExpression__';
 import QueryFieldExpression from './QueryFieldExpression__';
 import LogicItem from './LogicItem__';
@@ -16,13 +15,18 @@ import LogicItem from './LogicItem__';
 /**
  * 查询选择子句
  */
+@className
 @concept('查询选择子句')
+// @ts-ignore
 export class QuerySelectExpression extends LogicItem {
+  /** 类名 */
+  static readonly ConceptName = 'QuerySelectExpression';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'QuerySelectExpression' = 'QuerySelectExpression';
+  // @ts-ignore
+  readonly concept!: 'QuerySelectExpression';
 
   /**
    * distinct
@@ -46,16 +50,11 @@ export class QuerySelectExpression extends LogicItem {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<QuerySelectExpression>) {
-    // @ts-ignore
-    source = { ...QuerySelectExpression.getDefaultOptions(), ...source };
+    source = Object.assign({}, QuerySelectExpression.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'QuerySelectExpression';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): QuerySelectExpression {
     return super.from(source, parentNode, parentKey) as QuerySelectExpression;
   }
@@ -74,9 +73,10 @@ export class QuerySelectExpression extends LogicItem {
 
   getQueryAggregateExpressionExistingNames(excludedList: Array<QueryAggregateExpression> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.selectElements as QueryAggregateExpression[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.selectElements as QueryAggregateExpression[]) || [])
+      .filter((item) => !excludedSet.has(item))
+      .map((item) => item.name);
   }
-
   getQueryAggregateExpressionUniqueName(name = 'queryAggregateExpression1') {
     return utils.unique(name, this.getQueryAggregateExpressionExistingNames(), undefined, false);
   }
@@ -95,7 +95,7 @@ export class QuerySelectExpression extends LogicItem {
    */
   _insertQueryAggregateExpressionInSelectElementsAt(
     queryAggregateExpressionOptions: Partial<QueryAggregateExpression>,
-    index: number
+    index: number,
   ): QueryAggregateExpression;
 
   /**
@@ -103,9 +103,15 @@ export class QuerySelectExpression extends LogicItem {
    * @internal
    * @param queryAggregateExpression 已有的查询聚合函数实例
    */
-  _insertQueryAggregateExpressionInSelectElementsAt(queryAggregateExpression: QueryAggregateExpression, index: number): QueryAggregateExpression;
+  _insertQueryAggregateExpressionInSelectElementsAt(
+    queryAggregateExpression: QueryAggregateExpression,
+    index: number,
+  ): QueryAggregateExpression;
 
-  _insertQueryAggregateExpressionInSelectElementsAt(options: string | Partial<QueryAggregateExpression> | QueryAggregateExpression, index: number) {
+  _insertQueryAggregateExpressionInSelectElementsAt(
+    options: string | Partial<QueryAggregateExpression> | QueryAggregateExpression,
+    index: number,
+  ) {
     const queryAggregateExpressionOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'selectElements' };
     let queryAggregateExpression: QueryAggregateExpression;
@@ -116,7 +122,7 @@ export class QuerySelectExpression extends LogicItem {
           name: this.getQueryAggregateExpressionUniqueName(),
         },
         this,
-        'selectElements'
+        'selectElements',
       );
     } else if (typeof options === 'string') {
       queryAggregateExpression = QueryAggregateExpression.from(
@@ -125,7 +131,7 @@ export class QuerySelectExpression extends LogicItem {
           name: options,
         },
         this,
-        'selectElements'
+        'selectElements',
       );
     } else if (options instanceof QueryAggregateExpression) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -138,7 +144,7 @@ export class QuerySelectExpression extends LogicItem {
           ...options,
         },
         this,
-        'selectElements'
+        'selectElements',
       );
     }
     this.selectElements.splice(index, 0, queryAggregateExpression);
@@ -157,16 +163,22 @@ export class QuerySelectExpression extends LogicItem {
    */
   insertQueryAggregateExpressionInSelectElementsAt(
     queryAggregateExpressionOptions: Partial<QueryAggregateExpression>,
-    index: number
+    index: number,
   ): QueryAggregateExpression;
 
   /**
    * 插入查询聚合函数
    * @param queryAggregateExpression 已有的查询聚合函数实例
    */
-  insertQueryAggregateExpressionInSelectElementsAt(queryAggregateExpression: QueryAggregateExpression, index: number): QueryAggregateExpression;
+  insertQueryAggregateExpressionInSelectElementsAt(
+    queryAggregateExpression: QueryAggregateExpression,
+    index: number,
+  ): QueryAggregateExpression;
 
-  insertQueryAggregateExpressionInSelectElementsAt(options: string | Partial<QueryAggregateExpression> | QueryAggregateExpression, index: number) {
+  insertQueryAggregateExpressionInSelectElementsAt(
+    options: string | Partial<QueryAggregateExpression> | QueryAggregateExpression,
+    index: number,
+  ) {
     const node = this._insertQueryAggregateExpressionInSelectElementsAt(options as any, index);
     node.create({
       index,
@@ -188,16 +200,22 @@ export class QuerySelectExpression extends LogicItem {
    * @internal
    * @param queryAggregateExpressionOptions 查询聚合函数参数
    */
-  _addQueryAggregateExpressionInSelectElements(queryAggregateExpressionOptions: Partial<QueryAggregateExpression>): QueryAggregateExpression;
+  _addQueryAggregateExpressionInSelectElements(
+    queryAggregateExpressionOptions: Partial<QueryAggregateExpression>,
+  ): QueryAggregateExpression;
 
   /**
    * 添加查询聚合函数
    * @internal
    * @param queryAggregateExpression 已有的查询聚合函数实例
    */
-  _addQueryAggregateExpressionInSelectElements(queryAggregateExpression: QueryAggregateExpression): QueryAggregateExpression;
+  _addQueryAggregateExpressionInSelectElements(
+    queryAggregateExpression: QueryAggregateExpression,
+  ): QueryAggregateExpression;
 
-  _addQueryAggregateExpressionInSelectElements(options?: string | Partial<QueryAggregateExpression> | QueryAggregateExpression) {
+  _addQueryAggregateExpressionInSelectElements(
+    options?: string | Partial<QueryAggregateExpression> | QueryAggregateExpression,
+  ) {
     const index = this.selectElements.length;
     return this._insertQueryAggregateExpressionInSelectElementsAt(options as any, index);
   }
@@ -213,15 +231,21 @@ export class QuerySelectExpression extends LogicItem {
    * 添加查询聚合函数
    * @param queryAggregateExpressionOptions 查询聚合函数参数
    */
-  addQueryAggregateExpressionInSelectElements(queryAggregateExpressionOptions: Partial<QueryAggregateExpression>): QueryAggregateExpression;
+  addQueryAggregateExpressionInSelectElements(
+    queryAggregateExpressionOptions: Partial<QueryAggregateExpression>,
+  ): QueryAggregateExpression;
 
   /**
    * 添加查询聚合函数
    * @param queryAggregateExpression 已有的查询聚合函数实例
    */
-  addQueryAggregateExpressionInSelectElements(queryAggregateExpression: QueryAggregateExpression): QueryAggregateExpression;
+  addQueryAggregateExpressionInSelectElements(
+    queryAggregateExpression: QueryAggregateExpression,
+  ): QueryAggregateExpression;
 
-  addQueryAggregateExpressionInSelectElements(options?: string | Partial<QueryAggregateExpression> | QueryAggregateExpression) {
+  addQueryAggregateExpressionInSelectElements(
+    options?: string | Partial<QueryAggregateExpression> | QueryAggregateExpression,
+  ) {
     const node = this._addQueryAggregateExpressionInSelectElements(options as any);
     const index = this.selectElements.indexOf(node);
     node.create({
@@ -244,16 +268,25 @@ export class QuerySelectExpression extends LogicItem {
    * @internal
    * @param queryFieldExpressionOptions 查询属性参数
    */
-  _insertQueryFieldExpressionInSelectElementsAt(queryFieldExpressionOptions: Partial<QueryFieldExpression>, index: number): QueryFieldExpression;
+  _insertQueryFieldExpressionInSelectElementsAt(
+    queryFieldExpressionOptions: Partial<QueryFieldExpression>,
+    index: number,
+  ): QueryFieldExpression;
 
   /**
    * 插入查询属性
    * @internal
    * @param queryFieldExpression 已有的查询属性实例
    */
-  _insertQueryFieldExpressionInSelectElementsAt(queryFieldExpression: QueryFieldExpression, index: number): QueryFieldExpression;
+  _insertQueryFieldExpressionInSelectElementsAt(
+    queryFieldExpression: QueryFieldExpression,
+    index: number,
+  ): QueryFieldExpression;
 
-  _insertQueryFieldExpressionInSelectElementsAt(options: string | Partial<QueryFieldExpression> | QueryFieldExpression, index: number) {
+  _insertQueryFieldExpressionInSelectElementsAt(
+    options: string | Partial<QueryFieldExpression> | QueryFieldExpression,
+    index: number,
+  ) {
     const queryFieldExpressionOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'selectElements' };
     let queryFieldExpression: QueryFieldExpression;
@@ -264,7 +297,7 @@ export class QuerySelectExpression extends LogicItem {
           name: this.getQueryFieldExpressionUniqueName(),
         },
         this,
-        'selectElements'
+        'selectElements',
       );
     } else if (typeof options === 'string') {
       queryFieldExpression = QueryFieldExpression.from(
@@ -273,7 +306,7 @@ export class QuerySelectExpression extends LogicItem {
           name: options,
         },
         this,
-        'selectElements'
+        'selectElements',
       );
     } else if (options instanceof QueryFieldExpression) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -286,7 +319,7 @@ export class QuerySelectExpression extends LogicItem {
           ...options,
         },
         this,
-        'selectElements'
+        'selectElements',
       );
     }
     this.selectElements.splice(index, 0, queryFieldExpression);
@@ -303,15 +336,24 @@ export class QuerySelectExpression extends LogicItem {
    * 插入查询属性
    * @param queryFieldExpressionOptions 查询属性参数
    */
-  insertQueryFieldExpressionInSelectElementsAt(queryFieldExpressionOptions: Partial<QueryFieldExpression>, index: number): QueryFieldExpression;
+  insertQueryFieldExpressionInSelectElementsAt(
+    queryFieldExpressionOptions: Partial<QueryFieldExpression>,
+    index: number,
+  ): QueryFieldExpression;
 
   /**
    * 插入查询属性
    * @param queryFieldExpression 已有的查询属性实例
    */
-  insertQueryFieldExpressionInSelectElementsAt(queryFieldExpression: QueryFieldExpression, index: number): QueryFieldExpression;
+  insertQueryFieldExpressionInSelectElementsAt(
+    queryFieldExpression: QueryFieldExpression,
+    index: number,
+  ): QueryFieldExpression;
 
-  insertQueryFieldExpressionInSelectElementsAt(options: string | Partial<QueryFieldExpression> | QueryFieldExpression, index: number) {
+  insertQueryFieldExpressionInSelectElementsAt(
+    options: string | Partial<QueryFieldExpression> | QueryFieldExpression,
+    index: number,
+  ) {
     const node = this._insertQueryFieldExpressionInSelectElementsAt(options as any, index);
     node.create({
       index,
@@ -333,7 +375,9 @@ export class QuerySelectExpression extends LogicItem {
    * @internal
    * @param queryFieldExpressionOptions 查询属性参数
    */
-  _addQueryFieldExpressionInSelectElements(queryFieldExpressionOptions: Partial<QueryFieldExpression>): QueryFieldExpression;
+  _addQueryFieldExpressionInSelectElements(
+    queryFieldExpressionOptions: Partial<QueryFieldExpression>,
+  ): QueryFieldExpression;
 
   /**
    * 添加查询属性
@@ -358,7 +402,9 @@ export class QuerySelectExpression extends LogicItem {
    * 添加查询属性
    * @param queryFieldExpressionOptions 查询属性参数
    */
-  addQueryFieldExpressionInSelectElements(queryFieldExpressionOptions: Partial<QueryFieldExpression>): QueryFieldExpression;
+  addQueryFieldExpressionInSelectElements(
+    queryFieldExpressionOptions: Partial<QueryFieldExpression>,
+  ): QueryFieldExpression;
 
   /**
    * 添加查询属性
@@ -392,9 +438,11 @@ export class QuerySelectExpression extends LogicItem {
   removeQueryAggregateExpressionInSelectElements(options: string | QueryAggregateExpression) {
     let queryAggregateExpression: QueryAggregateExpression;
     if (typeof options === 'string') {
-      queryAggregateExpression = (this.selectElements as QueryAggregateExpression[]).find((item) => item.name === options);
+      queryAggregateExpression = (this.selectElements as QueryAggregateExpression[]).find(
+        (item) => item.name === options,
+      );
       if (!queryAggregateExpression) {
-        throw new Error(`找不到查询聚合函数 ${options}`);
+        throw new Error('找不到查询聚合函数 ' + options);
       }
     } else {
       queryAggregateExpression = options;
@@ -419,7 +467,7 @@ export class QuerySelectExpression extends LogicItem {
     if (typeof options === 'string') {
       queryFieldExpression = (this.selectElements as QueryFieldExpression[]).find((item) => item.name === options);
       if (!queryFieldExpression) {
-        throw new Error(`找不到查询属性 ${options}`);
+        throw new Error('找不到查询属性 ' + options);
       }
     } else {
       queryFieldExpression = options;
@@ -428,7 +476,7 @@ export class QuerySelectExpression extends LogicItem {
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const { parentKey } = logicItem;
+    const parentKey = logicItem.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -450,16 +498,18 @@ export class QuerySelectExpression extends LogicItem {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
 
   /**
    * 聚合函数列表
    */
   get selectAggregateElements(): QueryAggregateExpression[] {
-    return this.selectElements.filter((item) => item.concept === 'QueryAggregateExpression') as QueryAggregateExpression[];
+    return this.selectElements.filter(
+      (item) => item.concept === 'QueryAggregateExpression',
+    ) as QueryAggregateExpression[];
   }
 
   /**
@@ -471,22 +521,23 @@ export class QuerySelectExpression extends LogicItem {
 
   getQueryFieldExpressionExistingNames(excludedList: Array<QueryFieldExpression> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.selectElements as QueryFieldExpression[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.selectElements as QueryFieldExpression[]) || [])
+      .filter((item) => !excludedSet.has(item))
+      .map((item) => item.name);
   }
 
   getQueryFieldExpressionUniqueName(name = 'queryFieldExpression1') {
     return utils.unique(name, this.getQueryFieldExpressionExistingNames(), undefined, false);
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.QuerySelectExpression = QuerySelectExpression;
 export default QuerySelectExpression;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================

package/src/concepts/Rect__.ts

@@ -1,64 +1,67 @@
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 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';
 
 /**
  * 矩形信息
  */
+@className
 @concept('矩形信息')
+// @ts-ignore
 export class Rect extends BaseNode {
+  /** 类名 */
+  static readonly ConceptName = 'Rect';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'Rect' = 'Rect';
+  // @ts-ignore
+  readonly concept!: 'Rect';
 
   /**
    * x
    */
   @property()
-  x: number = undefined;
+  // @ts-ignore
+  x!: number;
 
   /**
    * y
    */
   @property()
-  y: number = undefined;
+  // @ts-ignore
+  y!: number;
 
   /**
    * width
    */
   @property()
-  width: number = undefined;
+  // @ts-ignore
+  width!: number;
 
   /**
    * height
    */
   @property()
-  height: number = undefined;
+  // @ts-ignore
+  height!: number;
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Rect>) {
-    // @ts-ignore
-    source = { ...Rect.getDefaultOptions(), ...source };
+    source = Object.assign({}, Rect.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'Rect';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): Rect {
     return super.from(source, parentNode, parentKey) as Rect;
   }
@@ -75,20 +78,19 @@ export class Rect extends BaseNode {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.Rect = Rect;
 export default Rect;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================