@noego/wood 0.4.8 → 0.4.10

package/dist/testing/browser.d.cts

@@ -1,6 +1,7 @@
 import { c as TraceLevel } from '../trace_hub-Cob54qRx.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';
@@ -156,7 +157,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

package/dist/testing/browser.d.ts

@@ -1,6 +1,7 @@
 import { c as TraceLevel } from '../trace_hub-Cob54qRx.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';
@@ -156,7 +157,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

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
@@ -776,15 +784,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 +803,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 +820,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 +1068,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 +1111,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 +1204,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}`