flakiness 0.216.0 → 0.217.0

package/lib/cli/cli.js

@@ -1027,8 +1027,8 @@ import path7 from "path";
 
 // ../package.json
 var package_default = {
-  name: "flakiness",
-  version: "0.216.0",
+  name: "@flakiness/monorepo",
+  version: "0.217.0",
   type: "module",
   private: true,
   scripts: {
@@ -1036,7 +1036,7 @@ var package_default = {
     patch: "./version.mjs patch",
     dev: "pnpm kubik --env-file=.env.dev -w $(find . -name build.mts) ./app.mts ./github_webhooks.mts",
     "dev+billing": "pnpm kubik --env-file=.env.dev+billing -w $(find . -name build.mts) ./app.mts ./stripe_webhooks.mts ./github_webhooks.mts",
-    prod: "pnpm kubik --env-file=.env.prodlocal -w ./cli/build.mts ./server.mts ./web/build.mts ./experimental/build.mts ./landing/build.mts ./github_webhooks.mts",
+    prod: "pnpm kubik --env-file=.env.prodlocal -w ./cli/build.mts ./server.mts ./docs/build.mts ./web/build.mts ./experimental/build.mts ./landing/build.mts ./github_webhooks.mts",
     build: "pnpm kubik $(find . -name build.mts)",
     perf: "node --max-old-space-size=10240 --enable-source-maps --env-file=.env.prodlocal experimental/lib/perf_filter.js"
   },
@@ -1046,6 +1046,7 @@ var package_default = {
   author: "Degu Labs, Inc",
   license: "Fair Source 100",
   devDependencies: {
+    flakiness: "workspace:*",
     "@flakiness/playwright": "catalog:",
     "@playwright/test": "catalog:",
     "@types/node": "^22.19.3",
@@ -1511,6 +1512,7 @@ import fs3 from "fs/promises";
 import path3 from "path";
 
 // src/junit.ts
+import { FlakinessReport as FK } from "@flakiness/flakiness-report";
 import { ReportUtils } from "@flakiness/sdk";
 import { parseXml, XmlElement, XmlText } from "@rgrove/parse-xml";
 import assert from "assert";
@@ -1537,25 +1539,37 @@ function extractErrors(testcase) {
   const xmlErrors = testcase.children.filter((e2) => e2 instanceof XmlElement).filter((element) => element.name === "error" || element.name === "failure");
   if (!xmlErrors.length)
     return void 0;
-  const errors = [];
-  for (const xmlErr of xmlErrors) {
-    const message = [xmlErr.attributes["type"], xmlErr.attributes["message"]].filter((x) => !!x).join(" ");
-    const xmlStackNodes = xmlErr.children.filter((child) => child instanceof XmlText);
-    const stack = xmlStackNodes ? xmlStackNodes.map((node) => node.text).join("\n") : void 0;
-    errors.push({
-      message,
-      stack
-    });
-  }
-  return errors;
+  return xmlErrors.map((xmlErr) => parseError(xmlErr));
 }
-function extractStdout(testcase, stdio) {
-  const xmlStdio = testcase.children.filter((e2) => e2 instanceof XmlElement).filter((element) => element.name === stdio);
-  if (!xmlStdio.length)
-    return void 0;
-  return xmlStdio.map((node) => node.children.filter((node2) => node2 instanceof XmlText)).flat().map((txtNode) => ({
-    text: txtNode.text
-  }));
+function parseError(xmlErr, explicitStackTrace) {
+  const stackTraceContainer = explicitStackTrace ? xmlErr.children.find((child) => child instanceof XmlElement && child.name === "stackTrace") : xmlErr;
+  const xmlStackNodes = stackTraceContainer?.children.filter((child) => child instanceof XmlText);
+  let stack = xmlStackNodes ? xmlStackNodes.map((node) => node.text).join("\n") : void 0;
+  let message = "";
+  let stackPrefix = "";
+  for (const token of [xmlErr.attributes["type"], xmlErr.attributes["message"]]) {
+    if (!token)
+      continue;
+    message = (message ? message + " " : "") + token;
+    if (!stack?.includes(token))
+      stackPrefix = (stackPrefix ? stackPrefix + " " : "") + token;
+  }
+  if (stack && stackPrefix)
+    stack = stackPrefix + "\n" + stack;
+  return {
+    message,
+    stack
+  };
+}
+function extractStdIO(testcase) {
+  const xmlStdio = testcase.children.filter((e2) => e2 instanceof XmlElement).filter((element) => element.name === "system-out" || element.name === "system-err");
+  return xmlStdio.map((node) => {
+    return node.children.filter((child) => child instanceof XmlText).map((txtNode) => ({
+      stream: node.name === "system-out" ? FK.STREAM_STDOUT : FK.STREAM_STDERR,
+      text: txtNode.text,
+      dts: 0
+    }));
+  }).flat();
 }
 async function parseAttachment(value) {
   let absolutePath = path2.resolve(process.cwd(), value);
@@ -1567,7 +1581,7 @@ async function traverseJUnitReport(context, node) {
   const element = node;
   if (!(element instanceof XmlElement))
     return;
-  let { currentEnv, currentEnvIndex, currentSuite, report, currentTimeMs, attachments } = context;
+  let { currentEnv, currentEnvIndex, currentSuite, report, currentTimeMs } = context;
   if (element.attributes["timestamp"])
     currentTimeMs = new Date(element.attributes["timestamp"]).getTime();
   if (element.name === "testsuite") {
@@ -1606,19 +1620,16 @@ async function traverseJUnitReport(context, node) {
     const file = element.attributes["file"];
     const name = element.attributes["name"];
     const line = parseInt(element.attributes["line"], 10);
-    const timeMs = parseFloat(element.attributes["time"]) * 1e3;
-    const startTimestamp = currentTimeMs;
-    const duration = timeMs;
-    currentTimeMs += timeMs;
+    const duration = parseFloat(element.attributes["time"]) * 1e3;
     const annotations = [];
-    const attachments2 = [];
+    const attachments = [];
     for (const [key, value] of getProperties(element)) {
       if (key.toLowerCase().startsWith("attachment")) {
         if (context.ignoreAttachments)
           continue;
         const attachment = await parseAttachment(value);
         context.attachments.set(attachment.id, attachment);
-        attachments2.push({
+        attachments.push({
           id: attachment.id,
           contentType: attachment.contentType,
           //TODO: better default names for attachments?
@@ -1648,15 +1659,35 @@ async function traverseJUnitReport(context, node) {
         environmentIdx: currentEnvIndex,
         expectedStatus,
         annotations,
-        attachments: attachments2,
-        startTimestamp,
+        attachments,
+        startTimestamp: 0,
         duration,
         status: xmlSkippedAnnotation ? "skipped" : errors ? "failed" : "passed",
         errors,
-        stdout: extractStdout(element, "system-out"),
-        stderr: extractStdout(element, "system-err")
+        stdio: extractStdIO(element)
       }]
     };
+    for (const rerun of element.children.filter((child) => child instanceof XmlElement && ["rerunFailure", "rerunError", "flakyError", "flakyFailure"].includes(child.name))) {
+      const duration2 = parseFloat(rerun.attributes["time"] || "0") * 1e3;
+      const attempt = {
+        environmentIdx: currentEnvIndex,
+        expectedStatus,
+        annotations,
+        startTimestamp: 0,
+        duration: duration2,
+        status: "failed",
+        errors: [parseError(rerun, "explicit-stack-trace")],
+        stdio: extractStdIO(rerun)
+      };
+      if (rerun.name.startsWith("flaky"))
+        test.attempts.splice(test.attempts.length - 1, 0, attempt);
+      else
+        test.attempts.push(attempt);
+    }
+    for (const attempt of test.attempts) {
+      attempt.startTimestamp = currentTimeMs;
+      currentTimeMs += attempt.duration;
+    }
     currentSuite.tests ??= [];
     currentSuite.tests.push(test);
   }

package/lib/junit.js

@@ -1,4 +1,5 @@
 // src/junit.ts
+import { FlakinessReport as FK } from "@flakiness/flakiness-report";
 import { ReportUtils } from "@flakiness/sdk";
 import { parseXml, XmlElement, XmlText } from "@rgrove/parse-xml";
 import assert from "assert";
@@ -25,25 +26,37 @@ function extractErrors(testcase) {
   const xmlErrors = testcase.children.filter((e) => e instanceof XmlElement).filter((element) => element.name === "error" || element.name === "failure");
   if (!xmlErrors.length)
     return void 0;
-  const errors = [];
-  for (const xmlErr of xmlErrors) {
-    const message = [xmlErr.attributes["type"], xmlErr.attributes["message"]].filter((x) => !!x).join(" ");
-    const xmlStackNodes = xmlErr.children.filter((child) => child instanceof XmlText);
-    const stack = xmlStackNodes ? xmlStackNodes.map((node) => node.text).join("\n") : void 0;
-    errors.push({
-      message,
-      stack
-    });
+  return xmlErrors.map((xmlErr) => parseError(xmlErr));
+}
+function parseError(xmlErr, explicitStackTrace) {
+  const stackTraceContainer = explicitStackTrace ? xmlErr.children.find((child) => child instanceof XmlElement && child.name === "stackTrace") : xmlErr;
+  const xmlStackNodes = stackTraceContainer?.children.filter((child) => child instanceof XmlText);
+  let stack = xmlStackNodes ? xmlStackNodes.map((node) => node.text).join("\n") : void 0;
+  let message = "";
+  let stackPrefix = "";
+  for (const token of [xmlErr.attributes["type"], xmlErr.attributes["message"]]) {
+    if (!token)
+      continue;
+    message = (message ? message + " " : "") + token;
+    if (!stack?.includes(token))
+      stackPrefix = (stackPrefix ? stackPrefix + " " : "") + token;
   }
-  return errors;
+  if (stack && stackPrefix)
+    stack = stackPrefix + "\n" + stack;
+  return {
+    message,
+    stack
+  };
 }
-function extractStdout(testcase, stdio) {
-  const xmlStdio = testcase.children.filter((e) => e instanceof XmlElement).filter((element) => element.name === stdio);
-  if (!xmlStdio.length)
-    return void 0;
-  return xmlStdio.map((node) => node.children.filter((node2) => node2 instanceof XmlText)).flat().map((txtNode) => ({
-    text: txtNode.text
-  }));
+function extractStdIO(testcase) {
+  const xmlStdio = testcase.children.filter((e) => e instanceof XmlElement).filter((element) => element.name === "system-out" || element.name === "system-err");
+  return xmlStdio.map((node) => {
+    return node.children.filter((child) => child instanceof XmlText).map((txtNode) => ({
+      stream: node.name === "system-out" ? FK.STREAM_STDOUT : FK.STREAM_STDERR,
+      text: txtNode.text,
+      dts: 0
+    }));
+  }).flat();
 }
 async function parseAttachment(value) {
   let absolutePath = path.resolve(process.cwd(), value);
@@ -55,7 +68,7 @@ async function traverseJUnitReport(context, node) {
   const element = node;
   if (!(element instanceof XmlElement))
     return;
-  let { currentEnv, currentEnvIndex, currentSuite, report, currentTimeMs, attachments } = context;
+  let { currentEnv, currentEnvIndex, currentSuite, report, currentTimeMs } = context;
   if (element.attributes["timestamp"])
     currentTimeMs = new Date(element.attributes["timestamp"]).getTime();
   if (element.name === "testsuite") {
@@ -94,19 +107,16 @@ async function traverseJUnitReport(context, node) {
     const file = element.attributes["file"];
     const name = element.attributes["name"];
     const line = parseInt(element.attributes["line"], 10);
-    const timeMs = parseFloat(element.attributes["time"]) * 1e3;
-    const startTimestamp = currentTimeMs;
-    const duration = timeMs;
-    currentTimeMs += timeMs;
+    const duration = parseFloat(element.attributes["time"]) * 1e3;
     const annotations = [];
-    const attachments2 = [];
+    const attachments = [];
     for (const [key, value] of getProperties(element)) {
       if (key.toLowerCase().startsWith("attachment")) {
         if (context.ignoreAttachments)
           continue;
         const attachment = await parseAttachment(value);
         context.attachments.set(attachment.id, attachment);
-        attachments2.push({
+        attachments.push({
           id: attachment.id,
           contentType: attachment.contentType,
           //TODO: better default names for attachments?
@@ -136,15 +146,35 @@ async function traverseJUnitReport(context, node) {
         environmentIdx: currentEnvIndex,
         expectedStatus,
         annotations,
-        attachments: attachments2,
-        startTimestamp,
+        attachments,
+        startTimestamp: 0,
         duration,
         status: xmlSkippedAnnotation ? "skipped" : errors ? "failed" : "passed",
         errors,
-        stdout: extractStdout(element, "system-out"),
-        stderr: extractStdout(element, "system-err")
+        stdio: extractStdIO(element)
       }]
     };
+    for (const rerun of element.children.filter((child) => child instanceof XmlElement && ["rerunFailure", "rerunError", "flakyError", "flakyFailure"].includes(child.name))) {
+      const duration2 = parseFloat(rerun.attributes["time"] || "0") * 1e3;
+      const attempt = {
+        environmentIdx: currentEnvIndex,
+        expectedStatus,
+        annotations,
+        startTimestamp: 0,
+        duration: duration2,
+        status: "failed",
+        errors: [parseError(rerun, "explicit-stack-trace")],
+        stdio: extractStdIO(rerun)
+      };
+      if (rerun.name.startsWith("flaky"))
+        test.attempts.splice(test.attempts.length - 1, 0, attempt);
+      else
+        test.attempts.push(attempt);
+    }
+    for (const attempt of test.attempts) {
+      attempt.startTimestamp = currentTimeMs;
+      currentTimeMs += attempt.duration;
+    }
     currentSuite.tests ??= [];
     currentSuite.tests.push(test);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flakiness",
-  "version": "0.216.0",
+  "version": "0.217.0",
   "private": false,
   "bin": {
     "flakiness": "./lib/cli/cli.js"
@@ -22,8 +22,8 @@
     "@playwright/test": "^1.57.0",
     "@types/debug": "^4.1.12",
     "@types/express": "^4.17.20",
-    "@flakiness/server": "0.216.0",
-    "@flakiness/shared": "0.216.0"
+    "@flakiness/server": "0.217.0",
+    "@flakiness/shared": "0.217.0"
   },
   "dependencies": {
     "@flakiness/flakiness-report": "^0.28.0",