@testomatio/reporter 2.3.9-beta-bin-fix → 2.4.0

package/lib/utils/utils.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateSuiteId = exports.testRunnerHelper = exports.specificTestInfo = exports.parseSuite = exports.isValidUrl = exports.humanize = exports.getTestomatIdFromTestTitle = exports.getCurrentDateTime = exports.foundedTestLog = exports.fileSystem = exports.fetchFilesFromStackTrace = exports.fetchIdFromOutput = exports.fetchIdFromCode = exports.fetchSourceCodeFromStackTrace = exports.fetchSourceCode = exports.isSameTest = exports.ansiRegExp = exports.SUITE_ID_REGEX = exports.TEST_ID_REGEX = void 0;
+exports.validateSuiteId = exports.testRunnerHelper = exports.specificTestInfo = exports.parseSuite = exports.isValidUrl = exports.humanize = exports.getTestomatIdFromTestTitle = exports.getGitCommitSha = exports.getCurrentDateTime = exports.foundedTestLog = exports.fileSystem = exports.fetchFilesFromStackTrace = exports.fetchIdFromOutput = exports.fetchIdFromCode = exports.fetchSourceCodeFromStackTrace = exports.fetchSourceCode = exports.isSameTest = exports.ansiRegExp = exports.SUITE_ID_REGEX = exports.TEST_ID_REGEX = void 0;
 exports.getPackageVersion = getPackageVersion;
 exports.truncate = truncate;
 exports.cleanLatestRunId = cleanLatestRunId;
@@ -45,6 +45,7 @@ exports.readLatestRunId = readLatestRunId;
 exports.removeColorCodes = removeColorCodes;
 exports.storeRunId = storeRunId;
 exports.transformEnvVarToBoolean = transformEnvVarToBoolean;
+exports.applyFilter = applyFilter;
 const url_1 = require("url");
 const path_1 = __importStar(require("path"));
 const picocolors_1 = __importDefault(require("picocolors"));
@@ -53,6 +54,7 @@ const is_valid_path_1 = __importDefault(require("is-valid-path"));
 const debug_1 = __importDefault(require("debug"));
 const os_1 = __importDefault(require("os"));
 const url_2 = require("url");
+const child_process_1 = require("child_process");
 const debug = (0, debug_1.default)('@testomatio/reporter:util');
 // Use __dirname directly since we're compiling to CommonJS
 // prettier-ignore
@@ -98,6 +100,22 @@ const validateSuiteId = suiteId => {
     return match ? match[0] : null;
 };
 exports.validateSuiteId = validateSuiteId;
+/**
+ * Gets current git commit SHA
+ * @returns {String|null} git commit SHA or null if not available
+ */
+const getGitCommitSha = () => {
+    try {
+        const sha = (0, child_process_1.execSync)('git rev-parse --short HEAD', {
+            stdio: ['ignore', 'pipe', 'ignore']
+        }).toString().trim();
+        return sha || null;
+    }
+    catch (error) {
+        return null;
+    }
+};
+exports.getGitCommitSha = getGitCommitSha;
 const ansiRegExp = () => {
     const pattern = [
         '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
@@ -116,19 +134,26 @@ const isValidUrl = s => {
     }
 };
 exports.isValidUrl = isValidUrl;
-const fileMatchRegex = /file:(\/+(?:[A-Za-z]:[\\/]|\/)?[^\s]*?\.(png|avi|webm|jpg|html|txt))/gi;
+const fileMatchRegex = /file:(\/*)([A-Za-z]:[\\/].*?|\/.*?)\.(png|avi|webm|jpg|html|txt)/gi;
 const fetchFilesFromStackTrace = (stack = '', checkExists = true) => {
-    const files = Array.from(stack.matchAll(fileMatchRegex))
-        .map(f => f[1].trim())
+    let files = Array.from(stack.matchAll(fileMatchRegex))
+        .map(match => {
+        // match[0] is full match, match[1] is slashes, match[2] is path, match[3] is extension
+        const slashes = match[1] || '';
+        const path = match[2];
+        const extension = match[3];
+        return `${slashes}${path}.${extension}`;
+    })
+        .map(f => f.trim())
         .map(f => f.replace(/^\/+/, '/').replace(/^\/([A-Za-z]:)/, '$1')) // Remove extra slashes, handle Windows paths
         .map(f => {
-        // Convert Windows paths to Linux paths for testing purposes
-        if (f.match(/^[A-Za-z]:[\\\/]/)) {
-            // Convert Windows path to Linux equivalent for test scenarios
-            return f.replace(/^[A-Za-z]:[\\\/]/, '/').replace(/\\/g, '/');
-        }
-        return f;
+        // Normalize path separators for cross-platform compatibility
+        return f.replace(/\\/g, '/');
     });
+    // If we're not checking file existence, remove Windows drive letters for consistency
+    if (!checkExists) {
+        files = files.map(f => f.replace(/^([A-Za-z]):/, ''));
+    }
     debug('Found files in stack trace: ', files);
     return files.filter(f => {
         if (!checkExists)
@@ -144,19 +169,88 @@ const fetchSourceCodeFromStackTrace = (stack = '') => {
     const stackLines = stack
         .split('\n')
         .filter(l => l.includes(':'))
-        // .map(l => l.match(/\[(.*?)\]/)?.[1] || l) // minitest format
-        // .map(l => l.split(':')[0])
         .map(l => l.trim())
-        .map(l => l.split(' ').find(p => p.includes(':')) || '')
-        .filter(l => (0, is_valid_path_1.default)(l?.split(':')[0]))
+        .map(l => {
+        // Remove 'at ' prefix if present
+        if (l.startsWith('at ')) {
+            return l.substring(3).trim();
+        }
+        // Find the part that looks like a file path with line number
+        const parts = l.split(' ');
+        for (const part of parts) {
+            // Check if this part has a colon
+            if (part.includes(':')) {
+                // For Windows paths, we need to handle drive letters (C:, D:, etc.)
+                // Split by colon but keep drive letter with the path
+                const colonParts = part.split(':');
+                let filePath;
+                // Check if first part is a Windows drive letter (single letter)
+                if (colonParts.length >= 2 && colonParts[0].length === 1 && /[A-Za-z]/.test(colonParts[0])) {
+                    // Windows path like D:\path\file.php:24
+                    // Reconstruct as D:\path\file.php
+                    filePath = colonParts[0] + ':' + colonParts[1];
+                }
+                else {
+                    // Unix path like /path/file.php:24
+                    filePath = colonParts[0];
+                }
+                // Only consider it valid if the file exists
+                if (fs_1.default.existsSync(filePath)) {
+                    return part;
+                }
+            }
+        }
+        // If no valid file path found in parts, return the whole line
+        // It will be filtered out later if it's not a valid file path
+        return parts.find(p => p.includes(':')) || l;
+    })
+        .filter(l => {
+        // Extract file path from line (accounting for Windows drive letters)
+        if (!l)
+            return false;
+        const colonParts = l.split(':');
+        let filePath;
+        if (colonParts.length >= 2 && colonParts[0].length === 1 && /[A-Za-z]/.test(colonParts[0])) {
+            // Windows path
+            filePath = colonParts[0] + ':' + colonParts[1];
+        }
+        else {
+            // Unix path
+            filePath = colonParts[0];
+        }
+        return filePath && fs_1.default.existsSync(filePath);
+    })
         // // filter out 3rd party libs
         .filter(l => !l?.includes(`vendor${path_1.sep}`))
         .filter(l => !l?.includes(`node_modules${path_1.sep}`))
-        .filter(l => fs_1.default.existsSync(l.split(':')[0]))
-        .filter(l => fs_1.default.lstatSync(l.split(':')[0]).isFile());
+        .filter(l => {
+        // Extract file path for final check (accounting for Windows drive letters)
+        const colonParts = l.split(':');
+        let filePath;
+        if (colonParts.length >= 2 && colonParts[0].length === 1 && /[A-Za-z]/.test(colonParts[0])) {
+            filePath = colonParts[0] + ':' + colonParts[1];
+        }
+        else {
+            filePath = colonParts[0];
+        }
+        return fs_1.default.lstatSync(filePath).isFile();
+    });
     if (!stackLines.length)
         return '';
-    const [file, line] = stackLines[0].split(':');
+    // Extract file and line number (accounting for Windows drive letters)
+    const firstLine = stackLines[0];
+    const colonParts = firstLine.split(':');
+    let file, line;
+    if (colonParts.length >= 3 && colonParts[0].length === 1 && /[A-Za-z]/.test(colonParts[0])) {
+        // Windows path like D:\path\file.php:24
+        file = colonParts[0] + ':' + colonParts[1];
+        line = colonParts[2];
+    }
+    else {
+        // Unix path like /path/file.php:24
+        file = colonParts[0];
+        line = colonParts[1];
+    }
     const prepend = 3;
     const source = fetchSourceCode(fs_1.default.readFileSync(file).toString(), { line, prepend, limit: 7 });
     if (!source)
@@ -174,6 +268,8 @@ exports.fetchSourceCodeFromStackTrace = fetchSourceCodeFromStackTrace;
 exports.TEST_ID_REGEX = /@T([\w\d]{8})/;
 exports.SUITE_ID_REGEX = /@S([\w\d]{8})/;
 const fetchIdFromCode = (code, opts = {}) => {
+    if (!code)
+        return null;
     const comments = code
         .split('\n')
         .map(l => l.trim())
@@ -216,10 +312,58 @@ const fetchSourceCode = (contents, opts = {}) => {
                 lineIndex = lines.findIndex(l => l.includes(`${title}(`));
         }
         else if (opts.lang === 'csharp') {
-            if (lineIndex === -1)
-                lineIndex = lines.findIndex(l => l.includes(`public void ${title}`));
-            if (lineIndex === -1)
-                lineIndex = lines.findIndex(l => l.includes(`${title}(`));
+            // Find the method declaration line
+            let methodLineIndex = lines.findIndex(l => l.includes(`public void ${title}(`));
+            if (methodLineIndex === -1) {
+                methodLineIndex = lines.findIndex(l => l.includes(`public async Task ${title}(`));
+            }
+            if (methodLineIndex === -1) {
+                methodLineIndex = lines.findIndex(l => l.includes(`${title}(`));
+            }
+            // If found, scan upwards to find [TestCase], [Test] attributes and XML comments
+            if (methodLineIndex !== -1) {
+                lineIndex = methodLineIndex;
+                // Scan upwards to find the start of attributes and comments
+                for (let i = methodLineIndex - 1; i >= 0; i--) {
+                    const trimmedLine = lines[i].trim();
+                    // Include [TestCase], [Test], and other attributes
+                    if (trimmedLine.startsWith('[')) {
+                        lineIndex = i;
+                        continue;
+                    }
+                    // Include XML documentation comments
+                    if (trimmedLine.startsWith('///')) {
+                        lineIndex = i;
+                        continue;
+                    }
+                    // Stop at empty lines (with some tolerance)
+                    if (trimmedLine === '') {
+                        // Check if next non-empty line is an attribute or comment
+                        let hasMoreAttributes = false;
+                        for (let j = i - 1; j >= 0; j--) {
+                            const nextTrimmed = lines[j].trim();
+                            if (nextTrimmed === '')
+                                continue;
+                            if (nextTrimmed.startsWith('[') || nextTrimmed.startsWith('///')) {
+                                hasMoreAttributes = true;
+                                lineIndex = j;
+                            }
+                            break;
+                        }
+                        if (!hasMoreAttributes)
+                            break;
+                        continue;
+                    }
+                    // Stop at other method declarations or class-level elements
+                    if (trimmedLine.includes('public ') ||
+                        trimmedLine.includes('private ') ||
+                        trimmedLine.includes('protected ') ||
+                        trimmedLine.includes('internal ')) {
+                        if (!trimmedLine.startsWith('['))
+                            break;
+                    }
+                }
+            }
         }
         else {
             lineIndex = lines.findIndex(l => l.includes(title));
@@ -228,11 +372,28 @@ const fetchSourceCode = (contents, opts = {}) => {
     if (opts.prepend) {
         lineIndex -= opts.prepend;
     }
-    if (lineIndex) {
+    if (lineIndex !== -1 && lineIndex !== undefined) {
         const result = [];
+        let braceDepth = 0; // Track brace depth for C# methods
+        let methodStartFound = false; // Flag to indicate we've found the method opening brace
         for (let i = lineIndex; i < lineIndex + limit; i++) {
             if (lines[i] === undefined)
                 continue;
+            // Track brace depth for C# to stop after method closes
+            if (opts.lang === 'csharp') {
+                const line = lines[i];
+                // Count opening and closing braces
+                const openBraces = (line.match(/\{/g) || []).length;
+                const closeBraces = (line.match(/\}/g) || []).length;
+                if (openBraces > 0)
+                    methodStartFound = true;
+                braceDepth += openBraces - closeBraces;
+                // If we've started the method and depth returns to 0, method is complete
+                if (methodStartFound && braceDepth === 0 && closeBraces > 0) {
+                    // Don't include the closing brace - just break
+                    break;
+                }
+            }
             if (i > lineIndex + 2 && !opts.prepend) {
                 // annotation
                 if (opts.lang === 'php' && lines[i].trim().startsWith('#['))
@@ -271,6 +432,24 @@ const fetchSourceCode = (contents, opts = {}) => {
                     break;
                 if (opts.lang === 'java' && lines[i].includes(' class '))
                     break;
+                // For C#, additional checks if brace tracking didn't stop us
+                if (opts.lang === 'csharp') {
+                    const trimmed = lines[i].trim();
+                    // Stop at attribute that marks beginning of next test (but not if we're still in the current method)
+                    if (trimmed.match(/^\[(Test|TestCase|Theory|Fact)/) && methodStartFound && braceDepth === 0)
+                        break;
+                    // Stop at XML documentation comments that belong to next method
+                    if (trimmed.startsWith('///') && methodStartFound && braceDepth === 0)
+                        break;
+                    // Stop at another method declaration (but not if we're still in the current method)
+                    if (trimmed.match(/^\s*(public|private|protected|internal)\s+(\w+|async\s+\w+)\s+\w+\s*\(/) &&
+                        methodStartFound &&
+                        braceDepth === 0)
+                        break;
+                    // Stop at class declaration
+                    if (trimmed.includes(' class ') && trimmed.includes('public'))
+                        break;
+                }
             }
             result.push(lines[i]);
         }
@@ -471,10 +650,62 @@ function transformEnvVarToBoolean(value) {
     return Boolean(value);
 }
 function truncate(s, size = 255) {
-    if (s.toString().trim().length < size) {
-        return s.toString();
+    if (s === undefined || s === null) {
+        return '';
     }
-    return `${s.toString().substring(0, size)}...`;
+    const str = s.toString();
+    if (str.trim().length < size) {
+        return str;
+    }
+    return `${str.substring(0, size)}...`;
+}
+function applyFilter(command, tests) {
+    if (!tests || !tests.length)
+        return command;
+    const lower = (command || '').toLowerCase();
+    const regexPattern = `(${tests.join('|')})`;
+    if (lower.includes('jest')) {
+        return `${command} --testNamePattern ${regexPattern}`;
+    }
+    if (lower.includes('cypress')) {
+        const grepValue = tests.join(',');
+        const baseEnv = {
+            grep: grepValue,
+            grepFilterSpecs: true,
+            grepOmitFiltered: true,
+        };
+        if (command.includes('--env')) {
+            return command.replace(/--env\s+(['"]?)([^\s'"]+)\1/, (match, quote, envVal) => {
+                const existingEnv = {};
+                if (envVal.startsWith('{') && envVal.endsWith('}')) {
+                    try {
+                        Object.assign(existingEnv, JSON.parse(envVal));
+                    }
+                    catch (e) {
+                    }
+                }
+                if (!Object.keys(existingEnv).length) {
+                    envVal.split(',').forEach((pair) => {
+                        const [k, v] = pair.split('=');
+                        if (!k)
+                            return;
+                        if (v === 'true')
+                            existingEnv[k] = true;
+                        else if (v === 'false')
+                            existingEnv[k] = false;
+                        else
+                            existingEnv[k] = v;
+                    });
+                }
+                const merged = { ...existingEnv, ...baseEnv };
+                const json = JSON.stringify(merged);
+                return `--env ${json}`;
+            });
+        }
+        const json = JSON.stringify(baseEnv);
+        return `${command} --env ${json}`;
+    }
+    return `${command} --grep ${regexPattern}`;
 }
 
 module.exports.getPackageVersion = getPackageVersion;
@@ -493,12 +724,16 @@ module.exports.storeRunId = storeRunId;
 
 module.exports.transformEnvVarToBoolean = transformEnvVarToBoolean;
 
+module.exports.applyFilter = applyFilter;
+
 module.exports.getTestomatIdFromTestTitle = getTestomatIdFromTestTitle;
 
 module.exports.parseSuite = parseSuite;
 
 module.exports.validateSuiteId = validateSuiteId;
 
+module.exports.getGitCommitSha = getGitCommitSha;
+
 module.exports.ansiRegExp = ansiRegExp;
 
 module.exports.isValidUrl = isValidUrl;

package/lib/xmlReader.d.ts

@@ -19,25 +19,11 @@ declare class XmlReader {
     tests: any[];
     stats: {};
     uploader: S3Uploader;
+    enhancedNunit: boolean;
+    groupParameterized: boolean;
     version: any;
     connectAdapter(): import("./junit-adapter/adapter.js").default;
-    parse(fileName: any): {
-        status: string;
-        create_tests: boolean;
-        tests_count: number;
-        passed_count: number;
-        skipped_count: number;
-        failed_count: number;
-        tests: any;
-    } | {
-        status: any;
-        create_tests: boolean;
-        tests_count: number;
-        passed_count: number;
-        failed_count: number;
-        skipped_count: number;
-        tests: any[];
-    };
+    parse(fileName: any): any;
     processJUnit(jsonSuite: any): {
         create_tests: boolean;
         duration: number;
@@ -49,15 +35,14 @@ declare class XmlReader {
         tests: any[];
         tests_count: number;
     };
-    processNUnit(jsonSuite: any): {
-        status: any;
-        create_tests: boolean;
-        tests_count: number;
-        passed_count: number;
-        failed_count: number;
-        skipped_count: number;
-        tests: any[];
-    };
+    processNUnit(jsonSuite: any): any;
+    /**
+     * Check if the XML is actually NUnit format (has test-suite hierarchy)
+     * @param {Object} jsonSuite - Parsed XML suite object
+     * @returns {boolean} - True if this is NUnit XML format
+     */
+    isNUnitXml(jsonSuite: any): boolean;
+    processNUnitEnhanced(jsonSuite: any): any;
     processTRX(jsonSuite: any): {
         status: string;
         create_tests: boolean;
@@ -67,6 +52,27 @@ declare class XmlReader {
         failed_count: number;
         tests: any;
     };
+    _parseTRXTestDefinition(td: any): {
+        title: any;
+        example: any;
+        file: string;
+        description: any;
+        suite_title: any;
+        id: any;
+    };
+    _parseTRXTestResult(td: any, tests: any): {
+        suite_title: any;
+        title: any;
+        file: any;
+        description: any;
+        code: any;
+        run_time: number;
+        stack: any;
+        files: any;
+        create: boolean;
+        overwrite: boolean;
+    };
+    _mapTRXStatus(outcome: any): string;
     processXUnit(assemblies: any): {
         status: string;
         create_tests: boolean;