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

package/src/concepts/Return__.ts

@@ -1,28 +1,21 @@
+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 EntityProperty from './EntityProperty__';
 import StructureProperty from './StructureProperty__';
+import Structure from './Structure__';
+import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 
-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__';
@@ -33,49 +26,50 @@ 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 Return extends BaseNode {
-  /** 类名 */
-  static readonly ConceptName = 'Return';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'Return';
+  @property()
+  concept: 'Return' = 'Return';
 
   /**
    * 输出参数名称
    */
   @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
-  defaultValue!: string;
+  defaultValue: string = undefined;
 
   /**
    * 祖先 Logic
@@ -83,42 +77,49 @@ export class Return 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
    */
@@ -130,11 +131,16 @@ export class Return extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Return>) {
-    source = Object.assign({}, Return.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...Return.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'Return';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): Return {
     return super.from(source, parentNode, parentKey) as Return;
   }
@@ -150,6 +156,7 @@ export class Return extends BaseNode {
     }
     return params;
   }
+
   /**
    * 设置输出参数名称
    */
@@ -204,7 +211,7 @@ export class Return extends BaseNode {
     if (typeof options === 'string') {
       typeAnnotation = this.typeAnnotation;
       if (!typeAnnotation) {
-        throw new Error('找不到类型标注 ' + options);
+        throw new Error(`找不到类型标注 ${options}`);
       }
     } else {
       typeAnnotation = options;
@@ -213,7 +220,7 @@ export class Return extends BaseNode {
   }
 
   __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const parentKey = typeAnnotation.parentKey;
+    const { parentKey } = typeAnnotation;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -235,10 +242,10 @@ export class Return extends BaseNode {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
 
   @excludedInJSON()
   useComponent: {
@@ -255,8 +262,7 @@ export class Return extends BaseNode {
     const context = this.view ? 'this' : 'Vue.prototype';
     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 += `${context}.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
@@ -288,7 +294,7 @@ export class Return extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = this.name || '__return';
     if (this.typeAnnotation) {
       code += ': ';
@@ -308,6 +314,24 @@ export class Return extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = this.name || '__return';
+    if (this.typeAnnotation) {
+      code += ': ';
+      code += this.typeAnnotation.toNaturalTS(shiftState(state, code));
+      // toTS暂时只需要翻译引用数据类型的，因为值都是字符串
+      // 就不在这里赋值了，这里单纯就为了快速查找
+      // 并且屏蔽了一些异常的错误
+      if (this.typeAnnotation?.typeKind !== 'primitive' && this.defaultValue) {
+        if (this.isEnum()) {
+          code += `= ${this.typeAnnotation.typeKey}['${this.defaultValue}']`;
+        }
+      }
+    }
+    return code;
+  }
+
   isEnum() {
     return this.typeAnnotation?.typeNamespace?.endsWith('.enums');
   }
@@ -378,14 +402,15 @@ export class Return extends BaseNode {
   get readonly() {
     return !!this.module;
   }
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.Return = Return;
 export default Return;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================

package/src/concepts/Role__.ts

@@ -1,39 +1,34 @@
+import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, withSourceMap, indent, createCompilerState } from '../translator';
 import Namespace from './Namespace__';
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 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 App from './App__';
 
 /**
  * 角色
  */
-@className
 @concept('角色')
-// @ts-ignore
 export class Role extends BaseNode {
-  /** 类名 */
-  static readonly ConceptName = 'Role';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'Role';
+  @property()
+  concept: 'Role' = 'Role';
 
   /**
    * 角色名称
    */
   @property()
-  // @ts-ignore
-  name!: string;
+  name: string = undefined;
 
   /**
    * 唯一标识
@@ -45,15 +40,13 @@ export class Role extends BaseNode {
    * 创建时间
    */
   @property()
-  // @ts-ignore
-  createdTime!: string;
+  createdTime: string = undefined;
 
   /**
    * 角色描述
    */
   @property()
-  // @ts-ignore
-  description!: string;
+  description: string = undefined;
 
   /**
    * 祖先 App
@@ -66,11 +59,16 @@ export class Role extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Role>) {
-    source = Object.assign({}, Role.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...Role.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'Role';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): Role {
     return super.from(source, parentNode, parentKey) as Role;
   }
@@ -86,6 +84,7 @@ export class Role extends BaseNode {
     }
     return params;
   }
+
   /**
    * 设置角色名称
    */
@@ -99,12 +98,12 @@ export class Role extends BaseNode {
     });
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = `export enum ${this.tsName} {\n`;
     code += `      ${this.tsName}='${this.tsName}'\n`;
     code += `${indent(state?.tabSize || 0)}}\n`;
@@ -159,14 +158,15 @@ export class Role extends BaseNode {
     };
   }
 
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.Role = Role;
 export default Role;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================

package/src/concepts/SelectMembers__.ts

@@ -1,33 +1,29 @@
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { v4 as uuidv4 } from 'uuid';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import BatchAssignment from './BatchAssignment__';
 import AssignmentLine from './AssignmentLine__';
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 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 LogicItem from './LogicItem__';
 
 /**
  * 选择成员
  */
-@className
 @concept('选择成员')
-// @ts-ignore
 export class SelectMembers extends BaseNode {
-  /** 类名 */
-  static readonly ConceptName = 'SelectMembers';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'SelectMembers';
+  @property()
+  concept: 'SelectMembers' = 'SelectMembers';
 
   /**
    * hideMembers
@@ -39,8 +35,7 @@ export class SelectMembers extends BaseNode {
    * 根表达式
    */
   @property('LogicItem')
-  // @ts-ignore
-  expression!: LogicItem;
+  expression: LogicItem = undefined;
 
   /**
    * 成员表达式
@@ -52,11 +47,16 @@ export class SelectMembers extends BaseNode {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<SelectMembers>) {
-    source = Object.assign({}, SelectMembers.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...SelectMembers.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'SelectMembers';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): SelectMembers {
     return super.from(source, parentNode, parentKey) as SelectMembers;
   }
@@ -72,6 +72,7 @@ export class SelectMembers extends BaseNode {
     }
     return params;
   }
+
   /**
    * 设置hideMembers
    */
@@ -115,6 +116,7 @@ export class SelectMembers extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.members as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
+
   getLogicItemUniqueName(name = 'logicItem1') {
     return utils.unique(name, this.getLogicItemExistingNames(), undefined, false);
   }
@@ -151,7 +153,7 @@ export class SelectMembers extends BaseNode {
           name: this.getLogicItemUniqueName(),
         },
         this,
-        'members',
+        'members'
       );
     } else if (typeof options === 'string') {
       logicItem = LogicItem.from(
@@ -160,7 +162,7 @@ export class SelectMembers extends BaseNode {
           name: options,
         },
         this,
-        'members',
+        'members'
       );
     } else if (options instanceof LogicItem) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -173,7 +175,7 @@ export class SelectMembers extends BaseNode {
           ...options,
         },
         this,
-        'members',
+        'members'
       );
     }
     this.members.splice(index, 0, logicItem);
@@ -281,7 +283,7 @@ export class SelectMembers extends BaseNode {
     if (typeof options === 'string') {
       expression = this.expression;
       if (!expression) {
-        throw new Error('找不到逻辑项 ' + options);
+        throw new Error(`找不到逻辑项 ${options}`);
       }
     } else {
       expression = options;
@@ -306,7 +308,7 @@ export class SelectMembers extends BaseNode {
     if (typeof options === 'string') {
       logicItem = (this.members as LogicItem[]).find((item) => item.name === options);
       if (!logicItem) {
-        throw new Error('找不到逻辑项 ' + options);
+        throw new Error(`找不到逻辑项 ${options}`);
       }
     } else {
       logicItem = options;
@@ -315,7 +317,7 @@ export class SelectMembers extends BaseNode {
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
+    const { parentKey } = logicItem;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -337,15 +339,14 @@ export class SelectMembers extends BaseNode {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
   get lines() {
     const rootNode: any = this.getAncestor('NewComposite') || this.getAncestor('BatchAssignment');
     const { parentKey } = this;
-    const firstIndex =
-      parentKey === 'left' ? 0 : rootNode.rights.findIndex((selectMember: SelectMembers) => selectMember === this);
+    const firstIndex = parentKey === 'left' ? 0 : rootNode.rights.findIndex((selectMember: SelectMembers) => selectMember === this);
     let count = 0;
     rootNode.assignmentLines.forEach((line: AssignmentLine) => {
       const lineIndex = parentKey === 'left' ? line.leftIndex[0] : line.rightIndex[0];
@@ -370,18 +371,19 @@ export class SelectMembers extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     const code = '';
     return code;
   }
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.SelectMembers = SelectMembers;
 export default SelectMembers;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================