@flakiness/junit-xml 1.0.0 → 1.2.0

package/README.md

@@ -1,3 +1,5 @@
+[![Tests](https://img.shields.io/endpoint?url=https%3A%2F%2Fflakiness.io%2Fapi%2Fbadge%3Finput%3D%257B%2522badgeToken%2522%253A%2522badge-5GdyOe2e6TECpfSm9KgGAj%2522%257D)](https://flakiness.io/flakiness/junit-xml)
+
 # @flakiness/junit-xml
 
 Convert JUnit XML test reports into a Flakiness report and upload it to [flakiness.io](https://flakiness.io).

package/lib/cli.js

@@ -3,6 +3,7 @@ import { CIUtils, GitWorktree, ReportUtils, uploadReport, writeReport } from "@f
 import { Command, Option } from "commander";
 import fs from "node:fs/promises";
 import path from "node:path";
+import pkg from "../package.json" with { type: "json" };
 import { parseJUnit } from "./parser.js";
 const STDERR_LOGGER = {
   log: (...args) => console.error(...args),
@@ -12,7 +13,7 @@ const STDERR_LOGGER = {
 function envBool(name) {
   return ["1", "true"].includes(process.env[name]?.toLowerCase() ?? "");
 }
-const program = new Command("flakiness-junit-xml").description("Convert JUnit XML report(s) to a Flakiness report and upload it to flakiness.io").argument("<junit-path>", "Path to a JUnit XML file or a directory containing XML files").option("-c, --category <category>", "Report category identifier (e.g. `bun`, `rust`). Defaults to `junit`.").option("--env-name <name>", "Environment name for the report (defaults to --category, or `junit` if neither is set)").option("--commit-id <id>", "Git commit ID (auto-detected from the current working directory if not provided)").addOption(new Option("--title <title>", "Human-readable report title").env("FLAKINESS_TITLE")).option("--output-dir <dir>", "Output directory for the report", "flakiness-report").addOption(new Option("--flakiness-project <project>", "Flakiness project identifier in `org/project` format").env("FLAKINESS_PROJECT")).addOption(new Option("-p, --project <org/project>").hideHelp()).addOption(new Option("--token <token>", "Flakiness.io access token for upload").env("FLAKINESS_ACCESS_TOKEN")).option("--endpoint <url>", "Flakiness.io API endpoint override").addOption(new Option("--disable-upload", "Convert only; do not upload to flakiness.io").env("FLAKINESS_DISABLE_UPLOAD")).action(async (junitPath, options) => {
+const program = new Command("flakiness-junit-xml").description("Convert JUnit XML report(s) to a Flakiness report and upload it to flakiness.io").version(pkg.version, "-v, --version", "Output the version number").argument("<junit-path>", "Path to a JUnit XML file or a directory containing XML files").option("-c, --category <category>", "Report category identifier (e.g. `bun`, `rust`). Defaults to `junit`.").option("--env-name <name>", "Environment name for the report (defaults to --category, or `junit` if neither is set)").option("--commit-id <id>", "Git commit ID (auto-detected from the current working directory if not provided)").addOption(new Option("--title <title>", "Human-readable report title").env("FLAKINESS_TITLE")).option("--output-dir <dir>", "Output directory for the report", "flakiness-report").addOption(new Option("--flakiness-project <project>", "Flakiness project identifier in `org/project` format").env("FLAKINESS_PROJECT")).addOption(new Option("-p, --project <org/project>").hideHelp()).addOption(new Option("--token <token>", "Flakiness.io access token for upload").env("FLAKINESS_ACCESS_TOKEN")).option("--endpoint <url>", "Flakiness.io API endpoint override").addOption(new Option("--disable-upload", "Convert only; do not upload to flakiness.io").env("FLAKINESS_DISABLE_UPLOAD")).action(async (junitPath, options) => {
   await runConvert(junitPath, {
     envName: options.envName ?? options.category ?? "junit",
     outputDir: options.outputDir,

package/lib/parser.js

@@ -6,6 +6,10 @@ import fs from "fs";
 import mime from "mime";
 import path from "path";
 import { Temporal } from "temporal-polyfill";
+import pkg from "../package.json" with { type: "json" };
+function toGitFilePath(file) {
+  return file.split("\\").join("/");
+}
 let gTZAbbreviationToIANATimezone;
 function tzAbbreviationToIANA(tz) {
   if (!gTZAbbreviationToIANATimezone) {
@@ -103,14 +107,17 @@ async function traverseJUnitReport(context, node) {
     const file = element.attributes["file"];
     const line = parseInt(element.attributes["line"], 10);
     const name = element.attributes["name"];
+    const isTopSuiteAFileSuite = !currentSuite && !!name && name === file;
+    const isFileSuite = isTopSuiteAFileSuite || !name && file;
+    const filePath = file ? toGitFilePath(file) : void 0;
     const newSuite = {
-      title: name ?? file,
-      location: file && !isNaN(line) ? {
-        file,
+      title: isFileSuite && filePath ? filePath : name,
+      location: filePath && !isNaN(line) ? {
+        file: filePath,
         line,
         column: 1
       } : void 0,
-      type: name ? "suite" : file ? "file" : "anonymous suite",
+      type: isFileSuite ? "file" : name ? "suite" : "anonymous suite",
       suites: [],
       tests: []
     };
@@ -158,7 +165,7 @@ async function traverseJUnitReport(context, node) {
     const test = {
       title: name,
       location: file && !isNaN(line) ? {
-        file,
+        file: toGitFilePath(file),
         line,
         column: 1
       } : void 0,
@@ -206,6 +213,7 @@ async function parseJUnit(xmls, options) {
   const report = {
     category: options.category ?? "junit",
     commitId: options.commitId,
+    generatedBy: { name: pkg.name, version: pkg.version },
     duration: options.runDuration,
     startTimestamp: options.runStartTimestamp,
     url: options.runUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flakiness/junit-xml",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "private": false,
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "temporal-polyfill": "^0.3.2"
   },
   "devDependencies": {
-    "@playwright/test": "^1.57.0",
+    "@types/bun": "^1.3.14",
     "@types/node": "^25.0.3",
     "esbuild": "^0.27.2",
     "kubik": "^0.24.0",
@@ -44,6 +44,6 @@
   "scripts": {
     "build": "kubik build.mts",
     "watch": "kubik build.mts -w",
-    "test": "playwright test"
+    "test": "bun test tests/ --reporter=junit --reporter-outfile=junit.xml"
   }
 }

package/types/src/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/parser.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,eAAe,IAAI,EAAE,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AA2P7C,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE;IACxD,UAAU,EAAE,EAAE,CAAC,WAAW,CAAC;IAC3B,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC;IACtB,WAAW,EAAE,EAAE,CAAC,UAAU,CAAC;IAC3B,iBAAiB,EAAE,EAAE,CAAC,eAAe,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC,UAAU,EAAE,CAAA;CAAE,CAAC,CA+BxE"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/parser.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,eAAe,IAAI,EAAE,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AA6Q7C,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE;IACxD,UAAU,EAAE,EAAE,CAAC,WAAW,CAAC;IAC3B,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC;IACtB,WAAW,EAAE,EAAE,CAAC,UAAU,CAAC;IAC3B,iBAAiB,EAAE,EAAE,CAAC,eAAe,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC,UAAU,EAAE,CAAA;CAAE,CAAC,CAgCxE"}