@flakiness/sdk 2.2.0 → 2.2.2

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-5qUBbhdeYquEDJyBxGAv2X%2522%257D)](https://flakiness.io/flakiness/nodejs-sdk)
+
 # Flakiness Node.js SDK
 
 The Flakiness SDK provides a comprehensive set of tools for creating and managing [Flakiness JSON Reports](https://github.com/flakiness/flakiness-report) in Node.js.

package/lib/browser.js

@@ -233,7 +233,6 @@ function deduplicateTestsSuitesEnvironments(report) {
     gEnvs.set(envId, env);
     gEnvIds.set(env, envId);
   }
-  const usedEnvIds = /* @__PURE__ */ new Set();
   function visitTests2(tests, suiteId) {
     for (const test of tests ?? []) {
       const testId = computeTestId(test, suiteId);
@@ -241,9 +240,6 @@ function deduplicateTestsSuitesEnvironments(report) {
       gTestIds.set(test, testId);
       gSuiteTests.set(suiteId, test);
       for (const attempt of test.attempts) {
-        const env = report.environments[attempt.environmentIdx ?? 0];
-        const envId = gEnvIds.get(env);
-        usedEnvIds.add(envId);
         if (attempt.annotations && !attempt.annotations.length)
           delete attempt.annotations;
         if (attempt.stdout && !attempt.stdout.length)
@@ -295,11 +291,11 @@ function deduplicateTestsSuitesEnvironments(report) {
   visitTests2(report.tests ?? [], "suiteless");
   for (const suite of report.suites ?? [])
     visitSuite(suite);
-  const newEnvironments = [...usedEnvIds];
-  const envIdToIndex = new Map(newEnvironments.map((envId, index) => [envId, index]));
+  const uniqueEnvIds = [...gEnvs.keys()];
+  const envIdToIndex = new Map(uniqueEnvIds.map((envId, index) => [envId, index]));
   return {
     ...report,
-    environments: newEnvironments.map((envId) => gEnvs.get(envId)),
+    environments: uniqueEnvIds.map((envId) => gEnvs.get(envId)),
     suites: transformSuites(report.suites ?? []),
     tests: transformTests(report.tests ?? [])
   };

package/lib/index.js

@@ -215,6 +215,12 @@ function randomUUIDBase62() {
 // src/gitWorktree.ts
 var log = debug("fk:git");
 var execAsync = promisify(exec);
+var GIT_SAFE_ENV = {
+  ...process.env,
+  GIT_CONFIG_COUNT: "1",
+  GIT_CONFIG_KEY_0: "safe.directory",
+  GIT_CONFIG_VALUE_0: "*"
+};
 var IS_WIN32_PATH = new RegExp("^[a-zA-Z]:\\\\", "i");
 var IS_ALMOST_POSIX_PATH = new RegExp("^[a-zA-Z]:/", "i");
 function toPosixAbsolutePath(absolutePath) {
@@ -259,7 +265,8 @@ var GitWorktree = class _GitWorktree {
   static create(somePathInsideGitRepo) {
     const root = shell(`git`, ["rev-parse", "--show-toplevel"], {
       cwd: somePathInsideGitRepo,
-      encoding: "utf-8"
+      encoding: "utf-8",
+      env: GIT_SAFE_ENV
     });
     assert(root, `FAILED: git rev-parse --show-toplevel HEAD @ ${somePathInsideGitRepo}`);
     return new _GitWorktree(root);
@@ -297,7 +304,8 @@ var GitWorktree = class _GitWorktree {
   headCommitId() {
     const sha = shell(`git`, ["rev-parse", "HEAD"], {
       cwd: this._gitRoot,
-      encoding: "utf-8"
+      encoding: "utf-8",
+      env: GIT_SAFE_ENV
     });
     assert(sha, `FAILED: git rev-parse HEAD @ ${this._gitRoot}`);
     return sha.trim();
@@ -390,7 +398,7 @@ async function listCommits(gitRoot, head, count) {
   ].join(FIELD_SEPARATOR);
   const command = `git log ${head} -n ${count} --pretty=format:"${prettyFormat}" -z`;
   try {
-    const { stdout } = await execAsync(command, { cwd: gitRoot });
+    const { stdout } = await execAsync(command, { cwd: gitRoot, env: GIT_SAFE_ENV });
     if (!stdout) {
       return [];
     }
@@ -891,7 +899,6 @@ function deduplicateTestsSuitesEnvironments(report) {
     gEnvs.set(envId, env);
     gEnvIds.set(env, envId);
   }
-  const usedEnvIds = /* @__PURE__ */ new Set();
   function visitTests2(tests, suiteId) {
     for (const test of tests ?? []) {
       const testId = computeTestId(test, suiteId);
@@ -899,9 +906,6 @@ function deduplicateTestsSuitesEnvironments(report) {
       gTestIds.set(test, testId);
       gSuiteTests.set(suiteId, test);
       for (const attempt of test.attempts) {
-        const env = report.environments[attempt.environmentIdx ?? 0];
-        const envId = gEnvIds.get(env);
-        usedEnvIds.add(envId);
         if (attempt.annotations && !attempt.annotations.length)
           delete attempt.annotations;
         if (attempt.stdout && !attempt.stdout.length)
@@ -953,11 +957,11 @@ function deduplicateTestsSuitesEnvironments(report) {
   visitTests2(report.tests ?? [], "suiteless");
   for (const suite of report.suites ?? [])
     visitSuite(suite);
-  const newEnvironments = [...usedEnvIds];
-  const envIdToIndex = new Map(newEnvironments.map((envId, index) => [envId, index]));
+  const uniqueEnvIds = [...gEnvs.keys()];
+  const envIdToIndex = new Map(uniqueEnvIds.map((envId, index) => [envId, index]));
   return {
     ...report,
-    environments: newEnvironments.map((envId) => gEnvs.get(envId)),
+    environments: uniqueEnvIds.map((envId) => gEnvs.get(envId)),
     suites: transformSuites(report.suites ?? []),
     tests: transformTests(report.tests ?? [])
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flakiness/sdk",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "private": false,
   "repository": {
     "type": "git",
@@ -26,6 +26,8 @@
   "license": "MIT",
   "devDependencies": {
     "@flakiness/flakiness-report": "^0.27.0",
+    "@flakiness/playwright": "^1.3.2",
+    "@playwright/test": "^1.58.2",
     "@types/debug": "^4.1.12",
     "@types/node": "^25.0.3",
     "esbuild": "^0.27.0",
@@ -34,7 +36,7 @@
     "typescript": "^5.6.2"
   },
   "peerDependencies": {
-    "@flakiness/flakiness-report": "^0.27.0"
+    "@flakiness/flakiness-report": ">=0.26.0 <1.0.0"
   },
   "dependencies": {
     "chalk": "^5.6.2",

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

@@ -1 +1 @@
-{"version":3,"file":"gitWorktree.d.ts","sourceRoot":"","sources":["../../src/gitWorktree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAY9D;;;;;GAKG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB,8CAA8C;IAC9C,QAAQ,EAAE,eAAe,CAAC,QAAQ,CAAC;IACnC,wDAAwD;IACxD,SAAS,EAAE,eAAe,CAAC,eAAe,CAAC;IAC3C,yCAAyC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,gCAAgC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mHAAmH;IACnH,OAAO,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAC;CACrC,CAAA;AAyCD;;;;GAIG;AACH,qBAAa,WAAW;IA4BV,OAAO,CAAC,QAAQ;IA3B5B;;;;;;;;;;;;;;;OAeG;IACH,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,MAAM;IAS3C,OAAO,CAAC,aAAa,CAAoB;gBAErB,QAAQ,EAAE,MAAM;IAIpC;;;;;;;;;;;;OAYG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;;;;;;;;;;OAYG;IACH,YAAY,IAAI,eAAe,CAAC,QAAQ;IASxC;;;;;;;;;;;;;;;;;;OAkBG;IACH,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,eAAe,CAAC,WAAW;IAI1D;;;;;;;;;;;;;;;;;;OAkBG;IACH,YAAY,CAAC,YAAY,EAAE,eAAe,CAAC,WAAW,GAAG,MAAM;IAI/D;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;CAGvD"}
+{"version":3,"file":"gitWorktree.d.ts","sourceRoot":"","sources":["../../src/gitWorktree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAwB9D;;;;;GAKG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB,8CAA8C;IAC9C,QAAQ,EAAE,eAAe,CAAC,QAAQ,CAAC;IACnC,wDAAwD;IACxD,SAAS,EAAE,eAAe,CAAC,eAAe,CAAC;IAC3C,yCAAyC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,gCAAgC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mHAAmH;IACnH,OAAO,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAC;CACrC,CAAA;AAyCD;;;;GAIG;AACH,qBAAa,WAAW;IA6BV,OAAO,CAAC,QAAQ;IA5B5B;;;;;;;;;;;;;;;OAeG;IACH,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,MAAM;IAU3C,OAAO,CAAC,aAAa,CAAoB;gBAErB,QAAQ,EAAE,MAAM;IAIpC;;;;;;;;;;;;OAYG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;;;;;;;;;;OAYG;IACH,YAAY,IAAI,eAAe,CAAC,QAAQ;IAUxC;;;;;;;;;;;;;;;;;;OAkBG;IACH,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,eAAe,CAAC,WAAW;IAI1D;;;;;;;;;;;;;;;;;;OAkBG;IACH,YAAY,CAAC,YAAY,EAAE,eAAe,CAAC,WAAW,GAAG,MAAM;IAI/D;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;CAGvD"}