@lcap/nasl 3.3.2-beta.4 → 3.3.3-beta.2

package/src/concepts/BindAttribute__.ts

@@ -25,7 +25,6 @@ import Module from './Module__';
 import App from './App__';
 import Frontend from './Frontend__';
 import Process from './Process__';
-import Identifier from './Identifier__';
 
 /**
  * 元素绑定属性
@@ -40,6 +39,7 @@ export class BindAttribute extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'BindAttribute';
 
@@ -669,11 +669,15 @@ export class BindAttribute extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        const index = (t as any)[parentKey].indexOf(n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -1004,7 +1008,23 @@ export class BindAttribute extends BaseNode {
       // 文本默认要经过toString转换
       if (options?.finalCode !== false && name === 'text' && !this.sync && this.type === 'dynamic') {
         const expTypeAnnotation = (this.expression as any)?.typeAnnotation || this.expression?.__TypeAnnotation;
-        value = `$utils['ToString']('${expTypeAnnotation?.sortedTypeKey}', ${value})`;
+        // 针对union类型，typeAnntatation拿不到app数据，暂时先在这里处理
+        if (expTypeAnnotation?.typeKind === 'union' && expTypeAnnotation?.typeArguments?.length) {
+          expTypeAnnotation?.typeArguments?.forEach((typeArg: any) => {
+            if (typeArg.typeNamespace?.endsWith('.metadataTypes')) {
+              const referenceNode = this.app.findNodeByCompleteName(typeArg.typeNamespace + '.' + typeArg.typeName)?.typeAnnotation || {};
+              typeArg.typeName = referenceNode.typeName
+              typeArg.typeKind = referenceNode.typeKind
+              typeArg.typeNamespace = referenceNode.typeNamespace
+            }
+          })
+        }
+        if (expTypeAnnotation?.typeNamespace?.endsWith('.metadataTypes')) {
+          const referenceNode = this.app.findNodeByCompleteName(expTypeAnnotation.typeNamespace + '.' + expTypeAnnotation.typeName)?.typeAnnotation || {};
+          value = `$utils['ToString']('${referenceNode?.typeNamespace}.${referenceNode.typeName}', ${value})`;
+        } else {
+          value = `$utils['ToString']('${expTypeAnnotation?.sortedTypeKey}', ${value})`;
+        }
       }
       if (this.type === 'string' && name !== 'rules') {
         if (options?.finalCode !== false) {
@@ -1088,22 +1108,25 @@ export class BindAttribute extends BaseNode {
     return code;
   }
 
-  toEmbeddedTSVariableDefinition(state?: TranslatorState, attrList?: string[], elementName?: string, currentLevel?: string): string {
+  toEmbeddedTSVariableDefinition(
+    state?: TranslatorState,
+    attrList?: string[],
+    elementName?: string,
+    currentLevel?: string,
+  ): string {
     let code = '';
     let arrCode = '';
     code += indent((state?.tabSize || 0) + 3);
     code += `${attrConvertCamelCase(this.name)}: `;
     if (this.expression) {
       if (this.name === 'data-source') {
-        code += `ReturnType<typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(
-          this.name,
-        )}>`;
+        code += `ReturnType<typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(this.name)}>`;
       } else {
         code += `ReturnType<typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(this.name)}>`;
       }
       arrCode = `() => {
         return __elements_variable_function.${currentLevel}?.${attrConvertCamelCase(this.name)}?.()
-      }`
+      }`;
     } else if (this.name === 'sorting') {
       code += `{
               field: nasl.core.String
@@ -1144,24 +1167,34 @@ export class BindAttribute extends BaseNode {
       } else {
         stashVariable = `${this.expression.toEmbeddedTS()}`;
       }
-      code += `() => {\n`
+      code += `() => {\n`;
       code += indent((state?.tabSize || 0) + 5);
-      code += `return ${stashVariable}\n`
+      code += `return ${stashVariable}\n`;
       code += indent((state?.tabSize || 0) + 4);
-      code += `},\n`
+      code += `},\n`;
     }
     return code;
   }
 
   findCurrentElementParent(node: any): ViewElement | undefined {
     if (node.parentNode instanceof ViewElement) {
-      if (['u-table-view', 'u-list-view', 'u-grid-view', 'u-list-components', 'van-list-view', 'van-grid-view', 'van-for-components'].includes(node.parentNode.tag)) {
-        return node.parentNode
+      if (
+        [
+          'u-table-view',
+          'u-list-view',
+          'u-grid-view',
+          'u-list-components',
+          'van-list-view',
+          'van-grid-view',
+          'van-for-components',
+        ].includes(node.parentNode.tag)
+      ) {
+        return node.parentNode;
       } else {
-        return this.findCurrentElementParent(node.parentNode)
+        return this.findCurrentElementParent(node.parentNode);
       }
     } else {
-      return undefined
+      return undefined;
     }
   }
   @withSourceMap()
@@ -1247,4 +1280,3 @@ export function attrConvertCamelCase(str: string) {
   });
   return strList.join('');
 }
-

package/src/concepts/BindDirective__.ts

@@ -31,6 +31,7 @@ export class BindDirective extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'BindDirective';
 
@@ -306,11 +307,15 @@ export class BindDirective extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        const index = (t as any)[parentKey].indexOf(n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -526,7 +531,21 @@ export class BindDirective extends BaseNode {
   toVue(options?: ElementToVueOptions) {
     let str = '';
     // eslint-disable-next-line no-nested-ternary
-    let value = (this.type ?? 'string') !== 'string' ? this.value : this.value ? `'${this.value}'` : '';
+    let value = this.value;
+    if(this.type === 'string') {
+        value = value.replace(/['"`\\]/g, (m) => {
+            let escape = '\\\\';
+            escape = '\\\\';
+            /// #if process.env.BUILD_TARGET === 'node'
+            escape = '\\';
+            /// #endif
+            if (m === '\\') {
+                return `${escape}${escape}`;
+            }
+            return `${escape}${m}`;
+        });
+    }
+    value = (this.type ?? 'string') !== 'string' ? this.value : value ? `\`${value}\`` : '';
     // 需要用标识符替换
     // if (options.finalCode !== false && this.needReplaceWithIdentifier) {
     //    const argsList = this.getArgsList();
@@ -537,7 +556,9 @@ export class BindDirective extends BaseNode {
       if (this.expression.concept === 'StringLiteral') {
         value = `${value}`;
       }
-      value = value?.replace(/"/g, "'");
+    }
+    if (value !== undefined && value !== null && typeof value === 'string') {
+        value = value?.replace(/"/g, "'");
     }
     if (this.name === 'auth' && !!this.value) {
       const regex = /(.\w+\[name=\w+\])/g;

package/src/concepts/BindEvent__.ts

@@ -38,6 +38,7 @@ export class BindEvent extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'BindEvent';
 
@@ -455,11 +456,15 @@ export class BindEvent extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logic);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logic.__v_raw || logic;
+      if (Array.isArray((t as any)[parentKey])) {
+        const index = (t as any)[parentKey].indexOf(n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === logic) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -489,11 +494,15 @@ export class BindEvent extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        const index = (t as any)[parentKey].indexOf(n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -677,9 +686,13 @@ export class BindEvent extends BaseNode {
       this.logics.forEach((logic, index) => {
         const logicName = `viewLogic_${logic.name}${index}`;
         // logic.name = logic.view.name + logic.name + index;
-        code += logic.toNaturalTS(shiftState(state, code, {
-          tabSize: state.tabSize,
-        }), 'noExport', logicName);
+        code += logic.toNaturalTS(
+          shiftState(state, code, {
+            tabSize: state.tabSize,
+          }),
+          'noExport',
+          logicName,
+        );
 
         // logic.name = logicName;
         // code += indent(state.tabSize);
@@ -704,17 +717,23 @@ export class BindEvent extends BaseNode {
         // logic.name = '__' + logic.view.name + (logic.parentNode as BindEvent).element.name + logic.name;
         logic.name = logic.name.replace(/-/g, '');
         try {
-          code += logic.toNaturalTS(shiftState(state, code, {
-            tabSize: state.tabSize,
-          }), 'noExport');
+          code += logic.toNaturalTS(
+            shiftState(state, code, {
+              tabSize: state.tabSize,
+            }),
+            'noExport',
+          );
         } finally {
           // 翻译logic可能出错
           logic.name = logicName;
         }
       } else {
-        code += logic.toNaturalTS(shiftState(state, code, {
-          tabSize: state.tabSize,
-        }), 'noExport');
+        code += logic.toNaturalTS(
+          shiftState(state, code, {
+            tabSize: state.tabSize,
+          }),
+          'noExport',
+        );
       }
 
       code += indent(state.tabSize);

package/src/concepts/BindStyle__.ts

@@ -31,6 +31,7 @@ export class BindStyle extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'BindStyle';
 
@@ -271,11 +272,15 @@ export class BindStyle extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        const index = (t as any)[parentKey].indexOf(n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/BooleanLiteral__.ts

@@ -25,6 +25,7 @@ export class BooleanLiteral extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'BooleanLiteral';
 

package/src/concepts/CallAuthInterface__.ts

@@ -30,6 +30,7 @@ export class CallAuthInterface extends CallInterface {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'CallAuthInterface';
 
@@ -241,11 +242,15 @@ export class CallAuthInterface extends CallInterface {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        const index = (t as any)[parentKey].indexOf(n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/CallConnector__.ts

@@ -33,6 +33,7 @@ export class CallConnector extends CallLogic {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'CallConnector';
 

package/src/concepts/CallFunction__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState, transfromMetadataType } from '../translator';
 import Function from './Function__';
 import { ElementToVueOptions } from './ViewElement__';
 import Identifier from './Identifier__';
@@ -20,7 +20,6 @@ import BaseNode from '../common/BaseNode';
 import TypeAnnotation from './TypeAnnotation__';
 import Argument from './Argument__';
 import LogicItem from './LogicItem__';
-import StringLiteral from './StringLiteral__';
 
 /**
  * 调用函数
@@ -35,6 +34,7 @@ export class CallFunction extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'CallFunction';
 
@@ -312,11 +312,15 @@ export class CallFunction extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(typeAnnotation);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = typeAnnotation.__v_raw || typeAnnotation;
+      if (Array.isArray((t as any)[parentKey])) {
+        const index = (t as any)[parentKey].indexOf(n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === typeAnnotation) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -346,11 +350,15 @@ export class CallFunction extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        const index = (t as any)[parentKey].indexOf(n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -368,22 +376,41 @@ export class CallFunction extends LogicItem {
     }
     let code = `$utils['${this.calleeName}']`;
     code += '(';
+    let argTyAnno;
+    if (this.calleeName === 'ToString') {
+      const arg0 = this.arguments[0];
+      argTyAnno = (arg0 as any).typeAnnotation || arg0.__TypeAnnotation;
+    } else if (this.calleeName === 'FromString') {
+      argTyAnno = this.typeArguments?.[0];
+    }
+
+    // 调整 ToString 的 typeKey 到第一个参数，剩下的以后重构。
+    // 事实上，大部分编译器都会选择把 type tag 放到前端来做运行时匹配，而非末位。
+    if (this.calleeName === 'ToString' && argTyAnno) {
+      code += `'${argTyAnno?.sortedTypeKey}', `;
+    }
+
     if (Array.isArray(this.arguments) && this.arguments.length) {
       const needToString = ['Concat'].includes(this.calleeName);
       this.arguments?.forEach((arg: any, index) => {
         let argStr = arg?.toVue(options);
         const argTypeAnnotation = arg.typeAnnotation || arg.__TypeAnnotation;
-
+        const { sortedTypeKey } = transfromMetadataType(argTypeAnnotation, this.app)
         if (needToString) {
-          argStr = `$utils['ToString'](${argStr}, '${argTypeAnnotation?.sortedTypeKey}')`;
+          argStr = `$utils['ToString']('${sortedTypeKey}', ${argStr})`;
         } else if (['HasValue'].includes(this.calleeName)) {
-          argStr = `{ type: '${argTypeAnnotation?.sortedTypeKey}', value: ${argStr} }`;
+          argStr = `{ type: '${sortedTypeKey}', value: ${argStr} }`;
         }
         code += argStr;
         if (index !== this.arguments?.length - 1) code += ', ';
       });
     }
-    if (this.typeArguments && this.typeArguments.length) {
+    if (this.calleeName === 'FromString' && argTyAnno) {
+      code += `, '${argTyAnno?.sortedTypeKey}'`;
+    }
+    // 用作做语义控制。后面这段代码没完全理解，需要保持进入条件不变。
+    const flagControl = ['ToString', 'FromString'].includes(this.calleeName) && argTyAnno;
+    if (!flagControl && Array.isArray(this.typeArguments) && this.typeArguments.length) {
       if (this.arguments?.length) code += ', ';
       this.typeArguments?.forEach((arg, index) => {
         code += arg?.toJS().replace(/"/g, "'");
@@ -426,7 +453,6 @@ export class CallFunction extends LogicItem {
     code += `this.$utils['${calleeName}']`;
     code += '(';
 
-
     let argTyAnno;
     if (this.calleeName === 'ToString') {
       const arg0 = this.arguments[0];
@@ -435,11 +461,10 @@ export class CallFunction extends LogicItem {
       argTyAnno = this.typeArguments?.[0];
     }
 
-
     // 调整 ToString 的 typeKey 到第一个参数，剩下的以后重构。
     // 事实上，大部分编译器都会选择把 type tag 放到前端来做运行时匹配，而非末位。
     if (this.calleeName === 'ToString' && argTyAnno) {
-      code += `'${argTyAnno?.sortedTypeKey}', `
+      code += `'${argTyAnno?.sortedTypeKey}', `;
     }
 
     if (Array.isArray(this.arguments) && this.arguments.length) {
@@ -448,22 +473,22 @@ export class CallFunction extends LogicItem {
       this.arguments.forEach((arg: any, index) => {
         let argStr = arg?.toJS(shiftState(state, code));
         const argTypeAnnotation = arg.typeAnnotation || arg.__TypeAnnotation;
-
+        const { sortedTypeKey } = transfromMetadataType(argTypeAnnotation, this.app)
         if (needToString) {
-          argStr = `this.$utils['ToString']('${argTypeAnnotation?.sortedTypeKey}', ${argStr})`;
+          argStr = `this.$utils['ToString']('${sortedTypeKey}', ${argStr})`;
         } else if (['HasValue'].includes(this.calleeName)) {
-          argStr = `{ type: '${argTypeAnnotation?.sortedTypeKey}', value: ${argStr} }`;
+          argStr = `{ type: '${sortedTypeKey}', value: ${argStr} }`;
         }
         code += argStr;
         if (index !== this.arguments?.length - 1) code += ', ';
       });
     }
 
-    if (this.calleeName === 'fromString' && argTyAnno) {
-      code += `, '${argTyAnno?.sortedTypeKey}'`
+    if (this.calleeName === 'FromString' && argTyAnno) {
+      code += `, '${argTyAnno?.sortedTypeKey}'`;
     }
     // 用作做语义控制。后面这段代码没完全理解，需要保持进入条件不变。
-    const flagControl = ['ToString', 'fromString'].includes(this.calleeName) && argTyAnno;
+    const flagControl = ['ToString', 'FromString'].includes(this.calleeName) && argTyAnno;
     if (!flagControl && Array.isArray(this.typeArguments) && this.typeArguments.length) {
       if (this.arguments?.length) code += ', ';
 
@@ -476,8 +501,7 @@ export class CallFunction extends LogicItem {
     code += ')';
     const tyAnno = (this as any).typeAnnotation || this.__TypeAnnotation;
     const needGenInitFromSchema =
-    tyAnno &&
-      (!['primitive', 'union'].includes(tyAnno.typeKind) || tyAnno.typeName === 'DateTime');
+      tyAnno && (!['primitive', 'union'].includes(tyAnno.typeKind) || tyAnno.typeName === 'DateTime');
     if (needGenInitFromSchema) {
       code = `this.$genInitFromSchema('${tyAnno?.sortedTypeKey}', ${code})`;
     }
@@ -634,12 +658,10 @@ export class CallFunction extends LogicItem {
       code += '(';
       this.arguments.forEach((arg, index) => {
         code += arg.toNaturalTS(shiftState(state, code, { tabSize: 0 }));
-        if (index !== this.arguments.length - 1)
-          code += ', ';
+        if (index !== this.arguments.length - 1) code += ', ';
       });
       if (this?.typeArguments?.[0]?.typeKind === 'reference') {
-        if (this.arguments?.length > 0)
-          code += ', ';
+        if (this.arguments?.length > 0) code += ', ';
         code += `{ typeNamespace: '${this.typeArguments[0].typeNamespace}' }`;
       }
       code += `)`;

package/src/concepts/CallInterface__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap, createCompilerState  } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import Interface from './Interface__';
 import { ElementToVueOptions } from './ViewElement__';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
@@ -35,6 +35,7 @@ export class CallInterface extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'CallInterface' | 'CallAuthInterface';
 
@@ -206,11 +207,15 @@ export class CallInterface extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        const index = (t as any)[parentKey].indexOf(n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -264,12 +269,12 @@ export class CallInterface extends LogicItem {
             this.app.emit('collect:start', { actionMsg: '删除接口' });
             const parentModule = oldItf.module || oldItf.connector;
             if (oldItf.module) {
-              const shouldDeleteStructures: Structure[] = []
+              const shouldDeleteStructures: Structure[] = [];
               oldItf.module.getInterfaceStructureMap().forEach((itfs, stru) => {
                 if (itfs.size === 1 && itfs.has(oldItf)) {
-                  shouldDeleteStructures.push(stru)
+                  shouldDeleteStructures.push(stru);
                 }
-              })
+              });
               shouldDeleteStructures.forEach((s: Structure) => s.delete());
             } else {
               const shouldDeleteStructures = oldItf.getRefStructures(parentModule.structures);
@@ -618,23 +623,33 @@ export class CallInterface extends LogicItem {
     const calleeNamespace = _interface.getNamespace();
     const calleeName = _interface.name;
     const params = _interface.params.map((param) => {
-      const oldArgument = this.arguments.find((node) => node.keyword === param.name)
-      return Argument.from({
-        keyword: param.name,
-        expression: oldArgument ? oldArgument.expression : undefined
-      }, this, 'arguments');
+      const oldArgument = this.arguments.find((node) => node.keyword === param.name);
+      return Argument.from(
+        {
+          keyword: param.name,
+          expression: oldArgument ? oldArgument.expression : undefined,
+        },
+        this,
+        'arguments',
+      );
     });
     const oldArguments = this.arguments.reduce((res, argumentNode) => {
-      const targetParam = _interface.params.find((item) => item.name === argumentNode.keyword)
+      const targetParam = _interface.params.find((item) => item.name === argumentNode.keyword);
       if (!targetParam) {
-        res.push(Argument.from({
-          keyword: argumentNode.keyword,
-          expression: argumentNode ? argumentNode.expression : undefined
-        }, this, 'arguments'))
+        res.push(
+          Argument.from(
+            {
+              keyword: argumentNode.keyword,
+              expression: argumentNode ? argumentNode.expression : undefined,
+            },
+            this,
+            'arguments',
+          ),
+        );
       }
-      return res
-    }, [])
-    params.push(...oldArguments)
+      return res;
+    }, []);
+    params.push(...oldArguments);
 
     if (this.app) {
       this.app.emit('collect:start', {
@@ -833,13 +848,13 @@ export class CallInterface extends LogicItem {
         // 仅被自己引用则删除
         if (!isSameItf && isSelfRef && refCount === 1) {
           //  删除旧的数据结构
-          const shouldDeleteStructures: Structure[] = []
-          const structureMap = oldItf.module.getInterfaceStructureMap()
+          const shouldDeleteStructures: Structure[] = [];
+          const structureMap = oldItf.module.getInterfaceStructureMap();
           structureMap.forEach((itfs, stru) => {
             if (itfs.size === 1 && itfs.has(oldItf)) {
-              shouldDeleteStructures.push(stru)
+              shouldDeleteStructures.push(stru);
             }
-          })
+          });
           shouldDeleteStructures.forEach((s: Structure) => s.delete());
           oldItf.delete();
           oldItf.afterDelete();
@@ -854,12 +869,12 @@ export class CallInterface extends LogicItem {
     // 递归找出 response/request 的 Body/Returns 引用的数据结构
     const newStructuresSet = targetItf.getRefStructures(moduleData.structures);
     // 新导入的数据结构在系统中已存在时 提前进行删除
-    newStructuresSet.forEach(stru => {
-      const target = targetItf.module.structures.find(node => node.name === stru.name)
+    newStructuresSet.forEach((stru) => {
+      const target = targetItf.module.structures.find((node) => node.name === stru.name);
       if (target) {
-        oldStructuresSet.add(target)
+        oldStructuresSet.add(target);
       }
-    })
+    });
     // 删除旧的数据结构
     oldStructuresSet.forEach((s) => s.delete());
     newStructuresSet.forEach((s) => module.addStructure(Structure.from(s)));