@lcap/nasl 4.1.0-creator.2 → 4.1.0-creator.4

package/out/natural/transforms/transform2LogicItem.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformCall2Extension = exports.transformCall2Connector = exports.transformCall2Interface = exports.transformAlert2ShowMessage = exports.transformForEach2ForEachStatement = exports.transformForOf2ForEachStatement = exports.transform2ForEachStatement = exports.transformMap2ListTransform = exports.transform2UIFunction = exports.transformCall2CallFunction = exports.transform2CallFunction = exports.transformCall2JSONFunctions = exports.transformCall2Logging = exports.transformCall2ConsoleLog = exports.transformCall2CallDataSourceLogic = exports.transformCall2CallEntityLogic = exports.transformCall2CallViewElementLogic = exports.transformCallFunctionExpression2Match = exports.transformMemberExpression = exports.transformNewExpression = exports.transform2PartialNewComposite = exports.transform2Comment = exports.transform2StringInterpolation = exports.transformReturnStatement2AssignmentOrEnd = exports.transform2NullLiteral = exports.transform2NumericLiteral = exports.transform2DirectiveLiteral = exports.transform2StringLiteral = exports.transform2BooleanLiteral = exports.transformUpdateExpression2Assignment = exports.transform2Assignment = exports.transform2AnonymousFunction = exports.transformIdentifier = exports.transformSwitchStatement2Match = exports.transform2WhileStatement = exports.transform2Break = exports.transform2Continue = exports.transform2IfStatement = exports.transform2BinaryExpression = exports.transform2VariadicExpression = exports.transformCallExpressionToBinaryExpression = exports.transform2Param = exports.fixLogicNode = exports.flatIfStatementForMatch = exports.flatMatchPatternsExpression = exports.getSelectMembers = exports.unflatMemberExpression = exports.flatMemberExpression = exports.fixExpression = exports.TransformManager = void 0;
-exports.transform2LogicItem = exports.transformCall2Paginate = exports.transformCall2LogicWithAuth = exports.transformCall2Logic = exports.transformCall2CallViewLogic = void 0;
+exports.transformCall2Interface = exports.transformAlert2ShowMessage = exports.transformForEach2ForEachStatement = exports.transformForOf2ForEachStatement = exports.transform2ForEachStatement = exports.transformMap2ListTransform = exports.transform2UIFunction = exports.transformCall2CallFunction = exports.transform2CallFunction = exports.transform2CallOtherNASLLogic = exports.transform2CallEventLogic = exports.transformCall2JSONFunctions = exports.transformCall2Logging = exports.transformCall2ConsoleLog = exports.transformCall2CallDataSourceLogic = exports.transformCall2CallEntityLogic = exports.transformCall2CallViewElementLogic = exports.transformCallFunctionExpression2Match = exports.transformMemberExpression = exports.transformNewExpression = exports.transform2PartialNewComposite = exports.transform2Comment = exports.transform2StringInterpolation = exports.transformReturnStatement2AssignmentOrEnd = exports.transform2NullLiteral = exports.transform2NumericLiteral = exports.transform2DirectiveLiteral = exports.transform2StringLiteral = exports.transform2BooleanLiteral = exports.transformUpdateExpression2Assignment = exports.transform2Assignment = exports.transform2AnonymousFunction = exports.transformIdentifier = exports.transformSwitchStatement2Match = exports.transform2WhileStatement = exports.transform2Break = exports.transform2Continue = exports.transform2IfStatement = exports.transform2BinaryExpression = exports.transform2VariadicExpression = exports.transformCallExpressionToBinaryExpression = exports.transform2Param = exports.fixLogicNode = exports.flatIfStatementForMatch = exports.flatMatchPatternsExpression = exports.getSelectMembers = exports.unflatMemberExpression = exports.flatMemberExpression = exports.fixExpression = exports.TransformManager = void 0;
+exports.transform2LogicItem = exports.transformCall2Paginate = exports.transformCall2LogicWithAuth = exports.transformCall2Logic = exports.transformCall2CallViewLogic = exports.transformCall2Extension = exports.transformCall2Connector = void 0;
 const utils_1 = require("./utils");
 const transform2TypeAnnotation_1 = require("./transform2TypeAnnotation");
 const utils_2 = require("../../utils");
@@ -47,7 +47,7 @@ class TransformManager {
                     return transform(node, calleeName, callee, options);
                 }
             }
-            return (0, utils_1.throwError)(options?.parsingId, `Unhandled node ${callee.map((item) => item.name).join('.')}`, node.type, node);
+            return (0, utils_1.throwError)(options?.parsingId, `不支持的节点类型 ${callee.map((item) => item.name).join('.')}`, node.type, node);
         }
         else {
             for (const [type, transform] of this.transforms) {
@@ -55,7 +55,7 @@ class TransformManager {
                     return transform(node, options);
                 }
             }
-            return (0, utils_1.throwError)(options?.parsingId, 'Unhandled node', node.type, node);
+            return (0, utils_1.throwError)(options?.parsingId, '不支持的节点类型', node.type, node);
         }
     }
 }
@@ -123,7 +123,7 @@ function transformTSCode2SubLogic(node, options) {
 }
 function assertAssignmentRightIsNotAnonymousFunction(expression, options) {
     if (expression?.concept === 'AnonymousFunction')
-        return (0, utils_1.throwError)(options?.parsingId, 'Anonymous function is not allowed in assignment', expression.toNaturalTS());
+        return (0, utils_1.throwError)(options?.parsingId, 'Anonymous function is not allowed in assignment');
     return expression;
 }
 function fixExpression(arg, options, supportSubLogic = false) {
@@ -338,7 +338,7 @@ function transform2Param(node, options) {
         });
     }
     else {
-        return (0, utils_1.throwError)(options?.parsingId, 'Unhandled node', node);
+        return (0, utils_1.throwError)(options?.parsingId, '在输入参数中不支持节点类型', node);
     }
 }
 exports.transform2Param = transform2Param;
@@ -442,7 +442,7 @@ function transform2BinaryExpression(node, options) {
             right: transformNodeFunction(node.right, options),
         });
     }
-    return (0, utils_1.throwError)(options?.parsingId, 'Unhandled node', node.type, node);
+    return (0, utils_1.throwError)(options?.parsingId, '在二元表达式中不支持节点类型', node.type, node);
 }
 exports.transform2BinaryExpression = transform2BinaryExpression;
 function transformDefaultExpression(node, options) {
@@ -508,7 +508,7 @@ function transform2NewAnonymousStructure(node, options) {
                 item.naslType = currentType.typeAnnotation;
             }
             else {
-                return (0, utils_1.throwError)(options?.parsingId, 'Do not allow NullLiteral without type, you can use as to carry the type', node);
+                return (0, utils_1.throwError)(options?.parsingId, '匿名数据结构的属性中, 不允许出现没有类型的 null 值，请使用 as 关键字来指定类型，如 { price: null as Decimal }', node);
             }
         }
         else if (itemValue.type === 'TSAsExpression') {
@@ -549,7 +549,7 @@ function transform2NewExpression(calleeName, node, options) {
             });
         }
         if (node?.arguments && node?.arguments?.[0]?.type !== 'ArrayExpression') {
-            return (0, utils_1.throwError)(options?.parsingId, 'Not allowed code in NewList', node);
+            return (0, utils_1.throwError)(options?.parsingId, 'NewList 中不允许出现非数组表达式', node);
         }
         return new utils_1.naslTypes.NewList({
             typeAnnotation: node?.typeParameters ? typeAnnotation : undefined,
@@ -582,13 +582,13 @@ function transform2NewExpression(calleeName, node, options) {
         const typeParam = node.typeParameters?.params[0];
         const typeNamespaceAndName = typeParam ? (0, utils_1.generate)(typeParam).code : '';
         if (!typeNamespaceAndName)
-            return (0, utils_1.throwError)(options?.parsingId, 'Not allowed empty namespace in NewEntity', node);
+            return (0, utils_1.throwError)(options?.parsingId, 'NewEntity 中必须指定类型', node);
         return transform2NewStructure(typeNamespaceAndName, node.arguments[0], options);
     }
     if (calleeName === 'NewAnonymousStructure') {
         return transform2NewAnonymousStructure(node.arguments[0], options);
     }
-    return (0, utils_1.throwError)(options?.parsingId, 'Unhandled ArrowFunctionExpression node', node.type, node);
+    return (0, utils_1.throwError)(options?.parsingId, '在新建表达式中不支持节点类型', node.type, node);
 }
 function pushElseIf(ifNode, switchStatement, options) {
     const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;
@@ -860,7 +860,7 @@ function transform2SelectQueryFieldExpression(node, options) {
         // @TODO
     }
     else {
-        return (0, utils_1.throwError)(options?.parsingId, 'Unsupported expression type for QueryFieldExpression', expression.type, expression);
+        return (0, utils_1.throwError)(options?.parsingId, '在 QueryFieldExpression 不支持表达式类型', expression.type, expression);
     }
 }
 function transform2QueryAggregateExpression(node, options) {
@@ -1142,7 +1142,7 @@ function transformNewExpression(node, options) {
     else if (calleeName.includes('.entities.') || calleeName.includes('.structures.')) {
         return transform2NewStructure(calleeName, node.arguments[0], options);
     }
-    return (0, utils_1.throwError)(options?.parsingId, 'Unhandled node', node.type, node);
+    return (0, utils_1.throwError)(options?.parsingId, '在新建表达式中不支持节点类型', node.type, node);
 }
 exports.transformNewExpression = transformNewExpression;
 function transformMemberExpression(node, options) {
@@ -1339,7 +1339,7 @@ function transformCallFunctionExpression2Match(node, calleeName, callee, options
 exports.transformCallFunctionExpression2Match = transformCallFunctionExpression2Match;
 function transformCall2CallViewElementLogic(node, calleeName, callee, options) {
     if (options?.isRestricted)
-        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用', node);
+        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用，请尝试单独赋值', node);
     if (calleeName?.includes('getPropValue') || calleeName?.includes('setPropValue')) {
         const componentName = callee?.[1]?.name;
         const propertyName = node?.arguments?.[0]?.value;
@@ -1375,7 +1375,7 @@ function transformCall2CallViewElementLogic(node, calleeName, callee, options) {
 exports.transformCall2CallViewElementLogic = transformCall2CallViewElementLogic;
 function transformCall2CallEntityLogic(node, calleeName, callee, options) {
     if (options?.isRestricted)
-        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用', node);
+        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用，请尝试单独赋值', node);
     const entityName = callee[0].name.replace(/Entity$/, '');
     // console.log('callee', callee);
     return new utils_1.naslTypes.CallLogic({
@@ -1389,7 +1389,7 @@ function transformCall2CallEntityLogic(node, calleeName, callee, options) {
 exports.transformCall2CallEntityLogic = transformCall2CallEntityLogic;
 function transformCall2CallDataSourceLogic(node, calleeName, callee, options) {
     if (options?.isRestricted)
-        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用', node);
+        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用，请尝试单独赋值', node);
     if (calleeName?.includes('.entities.')) {
         const calleeNamespace = (0, utils_1.generate)(node?.callee?.object?.object)?.code;
         const entityName = node?.callee?.object?.property?.name?.replace(/Entity$/, '');
@@ -1467,7 +1467,7 @@ function transformCall2OQLQuery(node, calleeName, callee, options) {
 }
 function transformCall2ConsoleLog(node, calleeName, callee, options) {
     if (options?.isRestricted)
-        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用', node);
+        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用，请尝试单独赋值', node);
     return new utils_1.naslTypes.CallLogic({
         calleeNamespace: 'nasl.logging',
         calleeName: 'INFO',
@@ -1480,7 +1480,7 @@ function transformCall2ConsoleLog(node, calleeName, callee, options) {
 exports.transformCall2ConsoleLog = transformCall2ConsoleLog;
 function transformCall2Logging(node, calleeName, callee, options) {
     if (options?.isRestricted)
-        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用', node);
+        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用，请尝试单独赋值', node);
     const newArguments = node.arguments.map((arg) => new utils_1.naslTypes.Argument({
         expression: arg?.name === "undefined" ?
             new utils_1.naslTypes.StringLiteral()
@@ -1516,6 +1516,28 @@ function transformCall2JSONFunctions(node, calleeName, callee, options) {
     });
 }
 exports.transformCall2JSONFunctions = transformCall2JSONFunctions;
+function transform2CallEventLogic(node, calleeName, callee, options) {
+    const lastName = callee[callee.length - 1].name;
+    return new utils_1.naslTypes.CallLogic({
+        calleeNamespace: 'nasl.event',
+        calleeName: lastName,
+        shortcut: true,
+        arguments: [],
+    });
+}
+exports.transform2CallEventLogic = transform2CallEventLogic;
+function transform2CallOtherNASLLogic(node, calleeName, callee, options) {
+    const arr = calleeName.split('.');
+    const lastName = arr.pop();
+    return new utils_1.naslTypes.CallLogic({
+        calleeNamespace: arr.join('.'),
+        calleeName: lastName,
+        arguments: node?.arguments?.map((arg) => new utils_1.naslTypes.Argument({
+            expression: fixExpression(arg, options),
+        })),
+    });
+}
+exports.transform2CallOtherNASLLogic = transform2CallOtherNASLLogic;
 function transform2CallFunction(node, calleeName, argument, options) {
     calleeName = utils_1.replaceCallFunctionMap?.[calleeName] || calleeName;
     const func = server_1.default ? server_1.default.getBuildInFunction(calleeName) : null;
@@ -1563,7 +1585,7 @@ function transform2CallFunction(node, calleeName, argument, options) {
             const content = np?.toNaturalTS();
             const noContent = np?.toNaturalTS()?.includes('__IDENTIFIER__');
             if (!np && !p?.defaultExpression) {
-                return (0, utils_1.throwError)(options?.parsingId, `函数${calleeName}生成不符合标准的函数调用`);
+                return (0, utils_1.throwError)(options?.parsingId, `函数${calleeName}生成不符合标准的函数调用`, content);
             }
             if (np && calleeName === 'ListDistinctBy') {
                 if (idx === 1) {
@@ -1596,7 +1618,7 @@ function transform2CallFunction(node, calleeName, argument, options) {
         });
     }
     else {
-        return (0, utils_1.throwError)(options?.parsingId, `函数${calleeName}不存在`, node.callee);
+        return (0, utils_1.throwError)(options?.parsingId, `函数${calleeName}不存在`, node.callee, node);
     }
     if (!func.params?.length) {
         const needDefaultParam = ['CurrDate', 'CurrTime', 'CurrDateTime'];
@@ -1618,7 +1640,7 @@ function transform2CallFunction(node, calleeName, argument, options) {
         // 这两个参数比较特殊，可以无限加参数，不再判断参数数量
         const excludes = ['HasValue', 'ListSort'];
         if (func.params?.length !== newArguments?.length && !excludes.includes(calleeName)) {
-            return (0, utils_1.throwError)(options?.parsingId, `函数${calleeName}生成不符合标准的函数调用，参数数量不匹配`);
+            return (0, utils_1.throwError)(options?.parsingId, `函数${calleeName}生成不符合标准的函数调用，参数数量不匹配`, node.callee, node);
         }
         else {
             newArguments?.forEach((arg, idx) => {
@@ -1646,7 +1668,7 @@ function transform2CallFunction(node, calleeName, argument, options) {
 exports.transform2CallFunction = transform2CallFunction;
 function transform2SqlFunction(node, calleeName, argument, options) {
     if (options.inCallQueryComponentField && !['WHERE', 'HAVING', 'ORDER_BY'].includes(options.inCallQueryComponentField)) {
-        return (0, utils_1.throwError)(options?.parsingId, `数据查询中只有 WHERE, HAVING, ORDER_BY 支持 SQL 函数，而当前字段为 ${options.inCallQueryComponentField}`);
+        return (0, utils_1.throwError)(options?.parsingId, `数据查询中只有 WHERE, HAVING, ORDER_BY 支持 SQL 函数，而当前字段为 ${options.inCallQueryComponentField}`, node.callee, node);
     }
     const specFunList = ['COUNT', 'COUNTD', 'SUM', 'AVG', 'MAX', 'MIN'];
     // TODO: 先写死了 mysql，后续需要传入: 参考 requestSqlFunctions
@@ -1747,7 +1769,7 @@ function transform2UIFunction(node, calleeName, callee, options) {
         });
     }
     if (options?.isRestricted)
-        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用', node);
+        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用，请尝试单独赋值', node);
     return new utils_1.naslTypes.CallLogic({
         calleeNamespace: 'nasl.ui',
         calleeName: callee[2].name,
@@ -1815,8 +1837,8 @@ function transformForOf2ForEachStatement(node, options) {
     let endNode;
     if (node?.right?.type === 'CallExpression') {
         const rightNode = node?.right;
-        const calleeName = rightNode?.callee?.type === 'Identifier' && rightNode?.callee?.name;
-        const hasListEntries = calleeName === 'ListEntries';
+        const calleeName = (0, utils_1.generate)(rightNode.callee).code;
+        const hasListEntries = ['ListEntries', 'nasl.util.ListEntries'].includes(calleeName);
         const areaArguments = rightNode?.arguments;
         eachNode = hasListEntries ? areaArguments?.[0] : rightNode;
         startNode = hasListEntries ? areaArguments?.[1] : undefined;
@@ -1868,7 +1890,7 @@ function transformForEach2ForEachStatement(node, calleeName, callee, options) {
 exports.transformForEach2ForEachStatement = transformForEach2ForEachStatement;
 function transformAlert2ShowMessage(node, calleeName, callee, options) {
     if (options?.isRestricted)
-        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用', node);
+        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用，请尝试单独赋值', node);
     return new utils_1.naslTypes.CallLogic({
         calleeNamespace: 'nasl.ui',
         calleeName: 'showMessage',
@@ -1947,7 +1969,7 @@ function transformTSAsExpression(node, options) {
     else if (node.expression.type === 'ArrayExpression') {
         const typeAnnotation = (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(node.typeAnnotation, options) || undefined;
         if (typeAnnotation.typeName !== 'List' && typeAnnotation.typeNamespace !== 'nasl.collection')
-            return (0, utils_1.throwError)(options?.parsingId, `列表 as 必须为 List 类型`);
+            return (0, utils_1.throwError)(options?.parsingId, `列表 as 必须为 List 类型`, node);
         return transformArrayExpression(node.expression, { ...options, typeAnnotation });
     }
     else if (node.expression.type === 'NullLiteral') {
@@ -1971,7 +1993,7 @@ function transformCall2CallViewLogic(node, calleeName, callee, options) {
 exports.transformCall2CallViewLogic = transformCall2CallViewLogic;
 function transformCall2Logic(node, calleeName, callee, options) {
     if (options?.isRestricted)
-        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用', node);
+        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用，请尝试单独赋值', node);
     if (utils_1.callFunctionMap.includes(calleeName)) {
         // 未带前缀，补一下
         return transform2CallFunction(node, calleeName, node?.arguments || [], options);
@@ -1997,7 +2019,7 @@ function transformCall2Logic(node, calleeName, callee, options) {
 exports.transformCall2Logic = transformCall2Logic;
 function transformCall2LogicWithAuth(node, calleeName, callee, options) {
     if (options?.isRestricted)
-        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用', node);
+        return (0, utils_1.throwError)(options?.parsingId, '调用逻辑不支持在组件或默认值表达式中使用，请尝试单独赋值', node);
     return new utils_1.naslTypes.CallLogic({
         calleeNamespace: `nasl.auth`,
         calleeName: callee[callee.length - 1].name,
@@ -2022,10 +2044,10 @@ function flatCallQueryComponentChainNode(node, options) {
         const calleeName = node.callee.name;
         if (['FROM', 'INNER_JOIN', 'LEFT_JOIN', 'RIGHT_JOIN', 'OUTER_JOIN'].includes(calleeName)) {
             if (node.arguments[1].type !== 'ArrowFunctionExpression')
-                return (0, utils_1.throwError)(options?.parsingId, 'FROM should have a ArrowFunctionExpression as the second argument', node.arguments[1]);
+                return (0, utils_1.throwError)(options?.parsingId, 'FROM should have a ArrowFunctionExpression as the second argument', node.arguments[1], node);
             const arrowFunctionExpression = node.arguments[1];
             if (arrowFunctionExpression.body.type !== 'CallExpression')
-                return (0, utils_1.throwError)(options?.parsingId, 'FROM should have a CallExpression as the body of ArrowFunctionExpression', arrowFunctionExpression.body);
+                return (0, utils_1.throwError)(options?.parsingId, 'FROM should have a CallExpression as the body of ArrowFunctionExpression', arrowFunctionExpression.body, node);
             const body = arrowFunctionExpression.body;
             const callExpressions = flatChainCallExpression(body);
             const joinNode = callExpressions?.filter((item) => item?.callee?.name.includes('_JOIN'));
@@ -2035,13 +2057,13 @@ function flatCallQueryComponentChainNode(node, options) {
 FROM(T1Entity, T1 => ${name}(T2Entity, T2 => ON(T1.id == T2.id)).SELECT(...)); // 错误用法, ${name}的回调函数必须是完整的QueryChain
 FROM(T1Entity, T1 => ${name}(T2Entity, T2 => ON(T1.id == T2.id).SELECT(...))); // 正确用法, 后续查询都在${name}的回调函数中进行
 `;
-                return (0, utils_1.throwError)(options?.parsingId, error);
+                return (0, utils_1.throwError)(options?.parsingId, error, node);
             }
             const joinCode = (0, utils_1.generate)(joinNode[0])?.code || '';
             const count = joinCode.match(/_JOIN/g)?.length || 0;
             const errorOrder = count >= 1 && !callExpressions?.[callExpressions?.length - 1]?.callee?.name?.includes('_JOIN');
             if (errorOrder) {
-                return (0, utils_1.throwError)(options?.parsingId, '调用顺序错误，期望的调用顺序为 FROM -> JOIN -> WHERE -> GROUP_BY -> SELECT/AGGR_SELECT -> HAVING -> ORDER_BY。其中，FROM在最外层，FROM内部是零到多层JOIN嵌套调用，在最内层的JOIN内部是 WHERE -> GROUP_BY -> SELECT/AGGR_SELECT -> HAVING -> ORDER_BY 的调用顺序。');
+                return (0, utils_1.throwError)(options?.parsingId, '调用顺序错误，期望的调用顺序为 FROM -> JOIN -> WHERE -> GROUP_BY -> SELECT/AGGR_SELECT -> HAVING -> ORDER_BY。其中，FROM在最外层，FROM内部是零到多层JOIN嵌套调用，在最内层的JOIN内部是 WHERE -> GROUP_BY -> SELECT/AGGR_SELECT -> HAVING -> ORDER_BY 的调用顺序。', node);
             }
             const result = [{
                     calleeName: calleeName,
@@ -2091,7 +2113,7 @@ function transformMemberExpression2Entity(node, node2, options) {
     const entityNamespace = entityPath.slice(0, -1).map(n => n.name).join('.');
     const entityName = entityPath[entityPath.length - 1].name.replace(/Entity$/, '');
     if (!entityNamespace?.includes('.entities')) {
-        return (0, utils_1.throwError)(options?.parsingId, `${entityNamespace}.${entityName} 不是一个数据库表，无法使用数据查询`);
+        return (0, utils_1.throwError)(options?.parsingId, `${entityNamespace}.${entityName} 不是一个数据库表，无法使用数据查询`, node);
     }
     const asName = node2.name === entityName ? undefined : node2.name;
     if (asName) {
@@ -2116,7 +2138,7 @@ function transformCall2DataQuery(node, calleeName, callee, options) {
     const calleeNames = flatted && flatted.map((item) => item?.calleeName).filter((name) => name !== '$');
     const isOrderCorrect = (0, utils_1.checkOQLCalleeNameOrder)(calleeNames);
     if (!isOrderCorrect) {
-        return (0, utils_1.throwError)(options?.parsingId, '调用顺序错误，期望的调用顺序为 FROM -> JOIN -> WHERE -> GROUP_BY -> SELECT/AGGR_SELECT -> HAVING -> ORDER_BY。其中，FROM在最外层，FROM内部是零到多层JOIN嵌套调用，在最内层的JOIN内部是 WHERE -> GROUP_BY -> SELECT/AGGR_SELECT -> HAVING -> ORDER_BY 的调用顺序。');
+        return (0, utils_1.throwError)(options?.parsingId, '调用顺序错误，期望的调用顺序为 FROM -> JOIN -> WHERE -> GROUP_BY -> SELECT/AGGR_SELECT -> HAVING -> ORDER_BY。其中，FROM在最外层，FROM内部是零到多层JOIN嵌套调用，在最内层的JOIN内部是 WHERE -> GROUP_BY -> SELECT/AGGR_SELECT -> HAVING -> ORDER_BY 的调用顺序。', node);
     }
     let from;
     let where;
@@ -2135,7 +2157,7 @@ function transformCall2DataQuery(node, calleeName, callee, options) {
             case 'FROM':
                 entity = transformMemberExpression2Entity(item.arguments[0], item.arguments[1], options);
                 if (!entity)
-                    break;
+                    return;
                 const entityName = entity.asName || entity.entityName;
                 entityAsNames.push(entityName);
                 from = new utils_1.naslTypes.QueryFromExpression({
@@ -2154,6 +2176,8 @@ function transformCall2DataQuery(node, calleeName, callee, options) {
                 const rawJoinType = item.calleeName.slice(0, -5);
                 const joinType = rawJoinType === 'OUTER' ? 'FULL' : rawJoinType;
                 const onExpressions = flatOnExpressions(item.arguments[2]);
+                if (!from)
+                    return; // throwError(options?.parsingId, 'FROM 不存在或异常，无法添加 JOIN 子句', node);
                 from.addJoinPart(new utils_1.naslTypes.QueryJoinExpression({
                     ...entity,
                     joinType,
@@ -2170,14 +2194,14 @@ function transformCall2DataQuery(node, calleeName, callee, options) {
                 break;
             case 'AGGR_SELECT':
                 if (groupBy?.length) {
-                    return (0, utils_1.throwError)(options?.parsingId, '存在 GROUP_BY，应使用 SELECT 进行查询，但实际为 AGGR_SELECT');
+                    return (0, utils_1.throwError)(options?.parsingId, '存在 GROUP_BY，应使用 SELECT 进行查询，但实际为 AGGR_SELECT', node);
                 }
                 select = new utils_1.naslTypes.QuerySelectExpression({
                     distinct: false,
                     star: true,
                     selectElements: [new utils_1.naslTypes.QueryFieldExpression({
                             isDotStar: true,
-                            entityAsName: from.entityName,
+                            entityAsName: from?.entityName,
                             propertyName: '',
                         })],
                 });
@@ -2221,7 +2245,7 @@ function transformCall2DataQuery(node, calleeName, callee, options) {
                     star: true,
                     selectElements: groupBy?.length ? [new utils_1.naslTypes.QueryFieldExpression({
                             isDotStar: true,
-                            entityAsName: from.entityName,
+                            entityAsName: from?.entityName,
                             propertyName: '',
                         })] : [],
                 });
@@ -2232,17 +2256,17 @@ function transformCall2DataQuery(node, calleeName, callee, options) {
                     }
                     else if (arg.value.type === 'ObjectExpression') {
                         if (groupBy?.length) {
-                            return (0, utils_1.throwError)(options?.parsingId, '存在 GROUP_BY，SELECT应为单层结构，不应使用双层局部列');
+                            return (0, utils_1.throwError)(options?.parsingId, '存在 GROUP_BY，SELECT应为单层结构，不应使用双层局部列', node);
                         }
                         const originName = arg.key?.name || '';
                         if (originName && originName.charAt(0) === originName.charAt(0).toUpperCase()) {
                             const needName = (0, utils_2.firstLowerCase)(originName);
-                            return (0, utils_1.throwError)(options?.parsingId, `SELECT 局部列第一层命名不符合规范, 应为${needName}, 但实际为${originName}`);
+                            return (0, utils_1.throwError)(options?.parsingId, `SELECT 局部列第一层命名不符合规范, 应为${needName}, 但实际为${originName}`, node);
                         }
                         const entityName = (0, utils_2.firstUpperCase)(originName);
                         const needNameList = entityAsNames.map(item => (0, utils_2.firstLowerCase)(item))?.join('或');
                         if (!entityAsNames.includes(entityName)) {
-                            return (0, utils_1.throwError)(options?.parsingId, `SELECT 局部列第一层命名不符合规范, 应为${needNameList}, 但实际为${originName}`);
+                            return (0, utils_1.throwError)(options?.parsingId, `SELECT 局部列第一层命名不符合规范, 应为${needNameList}, 但实际为${originName}`, node);
                         }
                         selectElements = arg.value.properties?.map((property) => {
                             const columnAsName = property.key?.name;
@@ -2250,7 +2274,7 @@ function transformCall2DataQuery(node, calleeName, callee, options) {
                             const selectElement = transform2SelectQueryFieldExpression(property, { ...options, entityAsNames, inCallQueryComponentField: item.calleeName });
                             if (columnAsName !== columnPropertyName) {
                                 // eg: comment: Topic_Comment.comment_stu
-                                return (0, utils_1.throwError)(options?.parsingId, `SELECT 局部列第二层命名不符合规范, 应为${columnPropertyName}, 但实际为${columnAsName}`);
+                                return (0, utils_1.throwError)(options?.parsingId, `SELECT 局部列第二层命名不符合规范, 应为${columnPropertyName}, 但实际为${columnAsName}`, node);
                             }
                             selectElement.isDotStar = false;
                             return selectElement;
@@ -2285,7 +2309,7 @@ function transformCall2DataQuery(node, calleeName, callee, options) {
                     }
                 }
                 else {
-                    return (0, utils_1.throwError)(options?.parsingId, 'HAVING 不符合规范，请使用箭头函数', havingNode);
+                    return (0, utils_1.throwError)(options?.parsingId, 'HAVING 不符合规范，请使用箭头函数', havingNode, node);
                 }
                 having = transformNodeFunction(havingNode, { ...options, ...restParams });
                 break;
@@ -2294,13 +2318,16 @@ function transformCall2DataQuery(node, calleeName, callee, options) {
                 let restOptionParams = { entityAsNames };
                 if (orderNode?.length === 1 && orderNode?.[0]?.type === 'ArrowFunctionExpression') {
                     const params = orderNode?.[0]?.params;
+                    if (orderNode?.[0]?.body?.type !== 'ArrayExpression') {
+                        return (0, utils_1.throwError)(options?.parsingId, 'ORDER_BY 不符合规范，请使用箭头函数，并返回数组', orderNode, node);
+                    }
                     orderNode = orderNode?.[0]?.body?.elements;
                     if (params?.length && params?.[0]?.name) {
                         restOptionParams = { inOqlIdentifierNamespace: params?.[0]?.name, entityAsNames };
                     }
                 }
                 else {
-                    return (0, utils_1.throwError)(options?.parsingId, 'ORDER_BY 不符合规范，请使用箭头函数', orderNode);
+                    return (0, utils_1.throwError)(options?.parsingId, 'ORDER_BY 不符合规范，请使用箭头函数，并返回数组', orderNode, node);
                 }
                 orderBy = orderNode.map((arg) => {
                     let orderElementCode = (0, utils_1.generate)(arg)?.code || '';
@@ -2326,19 +2353,19 @@ function transformCall2DataQuery(node, calleeName, callee, options) {
         ideVersion: '2.22',
     });
     if (hasErrorTSScopeColumn && !groupBy?.length && !having) {
-        return (0, utils_1.throwError)(options?.parsingId, 'SELECT 局部列不符合规范，需要按两层对象返回');
+        return (0, utils_1.throwError)(options?.parsingId, 'SELECT 局部列不符合规范，需要按两层对象返回', node);
     }
     const hasScopeColumn = select?.selectElements?.find((selectElement) => selectElement?.concept === 'QueryFieldExpression' && !selectElement?.isDotStar);
     if (hasScopeColumn && (groupBy?.length || having)) {
-        return (0, utils_1.throwError)(options?.parsingId, '分组聚合与表字段局部列不允许同时出现');
+        return (0, utils_1.throwError)(options?.parsingId, '分组聚合与表字段局部列不允许同时出现', node);
     }
     if (hasScopeColumn && useResultItem) {
-        return (0, utils_1.throwError)(options?.parsingId, "对于局部列的排序，只支持 实体.属性名 的格式，例如 ORDER_BY((resultItem) => [[Student.age, 'ASC']])");
+        return (0, utils_1.throwError)(options?.parsingId, "对于局部列的排序，只支持 实体.属性名 的格式，例如 ORDER_BY((resultItem) => [[Student.age, 'ASC']])", node);
     }
     const isOnlyAggr = select?.selectElements?.find((selectElement) => selectElement?.concept !== 'QueryAggregateExpression');
     // 如果 select 中只有聚合属性时，并且没有用 AGGR_SELECT 来指定列
     if (!isOnlyAggr && !calleeNames?.includes('AGGR_SELECT')) {
-        return (0, utils_1.throwError)(options?.parsingId, 'SELECT 不符合规范，请使用 AGGR_SELECT');
+        return (0, utils_1.throwError)(options?.parsingId, 'SELECT 不符合规范，请使用 AGGR_SELECT', node);
     }
     // callQueryComponent.typeAnnotation = callQueryComponent.computeStructure();
     return callQueryComponent;
@@ -2432,10 +2459,12 @@ function transform2LogicItem(node, options) {
     transformManager.registerCallExpression((node, calleeName) => calleeName.startsWith('nasl.logging.'), transformCall2Logging);
     transformManager.registerCallExpression('nasl.util.jsonSerialize', transformCall2JSONFunctions);
     transformManager.registerCallExpression('nasl.util.jsonDeserialize', transformCall2JSONFunctions);
+    transformManager.registerCallExpression((node, calleeName) => (calleeName.startsWith('nasl.event.') || calleeName.startsWith('event.')) && (calleeName.endsWith('.preventDefault') || calleeName.endsWith('.stopPropagation')), transform2CallEventLogic);
     transformManager.registerCallExpression((node, calleeName) => calleeName.endsWith('.forEach'), transformForEach2ForEachStatement);
     transformManager.registerCallExpression((node, calleeName) => calleeName.startsWith('nasl.util.'), transformCall2CallFunction);
     transformManager.registerCallExpression((node, calleeName) => calleeName.startsWith('nasl.auth.'), transformCall2LogicWithAuth);
     transformManager.registerCallExpression((node, calleeName) => calleeName.startsWith('nasl.ui.'), transform2UIFunction);
+    transformManager.registerCallExpression((node, calleeName) => calleeName.startsWith('nasl.browser.'), transform2CallOtherNASLLogic);
     transformManager.registerCallExpression((node, calleeName) => calleeName.endsWith('.map'), transformMap2ListTransform);
     transformManager.registerCallExpression('ForEach', transform2ForEachStatement);
     transformManager.registerCallExpression('alert', transformAlert2ShowMessage);