@lcap/nasl 4.4.0-beta.9 → 4.4.0-rc.2

package/out/natural/transforms/transform2LogicItem.js

@@ -3,11 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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.transform2NewRegex = 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.transformNode2Directory = exports.transformCall2Paginate = exports.transformCall2LogicWithAuth = exports.transformCall2Logic = exports.transformCall2CallViewLogic = exports.transformCall2Extension = exports.transformCall2Connector = exports.transformCall2Interface = void 0;
-const utils_1 = require("./utils");
+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.transform2NewRegex = 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.fixLogicNode = exports.flatIfStatementForMatch = exports.flatMatchPatternsExpression = exports.getSelectMembers = exports.unflatMemberExpression = exports.flatMemberExpression = exports.fixExpression = exports.TransformManager = void 0;
+exports.transform2LogicItem = exports.transform2DefaultValue = exports.transformNode2Directory = exports.transformCall2Paginate = exports.transformCall2LogicWithAuth = exports.transformCall2Logic = exports.transformCall2CallViewLogic = exports.transformCall2Extension = exports.transformCall2Connector = void 0;
+const utils_1 = require("../utils");
+const misc_1 = require("./utils/misc");
+const checkDataQueryCalleeNameOrder_1 = require("./checker/checkDataQueryCalleeNameOrder");
 const transform2TypeAnnotation_1 = require("./transform2TypeAnnotation");
-const utils_2 = require("../../utils");
+const transform2Param_1 = require("./transform2Param");
 const server_1 = __importDefault(require("../../server"));
 ;
 class TransformManager {
@@ -63,7 +65,7 @@ exports.TransformManager = TransformManager;
 function transformTSCode2SubLogic(node, options) {
     const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;
     const logic = new utils_1.naslTypes.SubLogic();
-    logic.name = options.transformType === 'logic' && options.logic?.getSubLogicUniqueName ? options.logic.getSubLogicUniqueName() : `subLogic_${(0, utils_2.uuidv4)().slice(0, 2)}`;
+    logic.name = options.transformType === 'logic' && options.logic?.getSubLogicUniqueName ? options.logic.getSubLogicUniqueName() : `subLogic_${(0, utils_1.uuidv4)().slice(0, 2)}`;
     logic.body = logic.body.slice(0, 1);
     let parameters = [];
     let statements = [];
@@ -77,7 +79,7 @@ function transformTSCode2SubLogic(node, options) {
         statements = [...node?.body?.directives, ...node?.body?.body];
     }
     parameters.forEach((node) => {
-        const param = transform2Param(node, options);
+        const param = (0, transform2Param_1.transform2Param)(node, options);
         if (param && !param?.typeAnnotation) {
             param.typeAnnotation = null;
         }
@@ -281,79 +283,6 @@ function fixLogicNode(node) {
     }
 }
 exports.fixLogicNode = fixLogicNode;
-function transform2Param(node, options) {
-    const exclude = ['event'];
-    if (node.type === 'ObjectProperty') {
-        const typeAnnotation = node?.value?.name ? utils_1.naslTypes.TypeAnnotation.createPrimitive((node?.value).name) : null;
-        const name = node.key.name;
-        if (exclude.includes(name))
-            return null;
-        let defaultValueExpression = node.key.optional ? { type: 'NullLiteral' } : undefined;
-        return new utils_1.naslTypes.Param({
-            name,
-            typeAnnotation,
-            defaultValue: defaultValueExpression && new utils_1.naslTypes.DefaultValue({
-                expression: transform2LogicItem(defaultValueExpression, { ...options, transformType: 'attr', isRestricted: true }),
-            }),
-        });
-    }
-    else if (node.type === 'TSPropertySignature') {
-        const typeAnnotation = node.typeAnnotation?.typeAnnotation;
-        const name = node.key.name;
-        if (exclude.includes(name))
-            return null;
-        let defaultValueExpression = node.optional ? { type: 'NullLiteral' } : undefined;
-        return new utils_1.naslTypes.Param({
-            name,
-            typeAnnotation: typeAnnotation && (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(typeAnnotation, options) || undefined,
-            defaultValue: defaultValueExpression && new utils_1.naslTypes.DefaultValue({
-                expression: transform2LogicItem(defaultValueExpression, { ...options, transformType: 'attr', isRestricted: true }),
-            }),
-        });
-    }
-    else if (node.type === 'Identifier') {
-        const typeAnnotation = node.typeAnnotation?.typeAnnotation;
-        const name = node.name;
-        if (exclude.includes(name))
-            return null;
-        let defaultValueExpression = node.optional ? { type: 'NullLiteral' } : undefined;
-        return new utils_1.naslTypes.Param({
-            name,
-            required: !node.optional,
-            typeAnnotation: typeAnnotation && (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(typeAnnotation, options) || undefined,
-            defaultValue: defaultValueExpression && new utils_1.naslTypes.DefaultValue({
-                expression: transform2LogicItem(defaultValueExpression, { ...options, transformType: 'attr', isRestricted: true }),
-            }),
-        });
-    }
-    else if (node.type === 'AssignmentPattern') {
-        const identifier = node.left;
-        const typeAnnotation = identifier.typeAnnotation?.typeAnnotation;
-        let defaultValueExpression;
-        if (node.type === 'AssignmentPattern') {
-            if (node.right)
-                defaultValueExpression = node.right;
-            else if (identifier.optional) {
-                defaultValueExpression = { type: 'NullLiteral' };
-            }
-        }
-        const exclude = ['event'];
-        const name = identifier.name;
-        if (exclude.includes(name))
-            return null;
-        return new utils_1.naslTypes.Param({
-            name,
-            typeAnnotation: typeAnnotation && (0, transform2TypeAnnotation_1.transform2TypeAnnotation)(typeAnnotation, options) || undefined,
-            defaultValue: defaultValueExpression && new utils_1.naslTypes.DefaultValue({
-                expression: transform2LogicItem(defaultValueExpression, { ...options, transformType: 'attr', isRestricted: true }),
-            }),
-        });
-    }
-    else {
-        return (0, utils_1.throwError)(options, '在输入参数中不支持节点类型', node);
-    }
-}
-exports.transform2Param = transform2Param;
 function transformCallExpressionToBinaryExpression(node, calleeName, callee, options) {
     const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;
     const argument = node?.arguments;
@@ -369,10 +298,11 @@ function transformCallExpressionToBinaryExpression(node, calleeName, callee, opt
         IN: 'in',
         IS_NULL: 'isNull',
     };
-    const limitMap = ['STARTS_WITH', 'ENDS_WITH', 'LIKE', 'IN', 'IS_NULL'];
-    if (limitMap.includes(calleeName) && options.transformType === 'logic' && !options.inCallQueryComponentField) {
-        return (0, utils_1.throwError)(options, `${calleeName} 仅支持在数据查询中使用`, node);
-    }
+    // 4.4版本支持使用: https://projectmanage.netease-official.lcap.163yun.com/dashboard/FeatureDetail?id=2903738850213120
+    // const limitMap = ['STARTS_WITH', 'ENDS_WITH', 'LIKE', 'IN', 'IS_NULL'];
+    // if (limitMap.includes(calleeName) && options.transformType === 'logic' && !options.inCallQueryComponentField) {
+    //   return throwError(options, `${calleeName} 仅支持在数据查询中使用`, node);
+    // }
     if (calleeName === 'IS_NULL') {
         return new utils_1.naslTypes.UnaryExpression({
             operator: 'isNull',
@@ -412,6 +342,13 @@ function collectExpressions(node, operator, expressions, options) {
         }
     }
 }
+/**
+ * 检查节点是否为 null 或 undefined
+ */
+function isNullOrUndefined(node) {
+    return (node?.type === 'NullLiteral' ||
+        (node?.type === 'Identifier' && node.name === 'undefined'));
+}
 function transform2VariadicExpression(node, options) {
     // 创建一个新的 VariadicExpression
     const result = {
@@ -430,13 +367,13 @@ function transform2BinaryExpression(node, options) {
         node.operator = '==';
     if (node.operator === '!==')
         node.operator = '!=';
-    if (node.operator === '==' && node.right?.type === 'NullLiteral' && options?.inCallQueryComponentField) {
+    if (node.operator === '==' && isNullOrUndefined(node.right) && options?.inCallQueryComponentField) {
         return new utils_1.naslTypes.UnaryExpression({
             operator: 'isNull',
             argument: transformNodeFunction(node.left, options),
         });
     }
-    if (node.operator === '!=' && node.right?.type === 'NullLiteral' && options?.inCallQueryComponentField) {
+    if (node.operator === '!=' && isNullOrUndefined(node.right) && options?.inCallQueryComponentField) {
         return new utils_1.naslTypes.UnaryExpression({
             operator: '!',
             argument: new utils_1.naslTypes.UnaryExpression({
@@ -623,7 +560,7 @@ function transform2ArrayPattern(decl, options) {
     }
     else {
         getVariableNode = new utils_1.naslTypes.Identifier({
-            name: `temp_${(0, utils_2.uuidv4)().slice(0, 4)}`,
+            name: `temp_${(0, utils_1.uuidv4)().slice(0, 4)}`,
         });
         logicItems.push(new utils_1.naslTypes.Assignment({
             left: getVariableNode,
@@ -839,13 +776,13 @@ function transform2SelectQueryFieldExpression(node, options) {
     let expression = node.value;
     let asNameNode = node.key;
     if (expression.type === 'Identifier') {
-        const isSameName = (0, utils_2.firstUpperCase)(asNameNode.name) === expression.name;
+        const isSameName = (0, utils_1.firstUpperCase)(asNameNode.name) === expression.name;
         if (!isSameName) {
-            return (0, utils_1.throwError)(options, `字段名需为 ${(0, utils_2.firstLowerCase)(expression.name)}, 目前为: ${asNameNode.name}, 相关代码如下`, node);
+            return (0, utils_1.throwError)(options, `字段名需为 ${(0, utils_1.firstLowerCase)(expression.name)}, 目前为: ${asNameNode.name}, 相关代码如下`, node);
         }
         return new utils_1.naslTypes.QueryFieldExpression({
             isDotStar: true,
-            asName: (0, utils_2.firstUpperCase)(asNameNode.name) === expression.name ? undefined : asNameNode.name,
+            asName: (0, utils_1.firstUpperCase)(asNameNode.name) === expression.name ? undefined : asNameNode.name,
             entityAsName: expression.name,
             propertyName: '',
         });
@@ -853,7 +790,7 @@ function transform2SelectQueryFieldExpression(node, options) {
     else if (expression.type === 'MemberExpression') {
         return new utils_1.naslTypes.QueryFieldExpression({
             isDotStar: false,
-            asName: (0, utils_2.firstUpperCase)(asNameNode.name) === expression.property.name ? undefined : asNameNode.name,
+            asName: (0, utils_1.firstUpperCase)(asNameNode.name) === expression.property.name ? undefined : asNameNode.name,
             entityAsName: expression.object.name,
             propertyName: expression.property.name,
         });
@@ -887,7 +824,7 @@ function transform2AnonymousFunction(node, options) {
         return (0, utils_1.throwError)(options, 'Anonymous function with block statement is not supported', node);
     const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;
     return new utils_1.naslTypes.AnonymousFunction({
-        params: node.params.map((param) => transform2Param(param, options)).filter(Boolean),
+        params: node.params.map((param) => (0, transform2Param_1.transform2Param)(param, options)).filter(Boolean),
         body: transformNodeFunction(node.body, options),
     });
 }
@@ -1024,6 +961,22 @@ function transform2StringInterpolation(node, options) {
             end: element.end,
         }))];
     expressions.sort((a, b) => a.start - b.start);
+    // 在数据查询组件字段中，将模板字符串转换为 SQL CONCAT 函数
+    if (options?.inCallQueryComponentField) {
+        const transformedExpressions = expressions
+            // 过滤掉空字符串
+            .filter((item) => !(item.type === 'StringLiteral' && item.value === ''))
+            .map((item) => transformNodeFunction(item, options))
+            .filter(Boolean);
+        return new utils_1.naslTypes.CallFunction({
+            calleeNamespace: 'nasl.sqlFunction',
+            calleeName: 'CONCAT',
+            arguments: transformedExpressions.map((expr, index) => new utils_1.naslTypes.Argument({
+                expression: expr,
+                keyword: `param${index + 1}`,
+            })),
+        });
+    }
     return new utils_1.naslTypes.StringInterpolation({
         expressions: expressions.map((item) => transformNodeFunction(item, options))?.filter(Boolean),
     });
@@ -1357,7 +1310,7 @@ function transformCallFunctionExpression2Match(node, calleeName, callee, options
                     return (0, utils_1.throwError)(options, 'Match Case 的 if 中只能写一个 return 语句', _case.consequent);
                 }
             }
-            let bodyNode = transformNodeFunction(argument, options);
+            let bodyNode = argument ? transformNodeFunction(argument, options) : undefined;
             let body = [];
             if (bodyNode) {
                 body = [bodyNode];
@@ -1616,7 +1569,7 @@ function transform2CallOtherNASLLogic(node, calleeName, callee, options) {
 }
 exports.transform2CallOtherNASLLogic = transform2CallOtherNASLLogic;
 function transform2CallFunction(node, calleeName, argument, options) {
-    calleeName = utils_1.replaceCallFunctionMap?.[calleeName] || calleeName;
+    calleeName = misc_1.replaceCallFunctionMap?.[calleeName] || calleeName;
     const func = server_1.default ? server_1.default.getBuildInFunction(calleeName) : null;
     let newArguments = argument.map((arg, index) => {
         let supportSubLogic = false;
@@ -1663,6 +1616,16 @@ function transform2CallFunction(node, calleeName, argument, options) {
             new utils_1.naslTypes.TypeAnnotation()
         ];
     }
+    if (calleeName === 'FromString') {
+        if (newTypeArguments?.[0]?.typeName === 'Time' && newArguments?.[0]?.expression?.concept === 'StringLiteral') {
+            const timeValue = newArguments?.[0]?.expression?.value;
+            // 验证时分秒格式：严格的 HH:mm:ss (两位数字)
+            const timeRegex = /^([0-1][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]$/;
+            if (timeValue && !timeRegex.test(timeValue)) {
+                return (0, utils_1.throwError)(options, `FromString<Time> 的参数值 "${timeValue}" 不符合时分秒格式，必须为 HH:mm:ss 格式`, node);
+            }
+        }
+    }
     if (func) {
         const needTypeMap = [
             'ListDistinctBy',
@@ -1709,6 +1672,14 @@ function transform2CallFunction(node, calleeName, argument, options) {
                     expression: utils_1.naslTypes.BaseNode.from(p.defaultExpression.toJSON()),
                 }));
             }
+            if (np && p?.defaultExpression?.concept === 'AnonymousFunction' && p?.name === 'by' && p?.parentKey === 'params') {
+                // 特殊处理下，因为 Params 中有默认行为，需要占个位
+                if (np.expression?.params) {
+                    np.expression.params.forEach((param) => {
+                        param.typeAnnotation = null;
+                    });
+                }
+            }
             // 类型不匹配时，使用默认值
             if (calleeName === "GetDateCount" && idx === func.params?.length - 1 && np?.expression?.concept !== 'StringLiteral') {
                 np &&
@@ -1751,13 +1722,13 @@ function transform2CallFunction(node, calleeName, argument, options) {
     }
     const nodeElement = new utils_1.naslTypes.CallFunction({
         calleeNamespace: 'nasl.util',
-        calleeName: utils_1.replaceCallFunctionMap?.[calleeName] || calleeName,
+        calleeName: misc_1.replaceCallFunctionMap?.[calleeName] || calleeName,
         arguments: newArguments,
         typeArguments: newTypeArguments
         // typeArguments: node?.typeParameters?.params.map((curType: any) => transform2TypeAnnotation({ ...curType, typeNamespace })),
     });
     if (calleeName === 'ListSort') {
-        const handledNode = (0, utils_1.handleListSort)(nodeElement?.toJSON(), options);
+        const handledNode = (0, misc_1.handleListSort)(nodeElement?.toJSON(), options);
         if (handledNode === null) {
             return (0, utils_1.throwError)(options, 'ListSort 函数使用错误，ListSort 定义如下：export function ListSort<T>(list: List<T>, ...fns: ((item: T) => { asc: Boolean, by: Boolean | Long | Decimal | String | Date | Time | DateTime; })[]): List<T>;', node);
         }
@@ -1792,7 +1763,7 @@ function transform2SqlFunction(node, calleeName, argument, options) {
     }));
     const nodeElement = new utils_1.naslTypes.CallFunction({
         calleeNamespace: 'nasl.sqlFunction',
-        calleeName: utils_1.replaceCallFunctionMap?.[calleeName] || calleeName,
+        calleeName: misc_1.replaceCallFunctionMap?.[calleeName] || calleeName,
         arguments: [...addArguments, ...newArguments],
         typeArguments: node?.typeParameters?.params.map((curType) => (0, transform2TypeAnnotation_1.transform2TypeAnnotation)({ ...curType }, options)).filter(Boolean),
         // typeArguments: node?.typeParameters?.params.map((curType: any) => transform2TypeAnnotation({ ...curType, typeNamespace })),
@@ -1912,12 +1883,12 @@ function transform2ForEachStatement(node, calleeName, callee, options) {
         each: transformNodeFunction(newCallee[0], options),
         start: transformNodeFunction(newCallee[1], options),
         end: newCallee[2]?.name === '__IDENTIFIER__' ? undefined : transformNodeFunction(newCallee[2], options),
-        item: arrowFunction?.params?.[0] ? transform2Param(arrowFunction.params[0], options) || undefined : new utils_1.naslTypes.Param({
+        item: arrowFunction?.params?.[0] ? (0, transform2Param_1.transform2Param)(arrowFunction.params[0], options, true) || undefined : new utils_1.naslTypes.Param({
             name: 'item',
             typeAnnotation: undefined,
         }),
-        index: arrowFunction?.params?.[1] ? transform2Param(arrowFunction.params[1], options) || undefined : new utils_1.naslTypes.Param({
-            name: `index_${(0, utils_2.uuidv4)().slice(0, 4)}`,
+        index: arrowFunction?.params?.[1] ? (0, transform2Param_1.transform2Param)(arrowFunction.params[1], options, true) || undefined : new utils_1.naslTypes.Param({
+            name: `index_${(0, utils_1.uuidv4)().slice(0, 4)}`,
             typeAnnotation: utils_1.naslTypes.TypeAnnotation.createPrimitive('Long'),
         }),
         body: transformBlockBody(body, options),
@@ -1960,12 +1931,12 @@ function transformForOf2ForEachStatement(node, options) {
             typeAnnotation: utils_1.naslTypes.TypeAnnotation.createPrimitive('Long'),
         }),
         end: endNode?.name === '__IDENTIFIER__' ? undefined : endNode ? transformNodeFunction(endNode, options) : undefined,
-        item: itemNode ? transform2Param(itemNode, options) || undefined : new utils_1.naslTypes.Param({
+        item: itemNode ? (0, transform2Param_1.transform2Param)(itemNode, options, true) || undefined : new utils_1.naslTypes.Param({
             name: 'item',
             typeAnnotation: undefined,
         }),
-        index: indexNode ? transform2Param(indexNode, options) || undefined : new utils_1.naslTypes.Param({
-            name: `index_${(0, utils_2.uuidv4)().slice(0, 2)}`,
+        index: indexNode ? (0, transform2Param_1.transform2Param)(indexNode, options, true) || undefined : new utils_1.naslTypes.Param({
+            name: `index_${(0, utils_1.uuidv4)().slice(0, 2)}`,
             typeAnnotation: utils_1.naslTypes.TypeAnnotation.createPrimitive('Long'),
         }),
         body: transformBlockBody(body, options),
@@ -1984,9 +1955,9 @@ function transformForEach2ForEachStatement(node, calleeName, callee, options) {
             value: '0',
             typeAnnotation: utils_1.naslTypes.TypeAnnotation.createPrimitive('Long'),
         }),
-        item: transform2Param(arrowFunction.params[0], options) || undefined,
-        index: arrowFunction.params[1] ? transform2Param(arrowFunction.params[1], options) || undefined : new utils_1.naslTypes.Param({
-            name: `index_${(0, utils_2.uuidv4)().slice(0, 2)}`,
+        item: (0, transform2Param_1.transform2Param)(arrowFunction.params[0], options) || undefined,
+        index: arrowFunction.params[1] ? (0, transform2Param_1.transform2Param)(arrowFunction.params[1], options) || undefined : new utils_1.naslTypes.Param({
+            name: `index_${(0, utils_1.uuidv4)().slice(0, 2)}`,
             typeAnnotation: utils_1.naslTypes.TypeAnnotation.createPrimitive('Long'),
         }),
         body: transformBlockBody(body, options),
@@ -2103,7 +2074,7 @@ exports.transformCall2CallViewLogic = transformCall2CallViewLogic;
 function transformCall2Logic(node, calleeName, callee, options) {
     if (options?.isRestricted)
         return (0, utils_1.throwError)(options, '调用逻辑不支持在组件或默认值表达式中使用，请尝试单独赋值', node);
-    if (utils_1.callFunctionMap.includes(calleeName)) {
+    if (misc_1.callFunctionMap.includes(calleeName)) {
         // 未带前缀，补一下
         return transform2CallFunction(node, calleeName, node?.arguments || [], options);
     }
@@ -2247,7 +2218,7 @@ function transformCall2DataQuery(node, calleeName, callee, options) {
     if (!flatted)
         return;
     const calleeNames = flatted && flatted.map((item) => item?.calleeName).filter((name) => name !== '$');
-    const isOrderCorrect = (0, utils_1.checkOQLCalleeNameOrder)(calleeNames);
+    const isOrderCorrect = (0, checkDataQueryCalleeNameOrder_1.checkDataQueryCalleeNameOrder)(calleeNames);
     if (!isOrderCorrect) {
         return (0, utils_1.throwError)(options, '调用顺序错误，期望的调用顺序为 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);
     }
@@ -2381,11 +2352,11 @@ function transformCall2DataQuery(node, calleeName, callee, options) {
                         }
                         const originName = arg.key?.name || '';
                         if (originName && originName.charAt(0) === originName.charAt(0).toUpperCase()) {
-                            const needName = (0, utils_2.firstLowerCase)(originName);
+                            const needName = (0, utils_1.firstLowerCase)(originName);
                             return (0, utils_1.throwError)(options, `SELECT 局部列第一层命名不符合规范, 应为${needName}, 但实际为${originName}`, node);
                         }
-                        const entityName = (0, utils_2.firstUpperCase)(originName);
-                        const needNameList = entityAsNames.map(item => (0, utils_2.firstLowerCase)(item))?.join('或');
+                        const entityName = (0, utils_1.firstUpperCase)(originName);
+                        const needNameList = entityAsNames.map(item => (0, utils_1.firstLowerCase)(item))?.join('或');
                         if (!entityAsNames.includes(entityName)) {
                             return (0, utils_1.throwError)(options, `SELECT 局部列第一层命名不符合规范, 应为${needNameList}, 但实际为${originName}`, node);
                         }
@@ -2535,6 +2506,24 @@ function transformNode2Directory(node) {
     return newNode;
 }
 exports.transformNode2Directory = transformNode2Directory;
+/**
+ * 将默认值表达式转换为 NASL DefaultValue 对象
+ */
+function transform2DefaultValue(node, options) {
+    const defaultValue = new utils_1.naslTypes.DefaultValue();
+    try {
+        const expression = transform2LogicItem(node, options);
+        if (expression) {
+            defaultValue.expression = expression;
+            return defaultValue;
+        }
+    }
+    catch (error) {
+        return (0, utils_1.throwError)(options, `默认值解析失败: ${error.message}`, node);
+    }
+    return undefined;
+}
+exports.transform2DefaultValue = transform2DefaultValue;
 function transform2LogicItem(node, options) {
     fixLogicNode(node);
     const transformNodeFunction = options?.transformNodeFunction || transform2LogicItem;