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

package/src/concepts/CallConnector__.ts

@@ -1,50 +1,44 @@
-import type Connector from './Connector__';
+import { v4 as uuidv4 } from 'uuid';
+import Connector from './Connector__';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
 import Logic from './Logic__';
 import Argument from './Argument__';
 import Identifier from './Identifier__';
 import TypeAnnotation from './TypeAnnotation__';
 import Connection from './Connection__';
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
-import Namespace from './Namespace__';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 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 CallLogic from './CallLogic__';
 
 /**
- * 调用连接器
+ * 连接器
  */
-@className
-@concept('调用连接器')
-// @ts-ignore
+@concept('连接器')
 export class CallConnector extends CallLogic {
-  /** 类名 */
-  static readonly ConceptName = 'CallConnector';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'CallConnector';
+  @property()
+  concept: 'CallConnector' = 'CallConnector';
 
   /**
    * calleeConnectionName
    */
   @property()
-  // @ts-ignore
-  calleeConnectionName!: string;
+  calleeConnectionName: string = undefined;
 
   /**
-   * 调用连接器标题
+   * 连接器标题
    */
   @property()
   label: string = '连接器';
@@ -53,11 +47,16 @@ export class CallConnector extends CallLogic {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<CallConnector>) {
-    source = Object.assign({}, CallConnector.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...CallConnector.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'CallConnector';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): CallConnector {
     return super.from(source, parentNode, parentKey) as CallConnector;
   }
@@ -74,10 +73,10 @@ export class CallConnector extends CallLogic {
     });
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
   setCallCtor(connection: Connection) {
     const calleeConnectionName = connection.name;
     if (this.app) {
@@ -144,30 +143,20 @@ export class CallConnector extends CallLogic {
   getCallNode() {
     let node;
     try {
-      // 自定义连接器走额外的检索逻辑
-      if (this.connection?.connector?.connectorKind === 'app') {
-        const {
-          connection: { connector },
-        } = this;
-        const namespaceName = this.calleeNamespace.split('.').pop();
-        const ns = (connector as Connector).namespaces.find((nsItem) => nsItem.name === namespaceName);
-        node = ns?.logics?.find?.((logic) => logic.name === this.calleeName);
-      } else {
-        node = getNodeByNodeCallee(this.app, this.calleewholeKey, (key: any, tempPoint: any) => {
-          // 处理 NASL 中未定义的假的节点
-          if (key === tempPoint.name) {
-            return {
-              tempPoint,
-              state: 1,
-            };
-          }
-          const t = tempPoint[key];
+      node = getNodeByNodeCallee(this.app, this.calleewholeKey, (key: any, tempPoint: any) => {
+        // 处理 NASL 中未定义的假的节点
+        if (key === tempPoint.name) {
           return {
-            tempPoint: t,
-            state: Array.isArray(t) ? 2 : 1,
+            tempPoint,
+            state: 1,
           };
-        });
-      }
+        }
+        const t = tempPoint[key];
+        return {
+          tempPoint: t,
+          state: Array.isArray(t) ? 2 : 1,
+        };
+      });
     } catch (err) {}
     return node;
   }
@@ -180,7 +169,7 @@ export class CallConnector extends CallLogic {
           keyword: param.name,
           expression: param.isFunction ? new Identifier() : param.defaultExpression,
         },
-        this,
+        this
       );
       Object.assign(argument, relationOptions);
       return argument;
@@ -201,7 +190,7 @@ export class CallConnector extends CallLogic {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     if (this.handleError) {
       code += 'nasl.util.autoHandleError(';
@@ -239,6 +228,7 @@ export class CallConnector extends CallLogic {
       this.parentNode.concept !== 'Assignment' &&
       this.parentNode.concept !== 'ForEachStatement' &&
       this.parentNode.concept !== 'SelectMembers' &&
+      this.parentNode.concept !== 'UnaryExpression' &&
       this.parentNode.concept !== 'BinaryExpression' &&
       this.parentNode.concept !== 'StringInterpolation' &&
       this.parentNode.concept !== 'MemberExpression' &&
@@ -248,14 +238,15 @@ export class CallConnector extends CallLogic {
     }
     return code;
   }
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.CallConnector = CallConnector;
 export default CallConnector;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================

package/src/concepts/CallFunction__.ts

@@ -1,22 +1,22 @@
-import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { v4 as uuidv4 } from 'uuid';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import Function from './Function__';
 import { ElementToVueOptions } from './ViewElement__';
 import Identifier from './Identifier__';
 import { getBuildInFunction } from '../server/getFunctions';
 import AnonymousFunction from './AnonymousFunction__';
-import MemberExpression from './MemberExpression__';
 import asyncFuncMap from '../common/asyncFuncMap';
 
-//================================================================================
+//= ===============================================================================
 // 从这里开始到结尾注释之间的代码由 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 Argument from './Argument__';
 import LogicItem from './LogicItem__';
@@ -24,18 +24,13 @@ import LogicItem from './LogicItem__';
 /**
  * 调用函数
  */
-@className
 @concept('调用函数')
-// @ts-ignore
 export class CallFunction extends LogicItem {
-  /** 类名 */
-  static readonly ConceptName = 'CallFunction';
-
   /**
    * 产品概念
    */
-  // @ts-ignore
-  readonly concept!: 'CallFunction';
+  @property()
+  concept: 'CallFunction' = 'CallFunction';
 
   /**
    * 调用函数标题
@@ -47,22 +42,19 @@ export class CallFunction extends LogicItem {
    * calleeNamespace
    */
   @property()
-  // @ts-ignore
-  calleeNamespace!: string;
+  calleeNamespace: string = undefined;
 
   /**
    * calleeName
    */
   @property()
-  // @ts-ignore
-  calleeName!: string;
+  calleeName: string = undefined;
 
   /**
    * shortcut
    */
   @property()
-  // @ts-ignore
-  shortcut!: boolean;
+  shortcut: boolean = undefined;
 
   /**
    * 类型参数
@@ -80,11 +72,16 @@ export class CallFunction extends LogicItem {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<CallFunction>) {
-    source = Object.assign({}, CallFunction.getDefaultOptions(), source);
+    // @ts-ignore
+    source = { ...CallFunction.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
 
+  getClassName() {
+    return 'CallFunction';
+  }
+
   static from(source: any, parentNode?: any, parentKey?: string): CallFunction {
     return super.from(source, parentNode, parentKey) as CallFunction;
   }
@@ -118,7 +115,7 @@ export class CallFunction extends LogicItem {
           ...options,
         },
         this,
-        'typeArguments',
+        'typeArguments'
       );
     }
     this.typeArguments.splice(index, 0, typeAnnotation);
@@ -218,7 +215,7 @@ export class CallFunction extends LogicItem {
           ...options,
         },
         this,
-        'arguments',
+        'arguments'
       );
     }
     this.arguments.splice(index, 0, argument);
@@ -296,12 +293,12 @@ export class CallFunction extends LogicItem {
   removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
 
   removeTypeAnnotation(options: TypeAnnotation) {
-    let typeAnnotation: TypeAnnotation = options;
+    const typeAnnotation: TypeAnnotation = options;
     return typeAnnotation.delete();
   }
 
   __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const parentKey = typeAnnotation.parentKey;
+    const { parentKey } = typeAnnotation;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -330,12 +327,12 @@ export class CallFunction extends LogicItem {
   removeArgument(argument: Argument): void;
 
   removeArgument(options: Argument) {
-    let argument: Argument = options;
+    const argument: Argument = options;
     return argument.delete();
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
+    const { parentKey } = logicItem;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -357,10 +354,10 @@ export class CallFunction extends LogicItem {
     return params;
   }
 
-  //================================================================================
+  //= ===============================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //================================================================================
+  //= ===============================================================================
   toVue(options?: ElementToVueOptions): string {
     if (options?.finalCode === false) {
       return this.toUI();
@@ -458,8 +455,7 @@ export class CallFunction extends LogicItem {
     code += ')';
     const typeAnnotation = (this as any).typeAnnotation || this.__TypeAnnotation;
     const needGenInitFromSchema =
-      typeAnnotation &&
-      (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
+      typeAnnotation && (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
     if (needGenInitFromSchema) {
       code = `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', ${code})`;
     }
@@ -471,9 +467,7 @@ export class CallFunction extends LogicItem {
   }
 
   get calleeKey(): string {
-    return this.calleeName
-      ? `${this.calleeNamespace ? `${this.calleeNamespace}.` : ''}${this.calleeName}`
-      : '__IDENTIFIER__';
+    return this.calleeName ? `${this.calleeNamespace ? `${this.calleeNamespace}.` : ''}${this.calleeName}` : '__IDENTIFIER__';
   }
 
   _setCallee(func: Function) {
@@ -494,7 +488,7 @@ export class CallFunction extends LogicItem {
         {
           keyword: param.name,
         },
-        this,
+        this
       );
       if (param.defaultExpression instanceof Identifier) {
         argument.expression = BaseNode.from(param.defaultExpression, argument, 'expression') as Identifier;
@@ -528,7 +522,7 @@ export class CallFunction extends LogicItem {
         folded: false,
       });
       if (parentNode.concept === 'MemberExpression') {
-        const topNode = (parentNode as MemberExpression).firstMemberExpressionNode();
+        const topNode = parentNode.firstMemberExpressionNode();
         topNode.replaceNode(this);
       }
       this.detectArgs();
@@ -547,8 +541,7 @@ export class CallFunction extends LogicItem {
 
   detectArgs(obj?: any) {
     const func = getBuildInFunction(this.calleeName);
-    const shouldJudge =
-      !!func && ['ListDistinctBy', 'MapDistinctBy', 'ListGroupBy', 'ListToMap', 'MapFilter'].includes(this.calleeName);
+    const shouldJudge = !!func && ['ListDistinctBy', 'MapDistinctBy', 'ListGroupBy', 'ListToMap', 'MapFilter'].includes(this.calleeName);
     if (shouldJudge && Array.isArray(this.arguments)) {
       const depParamIdx = func.params.findIndex((param) => ['list', 'map'].includes(param.name));
       if (depParamIdx !== -1) {
@@ -565,7 +558,7 @@ export class CallFunction extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     const { calleeKey } = this;
     if (['nasl.util.Convert', 'nasl.util.FromString'].includes(calleeKey)) {
@@ -602,23 +595,62 @@ export class CallFunction extends LogicItem {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = '';
+    code = this.calleeKey;
+    if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+      // 如果有内容
+      const typeAnnotation = this.typeArguments[0];
+      code += `<`;
+      code += `${typeAnnotation.toNaturalTS(shiftState(state, code, { tabSize: 0 }))}>`;
+    }
+    if (this.arguments.length <= 3) {
+      code += '(';
+      this.arguments.forEach((arg, index) => {
+        code += arg.toNaturalTS(shiftState(state, code, { tabSize: 0 }));
+        if (index !== this.arguments.length - 1)
+          code += ', ';
+      });
+      if (this?.typeArguments?.[0]?.typeKind === 'reference') {
+        if (this.arguments?.length > 0)
+          code += ', ';
+        code += `{ typeNamespace: '${this.typeArguments[0].typeNamespace}' }`;
+      }
+      code += `)`;
+    } else {
+      code += '(\n';
+      this.arguments.forEach((arg, index) => {
+        code += arg.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+        if (index !== this.arguments.length - 1) {
+          code += ',\n';
+        } else if (this?.typeArguments?.[0]?.typeKind === 'reference') {
+          code += `,\n{ typeNamespace: '${this.typeArguments[0].typeNamespace}' }`;
+        } else {
+          code += '\n';
+        }
+      });
+      code += `${indent(state.tabSize)})`;
+    }
+    return code;
+  }
+
   checkParamNameOfAnonymousFunction() {
-    const fns = this.arguments
-      .map((arg) => arg.expression)
-      .filter((exp) => exp instanceof AnonymousFunction) as unknown as AnonymousFunction[];
+    const fns = this.arguments.map((arg) => arg.expression).filter((exp) => exp instanceof AnonymousFunction) as unknown as AnonymousFunction[];
 
     fns.forEach((fn) => {
       fn.checkParamName();
     });
   }
-  //================================================================================
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //================================================================================
+  //= ===============================================================================
 }
 
+classMap.CallFunction = CallFunction;
 export default CallFunction;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================