@tscircuit/rectdiff 0.0.18 → 0.0.20

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

@@ -1,4 +1,4 @@
-<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[
+<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><polyline data-points="0,0 12,0 12,4 0,4 0,0" data-type="line" data-label="bounds" points="40,333.3333333333333 600,333.3333333333333 600,146.66666666666666 40,146.66666666666666 40,333.3333333333333" fill="none" stroke="#111827" stroke-width="4.666666666666667"/></g><g><rect data-type="rect" data-label="node" data-x="4.75" data-y="2" x="40" y="146.66666666666666" width="443.3333333333333" height="186.66666666666666" fill="#dbeafe" stroke="black" stroke-width="0.02142857142857143"/></g><g><rect data-type="rect" data-label="node" data-x="10.75" data-y="2" x="483.3333333333333" y="146.66666666666666" width="116.66666666666669" height="186.66666666666666" fill="#dbeafe" stroke="black" stroke-width="0.02142857142857143"/></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();
@@ -20,7 +20,7 @@
                 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};
+                const matrix = {"a":46.666666666666664,"c":0,"e":40,"b":0,"d":-46.666666666666664,"f":333.3333333333333};
                 // Manually invert and apply the affine transform
                 // Since we only use translate and scale, we can directly compute:
                 // x' = (x - tx) / sx

package/tests/fixtures/makeSimpleRouteOutlineGraphics.ts

@@ -0,0 +1,41 @@
+import type { GraphicsObject, Line } from "graphics-debug"
+import type { SimpleRouteJson } from "lib/types/srj-types"
+
+/**
+ * Creates a GraphicsObject that draws the SRJ outline (or bounds fallback).
+ */
+export const makeSimpleRouteOutlineGraphics = (
+  srj: SimpleRouteJson,
+): GraphicsObject => {
+  const lines: NonNullable<Line[]> = []
+
+  if (srj.outline && srj.outline.length > 1) {
+    lines.push({
+      points: [...srj.outline, srj.outline[0]!],
+      strokeColor: "#111827",
+      strokeWidth: 0.1,
+      label: "outline",
+    })
+  } else {
+    const { minX, maxX, minY, maxY } = srj.bounds
+    lines.push({
+      points: [
+        { x: minX, y: minY },
+        { x: maxX, y: minY },
+        { x: maxX, y: maxY },
+        { x: minX, y: maxY },
+        { x: minX, y: minY },
+      ],
+      strokeColor: "#111827",
+      strokeWidth: 0.1,
+      label: "bounds",
+    })
+  }
+
+  return {
+    title: "SimpleRoute Outline",
+    coordinateSystem: "cartesian",
+    lines,
+    points: [],
+  }
+}

package/tests/incremental-solver.test.ts

@@ -28,7 +28,7 @@ test("RectDiffSolver supports incremental stepping", () => {
 
   // Step advances one candidate at a time
   let stepCount = 0
-  const maxSteps = 1000 // safety limit
+  const maxSteps = 5000 // safety limit
 
   while (!pipeline.solved && stepCount < maxSteps) {
     pipeline.step()

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

@@ -1,11 +1,13 @@
 import { expect, test } from "bun:test"
-import { getSvgFromGraphicsObject } from "graphics-debug"
+import { getSvgFromGraphicsObject, mergeGraphics } from "graphics-debug"
 import { RectDiffExpansionSolver } from "lib/solvers/RectDiffExpansionSolver/RectDiffExpansionSolver"
 import { createTwoNodeExpansionInput } from "lib/fixtures/twoNodeExpansionFixture"
 import { makeCapacityMeshNodeWithLayerInfo } from "./fixtures/makeCapacityMeshNodeWithLayerInfo"
+import { makeSimpleRouteOutlineGraphics } from "./fixtures/makeSimpleRouteOutlineGraphics"
 
 test("RectDiff expansion reproduces the two-node gap fixture", async () => {
-  const solver = new RectDiffExpansionSolver(createTwoNodeExpansionInput())
+  const input = createTwoNodeExpansionInput()
+  const solver = new RectDiffExpansionSolver(input)
 
   solver.solve()
 
@@ -13,8 +15,9 @@ test("RectDiff expansion reproduces the two-node gap fixture", async () => {
   expect(meshNodes.length).toBeGreaterThanOrEqual(2)
 
   const finalGraphics = makeCapacityMeshNodeWithLayerInfo(meshNodes)
+  const outline = makeSimpleRouteOutlineGraphics(input.srj)
   const svg = getSvgFromGraphicsObject(
-    { rects: finalGraphics.values().toArray().flat() },
+    mergeGraphics({ rects: finalGraphics.values().toArray().flat() }, outline),
     {
       svgWidth: 640,
       svgHeight: 480,