flakiness 0.254.0 → 0.256.0

package/lib/cli/cli.js

@@ -1033,7 +1033,7 @@ import path7 from "path";
 // ../package.json
 var package_default = {
   name: "@flakiness/monorepo",
-  version: "0.254.0",
+  version: "0.256.0",
   type: "module",
   private: true,
   scripts: {
@@ -1514,7 +1514,7 @@ async function cmdAuthLogin(endpoint = DEFAULT_FLAKINESS_ENDPOINT) {
 }
 
 // src/cli/cmd-convert.ts
-import { CIUtils, GitWorktree, writeReport } from "@flakiness/sdk";
+import { CIUtils, GitWorktree, ReportUtils as ReportUtils2, writeReport } from "@flakiness/sdk";
 import fs3 from "fs/promises";
 import path3 from "path";
 
@@ -1643,14 +1643,6 @@ async function traverseJUnitReport(context, node) {
       report.suites.push(newSuite);
     }
     currentSuite = newSuite;
-    const metadata = getProperties(element);
-    if (metadata.length) {
-      currentEnv = structuredClone(currentEnv);
-      currentEnv.metadata ??= {};
-      for (const [key, value] of metadata)
-        currentEnv.metadata[key] = value;
-      currentEnvIndex = report.environments.push(currentEnv) - 1;
-    }
   } else if (element.name === "testcase") {
     assert(currentSuite);
     const file = element.attributes["file"];
@@ -1733,7 +1725,7 @@ async function traverseJUnitReport(context, node) {
 }
 async function parseJUnit(xmls, options) {
   const report = {
-    category: "junit",
+    category: options.category ?? "junit",
     commitId: options.commitId,
     duration: options.runDuration,
     startTimestamp: options.runStartTimestamp,
@@ -1803,9 +1795,11 @@ async function cmdConvert(junitPath, options) {
   }
   const { report, attachments } = await parseJUnit(xmlContents, {
     commitId,
-    defaultEnv: { name: options.envName },
+    defaultEnv: ReportUtils2.createEnvironment({ name: options.envName }),
     runStartTimestamp: Date.now(),
-    runDuration: 0
+    runDuration: 0,
+    runUrl: CIUtils.runUrl(),
+    category: options.category
   });
   report.title = options.title ?? CIUtils.runTitle();
   if (options.flakinessProject)
@@ -2436,13 +2430,14 @@ program.command("show").description("Show flakiness report").argument("[relative
     reportViewerUrl: options.viewerUrl
   });
 }));
-program.command("convert-junit").description("Convert JUnit XML report(s) to Flakiness report format").argument("<junit-root-dir-path>", "Path to JUnit XML file or directory containing XML files").option("--env-name <name>", "Environment name for the report", "junit").option("--commit-id <id>", "Git commit ID (auto-detected if not provided)").addOption(new Option("--title <title>", "Human-readable report title (auto-detected from CI if not provided)").env("FLAKINESS_TITLE")).option("--output-dir <dir>", "Output directory for the report", "flakiness-report").addOption(optFlakinessProject).action(async (junitPath, options) => {
+program.command("convert-junit").description("Convert JUnit XML report(s) to Flakiness report format").argument("<junit-root-dir-path>", "Path to JUnit XML file or directory containing XML files").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 if not provided)").addOption(new Option("--title <title>", "Human-readable report title (auto-detected from CI if not provided)").env("FLAKINESS_TITLE")).option("--output-dir <dir>", "Output directory for the report", "flakiness-report").option("-c, --category <category>", "Report category identifier (e.g. bun, rust). Defaults to `junit`.").addOption(optFlakinessProject).action(async (junitPath, options) => {
   await runCommand(async () => {
     await cmdConvert(junitPath, {
-      envName: options.envName,
+      envName: options.envName ?? options.category ?? "junit",
       outputDir: options.outputDir,
       commitId: options.commitId,
       title: options.title,
+      category: options.category,
       flakinessProject: options.project
     });
   });

package/lib/junit.js

@@ -123,14 +123,6 @@ async function traverseJUnitReport(context, node) {
       report.suites.push(newSuite);
     }
     currentSuite = newSuite;
-    const metadata = getProperties(element);
-    if (metadata.length) {
-      currentEnv = structuredClone(currentEnv);
-      currentEnv.metadata ??= {};
-      for (const [key, value] of metadata)
-        currentEnv.metadata[key] = value;
-      currentEnvIndex = report.environments.push(currentEnv) - 1;
-    }
   } else if (element.name === "testcase") {
     assert(currentSuite);
     const file = element.attributes["file"];
@@ -213,7 +205,7 @@ async function traverseJUnitReport(context, node) {
 }
 async function parseJUnit(xmls, options) {
   const report = {
-    category: "junit",
+    category: options.category ?? "junit",
     commitId: options.commitId,
     duration: options.runDuration,
     startTimestamp: options.runStartTimestamp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flakiness",
-  "version": "0.254.0",
+  "version": "0.256.0",
   "private": false,
   "bin": {
     "flakiness": "./lib/cli/cli.js"
@@ -23,8 +23,8 @@
     "@types/debug": "^4.1.13",
     "@types/express": "^4.17.25",
     "gray-matter": "^4.0.3",
-    "@flakiness/shared": "0.254.0",
-    "@flakiness/server": "0.254.0"
+    "@flakiness/server": "0.256.0",
+    "@flakiness/shared": "0.256.0"
   },
   "dependencies": {
     "@flakiness/flakiness-report": "^0.33.0",