ortoni-report 4.0.1-beta.3 → 4.0.1

package/changelog.md

@@ -1,5 +1,22 @@
 # Change Log:
 
+## V4.0.1
+
+- **Improvemnts:**
+
+  - UI (Glance page)
+  - Fix: Chart where Y axis is cropped
+  - Fix: Project logo not showing #97
+
+- **Merge Report**
+
+  - Playwright blob report feature is now available in Ortoni Report #83
+  - GitHub action support - [Refer the project for example](https://github.com/ortoniKC/pw-test)
+  - use the command to merge report
+    ```bash
+    npx ortoni-report merge-report
+    ```
+
 ## V4.0.0
 
 #### 🚨 Breaking Changes

package/dist/cli.js

@@ -682,14 +682,14 @@ async function mergeAllData(options = {}) {
     if (b.idx === null) return -1;
     return a.idx - b.idx;
   }).map((x) => x.f);
-  const dedupeByTestId = true;
-  const resultsById = /* @__PURE__ */ new Map();
+  const allResults = [];
   const projectSet = /* @__PURE__ */ new Set();
   let totalDurationSum = 0;
-  let totalDurationMax = 0;
   let mergedUserConfig = null;
   let mergedUserMeta = null;
   const badShards = [];
+  const shardCounts = {};
+  const shardDurMap = {};
   for (const file of sortedFiles) {
     const fullPath = path3.join(folderPath, file);
     try {
@@ -702,26 +702,25 @@ async function mergeAllData(options = {}) {
         badShards.push(file);
         continue;
       }
-      for (const r of shardData.results) {
-        const id = r.key;
-        if (dedupeByTestId) {
-          if (!resultsById.has(id)) {
-            resultsById.set(id, r);
-          } else {
-            console.info(
-              `Ortoni Report: Duplicate test ${id} found in ${file} \u2014 keeping first occurrence.`
-            );
-          }
-        } else {
-          resultsById.set(`${id}::${Math.random().toString(36).slice(2)}`, r);
-        }
-      }
+      shardData.results.forEach((r) => allResults.push(r));
+      shardCounts[file] = shardData.results.length;
       if (Array.isArray(shardData.projectSet)) {
-        for (const p of shardData.projectSet) projectSet.add(p);
+        shardData.projectSet.forEach((p) => projectSet.add(p));
+      }
+      const rawShardDur = shardData.totalDuration;
+      let durToAdd = 0;
+      let perTestSum = 0;
+      if (typeof rawShardDur === "number") {
+        durToAdd = rawShardDur;
+      } else {
+        perTestSum = Array.isArray(shardData.results) ? shardData.results.reduce(
+          (acc, t) => acc + (Number(t?.duration) || 0),
+          0
+        ) : 0;
+        durToAdd = perTestSum;
       }
-      const dur = Number(shardData.duration) || 0;
-      totalDurationSum += dur;
-      if (dur > totalDurationMax) totalDurationMax = dur;
+      totalDurationSum += durToAdd;
+      shardDurMap[file] = durToAdd;
       if (shardData.userConfig) {
         if (!mergedUserConfig) mergedUserConfig = { ...shardData.userConfig };
         else {
@@ -757,7 +756,6 @@ async function mergeAllData(options = {}) {
       badShards
     );
   }
-  const allResults = Array.from(resultsById.values());
   const totalDuration = totalDurationSum;
   const saveHistoryFromOptions = typeof options.saveHistory === "boolean" ? options.saveHistory : void 0;
   const saveHistoryFromShard = mergedUserConfig && typeof mergedUserConfig.saveHistory === "boolean" ? mergedUserConfig.saveHistory : void 0;
@@ -798,19 +796,23 @@ async function mergeAllData(options = {}) {
     dbManager
   );
   const finalReportData = await htmlGenerator.generateFinalReport(
+    // filteredResults: typically filter out skipped for display (keeps existing behavior)
     allResults.filter((r) => r.status !== "skipped"),
     totalDuration,
     allResults,
     projectSet
+    // pass Set<string> as original generateFinalReport expects
   );
   const fileManager = new FileManager(folderPath);
   const outputFileName = options.file || "ortoni-report.html";
-  const outputPath = await fileManager.writeReportFile(
+  const outputPath = fileManager.writeReportFile(
     outputFileName,
     finalReportData
   );
-  console.log(`\u2705 Final merged report generated at ${outputPath}`);
-  if (runId) console.log(`\u2705 DB runId: ${runId}`);
+  console.log(`\u2705 Final merged report generated at ${await outputPath}`);
+  console.log(`\u2705 Shards merged: ${sortedFiles.length}`);
+  console.log(`\u2705 Tests per shard:`, shardCounts);
+  console.log(`\u2705 Total tests merged ${allResults.length}`);
 }
 
 // src/utils/expressServer.ts

package/dist/cli.mjs

@@ -38,14 +38,14 @@ async function mergeAllData(options = {}) {
     if (b.idx === null) return -1;
     return a.idx - b.idx;
   }).map((x) => x.f);
-  const dedupeByTestId = true;
-  const resultsById = /* @__PURE__ */ new Map();
+  const allResults = [];
   const projectSet = /* @__PURE__ */ new Set();
   let totalDurationSum = 0;
-  let totalDurationMax = 0;
   let mergedUserConfig = null;
   let mergedUserMeta = null;
   const badShards = [];
+  const shardCounts = {};
+  const shardDurMap = {};
   for (const file of sortedFiles) {
     const fullPath = path.join(folderPath, file);
     try {
@@ -58,26 +58,25 @@ async function mergeAllData(options = {}) {
         badShards.push(file);
         continue;
       }
-      for (const r of shardData.results) {
-        const id = r.key;
-        if (dedupeByTestId) {
-          if (!resultsById.has(id)) {
-            resultsById.set(id, r);
-          } else {
-            console.info(
-              `Ortoni Report: Duplicate test ${id} found in ${file} \u2014 keeping first occurrence.`
-            );
-          }
-        } else {
-          resultsById.set(`${id}::${Math.random().toString(36).slice(2)}`, r);
-        }
-      }
+      shardData.results.forEach((r) => allResults.push(r));
+      shardCounts[file] = shardData.results.length;
       if (Array.isArray(shardData.projectSet)) {
-        for (const p of shardData.projectSet) projectSet.add(p);
+        shardData.projectSet.forEach((p) => projectSet.add(p));
+      }
+      const rawShardDur = shardData.totalDuration;
+      let durToAdd = 0;
+      let perTestSum = 0;
+      if (typeof rawShardDur === "number") {
+        durToAdd = rawShardDur;
+      } else {
+        perTestSum = Array.isArray(shardData.results) ? shardData.results.reduce(
+          (acc, t) => acc + (Number(t?.duration) || 0),
+          0
+        ) : 0;
+        durToAdd = perTestSum;
       }
-      const dur = Number(shardData.duration) || 0;
-      totalDurationSum += dur;
-      if (dur > totalDurationMax) totalDurationMax = dur;
+      totalDurationSum += durToAdd;
+      shardDurMap[file] = durToAdd;
       if (shardData.userConfig) {
         if (!mergedUserConfig) mergedUserConfig = { ...shardData.userConfig };
         else {
@@ -113,7 +112,6 @@ async function mergeAllData(options = {}) {
       badShards
     );
   }
-  const allResults = Array.from(resultsById.values());
   const totalDuration = totalDurationSum;
   const saveHistoryFromOptions = typeof options.saveHistory === "boolean" ? options.saveHistory : void 0;
   const saveHistoryFromShard = mergedUserConfig && typeof mergedUserConfig.saveHistory === "boolean" ? mergedUserConfig.saveHistory : void 0;
@@ -154,19 +152,23 @@ async function mergeAllData(options = {}) {
     dbManager
   );
   const finalReportData = await htmlGenerator.generateFinalReport(
+    // filteredResults: typically filter out skipped for display (keeps existing behavior)
     allResults.filter((r) => r.status !== "skipped"),
     totalDuration,
     allResults,
     projectSet
+    // pass Set<string> as original generateFinalReport expects
   );
   const fileManager = new FileManager(folderPath);
   const outputFileName = options.file || "ortoni-report.html";
-  const outputPath = await fileManager.writeReportFile(
+  const outputPath = fileManager.writeReportFile(
     outputFileName,
     finalReportData
   );
-  console.log(`\u2705 Final merged report generated at ${outputPath}`);
-  if (runId) console.log(`\u2705 DB runId: ${runId}`);
+  console.log(`\u2705 Final merged report generated at ${await outputPath}`);
+  console.log(`\u2705 Shards merged: ${sortedFiles.length}`);
+  console.log(`\u2705 Tests per shard:`, shardCounts);
+  console.log(`\u2705 Total tests merged ${allResults.length}`);
 }
 
 // src/cli.ts