@lcap/nasl 1.0.2 → 2.12.0-beta

package/src/concepts/BooleanLiteral__.ts

@@ -82,7 +82,7 @@ export class BooleanLiteral extends LogicItem {
     //================================================================================
 }
 
-classMap['BooleanLiteral'] = BooleanLiteral;
+classMap.BooleanLiteral = BooleanLiteral;
 export default BooleanLiteral;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/CallFunction__.ts

@@ -64,7 +64,7 @@ export class CallFunction extends LogicItem {
     @property('Argument')
     arguments: Array<Argument> = [];
 
-    
+
 
     /**
      * @param source 需要合并的部分参数
@@ -79,12 +79,12 @@ export class CallFunction extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallFunction;
     }
 
-    
-    
 
-    
 
-    
+
+
+
+
 
     /**
     * 插入类型标注
@@ -118,7 +118,7 @@ export class CallFunction extends LogicItem {
         return typeAnnotation;
     }
 
-    
+
 
     /**
      * 插入类型标注
@@ -142,7 +142,7 @@ export class CallFunction extends LogicItem {
         return node;
     }
 
-    
+
 
     /**
      * 添加类型标注
@@ -163,7 +163,7 @@ export class CallFunction extends LogicItem {
         return this._insertTypeAnnotationAt(options as any, index);
     }
 
-    
+
 
     /**
      * 添加类型标注
@@ -191,7 +191,7 @@ export class CallFunction extends LogicItem {
 
 
 
-    
+
 
     /**
     * 插入实际参数
@@ -225,7 +225,7 @@ export class CallFunction extends LogicItem {
         return argument;
     }
 
-    
+
 
     /**
      * 插入实际参数
@@ -249,7 +249,7 @@ export class CallFunction extends LogicItem {
         return node;
     }
 
-    
+
 
     /**
      * 添加实际参数
@@ -270,7 +270,7 @@ export class CallFunction extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
-    
+
 
     /**
      * 添加实际参数
@@ -296,7 +296,7 @@ export class CallFunction extends LogicItem {
     }
 
 
-    
+
 
     /**
      * 删除类型标注
@@ -421,10 +421,10 @@ export class CallFunction extends LogicItem {
                 code += ', ';
         });
         if (this.typeArguments && this.typeArguments.length) {
-            code += ', ';
+            if (this.arguments?.length) code += ', ';
             this.typeArguments?.forEach((arg, index) => {
                 code += arg?.toJS(shiftState(state, code));
-                if (index !== this.arguments?.length - 1)
+                if (index !== this.typeArguments?.length - 1)
                     code += ', ';
             });
         }
@@ -456,6 +456,9 @@ export class CallFunction extends LogicItem {
             if (param.defaultExpression instanceof Identifier) {
                 argument.expression = BaseNode.from(param.defaultExpression, argument, 'expression') as Identifier;
             }
+            if (param.defaultExpression instanceof Function) {
+                argument.expression = BaseNode.from(param.defaultExpression, argument, 'expression') as Identifier;
+            }
             Object.assign(argument, relationOptions);
             return argument;
         });
@@ -520,7 +523,7 @@ export class CallFunction extends LogicItem {
     //================================================================================
 }
 
-classMap['CallFunction'] = CallFunction;
+classMap.CallFunction = CallFunction;
 export default CallFunction;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/CallInterface__.ts

@@ -516,7 +516,7 @@ export class CallInterface extends LogicItem {
     //================================================================================
 }
 
-classMap['CallInterface'] = CallInterface;
+classMap.CallInterface = CallInterface;
 export default CallInterface;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/CallLogic__.ts

@@ -1,8 +1,10 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import Logic from './Logic__';
 import Param from './Param__';
+import View from './View__';
 import { ElementToVueOptions } from './ViewElement__';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
+import { findConceptKeyWordIndexFromNamespace } from '../utils';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -437,6 +439,9 @@ export class CallLogic extends LogicItem {
 
     _setCallee(logic: Logic) {
         this.calleeNamespace = logic.getNamespace();
+        if (logic.parentNode instanceof View) {
+            this.calleeNamespace = '';
+        }
         this.calleeName = logic.name;
         this.arguments = [];
         logic.params.forEach((param) => {
@@ -453,7 +458,10 @@ export class CallLogic extends LogicItem {
     }
 
     setCallee(logic: Logic) {
-        const calleeNamespace = logic.getNamespace();
+        let calleeNamespace = logic.getNamespace();
+        if (logic.parentNode instanceof View) {
+            calleeNamespace = '';
+        }
         const calleeName = logic.name;
         const params = logic.params.map((param) => {
             const relationOptions = { parentNode: this, parentKey: 'arguments' };
@@ -482,7 +490,10 @@ export class CallLogic extends LogicItem {
     }
 
     setCalleeArgName(logic: Logic) {
-        const calleeNamespace = logic.getNamespace();
+        let calleeNamespace = logic.getNamespace();
+        if (logic.parentNode instanceof View) {
+            calleeNamespace = '';
+        }
         const calleeName = logic.name;
         /**
          * a: logic.params b: this.arguments
@@ -563,21 +574,20 @@ export class CallLogic extends LogicItem {
         let isComponentLogic = false;
         let componentName = '';
         const calleeNamespace = this.calleeNamespace;
-        const isProcessLogic = this.calleeNamespace?.startsWith('app.processes');
-
+        const keywordProcessIndex = findConceptKeyWordIndexFromNamespace(this.calleeNamespace, 'processes');
+        const isProcessLogic = keywordProcessIndex !== -1;
         // calleeNamespace不存在，一定是页面逻辑
         if (calleeNamespace) {
             const namespaceArr = calleeNamespace.split('.');
-            const start = namespaceArr.shift();
+            const start = namespaceArr[0];
             if (start === 'app' || start === 'extensions') {
-                const mod = start === 'app' ? 0 : 1;
-                const keywordViews = namespaceArr.filter((namespaceItem, index) => index % 2 === mod).find((namespaceItem) => namespaceItem === 'views');
-                if (!keywordViews) {
+                const keywordViewsIndex = findConceptKeyWordIndexFromNamespace(this.calleeNamespace, 'views');
+                if (keywordViewsIndex === -1) {
                     isViewLogic = false;
                 }
-            } else if (start === 'elements' && namespaceArr.length === 2 && namespaceArr[1] === 'logics') {
+            } else if (start === 'elements' && namespaceArr.length === 3 && namespaceArr[2] === 'logics') {
                 isComponentLogic = true;
-                componentName = namespaceArr[0];
+                componentName = namespaceArr[1];
             }
         }
         // 全局逻辑
@@ -598,17 +608,7 @@ export class CallLogic extends LogicItem {
                 };
             });
             const args = logic?.params || [];
-
-            // 去掉app
-            namespaceArr.shift();
-            const keywordEntities = namespaceArr
-                .map((namespaceItem, index) => ({
-                    key: namespaceItem,
-                    index,
-                }))
-                .filter((namespaceItem, index) => index % 2 === 0)
-                .find((namespaceItem) => namespaceItem.key === 'entities');
-            const entityName = namespaceArr[keywordEntities?.index + 1];
+            const keywordEntitiesIndex = findConceptKeyWordIndexFromNamespace(this.calleeNamespace, 'entities');
             code += `this.$logics['${this.calleeNamespace ? `${this.calleeNamespace}.${this.calleeName}` : this.calleeName}']`;
             code += `({
                 config: {
@@ -629,7 +629,7 @@ export class CallLogic extends LogicItem {
                 headers: {},
             `;
 
-            if (entityName) {
+            if (keywordEntitiesIndex !== -1) {
                 let logicArgs = this.arguments;
                 switch (this.calleeName) {
                     case 'get':
@@ -736,7 +736,7 @@ export class CallLogic extends LogicItem {
     //================================================================================
 }
 
-classMap['CallLogic'] = CallLogic;
+classMap.CallLogic = CallLogic;
 export default CallLogic;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑