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

package/src/concepts/Namespace__.ts

@@ -19,7 +19,7 @@ import Function from './Function__';
 import AbstractInterface from './AbstractInterface__';
 import View from './View__';
 import Variable from './Variable__';
-import ViewComponent from './ViewComponent__';
+import ViewComponentDeclaration from './ViewComponentDeclaration__';
 import ProcessComponent from './ProcessComponent__';
 
 /**
@@ -29,6 +29,13 @@ import ProcessComponent from './ProcessComponent__';
 export class Namespace extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'Namespace';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -172,11 +179,11 @@ export class Namespace extends BaseNode {
    * 页面组件列表
    */
   @property({
-    objectRef: 'ViewComponent',
+    objectRef: 'ViewComponentDeclaration',
     isArray: true,
     defaultValue: [],
   })
-  viewComponents: Array<ViewComponent> = [];
+  viewComponents: Array<ViewComponentDeclaration> = [];
 
   /**
    * 流程组件列表
@@ -1737,14 +1744,14 @@ export class Namespace extends BaseNode {
     return node;
   }
 
-  getViewComponentExistingNames(excludedList: Array<ViewComponent> = []) {
+  getViewComponentDeclarationExistingNames(excludedList: Array<ViewComponentDeclaration> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.viewComponents as ViewComponent[]) || [])
+    return ((this.viewComponents as ViewComponentDeclaration[]) || [])
       .filter((item) => !excludedSet.has(item))
       .map((item) => item.name);
   }
-  getViewComponentUniqueName(name = 'viewComponent1') {
-    return utils.unique(name, this.getViewComponentExistingNames(), undefined, false);
+  getViewComponentDeclarationUniqueName(name = 'viewComponentDeclaration1') {
+    return utils.unique(name, this.getViewComponentDeclarationExistingNames(), undefined, false);
   }
 
   /**
@@ -1752,83 +1759,101 @@ export class Namespace extends BaseNode {
    * @internal
    * @param name 页面组件名称，如果不填会自动生成一个唯一名称
    */
-  _insertViewComponentAt(name: string, index: number): ViewComponent;
+  _insertViewComponentDeclarationAt(name: string, index: number): ViewComponentDeclaration;
 
   /**
    * 插入页面组件
    * @internal
-   * @param viewComponentOptions 页面组件参数
+   * @param viewComponentDeclarationOptions 页面组件参数
    */
-  _insertViewComponentAt(viewComponentOptions: Partial<ViewComponent>, index: number): ViewComponent;
+  _insertViewComponentDeclarationAt(
+    viewComponentDeclarationOptions: Partial<ViewComponentDeclaration>,
+    index: number,
+  ): ViewComponentDeclaration;
 
   /**
    * 插入页面组件
    * @internal
-   * @param viewComponent 已有的页面组件实例
+   * @param viewComponentDeclaration 已有的页面组件实例
    */
-  _insertViewComponentAt(viewComponent: ViewComponent, index: number): ViewComponent;
+  _insertViewComponentDeclarationAt(
+    viewComponentDeclaration: ViewComponentDeclaration,
+    index: number,
+  ): ViewComponentDeclaration;
 
-  _insertViewComponentAt(options: string | Partial<ViewComponent> | ViewComponent, index: number) {
-    const viewComponentOptions: any = {};
+  _insertViewComponentDeclarationAt(
+    options: string | Partial<ViewComponentDeclaration> | ViewComponentDeclaration,
+    index: number,
+  ) {
+    const viewComponentDeclarationOptions: any = {};
     const relationOptions = { parentNode: this, parentKey: 'viewComponents' };
-    const ViewComponent = getConceptConstructor('ViewComponent');
-    let viewComponent: ViewComponent;
+    const ViewComponentDeclaration = getConceptConstructor('ViewComponentDeclaration');
+    let viewComponentDeclaration: ViewComponentDeclaration;
     if (!options) {
-      viewComponent = ViewComponent.from(
+      viewComponentDeclaration = ViewComponentDeclaration.from(
         {
-          ...viewComponentOptions,
-          name: this.getViewComponentUniqueName(),
+          ...viewComponentDeclarationOptions,
+          name: this.getViewComponentDeclarationUniqueName(),
         },
         this,
         'viewComponents',
       );
     } else if (typeof options === 'string') {
-      viewComponent = ViewComponent.from(
+      viewComponentDeclaration = ViewComponentDeclaration.from(
         {
-          ...viewComponentOptions,
+          ...viewComponentDeclarationOptions,
           name: options,
         },
         this,
         'viewComponents',
       );
-    } else if (asserts.isViewComponent(options)) {
+    } else if (asserts.isViewComponentDeclaration(options)) {
       options.ensureDelete(); // 同一实例不支持多处存在
-      viewComponent = options;
-      Object.assign(viewComponent, relationOptions);
+      viewComponentDeclaration = options;
+      Object.assign(viewComponentDeclaration, relationOptions);
     } else {
-      viewComponent = ViewComponent.from(
+      viewComponentDeclaration = ViewComponentDeclaration.from(
         {
-          ...viewComponentOptions,
+          ...viewComponentDeclarationOptions,
           ...options,
         },
         this,
         'viewComponents',
       );
     }
-    this.viewComponents.splice(index, 0, viewComponent);
-    return viewComponent;
+    this.viewComponents.splice(index, 0, viewComponentDeclaration);
+    return viewComponentDeclaration;
   }
 
   /**
    * 插入页面组件
    * @param name 页面组件名称，如果不填会自动生成一个唯一名称
    */
-  insertViewComponentAt(name: string, index: number): ViewComponent;
+  insertViewComponentDeclarationAt(name: string, index: number): ViewComponentDeclaration;
 
   /**
    * 插入页面组件
-   * @param viewComponentOptions 页面组件参数
+   * @param viewComponentDeclarationOptions 页面组件参数
    */
-  insertViewComponentAt(viewComponentOptions: Partial<ViewComponent>, index: number): ViewComponent;
+  insertViewComponentDeclarationAt(
+    viewComponentDeclarationOptions: Partial<ViewComponentDeclaration>,
+    index: number,
+  ): ViewComponentDeclaration;
 
   /**
    * 插入页面组件
-   * @param viewComponent 已有的页面组件实例
-   */
-  insertViewComponentAt(viewComponent: ViewComponent, index: number): ViewComponent;
-
-  insertViewComponentAt(options: string | Partial<ViewComponent> | ViewComponent, index: number) {
-    const node = this._insertViewComponentAt(options as any, index);
+   * @param viewComponentDeclaration 已有的页面组件实例
+   */
+  insertViewComponentDeclarationAt(
+    viewComponentDeclaration: ViewComponentDeclaration,
+    index: number,
+  ): ViewComponentDeclaration;
+
+  insertViewComponentDeclarationAt(
+    options: string | Partial<ViewComponentDeclaration> | ViewComponentDeclaration,
+    index: number,
+  ) {
+    const node = this._insertViewComponentDeclarationAt(options as any, index);
     node.create({
       index,
       parentNode: this,
@@ -1842,25 +1867,27 @@ export class Namespace extends BaseNode {
    * @internal
    * @param name 页面组件名称，如果不填会自动生成一个唯一名称
    */
-  _addViewComponent(name?: string): ViewComponent;
+  _addViewComponentDeclaration(name?: string): ViewComponentDeclaration;
 
   /**
    * 添加页面组件
    * @internal
-   * @param viewComponentOptions 页面组件参数
+   * @param viewComponentDeclarationOptions 页面组件参数
    */
-  _addViewComponent(viewComponentOptions: Partial<ViewComponent>): ViewComponent;
+  _addViewComponentDeclaration(
+    viewComponentDeclarationOptions: Partial<ViewComponentDeclaration>,
+  ): ViewComponentDeclaration;
 
   /**
    * 添加页面组件
    * @internal
-   * @param viewComponent 已有的页面组件实例
+   * @param viewComponentDeclaration 已有的页面组件实例
    */
-  _addViewComponent(viewComponent: ViewComponent): ViewComponent;
+  _addViewComponentDeclaration(viewComponentDeclaration: ViewComponentDeclaration): ViewComponentDeclaration;
 
-  _addViewComponent(options?: string | Partial<ViewComponent> | ViewComponent) {
+  _addViewComponentDeclaration(options?: string | Partial<ViewComponentDeclaration> | ViewComponentDeclaration) {
     const index = this.viewComponents.length;
-    return this._insertViewComponentAt(options as any, index);
+    return this._insertViewComponentDeclarationAt(options as any, index);
   }
 
   /**
@@ -1868,22 +1895,24 @@ export class Namespace extends BaseNode {
    * @internal
    * @param name 页面组件名称，如果不填会自动生成一个唯一名称
    */
-  addViewComponent(name?: string): ViewComponent;
+  addViewComponentDeclaration(name?: string): ViewComponentDeclaration;
 
   /**
    * 添加页面组件
-   * @param viewComponentOptions 页面组件参数
+   * @param viewComponentDeclarationOptions 页面组件参数
    */
-  addViewComponent(viewComponentOptions: Partial<ViewComponent>): ViewComponent;
+  addViewComponentDeclaration(
+    viewComponentDeclarationOptions: Partial<ViewComponentDeclaration>,
+  ): ViewComponentDeclaration;
 
   /**
    * 添加页面组件
-   * @param viewComponent 已有的页面组件实例
+   * @param viewComponentDeclaration 已有的页面组件实例
    */
-  addViewComponent(viewComponent: ViewComponent): ViewComponent;
+  addViewComponentDeclaration(viewComponentDeclaration: ViewComponentDeclaration): ViewComponentDeclaration;
 
-  addViewComponent(options?: string | Partial<ViewComponent> | ViewComponent) {
-    const node = this._addViewComponent(options as any);
+  addViewComponentDeclaration(options?: string | Partial<ViewComponentDeclaration> | ViewComponentDeclaration) {
+    const node = this._addViewComponentDeclaration(options as any);
     const index = this.viewComponents.indexOf(node);
     node.create({
       index,
@@ -2303,25 +2332,27 @@ export class Namespace extends BaseNode {
    * 删除页面组件
    * @param name 页面组件名称
    */
-  removeViewComponent(name: string): void;
+  removeViewComponentDeclaration(name: string): void;
 
   /**
    * 删除页面组件
-   * @param viewComponent 已有的页面组件实例
+   * @param viewComponentDeclaration 已有的页面组件实例
    */
-  removeViewComponent(viewComponent: ViewComponent): void;
+  removeViewComponentDeclaration(viewComponentDeclaration: ViewComponentDeclaration): void;
 
-  removeViewComponent(options: string | ViewComponent) {
-    let viewComponent: ViewComponent;
+  removeViewComponentDeclaration(options: string | ViewComponentDeclaration) {
+    let viewComponentDeclaration: ViewComponentDeclaration;
     if (typeof options === 'string') {
-      viewComponent = (this.viewComponents as ViewComponent[]).find((item) => item.name === options);
-      if (!viewComponent) {
+      viewComponentDeclaration = (this.viewComponents as ViewComponentDeclaration[]).find(
+        (item) => item.name === options,
+      );
+      if (!viewComponentDeclaration) {
         throw new Error('找不到页面组件 ' + options);
       }
     } else {
-      viewComponent = options;
+      viewComponentDeclaration = options;
     }
-    return viewComponent.delete();
+    return viewComponentDeclaration.delete();
   }
 
   /**

package/src/concepts/NewComposite__.ts

@@ -37,6 +37,13 @@ import LogicItem from './LogicItem__';
 export class NewComposite extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'NewComposite';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/NewList__.ts

@@ -33,6 +33,13 @@ import LogicItem from './LogicItem__';
 export class NewList extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'NewList';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/NewMap__.ts

@@ -33,6 +33,13 @@ import LogicItem from './LogicItem__';
 export class NewMap extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'NewMap';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/New__.ts

@@ -29,6 +29,13 @@ import LogicItem from './LogicItem__';
 export class New extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'New';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/NullLiteral__.ts

@@ -30,6 +30,13 @@ import LogicItem from './LogicItem__';
 export class NullLiteral extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'NullLiteral';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/NumberInputSetter__.ts

@@ -0,0 +1,104 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+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 BaseSetter from './BaseSetter__';
+
+/**
+ * 数字输入设置器
+ */
+@concept('数字输入设置器')
+export class NumberInputSetter extends BaseSetter {
+  /** 类名 */
+  static readonly ConceptName: string = 'NumberInputSetter';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['BaseSetter', 'BaseNode'];
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'NumberInputSetter';
+  /**
+   * 按钮位置
+   */
+  @property({
+    objectRef: '',
+  })
+  placement?: string = null;
+
+  /**
+   * 最小值
+   */
+  @property({
+    objectRef: '',
+  })
+  min?: number = null;
+
+  /**
+   * 最大值
+   */
+  @property({
+    objectRef: '',
+  })
+  max?: number = null;
+
+  /**
+   * 精度
+   */
+  @property({
+    objectRef: '',
+  })
+  precision?: number = null;
+
+  /**
+   * 占位文本
+   */
+  @property({
+    objectRef: '',
+  })
+  placeholder?: string = null;
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<NumberInputSetter>) {
+    source = Object.assign({}, NumberInputSetter.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): NumberInputSetter {
+    return super.from(source, parentNode, parentKey) as NumberInputSetter;
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default NumberInputSetter;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/NumericLiteral__.ts

@@ -31,6 +31,13 @@ import LogicItem from './LogicItem__';
 export class NumericLiteral extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'NumericLiteral';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/OqlQueryComponent__.ts

@@ -39,6 +39,13 @@ import LogicItem from './LogicItem__';
 export class OqlQueryComponent extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'OqlQueryComponent';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/OverriddenLogic__.ts

@@ -65,6 +65,13 @@ import LogicItem from './LogicItem__';
 export class OverriddenLogic extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'OverriddenLogic';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/Paginate__.ts

@@ -28,6 +28,13 @@ import TypeAnnotation from './TypeAnnotation__';
 export class Paginate extends LogicItem {
   /** 类名 */
   static readonly ConceptName: string = 'Paginate';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['LogicItem', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/ParamWithGroup__.ts

@@ -19,6 +19,13 @@ import Param from './Param__';
 export class ParamWithGroup extends Param {
   /** 类名 */
   static readonly ConceptName: string = 'ParamWithGroup';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['Param', 'BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/Param__.ts

@@ -54,6 +54,13 @@ import DefaultValue from './DefaultValue__';
 export class Param extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'Param';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念
@@ -75,7 +82,7 @@ export class Param extends BaseNode {
   @property({
     objectRef: '',
   })
-  description: string;
+  description?: string = null;
 
   /**
    * 类型
@@ -85,14 +92,6 @@ export class Param extends BaseNode {
   })
   typeAnnotation: TypeAnnotation;
 
-  /**
-   * 是否必填
-   */
-  @property({
-    objectRef: '',
-  })
-  required: boolean;
-
   /**
    * 默认值
    */
@@ -139,18 +138,6 @@ export class Param extends BaseNode {
     });
   }
 
-  /**
-   * 设置是否必填
-   */
-  setRequired(required: boolean) {
-    const object = {
-      required,
-    };
-    this.update({
-      ...object,
-    });
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
@@ -204,6 +191,9 @@ export class Param extends BaseNode {
     return this.getAncestor('OverriddenLogic') as Logic;
   }
 
+  @excludedInJSON()
+  required: boolean;
+
   @excludedInJSON()
   @property()
   defaultExpression: LogicItem | Function | AnonymousFunction = undefined;
@@ -255,7 +245,7 @@ export class Param extends BaseNode {
 
       const expressionJS = this.defaultValue?.toJS?.();
 
-      code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${sortedTypeKey}', this.$route.query.${this.name}) : ${expressionJS})`;
+      code += `${this.name} === undefined ? (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${sortedTypeKey}', this.$route.query.${this.name}) : ${expressionJS}) : ${this.name}`;
       if (needGenInitFromSchema) {
         code += `)`;
       }
@@ -300,7 +290,7 @@ export class Param extends BaseNode {
       typeKey = `${typeAnnotation.typeNamespace}.${typeAnnotation.typeName}`;
     }
     if (asserts.isFunction(self.defaultExpression) || asserts.isAnonymousFunction(self.defaultExpression)) {
-      code += self.required ? ': ' : '?: ';
+      code += self.defaultValue?.expression || self.defaultExpression ? '?: ' : ': ';
       code += yield* self.defaultExpression.toEmbeddedTSDefinition(shiftState(state, code));
     } else if (!dontType && self.typeAnnotation) {
       code += ': ';
@@ -342,7 +332,7 @@ export class Param extends BaseNode {
     }
 
     if (asserts.isFunction(this.defaultExpression) || asserts.isAnonymousFunction(this.defaultExpression)) {
-      code += this.required ? ': ' : '?: ';
+      code += this.defaultValue?.expression || this.defaultExpression ? '?: ' : ': ';
       code += runSync(this.defaultExpression.toEmbeddedTSDefinition(shiftState(state, code)));
     } else if (!dontType && this.typeAnnotation) {
       code += ': ';

package/src/concepts/Point__.ts

@@ -18,6 +18,13 @@ import BaseNode from '../common/BaseNode';
 export class Point extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'Point';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念

package/src/concepts/ProcessComponent__.ts

@@ -21,6 +21,13 @@ import Logic from './Logic__';
 export class ProcessComponent extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'ProcessComponent';
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
+  /** 继承链 */
+  static readonly inheritanceChain: string[] = ['BaseNode'];
 
   /**
    * 产品概念