@arghajit/playwright-pulse-report 0.3.4 → 0.3.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arghajit/playwright-pulse-report",
   "author": "Arghajit Singha",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "A Playwright reporter and dashboard for visualizing test results.",
   "homepage": "https://arghajit47.github.io/playwright-pulse/",
   "repository": {
@@ -23,7 +23,8 @@
     "email",
     "playwright-report",
     "pulse",
-    "ai-failure-analysis"
+    "ai-failure-analysis",
+    "pulse-report"
   ],
   "main": "dist/reporter/index.js",
   "types": "dist/reporter/index.d.ts",
@@ -34,13 +35,13 @@
   ],
   "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.js",
+    "merge-pulse-report": "scripts/merge-pulse-report.mjs",
     "send-email": "scripts/sendReport.mjs",
-    "generate-trend": "scripts/generate-trend.mjs",
     "generate-email-report": "scripts/generate-email-report.mjs",
+    "generate-trend": "scripts/generate-trend.mjs",
     "pulse-logo": "scripts/terminal-logo.mjs"
   },
   "exports": {
@@ -55,7 +56,7 @@
     "prepublishOnly": "npm run build:reporter",
     "report:static": "node ./scripts/generate-static-report.mjs",
     "report:generate": "node ./scripts/generate-report.mjs",
-    "report:merge": "node ./scripts/merge-pulse-report.js",
+    "report:merge": "node ./scripts/merge-pulse-report.mjs",
     "report:email": "node ./scripts/sendReport.mjs",
     "report:minify": "node ./scripts/generate-email-report.mjs",
     "generate-trend": "node ./scripts/generate-trend.mjs"
@@ -67,13 +68,13 @@
     "d3": "^7.9.0",
     "date-fns": "^3.6.0",
     "dotenv": "^16.5.0",
-    "highcharts": "^12.2.0",
+    "highcharts": "^12.5.0",
     "jsdom": "^26.1.0",
-    "lucide-react": "^0.475.0",
     "node-fetch": "^3.3.2",
-    "nodemailer": "^7.0.3",
+    "nodemailer": "^7.0.12",
     "patch-package": "^8.0.0",
-    "sharp": "^0.33.5",
+    "readable-stream": "^4.7.0",
+    "sharp": "^0.34.5",
     "ua-parser-js": "^1.0.41",
     "zod": "^3.24.2"
   },
@@ -90,10 +91,11 @@
     "@playwright/test": ">=1.40.0"
   },
   "overrides": {
-    "brace-expansion": "^2.0.2",
-    "@isaacs/brace-expansion": "^5.0.1",
-    "glob": "^13.0.0",
-    "minimatch": "^10.1.2",
-    "lodash": "^4.17.23"
+    "glob": "^13.0.6",
+    "minimatch": "^10.2.1",
+    "ajv": "^8.18.0",
+    "isarray": "^2.0.5",
+    "safe-buffer": "^5.2.1",
+    "string_decoder": "^1.3.0"
   }
 }

package/scripts/config-reader.mjs

@@ -22,159 +22,149 @@ async function findPlaywrightConfig() {
   return { path: null, exists: false };
 }
 
-async function extractOutputDirFromConfig(configPath) {
+async function extractReporterOptionsFromConfig(configPath) {
   let fileContent = "";
   try {
     fileContent = fs.readFileSync(configPath, "utf-8");
   } catch (e) {
-    // If we can't read the file, we can't parse or import it.
-    return null;
+    return {};
   }
 
+  const options = {};
+
   // 1. Strategy: Text Parsing (Safe & Fast)
-  // We try to read the file as text first. This finds the outputDir without
-  // triggering any Node.js warnings or errors.
   try {
-    // Regex matches: outputDir: "value" or outputDir: 'value'
-    const match = fileContent.match(/outputDir:\s*["']([^"']+)["']/);
+    // 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*,?\s*\]/g;
+    let match;
+    while ((match = reporterBlockRegex.exec(fileContent)) !== null) {
+      const block = match[1];
+      
+      const outputDirMatch = block.match(/outputDir:\s*["']([^"']+)["']/);
+      if (outputDirMatch && outputDirMatch[1]) options.outputDir = outputDirMatch[1];
+
+      const outputFileMatch = block.match(/outputFile:\s*["']([^"']+)["']/);
+      if (outputFileMatch && outputFileMatch[1]) options.outputFile = outputFileMatch[1];
+
+      const resetOnEachRunMatch = block.match(/resetOnEachRun:\s*(true|false)/);
+      if (resetOnEachRunMatch) options.resetOnEachRun = resetOnEachRunMatch[1] === "true";
+
+      const individualReportsSubDirMatch = block.match(/individualReportsSubDir:\s*["']([^"']+)["']/);
+      if (individualReportsSubDirMatch && individualReportsSubDirMatch[1]) options.individualReportsSubDir = individualReportsSubDirMatch[1];
+      
+      // If we found any Pulse-specific options, we're likely in the right block
+      if (Object.keys(options).length > 0) break;
+    }
 
-    if (match && match[1]) {
-      return path.resolve(process.cwd(), match[1]);
+    // Fallback for global outputDir if not found in reporter block
+    if (!options.outputDir) {
+      const globalOutputDirMatch = fileContent.match(/outputDir:\s*["']([^"']+)["']/);
+      if (globalOutputDirMatch && globalOutputDirMatch[1]) options.outputDir = globalOutputDirMatch[1];
     }
-  } catch (e) {
-    // Ignore text reading errors
-  }
+  } catch (e) { }
+
+  // 2. Safety Check and Dynamic Import
+  if (Object.keys(options).length < 3) {
+    // Check if we can safely import()
+    let canImport = true;
+    if (configPath.endsWith(".js")) {
+      let isModulePackage = false;
+      try {
+        const pkgPath = path.resolve(process.cwd(), "package.json");
+        if (fs.existsSync(pkgPath)) {
+          const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
+          isModulePackage = pkg.type === "module";
+        }
+      } catch (e) {}
 
-  // 2. Safety Check: Detect ESM in CJS to Prevent Node Warnings
-  // The warning "To load an ES module..." happens when we try to import()
-  // a .js file containing ESM syntax (import/export) in a CJS package.
-  // We explicitly check for this and ABORT the import if found.
-  if (configPath.endsWith(".js")) {
-    let isModulePackage = false;
-    try {
-      const pkgPath = path.resolve(process.cwd(), "package.json");
-      if (fs.existsSync(pkgPath)) {
-        const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
-        isModulePackage = pkg.type === "module";
-      }
-    } catch (e) {}
-
-    if (!isModulePackage) {
-      // Heuristic: Check for ESM syntax (import/export at start of lines)
-      const hasEsmSyntax =
-        /^\s*import\s+/m.test(fileContent) ||
-        /^\s*export\s+/m.test(fileContent);
-
-      if (hasEsmSyntax) {
-        // We found ESM syntax in a .js file within a CJS project.
-        // Attempting to import this WILL trigger the Node.js warning.
-        // Since regex failed to find outputDir, and we can't import safely, we abort now.
-        return null;
+      if (!isModulePackage) {
+        const hasEsmSyntax = /^\s*import\s+/m.test(fileContent) || /^\s*export\s+/m.test(fileContent);
+        if (hasEsmSyntax) canImport = false;
       }
     }
-  }
 
-  // 3. Strategy: Dynamic Import
-  // If we passed the safety check, we try to import the config.
-  try {
-    let config;
-    const configDir = dirname(configPath);
-    const originalDirname = global.__dirname;
-    const originalFilename = global.__filename;
-
-    try {
-      global.__dirname = configDir;
-      global.__filename = configPath;
+    if (canImport) {
+      try {
+        let config;
+        const configDir = dirname(configPath);
+        const originalDirname = global.__dirname;
+        const originalFilename = global.__filename;
 
-      if (configPath.endsWith(".ts")) {
         try {
-          const { register } = await import("node:module");
-          const { pathToFileURL } = await import("node:url");
-          register("ts-node/esm", pathToFileURL("./"));
-          config = await import(pathToFileURL(configPath).href);
-        } catch (tsError) {
-          const tsNode = await import("ts-node");
-          tsNode.register({
-            transpileOnly: true,
-            compilerOptions: { module: "commonjs" },
-          });
-          config = require(configPath);
-        }
-      } else {
-        // Try dynamic import for JS/MJS
-        config = await import(pathToFileURL(configPath).href);
-      }
-
-      // Handle Default Export
-      if (config && config.default) {
-        config = config.default;
-      }
+          global.__dirname = configDir;
+          global.__filename = configPath;
+
+          if (configPath.endsWith(".ts")) {
+            try {
+              const { register } = await import("node:module");
+              const { pathToFileURL } = await import("node:url");
+              register("ts-node/esm", pathToFileURL("./"));
+              config = await import(pathToFileURL(configPath).href);
+            } catch (tsError) {
+              const tsNode = await import("ts-node");
+              tsNode.register({ transpileOnly: true, compilerOptions: { module: "commonjs" } });
+              config = require(configPath);
+            }
+          } else {
+            config = await import(pathToFileURL(configPath).href);
+          }
 
-      if (config) {
-        // Check for Reporter Config
-        if (config.reporter) {
-          const reporters = Array.isArray(config.reporter)
-            ? config.reporter
-            : [config.reporter];
-
-          for (const reporter of reporters) {
-            const reporterName = Array.isArray(reporter)
-              ? reporter[0]
-              : reporter;
-            const reporterOptions = Array.isArray(reporter)
-              ? reporter[1]
-              : null;
-
-            if (
-              typeof reporterName === "string" &&
-              (reporterName.includes("playwright-pulse-report") ||
-                reporterName.includes("@arghajit/playwright-pulse-report") ||
-                reporterName.includes("@arghajit/dummy"))
-            ) {
-              if (reporterOptions && reporterOptions.outputDir) {
-                return path.resolve(process.cwd(), reporterOptions.outputDir);
+          if (config && config.default) config = config.default;
+
+          if (config) {
+            if (config.reporter) {
+              const reporters = Array.isArray(config.reporter) ? config.reporter : [config.reporter];
+              for (const reporter of reporters) {
+                const reporterName = Array.isArray(reporter) ? reporter[0] : reporter;
+                const reporterOptions = Array.isArray(reporter) ? reporter[1] : null;
+
+                if (typeof reporterName === "string" && 
+                   (reporterName.includes("playwright-pulse-report") || 
+                    reporterName.includes("@arghajit/playwright-pulse-report") ||
+                    reporterName.includes("@arghajit/dummy"))) {
+                  if (reporterOptions) {
+                    if (reporterOptions.outputDir) options.outputDir = reporterOptions.outputDir;
+                    if (reporterOptions.outputFile) options.outputFile = reporterOptions.outputFile;
+                    if (reporterOptions.resetOnEachRun !== undefined) options.resetOnEachRun = reporterOptions.resetOnEachRun;
+                    if (reporterOptions.individualReportsSubDir) options.individualReportsSubDir = reporterOptions.individualReportsSubDir;
+                  }
+                }
               }
             }
+            if (config.outputDir && !options.outputDir) options.outputDir = config.outputDir;
           }
+        } finally {
+          global.__dirname = originalDirname;
+          global.__filename = originalFilename;
         }
-
-        // Check for Global outputDir
-        if (config.outputDir) {
-          return path.resolve(process.cwd(), config.outputDir);
-        }
-      }
-    } finally {
-      // Clean up globals
-      global.__dirname = originalDirname;
-      global.__filename = originalFilename;
+      } catch (error) {}
     }
-  } catch (error) {
-    // SILENT CATCH: Do NOT log anything here.
-    return null;
   }
 
-  return null;
+  return options;
 }
 
-export async function getOutputDir(customOutputDirFromArgs = null) {
-  if (customOutputDirFromArgs) {
-    console.log(`Using custom outputDir from CLI: ${customOutputDirFromArgs}`);
-    return path.resolve(process.cwd(), customOutputDirFromArgs);
-  }
-
+export async function getReporterConfig(customOutputDirFromArgs = null) {
   const { path: configPath, exists } = await findPlaywrightConfig();
-  console.log(
-    `Config file search result: ${exists ? configPath : "not found"}`
-  );
+  let options = {};
 
   if (exists) {
-    const outputDirFromConfig = await extractOutputDirFromConfig(configPath);
-    if (outputDirFromConfig) {
-      console.log(`Using outputDir from config: ${outputDirFromConfig}`);
-      return outputDirFromConfig;
-    }
+    options = await extractReporterOptionsFromConfig(configPath);
   }
 
-  console.log(`Using default outputDir: ${DEFAULT_OUTPUT_DIR}`);
-  return path.resolve(process.cwd(), DEFAULT_OUTPUT_DIR);
+  const outputDir = customOutputDirFromArgs 
+    ? path.resolve(process.cwd(), customOutputDirFromArgs)
+    : path.resolve(process.cwd(), options.outputDir || DEFAULT_OUTPUT_DIR);
+
+  const outputFile = options.outputFile || "playwright-pulse-report.json";
+  const resetOnEachRun = options.resetOnEachRun !== undefined ? options.resetOnEachRun : true;
+  const individualReportsSubDir = options.individualReportsSubDir || "pulse-results";
+
+  return { outputDir, outputFile, resetOnEachRun, individualReportsSubDir };
+}
+
+export async function getOutputDir(customOutputDirFromArgs = null) {
+  const config = await getReporterConfig(customOutputDirFromArgs);
+  return config.outputDir;
 }