@lcap/nasl 1.0.0-alpha → 1.0.0-alpha.11

package/src/concepts/BinaryExpression__.ts

@@ -1,4 +1,5 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { ElementToVueOptions } from './ViewElement__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -8,6 +9,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
@@ -15,7 +17,7 @@ import LogicItem from './LogicItem__';
 /**
  * 二元表达式
  */
-@concept
+@concept('二元表达式')
 export class BinaryExpression extends LogicItem {
     /**
      * 产品概念
@@ -23,12 +25,6 @@ export class BinaryExpression extends LogicItem {
     @property()
     concept: 'BinaryExpression' = 'BinaryExpression';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Expression';
-
     /**
      * 左边项
      */
@@ -177,6 +173,27 @@ export class BinaryExpression extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
+    toVue(options?: ElementToVueOptions) {
+        if (['startwith', 'endwith'].includes(this.operator)) {
+            const operatorMap = {
+                startwith: 'startsWith',
+                endwith: 'endsWith',
+            };
+            const fnName = operatorMap[this.operator as keyof typeof operatorMap];
+            let code = '';
+            code += this.left?.toVue ? this.left.toVue(options) : '';
+            code += '.' + fnName + '(';
+            code += this.right?.toVue ? this.right.toVue(options) : '';
+            code += ')';
+            return code;
+        }
+        let code = '';
+        code += this.left?.toVue ? this.left.toVue() : '';
+        code += ` ${this.operator} `;
+        code += this.right?.toVue ? this.right.toVue() : '';
+        return code;
+    }
+
     toUI(state?: TranslatorState): string {
         if (['startwith', 'endwith'].includes(this.operator)) {
             const operatorMap = {
@@ -231,7 +248,7 @@ export class BinaryExpression extends LogicItem {
             code += ')';
             return code;
         }
-        if (['&&', '||', '+'].includes(this.operator)) {
+        if (['&&', '||', '+', '-', '*', '/', '%'].includes(this.operator)) {
             const operatorMap = {
                 '&&': 'and',
                 '||': 'or',
@@ -239,6 +256,7 @@ export class BinaryExpression extends LogicItem {
                 '-': 'minus',
                 '*': 'multiply',
                 '/': 'divide',
+                '%': 'remainder',
             };
             let code = '';
             code += `nasl.core.${operatorMap[this.operator as keyof typeof operatorMap]}(`;

package/src/concepts/BindAttribute__.ts

@@ -1,4 +1,5 @@
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState, embeddedTSEmitter } from '../translator';
+import { ElementToVueOptions } from './ViewElement__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -8,6 +9,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
@@ -23,7 +25,7 @@ import Process from './Process__';
 /**
  * 元素绑定属性
  */
-@concept
+@concept('元素绑定属性')
 export class BindAttribute extends BaseNode {
     /**
      * 产品概念
@@ -196,7 +198,7 @@ export class BindAttribute extends BaseNode {
 
         getValidationRuleExistingNames(excludedList: Array<ValidationRule> = []) {
         const excludedSet = new Set(excludedList);
-        return this.rules.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.rules || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getValidationRuleUniqueName(name = 'validationRule1') {
         return utils.unique(name, this.getValidationRuleExistingNames());
@@ -231,22 +233,22 @@ export class BindAttribute extends BaseNode {
             validationRule = ValidationRule.from({
                 ...validationRuleOptions,
                 name: this.getValidationRuleUniqueName(),
-            }, this);
+            }, this, 'rules');
         } else if (typeof options === 'string') {
             validationRule = ValidationRule.from({
                 ...validationRuleOptions,
                 name: options,
-            }, this);
+            }, this, 'rules');
         } else if (options instanceof ValidationRule) {
             options.delete(); // 同一实例不支持多处存在
             validationRule = options;
+            Object.assign(validationRule, relationOptions);
         } else {
             validationRule = ValidationRule.from({
                 ...validationRuleOptions,
                 ...options,
-            }, this);
+            }, this, 'rules');
         }
-        Object.assign(validationRule, relationOptions);
         this.rules.splice(index, 0, validationRule);
         return validationRule;
     }
@@ -450,7 +452,6 @@ export class BindAttribute extends BaseNode {
     }
 
     updateSource(source?: Partial<BaseNode>) {
-        super.subConstructor(source);
         const object = {
             ...source,
         };
@@ -462,16 +463,21 @@ export class BindAttribute extends BaseNode {
     /**
      * 转换成 Vue 的模板格式
      */
-    toVue(placeholder?: any, finalCode?: boolean) {
+    toVue(options?: ElementToVueOptions) {
         let value = this.value;
-        if (this.expression && this.type === 'dynamic') {
-            value = this.expression.toUI();
+        if (this.type === 'dynamic' && this.expression) {
+            value = this.expression.toVue(options);
         }
         if (value !== undefined && value !== null && typeof value === 'string') {
             value = value.replace(/"/g, "'");
         }
-
-        if (this.type === 'string') {
+        if (this.name === 'destination' && this.destination) {
+            return this.destination.toVue(options);
+        } else if (this.name === 'rules' && this.rules) {
+            const ruleStrs = this.rules.map((rule) => rule.toVue());
+            value = ruleStrs.join(' | ');
+            return value !== undefined && value !== null ? `${this.name}="${value}"` : '';
+        } else if (this.type === 'string') {
             return value !== undefined && value !== null ? `${this.name}="${value}"` : '';
         } else {
             return value !== undefined && value !== null && value !== '' ? `:${this.name}${this.sync ? '.sync' : ''}="${value}"` : '';
@@ -483,6 +489,8 @@ export class BindAttribute extends BaseNode {
         let code = '';
         if (this.name === 'destination') {
             code += this.destination.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+        } else if (this.expression) {
+            code += this.expression.toEmbeddedTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
         }
         return code;
     }

package/src/concepts/BindDirective__.ts

@@ -1,3 +1,4 @@
+import { ElementToVueOptions } from './ViewElement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -6,6 +7,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
@@ -17,7 +19,7 @@ import App from './App__';
 /**
  * 元素指令
  */
-@concept
+@concept('元素指令')
 export class BindDirective extends BaseNode {
     /**
      * 产品概念
@@ -204,7 +206,7 @@ export class BindDirective extends BaseNode {
     /**
      * 转换成 Vue 的模板格式
      */
-    toVue(placeholder?: any, finalCode?: boolean) {
+    toVue(options?: ElementToVueOptions) {
         let modifiersString = '';
         Object.keys(this.modifiers || {}).forEach((key) => {
             const value = (this.modifiers as any)[key];
@@ -214,13 +216,15 @@ export class BindDirective extends BaseNode {
         // eslint-disable-next-line no-nested-ternary
         let value = this.type !== 'string' ? this.value : this.value ? `'${this.value}'` : '';
         if (this.expression) {
-            value = this.expression.toUI();
+            value = this.expression.toVue(options);
             if (this.expression.concept === 'StringLiteral') {
                 value = `'${value}'`;
             }
             value = value.replace && value.replace(/"/g, "'");
         }
-
+        if (this.name === 'auth' && !!this.value) {
+            value = `'/${this.view.name}/${this.element.name}'`;
+        }
         return value !== '' && value !== undefined && value !== null ? `v-${this.name}${modifiersString}${this.arg ? ':' + this.arg : ''}="${value}"` : '';
     }
 

package/src/concepts/BindEvent__.ts

@@ -3,7 +3,7 @@ import Logic from './Logic__';
 import LogicItem from './LogicItem__';
 import Namespace from './Namespace__';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState, embeddedTSEmitter } from '../translator';
-
+import { ElementToVueOptions } from './ViewElement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -12,6 +12,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import Argument from './Argument__';
@@ -23,7 +24,7 @@ import App from './App__';
 /**
  * 元素绑定事件
  */
-@concept
+@concept('元素绑定事件')
 export class BindEvent extends BaseNode {
     /**
      * 产品概念
@@ -166,13 +167,13 @@ export class BindEvent extends BaseNode {
         if (options instanceof Argument) {
             options.delete(); // 同一实例不支持多处存在
             argument = options;
+            Object.assign(argument, relationOptions);
         } else {
             argument = Argument.from({
                 ...argumentOptions,
                 ...options,
-            }, this);
+            }, this, 'arguments');
         }
-        Object.assign(argument, relationOptions);
         this.arguments.splice(index, 0, argument);
         return argument;
     }
@@ -289,23 +290,69 @@ export class BindEvent extends BaseNode {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
+    get tsCalleeNamespace() {
+        if (this.calleeNamespace) {
+            let tsCalleeNamespace = this.calleeNamespace;
+            tsCalleeNamespace = tsCalleeNamespace.replace(/\.[0-9]/g, (m) => m.replace('.', '.$'));
+            tsCalleeNamespace = tsCalleeNamespace.replace(/-/g, '_');
+            return tsCalleeNamespace;
+        }
+        return '';
+    }
+
+    get calleeKey(): string {
+        const tsCalleeNamespace = this.tsCalleeNamespace;
+        if (!tsCalleeNamespace) {
+            return `logics.${this.calleeName}`;
+        }
+        // elements单独处理相对路径，和后缀的问题
+        if (tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) {
+            const methodName = tsCalleeNamespace.substring(0, tsCalleeNamespace.length - '.logics'.length);
+            return '__' + methodName + `.${this.calleeName}`;
+        }
+        return `${tsCalleeNamespace}.${this.calleeName}`;
+    }
+    // 用于展示的value
+    get randerValue() {
+        const randerNameSpace = this.tsCalleeNamespace;
+        if (!randerNameSpace) {
+            return '' + this.calleeName;
+        }
+        // elements单独处理相对路径，和后缀的问题
+        if (randerNameSpace.startsWith('elements') && randerNameSpace.endsWith('logics')) {
+            const methodName = randerNameSpace.substring('elements.'.length, randerNameSpace.length);
+            return '$refs.' + methodName + `.${this.calleeName}`;
+        }
+        return `${randerNameSpace}.${this.calleeName}`;
+    }
+    // 绑定事件转驼峰
+    toHump = (name: string) => name ? name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase()) : '';
+
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
-        let code = `export function ${this.name || '__IDENTIFIER__'}() {\n`;
+        let code = `${this.toHump(this.name) || '__IDENTIFIER__'}: (event) => [\n`;
         code += indent(state.tabSize + 1);
-        code += `${this.calleeNamespace}.${this.calleeName}(`;
-        (this.arguments || []).forEach((arg, index) => {
-            code += arg.toEmbeddedTS(shiftState(state, code));
-            if (index !== this.arguments.length - 1)
-                code += ', ';
-        });
-        code += `)`;
+        code += `() => {${this.calleeKey}()}`;
         code += '\n';
         code += indent(state.tabSize);
-        code += '}';
+        code += '],\n';
         return code;
     }
 
+    // @withSourceMap()
+    // toObjectTS(state?: TranslatorState): string {
+    //     let code = '';
+    //     if (this.name) {
+    //         code = `function ${this.name || '__IDENTIFIER__'} () {\n`;
+    //         code += indent(state.tabSize + 1);
+    //         code += `${this.calleeKey}()`;
+    //         code += '\n';
+    //         code += indent(state.tabSize);
+    //         code += '};\n';
+    //     }
+    //     return code;
+    // }
+
     /**
      * 设置callee
      */
@@ -321,9 +368,23 @@ export class BindEvent extends BaseNode {
     /**
      * 转换成 Vue 的模板格式
      */
-    toVue(element?: ViewElement, finalCode?: boolean) {
+    toVue(options?: ElementToVueOptions) {
         const calleeName = this.calleeName;
-        return calleeName !== '' && calleeName !== undefined && calleeName !== null ? `@${this.name}="${calleeName}($event)"` : '';
+        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 += ', ';
+                });
+                code += ')';
+            }
+            code += `"`;
+        }
+        return code;
     }
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！

package/src/concepts/BooleanLiteral__.ts

@@ -1,4 +1,5 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { ElementToVueOptions } from './ViewElement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -7,6 +8,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
@@ -14,7 +16,7 @@ import LogicItem from './LogicItem__';
 /**
  * 布尔型字面量
  */
-@concept
+@concept('布尔型字面量')
 export class BooleanLiteral extends LogicItem {
     /**
      * 产品概念
@@ -22,12 +24,6 @@ export class BooleanLiteral extends LogicItem {
     @property()
     concept: 'BooleanLiteral' = 'BooleanLiteral';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Expression';
-
     /**
      * 字面量的值
      */
@@ -60,6 +56,10 @@ export class BooleanLiteral extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    toVue(options?: ElementToVueOptions): string {
+        return this.value;
+    }
+
     toUI(state?: TranslatorState): string {
         return this.value;
     }