@flakiness/sdk 0.115.0 → 0.118.0

package/lib/cli/cli.js

@@ -745,7 +745,7 @@ import fs2 from "fs";
 import path2 from "path";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import assert from "assert";
 import { spawnSync } from "child_process";
 import crypto from "crypto";
@@ -938,7 +938,7 @@ async function resolveAttachmentPaths(report, attachmentsDir) {
   const filenameToPath = new Map(attachmentFiles.map((file) => [path.basename(file), file]));
   const attachmentIdToPath = /* @__PURE__ */ new Map();
   const missingAttachments = /* @__PURE__ */ new Set();
-  FlakinessReport.visitTests(report, (test) => {
+  ReportUtils.visitTests(report, (test) => {
     for (const attempt of test.attempts) {
       for (const attachment of attempt.attachments ?? []) {
         const attachmentPath = filenameToPath.get(attachment.id);
@@ -1158,7 +1158,8 @@ import fs5 from "fs/promises";
 import path5 from "path";
 
 // src/junit.ts
-import { FlakinessReport as FK } from "@flakiness/report";
+import { FlakinessReport as FK } from "@flakiness/flakiness-report";
+import { ReportUtils as ReportUtils2 } from "@flakiness/report";
 import { parseXml, XmlElement, XmlText } from "@rgrove/parse-xml";
 import assert2 from "assert";
 import fs4 from "fs";
@@ -1345,7 +1346,7 @@ async function parseJUnit(xmls, options) {
       await traverseJUnitReport(context, element);
   }
   return {
-    report: FK.dedupeSuitesTestsEnvironments(report),
+    report: ReportUtils2.dedupeSuitesTestsEnvironments(report),
     attachments: Array.from(context.attachments.values())
   };
 }
@@ -1772,7 +1773,8 @@ import fs10 from "fs/promises";
 import path8 from "path";
 
 // src/playwrightJSONReport.ts
-import { FlakinessReport as FK2, FlakinessReport as FlakinessReport2 } from "@flakiness/report";
+import { FlakinessReport } from "@flakiness/flakiness-report";
+import { ReportUtils as ReportUtils3 } from "@flakiness/report";
 import debug2 from "debug";
 import { posix as posixPath2 } from "path";
 var dlog = debug2("flakiness:json-report");
@@ -1807,7 +1809,7 @@ var PlaywrightJSONReport;
     };
     const configPath = jsonReport.config.configFile ? gitFilePath(context.gitRoot, normalizePath(jsonReport.config.configFile)) : void 0;
     const report = {
-      category: FlakinessReport2.CATEGORY_PLAYWRIGHT,
+      category: FlakinessReport.CATEGORY_PLAYWRIGHT,
       commitId: metadata.commitId,
       configPath,
       url: metadata.runURL,
@@ -1825,7 +1827,7 @@ var PlaywrightJSONReport;
       context.projectId2environmentIdx.set(jsonReport.config.projects[envIdx].id, envIdx);
     report.suites = await Promise.all(jsonReport.suites.map((suite) => parseJSONSuite(context, suite)));
     return {
-      report: FK2.dedupeSuitesTestsEnvironments(report),
+      report: ReportUtils3.dedupeSuitesTestsEnvironments(report),
       attachments: [...context.attachments.values()],
       unaccessibleAttachmentPaths: context.unaccessibleAttachmentPaths
     };

package/lib/cli/cmd-convert.js

@@ -5,14 +5,15 @@ import fs3 from "fs/promises";
 import path2 from "path";
 
 // src/junit.ts
-import { FlakinessReport as FK } from "@flakiness/report";
+import { FlakinessReport as FK } from "@flakiness/flakiness-report";
+import { ReportUtils as ReportUtils2 } from "@flakiness/report";
 import { parseXml, XmlElement, XmlText } from "@rgrove/parse-xml";
 import assert2 from "assert";
 import fs2 from "fs";
 import path from "path";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import assert from "assert";
 import { spawnSync } from "child_process";
 import crypto from "crypto";
@@ -328,7 +329,7 @@ async function parseJUnit(xmls, options) {
       await traverseJUnitReport(context, element);
   }
   return {
-    report: FK.dedupeSuitesTestsEnvironments(report),
+    report: ReportUtils2.dedupeSuitesTestsEnvironments(report),
     attachments: Array.from(context.attachments.values())
   };
 }

package/lib/cli/cmd-link.js

@@ -3,7 +3,7 @@ import fs from "fs";
 import path2 from "path";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import assert from "assert";
 import { spawnSync } from "child_process";
 import http from "http";

package/lib/cli/cmd-login.js

@@ -17,7 +17,7 @@ import path from "path";
 import { TypedHTTP } from "@flakiness/shared/common/typedHttp.js";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import http from "http";
 import https from "https";
 var FLAKINESS_DBG = !!process.env.FLAKINESS_DBG;

package/lib/cli/cmd-logout.js

@@ -7,7 +7,7 @@ import path from "path";
 import { TypedHTTP } from "@flakiness/shared/common/typedHttp.js";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import http from "http";
 import https from "https";
 var FLAKINESS_DBG = !!process.env.FLAKINESS_DBG;

package/lib/cli/cmd-show-report.js

@@ -8,7 +8,7 @@ import fs2 from "fs";
 import path2 from "path";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import assert from "assert";
 import { spawnSync } from "child_process";
 import fs from "fs";
@@ -115,7 +115,7 @@ async function resolveAttachmentPaths(report, attachmentsDir) {
   const filenameToPath = new Map(attachmentFiles.map((file) => [path.basename(file), file]));
   const attachmentIdToPath = /* @__PURE__ */ new Map();
   const missingAttachments = /* @__PURE__ */ new Set();
-  FlakinessReport.visitTests(report, (test) => {
+  ReportUtils.visitTests(report, (test) => {
     for (const attempt of test.attempts) {
       for (const attachment of attempt.attachments ?? []) {
         const attachmentPath = filenameToPath.get(attachment.id);

package/lib/cli/cmd-status.js

@@ -3,7 +3,7 @@ import fs from "fs";
 import path2 from "path";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import assert from "assert";
 import { spawnSync } from "child_process";
 import http from "http";

package/lib/cli/cmd-unlink.js

@@ -3,7 +3,7 @@ import fs from "fs";
 import path2 from "path";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import assert from "assert";
 import { spawnSync } from "child_process";
 import http from "http";

package/lib/cli/cmd-upload-playwright-json.js

@@ -5,12 +5,13 @@ import fs3 from "fs/promises";
 import path2 from "path";
 
 // src/playwrightJSONReport.ts
-import { FlakinessReport as FK, FlakinessReport as FlakinessReport2 } from "@flakiness/report";
+import { FlakinessReport } from "@flakiness/flakiness-report";
+import { ReportUtils as ReportUtils2 } from "@flakiness/report";
 import debug from "debug";
 import { posix as posixPath2 } from "path";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import assert from "assert";
 import { spawnSync } from "child_process";
 import crypto from "crypto";
@@ -291,7 +292,7 @@ var PlaywrightJSONReport;
     };
     const configPath = jsonReport.config.configFile ? gitFilePath(context.gitRoot, normalizePath(jsonReport.config.configFile)) : void 0;
     const report = {
-      category: FlakinessReport2.CATEGORY_PLAYWRIGHT,
+      category: FlakinessReport.CATEGORY_PLAYWRIGHT,
       commitId: metadata.commitId,
       configPath,
       url: metadata.runURL,
@@ -309,7 +310,7 @@ var PlaywrightJSONReport;
       context.projectId2environmentIdx.set(jsonReport.config.projects[envIdx].id, envIdx);
     report.suites = await Promise.all(jsonReport.suites.map((suite) => parseJSONSuite(context, suite)));
     return {
-      report: FK.dedupeSuitesTestsEnvironments(report),
+      report: ReportUtils2.dedupeSuitesTestsEnvironments(report),
       attachments: [...context.attachments.values()],
       unaccessibleAttachmentPaths: context.unaccessibleAttachmentPaths
     };

package/lib/cli/cmd-upload.js

@@ -15,7 +15,7 @@ import { URL } from "url";
 import { TypedHTTP } from "@flakiness/shared/common/typedHttp.js";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import fs from "fs";
 import http from "http";
 import https from "https";
@@ -108,7 +108,7 @@ async function resolveAttachmentPaths(report, attachmentsDir) {
   const filenameToPath = new Map(attachmentFiles.map((file) => [path.basename(file), file]));
   const attachmentIdToPath = /* @__PURE__ */ new Map();
   const missingAttachments = /* @__PURE__ */ new Set();
-  FlakinessReport.visitTests(report, (test) => {
+  ReportUtils.visitTests(report, (test) => {
     for (const attempt of test.attempts) {
       for (const attachment of attempt.attachments ?? []) {
         const attachmentPath = filenameToPath.get(attachment.id);

package/lib/cli/cmd-whoami.js

@@ -9,7 +9,7 @@ import path from "path";
 import { TypedHTTP } from "@flakiness/shared/common/typedHttp.js";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import http from "http";
 import https from "https";
 var FLAKINESS_DBG = !!process.env.FLAKINESS_DBG;

package/lib/flakinessConfig.js

@@ -3,7 +3,7 @@ import fs from "fs";
 import path2 from "path";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import assert from "assert";
 import { spawnSync } from "child_process";
 import http from "http";

package/lib/flakinessSession.js

@@ -7,7 +7,7 @@ import path from "path";
 import { TypedHTTP } from "@flakiness/shared/common/typedHttp.js";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import http from "http";
 import https from "https";
 var FLAKINESS_DBG = !!process.env.FLAKINESS_DBG;

package/lib/junit.js

@@ -1,12 +1,13 @@
 // src/junit.ts
-import { FlakinessReport as FK } from "@flakiness/report";
+import { FlakinessReport as FK } from "@flakiness/flakiness-report";
+import { ReportUtils as ReportUtils2 } from "@flakiness/report";
 import { parseXml, XmlElement, XmlText } from "@rgrove/parse-xml";
 import assert from "assert";
 import fs2 from "fs";
 import path from "path";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import crypto from "crypto";
 import fs from "fs";
 import http from "http";
@@ -300,7 +301,7 @@ async function parseJUnit(xmls, options) {
       await traverseJUnitReport(context, element);
   }
   return {
-    report: FK.dedupeSuitesTestsEnvironments(report),
+    report: ReportUtils2.dedupeSuitesTestsEnvironments(report),
     attachments: Array.from(context.attachments.values())
   };
 }

package/lib/localReportServer.js

@@ -88,7 +88,7 @@ var localReportRouter = {
 };
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import fs2 from "fs";
 import http from "http";
 import https from "https";
@@ -181,7 +181,7 @@ async function resolveAttachmentPaths(report, attachmentsDir) {
   const filenameToPath = new Map(attachmentFiles.map((file) => [path.basename(file), file]));
   const attachmentIdToPath = /* @__PURE__ */ new Map();
   const missingAttachments = /* @__PURE__ */ new Set();
-  FlakinessReport.visitTests(report, (test) => {
+  ReportUtils.visitTests(report, (test) => {
     for (const attempt of test.attempts) {
       for (const attachment of attempt.attachments ?? []) {
         const attachmentPath = filenameToPath.get(attachment.id);

package/lib/playwright-test.js

@@ -1,5 +1,5 @@
 // src/playwright-test.ts
-import { FlakinessReport as FK } from "@flakiness/report";
+import { ReportUtils as ReportUtils2 } from "@flakiness/report";
 import { Multimap } from "@flakiness/shared/common/multimap.js";
 import chalk2 from "chalk";
 import fs8 from "fs";
@@ -15,7 +15,7 @@ import fs2 from "fs";
 import path2 from "path";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import assert from "assert";
 import { spawnSync } from "child_process";
 import crypto from "crypto";
@@ -205,7 +205,7 @@ async function resolveAttachmentPaths(report, attachmentsDir) {
   const filenameToPath = new Map(attachmentFiles.map((file) => [path.basename(file), file]));
   const attachmentIdToPath = /* @__PURE__ */ new Map();
   const missingAttachments = /* @__PURE__ */ new Set();
-  FlakinessReport.visitTests(report, (test) => {
+  ReportUtils.visitTests(report, (test) => {
     for (const attempt of test.attempts) {
       for (const attachment of attempt.attachments ?? []) {
         const attachmentPath = filenameToPath.get(attachment.id);
@@ -1030,7 +1030,7 @@ var FlakinessReporter = class {
     for (let envIdx = 0; envIdx < environments.length; ++envIdx)
       context.project2environmentIdx.set(this._config.projects[envIdx], envIdx);
     const relatedCommitIds = this._options.relatedCommitIds;
-    const report = FK.dedupeSuitesTestsEnvironments({
+    const report = ReportUtils2.dedupeSuitesTestsEnvironments({
       category: "playwright",
       commitId,
       relatedCommitIds,

package/lib/playwrightJSONReport.js

@@ -1,10 +1,11 @@
 // src/playwrightJSONReport.ts
-import { FlakinessReport as FK, FlakinessReport as FlakinessReport2 } from "@flakiness/report";
+import { FlakinessReport } from "@flakiness/flakiness-report";
+import { ReportUtils as ReportUtils2 } from "@flakiness/report";
 import debug from "debug";
 import { posix as posixPath2 } from "path";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import assert from "assert";
 import { spawnSync } from "child_process";
 import crypto from "crypto";
@@ -285,7 +286,7 @@ var PlaywrightJSONReport;
     };
     const configPath = jsonReport.config.configFile ? gitFilePath(context.gitRoot, normalizePath(jsonReport.config.configFile)) : void 0;
     const report = {
-      category: FlakinessReport2.CATEGORY_PLAYWRIGHT,
+      category: FlakinessReport.CATEGORY_PLAYWRIGHT,
       commitId: metadata.commitId,
       configPath,
       url: metadata.runURL,
@@ -303,7 +304,7 @@ var PlaywrightJSONReport;
       context.projectId2environmentIdx.set(jsonReport.config.projects[envIdx].id, envIdx);
     report.suites = await Promise.all(jsonReport.suites.map((suite) => parseJSONSuite(context, suite)));
     return {
-      report: FK.dedupeSuitesTestsEnvironments(report),
+      report: ReportUtils2.dedupeSuitesTestsEnvironments(report),
       attachments: [...context.attachments.values()],
       unaccessibleAttachmentPaths: context.unaccessibleAttachmentPaths
     };

package/lib/reportUploader.js

@@ -8,7 +8,7 @@ import { URL } from "url";
 import { TypedHTTP } from "@flakiness/shared/common/typedHttp.js";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import http from "http";
 import https from "https";
 var FLAKINESS_DBG = !!process.env.FLAKINESS_DBG;

package/lib/serverapi.js

@@ -2,7 +2,7 @@
 import { TypedHTTP } from "@flakiness/shared/common/typedHttp.js";
 
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import http from "http";
 import https from "https";
 var FLAKINESS_DBG = !!process.env.FLAKINESS_DBG;

package/lib/utils.js

@@ -1,5 +1,5 @@
 // src/utils.ts
-import { FlakinessReport } from "@flakiness/report";
+import { ReportUtils } from "@flakiness/report";
 import assert from "assert";
 import { spawnSync } from "child_process";
 import crypto from "crypto";
@@ -192,7 +192,7 @@ async function resolveAttachmentPaths(report, attachmentsDir) {
   const filenameToPath = new Map(attachmentFiles.map((file) => [path.basename(file), file]));
   const attachmentIdToPath = /* @__PURE__ */ new Map();
   const missingAttachments = /* @__PURE__ */ new Set();
-  FlakinessReport.visitTests(report, (test) => {
+  ReportUtils.visitTests(report, (test) => {
     for (const attempt of test.attempts) {
       for (const attachment of attempt.attachments ?? []) {
         const attachmentPath = filenameToPath.get(attachment.id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flakiness/sdk",
-  "version": "0.115.0",
+  "version": "0.118.0",
   "private": false,
   "bin": {
     "flakiness": "./lib/cli/cli.js"
@@ -10,29 +10,29 @@
       "types": "./types/src/localReportApi.d.ts"
     },
     "./uploader": {
+      "types": "./types/src/reportUploader.d.ts",
       "import": "./lib/reportUploader.js",
-      "require": "./lib/reportUploader.js",
-      "types": "./types/src/reportUploader.d.ts"
+      "require": "./lib/reportUploader.js"
     },
     "./utils": {
+      "types": "./types/src/utils.d.ts",
       "import": "./lib/utils.js",
-      "require": "./lib/utils.js",
-      "types": "./types/src/utils.d.ts"
+      "require": "./lib/utils.js"
     },
     "./playwright": {
+      "types": "./types/src/playwrightJSONReport.d.ts",
       "import": "./lib/playwrightJSONReport.js",
-      "require": "./lib/playwrightJSONReport.js",
-      "types": "./types/src/playwrightJSONReport.d.ts"
+      "require": "./lib/playwrightJSONReport.js"
     },
     "./junit": {
+      "types": "./types/src/junit.d.ts",
       "import": "./lib/junit.js",
-      "require": "./lib/junit.js",
-      "types": "./types/src/junit.d.ts"
+      "require": "./lib/junit.js"
     },
     "./playwright-test": {
+      "types": "./types/src/playwright-test.d.ts",
       "import": "./lib/playwright-test.js",
-      "require": "./lib/playwright-test.js",
-      "types": "./types/src/playwright-test.d.ts"
+      "require": "./lib/playwright-test.js"
     }
   },
   "type": "module",
@@ -45,7 +45,7 @@
   "author": "Degu Labs, Inc",
   "license": "Fair Source 100",
   "devDependencies": {
-    "@flakiness/server": "0.115.0",
+    "@flakiness/server": "0.118.0",
     "@playwright/test": "^1.54.0",
     "@types/babel__code-frame": "^7.0.6",
     "@types/compression": "^1.8.1",
@@ -53,8 +53,9 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.26.2",
-    "@flakiness/report": "0.115.0",
-    "@flakiness/shared": "0.115.0",
+    "@flakiness/flakiness-report": "^0.11.1",
+    "@flakiness/report": "0.118.0",
+    "@flakiness/shared": "0.118.0",
     "@rgrove/parse-xml": "^4.2.0",
     "body-parser": "^1.20.3",
     "chalk": "^5.6.2",