@lcap/nasl 1.0.0-alpha.9 → 1.0.2

package/src/concepts/BindDirective__.ts

@@ -218,12 +218,31 @@ export class BindDirective extends BaseNode {
         if (this.expression) {
             value = this.expression.toVue(options);
             if (this.expression.concept === 'StringLiteral') {
-                value = `'${value}'`;
+                value = `${value}`;
             }
-            value = value.replace && value.replace(/"/g, "'");
+            value = value?.replace(/"/g, "'");
         }
         if (this.name === 'auth' && !!this.value) {
-            value = `'/${this.view.name}/${this.element.name}'`;
+            const regex = /(.\w+\[name=\w+\])/g;
+            const paths = this.element.nodePath.match(regex);
+            const regex1 = /\s*=(\w+)\]/;
+            let pathArr: string[] = [];
+            const isElement = paths.find((item) => {
+                if (item.startsWith('.elements')) {
+                    return true;
+                } else {
+                    pathArr.push(item);
+                    return false;
+                }
+            });
+            if (isElement) {
+                pathArr = [...pathArr, ...paths.slice(-1)];
+            }
+            const _path = pathArr.reduce((str, item) => {
+                const c = item.match(regex1);
+                return str + '/' + c[1];
+            }, '');
+            value = `'${_path}'`;
         }
         return value !== '' && value !== undefined && value !== null ? `v-${this.name}${modifiersString}${this.arg ? ':' + this.arg : ''}="${value}"` : '';
     }

package/src/concepts/BindEvent__.ts

@@ -165,7 +165,7 @@ export class BindEvent extends BaseNode {
         const relationOptions = { parentNode: this, parentKey: 'arguments' };
         let argument: Argument;
         if (options instanceof Argument) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             argument = options;
             Object.assign(argument, relationOptions);
         } else {
@@ -239,7 +239,7 @@ export class BindEvent extends BaseNode {
 
     addArgument(options?: Partial<Argument> | Argument) {
         const node = this._addArgument(options as any);
-        const index = this.arguments.length;
+        const index = this.arguments.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -289,7 +289,10 @@ export class BindEvent extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-
+    // 用于logic回填
+    get calleewholeKey(): string {
+        return this.calleeNamespace + '.' + this.calleeName;
+    }
     get tsCalleeNamespace() {
         if (this.calleeNamespace) {
             let tsCalleeNamespace = this.calleeNamespace;
@@ -303,7 +306,7 @@ export class BindEvent extends BaseNode {
     get calleeKey(): string {
         const tsCalleeNamespace = this.tsCalleeNamespace;
         if (!tsCalleeNamespace) {
-            return `logics.${this.calleeName}`;
+            return `${this.calleeName}`;
         }
         // elements单独处理相对路径，和后缀的问题
         if (tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) {
@@ -326,17 +329,24 @@ export class BindEvent extends BaseNode {
         return `${randerNameSpace}.${this.calleeName}`;
     }
     // 绑定事件转驼峰
-    toHump = (name: string) => name ? name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase()) : '';
+    toHump = (name: string) => (name ? name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase()) : '');
 
     @withSourceMap()
-    toEmbeddedTS(state?: TranslatorState): string {
-        let code = `${this.toHump(this.name) || '__IDENTIFIER__'}: (event) => [\n`;
-        code += indent(state.tabSize + 1);
-        code += `() => {${this.calleeKey}()}`;
-        code += '\n';
-        code += indent(state.tabSize);
-        code += '],\n';
-        return code;
+    toEmbeddedTS(state?: TranslatorState, isPageCycle?: Boolean): string {
+        // 如果有绑定的事件名
+        if (this.calleeName) {
+            if (isPageCycle) {
+                return `${this.calleeKey}();`;
+            }
+            let code = `${this.toHump(this.name) || '__IDENTIFIER__'}: (event) => [\n`;
+            code += indent(state.tabSize + 1);
+            code += `() => {${this.calleeKey}()}`;
+            code += '\n';
+            code += indent(state.tabSize);
+            code += '],\n';
+            return code;
+        }
+        return '';
     }
 
     // @withSourceMap()
@@ -369,19 +379,53 @@ export class BindEvent extends BaseNode {
      * 转换成 Vue 的模板格式
      */
     toVue(options?: ElementToVueOptions) {
-        const calleeName = this.calleeName;
+        const calleeNamespace = this.calleeNamespace;
+        let isComponentLogic = false;
+        let componentName = '';
+        if (calleeNamespace) {
+            const namespaceArr = calleeNamespace.split('.');
+            const start = namespaceArr.shift();
+            if (start === 'elements' && namespaceArr.length === 2 && namespaceArr[1] === 'logics') {
+                isComponentLogic = true;
+                componentName = namespaceArr[0];
+            }
+        }
+        let callee = '';
+        if (isComponentLogic)
+            callee = `$refs.${componentName}.${this.calleeName}`;
+        else if (calleeNamespace?.startsWith('nasl.'))
+            callee = `$global.${this.calleeName}`;
+        else
+            callee = this.calleeName;
         let code = '';
-        if (calleeName) {
-            code += `@${this.name}="${calleeName}`;
-            if (Array.isArray(this.arguments)) {
-                code += '(';
-                this.arguments.forEach((arg, index) => {
-                    code += arg.toJS();
-                    if (index !== this.arguments.length - 1)
-                        code += ', ';
+        if (callee) {
+            code += `@${this.name}="${callee}`;
+            const argsList: string[] = [];
+            const argsMap: any = {};
+            if (Array.isArray(this.arguments) && this.arguments.length) {
+                this.arguments.forEach((arg) => {
+                    const argStr = arg.toJS();
+                    argsList.push(argStr);
+                    argsMap[argStr] = true;
                 });
-                code += ')';
             }
+            const additionalArgs: string[] = ['$event'];
+            if (Array.isArray(options?.scopeList) && options?.scopeList.length) {
+                additionalArgs.push(...options.scopeList);
+            }
+            additionalArgs.forEach((arg) => {
+                if (!argsMap[arg]) {
+                    argsList.push(arg);
+                    argsMap[arg] = true;
+                }
+            });
+            code += '(';
+            argsList.forEach((arg, index) => {
+                code += arg;
+                if (index !== argsList.length - 1)
+                    code += ', ';
+            });
+            code += ')';
             code += `"`;
         }
         return code;

package/src/concepts/BooleanLiteral__.ts

@@ -68,6 +68,14 @@ export class BooleanLiteral extends LogicItem {
         return this.value;
     }
 
+    @withSourceMap()
+    toEmbeddedTS(state?: TranslatorState) {
+        return this.value;
+    }
+    getValue() {
+        return this.value;
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/CallFunction__.ts

@@ -1,6 +1,7 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import Function from './Function__';
 import { ElementToVueOptions } from './ViewElement__';
+import Identifier from './Identifier__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -31,7 +32,7 @@ export class CallFunction extends LogicItem {
      * 调用函数标题
      */
     @property()
-    label: string = '调用逻辑';
+    label: string = '内置函数';
 
     /**
      * calleeNamespace
@@ -104,7 +105,7 @@ export class CallFunction extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
         let typeAnnotation: TypeAnnotation;
         if (options instanceof TypeAnnotation) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             typeAnnotation = options;
             Object.assign(typeAnnotation, relationOptions);
         } else {
@@ -178,7 +179,7 @@ export class CallFunction extends LogicItem {
 
     addTypeAnnotation(options?: Partial<TypeAnnotation> | TypeAnnotation) {
         const node = this._addTypeAnnotation(options as any);
-        const index = this.typeArguments.length;
+        const index = this.typeArguments.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -211,7 +212,7 @@ export class CallFunction extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'arguments' };
         let argument: Argument;
         if (options instanceof Argument) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             argument = options;
             Object.assign(argument, relationOptions);
         } else {
@@ -285,7 +286,7 @@ export class CallFunction extends LogicItem {
 
     addArgument(options?: Partial<Argument> | Argument) {
         const node = this._addArgument(options as any);
-        const index = this.arguments.length;
+        const index = this.arguments.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -374,11 +375,19 @@ export class CallFunction extends LogicItem {
     toVue(options?: ElementToVueOptions): string {
         let code = `$utils['${this.calleeName}']`;
         code += '(';
-        this.arguments.forEach((arg, index) => {
-            code += arg.toVue(options);
-            if (index !== this.arguments.length - 1)
+        this.arguments?.forEach((arg, index) => {
+            code += arg?.toVue(options);
+            if (index !== this.arguments?.length - 1)
                 code += ', ';
         });
+        if (this.typeArguments && this.typeArguments.length) {
+            code += ', ';
+            this.typeArguments?.forEach((arg, index) => {
+                code += arg?.toJS();
+                if (index !== this.arguments?.length - 1)
+                    code += ', ';
+            });
+        }
         code += ')';
         return code;
     }
@@ -386,11 +395,19 @@ export class CallFunction extends LogicItem {
     toUI(): string {
         let code = this.calleeName;
         code += '(';
-        this.arguments.forEach((arg, index) => {
-            code += arg.toUI();
-            if (index !== this.arguments.length - 1)
+        this.arguments?.forEach((arg, index) => {
+            code += arg?.toUI();
+            if (index !== this.arguments?.length - 1)
                 code += ', ';
         });
+        if (this.typeArguments && this.typeArguments.length) {
+            code += ', ';
+            this.typeArguments?.forEach((arg, index) => {
+                code += arg?.typeName;
+                if (index !== this.arguments?.length - 1)
+                    code += ', ';
+            });
+        }
         code += ')';
         return code;
     }
@@ -398,11 +415,19 @@ export class CallFunction extends LogicItem {
     toJS(state?: TranslatorState): string {
         let code = `this.$utils['${this.calleeName}']`;
         code += '(';
-        this.arguments.forEach((arg, index) => {
-            code += arg.toJS(shiftState(state, code));
-            if (index !== this.arguments.length - 1)
+        this.arguments?.forEach((arg, index) => {
+            code += arg?.toJS(shiftState(state, code));
+            if (index !== this.arguments?.length - 1)
                 code += ', ';
         });
+        if (this.typeArguments && this.typeArguments.length) {
+            code += ', ';
+            this.typeArguments?.forEach((arg, index) => {
+                code += arg?.toJS(shiftState(state, code));
+                if (index !== this.arguments?.length - 1)
+                    code += ', ';
+            });
+        }
         code += ')';
         return code;
     }
@@ -412,10 +437,10 @@ export class CallFunction extends LogicItem {
     }
 
     _setCallee(func: Function) {
-        this.calleeNamespace = func.getNamespace();
-        this.calleeName = func.name;
+        this.calleeNamespace = func?.getNamespace();
+        this.calleeName = func?.name;
         this.arguments = [];
-        func.params.forEach((param) => {
+        func?.params?.forEach((param) => {
             this._addArgument(undefined);
         });
     }
@@ -428,6 +453,9 @@ export class CallFunction extends LogicItem {
             const argument = Argument.from({
                 keyword: param.name,
             }, this);
+            if (param.defaultExpression instanceof Identifier) {
+                argument.expression = BaseNode.from(param.defaultExpression, argument, 'expression') as Identifier;
+            }
             Object.assign(argument, relationOptions);
             return argument;
         });
@@ -466,19 +494,23 @@ export class CallFunction extends LogicItem {
             code += ')';
             // 如果有内容
             const typeAnnotation = this.typeArguments[0];
-            if (typeAnnotation.typeNamespace && typeAnnotation.typeName) {
-                code += `<${typeAnnotation.typeNamespace}.${typeAnnotation.typeName}>()`;
-            }
-            code += '\n';
+            code += `<`;
+            code += `${typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>()`;
         } else {
             code = this.calleeKey;
+            if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+                // 如果有内容
+                const typeAnnotation = this.typeArguments[0];
+                code += `<`;
+                code += `${typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>`;
+            }
             code += '(';
-            this.arguments.forEach((arg, index) => {
+            Array.isArray(this.arguments) && this.arguments.forEach((arg, index) => {
                 code += arg.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
                 if (index !== this.arguments.length - 1)
                     code += ', ';
             });
-            code += ')\n';
+            code += ')';
         }
         return code;
     }