@lcap/nasl 1.0.0-alpha.2 → 1.0.0-alpha.3

package/src/concepts/Argument__.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__';
@@ -140,10 +142,10 @@ export class Argument extends LogicItem {
         });
     }
 
-    toVue(state?: TranslatorState): string {
+    toVue(options?: ElementToVueOptions) {
         let code = this.spread ? '...' : '';
         if (this.expression) {
-            code += this.expression.toVue(shiftState(state, code));
+            code += this.expression.toVue(options);
         } else {
             code += '';
         }

package/src/concepts/Assignment__.ts

@@ -1,5 +1,6 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import Identifier from './Identifier__';
+import { ElementToVueOptions } from './ViewElement__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -9,6 +10,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__';
@@ -181,11 +183,11 @@ export class Assignment extends LogicItem {
         };
     }
 
-    toVue(state?: TranslatorState): string {
+    toVue(options?: ElementToVueOptions) {
         let code = '';
-        code += this.left ? this.left.toVue(shiftState(state, code, { inline: true })) : '';
+        code += this.left ? this.left.toVue(options) : '';
         code += ' = ';
-        code += this.right ? this.right.toVue(shiftState(state, code, { inline: true })) : '';
+        code += this.right ? this.right.toVue(options) : '';
         code += ';';
         return code;
     }
@@ -215,10 +217,6 @@ export class Assignment extends LogicItem {
         code += this.left ? this.left.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__LEFT__';
         code += ' = ';
 
-        // 因为右侧枚举要赋值就得new 一下；
-        if (this.right && this.right instanceof Identifier && this.right.namespace && this.right.namespace.endsWith('enums')) {
-            code += 'new ';
-        }
         code += this.right ? this.right.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
         code += ';';
         return code;

package/src/concepts/Attribute__.ts

@@ -6,6 +6,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 TypeAnnotation from './TypeAnnotation__';

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__';
@@ -171,7 +173,7 @@ export class BinaryExpression extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
-    toVue(state?: TranslatorState): string {
+    toVue(options?: ElementToVueOptions) {
         if (['startwith', 'endwith'].includes(this.operator)) {
             const operatorMap = {
                 startwith: 'startsWith',
@@ -179,16 +181,16 @@ export class BinaryExpression extends LogicItem {
             };
             const fnName = operatorMap[this.operator as keyof typeof operatorMap];
             let code = '';
-            code += this.left?.toVue ? this.left.toVue(shiftState(state, code, { inline: true })) : '';
+            code += this.left?.toVue ? this.left.toVue(options) : '';
             code += '.' + fnName + '(';
-            code += this.right?.toVue ? this.right.toVue(shiftState(state, code, { inline: true })) : '';
+            code += this.right?.toVue ? this.right.toVue(options) : '';
             code += ')';
             return code;
         }
         let code = '';
-        code += this.left?.toVue ? this.left.toVue(shiftState(state, code, { inline: true })) : '';
+        code += this.left?.toVue ? this.left.toVue() : '';
         code += ` ${this.operator} `;
-        code += this.right?.toVue ? this.right.toVue(shiftState(state, code, { inline: true })) : '';
+        code += this.right?.toVue ? this.right.toVue() : '';
         return code;
     }
 

package/src/concepts/BindAttribute__.ts

@@ -9,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__';
@@ -197,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());
@@ -462,16 +463,20 @@ export class BindAttribute extends BaseNode {
     /**
      * 转换成 Vue 的模板格式
      */
-    toVue() {
+    toVue(options?: ElementToVueOptions) {
         let value = this.value;
         if (this.type === 'dynamic' && this.expression) {
-            value = this.expression.toVue();
+            value = this.expression.toVue(options);
         }
         if (value !== undefined && value !== null && typeof value === 'string') {
             value = value.replace(/"/g, "'");
         }
         if (this.name === 'destination' && this.destination) {
-            return this.destination.toVue();
+            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 {

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__';
@@ -204,7 +206,7 @@ export class BindDirective extends BaseNode {
     /**
      * 转换成 Vue 的模板格式
      */
-    toVue() {
+    toVue(options?: ElementToVueOptions) {
         let modifiersString = '';
         Object.keys(this.modifiers || {}).forEach((key) => {
             const value = (this.modifiers as any)[key];
@@ -214,7 +216,7 @@ 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.toVue();
+            value = this.expression.toVue(options);
             if (this.expression.concept === 'StringLiteral') {
                 value = `'${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__';
@@ -304,7 +305,8 @@ export class BindEvent extends BaseNode {
             if (/^\d/.test(tsName)) {
                 tsName = '$' + tsName;
             }
-            tsName = tsName.replaceAll('-', '_');
+            // 匹配所有特殊字符都转为_
+            tsName = tsName.replace(/\W/g, '_');
             return tsName;
         }
         return '';
@@ -376,7 +378,7 @@ export class BindEvent extends BaseNode {
     /**
      * 转换成 Vue 的模板格式
      */
-    toVue() {
+    toVue(options?: ElementToVueOptions) {
         const calleeName = this.calleeName;
         let code = '';
         if (calleeName) {
@@ -390,8 +392,8 @@ export class BindEvent extends BaseNode {
                 });
                 code += ')';
             }
+            code += `"`;
         }
-        code += `"`;
         return code;
     }
     //================================================================================

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__';
@@ -54,7 +56,7 @@ export class BooleanLiteral extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-    toVue(): string {
+    toVue(options?: ElementToVueOptions): string {
         return this.value;
     }
 

package/src/concepts/CallFunction__.ts

@@ -1,5 +1,6 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import Function from './Function__';
+import { ElementToVueOptions } from './ViewElement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -8,8 +9,10 @@ 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 TypeAnnotation from './TypeAnnotation__';
 import Argument from './Argument__';
 import LogicItem from './LogicItem__';
 
@@ -48,6 +51,12 @@ export class CallFunction extends LogicItem {
     @property()
     shortcut: boolean = undefined;
 
+    /**
+     * 类型参数
+     */
+    @property('TypeAnnotation')
+    typeArguments?: Array<TypeAnnotation> = null;
+
     /**
      * 实际参数
      */
@@ -76,6 +85,113 @@ export class CallFunction extends LogicItem {
 
     
 
+    /**
+    * 插入类型标注
+    * @internal
+    * @param typeAnnotationOptions 类型标注参数
+    */
+    _insertTypeAnnotationAt(typeAnnotationOptions: Partial<TypeAnnotation>, index: number): TypeAnnotation;
+
+    /**
+    * 插入类型标注
+    * @internal
+    * @param typeAnnotation 已有的类型标注实例
+    */
+    _insertTypeAnnotationAt(typeAnnotation: TypeAnnotation, index: number): TypeAnnotation;
+
+    _insertTypeAnnotationAt(options: Partial<TypeAnnotation> | TypeAnnotation, index: number) {
+        const typeAnnotationOptions: any = {};
+        const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
+        let typeAnnotation: TypeAnnotation;
+        if (options instanceof TypeAnnotation) {
+            options.delete(); // 同一实例不支持多处存在
+            typeAnnotation = options;
+            Object.assign(typeAnnotation, relationOptions);
+        } else {
+            typeAnnotation = TypeAnnotation.from({
+                ...typeAnnotationOptions,
+                ...options,
+            }, this, 'typeArguments');
+        }
+        this.typeArguments.splice(index, 0, typeAnnotation);
+        return typeAnnotation;
+    }
+
+    
+
+    /**
+     * 插入类型标注
+     * @param typeAnnotationOptions 类型标注参数
+     */
+    insertTypeAnnotationAt(typeAnnotationOptions: Partial<TypeAnnotation>, index: number): TypeAnnotation;
+
+    /**
+     * 插入类型标注
+     * @param typeAnnotation 已有的类型标注实例
+     */
+    insertTypeAnnotationAt(typeAnnotation: TypeAnnotation, index: number): TypeAnnotation;
+
+    insertTypeAnnotationAt(options: Partial<TypeAnnotation> | TypeAnnotation, index: number) {
+        const node = this._insertTypeAnnotationAt(options as any, index);
+        node.create({
+            index,
+            parentNode: this,
+            parentKey: 'typeArguments',
+        });
+        return node;
+    }
+
+    
+
+    /**
+     * 添加类型标注
+     * @internal
+     * @param typeAnnotationOptions 类型标注参数
+     */
+    _addTypeAnnotation(typeAnnotationOptions: Partial<TypeAnnotation>): TypeAnnotation;
+
+    /**
+     * 添加类型标注
+     * @internal
+     * @param typeAnnotation 已有的类型标注实例
+     */
+    _addTypeAnnotation(typeAnnotation: TypeAnnotation): TypeAnnotation;
+
+    _addTypeAnnotation(options?: Partial<TypeAnnotation> | TypeAnnotation) {
+        const index = this.typeArguments.length;
+        return this._insertTypeAnnotationAt(options as any, index);
+    }
+
+    
+
+    /**
+     * 添加类型标注
+     * @param typeAnnotationOptions 类型标注参数
+     */
+    addTypeAnnotation(typeAnnotationOptions: Partial<TypeAnnotation>): TypeAnnotation;
+
+    /**
+     * 添加类型标注
+     * @param typeAnnotation 已有的类型标注实例
+     */
+    addTypeAnnotation(typeAnnotation: TypeAnnotation): TypeAnnotation;
+
+    addTypeAnnotation(options?: Partial<TypeAnnotation> | TypeAnnotation) {
+        const node = this._addTypeAnnotation(options as any);
+        const index = this.typeArguments.length;
+        node.create({
+            index,
+            parentNode: this,
+            parentKey: 'typeArguments',
+        });
+        return node;
+    }
+
+
+
+
+    
+
     /**
     * 插入实际参数
     * @internal
@@ -181,6 +297,42 @@ export class CallFunction extends LogicItem {
 
     
 
+    /**
+     * 删除类型标注
+     * @param typeAnnotation 已有的类型标注实例
+     */
+    removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
+
+    removeTypeAnnotation(options: TypeAnnotation) {
+        let typeAnnotation: TypeAnnotation = options;
+        return typeAnnotation.delete();
+    }
+
+    __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
+        const parentKey = typeAnnotation.parentKey;
+        const params: Params = {
+            parentNode: this,
+            parentKey,
+            index: -1,
+            object: null,
+            oldObject: typeAnnotation,
+        };
+        if (parentKey) {
+            params.parentKey = parentKey;
+            if (Array.isArray((this as any)[parentKey])) {
+                const index = (this as any)[parentKey].indexOf(typeAnnotation);
+                ~index && (this as any)[parentKey].splice(index, 1);
+                params.index = index;
+            } else if ((this as any)[parentKey] === typeAnnotation) {
+                params.index = 0;
+                (this as any)[parentKey] = undefined;
+            }
+        }
+        return params;
+    }
+
+
+
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -219,11 +371,11 @@ export class CallFunction extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-    toVue(): string {
+    toVue(options?: ElementToVueOptions): string {
         let code = `$utils['${this.calleeName}']`;
         code += '(';
         this.arguments.forEach((arg, index) => {
-            code += arg.toVue();
+            code += arg.toVue(options);
             if (index !== this.arguments.length - 1)
                 code += ', ';
         });
@@ -256,7 +408,7 @@ export class CallFunction extends LogicItem {
     }
 
     get calleeKey(): string {
-        return `${this.calleeNamespace}.${this.calleeName}`;
+        return this.calleeName ? `${this.calleeNamespace ? this.calleeNamespace + '.' : ''}${this.calleeName}` : '__IDENTIFIER__';
     }
 
     _setCallee(func: Function) {
@@ -279,23 +431,55 @@ export class CallFunction extends LogicItem {
             Object.assign(argument, relationOptions);
             return argument;
         });
+        let typeArguments = null;
+        if(func.typeParams) {
+            typeArguments = func.typeParams.map(() => {
+                const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
+                const typeArgu = new TypeAnnotation();
+                Object.assign(typeArgu, relationOptions);
+                return typeArgu;
+            })
+        }
         this.update({
             calleeNamespace,
             calleeName,
             arguments: params,
+            typeArguments
         });
     }
 
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
-        let code = this.calleeKey;
-        code += '(';
-        this.arguments.forEach((arg, index) => {
-            code += arg.toEmbeddedTS(shiftState(state, code));
-            if (index !== this.arguments.length - 1)
-                code += ', ';
-        });
-        code += ');\n';
+        let code = '';
+        const calleeKey = this.calleeKey;
+        if (calleeKey === 'nasl.util.Convert') {
+            // nasl.util.Convert(variable1)<nasl.core.String>();
+            // 单独处理
+
+            code = calleeKey;
+            code += '(';
+            this.arguments.forEach((arg, index) => {
+                code += arg.toEmbeddedTS(shiftState(state, code));
+                if (index !== this.arguments.length - 1)
+                    code += ', ';
+            });
+            code += ')';
+            // 如果有内容
+            const typeAnnotation = this.typeArguments[0];
+            if (typeAnnotation.typeNamespace && typeAnnotation.typeName) {
+                code += `<${typeAnnotation.typeNamespace}.${typeAnnotation.typeName}>()`;
+            }
+            code += '\n';
+        } else {
+            code = this.calleeKey;
+            code += '(';
+            this.arguments.forEach((arg, index) => {
+                code += arg.toEmbeddedTS(shiftState(state, code));
+                if (index !== this.arguments.length - 1)
+                    code += ', ';
+            });
+            code += ')\n';
+        }
         return code;
     }
     //================================================================================

package/src/concepts/CallInterface__.ts

@@ -1,5 +1,6 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import Interface from './Interface__';
+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 Argument from './Argument__';
@@ -219,11 +221,11 @@ export class CallInterface extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-    toVue(): string {
+    toVue(options?: ElementToVueOptions): string {
         let code = this.calleeName;
         code += '(';
         this.arguments.forEach((arg, index) => {
-            code += arg.toVue();
+            code += arg.toVue(options);
             if (index !== this.arguments.length - 1)
                 code += ', ';
         });