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

package/src/concepts/CallLogic__.ts

@@ -728,7 +728,7 @@ export class CallLogic extends LogicItem {
                                     return `${name}: {
                                         concept: 'Function',
                                         name: 'filter',
-                                        returnExpression: this.$resolveRequestData(${argsStr}, event, current)
+                                        returnExpression: this.$resolveRequestData(${argsStr}, __eventArg, __currentArg)
                                     }`;
                                 } else {
                                     return `${name}: ${arg.expression.toJS(shiftState(state, code))}`;
@@ -747,7 +747,7 @@ export class CallLogic extends LogicItem {
                         code += `{
                             concept: 'Function',
                             name: 'filter',
-                            returnExpression: this.$resolveRequestData(${argsStr}, event, current)
+                            returnExpression: this.$resolveRequestData(${argsStr}, __eventArg, __currentArg)
                         }`;
                         code += `,\n`;
                         logicArgs = [];
@@ -881,7 +881,12 @@ export class CallLogic extends LogicItem {
                 };
             }
 
-            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

@@ -1014,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({
@@ -1042,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] });
@@ -1217,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) {
@@ -1228,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]];

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 += '[';

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';

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}')`;

package/src/concepts/TypeAnnotation__.ts

@@ -121,6 +121,8 @@ export class TypeAnnotation extends BaseNode {
     @property()
     ruleMap: Object = undefined;
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -157,6 +159,10 @@ export class TypeAnnotation extends BaseNode {
         });
     }
 
+    
+
+    
+
     /**
     * 插入类型标注
     * @internal
@@ -189,6 +195,8 @@ export class TypeAnnotation extends BaseNode {
         return typeAnnotation;
     }
 
+    
+
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -211,6 +219,8 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
+    
+
     /**
      * 添加类型标注
      * @internal
@@ -230,6 +240,8 @@ export class TypeAnnotation extends BaseNode {
         return this._insertTypeAnnotationInTypeArgumentsAt(options as any, index);
     }
 
+    
+
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -253,6 +265,8 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
+    
+
     /**
     * 插入类型标注
     * @internal
@@ -285,6 +299,8 @@ export class TypeAnnotation extends BaseNode {
         return typeAnnotation;
     }
 
+    
+
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -307,6 +323,8 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
+    
+
     /**
      * 添加类型标注
      * @internal
@@ -326,6 +344,8 @@ export class TypeAnnotation extends BaseNode {
         return this._insertTypeAnnotationInReturnTypeAt(options as any, index);
     }
 
+    
+
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -349,6 +369,11 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
+
+
+
+    
+
     /**
     * 插入数据结构属性
     * @internal
@@ -381,6 +406,8 @@ export class TypeAnnotation extends BaseNode {
         return structureProperty;
     }
 
+    
+
     /**
      * 插入数据结构属性
      * @param structurePropertyOptions 数据结构属性参数
@@ -403,6 +430,8 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
+    
+
     /**
      * 添加数据结构属性
      * @internal
@@ -422,6 +451,8 @@ export class TypeAnnotation extends BaseNode {
         return this._insertStructurePropertyAt(options as any, index);
     }
 
+    
+
     /**
      * 添加数据结构属性
      * @param structurePropertyOptions 数据结构属性参数
@@ -445,6 +476,9 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -452,10 +486,12 @@ export class TypeAnnotation extends BaseNode {
     removeTypeAnnotationInTypeArguments(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotationInTypeArguments(options: TypeAnnotation) {
-        const typeAnnotation: TypeAnnotation = options;
+        let typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
+    
+
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -463,7 +499,7 @@ export class TypeAnnotation extends BaseNode {
     removeTypeAnnotationInReturnType(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotationInReturnType(options: TypeAnnotation) {
-        const typeAnnotation: TypeAnnotation = options;
+        let typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
@@ -490,6 +526,8 @@ export class TypeAnnotation extends BaseNode {
         return params;
     }
 
+
+
     /**
      * 删除数据结构属性
      * @param structureProperty 已有的数据结构属性实例
@@ -497,7 +535,7 @@ export class TypeAnnotation extends BaseNode {
     removeStructureProperty(structureProperty: StructureProperty): void;
 
     removeStructureProperty(options: StructureProperty) {
-        const structureProperty: StructureProperty = options;
+        let structureProperty: StructureProperty = options;
         return structureProperty.delete();
     }
 

package/src/concepts/View__.ts

@@ -259,7 +259,7 @@ export class View extends BaseNode {
         });
     }
 
-    
+
 
     /**
     * 插入页面元素
@@ -1095,7 +1095,7 @@ export class View extends BaseNode {
     }
 
 
-    
+
 
     /**
     * 删除页面元素
@@ -2101,6 +2101,7 @@ export class View extends BaseNode {
     }
 
     getRightCode(code: string, assignment: Assignment | BatchAssignment, rightNode: any): string {
+        code = code.replaceAll('\n', ' ');
         const logic = assignment.logic;
         const logicRtn = logic?.returns[0];
         // 调用接口，参数替换成 null

package/src/generator/genReleaseBody.ts

@@ -1,4 +1,4 @@
-import { App, Assignment, BatchAssignment, CallFunction, CallInterface, CallLogic, ForEachStatement, IfStatement, Logic, LogicItem, Match, MatchCase, MemberExpression, Role, SwitchCase, SwitchStatement, View, ViewElement, WhileStatement, StringInterpolation } from '../concepts';
+import { App, Assignment, BatchAssignment, CallFunction, CallInterface, CallLogic, ForEachStatement, IfStatement, Logic, LogicItem, Match, MatchCase, MemberExpression, Role, SwitchCase, SwitchStatement, View, ViewElement, WhileStatement, StringInterpolation, ExternalDestination } from '../concepts';
 import { genBundleFiles } from './genBundleFiles';
 import { genPermissionData } from './permission';
 
@@ -265,6 +265,8 @@ function getAuthApiPathList(app: App) {
             logicItems = [state.object, state.property];
         } else if (state instanceof StringInterpolation) {
             logicItems = [...state.expressions];
+        } else if (state instanceof ExternalDestination) {
+            logicItems = [state.anchor, state.link];
         }
 
         return logicItems.filter((item) => !!item);

package/src/server/extendBaseNode.ts

@@ -87,7 +87,10 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
          */
         const res = naslServer._renamePrepare(this, refsList, newValue);
         if (res.length <= 1) {
-            (this as SetNameNode).setName(newValue);
+            if (this.concept === 'enumItem') {
+                (this as any).setValue(newValue);
+            } else
+                (this as SetNameNode).setName(newValue);
         } else {
             const callback = (value: boolean) => {
                 if (value) {

package/src/server/formatTsUtils.ts

@@ -45,16 +45,19 @@ export function type2TypeAnnotation(oldType: Array<any> | {}): TypeAnnotation {
     let typeAnnotation: TypeAnnotation;
     try {
         const { typeName, typeNamespace, typeArguments, typeKind, properties } = type as any;
-        if (typeKind === 'anonymousStructure' && Array.isArray(properties) && properties.length) {
+        if (typeKind === 'anonymousStructure') {
             // 自定义类型
             const newProperties: StructureProperty[] = [];
-            properties.forEach((item) => {
-                if (!item?.name?.startsWith('__')) {
-                    const itemType = type2TypeAnnotation(item.typeInfo);
-                    const structureProperty = StructureProperty.from({ name: item.name, typeAnnotation: itemType }, typeAnnotation, 'properties');
-                    newProperties.push(structureProperty);
-                }
-            });
+            if (Array.isArray(properties) && properties.length) {
+                properties.forEach((item) => {
+                    if (!item?.name?.startsWith('__')) {
+                        // 如果没有获取到类型，就默认塞一个string
+                        const itemType = type2TypeAnnotation(item.typeInfo) || TypeAnnotation.createPrimitive('String');
+                        const structureProperty = StructureProperty.from({ name: item.name, typeAnnotation: itemType }, typeAnnotation, 'properties');
+                        newProperties.push(structureProperty);
+                    }
+                });
+            }
             typeAnnotation = TypeAnnotation.createTypeAnonymousStructure(newProperties);
         } else if (!typeName || typeName === 'Promise' || typeName === 'nasl' || typeName === '___IDENTIFIER__') {
             return null;