@lcap/nasl 3.4.0-alpha.1 → 3.4.0-alpha.2

package/src/concepts/CallFunction__.ts

@@ -1,22 +1,22 @@
-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 } from '../decorators';
+import { concept, excludedInJSON, property, className } 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,13 +24,18 @@ import LogicItem from './LogicItem__';
 /**
  * 调用函数
  */
+@className
 @concept('调用函数')
+// @ts-ignore
 export class CallFunction extends LogicItem {
+  /** 类名 */
+  static readonly ConceptName = 'CallFunction';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'CallFunction' = 'CallFunction';
+  // @ts-ignore
+  readonly concept!: 'CallFunction';
 
   /**
    * 调用函数标题
@@ -42,19 +47,22 @@ export class CallFunction extends LogicItem {
    * calleeNamespace
    */
   @property()
-  calleeNamespace: string = undefined;
+  // @ts-ignore
+  calleeNamespace!: string;
 
   /**
    * calleeName
    */
   @property()
-  calleeName: string = undefined;
+  // @ts-ignore
+  calleeName!: string;
 
   /**
    * shortcut
    */
   @property()
-  shortcut: boolean = undefined;
+  // @ts-ignore
+  shortcut!: boolean;
 
   /**
    * 类型参数
@@ -72,16 +80,11 @@ export class CallFunction extends LogicItem {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<CallFunction>) {
-    // @ts-ignore
-    source = { ...CallFunction.getDefaultOptions(), ...source };
+    source = Object.assign({}, 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;
   }
@@ -115,7 +118,7 @@ export class CallFunction extends LogicItem {
           ...options,
         },
         this,
-        'typeArguments'
+        'typeArguments',
       );
     }
     this.typeArguments.splice(index, 0, typeAnnotation);
@@ -215,7 +218,7 @@ export class CallFunction extends LogicItem {
           ...options,
         },
         this,
-        'arguments'
+        'arguments',
       );
     }
     this.arguments.splice(index, 0, argument);
@@ -293,12 +296,12 @@ export class CallFunction extends LogicItem {
   removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
 
   removeTypeAnnotation(options: TypeAnnotation) {
-    const typeAnnotation: TypeAnnotation = options;
+    let typeAnnotation: TypeAnnotation = options;
     return typeAnnotation.delete();
   }
 
   __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const { parentKey } = typeAnnotation;
+    const parentKey = typeAnnotation.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -327,12 +330,12 @@ export class CallFunction extends LogicItem {
   removeArgument(argument: Argument): void;
 
   removeArgument(options: Argument) {
-    const argument: Argument = options;
+    let argument: Argument = options;
     return argument.delete();
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const { parentKey } = logicItem;
+    const parentKey = logicItem.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -354,10 +357,10 @@ export class CallFunction extends LogicItem {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
   toVue(options?: ElementToVueOptions): string {
     if (options?.finalCode === false) {
       return this.toUI();
@@ -455,7 +458,8 @@ 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})`;
     }
@@ -467,7 +471,9 @@ 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) {
@@ -488,7 +494,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;
@@ -522,7 +528,7 @@ export class CallFunction extends LogicItem {
         folded: false,
       });
       if (parentNode.concept === 'MemberExpression') {
-        const topNode = parentNode.firstMemberExpressionNode();
+        const topNode = (parentNode as MemberExpression).firstMemberExpressionNode();
         topNode.replaceNode(this);
       }
       this.detectArgs();
@@ -541,7 +547,8 @@ 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) {
@@ -636,21 +643,22 @@ export class CallFunction extends LogicItem {
   }
 
   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;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================

package/src/concepts/CallInterface__.ts

@@ -1,37 +1,41 @@
-import { v4 as uuidv4 } from 'uuid';
-import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState  } from '../translator';
 import Interface from './Interface__';
-import NullLiteral from './NullLiteral__';
 import { ElementToVueOptions } from './ViewElement__';
-import { getConceptConstructor, concept, excludedInJSON, property } from '../decorators';
-import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
+import { getNodeByNodeCallee } from '../automate/engine/utils';
 import InterfaceParam from './InterfaceParam__';
 import Structure from './Structure__';
 import Module from './Module__';
 import AuthInterface from './AuthInterface__';
+import type { MemberExpression } from './MemberExpression__';
 import Frontend from './Frontend__';
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//= ===============================================================================
+//================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
+import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
-import classMap from '../common/classMap';
 import Argument from './Argument__';
 import LogicItem from './LogicItem__';
 
 /**
  * 调用接口
  */
+@className
 @concept('调用接口')
+// @ts-ignore
 export class CallInterface extends LogicItem {
+  /** 类名 */
+  static readonly ConceptName = 'CallInterface';
+
   /**
    * 产品概念
    */
-  @property()
-  concept: 'CallInterface' | 'CallAuthInterface' = 'CallInterface';
+  // @ts-ignore
+  readonly concept!: 'CallInterface' | 'CallAuthInterface';
 
   /**
    * 调用接口标题
@@ -43,19 +47,22 @@ export class CallInterface extends LogicItem {
    * calleeNamespace
    */
   @property()
-  calleeNamespace: string = undefined;
+  // @ts-ignore
+  calleeNamespace!: string;
 
   /**
    * calleeName
    */
   @property()
-  calleeName: string = undefined;
+  // @ts-ignore
+  calleeName!: string;
 
   /**
    * shortcut
    */
   @property()
-  shortcut: boolean = undefined;
+  // @ts-ignore
+  shortcut!: boolean;
 
   /**
    * 实际参数
@@ -67,16 +74,11 @@ export class CallInterface extends LogicItem {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<CallInterface>) {
-    // @ts-ignore
-    source = { ...CallInterface.getDefaultOptions(), ...source };
+    source = Object.assign({}, CallInterface.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
 
-  getClassName() {
-    return 'CallInterface';
-  }
-
   static from(source: any, parentNode?: any, parentKey?: string): CallInterface {
     return super.from(source, parentNode, parentKey) as CallInterface;
   }
@@ -110,7 +112,7 @@ export class CallInterface extends LogicItem {
           ...options,
         },
         this,
-        'arguments'
+        'arguments',
       );
     }
     this.arguments.splice(index, 0, argument);
@@ -188,12 +190,12 @@ export class CallInterface extends LogicItem {
   removeArgument(argument: Argument): void;
 
   removeArgument(options: Argument) {
-    const argument: Argument = options;
+    let argument: Argument = options;
     return argument.delete();
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const { parentKey } = logicItem;
+    const parentKey = logicItem.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -215,10 +217,10 @@ export class CallInterface extends LogicItem {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
 
   /**
    * 标识当前删除是否为鉴权方式更新导致的删除。
@@ -238,7 +240,8 @@ export class CallInterface extends LogicItem {
           let refCount = 0;
           const refs = (await oldItf.findUsage()) as Map<any, any>;
 
-          const isOnlyUsedByFronted = refs.size === 1 && Array.from(refs.keys()).filter((key) => key instanceof Frontend).length > 0;
+          const isOnlyUsedByFronted =
+            refs.size === 1 && Array.from(refs.keys()).filter((key) => key instanceof Frontend).length > 0;
           const isAuthInterface = oldItf instanceof AuthInterface;
           // 当仅仅只有前端使用，且该接口是鉴权接口时需要将接口还原为普通接口
           if (isOnlyUsedByFronted && isAuthInterface) {
@@ -258,7 +261,8 @@ export class CallInterface extends LogicItem {
           if (!refCount) {
             //  删除旧的接口、接口的数据结构
             this.app.emit('collect:start', { actionMsg: '删除接口' });
-            const oldStructuresSet = oldItf.getRefStructures(oldItf.module.structures);
+            const parentModule = oldItf.module || oldItf.connector;
+            const oldStructuresSet = oldItf.getRefStructures(parentModule.structures);
             oldStructuresSet.forEach((s: Structure) => s.delete());
             oldItf.delete();
             oldItf.afterDelete();
@@ -590,14 +594,17 @@ export class CallInterface extends LogicItem {
   setCallee(_interface: Interface) {
     const calleeNamespace = _interface.getNamespace();
     const calleeName = _interface.name;
-    const params = _interface.params.map((param) => {
-      const relationOptions = { parentNode: this, parentKey: 'arguments' };
-      const argument = new Argument({
-        keyword: param.name,
-      });
-      Object.assign(argument, relationOptions);
-      return argument;
-    });
+    const params = this.arguments.map((argumentNode) => {
+      const newParam = _interface.params.find((item) => item.name === argumentNode.keyword)
+      if (newParam) {
+        const argument = Argument.from({
+          keyword: newParam.name,
+          expression: argumentNode.expression
+        }, this, 'arguments');
+        return argument;
+      }
+      return argumentNode
+    })
 
     if (this.app) {
       this.app.emit('collect:start', {
@@ -611,7 +618,7 @@ export class CallInterface extends LogicItem {
         folded: false,
       });
       if (parentNode.concept === 'MemberExpression') {
-        const topNode = parentNode.firstMemberExpressionNode();
+        const topNode = (parentNode as MemberExpression).firstMemberExpressionNode();
         topNode.replaceNode(this);
       }
       this.app.emit('collect:end');
@@ -803,15 +810,14 @@ export class CallInterface extends LogicItem {
     structuresSet.forEach((s) => module.addStructure(Structure.from(s)));
     this.app.emit('collect:end');
   }
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
-classMap.CallInterface = CallInterface;
 export default CallInterface;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================