@lcap/nasl 1.0.1 → 2.12.0-beta.1

package/src/concepts/BindAttribute__.ts

@@ -548,9 +548,9 @@ export class BindAttribute extends BaseNode {
     toEmbeddedTS(state?: TranslatorState): string {
         let code = '';
         if (this.name === 'destination') {
-            code += this.destination.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+            code += this.destination.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
         } else if (this.expression) {
-            code += this.expression.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+            code += this.expression.toEmbeddedTS(shiftState(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
         }
         return code;
     }

package/src/concepts/BindDirective__.ts

@@ -133,10 +133,6 @@ export class BindDirective extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
     * 删除逻辑项
     * @param name 逻辑项名称
@@ -208,8 +204,14 @@ export class BindDirective extends BaseNode {
      */
     toVue(options?: ElementToVueOptions) {
         let modifiersString = '';
-        Object.keys(this.modifiers || {}).forEach((key) => {
-            const value = (this.modifiers as any)[key];
+        let modifiers = {};
+        try {
+            modifiers = JSON.parse(this.modifiers || '{}');
+        } catch (err) {
+            modifiers = {};
+        }
+        Object.keys(modifiers).forEach((key) => {
+            const value = (modifiers as any)[key];
             if (value)
                 modifiersString += '.' + key;
         });
@@ -253,7 +255,7 @@ export class BindDirective extends BaseNode {
     //================================================================================
 }
 
-classMap['BindDirective'] = BindDirective;
+classMap.BindDirective = BindDirective;
 export default BindDirective;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/BindEvent__.ts

@@ -291,6 +291,10 @@ export class BindEvent extends BaseNode {
     //================================================================================
     // 用于logic回填
     get calleewholeKey(): string {
+        if (!this.calleeNamespace && this.calleeName) {
+            // 页面逻辑单独处理
+            return `${this.view.getNamespace()}.${this.view.name}.logics.${this.calleeName}`;
+        }
         return this.calleeNamespace + '.' + this.calleeName;
     }
     get tsCalleeNamespace() {
@@ -338,11 +342,11 @@ export class BindEvent extends BaseNode {
             if (isPageCycle) {
                 return `${this.calleeKey}();`;
             }
-            let code = `${this.toHump(this.name) || '__IDENTIFIER__'}: (event) => [\n`;
-            code += indent(state.tabSize + 1);
+            let code = `${this.toHump(this.name) || '__IDENTIFIER__'}: (event: any) => [\n`;
+            code += indent((state?.tabSize || 0) + 1);
             code += `() => {${this.calleeKey}()}`;
             code += '\n';
-            code += indent(state.tabSize);
+            code += indent((state?.tabSize || 0));
             code += '],\n';
             return code;
         }
@@ -354,10 +358,10 @@ export class BindEvent extends BaseNode {
     //     let code = '';
     //     if (this.name) {
     //         code = `function ${this.name || '__IDENTIFIER__'} () {\n`;
-    //         code += indent(state.tabSize + 1);
+    //         code += indent((state?.tabSize || 0) + 1);
     //         code += `${this.calleeKey}()`;
     //         code += '\n';
-    //         code += indent(state.tabSize);
+    //         code += indent((state?.tabSize || 0));
     //         code += '};\n';
     //     }
     //     return code;
@@ -367,8 +371,12 @@ export class BindEvent extends BaseNode {
      * 设置callee
      */
     setCallee(logic: Logic) {
+        let calleeNamespace = logic.getNamespace();
+        if (logic.parentNode instanceof View) {
+            calleeNamespace = '';
+        }
         const object = {
-            calleeNamespace: logic.getNamespace(),
+            calleeNamespace,
             calleeName: logic.name,
         };
         this.update({

package/src/concepts/BooleanLiteral__.ts

@@ -72,6 +72,18 @@ export class BooleanLiteral extends LogicItem {
     toEmbeddedTS(state?: TranslatorState) {
         return this.value;
     }
+
+    /**
+     * 设置布尔值内容
+     */
+    setValue(value: string) {
+        const object = {
+            value,
+        };
+        this.update({
+            ...object,
+        });
+    }
     getValue() {
         return this.value;
     }

package/src/concepts/CallFunction__.ts

@@ -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,10 @@ 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) {
+                (param.defaultExpression as Function).returnExpression = null;
+                argument.expression = BaseNode.from(param.defaultExpression, argument, 'expression') as Identifier;
+            }
             Object.assign(argument, relationOptions);
             return argument;
         });
@@ -496,7 +500,6 @@ export class CallFunction extends LogicItem {
             const typeAnnotation = this.typeArguments[0];
             code += `<`;
             code += `${typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>()`;
-            code += '\n';
         } else {
             code = this.calleeKey;
             if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
@@ -511,7 +514,7 @@ export class CallFunction extends LogicItem {
                 if (index !== this.arguments.length - 1)
                     code += ', ';
             });
-            code += ')\n';
+            code += ')';
         }
         return code;
     }

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 自动生成，请不手动修改！
@@ -387,6 +389,10 @@ export class CallLogic extends LogicItem {
 
     // 用于logic回填
     get calleewholeKey(): string {
+        if (!this.calleeNamespace && this.calleeName && this.view) {
+            // 页面逻辑单独处理
+            return `${this.view.getNamespace()}.${this.view.name}.logics.${this.calleeName}`;
+        }
         return this.calleeNamespace + '.' + this.calleeName;
     }
     get calleeKey(): string {
@@ -437,6 +443,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 +462,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 +494,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
@@ -528,7 +543,7 @@ export class CallLogic extends LogicItem {
 
     toVue(options?: ElementToVueOptions): string {
         let code = '';
-        if (this.calleeNamespace === 'nasl.browser' || this.calleeNamespace === 'nasl.auth' || this.calleeNamespace === 'nasl.configuration') {
+        if (this.calleeNamespace === 'nasl.browser' || this.calleeNamespace === 'nasl.auth' || this.calleeNamespace === 'nasl.configuration' || this.calleeNamespace === 'nasl.process') {
             code += '$global.';
         }
         code += this.calleeName;
@@ -563,21 +578,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 +612,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 +633,7 @@ export class CallLogic extends LogicItem {
                 headers: {},
             `;
 
-            if (entityName) {
+            if (keywordEntitiesIndex !== -1) {
                 let logicArgs = this.arguments;
                 switch (this.calleeName) {
                     case 'get':
@@ -688,19 +692,30 @@ export class CallLogic extends LogicItem {
                         code += `JSON.parse`;
                         break;
                 }
-            } else if (calleeNamespace === 'nasl.browser' || calleeNamespace === 'nasl.auth' || calleeNamespace === 'nasl.configuration') {
+            } else if (calleeNamespace === 'nasl.browser' || calleeNamespace === 'nasl.auth' || calleeNamespace === 'nasl.configuration' || calleeNamespace === 'nasl.process') {
                 code += `this.$global.${this.calleeName}`;
             } else {
                 code += `this.${this.calleeName}`;
             }
-            code += '(';
-            this.arguments?.filter((arg) => arg?.expression)
-                .forEach((arg, index) => {
-                    code += arg?.toJS(shiftState(state, code));
-                    if (index !== this.arguments?.length - 1)
-                        code += ', ';
-                });
-            code += ')';
+            if (calleeNamespace === 'nasl.process') {
+                code += '({';
+                this.arguments?.filter((arg) => arg?.expression)
+                    .forEach((arg, index) => {
+                        code += `${arg.keyword}: ${arg?.toJS(shiftState(state, code))}`;
+                        if (index !== this.arguments?.length - 1)
+                            code += ', ';
+                    });
+                code += '})';
+            } else {
+                code += '(';
+                this.arguments?.filter((arg) => arg?.expression)
+                    .forEach((arg, index) => {
+                        code += arg?.toJS(shiftState(state, code));
+                        if (index !== this.arguments?.length - 1)
+                            code += ', ';
+                    });
+                code += ')';
+            }
         }
         return code;
     }