@tscircuit/rectdiff 0.0.16 → 0.0.18

package/lib/fixtures/twoNodeExpansionFixture.ts

@@ -0,0 +1,66 @@
+import RBush from "rbush"
+import type {
+  RectDiffExpansionSolverInput,
+  RectDiffExpansionSolverSnapshot,
+} from "../solvers/RectDiffExpansionSolver/RectDiffExpansionSolver"
+import type { SimpleRouteJson } from "../types/srj-types"
+import type { XYRect } from "../rectdiff-types"
+import type { RTreeRect } from "lib/types/capacity-mesh-types"
+
+/**
+ * Builds a minimal RectDiffExpansionSolver snapshot with exactly two nodes
+ * separated by empty space. This keeps the data close to the solver’s real
+ * input shape so we can reuse it for demos/tests that reproduce the gap issue.
+ */
+export const createTwoNodeExpansionInput = (): RectDiffExpansionSolverInput => {
+  const srj: SimpleRouteJson = {
+    bounds: { minX: 0, maxX: 12, minY: 0, maxY: 4 },
+    layerCount: 1,
+    minTraceWidth: 0.2,
+    obstacles: [],
+    connections: [],
+  }
+  const layerCount = srj.layerCount ?? 1
+  const bounds: XYRect = {
+    x: srj.bounds.minX,
+    y: srj.bounds.minY,
+    width: srj.bounds.maxX - srj.bounds.minX,
+    height: srj.bounds.maxY - srj.bounds.minY,
+  }
+
+  const obstacleIndexByLayer = Array.from(
+    { length: layerCount },
+    () => new RBush<RTreeRect>(),
+  )
+  // Start with all-empty obstacle indexes for a "clean" scenario
+
+  const initialSnapshot: RectDiffExpansionSolverSnapshot = {
+    srj,
+    layerNames: ["top"],
+    layerCount,
+    bounds,
+    options: { gridSizes: [1] },
+    boardVoidRects: [],
+    gridIndex: 0,
+    candidates: [],
+    placed: [
+      {
+        rect: { x: 0.5, y: 0.5, width: 2, height: 3 },
+        zLayers: [0],
+      },
+      {
+        rect: { x: 9.5, y: 0.5, width: 2, height: 3 },
+        zLayers: [0],
+      },
+    ],
+    expansionIndex: 0,
+    edgeAnalysisDone: true,
+    totalSeedsThisGrid: 0,
+    consumedSeedsThisGrid: 0,
+  }
+
+  return {
+    initialSnapshot,
+    obstacleIndexByLayer,
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/rectdiff",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "type": "module",
   "main": "dist/index.js",
   "scripts": {

package/pages/features/should-expand-node.page.tsx

@@ -0,0 +1,13 @@
+import { useMemo } from "react"
+import { RectDiffExpansionSolver } from "lib/solvers/RectDiffExpansionSolver/RectDiffExpansionSolver"
+import { createTwoNodeExpansionInput } from "lib/fixtures/twoNodeExpansionFixture"
+import { SolverDebugger3d } from "../../components/SolverDebugger3d"
+
+export default () => {
+  const solver = useMemo(
+    () => new RectDiffExpansionSolver(createTwoNodeExpansionInput()),
+    [],
+  )
+
+  return <SolverDebugger3d solver={solver} />
+}

package/test-assets/gap-fill-h-shape-should-expand-node.json

@@ -0,0 +1,72 @@
+{
+  "description": "H-shaped configuration - two vertical nodes with a horizontal connector in the middle",
+  "expectedBehavior": "Should detect segments on all exposed edges and expand into empty spaces around the H shape",
+  "meshNodes": [
+    {
+      "capacityMeshNodeId": "node-left-vertical",
+      "center": { "x": -3, "y": 0 },
+      "width": 1,
+      "height": 6,
+      "layer": "top",
+      "availableZ": [0]
+    },
+    {
+      "capacityMeshNodeId": "node-right-vertical",
+      "center": { "x": 3, "y": 0 },
+      "width": 1,
+      "height": 6,
+      "layer": "top",
+      "availableZ": [0]
+    },
+    {
+      "capacityMeshNodeId": "node-middle-horizontal",
+      "center": { "x": 0, "y": 0 },
+      "width": 2,
+      "height": 1,
+      "layer": "top",
+      "availableZ": [0]
+    }
+  ],
+  "expectedSegments": [
+    {
+      "description": "Left vertical - left edge",
+      "parentNodeId": "node-left-vertical",
+      "facingDirection": "x-"
+    },
+    {
+      "description": "Left vertical - top edge (above horizontal)",
+      "parentNodeId": "node-left-vertical",
+      "facingDirection": "y+"
+    },
+    {
+      "description": "Left vertical - bottom edge (below horizontal)",
+      "parentNodeId": "node-left-vertical",
+      "facingDirection": "y-"
+    },
+    {
+      "description": "Right vertical - right edge",
+      "parentNodeId": "node-right-vertical",
+      "facingDirection": "x+"
+    },
+    {
+      "description": "Right vertical - top edge (above horizontal)",
+      "parentNodeId": "node-right-vertical",
+      "facingDirection": "y+"
+    },
+    {
+      "description": "Right vertical - bottom edge (below horizontal)",
+      "parentNodeId": "node-right-vertical",
+      "facingDirection": "y-"
+    },
+    {
+      "description": "Middle horizontal - top edge",
+      "parentNodeId": "node-middle-horizontal",
+      "facingDirection": "y+"
+    },
+    {
+      "description": "Middle horizontal - bottom edge",
+      "parentNodeId": "node-middle-horizontal",
+      "facingDirection": "y-"
+    }
+  ]
+}

package/tests/__snapshots__/should-expand-node.snap.svg

@@ -0,0 +1,44 @@
+<svg width="640" height="480" viewBox="0 0 640 480" xmlns="http://www.w3.org/2000/svg"><rect width="100%" height="100%" fill="white"/><g><rect data-type="rect" data-label="node" data-x="1.5" data-y="2" x="40.000000000000014" y="163.63636363636363" width="101.8181818181818" height="152.72727272727275" fill="#dbeafe" stroke="black" stroke-width="0.019642857142857142"/></g><g><rect data-type="rect" data-label="node" data-x="10.5" data-y="2" x="498.1818181818182" y="163.63636363636363" width="101.81818181818181" height="152.72727272727275" fill="#dbeafe" stroke="black" stroke-width="0.019642857142857142"/></g><g id="crosshair" style="display: none"><line id="crosshair-h" y1="0" y2="480" stroke="#666" stroke-width="0.5"/><line id="crosshair-v" x1="0" x2="640" stroke="#666" stroke-width="0.5"/><text id="coordinates" font-family="monospace" font-size="12" fill="#666"></text></g><script><![CDATA[
+              document.currentScript.parentElement.addEventListener('mousemove', (e) => {
+                const svg = e.currentTarget;
+                const rect = svg.getBoundingClientRect();
+                const x = e.clientX - rect.left;
+                const y = e.clientY - rect.top;
+                const crosshair = svg.getElementById('crosshair');
+                const h = svg.getElementById('crosshair-h');
+                const v = svg.getElementById('crosshair-v');
+                const coords = svg.getElementById('coordinates');
+                
+                crosshair.style.display = 'block';
+                h.setAttribute('x1', '0');
+                h.setAttribute('x2', '640');
+                h.setAttribute('y1', y);
+                h.setAttribute('y2', y);
+                v.setAttribute('x1', x);
+                v.setAttribute('x2', x);
+                v.setAttribute('y1', '0');
+                v.setAttribute('y2', '480');
+
+                // Calculate real coordinates using inverse transformation
+                const matrix = {"a":50.90909090909091,"c":0,"e":14.545454545454561,"b":0,"d":-50.90909090909091,"f":341.8181818181818};
+                // Manually invert and apply the affine transform
+                // Since we only use translate and scale, we can directly compute:
+                // x' = (x - tx) / sx
+                // y' = (y - ty) / sy
+                const sx = matrix.a;
+                const sy = matrix.d;
+                const tx = matrix.e; 
+                const ty = matrix.f;
+                const realPoint = {
+                  x: (x - tx) / sx,
+                  y: (y - ty) / sy // Flip y back since we used negative scale
+                }
+                
+                coords.textContent = `(${realPoint.x.toFixed(2)}, ${realPoint.y.toFixed(2)})`;
+                coords.setAttribute('x', (x + 5).toString());
+                coords.setAttribute('y', (y - 5).toString());
+              });
+              document.currentScript.parentElement.addEventListener('mouseleave', () => {
+                document.currentScript.parentElement.getElementById('crosshair').style.display = 'none';
+              });
+            ]]></script></svg>

package/tests/should-expand-node.test.ts

@@ -0,0 +1,25 @@
+import { expect, test } from "bun:test"
+import { getSvgFromGraphicsObject } from "graphics-debug"
+import { RectDiffExpansionSolver } from "lib/solvers/RectDiffExpansionSolver/RectDiffExpansionSolver"
+import { createTwoNodeExpansionInput } from "lib/fixtures/twoNodeExpansionFixture"
+import { makeCapacityMeshNodeWithLayerInfo } from "./fixtures/makeCapacityMeshNodeWithLayerInfo"
+
+test("RectDiff expansion reproduces the two-node gap fixture", async () => {
+  const solver = new RectDiffExpansionSolver(createTwoNodeExpansionInput())
+
+  solver.solve()
+
+  const { meshNodes } = solver.getOutput()
+  expect(meshNodes.length).toBeGreaterThanOrEqual(2)
+
+  const finalGraphics = makeCapacityMeshNodeWithLayerInfo(meshNodes)
+  const svg = getSvgFromGraphicsObject(
+    { rects: finalGraphics.values().toArray().flat() },
+    {
+      svgWidth: 640,
+      svgHeight: 480,
+    },
+  )
+
+  await expect(svg).toMatchSvgSnapshot(import.meta.path)
+})