@noego/wood 0.4.9 → 0.5.0

package/dist/testing/browser.d.cts

@@ -1,10 +1,10 @@
-import { c as TraceLevel } from '../trace_hub-Cob54qRx.cjs';
+import { c as TraceLevel } from '../trace_hub-Cpo_nVze.cjs';
 import { TraceRecorder } from '../trace-testing/trace_recorder.cjs';
 import { WoodRpcTransport } from '../transport/wood_rpc_transport.cjs';
+import { RectAxis } from './geometry.cjs';
 import 'rxjs';
 import '@noego/trace/testing';
 import '../tracing/trace_provider.cjs';
-import '@noego/ioc';
 
 type MaybePromise<T> = T | Promise<T>;
 type BrowserName = 'chromium' | 'firefox' | 'webkit';
@@ -156,7 +156,7 @@ interface WoodRectSnapshot {
     height: number;
 }
 /** Axis along which edge-to-edge spacing is measured. */
-type WoodSpacingAxis = 'horizontal' | 'vertical';
+type WoodSpacingAxis = RectAxis;
 /**
  * Description of the top-most element painted at a hit-test point, plus its
  * relationship to the queried target. `document.elementFromPoint` honours
@@ -394,6 +394,12 @@ declare function createBrowserBridgeFixture(input: WoodBridgeFixtureInput | unde
     manifest: RuntimeBridgeManifestEntry[];
     bridgeInit: string;
 };
+declare function startSharedBrowserViteServer(input: {
+    rootDir: string;
+}): Promise<{
+    url: string;
+    close: () => Promise<void>;
+}>;
 declare function createHarness(config?: WoodBrowserHarnessConfig): Promise<WoodBrowserHarness>;
 declare const browser: {
     createHarness: typeof createHarness;
@@ -413,4 +419,4 @@ declare global {
     }
 }
 
-export { type MountComponentOptions, type MountRouteOptions, type MountTreeOptions, type MountedWoodBridge, type MountedWoodComponent, type MountedWoodNavigation, type MountedWoodRoute, type MountedWoodSurface, type MountedWoodTree, type WoodBridgeFixtureContext, type WoodBridgeFixtureInput, type WoodBridgeRecordedCall, type WoodBridgeRecordedEvent, type WoodBrowserExpect, type WoodBrowserHarness, type WoodBrowserHarnessConfig, type WoodBrowserPageContext, type WoodBrowserTraceConfig, type WoodHitTestResult, type WoodRectSnapshot, type WoodRpcManifestEntryInput, type WoodSpacingAxis, type WoodViewport, browser, createBrowserBridgeFixture };
+export { type MountComponentOptions, type MountRouteOptions, type MountTreeOptions, type MountedWoodBridge, type MountedWoodComponent, type MountedWoodNavigation, type MountedWoodRoute, type MountedWoodSurface, type MountedWoodTree, type WoodBridgeFixtureContext, type WoodBridgeFixtureInput, type WoodBridgeRecordedCall, type WoodBridgeRecordedEvent, type WoodBrowserExpect, type WoodBrowserHarness, type WoodBrowserHarnessConfig, type WoodBrowserPageContext, type WoodBrowserTraceConfig, type WoodHitTestResult, type WoodRectSnapshot, type WoodRpcManifestEntryInput, type WoodSpacingAxis, type WoodViewport, browser, createBrowserBridgeFixture, startSharedBrowserViteServer };

package/dist/testing/browser.d.ts

@@ -1,10 +1,10 @@
-import { c as TraceLevel } from '../trace_hub-Cob54qRx.js';
+import { c as TraceLevel } from '../trace_hub-Cpo_nVze.js';
 import { TraceRecorder } from '../trace-testing/trace_recorder.js';
 import { WoodRpcTransport } from '../transport/wood_rpc_transport.js';
+import { RectAxis } from './geometry.js';
 import 'rxjs';
 import '@noego/trace/testing';
 import '../tracing/trace_provider.js';
-import '@noego/ioc';
 
 type MaybePromise<T> = T | Promise<T>;
 type BrowserName = 'chromium' | 'firefox' | 'webkit';
@@ -156,7 +156,7 @@ interface WoodRectSnapshot {
     height: number;
 }
 /** Axis along which edge-to-edge spacing is measured. */
-type WoodSpacingAxis = 'horizontal' | 'vertical';
+type WoodSpacingAxis = RectAxis;
 /**
  * Description of the top-most element painted at a hit-test point, plus its
  * relationship to the queried target. `document.elementFromPoint` honours
@@ -394,6 +394,12 @@ declare function createBrowserBridgeFixture(input: WoodBridgeFixtureInput | unde
     manifest: RuntimeBridgeManifestEntry[];
     bridgeInit: string;
 };
+declare function startSharedBrowserViteServer(input: {
+    rootDir: string;
+}): Promise<{
+    url: string;
+    close: () => Promise<void>;
+}>;
 declare function createHarness(config?: WoodBrowserHarnessConfig): Promise<WoodBrowserHarness>;
 declare const browser: {
     createHarness: typeof createHarness;
@@ -413,4 +419,4 @@ declare global {
     }
 }
 
-export { type MountComponentOptions, type MountRouteOptions, type MountTreeOptions, type MountedWoodBridge, type MountedWoodComponent, type MountedWoodNavigation, type MountedWoodRoute, type MountedWoodSurface, type MountedWoodTree, type WoodBridgeFixtureContext, type WoodBridgeFixtureInput, type WoodBridgeRecordedCall, type WoodBridgeRecordedEvent, type WoodBrowserExpect, type WoodBrowserHarness, type WoodBrowserHarnessConfig, type WoodBrowserPageContext, type WoodBrowserTraceConfig, type WoodHitTestResult, type WoodRectSnapshot, type WoodRpcManifestEntryInput, type WoodSpacingAxis, type WoodViewport, browser, createBrowserBridgeFixture };
+export { type MountComponentOptions, type MountRouteOptions, type MountTreeOptions, type MountedWoodBridge, type MountedWoodComponent, type MountedWoodNavigation, type MountedWoodRoute, type MountedWoodSurface, type MountedWoodTree, type WoodBridgeFixtureContext, type WoodBridgeFixtureInput, type WoodBridgeRecordedCall, type WoodBridgeRecordedEvent, type WoodBrowserExpect, type WoodBrowserHarness, type WoodBrowserHarnessConfig, type WoodBrowserPageContext, type WoodBrowserTraceConfig, type WoodHitTestResult, type WoodRectSnapshot, type WoodRpcManifestEntryInput, type WoodSpacingAxis, type WoodViewport, browser, createBrowserBridgeFixture, startSharedBrowserViteServer };

package/dist/testing/browser.js

@@ -7,6 +7,14 @@ import {
   dispatchRendererTracePayload
 } from "../tracing/index.js";
 import { TraceRecorder } from "../trace-testing/index.js";
+import {
+  axisEdges,
+  axisGap,
+  evenSpacing as evenSpacingRects,
+  rectsOverlap,
+  sharedEdges as sharedRectEdges,
+  snapshotRectsOverlap
+} from "./geometry.js";
 const DEFAULT_VIEWPORT = {
   width: 1280,
   height: 800
@@ -16,6 +24,7 @@ const DEFAULT_RESOURCE_CLOSE_TIMEOUT_MS = 5e3;
 const WORKER_RUNTIME_IDLE_CLOSE_MS = 5e3;
 const browserWorkerRuntimes = /* @__PURE__ */ new Map();
 const browserWorkerCacheDirs = /* @__PURE__ */ new Set();
+const browserConnectWarnings = /* @__PURE__ */ new Set();
 process.on("exit", () => {
   for (const cacheDir of browserWorkerCacheDirs) {
     try {
@@ -179,8 +188,9 @@ function buildBridgeInitScript(manifest, traceConfig, transportMode) {
 })();
 `;
 }
-async function loadPlaywright(browserName) {
-  const playwright = await import("playwright");
+async function loadPlaywright(browserName, rootDir) {
+  const playwrightPath = resolvePackageModule(rootDir, "playwright");
+  const playwright = playwrightPath ? await import(pathToFileURL(playwrightPath).href) : await import("playwright");
   return playwright[browserName];
 }
 async function loadVite() {
@@ -281,7 +291,14 @@ async function createViteServer(rootDir, cacheDir) {
     resolve: {
       dedupe: ["svelte"]
     },
-    server: { port: 0, fs: { allow: [rootDir, os.tmpdir()] } }
+    server: {
+      port: 0,
+      // Browser harnesses write independent HTML/entry files concurrently.
+      // HMR would broadcast another harness's temp-file changes to every page,
+      // causing unrelated mounts to reload; tests only need request-time transforms.
+      hmr: false,
+      fs: { allow: [rootDir, os.tmpdir()] }
+    }
   });
   await server.listen();
   return server;
@@ -290,21 +307,53 @@ function workerRuntimeKey(input) {
   return [
     input.rootDir,
     input.browserName,
-    input.headless ? "headless" : "headed"
+    input.headless ? "headless" : "headed",
+    input.wsEndpoint ?? "local-browser",
+    input.viteUrl ?? "local-vite"
   ].join("::");
 }
 async function createBrowserWorkerRuntime(input) {
-  const cacheRoot = fs.mkdtempSync(path.join(os.tmpdir(), "wood-browser-vite-"));
-  browserWorkerCacheDirs.add(cacheRoot);
   let browser2 = null;
+  let cacheRoot = null;
+  let ownedServer = null;
   try {
-    const playwrightBrowser = await loadPlaywright(input.browserName);
-    browser2 = await playwrightBrowser.launch({ headless: input.headless });
-    const server = await createViteServer(input.rootDir, path.join(cacheRoot, ".vite"));
+    const playwrightBrowser = await loadPlaywright(input.browserName, input.rootDir);
+    if (input.wsEndpoint) {
+      try {
+        browser2 = await playwrightBrowser.connect(input.wsEndpoint);
+      } catch (error) {
+        if (!browserConnectWarnings.has(input.wsEndpoint)) {
+          browserConnectWarnings.add(input.wsEndpoint);
+          console.warn(
+            `[wood browser] Could not connect to shared Chromium at "${input.wsEndpoint}"; falling back to a per-worker launch.`,
+            error
+          );
+        }
+      }
+    }
+    if (!browser2) {
+      browser2 = await playwrightBrowser.launch({ headless: input.headless });
+    }
+    let vite;
+    if (input.viteUrl) {
+      vite = {
+        baseUrl: input.viteUrl,
+        ownership: "external"
+      };
+    } else {
+      cacheRoot = fs.mkdtempSync(path.join(os.tmpdir(), "wood-browser-vite-"));
+      browserWorkerCacheDirs.add(cacheRoot);
+      ownedServer = await createViteServer(input.rootDir, path.join(cacheRoot, ".vite"));
+      vite = {
+        baseUrl: serverBaseUrl(ownedServer),
+        ownership: "worker",
+        server: ownedServer,
+        cacheDir: cacheRoot
+      };
+    }
     return {
       browser: browser2,
-      server,
-      cacheDir: cacheRoot,
+      vite,
       rootDir: input.rootDir,
       key: input.key,
       activeHarnesses: 0,
@@ -312,18 +361,25 @@ async function createBrowserWorkerRuntime(input) {
       idleCloseTimer: null
     };
   } catch (error) {
-    await browser2?.close().catch(() => void 0);
-    fs.rmSync(cacheRoot, { recursive: true, force: true });
-    browserWorkerCacheDirs.delete(cacheRoot);
+    await Promise.all([
+      browser2?.close().catch(() => void 0),
+      ownedServer?.close().catch(() => void 0)
+    ]);
+    if (cacheRoot) {
+      fs.rmSync(cacheRoot, { recursive: true, force: true });
+      browserWorkerCacheDirs.delete(cacheRoot);
+    }
     throw error;
   }
 }
 async function acquireBrowserWorkerRuntime(input) {
-  const key = workerRuntimeKey(input);
+  const wsEndpoint = input.browserName === "chromium" ? process.env.WOOD_BROWSER_WS_ENDPOINT : void 0;
+  const viteUrl = process.env.WOOD_BROWSER_VITE_URL;
+  const key = workerRuntimeKey({ ...input, wsEndpoint, viteUrl });
   let entry = browserWorkerRuntimes.get(key);
   if (!entry) {
     entry = {
-      promise: createBrowserWorkerRuntime({ ...input, key })
+      promise: createBrowserWorkerRuntime({ ...input, wsEndpoint, viteUrl, key })
     };
     browserWorkerRuntimes.set(key, entry);
   }
@@ -346,12 +402,14 @@ async function closeBrowserWorkerRuntime(runtime) {
   runtime.closing = true;
   try {
     await Promise.all([
-      waitForBoundedClose(runtime.server.close()),
+      ...runtime.vite.ownership === "worker" ? [waitForBoundedClose(runtime.vite.server.close())] : [],
       waitForBoundedClose(runtime.browser.close())
     ]);
   } finally {
-    fs.rmSync(runtime.cacheDir, { recursive: true, force: true });
-    browserWorkerCacheDirs.delete(runtime.cacheDir);
+    if (runtime.vite.ownership === "worker") {
+      fs.rmSync(runtime.vite.cacheDir, { recursive: true, force: true });
+      browserWorkerCacheDirs.delete(runtime.vite.cacheDir);
+    }
     const entry = browserWorkerRuntimes.get(runtime.key);
     const current = entry ? await entry.promise.catch(() => null) : null;
     if (current === runtime) {
@@ -378,6 +436,35 @@ function releaseBrowserWorkerRuntime(runtime) {
 function serverBaseUrl(server) {
   return server.resolvedUrls?.local?.[0] ?? "http://127.0.0.1:5173";
 }
+async function startSharedBrowserViteServer(input) {
+  const rootDir = normalizeRoot(input.rootDir);
+  const cacheRoot = fs.mkdtempSync(path.join(os.tmpdir(), "wood-browser-vite-"));
+  browserWorkerCacheDirs.add(cacheRoot);
+  let server = null;
+  try {
+    server = await createViteServer(rootDir, path.join(cacheRoot, ".vite"));
+  } catch (error) {
+    fs.rmSync(cacheRoot, { recursive: true, force: true });
+    browserWorkerCacheDirs.delete(cacheRoot);
+    throw error;
+  }
+  let closed = false;
+  return {
+    url: serverBaseUrl(server),
+    async close() {
+      if (closed) {
+        return;
+      }
+      closed = true;
+      try {
+        await waitForBoundedClose(server.close());
+      } finally {
+        fs.rmSync(cacheRoot, { recursive: true, force: true });
+        browserWorkerCacheDirs.delete(cacheRoot);
+      }
+    }
+  };
+}
 function assertFileExists(filePath, label) {
   if (!fs.existsSync(filePath)) {
     throw new Error(`${label} does not exist: ${filePath}`);
@@ -776,15 +863,6 @@ function collectMaxPaintOrders(snapshot) {
   }
   return paintByBackend;
 }
-function axisEdges(rect, axis) {
-  return axis === "horizontal" ? { leading: rect.left, trailing: rect.right } : { leading: rect.top, trailing: rect.bottom };
-}
-function axisGap(first, second, axis) {
-  const a = axisEdges(first, axis);
-  const b = axisEdges(second, axis);
-  const [earlier, later] = a.leading <= b.leading ? [a, b] : [b, a];
-  return later.leading - earlier.trailing;
-}
 function describeGapConstraint(constraint) {
   const parts = [];
   if (constraint.equals !== void 0) parts.push(`equals ${constraint.equals}`);
@@ -804,11 +882,6 @@ function gapConstraintViolation(gap, constraint, tolerance) {
   }
   return null;
 }
-function rectsOverlap(a, b) {
-  return Boolean(
-    a && b && a.left < b.right && a.right > b.left && a.top < b.bottom && a.bottom > b.top
-  );
-}
 const COVERAGE_STYLE_KEYS = [
   "opacity",
   "visibility",
@@ -826,9 +899,6 @@ function colorAlphaIsZero(color) {
   const parts = match[1].split(",").map((s) => s.trim());
   return parts.length >= 4 && parseFloat(parts[3]) === 0;
 }
-function snapshotRectsOverlap(a, b) {
-  return a.x < b.x + b.w && a.x + a.w > b.x && a.y < b.y + b.h && a.y + a.h > b.y;
-}
 function indexLayoutNodes(doc, strings) {
   const byNode = /* @__PURE__ */ new Map();
   const nodeIndex = doc.layout?.nodeIndex ?? [];
@@ -1077,8 +1147,7 @@ function createExpect(page, outputDir) {
       const first = await elementRect(page, firstSelector);
       const second = await elementRect(page, secondSelector);
       if (!first || !second) throw new Error(`Expected both "${firstSelector}" and "${secondSelector}" to exist.`);
-      const overlaps = first.left < second.right && first.right > second.left && first.top < second.bottom && first.bottom > second.top;
-      if (overlaps) {
+      if (rectsOverlap(first, second)) {
         throw new Error(`Expected "${firstSelector}" not to overlap "${secondSelector}".`);
       }
     },
@@ -1121,8 +1190,9 @@ function createExpect(page, outputDir) {
       const first = await firstRect(page, a);
       const second = await firstRect(page, b);
       if (!first || !second) throw new Error(`Expected both "${a}" and "${b}" to exist.`);
-      const delta = Math.abs(first[edge] - second[edge]);
-      if (delta > tolerance) {
+      const verdict = sharedRectEdges([first, second], edge, { tolerance });
+      if (!verdict.pass) {
+        const delta = Number(verdict.details?.maximumDelta);
         throw new Error(
           `Expected "${a}" and "${b}" to share ${edge} edge within ${tolerance}px, but delta was ${delta.toFixed(2)}px ("${a}".${edge}=${first[edge].toFixed(2)}, "${b}".${edge}=${second[edge].toFixed(2)}). Rects: ${a}=${JSON.stringify(first)}, ${b}=${JSON.stringify(second)}`
         );
@@ -1213,16 +1283,24 @@ function createExpect(page, outputDir) {
         if (!rect) throw new Error(`Expected "${selector}" to exist.`);
         boxes.push({ selector, rect });
       }
-      const sorted = [...boxes].sort((x, y) => axisEdges(x.rect, axis).leading - axisEdges(y.rect, axis).leading);
-      const gaps = sorted.slice(1).map((box, i) => ({
-        from: sorted[i].selector,
-        to: box.selector,
-        gap: axisGap(sorted[i].rect, box.rect, axis)
-      }));
-      const widest = gaps.reduce((acc, g) => g.gap > acc.gap ? g : acc);
-      const narrowest = gaps.reduce((acc, g) => g.gap < acc.gap ? g : acc);
-      const spread = widest.gap - narrowest.gap;
-      if (spread > tolerance) {
+      const verdict = evenSpacingRects(
+        boxes.map((box) => box.rect),
+        axis,
+        { tolerance }
+      );
+      if (!verdict.pass) {
+        const sorted = [...boxes].sort(
+          (x, y) => axisEdges(x.rect, axis).leading - axisEdges(y.rect, axis).leading
+        );
+        const measuredGaps = verdict.details?.gaps;
+        const gaps = sorted.slice(1).map((box, i) => ({
+          from: sorted[i].selector,
+          to: box.selector,
+          gap: measuredGaps[i]
+        }));
+        const widest = gaps.reduce((acc, g) => g.gap > acc.gap ? g : acc);
+        const narrowest = gaps.reduce((acc, g) => g.gap < acc.gap ? g : acc);
+        const spread = Number(verdict.details?.spread);
         const list = gaps.map((g) => `${g.from}\u2192${g.to}=${g.gap.toFixed(2)}px`).join(", ");
         throw new Error(
           `Expected elements to be evenly spaced along ${axis} within ${tolerance}px, but gap spread was ${spread.toFixed(2)}px (widest ${widest.from}\u2192${widest.to}=${widest.gap.toFixed(2)}px, narrowest ${narrowest.from}\u2192${narrowest.to}=${narrowest.gap.toFixed(2)}px). Gaps: ${list}`
@@ -1302,7 +1380,7 @@ async function openMountPage(input) {
     ...input.context
   };
   await input.hooks?.beforeMount?.(context);
-  await page.goto(`${serverBaseUrl(input.runtime.server)}${viteImport(htmlPath)}`, {
+  await page.goto(`${input.runtime.baseUrl}${viteImport(htmlPath)}`, {
     waitUntil: "domcontentloaded"
   });
   for (const event of input.bridge.state.initialEvents) {
@@ -1366,7 +1444,7 @@ async function createHarness(config = {}) {
   }
   const runtime = {
     context,
-    server: workerRuntime.server,
+    baseUrl: workerRuntime.vite.baseUrl,
     page,
     tempDir,
     rootDir,
@@ -1535,6 +1613,7 @@ const browser = {
 };
 export {
   browser,
-  createBrowserBridgeFixture
+  createBrowserBridgeFixture,
+  startSharedBrowserViteServer
 };
 //# sourceMappingURL=browser.js.map