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

package/src/concepts/Identifier__.ts

@@ -95,6 +95,8 @@ export class Identifier extends LogicItem {
                     enumName = `${this.namespace}.${this.name}`;
                 }
                 name = enumName;
+            } else if (this.namespace.endsWith('logics')) {
+                name = `'${this.namespace}.${name}'`;
             }
         }
         return name;
@@ -134,6 +136,8 @@ export class Identifier extends LogicItem {
                     enumName = `${this.namespace}.${this.name}`;
                 }
                 name = enumName;
+            } else if (this.namespace.endsWith('logics')) {
+                name = `'${this.namespace}.${name}'`;
             }
         }
         return name;
@@ -189,13 +193,10 @@ export class Identifier extends LogicItem {
                 return this.name;
             }
         }
-        // 因为右侧枚举要赋值就赋值toList方法一下
-        if (this.namespace && this.namespace.endsWith('enums')) {
-            // 绑定类型
-            if (this.parentNode instanceof BindAttribute) {
-                // this.parentNode.name === 'data-source'
-                return (this.namespace + '.' || '') + this.name + '.toList';
-            }
+
+        // 全局变量在不是页面的地方放置，就会报错
+        if (this.namespace?.startsWith('app.frontendVariables') && !this.view) {
+            return '__FRONTENDVARIABLES__';
         }
 
         // 如果是nasl.util.Enum 的子集里的 Identifier > MemberExpression > Argument > callfunction
@@ -271,6 +272,16 @@ export class Identifier extends LogicItem {
         });
     }
 
+    setNameAndNamespace(name: string, namespace: string) {
+        const object = {
+            name,
+            namespace,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/LogicItem__.ts

@@ -29,7 +29,7 @@ export class LogicItem extends BaseNode {
      * 产品概念
      */
     @property()
-    concept: 'LogicItem' | 'Start' | 'End' | 'IfStatement' | 'SwitchStatement' | 'SwitchCase' | 'ForEachStatement' | 'WhileStatement' | 'Assignment' | 'BatchAssignment' | 'Comment' | 'CallLogic' | 'CallFunction' | 'CallInterface' | 'Destination' | 'ExternalDestination' | 'ValidationRule' | 'Argument' | 'Anchor' | 'JSBlock' | 'Identifier' | 'NullLiteral' | 'BooleanLiteral' | 'StringLiteral' | 'StringInterpolation' | 'NumericLiteral' | 'BinaryExpression' | 'MatchCase' | 'Match' | 'UnaryExpression' | 'MemberExpression' | 'Unparsed' | 'CallQueryComponent' | 'QueryFromExpression' | 'QueryJoinExpression' | 'QueryFieldExpression' | 'QueryAggregateExpression' | 'QueryOrderByExpression' | 'QueryGroupByExpression' | 'QuerySelectExpression' | 'QueryLimitExpression' | 'SqlQueryComponent' | 'OqlQueryComponent' | 'ProcessOutcome' | 'Assignee' = 'LogicItem';
+    concept: 'LogicItem' | 'Start' | 'End' | 'IfStatement' | 'SwitchStatement' | 'SwitchCase' | 'ForEachStatement' | 'WhileStatement' | 'Assignment' | 'BatchAssignment' | 'Comment' | 'CallLogic' | 'CallFunction' | 'CallInterface' | 'Destination' | 'ExternalDestination' | 'ValidationRule' | 'Argument' | 'Anchor' | 'JSBlock' | 'Identifier' | 'NullLiteral' | 'BooleanLiteral' | 'StringLiteral' | 'StringInterpolation' | 'NumericLiteral' | 'BinaryExpression' | 'MatchCase' | 'Match' | 'UnaryExpression' | 'MemberExpression' | 'Unparsed' | 'New' | 'NewComposite' | 'NewList' | 'NewMap' | 'CallQueryComponent' | 'QueryFromExpression' | 'QueryJoinExpression' | 'QueryFieldExpression' | 'QueryAggregateExpression' | 'QueryOrderByExpression' | 'QueryGroupByExpression' | 'QuerySelectExpression' | 'QueryLimitExpression' | 'SqlQueryComponent' | 'OqlQueryComponent' | 'ProcessOutcome' | 'Assignee' | 'ProcessOutcomes' = 'LogicItem';
 
     /**
      * 逻辑项标题

package/src/concepts/Logic__.ts

@@ -796,7 +796,7 @@ export class Logic extends BaseNode {
 
 
 
-
+    
 
     /**
     * 插入逻辑项
@@ -830,7 +830,7 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
-
+    
 
     /**
      * 插入逻辑项
@@ -854,7 +854,7 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
+    
 
     /**
      * 添加逻辑项
@@ -875,7 +875,7 @@ export class Logic extends BaseNode {
         return this._insertItemInBodyAt(options as any, index);
     }
 
-
+    
 
     /**
      * 添加逻辑项
@@ -900,7 +900,7 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
+    
 
     /**
     * 插入逻辑项
@@ -934,7 +934,7 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
-
+    
 
     /**
      * 插入逻辑项
@@ -958,7 +958,7 @@ export class Logic extends BaseNode {
         return node;
     }
 
-
+    
 
     /**
      * 添加逻辑项
@@ -979,7 +979,7 @@ export class Logic extends BaseNode {
         return this._insertItemInPlaygroundAt(options as any, index);
     }
 
-
+    
 
     /**
      * 添加逻辑项
@@ -1005,7 +1005,7 @@ export class Logic extends BaseNode {
     }
 
 
-
+    
 
     /**
     * 删除事务
@@ -1268,7 +1268,7 @@ export class Logic extends BaseNode {
         return logicItem.delete();
     }
 
-
+    
 
     /**
      * 删除逻辑项
@@ -1640,13 +1640,11 @@ export class Logic extends BaseNode {
         this.traverseChildren((el) => {
             if (el && (el instanceof BatchAssignment || (el instanceof Assignment && el.left?.name))) {
                 const jsCode = el.toJS();
-                const advanceVar = this.variables?.find((variable) =>
-                    !variable.typeAnnotation && jsCode.includes(`${variable.name} = `));
+                const advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && jsCode.includes(`${variable.name} = `));
                 if (advanceVar && !advanceMap.get(advanceVar)) {
                     advanceMap.set(advanceVar, el);
                 }
-                const advanceRn = this.returns?.find((ret) =>
-                    !ret.typeAnnotation && jsCode.includes(`${ret.name} = `));
+                const advanceRn = this.returns?.find((ret) => !ret.typeAnnotation && jsCode.includes(`${ret.name} = `));
                 if (advanceRn && !advanceMap.get(advanceRn)) {
                     advanceMap.set(advanceRn, el);
                 }
@@ -1663,12 +1661,14 @@ export class Logic extends BaseNode {
             Promise.all(needGetSourceMapOqlList).then(() => {
                 // 触发一下更新重新生成代码
                 (this.app as any)?.naslServer?.embeddedTSEmitter.emit('change', {
-                    value: [{
-                        originEvent: {
-                            action: 'update',
-                            target: this,
+                    value: [
+                        {
+                            originEvent: {
+                                action: 'update',
+                                target: this,
+                            },
                         },
-                    }],
+                    ],
                 });
             });
         }
@@ -1680,11 +1680,13 @@ export class Logic extends BaseNode {
         code += '{\n';
 
         // 用于虚拟节点的查找引用
-        this.virtualParams && Array.isArray(this.virtualParams) && this.virtualParams.forEach((param) => {
-            code += indent((state?.tabSize || 0) + 1);
-            code += param.toEmbeddedNameTS(shiftState(state, code, { inline: true }));
-            code += '\n';
-        });
+        this.virtualParams
+            && Array.isArray(this.virtualParams)
+            && this.virtualParams.forEach((param) => {
+                code += indent((state?.tabSize || 0) + 1);
+                code += param.toEmbeddedNameTS(shiftState(state, code, { inline: true }));
+                code += '\n';
+            });
 
         this.variables.forEach((variable) => {
             if (!advanceMap.get(variable)) {
@@ -1708,12 +1710,12 @@ export class Logic extends BaseNode {
             code += node.toEmbeddedTS(shiftState(state, code, { inline: true }));
             if (assignment instanceof BatchAssignment) {
                 assignment.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
-                    const leftCode = leftIndex.length === 1 ? assignment.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true })) : assignment.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true }));
+                    const leftCode
+                        = leftIndex.length === 1 ? assignment.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true })) : assignment.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true }));
                     if (leftCode === node.name) {
                         const rightNode: any = rightIndex.length === 1 ? assignment.rights[rightIndex[0]]?.expression : assignment.rights[rightIndex[0]]?.members[rightIndex[1]];
                         // 当右边有明确类型时，直接使用其类型。旧版本数据查询不能直接使用其 typeAnnotation
-                        if (rightNode?.typeAnnotation
-                            && !(rightNode instanceof CallQueryComponent && rightNode.ideVersion !== '2.11')) {
+                        if (rightNode?.typeAnnotation && !(rightNode instanceof CallQueryComponent && rightNode.ideVersion !== '2.11')) {
                             code += ': ';
                             code += rightNode.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) || 'null';
                         } else {
@@ -1723,11 +1725,14 @@ export class Logic extends BaseNode {
                         }
                     }
                 });
+            } else if (['NewList', 'NewMap'].includes(assignment.right.concept) && !(assignment.right as any).typeAnnotation) {
+                const rightNode: any = assignment.right;
+                code += ' = ';
+                code += rightNode.getInitCode(shiftState(state, code, { inline: true }));
             } else {
                 const rightNode: any = assignment.right;
                 // 当右边有明确类型时，直接使用其类型。旧版本数据查询不能直接使用其 typeAnnotation
-                if (rightNode?.typeAnnotation
-                    && !(rightNode instanceof CallQueryComponent && rightNode.ideVersion !== '2.11')) {
+                if (rightNode?.typeAnnotation && !(rightNode instanceof CallQueryComponent && rightNode.ideVersion !== '2.11')) {
                     code += ': ';
                     code += rightNode.typeAnnotation?.toEmbeddedTS(shiftState(state, code, { inline: true })) || 'null';
                 } else {
@@ -1737,7 +1742,7 @@ export class Logic extends BaseNode {
                     if (rightNode && rightNode instanceof Identifier && rightNode.namespace && rightNode.namespace.endsWith('enums')) {
                         rightCode += 'new ';
                     }
-                    rightCode += (rightNode && rightNode.toEmbeddedTS) ? rightNode.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
+                    rightCode += rightNode && rightNode.toEmbeddedTS ? rightNode.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
                     code += this.getRightCode(rightCode, assignment, rightNode);
                 }
             }
@@ -1881,7 +1886,10 @@ export class Logic extends BaseNode {
                 arr.push(parentName);
             }
             let namespace = arr.join('.');
-            if (!['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser', 'nasl.auth', 'nasl.configuration', 'nasl.process', 'nasl.logging', 'nasl.io'].includes(namespace) && !namespace.includes('.logics')) {
+            if (
+                !['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser', 'nasl.auth', 'nasl.configuration', 'nasl.process', 'nasl.logging', 'nasl.io'].includes(namespace)
+                && !namespace.includes('.logics')
+            ) {
                 namespace = `${namespace}.logics`;
             }
             return namespace;
@@ -1898,7 +1906,10 @@ export class Logic extends BaseNode {
                 arr.push(parentName);
             }
             let namespace = arr.join('.');
-            if (!['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser', 'nasl.auth', 'nasl.configuration', 'nasl.process', 'nasl.logging', 'nasl.io'].includes(namespace) && !namespace.includes('.logics')) {
+            if (
+                !['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser', 'nasl.auth', 'nasl.configuration', 'nasl.process', 'nasl.logging', 'nasl.io'].includes(namespace)
+                && !namespace.includes('.logics')
+            ) {
                 namespace = `${namespace}.logics`;
             }
             return namespace;
@@ -2038,6 +2049,11 @@ export class Logic extends BaseNode {
     // 虚拟输入参数列表
     virtualParams: Array<Param> = [];
 
+    get getLogicBelongTo() {
+        const [, belongTo] = this.calleewholeKey.split('.');
+        return belongTo;
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/Match__.ts

@@ -466,11 +466,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 +518,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 +582,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;