@lcap/nasl 2.18.0 → 2.20.0-beta.2

package/src/concepts/Destination__.ts

@@ -66,8 +66,6 @@ export class Destination extends LogicItem {
     @property()
     target: string = '_self';
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -81,7 +79,6 @@ export class Destination extends LogicItem {
         return super.from(source, parentNode, parentKey) as Destination;
     }
 
-    
     /**
      * 设置viewNamespace
      */
@@ -133,10 +130,6 @@ export class Destination extends LogicItem {
         });
     }
 
-    
-
-    
-
     /**
     * 插入实际参数
     * @internal
@@ -169,8 +162,6 @@ export class Destination extends LogicItem {
         return argument;
     }
 
-    
-
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -193,8 +184,6 @@ export class Destination extends LogicItem {
         return node;
     }
 
-    
-
     /**
      * 添加实际参数
      * @internal
@@ -214,8 +203,6 @@ export class Destination extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
-    
-
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -239,9 +226,6 @@ export class Destination extends LogicItem {
         return node;
     }
 
-
-    
-
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -249,12 +233,10 @@ export class Destination extends LogicItem {
     removeArgumentInArguments(argument: Argument): void;
 
     removeArgumentInArguments(options: Argument) {
-        let argument: Argument = options;
+        const argument: Argument = options;
         return argument.delete();
     }
 
-    
-
     /**
     * 删除锚点参数
     * @param name 锚点参数名称
@@ -339,6 +321,8 @@ export class Destination extends LogicItem {
         if (this.viewName) {
             viewArr.push(this.viewName);
         }
+        // 第一个是端名，需要去掉
+        viewArr.shift();
         return viewArr;
     }
 
@@ -350,10 +334,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 +374,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 +393,7 @@ export class Destination extends LogicItem {
                         argStr += '}';
                     }
                     return argStr;
-                });
+                }).filter((arg) => !!arg);
                 url += `?${args.join('&')}`;
             }
             if (this.anchor) {
@@ -419,10 +415,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 +483,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
@@ -524,6 +561,9 @@ export class Destination extends LogicItem {
                 }
             });
         }
+        if (this.viewNode) {
+            return `${this.viewNode.frontend.basePath}/${viewNameAttr.join('/')}`;
+        }
         return `/${viewNameAttr.join('/')}`;
     }
     @withSourceMap()
@@ -554,13 +594,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 +625,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;
                     });
                 }
 
@@ -589,11 +646,11 @@ export class Destination extends LogicItem {
     }
 
     toBrief(): string {
-        let q = [];
+        const q = [];
         if (this.anchor?.expression) {
             q.push(this.anchor.toBrief());
         }
-        return this.arguments.map(a => a.toBrief()).concat(q).join('<br />')
+        return this.arguments.map((a) => a.toBrief()).concat(q).join('<br />');
     }
 
     @withSourceMap()