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

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 += ', ';
         });

package/src/concepts/CallLogic__.ts

@@ -1,6 +1,7 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import Logic from './Logic__';
 import Param from './Param__';
+import { ElementToVueOptions } from './ViewElement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -9,8 +10,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__';
 
@@ -49,12 +52,20 @@ export class CallLogic extends LogicItem {
     @property()
     shortcut: boolean = undefined;
 
+    /**
+     * 类型参数
+     */
+    @property('TypeAnnotation')
+    typeArguments?: Array<TypeAnnotation> = null;
+
     /**
      * 实际参数
      */
     @property('Argument')
     arguments: Array<Argument> = [];
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -68,6 +79,120 @@ export class CallLogic extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallLogic;
     }
 
+    
+    
+
+    
+
+    
+
+    /**
+    * 插入类型标注
+    * @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
@@ -100,6 +225,8 @@ export class CallLogic extends LogicItem {
         return argument;
     }
 
+    
+
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -122,6 +249,8 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加实际参数
      * @internal
@@ -141,6 +270,8 @@ export class CallLogic extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
+    
+
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -164,6 +295,45 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
+
+    
+
+    /**
+     * 删除类型标注
+     * @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 已有的实际参数实例
@@ -171,7 +341,7 @@ export class CallLogic extends LogicItem {
     removeArgument(argument: Argument): void;
 
     removeArgument(options: Argument) {
-        const argument: Argument = options;
+        let argument: Argument = options;
         return argument.delete();
     }
 
@@ -214,15 +384,16 @@ export class CallLogic extends LogicItem {
     }
     get calleeKey(): string {
         const tsCalleeNamespace = this.tsCalleeNamespace;
+        const calleeName = this.calleeName;
         if (!tsCalleeNamespace) {
-            return `logics.${this.calleeName}`;
+            return calleeName ? `logics.${calleeName}` : '__IDENTIFIER__';
         }
         // elements单独处理相对路径，和后缀的问题
         if (tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) {
             const methodName = tsCalleeNamespace.substring(0, tsCalleeNamespace.length - '.logics'.length);
-            return '__' + methodName + `.${this.calleeName}`;
+            return '__' + methodName + `.${calleeName}`;
         }
-        return `${tsCalleeNamespace}.${this.calleeName}`;
+        return calleeName ? `${tsCalleeNamespace}.${calleeName}` : '__IDENTIFIER__';
     }
 
     /**
@@ -265,6 +436,12 @@ export class CallLogic extends LogicItem {
                 keyword: param.name,
             });
         });
+        if (logic.typeParams) {
+            this.typeArguments = [];
+            logic.typeParams.forEach(() => {
+                this._addTypeAnnotation({});
+            });
+        }
     }
 
     setCallee(logic: Logic) {
@@ -278,10 +455,20 @@ export class CallLogic extends LogicItem {
             Object.assign(argument, relationOptions);
             return argument;
         });
+        let typeArguments = null;
+        if (logic.typeParams) {
+            typeArguments = logic.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,
         });
     }
 
@@ -330,11 +517,11 @@ export class CallLogic 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 += ', ';
         });
@@ -357,7 +544,11 @@ export class CallLogic extends LogicItem {
 
     toJS(state?: TranslatorState): string {
         let code = 'await ';
+        // 页面逻辑
         let isViewLogic = true;
+        // 组件逻辑
+        let isComponentLogic = false;
+        let componentName = '';
         const calleeNamespace = this.calleeNamespace;
         // calleeNamespace不存在，一定是页面逻辑
         if (calleeNamespace) {
@@ -368,6 +559,9 @@ export class CallLogic extends LogicItem {
                 if (!keywordViews) {
                     isViewLogic = false;
                 }
+            } else if (start === 'elements' && namespaceArr.length === 2 && namespaceArr[1] === 'logics') {
+                isComponentLogic = true;
+                componentName = namespaceArr[0];
             }
         }
         // 全局逻辑
@@ -383,10 +577,13 @@ export class CallLogic extends LogicItem {
             const namespaceArr = calleeNamespace.split('.');
             // 去掉app
             namespaceArr.shift();
-            const keywordEntities = namespaceArr.map((namespaceItem, index) => ({
-                key: namespaceItem,
-                index,
-            })).filter((namespaceItem, index) => index % 2 === 0).find((namespaceItem) => namespaceItem.key === 'entities');
+            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];
 
             if (entityName) {
@@ -429,7 +626,9 @@ export class CallLogic extends LogicItem {
             }
             code += '\n})';
         } else {
-            if (calleeNamespace === 'nasl.ui.logics' || calleeNamespace === 'nasl.util.logics') {
+            if (isComponentLogic) {
+                code += `this.$refs.${componentName}.${this.calleeName}`;
+            } else if (calleeNamespace === 'nasl.ui' || calleeNamespace === 'nasl.util') {
                 switch (this.calleeName) {
                     case 'showMessage':
                         code += `this.$toast.show`;
@@ -478,7 +677,7 @@ export class CallLogic extends LogicItem {
     //================================================================================
 }
 
-classMap.CallLogic = CallLogic;
+classMap['CallLogic'] = CallLogic;
 export default CallLogic;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/CallQueryComponent__.ts

@@ -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 TypeAnnotation from './TypeAnnotation__';
@@ -198,7 +199,7 @@ export class CallQueryComponent extends LogicItem {
 
         getQueryGroupByExpressionExistingNames(excludedList: Array<QueryGroupByExpression> = []) {
         const excludedSet = new Set(excludedList);
-        return this.groupBy.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.groupBy || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getQueryGroupByExpressionUniqueName(name = 'queryGroupByExpression1') {
         return utils.unique(name, this.getQueryGroupByExpressionExistingNames());

package/src/concepts/Comment__.ts

@@ -7,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__';