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

package/src/concepts/InterfaceParam__.ts

@@ -1,86 +1,71 @@
+import { v4 as uuidv4 } from 'uuid';
 import { dataTypesMap } from './basics/types';
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import StructureProperty from './StructureProperty__';
 import Structure from './Structure__';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 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 Interface from './Interface__';
 import Module from './Module__';
 import App from './App__';
-import Connector from './Connector__';
-import View from './View__';
-import Frontend from './Frontend__';
-import ProcessElement from './ProcessElement__';
-import Process from './Process__';
 
 /**
  * 接口参数
  */
-@className
 @concept('接口参数')
-// @ts-ignore
 export class InterfaceParam extends BaseNode {
-  /** 类名 */
-  static readonly ConceptName = 'InterfaceParam';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'InterfaceParam';
+  @property()
+  concept: 'InterfaceParam' = 'InterfaceParam';
 
   /**
    * 接口参数名称
    */
   @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;
 
   /**
-   * 参数位置
+   * in
    */
   @property()
-  // @ts-ignore
-  in!: 'query' | 'path' | 'body' | 'header' | 'cookie';
+  in: 'query' | 'path' | 'body' | 'header' | 'cookie' = undefined;
 
   /**
    * 是否必填
    */
   @property()
-  // @ts-ignore
-  required!: boolean;
+  required: boolean = undefined;
 
   /**
    * 默认值
    */
   @property()
-  // @ts-ignore
-  defaultValue!: string;
+  defaultValue: string = undefined;
 
   /**
    * 祖先 Interface
@@ -88,58 +73,35 @@ export class InterfaceParam extends BaseNode {
   get interface() {
     return this.getAncestor('Interface') as Interface;
   }
+
   /**
    * 祖先 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;
-  }
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<InterfaceParam>) {
-    source = Object.assign({}, InterfaceParam.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...InterfaceParam.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'InterfaceParam';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): InterfaceParam {
     return super.from(source, parentNode, parentKey) as InterfaceParam;
   }
@@ -155,6 +117,7 @@ export class InterfaceParam extends BaseNode {
     }
     return params;
   }
+
   /**
    * 设置接口参数名称
    */
@@ -181,7 +144,7 @@ export class InterfaceParam extends BaseNode {
   }
 
   /**
-   * 设置参数位置
+   * 设置in
    */
   setIn(inWhich: 'query' | 'path' | 'body' | 'header' | 'cookie') {
     const object = {
@@ -233,7 +196,7 @@ export class InterfaceParam extends BaseNode {
     if (typeof options === 'string') {
       typeAnnotation = this.typeAnnotation;
       if (!typeAnnotation) {
-        throw new Error('找不到类型标注 ' + options);
+        throw new Error(`找不到类型标注 ${options}`);
       }
     } else {
       typeAnnotation = options;
@@ -242,7 +205,7 @@ export class InterfaceParam extends BaseNode {
   }
 
   __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const parentKey = typeAnnotation.parentKey;
+    const { parentKey } = typeAnnotation;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -264,10 +227,10 @@ export class InterfaceParam extends BaseNode {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
   /**
    * 设置数据类型
    * @param typeAnnotation 类型标注对象
@@ -321,14 +284,15 @@ export class InterfaceParam extends BaseNode {
     return code;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.InterfaceParam = InterfaceParam;
 export default InterfaceParam;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================

package/src/concepts/Interface__.ts

@@ -1,79 +1,65 @@
+import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import Namespace from './Namespace__';
 import TypeAnnotation from './TypeAnnotation__';
 import Structure from './Structure__';
 import Param from './Param__';
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 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 InterfaceParam from './InterfaceParam__';
 import Return from './Return__';
 import BindAttribute from './BindAttribute__';
 import Module from './Module__';
-import Connector from './Connector__';
 import App from './App__';
-import View from './View__';
-import Frontend from './Frontend__';
-import ProcessElement from './ProcessElement__';
-import Process from './Process__';
 
 /**
  * 接口
  */
-@className
 @concept('接口')
-// @ts-ignore
 export class Interface extends BaseNode {
-  /** 类名 */
-  static readonly ConceptName = 'Interface';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'Interface' | 'AuthInterface';
+  @property()
+  concept: 'Interface' | 'AuthInterface' = 'Interface';
 
   /**
    * 接口名称
    */
   @property()
-  // @ts-ignore
-  name!: string;
+  name: string = undefined;
 
   /**
-   * 导出的来源
+   * originLogicName
    */
   @property()
-  // @ts-ignore
-  originLogicName!: string;
+  originLogicName: string = undefined;
 
   /**
-   * 接口路径
+   * path
    */
   @property()
-  // @ts-ignore
-  path!: string;
+  path: string = undefined;
 
   /**
-   * 接口方法
+   * method
    */
   @property()
-  // @ts-ignore
-  method!: 'GET' | 'POST' | 'PUT' | 'DELETE';
+  method: 'GET' | 'POST' | 'PUT' | 'DELETE' = undefined;
 
   /**
    * 接口描述
    */
   @property()
-  // @ts-ignore
-  description!: string;
+  description: string = undefined;
 
   /**
    * 接口参数列表
@@ -91,8 +77,7 @@ export class Interface extends BaseNode {
    * 验证规则
    */
   @property('BindAttribute')
-  // @ts-ignore
-  validation!: BindAttribute;
+  validation: BindAttribute = undefined;
 
   /**
    * 祖先 Module
@@ -100,52 +85,28 @@ export class Interface extends BaseNode {
   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;
-  }
 
   /**
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<Interface>) {
-    source = Object.assign({}, Interface.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...Interface.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'Interface';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): Interface {
     return super.from(source, parentNode, parentKey) as Interface;
   }
@@ -161,6 +122,7 @@ export class Interface extends BaseNode {
     }
     return params;
   }
+
   /**
    * 设置接口名称
    */
@@ -237,7 +199,7 @@ export class Interface extends BaseNode {
           name: this.getInterfaceParamUniqueName(),
         },
         this,
-        'params',
+        'params'
       );
     } else if (typeof options === 'string') {
       interfaceParam = InterfaceParam.from(
@@ -246,7 +208,7 @@ export class Interface extends BaseNode {
           name: options,
         },
         this,
-        'params',
+        'params'
       );
     } else if (options instanceof InterfaceParam) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -259,7 +221,7 @@ export class Interface extends BaseNode {
           ...options,
         },
         this,
-        'params',
+        'params'
       );
     }
     this.params.splice(index, 0, interfaceParam);
@@ -386,7 +348,7 @@ export class Interface extends BaseNode {
           name: this.getReturnUniqueName(),
         },
         this,
-        'returns',
+        'returns'
       );
     } else if (typeof options === 'string') {
       ret = Return.from(
@@ -395,7 +357,7 @@ export class Interface extends BaseNode {
           name: options,
         },
         this,
-        'returns',
+        'returns'
       );
     } else if (options instanceof Return) {
       options.ensureDelete(); // 同一实例不支持多处存在
@@ -408,7 +370,7 @@ export class Interface extends BaseNode {
           ...options,
         },
         this,
-        'returns',
+        'returns'
       );
     }
     this.returns.splice(index, 0, ret);
@@ -516,7 +478,7 @@ export class Interface extends BaseNode {
     if (typeof options === 'string') {
       interfaceParam = (this.params as InterfaceParam[]).find((item) => item.name === options);
       if (!interfaceParam) {
-        throw new Error('找不到接口参数 ' + options);
+        throw new Error(`找不到接口参数 ${options}`);
       }
     } else {
       interfaceParam = options;
@@ -525,7 +487,7 @@ export class Interface extends BaseNode {
   }
 
   __removeInterfaceParam(interfaceParam: InterfaceParam) {
-    const parentKey = interfaceParam.parentKey;
+    const { parentKey } = interfaceParam;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -564,7 +526,7 @@ export class Interface extends BaseNode {
     if (typeof options === 'string') {
       ret = (this.returns as Return[]).find((item) => item.name === options);
       if (!ret) {
-        throw new Error('找不到输出参数 ' + options);
+        throw new Error(`找不到输出参数 ${options}`);
       }
     } else {
       ret = options;
@@ -573,7 +535,7 @@ export class Interface extends BaseNode {
   }
 
   __removeReturn(ret: Return) {
-    const parentKey = ret.parentKey;
+    const { parentKey } = ret;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -612,7 +574,7 @@ export class Interface extends BaseNode {
     if (typeof options === 'string') {
       validation = this.validation;
       if (!validation) {
-        throw new Error('找不到元素绑定属性 ' + options);
+        throw new Error(`找不到元素绑定属性 ${options}`);
       }
     } else {
       validation = options;
@@ -621,7 +583,7 @@ export class Interface extends BaseNode {
   }
 
   __removeBindAttribute(bindAttribute: BindAttribute) {
-    const parentKey = bindAttribute.parentKey;
+    const { parentKey } = bindAttribute;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -643,10 +605,10 @@ export class Interface extends BaseNode {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
 
   /**
    * 协议
@@ -847,11 +809,6 @@ export class Interface extends BaseNode {
    * @param name 一般不用传，用于 rename
    */
   getEmbeddedFilePath(name = this.name) {
-    // 连接器相关的接口，本身没有 module 属性故，需要额外处理
-    if (this.parentNode.concept === 'Connector') {
-      return `/embedded/${this.app.name}/dependencies/${this.parentNode.name}/interfaces/${name}.ts`;
-      ``;
-    }
     const _path = this.module ? `/${this.module.parentKey}/${this.module.name}` : '';
     return `/embedded/${this.app.name}${_path}/interfaces/${name}.ts`;
   }
@@ -939,7 +896,7 @@ export class Interface extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     const getCheckerCode = () => {
       if (this.validation) {
@@ -980,9 +937,7 @@ export class Interface extends BaseNode {
 
       code += '{\n';
       getCheckerCode();
-      code += this.module
-        ? ''
-        : `let logic =${(this.parentNode as Namespace).getTsNamespace()}.logics.${this.originLogicName};\n`;
+      code += this.module ? '' : `let logic =${(this.parentNode as Namespace).getTsNamespace()}.logics.${this.originLogicName};\n`;
       code += 'let ';
       code += this.returns[0].toEmbeddedTS(shiftState(state, code, { inline: true }));
       code += ';\n';
@@ -992,9 +947,7 @@ export class Interface extends BaseNode {
     } else {
       code += 'void {\n';
       getCheckerCode();
-      code += this.module
-        ? ''
-        : `let logic =${(this.parentNode as Namespace).getTsNamespace()}.logics.${this.originLogicName};\n`;
+      code += this.module ? '' : `let logic =${(this.parentNode as Namespace).getTsNamespace()}.logics.${this.originLogicName};\n`;
       code += '};';
     }
     code += '\n';
@@ -1002,12 +955,6 @@ export class Interface extends BaseNode {
   }
 
   getNamespace() {
-    // 针对 Connector 下的 Interface 需要做额外的兼容处理
-    // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
-    // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里需要强行改成 extensions
-    if (this.parentNode?.concept === 'Connector') {
-      return `extensions.${this.parentNode.name}.interfaces`;
-    }
     if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getNamespace();
       const parentName = this.parentNode.name;
@@ -1021,12 +968,6 @@ export class Interface extends BaseNode {
   }
 
   getTsNamespace() {
-    // 针对 Connector 下的 Interface 需要做额外的兼容处理
-    // 本来 Connector 对应的 Namespace 是 connector，走默认逻辑就成
-    // 但是后端在翻译 Connector 下的 Interface 时选择的前缀为 extensions 故这里需要强行改成 extensions
-    if (this.parentNode?.concept === 'Connector') {
-      return `extensions.${this.parentNode.tsName}.interfaces`;
-    }
     if (this.parentNode && (this.parentNode as Namespace).getTsNamespace) {
       const parentNamespace = (this.parentNode as Namespace).getTsNamespace();
       const parentName = this.parentNode.tsName || this.parentNode.name;
@@ -1073,14 +1014,15 @@ export class Interface extends BaseNode {
     return structuresSet;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.Interface = Interface;
 export default Interface;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================