@lcap/nasl 2.18.0-beta.5 → 2.18.0-beta.7

package/src/concepts/BatchAssignment__.ts

@@ -572,63 +572,79 @@ export class BatchAssignment extends LogicItem {
             if (preCompleteName.includes(completeName) && completeName.split('.').length !== preCompleteName.split('.').length)
                 leftLineSet.add(i);
         }
-
-        await new Promise((resolve) => setTimeout(resolve, 400));
-        this.app.emit('collect:start', {
-            actionMsg: '自动连线',
-        });
-        this.left.members.forEach((member: any, leftSecondIndex: number) => {
-            const leftValue = member.getValue();
-            const leftName = member.property.name;
-            const leftTypeAnnotation = member.__TypeAnnotation;
-            if (leftLineSet.has(leftSecondIndex) || leftLineSet.has(leftName))
-                return;
-
-            this.rights.forEach((selectMember, rightFirstIndex) => {
-                const { members, expression } = selectMember;
-                if (leftLineSet.has(leftSecondIndex))
-                    return;
-                if (addRightIndex !== -1 && addRightIndex !== rightFirstIndex)
-                    return;
-                // 右侧父节点也不允许自动连线
-                const rightLineSet = new Set();
-                for (let i = 0; i < members.length - 1; i++) {
-                    const completeName = members[i].completeName;
-                    const preCompleteName = members[i + 1].completeName;
-                    if (preCompleteName.includes(completeName) && completeName.split('.').length !== preCompleteName.split('.').length)
-                        rightLineSet.add(i);
-                }
-
-                if (leftName === expression.name && expression.__TypeAnnotation.typeKind === leftTypeAnnotation.typeKind) {
-                    const Line: AssignmentLine = new AssignmentLine({
-                        leftIndex: [0, leftSecondIndex],
-                        rightIndex: [rightFirstIndex],
-                    });
-                    lineArr.push(Line);
-                    leftLineSet.add(leftSecondIndex);
+        // await new Promise((resolve) => setTimeout(resolve, 400));
+        const autoConnection = () => {
+            this.app.emit('collect:start', {
+                actionMsg: '自动连线',
+            });
+            this.left.members.forEach((member: any, leftSecondIndex: number) => {
+                const leftValue = member.getValue();
+                const leftName = member.property.name;
+                const leftTypeAnnotation = member.__TypeAnnotation;
+                if (leftLineSet.has(leftSecondIndex) || leftLineSet.has(leftName))
                     return;
-                }
-                members.forEach((rightMember: any, rightSecondIndex: number) => {
-                    const rightValue = rightMember.getValue();
-                    const rightName = rightMember.property.name;
-                    if (rightLineSet.has(rightSecondIndex))
+    
+                this.rights.forEach((selectMember, rightFirstIndex) => {
+                    const { members, expression } = selectMember;
+                    if (leftLineSet.has(leftSecondIndex))
                         return;
-
-                    if (leftName === rightName && leftValue.split('.').length === rightValue.split('.').length) {
-                        const rightTypeAnnotation = rightMember.__TypeAnnotation;
-                        if (leftTypeAnnotation.typeKind !== rightTypeAnnotation.typeKind)
-                            return;
-                        const leftIndex = [0, leftSecondIndex];
-                        const rightIndex = [rightFirstIndex, rightSecondIndex];
-                        const Line: AssignmentLine = new AssignmentLine({ leftIndex, rightIndex });
+                    if (addRightIndex !== -1 && addRightIndex !== rightFirstIndex)
+                        return;
+                    // 右侧父节点也不允许自动连线
+                    const rightLineSet = new Set();
+                    for (let i = 0; i < members.length - 1; i++) {
+                        const completeName = members[i].completeName;
+                        const preCompleteName = members[i + 1].completeName;
+                        if (preCompleteName.includes(completeName) && completeName.split('.').length !== preCompleteName.split('.').length)
+                            rightLineSet.add(i);
+                    }
+    
+                    if (leftName === expression.name && expression.__TypeAnnotation.typeKind === leftTypeAnnotation.typeKind) {
+                        const Line: AssignmentLine = new AssignmentLine({
+                            leftIndex: [0, leftSecondIndex],
+                            rightIndex: [rightFirstIndex],
+                        });
                         lineArr.push(Line);
                         leftLineSet.add(leftSecondIndex);
+                        return;
                     }
+                    members.forEach((rightMember: any, rightSecondIndex: number) => {
+                        const rightValue = rightMember.getValue();
+                        const rightName = rightMember.property.name;
+                        if (rightLineSet.has(rightSecondIndex))
+                            return;
+    
+                        if (leftName === rightName && leftValue.split('.').length === rightValue.split('.').length) {
+                            const rightTypeAnnotation = rightMember.__TypeAnnotation;
+                            if (leftTypeAnnotation.typeKind !== rightTypeAnnotation.typeKind)
+                                return;
+                            const leftIndex = [0, leftSecondIndex];
+                            const rightIndex = [rightFirstIndex, rightSecondIndex];
+                            const Line: AssignmentLine = new AssignmentLine({ leftIndex, rightIndex });
+                            lineArr.push(Line);
+                            leftLineSet.add(leftSecondIndex);
+                        }
+                    });
                 });
             });
-        });
-        lineArr.length && this.setAssignmentLines([...this.assignmentLines, ...lineArr]);
-        this.app.emit('collect:end');
+            lineArr.length && this.setAssignmentLines([...this.assignmentLines, ...lineArr]);
+            this.app.emit('collect:end');
+        };
+
+        let count = 0;
+        const typeAnnotationEnd = () => {
+            const l = this.left.members.every((item) => item.__isCorrectTypeAnnotation);
+            const r = this.rights.every((right) => right.members.every((item) => item.__isCorrectTypeAnnotation));
+            count++;
+            if (l && r) {
+                autoConnection();
+            } else if (count <= 10) {
+                setTimeout(() => {
+                    typeAnnotationEnd();
+                }, 100);
+            }
+        };
+        typeAnnotationEnd();
     }
 
     connection(leftItem: LogicItem | SelectMembers, rightItem: LogicItem | SelectMembers, rightToLeft: boolean) {

package/src/concepts/CallLogic__.ts

@@ -513,21 +513,15 @@ export class CallLogic extends LogicItem {
         }
     }
 
-    setCalleeArgName(logic: Logic) {
-        /**
-         * a: logic.params b: this.arguments
-         * a 长度 和 b长度相等就一起加一起删
-         * 等重新建立连接后
-         * 2.b大于a时后面的几项就是要被删除的
-         * 3.重命名时候按照下标进行重命名
-         * 4.b大于a时，a添加的时候，b的name要改，但是内容不改
-         */
+    addCalleeArg(logic: Logic) {
         const newArgs = this.arguments.map((argument) =>
             Argument.from({
                 ...argument,
             }, this));
         const relationOptions = { parentNode: this, parentKey: 'arguments' };
-        // logic在增加参数的时候走到这里
+        /**
+         * 当前两个参数对应上，添加的时候，logic会比参数位内容多，就添加一个 argment
+         */
         if (logic.params.length >= newArgs.length) {
             logic.params.forEach((param: Param, index: number) => {
                 const arg = newArgs[index];
@@ -542,6 +536,9 @@ export class CallLogic extends LogicItem {
                 }
             });
         } else {
+            /**
+             * 当前calllogic上数量比logic参数还多，他就需要找一个arg使他变成可用的参数
+             */
             newArgs.forEach((arg: Argument, index: number) => {
                 const param = logic.params[index];
                 if (param) {
@@ -554,6 +551,24 @@ export class CallLogic extends LogicItem {
         });
     }
 
+    deleteCalleeArg(argIndex: number) {
+        /**
+         * 传递过下标来，然后直接移动到最后结束
+         * 如果原来就是最后一个位置就不移动了
+         */
+        if (typeof argIndex === 'number') {
+            if (!this.arguments[argIndex]?.expression) {
+                // 如果本身没有值就直接删除
+                return this.arguments[argIndex].delete();
+            }
+            if (argIndex !== this.arguments.length - 1) {
+                this.arguments[argIndex]?.moveNode({
+                    sourceNode: this.arguments[this.arguments.length - 1],
+                    position: 'insertAfter',
+                });
+            }
+        }
+    }
     toVue(options?: ElementToVueOptions): string {
         let code = '';
         if (this.calleeNamespace === 'nasl.browser' || this.calleeNamespace === 'nasl.auth' || this.calleeNamespace === 'nasl.configuration' || this.calleeNamespace === 'nasl.process') {
@@ -949,7 +964,7 @@ var __parseType = __parseType || ((root, prop) => {
                     // 取到是不是必填放入参数中
                     code += arg.toEmbeddedTS(shiftState(state, code), arg?.paramRequired);
                     if (index !== this.arguments.length - 1)
-                        code += ', \n';
+                        code += ', ';
                 });
                 code += ')';
                 if (this.parentNode.concept !== 'Argument'

package/src/concepts/Destination__.ts

@@ -350,10 +350,16 @@ export class Destination extends LogicItem {
             url += `/${viewArr.join('/')}`;
             const completeArguments = this.completeArguments;
             if (completeArguments.length) {
-                const args = completeArguments.map((arg) => {
+                const node = this.viewNode;
+                let logicParam: Param[] = [];
+                if (node) {
+                    logicParam = node.params;
+                }
+                const logicParamLength = logicParam.length;
+                const args = completeArguments.map((arg, index) => {
                     const value = arg?.toVue();
                     let argStr = '';
-                    if (value) {
+                    if (value && index < logicParamLength) {
                         argStr += `${arg.keyword}=` + '${';
                         if (value === 'undefined') {
                             argStr += `null`;
@@ -384,10 +390,16 @@ export class Destination extends LogicItem {
             url += `/${viewArr.join('/')}`;
             const completeArguments = this.completeArguments;
             if (completeArguments.length) {
-                const args = completeArguments.map((arg) => {
+                const node = this.viewNode;
+                let logicParam: Param[] = [];
+                if (node) {
+                    logicParam = node.params;
+                }
+                const logicParamLength = logicParam.length;
+                const args = completeArguments.map((arg, index) => {
                     const value = arg?.toUI();
                     let argStr = '';
-                    if (value) {
+                    if (value && index < logicParamLength) {
                         argStr += `${arg.keyword}=` + '${';
                         if (value === 'undefined') {
                             argStr += 'null';
@@ -397,7 +409,7 @@ export class Destination extends LogicItem {
                         argStr += '}';
                     }
                     return argStr;
-                });
+                }).filter((arg) => !!arg);
                 url += `?${args.join('&')}`;
             }
             if (this.anchor) {
@@ -419,10 +431,16 @@ export class Destination extends LogicItem {
             const completeArguments = this.completeArguments;
 
             if (completeArguments.length) {
-                const args = completeArguments.map((arg) => {
+                const node = this.viewNode;
+                let logicParam: Param[] = [];
+                if (node) {
+                    logicParam = node.params;
+                }
+                const logicParamLength = logicParam.length;
+                const args = completeArguments.map((arg, index) => {
                     const value = arg?.toJS();
                     let argStr = '';
-                    if (value) {
+                    if (value && index < logicParamLength) {
                         argStr += `${arg.keyword}=` + '${';
                         if (value === 'undefined') {
                             argStr += 'null';
@@ -481,26 +499,61 @@ export class Destination extends LogicItem {
     /**
      * 设置view的argument
      */
-    setViewArgument(view: View) {
-        const params = view.params;
-        const argument = this.arguments;
-        if (params.length > argument.length) {
-            params.forEach((item) => {
-                const arg = argument.find((arg) => arg.keyword === item.name);
+    addCalleeArg(view: View) {
+        const newArgs = this.arguments.map((argument) =>
+            Argument.from({
+                ...argument,
+            }, this));
+        const relationOptions = { parentNode: this, parentKey: 'arguments' };
+        /**
+         * 当前两个参数对应上，添加的时候，view会比参数位内容多，就添加一个 argment
+         */
+        if (view.params.length >= newArgs.length) {
+            view.params.forEach((param: Param, index: number) => {
+                const arg = newArgs[index];
                 if (!arg) {
-                    this.addArgument({
-                        keyword: item.name,
-                    });
+                    const newParam = Argument.from({
+                        keyword: param.name,
+                    }, this);
+                    Object.assign(newParam, relationOptions);
+                    newArgs.push(newParam);
+                } else {
+                    arg.keyword = param.name;
                 }
             });
         } else {
-            argument.forEach((item) => {
-                const param = params.find((param) => param.name === item.keyword);
-                if (!param) {
-                    item.delete();
+            /**
+             * 当前callview上数量比view参数还多，他就需要找一个arg使他变成可用的参数
+             */
+            newArgs.forEach((arg: Argument, index: number) => {
+                const param = view.params[index];
+                if (param) {
+                    arg.keyword = param.name;
                 }
             });
         }
+        this.update({
+            arguments: newArgs,
+        });
+    }
+
+    deleteCalleeArg(argIndex: number) {
+        /**
+         * 传递过下标来，然后直接移动到最后结束
+         * 如果原来就是最后一个位置就不移动了
+         */
+        if (typeof argIndex === 'number') {
+            if (!this.arguments[argIndex]?.expression) {
+                return this.arguments[argIndex].delete();
+            }
+            if (argIndex !== this.arguments.length - 1) {
+                // 如果本身没有值就直接删除
+                this.arguments[argIndex]?.moveNode({
+                    sourceNode: this.arguments[this.arguments.length - 1],
+                    position: 'insertAfter',
+                });
+            }
+        }
     }
     /**
      * 设置Arguments的KeyWord
@@ -554,13 +607,25 @@ export class Destination extends LogicItem {
     toEmbeddedTS(state?: TranslatorState): string {
         let code = '';
 
+        const node = this.viewNode;
+        let logicParam: Param[] = [];
+        if (node) {
+            logicParam = node.params;
+        }
+        const logicParamLength = logicParam.length;
+
         if (this.parentNode instanceof BindAttribute) {
             code += indent((state?.tabSize || 0) + 2);
             if (this.tsCalleeNamespace && this.tsName) {
                 code += `${this.tsCalleeNamespace}.${this.tsName}.$destination({`;
                 if (Array.isArray(this.arguments)) {
-                    this.arguments.forEach((argument: Argument) => {
+                    this.arguments.forEach((argument: Argument, index) => {
+                        const oldName = argument.keyword;
+                        if (index >= logicParamLength) {
+                            argument.keyword = '__unknown__';
+                        }
                         code += argument.toEmbeddedTS(shiftState(state, code), false, true) + ', ';
+                        argument.keyword = oldName;
                     });
                 }
 
@@ -573,8 +638,13 @@ export class Destination extends LogicItem {
             if (this.tsCalleeNamespace && this.tsName) {
                 code += `${this.tsCalleeNamespace}.${this.tsName}.$destination({`;
                 if (Array.isArray(this.arguments)) {
-                    this.arguments.forEach((argument: Argument) => {
+                    this.arguments.forEach((argument: Argument, index) => {
+                        const oldName = argument.keyword;
+                        if (index >= logicParamLength) {
+                            argument.keyword = '__unknown__';
+                        }
                         code += argument.toEmbeddedTS(shiftState(state, code), false, true) + ', ';
+                        argument.keyword = oldName;
                     });
                 }
 

package/src/concepts/Logic__.ts

@@ -1625,15 +1625,10 @@ export class Logic extends BaseNode {
             code += '(';
             this.params.forEach((param, index) => {
                 code += param.toEmbeddedTS(shiftState(state, code));
-                code += ',';
-            });
-            code += '\n,  __defaultValues?: { \n';
-            this.params.forEach((param, index) => {
-                code += `${param.name}: "${param.defaultValue || ''}"`;
                 if (index !== this.params.length - 1)
-                    code += ',\n';
+                    code += ', ';
             });
-            code += '})';
+            code += ')';
         } else {
             // 没有参数的
             code += '()';
@@ -1815,6 +1810,10 @@ export class Logic extends BaseNode {
                 return replaceCode;
 
             let fnCode = $1;
+            if ($1.startsWith(`${variable}.`))
+                fnCode = $1.replaceAll(`${variable}.`, `${replaceCode}.`);
+            if ($1.startsWith(`${variable},`))
+                fnCode = $1.replaceAll(`${variable},`, `${replaceCode},`);
             if ($1.includes(`(${variable},`))
                 fnCode = $1.replaceAll(`(${variable},`, `(${replaceCode},`);
             if ($1.includes(`(${variable}.`))

package/src/concepts/ViewElement__.ts

@@ -315,8 +315,6 @@ export class ViewElement extends BaseNode {
         super.subConstructor(source);
     }
 
-
-
     /**
      * 从父级删除该节点
      * @internal
@@ -365,7 +363,7 @@ export class ViewElement extends BaseNode {
         });
     }
 
-        getBindAttributeExistingNames(excludedList: Array<BindAttribute> = []) {
+    getBindAttributeExistingNames(excludedList: Array<BindAttribute> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindAttrs as BindAttribute[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -506,7 +504,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
     getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindEvents as BindEvent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -648,7 +645,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
     getBindDirectiveExistingNames(excludedList: Array<BindDirective> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindDirectives as BindDirective[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -790,9 +786,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
-
-
     getBindStyleExistingNames(excludedList: Array<BindStyle> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindStyles as BindStyle[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -934,9 +927,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
-
-
     /**
     * 插入页面元素
     * @internal
@@ -1070,9 +1060,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除元素绑定属性
     * @param name 元素绑定属性名称
@@ -1121,8 +1108,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -1171,8 +1156,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素指令
     * @param name 元素指令名称
@@ -1221,8 +1204,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素绑定样式
     * @param name 元素绑定样式名称
@@ -1271,8 +1252,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除页面元素
     * @param name 页面元素名称
@@ -1669,7 +1648,7 @@ export class ViewElement extends BaseNode {
                     expression: transAstNodeToNaslNode(Object.assign({}, argument)),
                 }));
             }
-        } catch (error) {}
+        } catch (error) { }
         return {
             concept: 'ValidationRule',
             name: '',
@@ -1766,7 +1745,7 @@ export class ViewElement extends BaseNode {
                         }
                         attr = new BindAttribute(source);
                     } catch (e) {
-                        const expression = <any> this._parseExpression(oldAttr.value);
+                        const expression = <any>this._parseExpression(oldAttr.value);
                         attr = new BindAttribute({
                             type: 'dynamic',
                             name: oldAttr.name,
@@ -1823,7 +1802,7 @@ export class ViewElement extends BaseNode {
                     if (directive.name === 'model') {
                         const valueAttr = astNode.attrs && astNode.attrs.find((attr) => attr.name === 'value');
                         if (!valueAttr) {
-                            const expression = <any> this._parseExpression(directive.value);
+                            const expression = <any>this._parseExpression(directive.value);
                             element.addBindAttribute(new BindAttribute({
                                 type: 'dynamic',
                                 name: 'value',
@@ -1833,7 +1812,7 @@ export class ViewElement extends BaseNode {
                             }));
                         }
                     } else {
-                        const expression = <any> this._parseExpression(directive.value);
+                        const expression = <any>this._parseExpression(directive.value);
                         element.addBindDirective(new BindDirective({
                             type: expression ? 'string' : 'dynamic',
                             name: directive.name,
@@ -1852,7 +1831,7 @@ export class ViewElement extends BaseNode {
                     name: 'if',
                     rawName: 'v-if',
                     value: '',
-                    expression: <any> this._parseExpression(astNode.if),
+                    expression: <any>this._parseExpression(astNode.if),
                 }));
             }
         } else if (astNode.type === 2) {
@@ -1863,7 +1842,7 @@ export class ViewElement extends BaseNode {
                 name: view.getViewElementUniqueName(`${baseName}1`),
             });
             const value = astNode.text?.match(/{{(.*?)}}/)[1].trim();
-            const expression = <any> this._parseExpression(value);
+            const expression = <any>this._parseExpression(value);
             element.addBindAttribute(new BindAttribute({
                 type: 'dynamic',
                 name: 'text',
@@ -1925,7 +1904,7 @@ export class ViewElement extends BaseNode {
             finalCode: false,
             nodePathAttr: true,
             attrFormat: (attr: BindAttribute | BindEvent | BindDirective, element?: ViewElement, defaultResult?: string) => {
-                if (attr.concept === 'BindAttribute') {
+                if (attr.concept === 'BindAttribute' && !['href', 'destination', 'externalDestination', 'download'].includes(attr.name)) {
                     const api = config.allNodesAPI[element.tag];
                     const apiOfAttr = api && api.attrs && api.attrs.find((_attr) => _attr.name === attr.name);
                     if (['u-form-item', 'u-validator', 'van-field'].includes(element.tag) && attr.name === 'rules') {

package/src/concepts/View__.ts

@@ -2153,6 +2153,10 @@ export class View extends BaseNode {
                 return replaceCode;
 
             let fnCode = $1;
+            if ($1.startsWith(`${variable}.`))
+                fnCode = $1.replaceAll(`${variable}.`, `${replaceCode}.`);
+            if ($1.startsWith(`${variable},`))
+                fnCode = $1.replaceAll(`${variable},`, `${replaceCode},`);
             if ($1.includes(`(${variable},`))
                 fnCode = $1.replaceAll(`(${variable},`, `(${replaceCode},`);
             if ($1.includes(`(${variable}.`))