@lcap/nasl 2.18.0-beta.7 → 2.20.0-beta.1

package/src/concepts/BatchAssignment__.ts

@@ -731,7 +731,7 @@ export class BatchAssignment extends LogicItem {
     }
 
     deleteAssignmentLine(assignmentLine: AssignmentLine) {
-        const newLine = this.assignmentLines.filter((line) => line === assignmentLine);
+        const newLine = this.assignmentLines.filter((line) => line !== assignmentLine);
         this.update({
             assignmentLines: newLine,
         });
@@ -769,6 +769,50 @@ export class BatchAssignment extends LogicItem {
         }
     }
 
+    changeMembers(oldNode:any, members: MemberExpression[], keepMembers: any, expression: LogicItem) {
+        this.app.emit('collect:start', {
+            actionMsg: '批量赋值修改变量',
+        });
+        const selectMember = oldNode.parentNode;
+        const autoConnectionIndex = this.rights.findIndex((right) => right === selectMember);
+        const newSelectMember = Object.assign({}, selectMember, { expression, members });
+        let newLines: any = [];
+        // 修改连线
+        if (selectMember.parentKey === 'left') {
+            members.forEach((item: any, index: any) => {
+                if (keepMembers.has(item.completeName)) {
+                    const lines = this.findlines(item, selectMember);
+                    lines.forEach((line) => {
+                        const newLine = Object.assign({}, line, { leftIndex: [line.leftIndex[0], index] });
+                        newLines.push(newLine);
+                    });
+                }
+            });
+            this.update({
+                assignmentLines: newLines,
+                left: newSelectMember,
+            });
+        } else {
+            const splitIndex = this.rights.findIndex((right) => selectMember === right);
+            newLines = this.assignmentLines.filter(({ rightIndex }) => rightIndex[0] !== splitIndex);
+            members.forEach((item, index) => {
+                if (keepMembers.has(item.completeName)) {
+                    const lines = this.findlines(item, selectMember);
+                    lines.forEach((line) => {
+                        const newLine = Object.assign({}, line, { rightIndex: [line.rightIndex[0], index] });
+                        newLines.push(newLine);
+                    });
+                }
+            });
+            this.update({
+                assignmentLines: newLines,
+                rights: [...this.rights.slice(0, splitIndex), newSelectMember, ...this.rights.slice(splitIndex + 1, this.rights.length)],
+            });
+        }
+        this.autoConnection && this.batchAutoConnection(autoConnectionIndex);
+        this.app.emit('collect:end');
+    }
+
     findMember(arrIndex: Array<number>, place: string) {
         const [firstIndex, secondIndex] = [arrIndex[0], arrIndex[1]];
         if (place === 'left') {

package/src/concepts/BindAttribute__.ts

@@ -22,6 +22,7 @@ import ProcessElement from './ProcessElement__';
 import View from './View__';
 import Module from './Module__';
 import App from './App__';
+import Frontend from './Frontend__';
 import Process from './Process__';
 
 /**
@@ -125,6 +126,12 @@ export class BindAttribute extends BaseNode {
     get app() {
         return this.getAncestor('App') as App;
     }
+    /**
+     * 祖先 Frontend
+     */
+    get frontend() {
+        return this.getAncestor('Frontend') as Frontend;
+    }
     /**
      * 祖先 ProcessElement
      */
@@ -246,7 +253,7 @@ export class BindAttribute extends BaseNode {
         });
     }
 
-        getValidationRuleExistingNames(excludedList: Array<ValidationRule> = []) {
+    getValidationRuleExistingNames(excludedList: Array<ValidationRule> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.rules as ValidationRule[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -387,8 +394,6 @@ export class BindAttribute extends BaseNode {
         return node;
     }
 
-    
-
     /**
     * 插入逻辑项
     * @internal
@@ -421,8 +426,6 @@ export class BindAttribute extends BaseNode {
         return logicItem;
     }
 
-    
-
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -445,8 +448,6 @@ export class BindAttribute extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加逻辑项
      * @internal
@@ -466,8 +467,6 @@ export class BindAttribute extends BaseNode {
         return this._insertItemInPlaygroundAt(options as any, index);
     }
 
-    
-
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -491,9 +490,6 @@ export class BindAttribute extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除逻辑项
     * @param name 逻辑项名称
@@ -519,8 +515,6 @@ export class BindAttribute extends BaseNode {
         return expression.delete();
     }
 
-    
-
     /**
     * 删除跳转页面
     * @param name 跳转页面名称
@@ -546,8 +540,6 @@ export class BindAttribute extends BaseNode {
         return destination.delete();
     }
 
-    
-
     /**
     * 删除外部链接
     * @param name 外部链接名称
@@ -573,8 +565,6 @@ export class BindAttribute extends BaseNode {
         return externalDestination.delete();
     }
 
-    
-
     /**
     * 删除验证规则
     * @param name 验证规则名称
@@ -600,8 +590,6 @@ export class BindAttribute extends BaseNode {
         return validationRule.delete();
     }
 
-    
-
     /**
     * 删除经办人
     * @param name 经办人名称
@@ -627,8 +615,6 @@ export class BindAttribute extends BaseNode {
         return assignee.delete();
     }
 
-    
-
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -636,7 +622,7 @@ export class BindAttribute extends BaseNode {
     removeItemInPlayground(logicItem: LogicItem): void;
 
     removeItemInPlayground(options: LogicItem) {
-        let logicItem: LogicItem = options;
+        const logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
@@ -723,13 +709,20 @@ export class BindAttribute extends BaseNode {
                     str += 'download="true" ';
                     name = 'href';
                 }
+                // 文本默认要经过toString转换
+                if (options.finalCode !== false && name === 'text' && !this.sync && this.type === 'dynamic') {
+                    const expTypeAnnotation = (this.expression as any)?.typeAnnotation || this.expression?.__TypeAnnotation;
+                    value = `$utils['ToString'](${value}, '${expTypeAnnotation?.sortedTypeKey}')`;
+                }
                 if (this.type === 'string') {
                     str += `${name}="${value}"`;
                 } else {
                     str += `:${name}${this.sync ? '.sync' : ''}="${value}"`;
                 }
-            } else if(this.type === 'string' && this.value === '')
-                str = `${name}="${this.value}"`;
+            } else if (this.type === 'string' && this.value === '')
+                if (!['destination', 'externalDestination'].includes(this.name)) {
+                    str = `${name}="${this.value}"`;
+                }
 
             return str;
         }

package/src/concepts/BindDirective__.ts

@@ -16,6 +16,7 @@ import ViewElement from './ViewElement__';
 import View from './View__';
 import Module from './Module__';
 import App from './App__';
+import Frontend from './Frontend__';
 
 /**
  * 元素指令
@@ -100,6 +101,12 @@ export class BindDirective extends BaseNode {
     get app() {
         return this.getAncestor('App') as App;
     }
+    /**
+     * 祖先 Frontend
+     */
+    get frontend() {
+        return this.getAncestor('Frontend') as Frontend;
+    }
 
     /**
      * @param source 需要合并的部分参数

package/src/concepts/BindEvent__.ts

@@ -25,6 +25,7 @@ import ViewElement from './ViewElement__';
 import View from './View__';
 import Module from './Module__';
 import App from './App__';
+import Frontend from './Frontend__';
 
 /**
  * 元素绑定事件
@@ -91,6 +92,12 @@ export class BindEvent extends BaseNode {
     get app() {
         return this.getAncestor('App') as App;
     }
+    /**
+     * 祖先 Frontend
+     */
+    get frontend() {
+        return this.getAncestor('Frontend') as Frontend;
+    }
 
     /**
      * @param source 需要合并的部分参数

package/src/concepts/BindStyle__.ts

@@ -16,6 +16,7 @@ import ViewElement from './ViewElement__';
 import View from './View__';
 import Module from './Module__';
 import App from './App__';
+import Frontend from './Frontend__';
 
 /**
  * 元素绑定样式
@@ -70,6 +71,12 @@ export class BindStyle extends BaseNode {
     get app() {
         return this.getAncestor('App') as App;
     }
+    /**
+     * 祖先 Frontend
+     */
+    get frontend() {
+        return this.getAncestor('Frontend') as Frontend;
+    }
 
     /**
      * @param source 需要合并的部分参数

package/src/concepts/CallFunction__.ts

@@ -66,8 +66,6 @@ export class CallFunction extends LogicItem {
     @property('Argument')
     arguments: Array<Argument> = [];
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -81,13 +79,6 @@ export class CallFunction extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallFunction;
     }
 
-    
-    
-
-    
-
-    
-
     /**
     * 插入类型标注
     * @internal
@@ -120,8 +111,6 @@ export class CallFunction extends LogicItem {
         return typeAnnotation;
     }
 
-    
-
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -144,8 +133,6 @@ export class CallFunction extends LogicItem {
         return node;
     }
 
-    
-
     /**
      * 添加类型标注
      * @internal
@@ -165,8 +152,6 @@ export class CallFunction extends LogicItem {
         return this._insertTypeAnnotationAt(options as any, index);
     }
 
-    
-
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -190,11 +175,6 @@ export class CallFunction extends LogicItem {
         return node;
     }
 
-
-
-
-    
-
     /**
     * 插入实际参数
     * @internal
@@ -227,8 +207,6 @@ export class CallFunction extends LogicItem {
         return argument;
     }
 
-    
-
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -251,8 +229,6 @@ export class CallFunction extends LogicItem {
         return node;
     }
 
-    
-
     /**
      * 添加实际参数
      * @internal
@@ -272,8 +248,6 @@ export class CallFunction extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
-    
-
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -297,9 +271,6 @@ export class CallFunction extends LogicItem {
         return node;
     }
 
-
-    
-
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -307,7 +278,7 @@ export class CallFunction extends LogicItem {
     removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotation(options: TypeAnnotation) {
-        let typeAnnotation: TypeAnnotation = options;
+        const typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
@@ -334,8 +305,6 @@ export class CallFunction extends LogicItem {
         return params;
     }
 
-
-
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -343,7 +312,7 @@ export class CallFunction extends LogicItem {
     removeArgument(argument: Argument): void;
 
     removeArgument(options: Argument) {
-        let argument: Argument = options;
+        const argument: Argument = options;
         return argument.delete();
     }
 
@@ -423,23 +392,43 @@ export class CallFunction extends LogicItem {
     toJS(state?: TranslatorState): string {
         let code = `this.$utils['${this.calleeName}']`;
         code += '(';
-        this.arguments?.forEach((arg, index) => {
-            code += arg?.toJS(shiftState(state, code));
-            if (index !== this.arguments?.length - 1)
-                code += ', ';
-        });
-        if (this.typeArguments && this.typeArguments.length) {
-            if (this.arguments?.length)
-                code += ', ';
-            this.typeArguments?.forEach((arg, index) => {
+        if (Array.isArray(this.arguments) && this.arguments.length) {
+            this.arguments.forEach((arg, index) => {
                 code += arg?.toJS(shiftState(state, code));
-                if (index !== this.typeArguments?.length - 1)
+                if (index !== this.arguments?.length - 1)
                     code += ', ';
             });
         }
+        const isStringConvert = ['ToString', 'FromString'].includes(this.calleeName);
+        let argTypeAnnotation;
+        if (isStringConvert) {
+            if (this.calleeName === 'ToString') {
+                const arg = this.arguments[0];
+                argTypeAnnotation = (arg as any).typeAnnotation || arg.__TypeAnnotation;
+            } else if (this.calleeName === 'FromString') {
+                argTypeAnnotation = this.typeArguments?.[0];
+            }
+        }
+        if (argTypeAnnotation) {
+            code += `, '${argTypeAnnotation?.sortedTypeKey}'`;
+        } else {
+            if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+                if (this.arguments?.length)
+                    code += ', ';
+                this.typeArguments?.forEach((arg, index) => {
+                    code += arg?.toJS(shiftState(state, code));
+                    if (index !== this.typeArguments?.length - 1)
+                        code += ', ';
+                });
+            }
+        }
+
         code += ')';
         const typeAnnotation = (this as any).typeAnnotation || this.__TypeAnnotation;
-        const needGenInitFromSchema = typeAnnotation && !['primitive', 'union'].includes(typeAnnotation.typeKind);
+        const needGenInitFromSchema = typeAnnotation && (
+            !['primitive', 'union'].includes(typeAnnotation.typeKind) 
+            || typeAnnotation.typeName === 'DateTime'
+        );
         if (needGenInitFromSchema) {
             code = `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', ${code})`;
         }
@@ -550,7 +539,7 @@ export class CallFunction extends LogicItem {
     toEmbeddedTS(state?: TranslatorState): string {
         let code = '';
         const calleeKey = this.calleeKey;
-        if (calleeKey === 'nasl.util.Convert') {
+        if (['nasl.util.Convert', 'nasl.util.FromString'].includes(calleeKey)) {
             // nasl.util.Convert(variable1)<nasl.core.String>();
             // 单独处理
 

package/src/concepts/CallInterface__.ts

@@ -368,7 +368,8 @@ export class CallInterface extends LogicItem {
             && this.parentNode.concept !== 'SelectMembers'
             && this.parentNode.concept !== 'BinaryExpression'
             && this.parentNode.concept !== 'MemberExpression'
-            && this.parentNode.concept !== 'StringInterpolation') {
+            && this.parentNode.concept !== 'StringInterpolation'
+            && !['NewMap', 'NewList'].includes(this.parentNode.concept)) {
             code += ';';
         }
         code += '\n';