@lcap/nasl 2.20.0-beta.2 → 2.20.0

package/src/concepts/CallFunction__.ts

@@ -66,6 +66,8 @@ export class CallFunction extends LogicItem {
     @property('Argument')
     arguments: Array<Argument> = [];
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -79,6 +81,13 @@ export class CallFunction extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallFunction;
     }
 
+    
+    
+
+    
+
+    
+
     /**
     * 插入类型标注
     * @internal
@@ -111,6 +120,8 @@ export class CallFunction extends LogicItem {
         return typeAnnotation;
     }
 
+    
+
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -133,6 +144,8 @@ export class CallFunction extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加类型标注
      * @internal
@@ -152,6 +165,8 @@ export class CallFunction extends LogicItem {
         return this._insertTypeAnnotationAt(options as any, index);
     }
 
+    
+
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -175,6 +190,11 @@ export class CallFunction extends LogicItem {
         return node;
     }
 
+
+
+
+    
+
     /**
     * 插入实际参数
     * @internal
@@ -207,6 +227,8 @@ export class CallFunction extends LogicItem {
         return argument;
     }
 
+    
+
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -229,6 +251,8 @@ export class CallFunction extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加实际参数
      * @internal
@@ -248,6 +272,8 @@ export class CallFunction extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
+    
+
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -271,6 +297,9 @@ export class CallFunction extends LogicItem {
         return node;
     }
 
+
+    
+
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -278,7 +307,7 @@ export class CallFunction extends LogicItem {
     removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotation(options: TypeAnnotation) {
-        const typeAnnotation: TypeAnnotation = options;
+        let typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
@@ -305,6 +334,8 @@ export class CallFunction extends LogicItem {
         return params;
     }
 
+
+
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -312,7 +343,7 @@ export class CallFunction extends LogicItem {
     removeArgument(argument: Argument): void;
 
     removeArgument(options: Argument) {
-        const argument: Argument = options;
+        let argument: Argument = options;
         return argument.delete();
     }
 
@@ -349,11 +380,19 @@ export class CallFunction extends LogicItem {
         } else {
             let code = `$utils['${this.calleeName}']`;
             code += '(';
-            this.arguments?.forEach((arg, index) => {
-                code += arg?.toVue(options);
-                if (index !== this.arguments?.length - 1)
-                    code += ', ';
-            });
+            if (Array.isArray(this.arguments) && this.arguments.length) {
+                const needToString = ['Concat'].includes(this.calleeName);
+                this.arguments?.forEach((arg: any, index) => {
+                    let argStr = arg?.toVue(options);
+                    if (needToString) {
+                        const argTypeAnnotation = arg.typeAnnotation || arg.__TypeAnnotation;
+                        argStr = `$utils['ToString'](${argStr}, '${argTypeAnnotation?.sortedTypeKey}')`;
+                    }
+                    code += argStr;
+                    if (index !== this.arguments?.length - 1)
+                        code += ', ';
+                });
+            }
             if (this.typeArguments && this.typeArguments.length) {
                 if (this.arguments?.length)
                     code += ', ';
@@ -393,8 +432,14 @@ export class CallFunction extends LogicItem {
         let code = `this.$utils['${this.calleeName}']`;
         code += '(';
         if (Array.isArray(this.arguments) && this.arguments.length) {
-            this.arguments.forEach((arg, index) => {
-                code += arg?.toJS(shiftState(state, code));
+            const needToString = ['Concat'].includes(this.calleeName);
+            this.arguments.forEach((arg: any, index) => {
+                let argStr = arg?.toJS(shiftState(state, code));
+                if (needToString) {
+                    const argTypeAnnotation = arg.typeAnnotation || arg.__TypeAnnotation;
+                    argStr = `this.$utils['ToString'](${argStr}, '${argTypeAnnotation?.sortedTypeKey}')`;
+                }
+                code += argStr;
                 if (index !== this.arguments?.length - 1)
                     code += ', ';
             });
@@ -426,7 +471,7 @@ export class CallFunction extends LogicItem {
         code += ')';
         const typeAnnotation = (this as any).typeAnnotation || this.__TypeAnnotation;
         const needGenInitFromSchema = typeAnnotation && (
-            !['primitive', 'union'].includes(typeAnnotation.typeKind) 
+            !['primitive', 'union'].includes(typeAnnotation.typeKind)
             || typeAnnotation.typeName === 'DateTime'
         );
         if (needGenInitFromSchema) {

package/src/concepts/CallInterface__.ts

@@ -554,8 +554,9 @@ export class CallInterface extends LogicItem {
             logicParam = node.params;
         }
         if (this.arguments?.length) {
-            this.arguments.forEach((arg, index) => {
-                const param = logicParam[index];
+            this.arguments.forEach((arg) => {
+                const idx = logicParam.findIndex((params) => arg.keyword === params.name);
+                const param = logicParam[idx];
 
                 arg.paramRequired = param?.required;
                 arg.paramTypeAnnotation = undefined;

package/src/concepts/CallLogic__.ts

@@ -6,6 +6,7 @@ import { ElementToVueOptions } from './ViewElement__';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 import { findConceptKeyWordIndexFromNamespace } from '../utils';
 import * as JSON5 from 'json5';
+import Identifier from './Identifier__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -21,7 +22,6 @@ import classMap from '../common/classMap';
 import TypeAnnotation from './TypeAnnotation__';
 import Argument from './Argument__';
 import LogicItem from './LogicItem__';
-import Identifier from './Identifier__';
 
 /**
  * 调用逻辑
@@ -70,6 +70,8 @@ export class CallLogic extends LogicItem {
     @property('Argument')
     arguments: Array<Argument> = [];
 
+
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -83,6 +85,13 @@ export class CallLogic extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallLogic;
     }
 
+    
+    
+
+    
+
+    
+
     /**
     * 插入类型标注
     * @internal
@@ -115,6 +124,8 @@ export class CallLogic extends LogicItem {
         return typeAnnotation;
     }
 
+
+
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -137,6 +148,8 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
+
+
     /**
      * 添加类型标注
      * @internal
@@ -156,6 +169,8 @@ export class CallLogic extends LogicItem {
         return this._insertTypeAnnotationAt(options as any, index);
     }
 
+
+
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -179,6 +194,11 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
+
+
+
+
+
     /**
     * 插入实际参数
     * @internal
@@ -211,6 +231,8 @@ export class CallLogic extends LogicItem {
         return argument;
     }
 
+
+
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -233,6 +255,8 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
+
+
     /**
      * 添加实际参数
      * @internal
@@ -252,6 +276,8 @@ export class CallLogic extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
+
+
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -275,6 +301,9 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
+
+
+
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -282,7 +311,7 @@ export class CallLogic extends LogicItem {
     removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotation(options: TypeAnnotation) {
-        const typeAnnotation: TypeAnnotation = options;
+        let typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
@@ -309,6 +338,8 @@ export class CallLogic extends LogicItem {
         return params;
     }
 
+
+
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -316,7 +347,7 @@ export class CallLogic extends LogicItem {
     removeArgument(argument: Argument): void;
 
     removeArgument(options: Argument) {
-        const argument: Argument = options;
+        let argument: Argument = options;
         return argument.delete();
     }
 
@@ -564,86 +595,72 @@ export class CallLogic extends LogicItem {
     toUI(state?: TranslatorState): string {
         let code = this.calleeName;
         code += '(';
-        const completeArguments = this.completeArguments;
-        completeArguments.forEach((arg, index) => {
-            code += arg?.toUI();
-            if (index !== completeArguments.length - 1)
-                code += ', ';
-        });
+
+        const node = this.getCallNode();
+        let logicParam: Param[] = [];
+        if (node) {
+            logicParam = node.params;
+        }
+        if (this.arguments?.length) {
+            this.arguments.forEach((arg, index) => {
+                const param = logicParam[index] || ({} as any);
+                // 打开了必填，
+                // 或者遗留问题，没有required = undefined 而且没有defaultValue，就是之前的必填项
+                const paramRequired = Boolean(param.required || (param.required === undefined && !param.defaultValue));
+                // 取到是不是必填放入参数中
+                if (param && !arg.expression && !paramRequired) {
+                    // 非必填时 才会有默认值
+                    code += param.defaultValue;
+                } else {
+                    code += arg?.toUI();
+                }
+                if (index !== this.arguments?.length - 1)
+                    code += ', ';
+            });
+        }
         code += ')';
 
         return code;
     }
 
-    toJS(state?: TranslatorState): string {
-        let code = '';
-        if (this.calleeName === 'deleteBy' || this.calleeName === 'updateBy') {
-            code += `
-var __resolveData = __resolveData || ((root) => {
-    if (!root)
-        return
-    // console.log(root.concept)
-    delete root.folded
-
-    if (root.concept === 'NumericLiteral') {
-        root.value = root.value
-    } else if (root.concept === "StringLiteral") {
-        root.value = root.value
-    } else if (root.concept === "NullLiteral") {
-        delete root.value
-    } else if (root.concept === "BooleanLiteral") {
-        root.value = root.value === 'true'
-    } else if (root.concept === "Identifier") {
-        __parseType(root, 'expression')
-    } else if (root.concept === "MemberExpression") {
-        if (root.expression) {
-            __parseType(root, 'expression')
-
+    // 是否属于页面逻辑
+    get isViewLogic() {
+        // 页面逻辑
+        let flag = true;
+        const calleeNamespace = this.calleeNamespace;
+        // calleeNamespace不存在，一定是页面逻辑
+        if (calleeNamespace) {
+            const namespaceArr = calleeNamespace.split('.');
+            const start = namespaceArr[0];
+            if (start === 'app' || start === 'extensions') {
+                const keywordViewsIndex = findConceptKeyWordIndexFromNamespace(this.calleeNamespace, 'views');
+                if (keywordViewsIndex === -1) {
+                    flag = false;
+                }
+            }
         }
+        return flag;
     }
 
-    __resolveData(root.left)
-    __resolveData(root.right)
-    return root
-})
-
-var __parseType = __parseType || ((root, prop) => {
-    const value = eval(root[prop])
-    const type = typeof value
-    // console.log('type:', type, value)
-    if (type === 'number') {
-        root.concept = 'NumericLiteral'
-        root.value = value + ''
-    } else if (type === 'string') {
-        root.concept = 'StringLiteral'
-        root.value = value
-    } else if (type === 'boolean') {
-        root.concept = 'BooleanLiteral'
-        root.value = value
-    } else if (type === 'object') {
-        if (Array.isArray(value)) {
-            var itemValue = value[0]
-            if(itemValue !== undefined) {
-                var itemType = typeof itemValue
-                root.concept = 'ListLiteral'
-                if (itemType === 'number') {
-                    root.value = value.map(v => v + '').join(',')
-                } else if (itemType === 'string') {
-                    root.value = value.map(v => "'" + v + "'").join(',')
-                } else if (itemType === 'boolean') {
-                    root.value = value.join(',')
-                }
+    // 是否属于组件逻辑
+    get isComponentLogic() {
+        // 组件逻辑
+        let flag = false;
+        const calleeNamespace = this.calleeNamespace;
+        // calleeNamespace不存在，一定是页面逻辑
+        if (calleeNamespace) {
+            const namespaceArr = calleeNamespace.split('.');
+            const start = namespaceArr[0];
+            if (start === 'elements' && namespaceArr.length === 3 && namespaceArr[2] === 'logics') {
+                flag = true;
             }
         }
+        return flag;
     }
-})
-`;
-        }
-        code += 'await ';
-        // 页面逻辑
-        let isViewLogic = true;
-        // 组件逻辑
-        let isComponentLogic = false;
+
+    toJS(state?: TranslatorState): string {
+        let code = '';
+        code += 'await (';
         let componentName = '';
         const calleeNamespace = this.calleeNamespace;
         const keywordProcessIndex = findConceptKeyWordIndexFromNamespace(this.calleeNamespace, 'processes');
@@ -651,22 +668,13 @@ var __parseType = __parseType || ((root, prop) => {
         // calleeNamespace不存在，一定是页面逻辑
         if (calleeNamespace) {
             const namespaceArr = calleeNamespace.split('.');
-            const start = namespaceArr[0];
-            if (start === 'app' || start === 'extensions') {
-                const keywordViewsIndex = findConceptKeyWordIndexFromNamespace(this.calleeNamespace, 'views');
-                if (keywordViewsIndex === -1) {
-                    isViewLogic = false;
-                }
-            } else if (start === 'elements' && namespaceArr.length === 3 && namespaceArr[2] === 'logics') {
-                isComponentLogic = true;
+            if (this.isComponentLogic) {
                 componentName = namespaceArr[1];
             }
         }
-
         const completeArguments = this.completeArguments;
-
         // 全局逻辑
-        if (!isViewLogic) {
+        if (!this.isViewLogic) {
             const logic = getNodeByNodeCallee(this.app, this.calleewholeKey, (key: string, tempPoint: any) => {
                 // 处理 NASL 中未定义的假的节点
                 if (key === tempPoint.name) {
@@ -759,7 +767,7 @@ var __parseType = __parseType || ((root, prop) => {
                                     return `${name}: {
                                         concept: 'Function',
                                         name: 'filter',
-                                        returnExpression: __resolveData(${argsStr})
+                                        returnExpression: this.$resolveRequestData(${argsStr}, __eventArg, __currentArg)
                                     }`;
                                 } else {
                                     return `${name}: ${arg.expression.toJS(shiftState(state, code))}`;
@@ -778,7 +786,7 @@ var __parseType = __parseType || ((root, prop) => {
                         code += `{
                             concept: 'Function',
                             name: 'filter',
-                            returnExpression: __resolveData(${argsStr})
+                            returnExpression: this.$resolveRequestData(${argsStr}, __eventArg, __currentArg)
                         }`;
                         code += `,\n`;
                         logicArgs = [];
@@ -817,8 +825,9 @@ var __parseType = __parseType || ((root, prop) => {
             }
             code += '\n})';
         } else {
-            if (isComponentLogic) {
-                code += `this.$refs.${componentName}.${this.calleeName}`;
+            if (this.isComponentLogic) {
+                // 组件ref元素的对象没有qu dao的容错
+                code += `this.$refs && this.$refs.${componentName} && this.$refs.${componentName}.${this.calleeName} && this.$refs.${componentName}.${this.calleeName}`;
             } else if (calleeNamespace === 'nasl.ui' || calleeNamespace === 'nasl.util') {
                 switch (this.calleeName) {
                     case 'showMessage':
@@ -912,7 +921,12 @@ var __parseType = __parseType || ((root, prop) => {
                 };
             }
 
-            const left = handleMember(root.left);
+            let left;
+            if (root.concept === 'UnaryExpression') {
+                left = handleMember(root.argument);
+            } else {
+                left = handleMember(root.left);
+            }
             const right = handleMember(root.right);
             return {
                 concept: root.concept,
@@ -932,6 +946,7 @@ var __parseType = __parseType || ((root, prop) => {
         if (needGenInitFromSchema) {
             code = `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', ${code})`;
         }
+        code += ')';
         return code;
     }
 
@@ -948,13 +963,14 @@ var __parseType = __parseType || ((root, prop) => {
             code += `<`;
             code += `${typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>`;
         }
-
+        // 参数必填
+        const paramRequired = ['showMessage', 'consoleLog'].includes(this.calleeName);
         const tsCalleeNamespace = this.tsCalleeNamespace;
         if ((tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) || tsCalleeNamespace.startsWith('nasl.')) {
             code += '(';
             this.arguments.forEach((arg, index) => {
                 // 页面逻辑先都非必填
-                code += arg.toEmbeddedTS(shiftState(state, code), false);
+                code += arg.toEmbeddedTS(shiftState(state, code), paramRequired);
                 if (index !== this.arguments.length - 1)
                     code += ', ';
             });
@@ -1072,6 +1088,10 @@ var __parseType = __parseType || ((root, prop) => {
         }
         return Arguments;
     }
+
+    static isSystem(node: CallLogic) {
+        return ['nasl.process', 'nasl.browser', 'nasl.auth', 'nasl.configuration', 'nasl.io'].includes(node?.calleeNamespace);
+    }
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/CallQueryComponent__.ts

@@ -1150,7 +1150,15 @@ export class CallQueryComponent extends LogicItem {
                 if (['COUNT', 'COUNTD'].includes(item.aggregateName)) {
                     typeName = 'Integer';
                 } else if (['AVG'].includes(item.aggregateName)) {
-                    typeName = 'Double';
+                    const { entityAsName, propertyName } = item.aggregateParam;
+                    const entity = entities.find((item: Entity) => item.name === entityAsName);
+                    const property = entity?.properties.find((item: any) => item.name === propertyName);
+                    const propertyTypeName = property?.typeAnnotation?.typeName;
+                    if (propertyTypeName === 'Decimal') {
+                        typeName = 'Decimal';
+                    } else {
+                        typeName = 'Double';
+                    }
                 } else {
                     const { entityAsName, propertyName } = item.aggregateParam;
                     const entity = entities.find((item: Entity) => item.name === entityAsName);
@@ -1322,8 +1330,15 @@ export class CallQueryComponent extends LogicItem {
                         // 2.1.1. `COUNT`、`COUNTD` 返回 `Integer`
                         typeName = 'Integer';
                     } else if (['AVG'].includes(selectElements[0].aggregateName)) {
-                        // 2.1.2. `AVG` 返回 `Double`
-                        typeName = 'Double';
+                        const { entityAsName, propertyName } = selectElements[0].aggregateParam;
+                        const entity = entities.find((item: Entity) => item.name === entityAsName);
+                        const property = entity?.properties.find((item: any) => item.name === propertyName);
+                        const propertyTypeName = property?.typeAnnotation?.typeName;
+                        if (propertyTypeName === 'Decimal') {
+                            typeName = 'Decimal';
+                        } else {
+                            typeName = 'Double';
+                        }
                     } else {
                         // 2.1.3. 其他返回列类型，包含：`Integer`、`Long`、`Double`
                         const { entityAsName, propertyName } = selectElements[0].aggregateParam;

package/src/concepts/ConfigGroup__.ts

@@ -11,6 +11,8 @@ import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import ConfigProperty from './ConfigProperty__';
 import App from './App__';
+import Namespace from './Namespace__';
+import Configuration from './Configuration__';
 
 /**
  * 配置组
@@ -79,7 +81,7 @@ export class ConfigGroup extends BaseNode {
         });
     }
 
-        getConfigPropertyExistingNames(excludedList: Array<ConfigProperty> = []) {
+    getConfigPropertyExistingNames(excludedList: Array<ConfigProperty> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.properties as ConfigProperty[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -220,9 +222,6 @@ export class ConfigGroup extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除配置属性
     * @param name 配置属性名称
@@ -278,6 +277,20 @@ export class ConfigGroup extends BaseNode {
     getProperty(name = '') {
         return this.properties.find((item) => item.name === name);
     }
+
+    getNamespace() {
+        if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
+            const parentNamespace = (this.parentNode as Namespace).getNamespace();
+            const parentName = this.parentNode.name;
+            const arr = [parentNamespace];
+            if (this.parentNode.concept !== 'App' && parentName) {
+                arr.push(parentName);
+            }
+            return `${arr.join('.')}.groups`;
+        } else
+            throw new Error('无法获取命名空间，请设置 parentNode！');
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓