@lcap/nasl 3.3.0-alpha.3 → 3.3.0-beta.0

package/src/concepts/QueryJoinExpression__.ts

@@ -1,53 +1,61 @@
-import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
 import CallQueryComponent from './CallQueryComponent__';
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 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 BinaryExpression from './BinaryExpression__';
 import LogicItem from './LogicItem__';
 
 /**
  * 查询 Join 子句
  */
+@className
 @concept('查询 Join 子句')
+// @ts-ignore
 export class QueryJoinExpression extends LogicItem {
+  /** 类名 */
+  static readonly ConceptName = 'QueryJoinExpression';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'QueryJoinExpression' = 'QueryJoinExpression';
+  // @ts-ignore
+  readonly concept!: 'QueryJoinExpression';
 
   /**
    * 实体的命名空间
    */
   @property()
-  entityNamespace: string = undefined;
+  // @ts-ignore
+  entityNamespace!: string;
 
   /**
    * 实体名称
    */
   @property()
-  entityName: string = undefined;
+  // @ts-ignore
+  entityName!: string;
 
   /**
    * 别名
    */
   @property()
-  asName?: string = undefined;
+  // @ts-ignore
+  asName!: string;
 
   /**
    * joinType
    */
   @property()
-  joinType: 'INNER' | 'LEFT' | 'RIGHT' | 'FULL' = undefined;
+  // @ts-ignore
+  joinType!: 'INNER' | 'LEFT' | 'RIGHT' | 'FULL';
 
   /**
    * 二元表达式列表
@@ -65,16 +73,11 @@ export class QueryJoinExpression extends LogicItem {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<QueryJoinExpression>) {
-    // @ts-ignore
-    source = { ...QueryJoinExpression.getDefaultOptions(), ...source };
+    source = Object.assign({}, QueryJoinExpression.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'QueryJoinExpression';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): QueryJoinExpression {
     return super.from(source, parentNode, parentKey) as QueryJoinExpression;
   }
@@ -93,9 +96,10 @@ export class QueryJoinExpression extends LogicItem {
 
   getBinaryExpressionExistingNames(excludedList: Array<BinaryExpression> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.onExpressions as BinaryExpression[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.onExpressions as BinaryExpression[]) || [])
+      .filter((item) => !excludedSet.has(item))
+      .map((item) => item.name);
   }
-
   getBinaryExpressionUniqueName(name = 'binaryExpression1') {
     return utils.unique(name, this.getBinaryExpressionExistingNames(), undefined, false);
   }
@@ -112,7 +116,10 @@ export class QueryJoinExpression extends LogicItem {
    * @internal
    * @param binaryExpressionOptions 二元表达式参数
    */
-  _insertBinaryExpressionInOnExpressionsAt(binaryExpressionOptions: Partial<BinaryExpression>, index: number): BinaryExpression;
+  _insertBinaryExpressionInOnExpressionsAt(
+    binaryExpressionOptions: Partial<BinaryExpression>,
+    index: number,
+  ): BinaryExpression;
 
   /**
    * 插入二元表达式
@@ -121,7 +128,10 @@ export class QueryJoinExpression extends LogicItem {
    */
   _insertBinaryExpressionInOnExpressionsAt(binaryExpression: BinaryExpression, index: number): BinaryExpression;
 
-  _insertBinaryExpressionInOnExpressionsAt(options: string | Partial<BinaryExpression> | BinaryExpression, index: number) {
+  _insertBinaryExpressionInOnExpressionsAt(
+    options: string | Partial<BinaryExpression> | BinaryExpression,
+    index: number,
+  ) {
     const binaryExpressionOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'onExpressions' };
     let binaryExpression: BinaryExpression;
@@ -132,7 +142,7 @@ export class QueryJoinExpression extends LogicItem {
           name: this.getBinaryExpressionUniqueName(),
         },
         this,
-        'onExpressions'
+        'onExpressions',
       );
     } else if (typeof options === 'string') {
       binaryExpression = BinaryExpression.from(
@@ -141,7 +151,7 @@ export class QueryJoinExpression extends LogicItem {
           name: options,
         },
         this,
-        'onExpressions'
+        'onExpressions',
       );
     } else if (options instanceof BinaryExpression) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -154,7 +164,7 @@ export class QueryJoinExpression extends LogicItem {
           ...options,
         },
         this,
-        'onExpressions'
+        'onExpressions',
       );
     }
     this.onExpressions.splice(index, 0, binaryExpression);
@@ -171,7 +181,10 @@ export class QueryJoinExpression extends LogicItem {
    * 插入二元表达式
    * @param binaryExpressionOptions 二元表达式参数
    */
-  insertBinaryExpressionInOnExpressionsAt(binaryExpressionOptions: Partial<BinaryExpression>, index: number): BinaryExpression;
+  insertBinaryExpressionInOnExpressionsAt(
+    binaryExpressionOptions: Partial<BinaryExpression>,
+    index: number,
+  ): BinaryExpression;
 
   /**
    * 插入二元表达式
@@ -179,7 +192,10 @@ export class QueryJoinExpression extends LogicItem {
    */
   insertBinaryExpressionInOnExpressionsAt(binaryExpression: BinaryExpression, index: number): BinaryExpression;
 
-  insertBinaryExpressionInOnExpressionsAt(options: string | Partial<BinaryExpression> | BinaryExpression, index: number) {
+  insertBinaryExpressionInOnExpressionsAt(
+    options: string | Partial<BinaryExpression> | BinaryExpression,
+    index: number,
+  ) {
     const node = this._insertBinaryExpressionInOnExpressionsAt(options as any, index);
     node.create({
       index,
@@ -250,7 +266,10 @@ export class QueryJoinExpression extends LogicItem {
    * @internal
    * @param queryJoinExpressionOptions 查询 Join 子句参数
    */
-  _insertJoinPartInJoinPartsAt(queryJoinExpressionOptions: Partial<QueryJoinExpression>, index: number): QueryJoinExpression;
+  _insertJoinPartInJoinPartsAt(
+    queryJoinExpressionOptions: Partial<QueryJoinExpression>,
+    index: number,
+  ): QueryJoinExpression;
 
   /**
    * 插入查询 Join 子句
@@ -274,7 +293,7 @@ export class QueryJoinExpression extends LogicItem {
           ...options,
         },
         this,
-        'joinParts'
+        'joinParts',
       );
     }
     this.joinParts.splice(index, 0, queryJoinExpression);
@@ -285,7 +304,10 @@ export class QueryJoinExpression extends LogicItem {
    * 插入查询 Join 子句
    * @param queryJoinExpressionOptions 查询 Join 子句参数
    */
-  insertJoinPartInJoinPartsAt(queryJoinExpressionOptions: Partial<QueryJoinExpression>, index: number): QueryJoinExpression;
+  insertJoinPartInJoinPartsAt(
+    queryJoinExpressionOptions: Partial<QueryJoinExpression>,
+    index: number,
+  ): QueryJoinExpression;
 
   /**
    * 插入查询 Join 子句
@@ -362,7 +384,7 @@ export class QueryJoinExpression extends LogicItem {
     if (typeof options === 'string') {
       binaryExpression = (this.onExpressions as BinaryExpression[]).find((item) => item.name === options);
       if (!binaryExpression) {
-        throw new Error(`找不到二元表达式 ${options}`);
+        throw new Error('找不到二元表达式 ' + options);
       }
     } else {
       binaryExpression = options;
@@ -377,12 +399,12 @@ export class QueryJoinExpression extends LogicItem {
   removeJoinPartInJoinParts(queryJoinExpression: QueryJoinExpression): void;
 
   removeJoinPartInJoinParts(options: QueryJoinExpression) {
-    const queryJoinExpression: QueryJoinExpression = options;
+    let queryJoinExpression: QueryJoinExpression = options;
     return queryJoinExpression.delete();
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const { parentKey } = logicItem;
+    const parentKey = logicItem.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -404,10 +426,10 @@ export class QueryJoinExpression extends LogicItem {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
 
   get entityKey(): string {
     return `${this.entityNamespace}.${this.entityName}`;
@@ -439,7 +461,7 @@ export class QueryJoinExpression extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  toEmbeddedTS(state?: TranslatorState): string {
     let code = '';
     code += `.${this.joinType}_JOIN(new nasl.langUtil.Collection<[${this.entityKey}]>())\n`;
     if (this.onExpressions.length > 0) {
@@ -459,15 +481,14 @@ export class QueryJoinExpression extends LogicItem {
     return code;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.QueryJoinExpression = QueryJoinExpression;
 export default QueryJoinExpression;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================

package/src/concepts/QueryLimitExpression__.ts

@@ -1,54 +1,55 @@
-import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
-//= ===============================================================================
+import { TranslatorState, shiftState, withSourceMap } 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 LogicItem from './LogicItem__';
 
 /**
  * 查询分页子句
  */
+@className
 @concept('查询分页子句')
+// @ts-ignore
 export class QueryLimitExpression extends LogicItem {
+  /** 类名 */
+  static readonly ConceptName = 'QueryLimitExpression';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'QueryLimitExpression' = 'QueryLimitExpression';
+  // @ts-ignore
+  readonly concept!: 'QueryLimitExpression';
 
   /**
    * 逻辑项
    */
   @property('LogicItem')
-  pageElement: LogicItem = undefined;
+  // @ts-ignore
+  pageElement!: LogicItem;
 
   /**
    * 逻辑项
    */
   @property('LogicItem')
-  pageSizeElement: LogicItem = undefined;
+  // @ts-ignore
+  pageSizeElement!: LogicItem;
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<QueryLimitExpression>) {
-    // @ts-ignore
-    source = { ...QueryLimitExpression.getDefaultOptions(), ...source };
+    source = Object.assign({}, QueryLimitExpression.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'QueryLimitExpression';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): QueryLimitExpression {
     return super.from(source, parentNode, parentKey) as QueryLimitExpression;
   }
@@ -100,7 +101,7 @@ export class QueryLimitExpression extends LogicItem {
     if (typeof options === 'string') {
       pageElement = this.pageElement;
       if (!pageElement) {
-        throw new Error(`找不到逻辑项 ${options}`);
+        throw new Error('找不到逻辑项 ' + options);
       }
     } else {
       pageElement = options;
@@ -125,7 +126,7 @@ export class QueryLimitExpression extends LogicItem {
     if (typeof options === 'string') {
       pageSizeElement = this.pageSizeElement;
       if (!pageSizeElement) {
-        throw new Error(`找不到逻辑项 ${options}`);
+        throw new Error('找不到逻辑项 ' + options);
       }
     } else {
       pageSizeElement = options;
@@ -134,7 +135,7 @@ export class QueryLimitExpression extends LogicItem {
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const { parentKey } = logicItem;
+    const parentKey = logicItem.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -156,13 +157,13 @@ export class QueryLimitExpression extends LogicItem {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
 
   @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  toEmbeddedTS(state?: TranslatorState): string {
     const { pageElement, pageSizeElement } = this;
     let code = '[';
     code += `${pageElement.toEmbeddedTS(shiftState(state, code))}, `;
@@ -170,15 +171,14 @@ export class QueryLimitExpression extends LogicItem {
     return code;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.QueryLimitExpression = QueryLimitExpression;
 export default QueryLimitExpression;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================

package/src/concepts/QueryOrderByExpression__.ts

@@ -1,54 +1,55 @@
-import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
-//= ===============================================================================
+import { TranslatorState, shiftState, withSourceMap, indent } 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 LogicItem from './LogicItem__';
 
 /**
  * 查询排序子句
  */
+@className
 @concept('查询排序子句')
+// @ts-ignore
 export class QueryOrderByExpression extends LogicItem {
+  /** 类名 */
+  static readonly ConceptName = 'QueryOrderByExpression';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'QueryOrderByExpression' = 'QueryOrderByExpression';
+  // @ts-ignore
+  readonly concept!: 'QueryOrderByExpression';
 
   /**
    * 逻辑项
    */
   @property('LogicItem')
-  orderElement: LogicItem = undefined;
+  // @ts-ignore
+  orderElement!: LogicItem;
 
   /**
    * 逻辑项
    */
   @property('LogicItem')
-  order: LogicItem = undefined;
+  // @ts-ignore
+  order!: LogicItem;
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<QueryOrderByExpression>) {
-    // @ts-ignore
-    source = { ...QueryOrderByExpression.getDefaultOptions(), ...source };
+    source = Object.assign({}, QueryOrderByExpression.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'QueryOrderByExpression';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): QueryOrderByExpression {
     return super.from(source, parentNode, parentKey) as QueryOrderByExpression;
   }
@@ -100,7 +101,7 @@ export class QueryOrderByExpression extends LogicItem {
     if (typeof options === 'string') {
       orderElement = this.orderElement;
       if (!orderElement) {
-        throw new Error(`找不到逻辑项 ${options}`);
+        throw new Error('找不到逻辑项 ' + options);
       }
     } else {
       orderElement = options;
@@ -125,7 +126,7 @@ export class QueryOrderByExpression extends LogicItem {
     if (typeof options === 'string') {
       order = this.order;
       if (!order) {
-        throw new Error(`找不到逻辑项 ${options}`);
+        throw new Error('找不到逻辑项 ' + options);
       }
     } else {
       order = options;
@@ -134,7 +135,7 @@ export class QueryOrderByExpression extends LogicItem {
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const { parentKey } = logicItem;
+    const parentKey = logicItem.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -156,10 +157,10 @@ export class QueryOrderByExpression extends LogicItem {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
 
   public static getDefaultOptions() {
     return {
@@ -176,7 +177,7 @@ export class QueryOrderByExpression extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
+  toEmbeddedTS(state?: TranslatorState): string {
     const { orderElement, order } = this;
     let code = '[';
     code += `${orderElement.toEmbeddedTS(shiftState(state, code))}, `;
@@ -184,15 +185,14 @@ export class QueryOrderByExpression extends LogicItem {
     return code;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.QueryOrderByExpression = QueryOrderByExpression;
 export default QueryOrderByExpression;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================