@crvy/rprtr 0.0.5 → 0.0.8

package/dist/{chunk-IH44LYNM.js → chunk-XU5VQ3FZ.js}

@@ -9,11 +9,12 @@ import {
   applyTestEndEvent,
   createMutableReportState,
   finalizeRunEvent,
+  resolveBaselineTargets,
   safeParse
-} from "./chunk-MWLM3HWS.js";
+} from "./chunk-EJRLZZ22.js";
 
 // src/server/app.ts
-import { dirname as dirname2, join as join4 } from "path";
+import { dirname as dirname3, join as join4 } from "path";
 import { fileURLToPath } from "url";
 import pLimit from "p-limit";
 
@@ -177,7 +178,9 @@ function broadcastToBrowsers(wsClients, msg) {
 // src/server/handlers.ts
 function handleTestBegin(ctx, data) {
   const test = applyTestBeginEvent(ctx, data);
+  ctx.reportData.isRunning = true;
   console.log(`  \u25B6 [${test.browser ?? "?"}] ${test.title}`);
+  broadcastToBrowsers(ctx.wsClients, { type: "test-begin", data });
 }
 function handleTestEnd(ctx, data) {
   const result = applyTestEndEvent(ctx, data);
@@ -316,7 +319,8 @@ async function watchReportArtifacts(options) {
 }
 
 // src/server/routes.ts
-import { join as join3 } from "path";
+import { existsSync } from "fs";
+import { dirname as dirname2, join as join3 } from "path";
 var LIVE_UPDATES_WEBSOCKET_PATH = "/";
 function isWebSocketUpgradeRequest(req) {
   return new URL(req.url).pathname === LIVE_UPDATES_WEBSOCKET_PATH && req.headers.get("upgrade")?.toLowerCase() === "websocket";
@@ -339,6 +343,37 @@ async function handleSrcFiles(req) {
 function handleApiReport(ctx) {
   return Response.json(ctx.reportData);
 }
+var APPROVAL_TARGET_ERROR = "Could not resolve approval target";
+function actualPathFromUrl(ctx, actualUrl) {
+  return actualUrl.startsWith("/screenshots/") ? join3(ctx.reportData.screenshotDir, actualUrl.slice("/screenshots/".length)) : actualUrl;
+}
+function reporterTitlePath(test) {
+  const testFile = test.location?.file;
+  return ["", test.browser, testFile ?? "", ...test.titlePath, test.title];
+}
+function resolveApprovalTarget(ctx, test, retry, imageName) {
+  const testFile = test.location?.file;
+  const declaration = test.results?.[retry]?.visualDeclarations?.find((candidate) => candidate.visualName === imageName);
+  if (ctx.approvalRouting === void 0 || testFile === void 0 || declaration === void 0) {
+    return null;
+  }
+  const targets = resolveBaselineTargets({
+    testFile,
+    reporterTitlePath: reporterTitlePath(test),
+    declarations: [declaration],
+    config: {
+      configDir: ctx.approvalRouting.configDir,
+      testDir: ctx.approvalRouting.playwrightTestDir ?? dirname2(testFile),
+      snapshotDir: ctx.approvalRouting.playwrightSnapshotDir ?? dirname2(testFile),
+      projectName: test.browser,
+      snapshotSuffix: process.platform,
+      snapshotPathTemplate: ctx.approvalRouting.playwrightSnapshotPathTemplate,
+      toHaveScreenshotPathTemplate: ctx.approvalRouting.playwrightToHaveScreenshotPathTemplate
+    },
+    snapshotPathExists: existsSync
+  });
+  return targets.length === 1 ? targets[0]?.snapshotPath ?? null : null;
+}
 async function handleApiApprove(ctx, req) {
   try {
     const rawBody = await req.json();
@@ -349,61 +384,96 @@ async function handleApiApprove(ctx, req) {
     }
     const { id, retry, image } = parsed;
     const test = ctx.reportData.tests[id];
-    if (test !== null && test !== void 0) {
-      test.approved ??= {};
-      test.approved[image] = retry;
+    if (test === void 0) {
+      return Response.json({ success: false, error: "Test not found" }, { status: 404 });
+    }
+    const actualUrl = test.results?.[retry]?.images?.[image]?.actual;
+    if (actualUrl === void 0) {
+      return Response.json({ success: false, error: "Actual image not found" }, { status: 409 });
+    }
+    const snapshotPath = resolveApprovalTarget(ctx, test, retry, image);
+    if (snapshotPath === null) {
+      return Response.json({ success: false, error: APPROVAL_TARGET_ERROR }, { status: 409 });
+    }
+    try {
+      await copyFilePortable(actualPathFromUrl(ctx, actualUrl), snapshotPath);
+      test.approved = { ...test.approved ?? {}, [image]: retry };
       await ctx.saveReport();
-      const actualUrl = test.results?.[retry]?.images?.[image]?.actual;
-      if (actualUrl !== null && actualUrl !== void 0 && test.location?.file !== null && test.location?.file !== void 0) {
-        const actualPath = actualUrl.replace("/screenshots/", `${ctx.reportData.screenshotDir}/`);
-        const snapshotPath = `${test.location.file}-snapshots/${image}-${test.browser}-${process.platform}.png`;
-        try {
-          await copyFilePortable(actualPath, snapshotPath);
-          console.log(`  \u2714 Updated baseline: ${snapshotPath}`);
-        } catch (err) {
-          const errorMsg = err instanceof Error ? err.message : String(err);
-          console.error(`  \u2717 Failed to update baseline: ${errorMsg}`);
-        }
-      }
+      console.log(`  \u2714 Updated baseline: ${snapshotPath}`);
       console.log(`  \u2714 Approved [${test.browser}] ${test.title} \u2014 ${image}`);
+      return Response.json({ success: true });
+    } catch (err) {
+      const errorMsg = err instanceof Error ? err.message : String(err);
+      console.error(`  \u2717 Failed to update baseline: ${errorMsg}`);
+      return Response.json({ success: false, error: "Failed to update baseline" }, { status: 500 });
     }
-    return Response.json({ success: true });
   } catch {
     return Response.json({ success: false, error: "Invalid request" }, { status: 400 });
   }
 }
-async function handleApiApproveAll(ctx) {
-  let approvedCount = 0;
-  const baselineUpdates = [];
-  Object.values(ctx.reportData.tests).forEach((test) => {
-    if (!test?.results) return;
-    const approved = {};
+function createBulkApprovalUpdates(ctx) {
+  return Object.values(ctx.reportData.tests).flatMap((test) => {
+    if (!test.results || test.results.length === 0) {
+      return [];
+    }
     const lastRetry = test.results.length - 1;
     const lastResult = test.results[lastRetry];
-    if (!lastResult?.images) return;
-    Object.keys(lastResult.images).forEach((imageName) => {
-      approved[imageName] = lastRetry;
-      approvedCount++;
+    if (!lastResult?.images) {
+      return [];
+    }
+    return Object.keys(lastResult.images).flatMap((imageName) => {
       const actualUrl = lastResult.images?.[imageName]?.actual;
-      if (actualUrl !== null && actualUrl !== void 0 && test.location?.file !== null && test.location?.file !== void 0) {
-        const actualPath = actualUrl.replace("/screenshots/", `${ctx.reportData.screenshotDir}/`);
-        const snapshotPath = `${test.location.file}-snapshots/${imageName}-${test.browser}-${process.platform}.png`;
-        baselineUpdates.push(
-          copyFilePortable(actualPath, snapshotPath).then(() => {
-            console.log(`  \u2714 Updated baseline: ${snapshotPath}`);
-          }).catch((err) => {
-            const errorMsg = err instanceof Error ? err.message : String(err);
-            console.error(`  \u2717 Failed to update baseline: ${errorMsg}`);
-          })
-        );
+      if (actualUrl === void 0) {
+        return [Promise.resolve({ kind: "unresolved" })];
+      }
+      const snapshotPath = resolveApprovalTarget(ctx, test, lastRetry, imageName);
+      if (snapshotPath === null) {
+        return [Promise.resolve({ kind: "unresolved" })];
       }
+      return [
+        copyFilePortable(actualPathFromUrl(ctx, actualUrl), snapshotPath).then(
+          () => ({
+            kind: "approved",
+            imageName,
+            retry: lastRetry,
+            snapshotPath,
+            test
+          })
+        ).catch((err) => {
+          const errorMsg = err instanceof Error ? err.message : String(err);
+          console.error(`  \u2717 Failed to update baseline: ${errorMsg}`);
+          return { kind: "failed" };
+        })
+      ];
     });
-    test.approved = approved;
   });
+}
+function summarizeBulkApprovalOutcomes(outcomes) {
+  return outcomes.reduce(
+    (summary, outcome) => {
+      switch (outcome.kind) {
+        case "approved": {
+          outcome.test.approved = { ...outcome.test.approved ?? {}, [outcome.imageName]: outcome.retry };
+          console.log(`  \u2714 Updated baseline: ${outcome.snapshotPath}`);
+          return { ...summary, approved: summary.approved + 1 };
+        }
+        case "unresolved":
+          return { ...summary, unresolved: summary.unresolved + 1 };
+        case "failed":
+          return { ...summary, failed: summary.failed + 1 };
+      }
+    },
+    { approved: 0, unresolved: 0, failed: 0 }
+  );
+}
+async function handleApiApproveAll(ctx) {
+  const outcomes = await Promise.all(createBulkApprovalUpdates(ctx));
+  const counts = summarizeBulkApprovalOutcomes(outcomes);
   await ctx.saveReport();
-  await Promise.all(baselineUpdates);
-  console.log(`  \u2714 Approved all \u2014 ${approvedCount} image(s)`);
-  return Response.json({ success: true });
+  console.log(
+    `  \u2714 Approved all \u2014 approved: ${counts.approved}, unresolved: ${counts.unresolved}, failed: ${counts.failed}`
+  );
+  return Response.json({ success: counts.failed === 0, ...counts });
 }
 async function handleApiImages(req) {
   const path = new URL(req.url).pathname.slice("/api/images/".length);
@@ -438,10 +508,10 @@ function handleHttpRequest(ctx, req) {
   if (pathname === "/api/report") {
     return Promise.resolve(handleApiReport(ctx));
   }
-  if (pathname === "/api/approve") {
+  if (pathname === "/api/approve" && req.method === "POST") {
     return handleApiApprove(ctx, req);
   }
-  if (pathname === "/api/approve-all") {
+  if (pathname === "/api/approve-all" && req.method === "POST") {
     return handleApiApproveAll(ctx);
   }
   if (pathname.startsWith("/api/images/")) {
@@ -574,7 +644,7 @@ function createWebSocketMessageHandler(getHandlerContext) {
   };
 }
 async function resolveStaticDir(staticDir) {
-  const currentDir = dirname2(fileURLToPath(import.meta.url));
+  const currentDir = dirname3(fileURLToPath(import.meta.url));
   const candidates = staticDir === void 0 ? [
     currentDir,
     join4(currentDir, "dist"),
@@ -599,7 +669,21 @@ async function resolveReportPath(reportPath) {
   if (await isDirectory(reportPath)) {
     return { reportFile: join4(reportPath, "report.json"), offlineReportDir: reportPath };
   }
-  return { reportFile: reportPath, offlineReportDir: dirname2(reportPath) };
+  return { reportFile: reportPath, offlineReportDir: dirname3(reportPath) };
+}
+function createRoutesContext(reportData, staticDir, saveReport, options) {
+  return {
+    reportData,
+    staticDir,
+    saveReport,
+    approvalRouting: {
+      configDir: options.configDir ?? process.cwd(),
+      playwrightTestDir: options.playwrightTestDir,
+      playwrightSnapshotDir: options.playwrightSnapshotDir,
+      playwrightSnapshotPathTemplate: options.playwrightSnapshotPathTemplate,
+      playwrightToHaveScreenshotPathTemplate: options.playwrightToHaveScreenshotPathTemplate
+    }
+  };
 }
 async function createServerApp(options = {}) {
   const port = options.port ?? 3e3;
@@ -612,11 +696,7 @@ async function createServerApp(options = {}) {
   async function saveReport() {
     await writeJsonFile(reportFile, reportData);
   }
-  const routesContext = {
-    reportData,
-    staticDir,
-    saveReport
-  };
+  const routesContext = createRoutesContext(reportData, staticDir, saveReport, options);
   const getHandlerContext = () => createHandlerContext(reportData, wsClients, currentRunIds, saveReport);
   const handleRequest = (req) => handleHttpRequest(routesContext, req);
   const handleWebSocketMessage = createWebSocketMessageHandler(getHandlerContext);

package/dist/cli.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import {
   startServer
-} from "./chunk-IH44LYNM.js";
-import "./chunk-MWLM3HWS.js";
+} from "./chunk-XU5VQ3FZ.js";
+import "./chunk-EJRLZZ22.js";
 
 // src/cli.ts
 import { join } from "path";

package/dist/debug-log.d.ts

@@ -0,0 +1,3 @@
+export declare const log: (...args: unknown[]) => void;
+export declare const logError: (...args: unknown[]) => void;
+//# sourceMappingURL=debug-log.d.ts.map

package/dist/debug-log.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"debug-log.d.ts","sourceRoot":"","sources":["../src/debug-log.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,GAAG,GAAI,GAAG,MAAM,OAAO,EAAE,KAAG,IAExC,CAAA;AACD,eAAO,MAAM,QAAQ,GAAI,GAAG,MAAM,OAAO,EAAE,KAAG,IAE7C,CAAA"}

package/dist/index.css

@@ -24,7 +24,6 @@
     --color-white: #fff;
     --spacing: 0.25rem;
     --container-xl: 36rem;
-    --container-2xl: 42rem;
     --text-xs: 0.75rem;
     --text-xs--line-height: calc(1 / 0.75);
     --text-sm: 0.875rem;
@@ -324,6 +323,9 @@
   .inline-block {
     display: inline-block;
   }
+  .table {
+    display: table;
+  }
   .size-2 {
     width: calc(var(--spacing) * 2);
     height: calc(var(--spacing) * 2);
@@ -388,9 +390,6 @@
   .w-full {
     width: 100%;
   }
-  .max-w-2xl {
-    max-width: var(--container-2xl);
-  }
   .max-w-full {
     max-width: 100%;
   }
@@ -538,12 +537,6 @@
   .border-edge {
     border-color: var(--color-edge);
   }
-  .border-edge\/70 {
-    border-color: var(--color-edge);
-    @supports (color: color-mix(in lab, red, red)) {
-      border-color: color-mix(in oklab, var(--color-edge) 70%, transparent);
-    }
-  }
   .border-error {
     border-color: var(--color-error);
   }
@@ -556,12 +549,6 @@
       border-color: color-mix(in oklab, var(--color-green-500) 60%, transparent);
     }
   }
-  .border-info\/40 {
-    border-color: var(--color-info);
-    @supports (color: color-mix(in lab, red, red)) {
-      border-color: color-mix(in oklab, var(--color-info) 40%, transparent);
-    }
-  }
   .border-purple-500\/60 {
     border-color: color-mix(in srgb, oklch(62.7% 0.265 303.9) 60%, transparent);
     @supports (color: color-mix(in lab, red, red)) {
@@ -616,12 +603,6 @@
   .bg-info {
     background-color: var(--color-info);
   }
-  .bg-info\/10 {
-    background-color: var(--color-info);
-    @supports (color: color-mix(in lab, red, red)) {
-      background-color: color-mix(in oklab, var(--color-info) 10%, transparent);
-    }
-  }
   .bg-purple-500\/25 {
     background-color: color-mix(in srgb, oklch(62.7% 0.265 303.9) 25%, transparent);
     @supports (color: color-mix(in lab, red, red)) {