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

package/src/concepts/ParamWithGroup__.ts

@@ -3,22 +3,27 @@
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 Param from './Param__';
 
 /**
- * 参数分组
+ * 带分组的参数
  */
-@concept('参数分组')
+@concept('带分组的参数')
 export class ParamWithGroup extends Param {
   /** 类名 */
   static readonly ConceptName: string = 'ParamWithGroup';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['Param', 'BaseNode'];
 
@@ -28,34 +33,37 @@ export class ParamWithGroup extends Param {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'ParamWithGroup';
-
   /**
-   * 参数分组标题
+   * 标题
    */
-  @property()
-  title!: string;
+  @property({
+    objectRef: '',
+  })
+  title: string;
 
   /**
-   * 类别
+   * 分组
    */
-  @property()
-  group!: string;
+  @property({
+    objectRef: '',
+  })
+  group: string;
 
   /**
    * @param source 需要合并的部分参数
    */
-  constructor(source?: Partial<any>) {
+  constructor(source?: Partial<ParamWithGroup>) {
     source = Object.assign({}, ParamWithGroup.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  static from(source: any, parentNode?: any, parentKey?: string): any {
-    return super.from(source, parentNode, parentKey) as any;
+  static from(source: any, parentNode?: any, parentKey?: string): ParamWithGroup {
+    return super.from(source, parentNode, parentKey) as ParamWithGroup;
   }
 
   /**
-   * 设置参数分组标题
+   * 设置标题
    */
   setTitle(title: string) {
     const object = {
@@ -67,7 +75,7 @@ export class ParamWithGroup extends Param {
   }
 
   /**
-   * 设置类别
+   * 设置分组
    */
   setGroup(group: string) {
     const object = {
@@ -82,7 +90,8 @@ export class ParamWithGroup extends Param {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
-  static getDefaultOptions() {
+
+  static getDefaultOptions(): any {
     return {
       group: '主要属性',
     };

package/src/concepts/Param__.ts

@@ -25,28 +25,27 @@ function tryJSONParse(str: string) {
 
   return result;
 }
+import Module from './Module__';
+import Connector from './Connector__';
+import View from './View__';
+import Frontend from './Frontend__';
+import ProcessElement from './ProcessElement__';
+import Process from './Process__';
+import Logic from './Logic__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
 //================================================================================
 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 BaseNode from '../common/BaseNode';
-import type TypeAnnotation from './TypeAnnotation__';
-import type DefaultValue from './DefaultValue__';
-import type Logic from './Logic__';
-import type View from './View__';
-import type Module from './Module__';
-import type App from './App__';
-import type Connector from './Connector__';
-import type Frontend from './Frontend__';
-import type ProcessElement from './ProcessElement__';
-import type Process from './Process__';
+import TypeAnnotation from './TypeAnnotation__';
+import DefaultValue from './DefaultValue__';
 
 /**
  * 输入参数
@@ -55,7 +54,11 @@ import type Process from './Process__';
 export class Param extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'Param';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -64,19 +67,22 @@ export class Param extends BaseNode {
    */
   @property('concept')
   // @ts-ignore
-  readonly concept!: 'Param';
-
+  readonly concept!: 'Param' | 'ParamWithGroup';
   /**
    * 输入参数名称
    */
-  @property()
-  name!: string;
+  @property({
+    objectRef: '',
+  })
+  name: string = '';
 
   /**
    * 输入参数描述
    */
-  @property()
-  description!: string;
+  @property({
+    objectRef: '',
+  })
+  description?: string = null;
 
   /**
    * 类型
@@ -84,13 +90,7 @@ export class Param extends BaseNode {
   @property({
     objectRef: 'TypeAnnotation',
   })
-  typeAnnotation!: TypeAnnotation;
-
-  /**
-   * 是否必填
-   */
-  @property()
-  required!: boolean;
+  typeAnnotation: TypeAnnotation;
 
   /**
    * 默认值
@@ -98,56 +98,7 @@ export class Param extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  defaultValue!: DefaultValue;
-
-  /**
-   * 祖先 Logic
-   */
-  get logic() {
-    return this.getAncestor('Logic') as Logic;
-  }
-  /**
-   * 祖先 Module
-   */
-  get module() {
-    return this.getAncestor('Module') as Module;
-  }
-  /**
-   * 祖先 App
-   */
-  get app() {
-    return this.getAncestor('App') as App;
-  }
-  /**
-   * 祖先 Connector
-   */
-  get connector() {
-    return this.getAncestor('Connector') as Connector;
-  }
-  /**
-   * 祖先 View
-   */
-  get view() {
-    return this.getAncestor('View') as View;
-  }
-  /**
-   * 祖先 Frontend
-   */
-  get frontend() {
-    return this.getAncestor('Frontend') as Frontend;
-  }
-  /**
-   * 祖先 ProcessElement
-   */
-  get processElement() {
-    return this.getAncestor('ProcessElement') as ProcessElement;
-  }
-  /**
-   * 祖先 Process
-   */
-  get process() {
-    return this.getAncestor('Process') as Process;
-  }
+  defaultValue?: DefaultValue = null;
 
   /**
    * @param source 需要合并的部分参数
@@ -162,17 +113,6 @@ export class Param extends BaseNode {
     return super.from(source, parentNode, parentKey) as Param;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removeParam?.(this);
-    }
-    return params;
-  }
   /**
    * 设置输入参数名称
    */
@@ -198,134 +138,61 @@ export class Param extends BaseNode {
     });
   }
 
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+  /**
+   * 祖先 Logic
+   */
+  get logic() {
+    return this.getAncestor('Logic') as Logic;
+  }
   /**
-   * 设置是否必填
+   * 祖先 Module
    */
-  setRequired(required: boolean) {
-    const object = {
-      required,
-    };
-    this.update({
-      ...object,
-    });
+  get module() {
+    return this.getAncestor('Module') as Module;
   }
-
   /**
-   * 删除类型标注
-   * @param name 类型标注名称
+   * 祖先 Connector
    */
-  removeTypeAnnotation(name: string): void;
-
+  get connector() {
+    return this.getAncestor('Connector') as Connector;
+  }
   /**
-   * 删除类型标注
-   * @param typeAnnotation 已有的类型标注实例
+   * 祖先 View
    */
-  removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
-
-  removeTypeAnnotation(options: string | TypeAnnotation) {
-    let typeAnnotation: TypeAnnotation;
-    if (typeof options === 'string') {
-      typeAnnotation = this.typeAnnotation;
-      if (!typeAnnotation) {
-        throw new Error('找不到类型标注 ' + options);
-      }
-    } else {
-      typeAnnotation = options;
-    }
-    return typeAnnotation.delete();
+  get view() {
+    return this.getAncestor('View') as View;
   }
-
-  __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const parentKey = typeAnnotation.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: typeAnnotation,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = typeAnnotation.__v_raw || typeAnnotation;
-      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;
+  /**
+   * 祖先 Frontend
+   */
+  get frontend() {
+    return this.getAncestor('Frontend') as Frontend;
   }
-
   /**
-   * 删除默认值
-   * @param name 默认值名称
+   * 祖先 ProcessElement
    */
-  removeDefaultValue(name: string): void;
-
+  get processElement() {
+    return this.getAncestor('ProcessElement') as ProcessElement;
+  }
   /**
-   * 删除默认值
-   * @param defaultValue 已有的默认值实例
+   * 祖先 Process
    */
-  removeDefaultValue(defaultValue: DefaultValue): void;
-
-  removeDefaultValue(options: string | DefaultValue) {
-    let defaultValue: DefaultValue;
-    if (typeof options === 'string') {
-      defaultValue = this.defaultValue;
-      if (!defaultValue) {
-        throw new Error('找不到默认值 ' + options);
-      }
-    } else {
-      defaultValue = options;
-    }
-    return defaultValue.delete();
+  get process() {
+    return this.getAncestor('Process') as Process;
   }
-
-  __removeDefaultValue(defaultValue: DefaultValue) {
-    const parentKey = defaultValue.parentKey;
-    const params: Params = {
-      parentNode: this,
-      parentKey,
-      index: -1,
-      object: null,
-      oldObject: defaultValue,
-    };
-    if (parentKey) {
-      params.parentKey = parentKey;
-      // @ts-ignore
-      const t = this.__v_raw || this;
-      // @ts-ignore
-      const n = defaultValue.__v_raw || defaultValue;
-      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;
+  /**
+   * 祖先 Logic
+   */
+  get OverriddenLogic() {
+    return this.getAncestor('OverriddenLogic') as Logic;
   }
 
-  //================================================================================
-  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-  // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  @excludedInJSON()
+  required: boolean;
 
   @excludedInJSON()
   @property()
@@ -370,8 +237,7 @@ export class Param extends BaseNode {
         typeName = typeAn.typeName;
       }
       const needGenInitFromSchema =
-        typeAnnotation &&
-        (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
+        typeAnnotation && (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
       let code = `${this.name} = `;
       if (needGenInitFromSchema) {
         code += `this.$genInitFromSchema('${sortedTypeKey}',`;
@@ -379,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 += `)`;
       }
@@ -424,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 += ': ';
@@ -466,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 += ': ';
@@ -527,7 +393,7 @@ export class Param extends BaseNode {
     });
   }
 
-  public static getDefaultOptions() {
+  public static getDefaultOptions(): any {
     return {
       required: true,
       typeAnnotation: {
@@ -574,13 +440,6 @@ export class Param extends BaseNode {
     return '';
   }
 
-  /**
-   * 祖先 Logic
-   */
-  get OverriddenLogic() {
-    return this.getAncestor('OverriddenLogic') as Logic;
-  }
-
   get AuthLogic() {
     return this.getAncestor('AuthLogic') as Logic;
   }

package/src/concepts/Point__.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 Point extends BaseNode {
   /** 类名 */
   static readonly ConceptName: string = 'Point';
-
+  /**
+   * 是否为抽象类
+   * 抽象类不能产生 concept: string
+   */
+  static isAbstract: boolean = false;
   /** 继承链 */
   static readonly inheritanceChain: string[] = ['BaseNode'];
 
@@ -28,18 +32,21 @@ export class Point extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'Point';
-
   /**
    * x
    */
-  @property()
-  x!: number;
+  @property({
+    objectRef: '',
+  })
+  x: number;
 
   /**
    * y
    */
-  @property()
-  y!: number;
+  @property({
+    objectRef: '',
+  })
+  y: number;
 
   /**
    * @param source 需要合并的部分参数
@@ -54,18 +61,6 @@ export class Point extends BaseNode {
     return super.from(source, parentNode, parentKey) as Point;
   }
 
-  /**
-   * 从父级删除该节点
-   * @internal
-   */
-  _delete() {
-    let params: Params = null;
-    if (this.parentNode) {
-      params = (this.parentNode as any)?.__removePoint?.(this);
-    }
-    return params;
-  }
-
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。