@bigbinary/neeto-playwright-reporter 3.0.0-beta.2 → 3.0.0-beta.4

package/bin/extractReporterConfig.mjs

@@ -0,0 +1,95 @@
+#!/usr/bin/env node
+
+import { pathToFileURL } from "url";
+import path from "path";
+import fs from "fs";
+
+const NEETO_REPORTER_NAME = "@bigbinary/neeto-playwright-reporter";
+
+const findPlaywrightConfig = cwd => {
+  const configNames = [
+    "playwright.config.ts",
+    "playwright.config.js",
+    "playwright.config.mjs",
+    "playwright.config.mts",
+  ];
+
+  for (const name of configNames) {
+    const configPath = path.resolve(cwd, name);
+    if (fs.existsSync(configPath)) {
+      return configPath;
+    }
+  }
+
+  return null;
+};
+
+const extractFromReporterArray = reporters => {
+  if (!reporters) return null;
+
+  if (typeof reporters === "string") {
+    return reporters === NEETO_REPORTER_NAME ? {} : null;
+  }
+
+  if (Array.isArray(reporters)) {
+    for (const reporter of reporters) {
+      if (typeof reporter === "string" && reporter === NEETO_REPORTER_NAME) {
+        return {};
+      }
+
+      if (Array.isArray(reporter)) {
+        const [name, options] = reporter;
+        if (name === NEETO_REPORTER_NAME) {
+          return options || {};
+        }
+      }
+    }
+  }
+
+  return null;
+};
+
+const extractNeetoReporterOptions = config => {
+  const reporters = config.reporter || config.default?.reporter;
+  return extractFromReporterArray(reporters);
+};
+
+const main = async () => {
+  try {
+    const cwd = process.cwd();
+    const configArg = process.argv[2];
+
+    let configPath;
+    if (configArg) {
+      configPath = path.isAbsolute(configArg)
+        ? configArg
+        : path.resolve(cwd, configArg);
+    } else {
+      configPath = findPlaywrightConfig(cwd);
+    }
+
+    if (!configPath || !fs.existsSync(configPath)) {
+      return;
+    }
+
+    const configUrl = pathToFileURL(configPath).href;
+    const configModule = await import(configUrl);
+    const config = configModule.default || configModule;
+
+    console.error("\n[neetoplaydash] Resolved Playwright config:");
+    console.error(JSON.stringify(config, null, 2));
+
+    const options = extractNeetoReporterOptions(config);
+
+    console.error("\n[neetoplaydash] Extracted reporter options:");
+    console.error(JSON.stringify(options, null, 2));
+
+    if (options) {
+      console.log(JSON.stringify({ success: true, options }));
+    }
+  } catch (error) {
+    console.error("[neetoplaydash] Config extraction error:", error.message);
+  }
+};
+
+main();

package/bin/neetoplaydash.mjs

@@ -1,18 +1,38 @@
 #!/usr/bin/env node
 
-import { spawn } from "child_process";
+import { spawn, execSync } from "child_process";
+import path from "path";
+import { fileURLToPath } from "url";
 import * as R from "ramda";
 import smartOrchestrationApi from "./smartOrchestration.js";
 
-const pickTest = R.pick(["id", "title"]);
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
-const collectSpecs = suite =>
+const buildFullTitle = (parentTitles, specTitle) =>
+  [...parentTitles, specTitle].join(" ");
+
+const collectSpecs = (suite, parentTitles = []) =>
   R.concat(
-    R.map(pickTest, suite.specs || []),
-    R.chain(collectSpecs, suite.suites || [])
+    R.map(
+      spec => ({
+        id: spec.id,
+        title: buildFullTitle(parentTitles, spec.title),
+      }),
+      suite.specs || []
+    ),
+    R.chain(
+      childSuite =>
+        collectSpecs(childSuite, [...parentTitles, childSuite.title]),
+      suite.suites || []
+    )
   );
 
-const extractTestTitlesAndIds = R.pipe(R.prop("suites"), R.chain(collectSpecs));
+const extractTestTitlesAndIds = json =>
+  R.chain(
+    project => R.chain(file => collectSpecs(file, []), project.suites || []),
+    json.suites || []
+  );
 
 const args = process.argv.slice(2);
 
@@ -57,9 +77,65 @@ const neetoOptions = {};
   remainingArgs = filteredArgs;
 });
 
-const projectKey = neetoOptions.projectKey || process.env.NEETO_PROJECT_KEY;
-const apiKey = neetoOptions.apiKey || process.env.NEETO_API_KEY;
-const ciBuildId = neetoOptions.ciBuildId || process.env.NEETO_CI_BUILD_ID;
+const playwrightArgs = remainingArgs;
+
+const extractConfigPath = args => {
+  const index = args.findIndex(
+    arg => arg === "--config" || arg === "-c" || arg.startsWith("--config=")
+  );
+
+  if (index === -1) return null;
+
+  const arg = args[index];
+
+  if (arg === "--config" || arg === "-c") {
+    return args[index + 1] || null;
+  }
+
+  if (arg.startsWith("--config=")) {
+    return arg.substring("--config=".length);
+  }
+
+  return null;
+};
+
+const extractReporterConfigFromPlaywright = configPath => {
+  try {
+    const extractorScript = path.join(__dirname, "extractReporterConfig.mjs");
+    const configArg = configPath ? `"${configPath}"` : "";
+
+    const command = `node --import tsx "${extractorScript}" ${configArg}`;
+
+    const result = execSync(command, {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"],
+      cwd: process.cwd(),
+    });
+
+    if (!result || !result.trim()) {
+      return null;
+    }
+
+    const parsed = JSON.parse(result.trim());
+    return parsed.success ? parsed.options : null;
+  } catch {
+    return null;
+  }
+};
+
+const configPath = extractConfigPath(playwrightArgs);
+const reporterOptions = extractReporterConfigFromPlaywright(configPath) || {};
+
+const projectKey =
+  neetoOptions.projectKey ||
+  reporterOptions.projectKey ||
+  process.env.NEETO_PROJECT_KEY;
+const apiKey =
+  neetoOptions.apiKey || reporterOptions.apiKey || process.env.NEETO_API_KEY;
+const ciBuildId =
+  neetoOptions.ciBuildId ||
+  reporterOptions.ciBuildId ||
+  process.env.NEETO_CI_BUILD_ID;
 
 const missingOptions = [];
 if (!projectKey) missingOptions.push("--projectKey or NEETO_PROJECT_KEY");
@@ -76,11 +152,10 @@ if (missingOptions.length > 0) {
   console.error(
     `Or set environment variables: NEETO_PROJECT_KEY, NEETO_API_KEY, NEETO_CI_BUILD_ID`
   );
+  console.error(`Or define them in your Playwright config reporter options.`);
   process.exit(1);
 }
 
-const playwrightArgs = remainingArgs;
-
 const escapeShellArg = arg => {
   if (arg.includes(" ") || arg.includes('"') || arg.includes("'")) {
     return `"${arg.replace(/"/g, '\\"')}"`;
@@ -156,6 +231,10 @@ env.NEETO_PROJECT_KEY = projectKey;
 env.NEETO_API_KEY = apiKey;
 env.NEETO_CI_BUILD_ID = ciBuildId;
 
+if (reporterOptions.baseURL) {
+  env.NEETO_PLAYDASH_API_BASE_URL = reporterOptions.baseURL;
+}
+
 if (currentShard !== null) {
   env.NEETO_PLAYDASH_CURRENT_SHARD = currentShard.toString();
 }
@@ -164,6 +243,24 @@ if (totalShards !== null) {
   env.NEETO_PLAYDASH_TOTAL_SHARDS = totalShards.toString();
 }
 
+if (reporterOptions.tags) {
+  env.NEETO_PLAYDASH_TAGS = Array.isArray(reporterOptions.tags)
+    ? reporterOptions.tags.join(",")
+    : reporterOptions.tags;
+}
+if (reporterOptions.title) {
+  env.NEETO_PLAYDASH_TITLE = reporterOptions.title;
+}
+if (reporterOptions.commitId) {
+  env.NEETO_PLAYDASH_COMMIT_ID = reporterOptions.commitId;
+}
+if (reporterOptions.author) {
+  env.NEETO_PLAYDASH_AUTHOR = reporterOptions.author;
+}
+if (reporterOptions.branch) {
+  env.NEETO_PLAYDASH_BRANCH = reporterOptions.branch;
+}
+
 const finalArgs = [...filteredPlaywrightArgs, "--reporter=json", "--list"];
 const escapedFinalArgs = finalArgs.map(escapeShellArg);
 const listCommand = `npx playwright ${escapedFinalArgs.join(" ")}`;
@@ -196,13 +293,12 @@ child.on("close", async code => {
   try {
     const json = JSON.parse(jsonString);
     const tests = extractTestTitlesAndIds(json);
-    const historyIds = R.pluck("id", tests);
 
     const smartOrchestrationPayload = {
       total_shards: totalShards,
       current_shard: currentShard,
       ci_build_id: ciBuildId,
-      test_history_ids: historyIds,
+      tests,
     };
 
     const smartOrchestrationResponse = await smartOrchestrationApi.create({