@nasl/cli 0.2.2 → 0.2.3

package/dist/bin/nasl.mjs

@@ -29326,7 +29326,10 @@ function validateNormalFile(file, nameFromPath, namespace, errors) {
 function composeToString(files) {
     files.sort((a, b) => sorter(a.path, b.path));
     const errors = [];
+    let currentLine = 1;
     const result = files.map((file) => {
+        // 记录这个文件的开始行号
+        file.startLine = currentLine;
         const arr = file.path.split('.');
         const ext = arr.pop();
         const nameFromPath = arr.pop();
@@ -29352,7 +29355,14 @@ function composeToString(files) {
         else if (isThemeCss) {
             content = `  $theme\`${content}\`;`;
         }
-        return `namespace ${namespace} {\n${content}\n}\n`;
+        const fileContent = `namespace ${namespace} {\n${content}\n}\n`;
+        // 计算这个文件占用的行数（末尾 \n 导致 split 多一个空元素，减 1 得到实际行数）
+        const lineCount = fileContent.split('\n').length - 1;
+        // 记录这个文件的结束行号
+        file.endLine = currentLine + lineCount - 1;
+        // +1 是 join('\n') 在文件之间插入的换行符
+        currentLine = file.endLine + 2;
+        return fileContent;
     })
         .join('\n');
     if (errors.length > 0) {
@@ -38312,6 +38322,63 @@ async function tryCompile(entry, options) {
     }
 }
 
+/**
+ * 将错误信息中的行号映射回原始文件
+ * 直接替换错误头中的文件路径和行号，并调整代码片段中的行号
+ */
+function mapErrorToSourceFile(options) {
+    const { errorMessage, collectedFiles } = options;
+    // 构建行号到文件的映射
+    const lineToFileMap = new Map();
+    collectedFiles.forEach((file) => {
+        if (file.startLine !== undefined && file.endLine !== undefined) {
+            for (let i = file.startLine; i <= file.endLine; i++) {
+                const lineInFile = i - file.startLine;
+                lineToFileMap.set(i, { file, lineInFile });
+            }
+        }
+    });
+    // 处理单个错误块：替换路径、行号，调整代码片段行号
+    function processBlock(block) {
+        // 匹配错误头: 可选的 "N. " 前缀 + "filepath: message (line:col)"
+        const headerMatch = block.match(/^((?:\d+\.\s+)?)(.*?):\s+(.*?)\((\d+):(\d+)\)/);
+        if (!headerMatch)
+            return block;
+        const [fullHeader, prefix, , message, lineStr, colStr] = headerMatch;
+        const originalLine = parseInt(lineStr, 10);
+        const fileInfo = lineToFileMap.get(originalLine);
+        if (!fileInfo)
+            return block;
+        const { file, lineInFile } = fileInfo;
+        const lineOffset = originalLine - lineInFile;
+        // 替换错误头中的路径和行号
+        let mapped = block.replace(fullHeader, `${prefix}${file.path}: ${message}(${lineInFile}:${colStr})`);
+        // 收集代码片段中所有行号并计算映射后的值
+        const snippetNumbers = [];
+        const collectRegex = /^([> ]*?)(\d+)(\s*\|)/gm;
+        let m;
+        while ((m = collectRegex.exec(mapped)) !== null) {
+            snippetNumbers.push(parseInt(m[2], 10) - lineOffset);
+        }
+        // 替换代码片段中的行号，保持对齐
+        if (snippetNumbers.length > 0) {
+            const maxWidth = Math.max(...snippetNumbers.map((n) => String(n).length));
+            let idx = 0;
+            mapped = mapped.replace(/^([> ]*?)(\d+)(\s*\|)/gm, (fullMatch, lead) => {
+                const newNum = snippetNumbers[idx++];
+                if (newNum <= 0)
+                    return fullMatch;
+                const paddedNum = String(newNum).padStart(maxWidth);
+                return lead.includes('>') ? `> ${paddedNum} |` : `  ${paddedNum} |`;
+            });
+        }
+        return mapped;
+    }
+    // 按编号前缀分割为独立错误块，分别处理
+    const parts = errorMessage.split(/(?=^\d+\.\s)/m);
+    return parts.map(processBlock).join('');
+}
+
 /**
  * 检查命令 - 检查 NASL 代码的语法和语义
  */
@@ -38333,6 +38400,13 @@ async function check(entry, options) {
     }
     if (!result && fullNaturalTS) {
         result = (await checkApi(fullNaturalTS, config)).trim();
+        // 如果有错误，尝试映射回原始文件
+        if (result) {
+            result = mapErrorToSourceFile({
+                errorMessage: result,
+                collectedFiles,
+            });
+        }
     }
     const checkResult = {
         success: !result,
@@ -38765,7 +38839,7 @@ async function transform(transformType, entry, options) {
     await transformFn(entry, options);
 }
 
-var version = "0.2.2";
+var version = "0.2.3";
 var pkg = {
 	version: version};