@lcap/nasl 2.19.0-beta.1 → 2.19.0-beta.3

package/src/concepts/CallInterface__.ts

@@ -61,6 +61,8 @@ export class CallInterface extends LogicItem {
     @property('Argument')
     arguments: Array<Argument> = [];
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -74,6 +76,13 @@ export class CallInterface extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallInterface;
     }
 
+    
+    
+
+    
+
+    
+
     /**
     * 插入实际参数
     * @internal
@@ -106,6 +115,8 @@ export class CallInterface extends LogicItem {
         return argument;
     }
 
+    
+
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -128,6 +139,8 @@ export class CallInterface extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加实际参数
      * @internal
@@ -147,6 +160,8 @@ export class CallInterface extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
+    
+
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -170,6 +185,9 @@ export class CallInterface extends LogicItem {
         return node;
     }
 
+
+    
+
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -177,7 +195,7 @@ export class CallInterface extends LogicItem {
     removeArgument(argument: Argument): void;
 
     removeArgument(options: Argument) {
-        const argument: Argument = options;
+        let argument: Argument = options;
         return argument.delete();
     }
 

package/src/concepts/CallLogic__.ts

@@ -608,68 +608,6 @@ export class CallLogic extends LogicItem {
 
     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')
-
-        }
-    }
-
-    __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(',')
-                }
-            }
-        }
-    }
-})
-`;
-        }
         code += 'await ';
         // 页面逻辑
         let isViewLogic = true;
@@ -790,7 +728,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))}`;
@@ -809,7 +747,7 @@ var __parseType = __parseType || ((root, prop) => {
                         code += `{
                             concept: 'Function',
                             name: 'filter',
-                            returnExpression: __resolveData(${argsStr})
+                            returnExpression: this.$resolveRequestData(${argsStr}, __eventArg, __currentArg)
                         }`;
                         code += `,\n`;
                         logicArgs = [];
@@ -943,7 +881,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,

package/src/concepts/EnumItem__.ts

@@ -15,9 +15,9 @@ import Module from './Module__';
 import App from './App__';
 
 /**
- * 枚举项
+ * 枚举值
  */
-@concept('枚举项')
+@concept('枚举值')
 export class EnumItem extends BaseNode {
     /**
      * 产品概念
@@ -26,13 +26,13 @@ export class EnumItem extends BaseNode {
     concept: 'EnumItem' = 'EnumItem';
 
     /**
-     * 枚举项的值
+     * 枚举值的值
      */
     @property()
     value: string = undefined;
 
     /**
-     * 枚举项标题
+     * 枚举值标题
      */
     @property()
     label: string = undefined;
@@ -81,7 +81,7 @@ export class EnumItem extends BaseNode {
         return params;
     }
     /**
-     * 设置枚举项的值
+     * 设置枚举值的值
      */
     setValue(value: string) {
         const object = {
@@ -93,7 +93,7 @@ export class EnumItem extends BaseNode {
     }
 
     /**
-     * 设置枚举项标题
+     * 设置枚举值标题
      */
     setLabel(label: string) {
         const object = {

package/src/concepts/Enum__.ts

@@ -46,7 +46,7 @@ export class Enum extends BaseNode {
     description: string = undefined;
 
     /**
-     * 枚举项列表
+     * 枚举值列表
      */
     @property('EnumItem')
     enumItems: Array<EnumItem> = [];
@@ -130,16 +130,16 @@ export class Enum extends BaseNode {
     
 
     /**
-    * 插入枚举项
+    * 插入枚举值
     * @internal
-    * @param enumItemOptions 枚举项参数
+    * @param enumItemOptions 枚举值参数
     */
     _insertEnumItemAt(enumItemOptions: Partial<EnumItem>, index: number): EnumItem;
 
     /**
-    * 插入枚举项
+    * 插入枚举值
     * @internal
-    * @param enumItem 已有的枚举项实例
+    * @param enumItem 已有的枚举值实例
     */
     _insertEnumItemAt(enumItem: EnumItem, index: number): EnumItem;
 
@@ -164,14 +164,14 @@ export class Enum extends BaseNode {
     
 
     /**
-     * 插入枚举项
-     * @param enumItemOptions 枚举项参数
+     * 插入枚举值
+     * @param enumItemOptions 枚举值参数
      */
     insertEnumItemAt(enumItemOptions: Partial<EnumItem>, index: number): EnumItem;
 
     /**
-     * 插入枚举项
-     * @param enumItem 已有的枚举项实例
+     * 插入枚举值
+     * @param enumItem 已有的枚举值实例
      */
     insertEnumItemAt(enumItem: EnumItem, index: number): EnumItem;
 
@@ -188,16 +188,16 @@ export class Enum extends BaseNode {
     
 
     /**
-     * 添加枚举项
+     * 添加枚举值
      * @internal
-     * @param enumItemOptions 枚举项参数
+     * @param enumItemOptions 枚举值参数
      */
     _addEnumItem(enumItemOptions: Partial<EnumItem>): EnumItem;
 
     /**
-     * 添加枚举项
+     * 添加枚举值
      * @internal
-     * @param enumItem 已有的枚举项实例
+     * @param enumItem 已有的枚举值实例
      */
     _addEnumItem(enumItem: EnumItem): EnumItem;
 
@@ -209,14 +209,14 @@ export class Enum extends BaseNode {
     
 
     /**
-     * 添加枚举项
-     * @param enumItemOptions 枚举项参数
+     * 添加枚举值
+     * @param enumItemOptions 枚举值参数
      */
     addEnumItem(enumItemOptions: Partial<EnumItem>): EnumItem;
 
     /**
-     * 添加枚举项
-     * @param enumItem 已有的枚举项实例
+     * 添加枚举值
+     * @param enumItem 已有的枚举值实例
      */
     addEnumItem(enumItem: EnumItem): EnumItem;
 
@@ -235,8 +235,8 @@ export class Enum extends BaseNode {
     
 
     /**
-     * 删除枚举项
-     * @param enumItem 已有的枚举项实例
+     * 删除枚举值
+     * @param enumItem 已有的枚举值实例
      */
     removeEnumItem(enumItem: EnumItem): void;
 
@@ -290,6 +290,9 @@ export class Enum extends BaseNode {
         const excludedSet = new Set(excludedList);
         return (this.enumItems || []).filter((item) => !excludedSet.has(item)).map((item) => item.value);
     }
+    getEnumItemUniqueName(name = 'VALUE1') {
+        return utils.unique(name, this.getEnumItemExistingNames(), undefined, false);
+    }
 
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {

package/src/concepts/ForEachStatement__.ts

@@ -531,7 +531,7 @@ export class ForEachStatement extends LogicItem {
         code += this.each ? this.each.toEmbeddedTS(shiftState(state, code, {
             tabSize: 0,
         })) : '__IDENTIFIER__';
-        if (['NewList', 'NewMap'].includes(this.each.concept))
+        if (['NewList', 'NewMap'].includes(this.each?.concept))
             code += '\n';
         code += '.__slice(';
         code += this.start ? this.start.toEmbeddedTS(shiftState(state, code)) : '__IDENTIFIER__';

package/src/concepts/Logic__.ts

@@ -796,7 +796,7 @@ export class Logic extends BaseNode {
 
 
 
-    
+
 
     /**
     * 插入逻辑项
@@ -830,7 +830,7 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
-    
+
 
     /**
      * 插入逻辑项
@@ -854,7 +854,7 @@ export class Logic extends BaseNode {
         return node;
     }
 
-    
+
 
     /**
      * 添加逻辑项
@@ -875,7 +875,7 @@ export class Logic extends BaseNode {
         return this._insertItemInBodyAt(options as any, index);
     }
 
-    
+
 
     /**
      * 添加逻辑项
@@ -900,7 +900,7 @@ export class Logic extends BaseNode {
         return node;
     }
 
-    
+
 
     /**
     * 插入逻辑项
@@ -934,7 +934,7 @@ export class Logic extends BaseNode {
         return logicItem;
     }
 
-    
+
 
     /**
      * 插入逻辑项
@@ -958,7 +958,7 @@ export class Logic extends BaseNode {
         return node;
     }
 
-    
+
 
     /**
      * 添加逻辑项
@@ -979,7 +979,7 @@ export class Logic extends BaseNode {
         return this._insertItemInPlaygroundAt(options as any, index);
     }
 
-    
+
 
     /**
      * 添加逻辑项
@@ -1005,7 +1005,7 @@ export class Logic extends BaseNode {
     }
 
 
-    
+
 
     /**
     * 删除事务
@@ -1268,7 +1268,7 @@ export class Logic extends BaseNode {
         return logicItem.delete();
     }
 
-    
+
 
     /**
      * 删除逻辑项
@@ -1390,6 +1390,8 @@ export class Logic extends BaseNode {
     }
 
     toJSContent(code: string, state?: TranslatorState): string {
+        // 兼容前端事件逻辑参数中的 current event，deleteBy updateBy 需要对 current、event 进行预处理
+        code += `var __currentArg;var __eventArg;try {__currentArg = current;__eventArg = event;} catch(e) {}`;
         // params
         if (Array.isArray(this.params)) {
             this.params.forEach((param) => {
@@ -1778,6 +1780,7 @@ export class Logic extends BaseNode {
     }
 
     getRightCode(code: string, assignment: Assignment | BatchAssignment, rightNode: any): string {
+        code = code.replaceAll('\n', ' ');
         if (assignment instanceof Assignment && !assignment.right)
             return code;
 

package/src/concepts/NewComposite__.ts

@@ -823,16 +823,13 @@ export class NewComposite extends LogicItem {
         });
 
         const autoConnection = () => {
-            let structure: any;
             const isAnnotation = this.typeAnnotation.typeKind === 'anonymousStructure';
-            if (!isAnnotation)
-                structure = this.app.findNodeByCompleteName(this.typeAnnotation.typeNamespace + '.' + this.typeAnnotation.typeName);
             this.app.emit('collect:start', {
                 actionMsg: '自动连线',
             });
             this.properties.forEach((property: Identifier, leftSecondIndex: number) => {
                 const leftName = property.name;
-                const leftTypeAnnotation = !isAnnotation && structure.properties.find((p: StructureProperty) => p.name === property.name).typeAnnotation;
+                const leftTypeAnnotation = !isAnnotation && property.__TypeAnnotation;
                 const typeStruct = isAnnotation && this.typeAnnotation.properties[leftSecondIndex]; // 获取匿名数据结构typeAnnotation的具体property
                 if (leftLineSet.has(leftSecondIndex) || leftLineSet.has(leftName))
                     return;
@@ -902,9 +899,10 @@ export class NewComposite extends LogicItem {
 
         let count = 0;
         const typeAnnotationEnd = () => {
-            const r = this.rights.every((right) => right.members.every((item) => item.__isCorrectTypeAnnotation));
+            const l = this.properties.every((item) => item.__isCorrectTypeAnnotation);
+            const r = this.rights.every((right) => right.members.every((item) => item.__isCorrectTypeAnnotation) && right.expression.__isCorrectTypeAnnotation);
             count++;
-            if (r) {
+            if (r && l) {
                 autoConnection();
             } else if (count <= 10) {
                 setTimeout(() => {
@@ -1016,7 +1014,7 @@ export class NewComposite extends LogicItem {
             this.app.emit('collect:start', {
                 actionMsg: '匿名数据结构删除右侧变量',
             });
-            if (this.typeAnnotation.typeKind === 'anonymousStructure') {
+            if (this.typeAnnotation?.typeKind === 'anonymousStructure') {
                 oldLines.forEach(({ leftIndex }) => {
                     const leftItem = this.typeAnnotation.properties[leftIndex[1]];
                     leftItem.update({
@@ -1044,7 +1042,7 @@ export class NewComposite extends LogicItem {
         let oldLines: AssignmentLine[] = this.assignmentLines.filter(({ rightIndex }) => rightIndex[0] === splitIndex);
         // 右侧变量改变后，修改连线
         members.forEach((item, index) => {
-            if (keepMembers.has(item.completeName)) {
+            if (keepMembers?.has(item.completeName)) {
                 const lines = this.findlines(item, selectMember);
                 lines.forEach((line) => {
                     const newLine = Object.assign({}, line, { rightIndex: [line.rightIndex[0], index] });
@@ -1219,8 +1217,7 @@ export class NewComposite extends LogicItem {
             });
             // 方便ts报错检查
             code += 'function __newComposite() {\n';
-            code += `let __obj = nasl.util.New<${this.typeAnnotation.sortedTypeKey}>();`;
-            code += '\n';
+            code += `let __obj = nasl.util.New<${this.typeAnnotation.sortedTypeKey}>();\n`;
             // 是否是左边的顶层连线
             const leftTopIndex = this.assignmentLines.findIndex(({ leftIndex }) => leftIndex[1] === undefined);
             if (leftTopIndex !== -1) {
@@ -1230,10 +1227,13 @@ export class NewComposite extends LogicItem {
                 code += '\n';
             } else {
                 // 左侧properties的identifier的类型标注
-                this.properties.forEach((item) => {
-                    code += `const `;
-                    code += `${item.toEmbeddedTS(shiftState(state, code, { inline: true }))} = __obj.${item.name};\n`;
+                code += 'const { ';
+                this.properties.forEach((item, index) => {
+                    code += item.toEmbeddedTS(shiftState(state, code, { inline: true }));
+                    if (index < this.properties.length - 1)
+                        code += ', ';
                 });
+                code += ' } = __obj;\n';
                 this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
                     const leftSecondIndex = leftIndex[1];
                     const [rightFirst, rightSecond] = [rightIndex[0], rightIndex[1]];
@@ -1286,7 +1286,7 @@ export class NewComposite extends LogicItem {
                 const name = property.name;
                 const rightItem = nameMap.get(name);
                 if (rightMap.get(rightItem) !== undefined) {
-                    code += `{ const x = ${rightMap.get(rightItem)}; const `;
+                    code += `{ const x${rightMap.get(rightItem) === 'null' ? ':void' : ''} = ${rightMap.get(rightItem)}; const `;
                     code += property.toEmbeddedTS(shiftState(state, code, { inline: true }));
                     code += `: nasl.core.Incompatible<typeof x, void> = x`;
                     code += '; }\n';

package/src/concepts/NewList__.ts

@@ -326,6 +326,22 @@ export class NewList extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    toBrief(): string {
+        let code = '';
+        code += '[ ';
+        this.items.forEach((value, index) => {
+            if (index >= 10)
+                return;
+            if (index)
+                code += '，';
+            code += value.toBrief();
+        });
+        if (this.items.length > 10)
+            code += ', ...';
+        code += ' ]';
+        return code;
+    }
+
     toUI(state?: TranslatorState): string {
         let code = '';
         code += '[';
@@ -378,9 +394,10 @@ export class NewList extends LogicItem {
             this.items.forEach((item, index) => {
                 if (item.concept === 'Unparsed')
                     return;
+                code += 'nasl.core.ensureVoid(';
                 arr.push(item.toEmbeddedTS(shiftState(state, code, { inline: true })));
                 code += arr[index];
-                code += '; ';
+                code += '); ';
             });
             code += '\n';
             if (!arr.length || arr.every((item: any) => ['__IDENTIFIER__', '__IDENTIFIER__()', 'null'].includes(item)))

package/src/concepts/NewMap__.ts

@@ -530,6 +530,23 @@ export class NewMap extends LogicItem {
         })
     }
 
+    toBrief(): string {
+        let code = '';
+        code += '[<br />';
+        this.keys.forEach((key, index) => {
+            if (index >= 10)
+                return;
+            const value = this.values[index];
+            code += '&nbsp;&nbsp;&nbsp;&nbsp;';
+            code += `${key ? key.toBrief() : 'null'} -> ${value ? value.toBrief() : 'null'}`;
+            code += '<br />';
+        });
+        if (this.keys.length > 10)
+            code += '&nbsp;&nbsp;&nbsp;&nbsp...<br />';
+        code += ']';
+        return code;
+    }
+
     toJS(state?: TranslatorState): string {
         let code = '';
         code += 'await (async () => {\n';
@@ -594,10 +611,11 @@ export class NewMap extends LogicItem {
                 this.values.forEach((item, index) => {
                     if (item)
                         valueTs = true;
+                    code += 'nasl.core.ensureVoid(';
                     const ts = item ? item.toEmbeddedTS(shiftState(state, code, { inline: true })) : null;
                     valueTsArr.push(ts);
                     code += valueTsArr[index];
-                    code += '; ';
+                    code += '); ';
                 });
                 code += '\n';
                 if (keyTs === 'null' || !valueTs) {

package/src/concepts/OqlQueryComponent__.ts

@@ -319,6 +319,8 @@ export class OqlQueryComponent extends LogicItem {
                 },
             }).then((res: any) => {
                 this.codeSourceMap = res || { typescript: '', lexicalErrorCode: 1001 };
+            }).catch(() => {
+                this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
             });
         } else {
             this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };

package/src/concepts/StringInterpolation__.ts

@@ -30,7 +30,7 @@ export class StringInterpolation extends LogicItem {
     @property('LogicItem')
     expressions: Array<LogicItem> = [];
 
-
+    
 
     /**
      * @param source 需要合并的部分参数
@@ -45,7 +45,7 @@ export class StringInterpolation extends LogicItem {
         return super.from(source, parentNode, parentKey) as StringInterpolation;
     }
 
-
+    
     /**
      * 设置插值表达式
      */
@@ -58,7 +58,7 @@ export class StringInterpolation extends LogicItem {
         });
     }
 
-    getItemExistingNames(excludedList: Array<LogicItem> = []) {
+        getItemExistingNames(excludedList: Array<LogicItem> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.expressions as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -200,7 +200,7 @@ export class StringInterpolation extends LogicItem {
     }
 
 
-
+    
 
     /**
     * 删除逻辑项
@@ -279,6 +279,8 @@ export class StringInterpolation extends LogicItem {
     }
 
     toJS(): string {
+        if (!this.expressions.length)
+            return `''`;
         return this.expressions.map((exp: any) => {
             const expTypeAnnotation = exp.typeAnnotation || exp.__TypeAnnotation;
             return `this.$utils['ToString'](${exp.toJS()}, '${expTypeAnnotation?.sortedTypeKey}')`;