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

package/src/concepts/QuerySelectExpression__.ts

@@ -3,15 +3,16 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } 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 QueryAggregateExpression from './QueryAggregateExpression__';
+import QueryFieldExpression from './QueryFieldExpression__';
 import LogicItem from './LogicItem__';
-import type QueryAggregateExpression from './QueryAggregateExpression__';
-import type QueryFieldExpression from './QueryFieldExpression__';
 
 /**
  * 查询选择子句
@@ -20,7 +21,11 @@ import type QueryFieldExpression from './QueryFieldExpression__';
 export class QuerySelectExpression extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'QuerySelectExpression';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
@@ -30,17 +35,20 @@ export class QuerySelectExpression extends LogicItem {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'QuerySelectExpression';
-
   /**
    * distinct
    */
-  @property()
+  @property({
+    objectRef: '',
+  })
   distinct: boolean = false;
 
   /**
    * star
    */
-  @property()
+  @property({
+    objectRef: '',
+  })
   star: boolean = true;
 
   /**
@@ -82,7 +90,7 @@ export class QuerySelectExpression extends LogicItem {
     const excludedSet = new Set(excludedList);
     return ((this.selectElements as QueryAggregateExpression[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item?.name);
+      .map((item) => item.name);
   }
   getQueryAggregateExpressionUniqueName(name = 'queryAggregateExpression1') {
     return utils.unique(name, this.getQueryAggregateExpressionExistingNames(), undefined, false);
@@ -93,14 +101,14 @@ export class QuerySelectExpression extends LogicItem {
    * @internal
    * @param name 查询聚合函数名称，如果不填会自动生成一个唯一名称
    */
-  _insertQueryAggregateExpressionInSelectElementsAt(name: string, index: number): QueryAggregateExpression;
+  _insertQueryAggregateExpressionAt(name: string, index: number): QueryAggregateExpression;
 
   /**
    * 插入查询聚合函数
    * @internal
    * @param queryAggregateExpressionOptions 查询聚合函数参数
    */
-  _insertQueryAggregateExpressionInSelectElementsAt(
+  _insertQueryAggregateExpressionAt(
     queryAggregateExpressionOptions: Partial<QueryAggregateExpression>,
     index: number,
   ): QueryAggregateExpression;
@@ -110,12 +118,12 @@ export class QuerySelectExpression extends LogicItem {
    * @internal
    * @param queryAggregateExpression 已有的查询聚合函数实例
    */
-  _insertQueryAggregateExpressionInSelectElementsAt(
+  _insertQueryAggregateExpressionAt(
     queryAggregateExpression: QueryAggregateExpression,
     index: number,
   ): QueryAggregateExpression;
 
-  _insertQueryAggregateExpressionInSelectElementsAt(
+  _insertQueryAggregateExpressionAt(
     options: string | Partial<QueryAggregateExpression> | QueryAggregateExpression,
     index: number,
   ) {
@@ -163,13 +171,13 @@ export class QuerySelectExpression extends LogicItem {
    * 插入查询聚合函数
    * @param name 查询聚合函数名称，如果不填会自动生成一个唯一名称
    */
-  insertQueryAggregateExpressionInSelectElementsAt(name: string, index: number): QueryAggregateExpression;
+  insertQueryAggregateExpressionAt(name: string, index: number): QueryAggregateExpression;
 
   /**
    * 插入查询聚合函数
    * @param queryAggregateExpressionOptions 查询聚合函数参数
    */
-  insertQueryAggregateExpressionInSelectElementsAt(
+  insertQueryAggregateExpressionAt(
     queryAggregateExpressionOptions: Partial<QueryAggregateExpression>,
     index: number,
   ): QueryAggregateExpression;
@@ -178,16 +186,16 @@ export class QuerySelectExpression extends LogicItem {
    * 插入查询聚合函数
    * @param queryAggregateExpression 已有的查询聚合函数实例
    */
-  insertQueryAggregateExpressionInSelectElementsAt(
+  insertQueryAggregateExpressionAt(
     queryAggregateExpression: QueryAggregateExpression,
     index: number,
   ): QueryAggregateExpression;
 
-  insertQueryAggregateExpressionInSelectElementsAt(
+  insertQueryAggregateExpressionAt(
     options: string | Partial<QueryAggregateExpression> | QueryAggregateExpression,
     index: number,
   ) {
-    const node = this._insertQueryAggregateExpressionInSelectElementsAt(options as any, index);
+    const node = this._insertQueryAggregateExpressionAt(options as any, index);
     node.create({
       index,
       parentNode: this,
@@ -201,14 +209,14 @@ export class QuerySelectExpression extends LogicItem {
    * @internal
    * @param name 查询聚合函数名称，如果不填会自动生成一个唯一名称
    */
-  _addQueryAggregateExpressionInSelectElements(name?: string): QueryAggregateExpression;
+  _addQueryAggregateExpression(name?: string): QueryAggregateExpression;
 
   /**
    * 添加查询聚合函数
    * @internal
    * @param queryAggregateExpressionOptions 查询聚合函数参数
    */
-  _addQueryAggregateExpressionInSelectElements(
+  _addQueryAggregateExpression(
     queryAggregateExpressionOptions: Partial<QueryAggregateExpression>,
   ): QueryAggregateExpression;
 
@@ -217,15 +225,11 @@ export class QuerySelectExpression extends LogicItem {
    * @internal
    * @param queryAggregateExpression 已有的查询聚合函数实例
    */
-  _addQueryAggregateExpressionInSelectElements(
-    queryAggregateExpression: QueryAggregateExpression,
-  ): QueryAggregateExpression;
+  _addQueryAggregateExpression(queryAggregateExpression: QueryAggregateExpression): QueryAggregateExpression;
 
-  _addQueryAggregateExpressionInSelectElements(
-    options?: string | Partial<QueryAggregateExpression> | QueryAggregateExpression,
-  ) {
+  _addQueryAggregateExpression(options?: string | Partial<QueryAggregateExpression> | QueryAggregateExpression) {
     const index = this.selectElements.length;
-    return this._insertQueryAggregateExpressionInSelectElementsAt(options as any, index);
+    return this._insertQueryAggregateExpressionAt(options as any, index);
   }
 
   /**
@@ -233,13 +237,13 @@ export class QuerySelectExpression extends LogicItem {
    * @internal
    * @param name 查询聚合函数名称，如果不填会自动生成一个唯一名称
    */
-  addQueryAggregateExpressionInSelectElements(name?: string): QueryAggregateExpression;
+  addQueryAggregateExpression(name?: string): QueryAggregateExpression;
 
   /**
    * 添加查询聚合函数
    * @param queryAggregateExpressionOptions 查询聚合函数参数
    */
-  addQueryAggregateExpressionInSelectElements(
+  addQueryAggregateExpression(
     queryAggregateExpressionOptions: Partial<QueryAggregateExpression>,
   ): QueryAggregateExpression;
 
@@ -247,14 +251,10 @@ export class QuerySelectExpression extends LogicItem {
    * 添加查询聚合函数
    * @param queryAggregateExpression 已有的查询聚合函数实例
    */
-  addQueryAggregateExpressionInSelectElements(
-    queryAggregateExpression: QueryAggregateExpression,
-  ): QueryAggregateExpression;
+  addQueryAggregateExpression(queryAggregateExpression: QueryAggregateExpression): QueryAggregateExpression;
 
-  addQueryAggregateExpressionInSelectElements(
-    options?: string | Partial<QueryAggregateExpression> | QueryAggregateExpression,
-  ) {
-    const node = this._addQueryAggregateExpressionInSelectElements(options as any);
+  addQueryAggregateExpression(options?: string | Partial<QueryAggregateExpression> | QueryAggregateExpression) {
+    const node = this._addQueryAggregateExpression(options as any);
     const index = this.selectElements.indexOf(node);
     node.create({
       index,
@@ -264,19 +264,29 @@ export class QuerySelectExpression extends LogicItem {
     return node;
   }
 
+  getQueryFieldExpressionExistingNames(excludedList: Array<QueryFieldExpression> = []) {
+    const excludedSet = new Set(excludedList);
+    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);
+  }
+
   /**
    * 插入查询属性
    * @internal
    * @param name 查询属性名称，如果不填会自动生成一个唯一名称
    */
-  _insertQueryFieldExpressionInSelectElementsAt(name: string, index: number): QueryFieldExpression;
+  _insertQueryFieldExpressionAt(name: string, index: number): QueryFieldExpression;
 
   /**
    * 插入查询属性
    * @internal
    * @param queryFieldExpressionOptions 查询属性参数
    */
-  _insertQueryFieldExpressionInSelectElementsAt(
+  _insertQueryFieldExpressionAt(
     queryFieldExpressionOptions: Partial<QueryFieldExpression>,
     index: number,
   ): QueryFieldExpression;
@@ -286,15 +296,9 @@ export class QuerySelectExpression extends LogicItem {
    * @internal
    * @param queryFieldExpression 已有的查询属性实例
    */
-  _insertQueryFieldExpressionInSelectElementsAt(
-    queryFieldExpression: QueryFieldExpression,
-    index: number,
-  ): QueryFieldExpression;
+  _insertQueryFieldExpressionAt(queryFieldExpression: QueryFieldExpression, index: number): QueryFieldExpression;
 
-  _insertQueryFieldExpressionInSelectElementsAt(
-    options: string | Partial<QueryFieldExpression> | QueryFieldExpression,
-    index: number,
-  ) {
+  _insertQueryFieldExpressionAt(options: string | Partial<QueryFieldExpression> | QueryFieldExpression, index: number) {
     const queryFieldExpressionOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'selectElements' };
     const QueryFieldExpression = getConceptConstructor('QueryFieldExpression');
@@ -339,13 +343,13 @@ export class QuerySelectExpression extends LogicItem {
    * 插入查询属性
    * @param name 查询属性名称，如果不填会自动生成一个唯一名称
    */
-  insertQueryFieldExpressionInSelectElementsAt(name: string, index: number): QueryFieldExpression;
+  insertQueryFieldExpressionAt(name: string, index: number): QueryFieldExpression;
 
   /**
    * 插入查询属性
    * @param queryFieldExpressionOptions 查询属性参数
    */
-  insertQueryFieldExpressionInSelectElementsAt(
+  insertQueryFieldExpressionAt(
     queryFieldExpressionOptions: Partial<QueryFieldExpression>,
     index: number,
   ): QueryFieldExpression;
@@ -354,16 +358,10 @@ export class QuerySelectExpression extends LogicItem {
    * 插入查询属性
    * @param queryFieldExpression 已有的查询属性实例
    */
-  insertQueryFieldExpressionInSelectElementsAt(
-    queryFieldExpression: QueryFieldExpression,
-    index: number,
-  ): QueryFieldExpression;
+  insertQueryFieldExpressionAt(queryFieldExpression: QueryFieldExpression, index: number): QueryFieldExpression;
 
-  insertQueryFieldExpressionInSelectElementsAt(
-    options: string | Partial<QueryFieldExpression> | QueryFieldExpression,
-    index: number,
-  ) {
-    const node = this._insertQueryFieldExpressionInSelectElementsAt(options as any, index);
+  insertQueryFieldExpressionAt(options: string | Partial<QueryFieldExpression> | QueryFieldExpression, index: number) {
+    const node = this._insertQueryFieldExpressionAt(options as any, index);
     node.create({
       index,
       parentNode: this,
@@ -377,27 +375,25 @@ export class QuerySelectExpression extends LogicItem {
    * @internal
    * @param name 查询属性名称，如果不填会自动生成一个唯一名称
    */
-  _addQueryFieldExpressionInSelectElements(name?: string): QueryFieldExpression;
+  _addQueryFieldExpression(name?: string): QueryFieldExpression;
 
   /**
    * 添加查询属性
    * @internal
    * @param queryFieldExpressionOptions 查询属性参数
    */
-  _addQueryFieldExpressionInSelectElements(
-    queryFieldExpressionOptions: Partial<QueryFieldExpression>,
-  ): QueryFieldExpression;
+  _addQueryFieldExpression(queryFieldExpressionOptions: Partial<QueryFieldExpression>): QueryFieldExpression;
 
   /**
    * 添加查询属性
    * @internal
    * @param queryFieldExpression 已有的查询属性实例
    */
-  _addQueryFieldExpressionInSelectElements(queryFieldExpression: QueryFieldExpression): QueryFieldExpression;
+  _addQueryFieldExpression(queryFieldExpression: QueryFieldExpression): QueryFieldExpression;
 
-  _addQueryFieldExpressionInSelectElements(options?: string | Partial<QueryFieldExpression> | QueryFieldExpression) {
+  _addQueryFieldExpression(options?: string | Partial<QueryFieldExpression> | QueryFieldExpression) {
     const index = this.selectElements.length;
-    return this._insertQueryFieldExpressionInSelectElementsAt(options as any, index);
+    return this._insertQueryFieldExpressionAt(options as any, index);
   }
 
   /**
@@ -405,24 +401,22 @@ export class QuerySelectExpression extends LogicItem {
    * @internal
    * @param name 查询属性名称，如果不填会自动生成一个唯一名称
    */
-  addQueryFieldExpressionInSelectElements(name?: string): QueryFieldExpression;
+  addQueryFieldExpression(name?: string): QueryFieldExpression;
 
   /**
    * 添加查询属性
    * @param queryFieldExpressionOptions 查询属性参数
    */
-  addQueryFieldExpressionInSelectElements(
-    queryFieldExpressionOptions: Partial<QueryFieldExpression>,
-  ): QueryFieldExpression;
+  addQueryFieldExpression(queryFieldExpressionOptions: Partial<QueryFieldExpression>): QueryFieldExpression;
 
   /**
    * 添加查询属性
    * @param queryFieldExpression 已有的查询属性实例
    */
-  addQueryFieldExpressionInSelectElements(queryFieldExpression: QueryFieldExpression): QueryFieldExpression;
+  addQueryFieldExpression(queryFieldExpression: QueryFieldExpression): QueryFieldExpression;
 
-  addQueryFieldExpressionInSelectElements(options?: string | Partial<QueryFieldExpression> | QueryFieldExpression) {
-    const node = this._addQueryFieldExpressionInSelectElements(options as any);
+  addQueryFieldExpression(options?: string | Partial<QueryFieldExpression> | QueryFieldExpression) {
+    const node = this._addQueryFieldExpression(options as any);
     const index = this.selectElements.indexOf(node);
     node.create({
       index,
@@ -436,15 +430,15 @@ export class QuerySelectExpression extends LogicItem {
    * 删除查询聚合函数
    * @param name 查询聚合函数名称
    */
-  removeQueryAggregateExpressionInSelectElements(name: string): void;
+  removeQueryAggregateExpression(name: string): void;
 
   /**
    * 删除查询聚合函数
    * @param queryAggregateExpression 已有的查询聚合函数实例
    */
-  removeQueryAggregateExpressionInSelectElements(queryAggregateExpression: QueryAggregateExpression): void;
+  removeQueryAggregateExpression(queryAggregateExpression: QueryAggregateExpression): void;
 
-  removeQueryAggregateExpressionInSelectElements(options: string | QueryAggregateExpression) {
+  removeQueryAggregateExpression(options: string | QueryAggregateExpression) {
     let queryAggregateExpression: QueryAggregateExpression;
     if (typeof options === 'string') {
       queryAggregateExpression = (this.selectElements as QueryAggregateExpression[]).find(
@@ -463,15 +457,15 @@ export class QuerySelectExpression extends LogicItem {
    * 删除查询属性
    * @param name 查询属性名称
    */
-  removeQueryFieldExpressionInSelectElements(name: string): void;
+  removeQueryFieldExpression(name: string): void;
 
   /**
    * 删除查询属性
    * @param queryFieldExpression 已有的查询属性实例
    */
-  removeQueryFieldExpressionInSelectElements(queryFieldExpression: QueryFieldExpression): void;
+  removeQueryFieldExpression(queryFieldExpression: QueryFieldExpression): void;
 
-  removeQueryFieldExpressionInSelectElements(options: string | QueryFieldExpression) {
+  removeQueryFieldExpression(options: string | QueryFieldExpression) {
     let queryFieldExpression: QueryFieldExpression;
     if (typeof options === 'string') {
       queryFieldExpression = (this.selectElements as QueryFieldExpression[]).find((item) => item.name === options);
@@ -484,37 +478,6 @@ export class QuerySelectExpression extends LogicItem {
     return queryFieldExpression.delete();
   }
 
-  __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: logicItem,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = logicItem.__v_raw || logicItem;
-      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;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
@@ -536,17 +499,6 @@ export class QuerySelectExpression extends LogicItem {
     return this.selectElements.filter((item) => item.concept === 'QueryFieldExpression') as QueryFieldExpression[];
   }
 
-  getQueryFieldExpressionExistingNames(excludedList: Array<QueryFieldExpression> = []) {
-    const excludedSet = new Set(excludedList);
-    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 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/Rect__.ts

@@ -3,7 +3,7 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, getConceptConstructor, getBaseNode } from '../decorators';
+import { concept, excludedInJSON, property, getConceptConstructor } from '../decorators';
 
 import * as utils from '../utils';
 import * as types from './utils/types';
@@ -18,7 +18,11 @@ import BaseNode from '../common/BaseNode';
 export class Rect extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'Rect';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -28,30 +32,37 @@ export class Rect extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'Rect';
-
   /**
    * x
    */
-  @property()
-  x!: number;
+  @property({
+    objectRef: '',
+  })
+  x: number;
 
   /**
    * y
    */
-  @property()
-  y!: number;
+  @property({
+    objectRef: '',
+  })
+  y: number;
 
   /**
    * width
    */
-  @property()
-  width!: number;
+  @property({
+    objectRef: '',
+  })
+  width: number;
 
   /**
    * height
    */
-  @property()
-  height!: number;
+  @property({
+    objectRef: '',
+  })
+  height: number;
 
   /**
    * @param source 需要合并的部分参数
@@ -66,18 +77,6 @@ export class Rect extends BaseNode {
     return super.from(source, parentNode, parentKey) as Rect;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeRect?.(this);
-    }
-    return params;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。