@lcap/nasl 2.22.1 → 2.22.2-beta.2

package/src/concepts/Destination__.ts

@@ -762,15 +762,17 @@ export class Destination extends LogicItem {
         return this.viewNamespace + '.' + this.viewName;
     }
     get completeArguments() {
-        const node = this.viewNode;
-        let logicParam: Param[] = [];
+        const node = this.viewNode as View;
+        const logicParam: Map<string, Param> = new Map();
         const Arguments: Argument[] = [];
         if (node?.params) {
-            logicParam = node.params;
+            node.params.forEach((param) => {
+                logicParam.set(param.name, param);
+            });
         }
         if (this.arguments?.length) {
-            this.arguments.forEach((arg, index) => {
-                const param = logicParam[index];
+            this.arguments.forEach((arg) => {
+                const param = logicParam.get(arg.keyword);
                 // 取到是不是必填放入参数中
                 const newArg = Argument.from(arg);
                 if (param && !newArg.expression) {

package/src/concepts/Match__.ts

@@ -453,17 +453,27 @@ export class Match extends LogicItem {
                 }));
             }
         }
+        // body的暂存数组
         const bodys: any[] = [];
+        // 最后一项的body
+        let lastCaseBody;
         if (Array.isArray(this.cases) && this.cases.length) {
-            this.cases.forEach((caseItem) => {
+            // 将原分支body中存在的内容拿出来
+            this.cases.forEach((caseItem, index) => {
                 const { body } = caseItem || {};
                 if (Array.isArray(body) && body.length) {
-                    bodys.push({
-                        body,
-                        isMatchedTypeEnumable: currTypeAnnotation ? isMatchedTypeEnumable : true,
-                    });
+                    // “其他”分支单独处理
+                    if (index < this.cases.length - 1) {
+                        bodys.push({
+                            body,
+                            isMatchedTypeEnumable: currTypeAnnotation ? isMatchedTypeEnumable : true,
+                        });
+                    } else {
+                        lastCaseBody = body;
+                    }
                 }
             });
+            // 将原分支body中存在的内容拿出来赋到新的分支中去
             bodys.forEach(({ body, isMatchedTypeEnumable }, index) => {
                 let caseItem = cases[index];
                 if (!caseItem) {
@@ -477,8 +487,16 @@ export class Match extends LogicItem {
                 });
             });
         }
+        // 如果分支项存在时，加上“其他”项
         if (cases.length) {
-            cases.push(new MatchCase());
+            const otherCase = new MatchCase();
+            // “其他”项body存在内容时,给新的分支上加上内容
+            if (lastCaseBody) {
+                otherCase.update({
+                    body: lastCaseBody,
+                });
+            }
+            cases.push(otherCase);
         }
         this.update({
             cases,

package/src/concepts/Param__.ts

@@ -307,7 +307,7 @@ export class Param extends BaseNode {
                   parsedValue = tryJSONParse(defaultValue) ?? defaultValue;
               }
           }
-          code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', this.$route.query.${this.name}) : ${JSON.stringify(this.defaultValue)})`;
+          code += `${this.name} !== undefined ? ${this.name} : (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', this.$route.query.${this.name}) : ${JSON.stringify(this.defaultValue)})`;
 
           if (needGenInitFromSchema) {
               code += `)`;

package/src/concepts/StringLiteral__.ts

@@ -65,7 +65,11 @@ export class StringLiteral extends LogicItem {
             code = `\`${this.value}\``;
             if (options?.finalCode !== false) {
                 code = `\`${this.value.replace(/['"`\\]/g, (m) => {
-                    const escape = '\\\\';
+                    let escape = '\\\\';
+                    escape = '\\\\';
+                    /// #if process.env.BUILD_TARGET === 'node'
+                    escape = '\\';
+                    /// #endif
                     if (m === '\\') {
                         return `${escape}${escape}`;
                     } else {