@arghajit/dummy 0.3.41 → 0.3.43

package/dist/reporter/playwright-pulse-reporter.js

@@ -601,7 +601,8 @@ class PlaywrightPulseReporter {
         else {
             // Logic for appending/merging reports
             const pulseResultsDir = path.join(this.outputDir, this.individualReportsSubDir);
-            const individualReportPath = path.join(pulseResultsDir, `playwright-pulse-report-${Date.now()}.json`);
+            const shardPrefix = this.baseOutputFile.replace(".json", "-");
+            const individualReportPath = path.join(pulseResultsDir, `${shardPrefix}${Date.now()}.json`);
             try {
                 await this._ensureDirExists(pulseResultsDir);
                 await fs.writeFile(individualReportPath, JSON.stringify(finalReport, jsonReplacer, 2));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arghajit/dummy",
   "author": "Arghajit Singha",
-  "version": "0.3.41",
+  "version": "0.3.43",
   "description": "A Playwright reporter and dashboard for visualizing test results.",
   "homepage": "https://arghajit47.github.io/playwright-pulse/",
   "repository": {
@@ -35,7 +35,7 @@
   ],
   "license": "MIT",
   "bin": {
-    "logo": "node scripts/terminal-logo.mjs",
+    "logo": "scripts/terminal-logo.mjs",
     "generate-pulse-report": "scripts/generate-static-report.mjs",
     "generate-report": "scripts/generate-report.mjs",
     "merge-pulse-report": "scripts/merge-pulse-report.mjs",

package/scripts/config-reader.mjs

@@ -36,7 +36,7 @@ async function extractReporterOptionsFromConfig(configPath) {
   try {
     // Find the Pulse/Dummy reporter block
     // It usually looks like ["@arghajit/playwright-pulse-report", { ... }] or ["playwright-pulse-report", { ... }]
-    const reporterBlockRegex = /\[\s*["'](?:@arghajit\/)?(?:playwright-pulse-report|dummy)["']\s*,\s*(\{[\s\S]*?\})\s*\]/g;
+    const reporterBlockRegex = /\[\s*["'](?:@arghajit\/)?(?:playwright-pulse-report|dummy)["']\s*,\s*(\{[\s\S]*?\})\s*,?\s*\]/g;
     let match;
     while ((match = reporterBlockRegex.exec(fileContent)) !== null) {
       const block = match[1];

package/scripts/merge-pulse-report.mjs

@@ -38,16 +38,27 @@ async function getFullConfig() {
 /**
  * Scans the report directory for subdirectories (shards).
  * Returns an array of absolute paths to these subdirectories.
- * Excludes the 'attachments' folder itself.
+ * Excludes the 'attachments' folder and non-shard directories.
  */
-function getShardDirectories(dir) {
+function getShardDirectories(dir, outputFile, individualReportsSubDir) {
   if (!fs.existsSync(dir)) {
     return [];
   }
 
   return fs
     .readdirSync(dir, { withFileTypes: true })
-    .filter((dirent) => dirent.isDirectory() && dirent.name !== "attachments" && dirent.name !== "pulse-results")
+    .filter((dirent) => {
+      if (!dirent.isDirectory() || dirent.name === "attachments" || dirent.name === individualReportsSubDir) {
+        return false;
+      }
+      
+      const shardPath = path.join(dir, dirent.name);
+      const hasDirectReport = fs.existsSync(path.join(shardPath, outputFile));
+      const hasSequentialResults = fs.existsSync(path.join(shardPath, individualReportsSubDir));
+      
+      // Scenario 3: Only consider directories that have either a report or sequential results
+      return hasDirectReport || hasSequentialResults;
+    })
     .map((dirent) => path.join(dir, dirent.name));
 }
 
@@ -61,6 +72,7 @@ function mergeReports(shardDirs, outputFile) {
     failed: 0,
     skipped: 0,
     duration: 0,
+    flaky: 0
   };
 
   let combinedResults = [];
@@ -72,7 +84,7 @@ function mergeReports(shardDirs, outputFile) {
     const jsonPath = path.join(shardDir, outputFile);
 
     if (!fs.existsSync(jsonPath)) {
-      console.warn(`  Warning: No ${outputFile} found in ${path.basename(shardDir)}`);
+      console.warn(`  Warning: No ${outputFile} found in ${path.basename(shardDir)} after pre-merge attempt.`);
       continue;
     }
 
@@ -85,7 +97,7 @@ function mergeReports(shardDirs, outputFile) {
       combinedRun.passed += run.passed || 0;
       combinedRun.failed += run.failed || 0;
       combinedRun.skipped += run.skipped || 0;
-      combinedRun.flaky = (combinedRun.flaky || 0) + (run.flaky || 0);
+      combinedRun.flaky += run.flaky || 0;
       combinedRun.duration += run.duration || 0;
 
       if (run.environment) {
@@ -179,8 +191,7 @@ function cleanupShardDirectories(shardDirs) {
   const config = await getFullConfig();
   const REPORT_DIR = config.outputDir;
   const OUTPUT_FILE = config.outputFile;
-
-  await mergeSequentialReportsIfNeeded(REPORT_DIR);
+  const INDIVIDUAL_SUBDIR = config.individualReportsSubDir;
 
   console.log(`\n🔄 Playwright Pulse - Merge Reports (Sharding Mode)\n`);
   console.log(`  Report directory: ${REPORT_DIR}`);
@@ -192,13 +203,13 @@ function cleanupShardDirectories(shardDirs) {
   }
   console.log();
 
-  // 1. Get Shard Directories
-  const shardDirs = getShardDirectories(REPORT_DIR);
+  // 1. Get initial Shard Directories (Scenario 3: filtering non-relevant folders)
+  const shardDirs = getShardDirectories(REPORT_DIR, OUTPUT_FILE, INDIVIDUAL_SUBDIR);
 
   if (shardDirs.length === 0) {
     console.log("❌ No shard directories found.");
     console.log(
-      `   Expected structure: <report-dir>/<shard-folder>/${OUTPUT_FILE}`,
+      `   Expected structure: <report-dir>/<shard-folder>/${OUTPUT_FILE} or <report-dir>/<shard-folder>/${INDIVIDUAL_SUBDIR}/`,
     );
     process.exit(0);
   }
@@ -209,18 +220,30 @@ function cleanupShardDirectories(shardDirs) {
   });
   console.log();
 
-  // 2. Merge JSON Reports
-  console.log(`🔀 Merging reports...`);
+  // 2. Scenario 1: Pre-merge sequential results for EACH shard if needed
+  console.log(`⚙️  Checking for sequential results in shards...`);
+  for (const shardDir of shardDirs) {
+    const hasSequential = fs.existsSync(path.join(shardDir, INDIVIDUAL_SUBDIR));
+    if (hasSequential) {
+      console.log(`  - ${path.basename(shardDir)}: Merging sequential results...`);
+      // Force merge because individual shard dirs might not have playwright.config.ts resolving to resetOnEachRun=false
+      await mergeSequentialReportsIfNeeded(shardDir, true);
+    }
+  }
+  console.log();
+
+  // 3. Merge JSON Reports
+  console.log(`🔀 Merging reports across shards...`);
   const merged = mergeReports(shardDirs, OUTPUT_FILE);
   console.log(`  ✓ Merged ${shardDirs.length} report(s)`);
   console.log();
 
-  // 3. Copy Attachments
+  // 4. Copy Attachments
   console.log(`📎 Merging attachments...`);
   mergeAttachments(shardDirs, REPORT_DIR);
   console.log(`  ✓ Attachments merged`);
 
-  // 4. Write Final Merged JSON
+  // 5. Write Final Merged JSON
   const finalReportPath = path.join(REPORT_DIR, OUTPUT_FILE);
   fs.writeFileSync(finalReportPath, JSON.stringify(merged, null, 2));
 
@@ -228,7 +251,7 @@ function cleanupShardDirectories(shardDirs) {
   console.log(`   Total tests: ${merged.run.totalTests}`);
   console.log(`   Passed: ${merged.run.passed} | Failed: ${merged.run.failed} | Skipped: ${merged.run.skipped} | Flaky: ${merged.run.flaky}`);
 
-  // 5. Cleanup Shard Directories
+  // 6. Cleanup Shard Directories
   cleanupShardDirectories(shardDirs);
 
   console.log();

package/scripts/merge-sequential-reports.mjs

@@ -4,33 +4,43 @@ import * as path from "path";
 import { getReporterConfig } from "./config-reader.mjs";
 
 /**
- * Reads all `playwright-pulse-report-*.json` files in the `pulse-results` directory
- * and merges them into a single `playwright-pulse-report.json`.
+ * Reads all `<outputFile>-*.json` files in the `pulse-results` directory
+ * and merges them into a single `<outputFile>.json`.
  * It resolves duplicate tests using exactly the same logic as the reporter.
  * 
  * @param {string} customOutputDir The base report directory override (from CLI).
+ * @param {boolean} forceMerge Try to merge regardless of config.resetOnEachRun (used by sharded merge).
  */
-export async function mergeSequentialReportsIfNeeded(customOutputDir) {
+export async function mergeSequentialReportsIfNeeded(customOutputDir, forceMerge = false) {
   const config = await getReporterConfig(customOutputDir);
 
-  // This logic should ONLY run if resetOnEachRun is disabled.
-  if (config.resetOnEachRun) {
+  // This logic should ONLY run if resetOnEachRun is disabled, UNLESS we are forcing it 
+  // (e.g. recovering orphaned shards in merge-pulse-report.mjs).
+  if (config.resetOnEachRun && !forceMerge) {
     return;
   }
 
   const individualReportsSubDir = config.individualReportsSubDir;
   const baseOutputFile = config.outputFile;
-  const outputDir = config.outputDir;
+  
+  // If customOutputDir is provided, it might be an absolute path to a shard. Use it directly if it is absolute.
+  // Otherwise, fall back to the config's outputDir (which is resolved relative to CWD).
+  const outputDir = customOutputDir && path.isAbsolute(customOutputDir) 
+    ? customOutputDir 
+    : config.outputDir;
 
   const pulseResultsDir = path.join(outputDir, individualReportsSubDir);
   const finalOutputPath = path.join(outputDir, baseOutputFile);
 
+  // Use the actual outputFile name as seed for shard files (e.g. "results.json" -> "results-")
+  const shardPrefix = baseOutputFile.replace(".json", "-");
+
   let reportFiles;
   try {
     const allFiles = await fs.readdir(pulseResultsDir);
     reportFiles = allFiles.filter(
       (file) =>
-        file.startsWith("playwright-pulse-report-") && file.endsWith(".json"),
+        file.startsWith(shardPrefix) && file.endsWith(".json"),
     );
   } catch (error) {
     if (error.code === "ENOENT") {
@@ -64,7 +74,7 @@ export async function mergeSequentialReportsIfNeeded(customOutputDir) {
       const content = await fs.readFile(filePath, "utf-8");
       const json = JSON.parse(content);
 
-      let currentRunId = `run-${Date.now()}-581d5ad8-ce75-4ca5-94a6-ed29c466c815`;
+      let currentRunId = `run-${Date.now()}`;
       if (json.run) {
         if (json.run.id) currentRunId = json.run.id;
         
@@ -99,7 +109,7 @@ export async function mergeSequentialReportsIfNeeded(customOutputDir) {
   );
 
   const combinedRun = {
-    id: `run-${Date.now()}-581d5ad8-ce75-4ca5-94a6-ed29c466c815`,
+    id: `run-${Date.now()}`,
     timestamp: latestTimestamp.toISOString(),
     environment: lastRunEnvironment,
     totalTests: finalMergedResults.length,