@lcap/nasl 3.3.0-beta.0 → 3.4.0-alpha.1

package/src/concepts/Param__.ts

@@ -1,5 +1,6 @@
+import { v4 as uuidv4 } from 'uuid';
 import { dataTypesMap } from './basics/types';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import LogicItem from './LogicItem__';
 import EntityProperty from './EntityProperty__';
 import Structure from './Structure__';
@@ -7,26 +8,16 @@ import StructureProperty from './StructureProperty__';
 import Function from './Function__';
 import AnonymousFunction from './AnonymousFunction__';
 
-function tryJSONParse(str: string) {
-  let result;
-
-  try {
-    result = JSON.parse(str);
-  } catch (e) {}
-
-  return result;
-}
-
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//================================================================================
+//= ===============================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+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 TypeAnnotation from './TypeAnnotation__';
 import Logic from './Logic__';
 import View from './View__';
@@ -37,56 +28,56 @@ import Frontend from './Frontend__';
 import ProcessElement from './ProcessElement__';
 import Process from './Process__';
 
+function tryJSONParse(str: string) {
+  let result;
+
+  try {
+    result = JSON.parse(str);
+  } catch (e) {}
+
+  return result;
+}
+
 /**
  * 输入参数
  */
-@className
 @concept('输入参数')
-// @ts-ignore
 export class Param extends BaseNode {
-  /** 类名 */
-  static readonly ConceptName = 'Param';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'Param';
+  @property()
+  concept: 'Param' = 'Param';
 
   /**
    * 输入参数名称
    */
   @property()
-  // @ts-ignore
-  name!: string;
+  name: string = undefined;
 
   /**
    * 输入参数描述
    */
   @property()
-  // @ts-ignore
-  description!: string;
+  description: string = undefined;
 
   /**
    * 类型
    */
   @property('TypeAnnotation')
-  // @ts-ignore
-  typeAnnotation!: TypeAnnotation;
+  typeAnnotation: TypeAnnotation = undefined;
 
   /**
    * 是否必填
    */
   @property()
-  // @ts-ignore
-  required!: boolean;
+  required: boolean = undefined;
 
   /**
    * 默认值
    */
   @property()
-  // @ts-ignore
-  defaultValue!: string;
+  defaultValue: string = undefined;
 
   /**
    * 祖先 Logic
@@ -94,42 +85,49 @@ export class Param extends BaseNode {
   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
    */
@@ -141,11 +139,16 @@ export class Param extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Param>) {
-    source = Object.assign({}, Param.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...Param.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'Param';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): Param {
     return super.from(source, parentNode, parentKey) as Param;
   }
@@ -161,6 +164,7 @@ export class Param extends BaseNode {
     }
     return params;
   }
+
   /**
    * 设置输入参数名称
    */
@@ -227,7 +231,7 @@ export class Param extends BaseNode {
     if (typeof options === 'string') {
       typeAnnotation = this.typeAnnotation;
       if (!typeAnnotation) {
-        throw new Error('找不到类型标注 ' + options);
+        throw new Error(`找不到类型标注 ${options}`);
       }
     } else {
       typeAnnotation = options;
@@ -236,7 +240,7 @@ export class Param extends BaseNode {
   }
 
   __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const parentKey = typeAnnotation.parentKey;
+    const { parentKey } = typeAnnotation;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -258,10 +262,10 @@ export class Param extends BaseNode {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
 
   @excludedInJSON()
   @property()
@@ -298,8 +302,7 @@ export class Param extends BaseNode {
     if (this.view) {
       const typeAnnotation = this.typeAnnotation || this.__TypeAnnotation;
       const needGenInitFromSchema =
-        typeAnnotation &&
-        (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
+        typeAnnotation && (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
       let code = `${this.name} = `;
       if (needGenInitFromSchema) {
         code += `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
@@ -311,11 +314,7 @@ export class Param extends BaseNode {
       let parsedValue = defaultValue ?? undefined;
       if (
         defaultValueType === '[object String]' &&
-        !(
-          typeKind === 'primitive' &&
-          typeNamespace === 'nasl.core' &&
-          ['String', 'Text', 'Email'].includes(typeName)
-        ) &&
+        !(typeKind === 'primitive' && typeNamespace === 'nasl.core' && ['String', 'Text', 'Email'].includes(typeName)) &&
         !this.isEnum() &&
         !['union'].includes(typeKind)
       ) {
@@ -327,9 +326,9 @@ export class Param extends BaseNode {
           parsedValue = tryJSONParse(defaultValue) ?? defaultValue;
         }
       }
-      code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${
-        typeAnnotation?.sortedTypeKey
-      }', this.$route.query.${this.name}) : ${JSON.stringify(this.defaultValue)})`;
+      code += `${this.name} || (this.$route.query.hasOwnProperty('${
+        this.name
+      }') ? this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', this.$route.query.${this.name}) : ${JSON.stringify(this.defaultValue)})`;
 
       if (needGenInitFromSchema) {
         code += `)`;
@@ -386,6 +385,45 @@ export class Param extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState(), dontType?: boolean): string {
+    let code = this.name;
+    // 回调函数类的参数
+    if (this?.typeAnnotation?.typeKind === 'function') {
+      code += ':{(';
+      const paramTypes = this.typeAnnotation?.typeArguments || [];
+      paramTypes.forEach((type, index) => {
+        code += `type${index + 1}:${type.toNaturalTS(shiftState(state, code))}`;
+        if (index !== paramTypes.length - 1) {
+          code += ',';
+        } else {
+          code += ')';
+        }
+      });
+      code += ':';
+      const returnTypes = this.typeAnnotation?.returnType || [];
+      returnTypes.forEach((type) => {
+        code += type.toNaturalTS(shiftState(state, code));
+      });
+      code += '}';
+      return code;
+    }
+
+    if (this.defaultExpression instanceof Function || this.defaultExpression instanceof AnonymousFunction) {
+      code += this.required ? ': ' : '?: ';
+      code += this.defaultExpression.toEmbeddedTSDefinition(shiftState(state, code));
+    } else if (!dontType && this.typeAnnotation) {
+      code += ': ';
+      code += this.typeAnnotation.toNaturalTS(shiftState(state, code));
+      if (this.typeAnnotation?.typeKind !== 'primitive' && this.defaultValue) {
+        if (this.isEnum()) {
+          code += `= ${this.typeAnnotation.typeKey}['${this.defaultValue}']`;
+        }
+      }
+    }
+    return code;
+  }
+
   @withSourceMap()
   toEmbeddedNameTS(state?: TranslatorState): string {
     return `${this.name}`;
@@ -495,14 +533,15 @@ export class Param extends BaseNode {
     return this.getAncestor('AuthLogicForCallInterface') as Logic;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.Param = Param;
 export default Param;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================

package/src/concepts/Point__.ts

@@ -1,53 +1,52 @@
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//================================================================================
+//= ===============================================================================
+import { v4 as uuidv4 } from 'uuid';
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+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';
 
 /**
  * 点信息
  */
-@className
 @concept('点信息')
-// @ts-ignore
 export class Point extends BaseNode {
-  /** 类名 */
-  static readonly ConceptName = 'Point';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'Point';
+  @property()
+  concept: 'Point' = 'Point';
 
   /**
    * x
    */
   @property()
-  // @ts-ignore
-  x!: number;
+  x: number = undefined;
 
   /**
    * y
    */
   @property()
-  // @ts-ignore
-  y!: number;
+  y: number = undefined;
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Point>) {
-    source = Object.assign({}, Point.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...Point.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'Point';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): Point {
     return super.from(source, parentNode, parentKey) as Point;
   }
@@ -64,19 +63,20 @@ export class Point extends BaseNode {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
 
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.Point = Point;
 export default Point;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================

package/src/concepts/ProcessComponent__.ts

@@ -1,13 +1,14 @@
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//================================================================================
+//= ===============================================================================
+import { v4 as uuidv4 } from 'uuid';
 import { EventPayload, Params } from '../common/EventEmitter';
-import { concept, excludedInJSON, property, className } from '../decorators';
+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 Attribute from './Attribute__';
 import Logic from './Logic__';
 import Module from './Module__';
@@ -16,46 +17,37 @@ import App from './App__';
 /**
  * 流程组件
  */
-@className
 @concept('流程组件')
-// @ts-ignore
 export class ProcessComponent extends BaseNode {
-  /** 类名 */
-  static readonly ConceptName = 'ProcessComponent';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'ProcessComponent';
+  @property()
+  concept: 'ProcessComponent' = 'ProcessComponent';
 
   /**
    * 流程组件名称
    */
   @property()
-  // @ts-ignore
-  name!: string;
+  name: string = undefined;
 
   /**
    * 流程组件标题
    */
   @property()
-  // @ts-ignore
-  title!: string;
+  title: string = undefined;
 
   /**
    * 流程组件描述
    */
   @property()
-  // @ts-ignore
-  description!: string;
+  description: string = undefined;
 
   /**
    * category
    */
   @property()
-  // @ts-ignore
-  category!: string;
+  category: string = undefined;
 
   /**
    * 组件属性列表
@@ -75,6 +67,7 @@ export class ProcessComponent extends BaseNode {
   get module() {
     return this.getAncestor('Module') as Module;
   }
+
   /**
    * 祖先 App
    */
@@ -86,11 +79,16 @@ export class ProcessComponent extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<ProcessComponent>) {
-    source = Object.assign({}, ProcessComponent.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...ProcessComponent.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'ProcessComponent';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): ProcessComponent {
     return super.from(source, parentNode, parentKey) as ProcessComponent;
   }
@@ -111,6 +109,7 @@ export class ProcessComponent extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.attrs as Attribute[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
+
   getAttributeUniqueName(name = 'attribute1') {
     return utils.unique(name, this.getAttributeExistingNames(), undefined, false);
   }
@@ -147,7 +146,7 @@ export class ProcessComponent extends BaseNode {
           name: this.getAttributeUniqueName(),
         },
         this,
-        'attrs',
+        'attrs'
       );
     } else if (typeof options === 'string') {
       attribute = Attribute.from(
@@ -156,7 +155,7 @@ export class ProcessComponent extends BaseNode {
           name: options,
         },
         this,
-        'attrs',
+        'attrs'
       );
     } else if (options instanceof Attribute) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -169,7 +168,7 @@ export class ProcessComponent extends BaseNode {
           ...options,
         },
         this,
-        'attrs',
+        'attrs'
       );
     }
     this.attrs.splice(index, 0, attribute);
@@ -264,6 +263,7 @@ export class ProcessComponent extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
+
   getLogicUniqueName(name = 'logic1') {
     return utils.unique(name, this.getLogicExistingNames(), undefined, false);
   }
@@ -300,7 +300,7 @@ export class ProcessComponent extends BaseNode {
           name: this.getLogicUniqueName(),
         },
         this,
-        'logics',
+        'logics'
       );
     } else if (typeof options === 'string') {
       logic = Logic.from(
@@ -309,7 +309,7 @@ export class ProcessComponent extends BaseNode {
           name: options,
         },
         this,
-        'logics',
+        'logics'
       );
     } else if (options instanceof Logic) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -322,7 +322,7 @@ export class ProcessComponent extends BaseNode {
           ...options,
         },
         this,
-        'logics',
+        'logics'
       );
     }
     this.logics.splice(index, 0, logic);
@@ -430,7 +430,7 @@ export class ProcessComponent extends BaseNode {
     if (typeof options === 'string') {
       attribute = (this.attrs as Attribute[]).find((item) => item.name === options);
       if (!attribute) {
-        throw new Error('找不到组件属性 ' + options);
+        throw new Error(`找不到组件属性 ${options}`);
       }
     } else {
       attribute = options;
@@ -439,7 +439,7 @@ export class ProcessComponent extends BaseNode {
   }
 
   __removeAttribute(attribute: Attribute) {
-    const parentKey = attribute.parentKey;
+    const { parentKey } = attribute;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -478,7 +478,7 @@ export class ProcessComponent extends BaseNode {
     if (typeof options === 'string') {
       logic = (this.logics as Logic[]).find((item) => item.name === options);
       if (!logic) {
-        throw new Error('找不到逻辑 ' + options);
+        throw new Error(`找不到逻辑 ${options}`);
       }
     } else {
       logic = options;
@@ -487,7 +487,7 @@ export class ProcessComponent extends BaseNode {
   }
 
   __removeLogic(logic: Logic) {
-    const parentKey = logic.parentKey;
+    const { parentKey } = logic;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -509,19 +509,20 @@ export class ProcessComponent extends BaseNode {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
 
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.ProcessComponent = ProcessComponent;
 export default ProcessComponent;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================