@lcap/nasl 2.18.0-beta.7 → 2.20.0-beta.1

package/src/concepts/Match__.ts

@@ -49,8 +49,6 @@ export class Match extends LogicItem {
     @property('MatchCase')
     cases: Array<MatchCase> = [];
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -64,13 +62,6 @@ export class Match extends LogicItem {
         return super.from(source, parentNode, parentKey) as Match;
     }
 
-    
-    
-
-    
-
-    
-
     /**
     * 插入匹配分支
     * @internal
@@ -103,8 +94,6 @@ export class Match extends LogicItem {
         return matchCase;
     }
 
-    
-
     /**
      * 插入匹配分支
      * @param matchCaseOptions 匹配分支参数
@@ -127,8 +116,6 @@ export class Match extends LogicItem {
         return node;
     }
 
-    
-
     /**
      * 添加匹配分支
      * @internal
@@ -148,8 +135,6 @@ export class Match extends LogicItem {
         return this._insertMatchCaseAt(options as any, index);
     }
 
-    
-
     /**
      * 添加匹配分支
      * @param matchCaseOptions 匹配分支参数
@@ -173,9 +158,6 @@ export class Match extends LogicItem {
         return node;
     }
 
-
-    
-
     /**
     * 删除逻辑项
     * @param name 逻辑项名称
@@ -201,8 +183,6 @@ export class Match extends LogicItem {
         return expression.delete();
     }
 
-    
-
     /**
      * 删除匹配分支
      * @param matchCase 已有的匹配分支实例
@@ -210,7 +190,7 @@ export class Match extends LogicItem {
     removeMatchCaseInCases(matchCase: MatchCase): void;
 
     removeMatchCaseInCases(options: MatchCase) {
-        let matchCase: MatchCase = options;
+        const matchCase: MatchCase = options;
         return matchCase.delete();
     }
 
@@ -466,11 +446,7 @@ export class Match extends LogicItem {
 
         let code = '';
         code += `${this.getViewMatchExpressionBuilder()} (${argsList.join(', ')}) {\n`;
-        if (this.expression && Array.isArray(this.cases)) {
-            this.cases.forEach((item, index) => {
-                code += item?.toJS?.(this.expression, index, this.cases.length);
-            });
-        }
+        code += `return ${this.toJS()}`;
         code += `;\n`;
         code += '}';
         return code;
@@ -522,13 +498,20 @@ export class Match extends LogicItem {
     }
 
     toJS(state?: TranslatorState): string {
-        let code = 'await (async () => {\n';
+        let code = '';
+        // 祖先逻辑
+        const ancestorLogic = this.getAncestor('Logic');
+        if (ancestorLogic) {
+            code += 'await (async () => {\n';
+        } else {
+            code += '(() => {\n';
+        }
         if (this.expression && Array.isArray(this.cases)) {
             this.cases.forEach((item, index) => {
                 code += item?.toJS?.(this.expression, index, this.cases.length);
             });
         }
-        code += `})()`;
+        code += '})()';
         return code;
     }
 
@@ -579,7 +562,8 @@ export class Match extends LogicItem {
             && this.parentNode.concept !== 'SelectMembers'
             && this.parentNode.concept !== 'BinaryExpression'
             && this.parentNode.concept !== 'StringInterpolation'
-            && this.parentNode.concept !== 'MemberExpression') {
+            && this.parentNode.concept !== 'MemberExpression'
+            && !['NewMap', 'NewList'].includes(this.parentNode.concept)) {
             code += ';\n';
         }
         return code;