@lcap/nasl 3.2.0-beta.4 → 3.3.0-alpha

package/src/concepts/QueryAggregateExpression__.ts

@@ -1,13 +1,13 @@
+import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, withSourceMap } from '../translator';
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//================================================================================
+//= ===============================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
 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 QueryFieldExpression from './QueryFieldExpression__';
@@ -18,150 +18,143 @@ import LogicItem from './LogicItem__';
  */
 @concept('查询聚合函数')
 export class QueryAggregateExpression extends LogicItem {
-    /**
-     * 产品概念
-     */
-    @property()
-    concept: 'QueryAggregateExpression' = 'QueryAggregateExpression';
-
-    /**
-     * 聚合属性别名
-     */
-    @property()
-    asName: string = undefined;
-
-    /**
-     * 聚合函数名称
-     */
-    @property()
-    aggregateName: 'COUNT' | 'COUNTD' | 'SUM' | 'AVG' | 'MAX' | 'MIN' = undefined;
-
-    /**
-     * 聚合函数参数
-     */
-    @property('QueryFieldExpression')
-    aggregateParam: QueryFieldExpression = undefined;
-
-    
-
-    /**
-     * @param source 需要合并的部分参数
-     */
-    constructor(source?: Partial<QueryAggregateExpression>) {
-        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;
-    }
-
-    
-    
-
-    
-
-    
-
-    /**
-    * 删除查询属性
-    * @param name 查询属性名称
-    */
-    removeAggregateParam(name: string): void;
-
-    /**
-     * 删除查询属性
-     * @param aggregateParam 已有的查询属性实例
-     */
-    removeAggregateParam(aggregateParam: QueryFieldExpression): void;
-
-    removeAggregateParam(options: string | QueryFieldExpression) {
-        let aggregateParam: QueryFieldExpression;
-        if (typeof options === 'string') {
-            aggregateParam = this.aggregateParam;
-            if (!aggregateParam) {
-                throw new Error('找不到查询属性 ' + options);
-            }
-        } else {
-            aggregateParam = options;
-        }
-        return aggregateParam.delete();
+  /**
+   * 产品概念
+   */
+  @property()
+  concept: 'QueryAggregateExpression' = 'QueryAggregateExpression';
+
+  /**
+   * 聚合属性别名
+   */
+  @property()
+  asName: string = undefined;
+
+  /**
+   * 聚合函数名称
+   */
+  @property()
+  aggregateName: 'COUNT' | 'COUNTD' | 'SUM' | 'AVG' | 'MAX' | 'MIN' = undefined;
+
+  /**
+   * 聚合函数参数
+   */
+  @property('QueryFieldExpression')
+  aggregateParam: QueryFieldExpression = undefined;
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<QueryAggregateExpression>) {
+    // @ts-ignore
+    source = { ...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;
+  }
+
+  /**
+   * 删除查询属性
+   * @param name 查询属性名称
+   */
+  removeAggregateParam(name: string): void;
+
+  /**
+   * 删除查询属性
+   * @param aggregateParam 已有的查询属性实例
+   */
+  removeAggregateParam(aggregateParam: QueryFieldExpression): void;
+
+  removeAggregateParam(options: string | QueryFieldExpression) {
+    let aggregateParam: QueryFieldExpression;
+    if (typeof options === 'string') {
+      aggregateParam = this.aggregateParam;
+      if (!aggregateParam) {
+        throw new Error(`找不到查询属性 ${options}`);
+      }
+    } else {
+      aggregateParam = options;
     }
-
-    __removeLogicItem(logicItem: LogicItem) {
-        const parentKey = logicItem.parentKey;
-        const params: Params = {
-            parentNode: this,
-            parentKey,
-            index: -1,
-            object: null,
-            oldObject: logicItem,
-        };
-        if (parentKey) {
-            params.parentKey = parentKey;
-            if (Array.isArray((this as any)[parentKey])) {
-                const index = (this as any)[parentKey].indexOf(logicItem);
-                ~index && (this as any)[parentKey].splice(index, 1);
-                params.index = index;
-            } else if ((this as any)[parentKey] === logicItem) {
-                params.index = 0;
-                (this as any)[parentKey] = undefined;
-            }
-        }
-        return params;
+    return aggregateParam.delete();
+  }
+
+  __removeLogicItem(logicItem: LogicItem) {
+    const { parentKey } = logicItem;
+    const params: Params = {
+      parentNode: this,
+      parentKey,
+      index: -1,
+      object: null,
+      oldObject: logicItem,
+    };
+    if (parentKey) {
+      params.parentKey = parentKey;
+      if (Array.isArray((this as any)[parentKey])) {
+        const index = (this as any)[parentKey].indexOf(logicItem);
+        ~index && (this as any)[parentKey].splice(index, 1);
+        params.index = index;
+      } else if ((this as any)[parentKey] === logicItem) {
+        params.index = 0;
+        (this as any)[parentKey] = undefined;
+      }
     }
-
-    //================================================================================
-    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-    // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
-    public static getDefaultOptions() {
-        return {
-            aggregateName: '',
-            aggregateParam: {
-                concept: 'QueryFieldExpression',
-            },
-        };
-    }
-
-    @withSourceMap()
-    toEmbeddedTS(state?: TranslatorState): string {
-        // const { aggregateName, aggregateParam, asName } = this;
-        // let code = '';
-        // if (aggregateName && aggregateParam) {
-        //     code += `[nasl.langUtil.${aggregateName}(`;
-        //     code += aggregateParam.toEmbeddedTS(shiftState(state, code));
-        //     code += '), ';
-        //     code += `${asName || '__EMPTY_AGGREGATE_ALIAS__'}]`;
-        // } else
-        //     code += `[__EMPTY_AGGREGATE_NAME__, '']`;
-
-        // return code;
-        return `__${this.asName || 'EMPTY_AGGREGATE_ALIAS__'}`;
-    }
-
-    setName(asName: string) {
-        const object = {
-            asName,
-        };
-        this.update({
-            ...object,
-        });
-    }
-
-    //================================================================================
-    // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
-    // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-    //================================================================================
+    return params;
+  }
+
+  //= ===============================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //= ===============================================================================
+  public static getDefaultOptions() {
+    return {
+      aggregateName: '',
+      aggregateParam: {
+        concept: 'QueryFieldExpression',
+      },
+    };
+  }
+
+  @withSourceMap()
+  toEmbeddedTS(state?: TranslatorState): string {
+    // const { aggregateName, aggregateParam, asName } = this;
+    // let code = '';
+    // if (aggregateName && aggregateParam) {
+    //     code += `[nasl.langUtil.${aggregateName}(`;
+    //     code += aggregateParam.toEmbeddedTS(shiftState(state, code));
+    //     code += '), ';
+    //     code += `${asName || '__EMPTY_AGGREGATE_ALIAS__'}]`;
+    // } else
+    //     code += `[__EMPTY_AGGREGATE_NAME__, '']`;
+
+    // return code;
+    return `__${this.asName || 'EMPTY_AGGREGATE_ALIAS__'}`;
+  }
+
+  setName(asName: string) {
+    const object = {
+      asName,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
+  //= ===============================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //= ===============================================================================
 }
 
 classMap.QueryAggregateExpression = QueryAggregateExpression;
 export default QueryAggregateExpression;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================

package/src/concepts/QueryFieldExpression__.ts

@@ -1,14 +1,14 @@
+import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, withSourceMap } from '../translator';
 import CallQueryComponent from './CallQueryComponent__';
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//================================================================================
+//= ===============================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
 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__';
@@ -18,152 +18,148 @@ import LogicItem from './LogicItem__';
  */
 @concept('查询属性')
 export class QueryFieldExpression extends LogicItem {
-    /**
-     * 产品概念
-     */
-    @property()
-    concept: 'QueryFieldExpression' = 'QueryFieldExpression';
-
-    /**
-     * isDotStar
-     */
-    @property()
-    isDotStar: boolean = false;
-
-    /**
-     * asName
-     */
-    @property()
-    asName?: string = undefined;
-
-    /**
-     * entityAsName
-     */
-    @property()
-    entityAsName: string = undefined;
-
-    /**
-     * propertyName
-     */
-    @property()
-    propertyName: string = undefined;
-
-    
-
-    /**
-     * @param source 需要合并的部分参数
-     */
-    constructor(source?: Partial<QueryFieldExpression>) {
-        source = Object.assign({}, QueryFieldExpression.getDefaultOptions(), source);
-        super(source);
-        super.subConstructor(source);
-    }
-    getClassName() {
-        return 'QueryFieldExpression';
-    }
-
-    static from(source: any, parentNode?: any, parentKey?: string): QueryFieldExpression {
-        return super.from(source, parentNode, parentKey) as QueryFieldExpression;
-    }
-
-    
-    /**
-     * 设置entityAsName
-     */
-    setEntityAsName(entityAsName: string) {
-        const object = {
-            entityAsName,
-        };
-        this.update({
-            ...object,
-        });
-    }
-
-    /**
-     * 设置propertyName
-     */
-    setPropertyName(propertyName: string) {
-        const object = {
-            propertyName,
-        };
-        this.update({
-            ...object,
-        });
-    }
-
-    
-
-    
-
-    //================================================================================
-    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-    // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
-
-    get completeName() {
-        const callQueryComponent = this.getAncestor('CallQueryComponent') as CallQueryComponent;
-        if (callQueryComponent) {
-            const entityNamespace = callQueryComponent?.from?.entityNamespace;
-            return `${entityNamespace}.${this.entityAsName}.${this.propertyName}`;
-        }
-        return `${this.entityAsName}.${this.propertyName}`;
-    }
-
-    public static getDefaultOptions() {
-        return {
-            entityAsName: '',
-            propertyName: '',
-        };
+  /**
+   * 产品概念
+   */
+  @property()
+  concept: 'QueryFieldExpression' = 'QueryFieldExpression';
+
+  /**
+   * isDotStar
+   */
+  @property()
+  isDotStar: boolean = false;
+
+  /**
+   * asName
+   */
+  @property()
+  asName?: string = undefined;
+
+  /**
+   * entityAsName
+   */
+  @property()
+  entityAsName: string = undefined;
+
+  /**
+   * propertyName
+   */
+  @property()
+  propertyName: string = undefined;
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<QueryFieldExpression>) {
+    // @ts-ignore
+    source = { ...QueryFieldExpression.getDefaultOptions(), ...source };
+    super(source);
+    super.subConstructor(source);
+  }
+
+  getClassName() {
+    return 'QueryFieldExpression';
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): QueryFieldExpression {
+    return super.from(source, parentNode, parentKey) as QueryFieldExpression;
+  }
+
+  /**
+   * 设置entityAsName
+   */
+  setEntityAsName(entityAsName: string) {
+    const object = {
+      entityAsName,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
+  /**
+   * 设置propertyName
+   */
+  setPropertyName(propertyName: string) {
+    const object = {
+      propertyName,
+    };
+    this.update({
+      ...object,
+    });
+  }
+
+  //= ===============================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //= ===============================================================================
+
+  get completeName() {
+    const callQueryComponent = this.getAncestor('CallQueryComponent') as CallQueryComponent;
+    if (callQueryComponent) {
+      const entityNamespace = callQueryComponent?.from?.entityNamespace;
+      return `${entityNamespace}.${this.entityAsName}.${this.propertyName}`;
     }
-
-    setEntityAsNameAndEffect(entityAsName: string) {
-        this.setEntityAsName(entityAsName);
-        this.effect();
+    return `${this.entityAsName}.${this.propertyName}`;
+  }
+
+  public static getDefaultOptions() {
+    return {
+      entityAsName: '',
+      propertyName: '',
+    };
+  }
+
+  setEntityAsNameAndEffect(entityAsName: string) {
+    this.setEntityAsName(entityAsName);
+    this.effect();
+  }
+
+  effect() {
+    // 处理选中的此实体的 CallQueryComponent
+    const callQueryComponent = this.getAncestor('CallQueryComponent') as CallQueryComponent;
+    callQueryComponent.saveStructure();
+  }
+
+  setName(asName: string) {
+    this.update({ asName });
+  }
+
+  getValue() {
+    const { entityAsName, propertyName } = this;
+    return `${entityAsName}.${propertyName}`;
+  }
+
+  @withSourceMap()
+  toEmbeddedTS(state?: TranslatorState): string {
+    const { entityAsName, propertyName, isDotStar } = this;
+    const callQueryComponent = this.getAncestor('CallQueryComponent') as CallQueryComponent;
+    if (callQueryComponent) {
+      const entityNamespace = callQueryComponent?.from?.entityNamespace;
+      if (entityNamespace && entityAsName && propertyName) {
+        return `new ${entityNamespace}.${entityAsName}().${propertyName}`;
+      }
+      if (entityNamespace && entityAsName && isDotStar) {
+        return `new ${entityNamespace}.${entityAsName}()`;
+      }
     }
+    return '__QueryFieldExpression__';
+  }
 
-    effect() {
-        // 处理选中的此实体的 CallQueryComponent
-        const callQueryComponent = this.getAncestor('CallQueryComponent') as CallQueryComponent;
-        callQueryComponent.saveStructure();
-    }
-
-    setName(asName: string) {
-        this.update({ asName });
-    }
-
-    getValue() {
-        const { entityAsName, propertyName } = this;
-        return `${entityAsName}.${propertyName}`;
-    }
-
-    @withSourceMap()
-    toEmbeddedTS(state?: TranslatorState): string {
-        const { entityAsName, propertyName, isDotStar } = this;
-        const callQueryComponent = this.getAncestor('CallQueryComponent') as CallQueryComponent;
-        if (callQueryComponent) {
-            const entityNamespace = callQueryComponent?.from?.entityNamespace;
-            if (entityNamespace && entityAsName && propertyName) {
-                return `new ${entityNamespace}.${entityAsName}().${propertyName}`;
-            } else if (entityNamespace && entityAsName && isDotStar) {
-                return `new ${entityNamespace}.${entityAsName}()`;
-            }
-        }
-        return '__QueryFieldExpression__';
-    }
-
-    toBrief(): string {
-        return this.getValue();
-    }
+  toBrief(): string {
+    return this.getValue();
+  }
 
-    //================================================================================
-    // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
-    // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-    //================================================================================
+  //= ===============================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //= ===============================================================================
 }
 
 classMap.QueryFieldExpression = QueryFieldExpression;
 export default QueryFieldExpression;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================