@tscircuit/schematic-trace-solver 0.0.157 → 0.0.158

package/tests/repros/repro-mspm0l1306-capacitor-symmetry.test.ts

@@ -0,0 +1,54 @@
+import { expect, test } from "bun:test"
+import { SchematicTracePipelineSolver } from "lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver"
+import type { InputProblem } from "lib/types/InputProblem"
+import "tests/fixtures/matcher"
+import inputProblem from "./assets/repro-mspm0l1306-capacitor-symmetry.input.json"
+
+// Captured from tscircuit/ti#119, Microcontroller_MSPM0L1306 at b5ee159.
+// Only opaque component/port IDs and display metadata were normalized.
+// C1/C2 are already level; their VDD/VSS rail junctions should be level too.
+test("repro: MSPM0L1306 aligned decoupling capacitor rails", async () => {
+  const solver = new SchematicTracePipelineSolver(
+    inputProblem as unknown as InputProblem,
+    {
+      hideRatsNet: true,
+    },
+  )
+  solver.solve()
+
+  expect(solver.solved).toBe(true)
+  expect(solver.failed).toBe(false)
+
+  const traces = solver.netLabelToTraceSolver!.getOutput().traces
+  const getTrace = (...pinIds: string[]) => {
+    const trace = traces.find((trace) =>
+      pinIds.every((pinId) => trace.pinIds.includes(pinId)),
+    )
+    expect(trace).toBeDefined()
+    return trace!
+  }
+  for (const [pin, railY] of [
+    [1, 2.05],
+    [2, 0.65],
+  ] as const) {
+    const path = getTrace(`C1.${pin}`, `C2.${pin}`).tracePath
+    const horizontalSegments = path.slice(1).flatMap((end, index) => {
+      const start = path[index]!
+      return Math.abs(start.y - end.y) < 1e-6 ? [[start, end]] : []
+    })
+    expect(horizontalSegments).toHaveLength(1)
+    const [start, end] = horizontalSegments[0]!
+    expect(start!.y).toBeCloseTo(railY, 6)
+    expect(end!.y).toBeCloseTo(railY, 6)
+    expect([start!.x, end!.x].sort()).toEqual([-3.5, -4.5].sort())
+  }
+
+  // The lower return should continue the C1 column, not introduce a third
+  // column between C1/C2 or an extra horizontal step near VSS.
+  const returnPath = getTrace("C3.2", "C2.2").tracePath
+  expect(returnPath.some((point) => Math.abs(point.x + 4.5) < 1e-6)).toBe(true)
+  expect(returnPath.every((point) => [-4.5, -3.5].includes(point.x))).toBe(true)
+  expect(returnPath.some((point) => Math.abs(point.y - 0.65) < 1e-6)).toBe(true)
+
+  await expect(solver).toMatchSolverSnapshot(import.meta.path)
+})

package/tests/repros/repro-pga300-redundant-ground-traces.test.ts

@@ -0,0 +1,33 @@
+import { expect, test } from "bun:test"
+import { SchematicTracePipelineSolver } from "lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver"
+import type { InputProblem } from "lib/types/InputProblem"
+import "tests/fixtures/matcher"
+import inputProblem from "./assets/repro-pga300-redundant-ground-traces.input.json"
+
+// Full solver input captured from tscircuit/ti#117 at 067b6a2 using
+// `tsci build ... --schematic-only --disable-pcb --solver-debug`.
+// Only the debug serializer's { value_type: "undefined" } markers were removed.
+const COMP = "schematic_port_10"
+const GND = "schematic_port_7"
+const C3_GND = "schematic_port_32"
+const R1_GND = "schematic_port_38"
+
+test("repro: PGA300 adds redundant ground branches at COMP", async () => {
+  const solver = new SchematicTracePipelineSolver(
+    inputProblem as unknown as InputProblem,
+  )
+  solver.solve()
+
+  expect(solver.solved).toBe(true)
+  const { traces } = solver.netLabelToTraceSolver!.getOutput()
+  const hasPair = (a: string, b: string) =>
+    traces.some((trace) => trace.pinIds.includes(a) && trace.pinIds.includes(b))
+
+  // Current bug: the global GND spanning tree substitutes these two branches
+  // for the explicitly requested COMP -> R1 connection in the source circuit.
+  expect(hasPair(COMP, GND)).toBe(true)
+  expect(hasPair(COMP, C3_GND)).toBe(true)
+  expect(hasPair(COMP, R1_GND)).toBe(false)
+
+  await expect(solver).toMatchSolverSnapshot(import.meta.path)
+})

package/tests/solvers/InlineNetLabelSolver/__snapshots__/anchored-net-label-width.snap.svg

@@ -1,4 +1,4 @@
-<svg width="2416" height="1200" viewBox="0 0 2416 1200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on the left and Circuit JSON schematic on the right">
+<svg width="1200" height="2016" viewBox="0 0 1200 2016" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on top and Circuit JSON schematic on the bottom">
   <g transform="translate(0, 0) scale(1.875, 1.875) translate(0, 0)">
     <rect width="100%" height="100%" fill="white"/><g><polyline data-points="5.575,1.4 2.045,2.6" data-type="line" data-label="" points="447.56446991404016,256.8863419293219 258.75835721107927,192.70296084049664" fill="none" stroke="hsl(193, 100%, 50%, 0.8)" stroke-width="1px"/></g><g><polyline data-points="5.575,1.2 2.045,2.4" data-type="line" data-label="" points="447.56446991404016,267.5835721107927 258.75835721107927,203.40019102196752" fill="none" stroke="hsl(191, 100%, 50%, 0.8)" stroke-width="1px"/></g><g><polyline data-points="5.575,1 2.045,2.2" data-type="line" data-label="" points="447.56446991404016,278.2808022922636 258.75835721107927,214.0974212034384" fill="none" stroke="hsl(72, 100%, 50%, 0.8)" stroke-width="1px"/></g><g><polyline data-points="5.575,0.8 2.045,2" data-type="line" data-label="" points="447.56446991404016,288.97803247373446 258.75835721107927,224.79465138490926" fill="none" stroke="hsl(74, 100%, 50%, 0.8)" stroke-width="1px"/></g><g><polyline data-points="5.575,0.6 2.045,0.7" data-type="line" data-label="" points="447.56446991404016,299.67526265520536 258.75835721107927,294.3266475644699" fill="none" stroke="hsl(184, 100%, 50%, 0.8)" stroke-width="1px"/></g><g><polyline data-points="5.575,1.4 5.375,1.4 5.375,2.6 2.045,2.6" data-type="line" data-label="" points="447.56446991404016,256.8863419293219 436.86723973256926,256.8863419293219 436.86723973256926,192.70296084049664 258.75835721107927,192.70296084049664" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="5.575,1.2 3.81,1.2 3.81,2.4 2.045,2.4" data-type="line" data-label="" points="447.56446991404016,267.5835721107927 353.1614135625597,267.5835721107927 353.1614135625597,203.40019102196752 258.75835721107927,203.40019102196752" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="5.575,1 3.71,1 3.71,2.2 2.045,2.2" data-type="line" data-label="" points="447.56446991404016,278.2808022922636 347.81279847182424,278.2808022922636 347.81279847182424,214.0974212034384 258.75835721107927,214.0974212034384" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="5.575,0.8 2.245,0.8 2.245,2 2.045,2" data-type="line" data-label="" points="447.56446991404016,288.97803247373446 269.4555873925501,288.97803247373446 269.4555873925501,224.79465138490926 258.75835721107927,224.79465138490926" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="5.575,0.6 3.81,0.6 3.81,0.7 2.045,0.7" data-type="line" data-label="" points="447.56446991404016,299.67526265520536 353.1614135625597,299.67526265520536 353.1614135625597,294.3266475644699 258.75835721107927,294.3266475644699" fill="none" stroke="purple" stroke-width="1px"/></g><g><rect data-type="rect" data-label="U1" data-x="0" data-y="0" x="40" y="161.9484240687679" width="218.75835721107927" height="339.6370582617001" fill="hsl(164, 100%, 50%, 0.8)" stroke="black" stroke-width="0.018696428571428572"/></g><g><rect data-type="rect" data-label="J4" data-x="7" data-y="-0.4" x="447.5644699140401" y="246.189111747851" width="152.43553008595984" height="213.94460362941737" fill="hsl(186, 100%, 50%, 0.8)" stroke="black" stroke-width="0.018696428571428572"/></g><g><rect data-type="rect" data-label="TB67S579FTG" data-x="2.405" data-y="3.525" x="242.71251193887292" y="138.41451766953202" width="70.60171919770775" height="9.627507163323742" fill="rgba(160, 0, 220, 0.14)" stroke="black" stroke-width="0.018696428571428572"/></g><g><rect data-type="rect" data-label="U1" data-x="1.865" data-y="3.29" x="239.50334288443167" y="149.11174785100286" width="19.25501432664757" height="13.371537726838596" fill="rgba(160, 0, 220, 0.14)" stroke="black" stroke-width="0.018696428571428572"/></g><g><rect data-type="rect" data-label="J4" data-x="6.095" data-y="1.715" x="465.74976122254054" y="233.35243553008593" width="19.255014326647597" height="13.371537726838568" fill="rgba(160, 0, 220, 0.14)" stroke="black" stroke-width="0.018696428571428572"/></g><g><rect data-type="rect" data-label="INLINE netId: OUT_A_P
 axis: x
@@ -70,7 +70,7 @@ SERIAL_IN" data-x="4.6925" data-y="0.6" cx="400.3629417382999" cy="299.675262655
               });
             ]]></script>
   </g>
-  <g transform="translate(1216, 200)">
+  <g transform="translate(0, 1216)">
     <style>
               .boundary { fill: rgb(245, 241, 237); }
               .schematic-boundary { fill: none; stroke: #fff; }

package/tests/solvers/InlineNetLabelSolver/__snapshots__/inline-net-label-anchored-label-clearance.snap.svg

@@ -1,4 +1,4 @@
-<svg width="2416" height="1200" viewBox="0 0 2416 1200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on the left and Circuit JSON schematic on the right">
+<svg width="1200" height="2016" viewBox="0 0 1200 2016" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on top and Circuit JSON schematic on the bottom">
   <g transform="translate(0, 0) scale(1.875, 1.875) translate(0, 0)">
     <rect width="100%" height="100%" fill="white"/><g><polyline data-points="-0.7,0.2 -1.3290000000000002,0.2" data-type="line" data-label="" points="337.7926421404682,320 219.98662207357856,320" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="-0.7,0.4 -1.3290000000000002,0.4" data-type="line" data-label="" points="337.7926421404682,282.54180602006693 219.98662207357856,282.54180602006693" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="-0.7,0 -1.38,0" data-type="line" data-label="" points="337.7926421404682,357.4581939799331 210.43478260869568,357.4581939799331" fill="none" stroke="purple" stroke-width="1px"/></g><g><rect data-type="rect" data-label="U1" data-x="0" data-y="0.2" x="337.79264214046816" y="226.35451505016724" width="262.2073578595318" height="187.29096989966553" fill="hsl(164, 100%, 50%, 0.8)" stroke="black" stroke-width="0.005339285714285715"/></g><g><rect data-type="rect" data-label="netId: D_MINUS
 globalConnNetId: connectivity_net0" data-x="-1.81" data-y="0.4" x="40" y="263.81270903010034" width="179.79933110367892" height="37.45819397993313" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.005339285714285715"/></g><g><rect data-type="rect" data-label="netId: D_PLUS
@@ -55,7 +55,7 @@ SWCLK" data-x="-1.04" data-y="0" cx="274.11371237458195" cy="357.4581939799331"
               });
             ]]></script>
   </g>
-  <g transform="translate(1216, 200)">
+  <g transform="translate(0, 1216)">
     <style>
               .boundary { fill: rgb(245, 241, 237); }
               .schematic-boundary { fill: none; stroke: #fff; }

package/tests/solvers/InlineNetLabelSolver/__snapshots__/inline-net-label-port-stub.snap.svg

@@ -1,4 +1,4 @@
-<svg width="2416" height="1200" viewBox="0 0 2416 1200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on the left and Circuit JSON schematic on the right">
+<svg width="1200" height="2016" viewBox="0 0 1200 2016" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on top and Circuit JSON schematic on the bottom">
   <g transform="translate(0, 0) scale(1.875, 1.875) translate(0, 0)">
     <rect width="100%" height="100%" fill="white"/><g><polyline data-points="-0.5,0.3 -2.3499999999999996,0.3" data-type="line" data-label="" points="262.79569892473114,271.8279569892473 40,271.8279569892473" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="0.5,-0.2 2.3,-0.2" data-type="line" data-label="" points="383.2258064516129,332.04301075268813 600,332.04301075268813" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="-0.5,-0.1 -2.3499999999999996,-0.1" data-type="line" data-label="" points="262.79569892473114,320 40,320" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="-0.2,0.5 -0.2,1.45" data-type="line" data-label="" points="298.9247311827957,247.74193548387095 298.9247311827957,133.33333333333331" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="0.2,-0.5 0.2,-1.65" data-type="line" data-label="" points="347.09677419354836,368.17204301075265 347.09677419354836,506.66666666666663" fill="none" stroke="purple" stroke-width="1px"/></g><g><rect data-type="rect" data-label="U1" data-x="0" data-y="0" x="262.79569892473114" y="247.74193548387098" width="120.43010752688178" height="120.4301075268817" fill="hsl(164, 100%, 50%, 0.8)" stroke="black" stroke-width="0.008303571428571428"/></g><g><rect data-type="rect" data-label="INLINE netId: NET_PRU0_MII_TX_CLK1
 axis: x
@@ -65,7 +65,7 @@ NET_BOTTOM" data-x="0.2" data-y="-1.075" cx="347.09677419354836" cy="437.4193548
               });
             ]]></script>
   </g>
-  <g transform="translate(1216, 200)">
+  <g transform="translate(0, 1216)">
     <style>
               .boundary { fill: rgb(245, 241, 237); }
               .schematic-boundary { fill: none; stroke: #fff; }

package/tests/solvers/InlineNetLabelSolver/__snapshots__/inline-net-label-two-pin-net.snap.svg

@@ -1,4 +1,4 @@
-<svg width="2416" height="1200" viewBox="0 0 2416 1200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on the left and Circuit JSON schematic on the right">
+<svg width="1200" height="2016" viewBox="0 0 1200 2016" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on top and Circuit JSON schematic on the bottom">
   <g transform="translate(0, 0) scale(1.875, 1.875) translate(0, 0)">
     <rect width="100%" height="100%" fill="white"/><g><polyline data-points="-0.5,1 0.5,1" data-type="line" data-label="" points="264,208 376,208" fill="none" stroke="hsl(253, 100%, 50%, 0.8)" stroke-width="1px" stroke-dasharray="4 2"/></g><g><polyline data-points="-0.5,1 0.5,1" data-type="line" data-label="" points="264,208 376,208" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="-1.5,-1 -0.19999999999999996,-1" data-type="line" data-label="" points="152,432 297.6,432" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="1.5,-1 0.19999999999999996,-1" data-type="line" data-label="" points="488,432 342.4,432" fill="none" stroke="purple" stroke-width="1px"/></g><g><rect data-type="rect" data-label="U1" data-x="-1" data-y="1" x="152" y="152" width="112" height="112" fill="hsl(164, 100%, 50%, 0.8)" stroke="black" stroke-width="0.008928571428571428"/></g><g><rect data-type="rect" data-label="U2" data-x="1" data-y="1" x="376" y="152" width="112" height="112" fill="hsl(165, 100%, 50%, 0.8)" stroke="black" stroke-width="0.008928571428571428"/></g><g><rect data-type="rect" data-label="U3" data-x="-2" data-y="-1" x="40" y="376" width="112" height="112" fill="hsl(166, 100%, 50%, 0.8)" stroke="black" stroke-width="0.008928571428571428"/></g><g><rect data-type="rect" data-label="U4" data-x="2" data-y="-1" x="488" y="376" width="112" height="112" fill="hsl(167, 100%, 50%, 0.8)" stroke="black" stroke-width="0.008928571428571428"/></g><g><rect data-type="rect" data-label="INLINE netId: NET_ROUTED
 axis: x
@@ -58,7 +58,7 @@ NET_SECTIONED" data-x="0.85" data-y="-1" cx="415.2" cy="432" r="3" fill="green"/
               });
             ]]></script>
   </g>
-  <g transform="translate(1216, 200)">
+  <g transform="translate(0, 1216)">
     <style>
               .boundary { fill: rgb(245, 241, 237); }
               .schematic-boundary { fill: none; stroke: #fff; }

package/tests/solvers/InlineNetLabelSolver/__snapshots__/inline-net-label01.snap.svg

@@ -1,4 +1,4 @@
-<svg width="2416" height="1200" viewBox="0 0 2416 1200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on the left and Circuit JSON schematic on the right">
+<svg width="1200" height="2016" viewBox="0 0 1200 2016" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on top and Circuit JSON schematic on the bottom">
   <g transform="translate(0, 0) scale(1.875, 1.875) translate(0, 0)">
     <rect width="100%" height="100%" fill="white"/><g><polyline data-points="0.5,0 2.5,0" data-type="line" data-label="" points="214.33962264150944,71.69811320754715 425.66037735849056,71.69811320754715" fill="none" stroke="hsl(48, 100%, 50%, 0.8)" stroke-width="1px"/></g><g><polyline data-points="0,-2.5 0,-4" data-type="line" data-label="" points="161.50943396226415,335.84905660377353 161.50943396226415,494.33962264150944" fill="none" stroke="hsl(136, 100%, 50%, 0.8)" stroke-width="1px"/></g><g><polyline data-points="0.5,0 2.5,0" data-type="line" data-label="" points="214.33962264150944,71.69811320754715 425.66037735849056,71.69811320754715" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="0,-2.5 0,-4" data-type="line" data-label="" points="161.50943396226415,335.84905660377353 161.50943396226415,494.33962264150944" fill="none" stroke="purple" stroke-width="1px"/></g><g><rect data-type="rect" data-label="U1" data-x="0" data-y="0" x="108.67924528301887" y="39.999999999999986" width="105.66037735849056" height="63.39622641509433" fill="hsl(164, 100%, 50%, 0.8)" stroke="black" stroke-width="0.009464285714285715"/></g><g><rect data-type="rect" data-label="U2" data-x="3" data-y="0" x="425.66037735849056" y="39.999999999999986" width="105.66037735849056" height="63.39622641509433" fill="hsl(165, 100%, 50%, 0.8)" stroke="black" stroke-width="0.009464285714285715"/></g><g><rect data-type="rect" data-label="U3" data-x="0" data-y="-2" x="129.81132075471697" y="230.18867924528303" width="63.39622641509436" height="105.66037735849054" fill="hsl(166, 100%, 50%, 0.8)" stroke="black" stroke-width="0.009464285714285715"/></g><g><rect data-type="rect" data-label="U4" data-x="0" data-y="-4.5" x="129.81132075471697" y="494.3396226415094" width="63.39622641509436" height="105.66037735849056" fill="hsl(167, 100%, 50%, 0.8)" stroke="black" stroke-width="0.009464285714285715"/></g><g><rect data-type="rect" data-label="INLINE netId: USER_LED_ANODE
 axis: x
@@ -55,7 +55,7 @@ SPI_SCK" data-x="0" data-y="-3.25" cx="161.50943396226415" cy="415.0943396226415
               });
             ]]></script>
   </g>
-  <g transform="translate(1216, 200)">
+  <g transform="translate(0, 1216)">
     <style>
               .boundary { fill: rgb(245, 241, 237); }
               .schematic-boundary { fill: none; stroke: #fff; }

package/tests/solvers/InlineNetLabelSolver/__snapshots__/inline-net-label02.snap.svg

@@ -1,4 +1,4 @@
-<svg width="2416" height="1200" viewBox="0 0 2416 1200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on the left and Circuit JSON schematic on the right">
+<svg width="1200" height="2016" viewBox="0 0 1200 2016" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on top and Circuit JSON schematic on the bottom">
   <g transform="translate(0, 0) scale(1.875, 1.875) translate(0, 0)">
     <rect width="100%" height="100%" fill="white"/><g><polyline data-points="0.6000000000000001,-0.30000000000000004 2.435,0" data-type="line" data-label="" points="201.34453781512605,376.47058823529414 448.06722689075633,336.1344537815126" fill="none" stroke="hsl(48, 100%, 50%, 0.8)" stroke-width="1px"/></g><g><polyline data-points="0.6000000000000001,-0.30000000000000004 1.5175,-0.30000000000000004 1.5175,0 2.435,0" data-type="line" data-label="" points="201.34453781512605,376.47058823529414 324.7058823529412,376.47058823529414 324.7058823529412,336.1344537815126 448.06722689075633,336.1344537815126" fill="none" stroke="purple" stroke-width="1px"/></g><g><rect data-type="rect" data-label="schematic_component_0" data-x="0" data-y="0" x="40" y="268.9075630252101" width="161.34453781512605" height="134.45378151260502" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.0074375"/></g><g><rect data-type="rect" data-label="schematic_component_1" data-x="3" data-y="0.13249999999999998" x="448.0672268907564" y="256.8067226890756" width="151.93277310924367" height="123.02521008403363" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.0074375"/></g><g><rect data-type="rect" data-label="U1" data-x="-0.08000000000000002" data-y="0.615" x="85.7142857142857" y="236.6386554621849" width="48.40336134453783" height="33.613445378151255" fill="rgba(160, 0, 220, 0.14)" stroke="black" stroke-width="0.0074375"/></g><g><rect data-type="rect" data-label="INLINE netId: USER_LED_ANODE
 axis: x
@@ -58,7 +58,7 @@ USER_LED_ANODE" data-x="1.5175" data-y="0" cx="324.7058823529412" cy="336.134453
               });
             ]]></script>
   </g>
-  <g transform="translate(1216, 200)">
+  <g transform="translate(0, 1216)">
     <style>
               .boundary { fill: rgb(245, 241, 237); }
               .schematic-boundary { fill: none; stroke: #fff; }

package/tests/solvers/InlineNetLabelSolver/__snapshots__/terminal-stub-trace-clearance.snap.svg

@@ -1,4 +1,4 @@
-<svg width="2416" height="1200" viewBox="0 0 2416 1200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on the left and Circuit JSON schematic on the right">
+<svg width="1200" height="2016" viewBox="0 0 1200 2016" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on top and Circuit JSON schematic on the bottom">
   <g transform="translate(0, 0) scale(1.875, 1.875) translate(0, 0)">
     <rect width="100%" height="100%" fill="white"/><g><polyline data-points="0.5,-0.1 1,-0.1 1,0.5" data-type="line" data-label="" points="413.33333333333337,394.66666666666663 600,394.66666666666663 600,170.66666666666666" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="0.5,0.3 0.95,0.3" data-type="line" data-label="" points="413.33333333333337,245.33333333333331 581.3333333333333,245.33333333333331" fill="none" stroke="purple" stroke-width="1px"/></g><g><polyline data-points="0.5,0.1 0.95,0.1" data-type="line" data-label="" points="413.33333333333337,320 581.3333333333333,320" fill="none" stroke="purple" stroke-width="1px"/></g><g><rect data-type="rect" data-label="U1" data-x="0" data-y="0.1" x="40" y="170.66666666666669" width="373.33333333333337" height="298.66666666666663" fill="hsl(164, 100%, 50%, 0.8)" stroke="black" stroke-width="0.0026785714285714286"/></g><g><rect data-type="rect" data-label="INLINE netId: SCL
 axis: x
@@ -54,7 +54,7 @@ SDA" data-x="0.725" data-y="0.1" cx="497.3333333333333" cy="320" r="3" fill="gre
               });
             ]]></script>
   </g>
-  <g transform="translate(1216, 200)">
+  <g transform="translate(0, 1216)">
     <style>
               .boundary { fill: rgb(245, 241, 237); }
               .schematic-boundary { fill: none; stroke: #fff; }

package/tests/solvers/SameNetJunctionAlignmentSolver/parallel-load-rails.test.ts

@@ -0,0 +1,291 @@
+import { expect, test } from "bun:test"
+import { alignSameNetJunctions } from "lib/solvers/SameNetJunctionAlignmentSolver/alignSameNetJunctions"
+import type { SolvedTracePath } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceLinesSolver"
+import type { NetLabelPlacement } from "lib/solvers/NetLabelPlacementSolver/NetLabelPlacementSolver"
+import { tracePathContainsPoint } from "lib/solvers/RailNetLabelCornerPlacementSolver/geometry"
+import type { InputProblem } from "lib/types/InputProblem"
+
+const createFixture = (mirrorX = 1, mirrorY = 1) => {
+  const point = (x: number, y: number) => ({ x: x * mirrorX, y: y * mirrorY })
+  const facing = mirrorY === 1 ? "y-" : "y+"
+  const pins: Array<SolvedTracePath["pins"][number]> = [
+    { pinId: "A.1", chipId: "A", ...point(0, 1), _facingDirection: facing },
+    { pinId: "B.1", chipId: "B", ...point(2, 1), _facingDirection: facing },
+    { pinId: "C.1", chipId: "C", ...point(2, -1), _facingDirection: facing },
+    {
+      pinId: "U.1",
+      chipId: "U",
+      ...point(3, 0.6),
+      _facingDirection: mirrorX === 1 ? "x-" : "x+",
+    },
+  ]
+  const trace = (
+    id: string,
+    indexes: [number, number],
+    coordinates: number[][],
+  ): SolvedTracePath => ({
+    mspPairId: id,
+    dcConnNetId: "rail",
+    globalConnNetId: "rail",
+    userNetId: "RAIL",
+    mspConnectionPairIds: [id],
+    pins: [pins[indexes[0]]!, pins[indexes[1]]!],
+    pinIds: indexes.map((index) => pins[index]!.pinId),
+    tracePath: coordinates.map(([x, y]) => point(x!, y!)),
+  })
+  const traces = [
+    trace(
+      "parallel",
+      [1, 0],
+      [
+        [2, 1],
+        [2, 0.8],
+        [0, 0.8],
+        [0, 1],
+      ],
+    ),
+    trace(
+      "supply",
+      [3, 1],
+      [
+        [3, 0.6],
+        [2, 0.6],
+        [2, 1],
+      ],
+    ),
+    trace(
+      "return",
+      [2, 1],
+      [
+        [2, -1],
+        [2, -1.2],
+        [1.2, -1.2],
+        [1.2, 0.8],
+        [2, 0.8],
+        [2, 1],
+      ],
+    ),
+  ]
+  const inputProblem: InputProblem = {
+    chips: pins.map((pin, index) => ({
+      chipId: pin.chipId,
+      center:
+        index === 3 ? point(3.2, 0.6) : { x: pin.x, y: pin.y + 0.2 * mirrorY },
+      width: 0.4,
+      height: 0.4,
+      pins: [pin],
+    })),
+    directConnections: [],
+    netConnections: [],
+    availableNetLabelOrientations: {},
+  }
+  return {
+    inputProblem,
+    traces,
+    point,
+    netLabelPlacements: [] as NetLabelPlacement[],
+  }
+}
+
+for (const mirrorX of [1, -1]) {
+  for (const mirrorY of [1, -1]) {
+    test(`levels parallel rails and aligns return columns (${mirrorX}, ${mirrorY})`, () => {
+      const fixture = createFixture(mirrorX, mirrorY)
+      const before = structuredClone(fixture.traces)
+      const result = alignSameNetJunctions(fixture)
+      expect(result.alignedJunctionCount).toBe(2)
+      const parallel = result.traces.find(
+        (trace) => trace.mspPairId === "parallel",
+      )!
+      expect(parallel.tracePath).toEqual([
+        fixture.point(2, 1),
+        fixture.point(2, 0.6),
+        fixture.point(0, 0.6),
+        fixture.point(0, 1),
+      ])
+      const branch = result.traces.find(
+        (trace) => trace.mspPairId === "return",
+      )!
+      expect(branch.tracePath).toEqual([
+        fixture.point(2, -1),
+        fixture.point(2, -1.2),
+        fixture.point(0, -1.2),
+        fixture.point(0, 0.6),
+        fixture.point(2, 0.6),
+        fixture.point(2, 1),
+      ])
+      for (const trace of result.traces) {
+        expect(trace.tracePath[0]).toEqual({
+          x: trace.pins[0]!.x,
+          y: trace.pins[0]!.y,
+        })
+        expect(trace.tracePath.at(-1)).toEqual({
+          x: trace.pins[1]!.x,
+          y: trace.pins[1]!.y,
+        })
+      }
+      expect(fixture.traces).toEqual(before)
+      expect(
+        alignSameNetJunctions({ ...fixture, traces: result.traces }).traces,
+      ).toEqual(result.traces)
+    })
+  }
+}
+
+test("reversing trace order and endpoints preserves the aligned geometry", () => {
+  const fixture = createFixture()
+  fixture.traces.reverse()
+  for (const trace of fixture.traces) {
+    trace.pins.reverse()
+    trace.pinIds.reverse()
+    trace.tracePath.reverse()
+  }
+  const result = alignSameNetJunctions(fixture)
+  expect(result.alignedJunctionCount).toBe(2)
+  const branch = result.traces.find((trace) => trace.mspPairId === "return")!
+  expect(
+    branch.tracePath.every((point) => point.x === 0 || point.x === 2),
+  ).toBe(true)
+})
+
+test("does not route a return column through a component", () => {
+  const fixture = createFixture()
+  fixture.inputProblem.chips.push({
+    chipId: "obstacle",
+    center: { x: 0, y: 0 },
+    width: 0.2,
+    height: 0.2,
+    pins: [],
+  })
+  const original = structuredClone(fixture.traces[2]!)
+  const result = alignSameNetJunctions(fixture)
+  expect(result.traces.find((trace) => trace.mspPairId === "return")).toEqual(
+    original,
+  )
+})
+
+for (const [name, path] of [
+  [
+    "perpendicular",
+    [
+      { x: -0.5, y: 0 },
+      { x: 0.5, y: 0 },
+    ],
+  ],
+  [
+    "collinear",
+    [
+      { x: 0, y: -0.5 },
+      { x: 0, y: 0.3 },
+    ],
+  ],
+] as const) {
+  test(`does not introduce a ${name} cross-net intersection`, () => {
+    const fixture = createFixture()
+    const original = structuredClone(fixture.traces[2]!)
+    fixture.traces.push({
+      ...original,
+      mspPairId: "foreign",
+      globalConnNetId: "foreign",
+      tracePath: [...path],
+    })
+    const result = alignSameNetJunctions(fixture)
+    expect(result.traces.find((trace) => trace.mspPairId === "return")).toEqual(
+      original,
+    )
+  })
+}
+
+test("shortens the return escape when the original length would cross another net", () => {
+  const fixture = createFixture()
+  fixture.traces.push({
+    ...fixture.traces[2]!,
+    mspPairId: "foreign",
+    globalConnNetId: "foreign",
+    tracePath: [
+      { x: -0.5, y: -1.1 },
+      { x: 1, y: -1.1 },
+      { x: 1, y: -1.3 },
+    ],
+  })
+  const result = alignSameNetJunctions(fixture)
+  const branch = result.traces.find((trace) => trace.mspPairId === "return")!
+  expect(
+    branch.tracePath.every((point) => point.x === 0 || point.x === 2),
+  ).toBe(true)
+  expect(Math.min(...branch.tracePath.map((point) => point.y))).toBeCloseTo(
+    -1.05,
+    6,
+  )
+})
+
+test("keeps a label attached when the return branch moves", () => {
+  const fixture = createFixture()
+  fixture.netLabelPlacements.push({
+    globalConnNetId: "rail",
+    dcConnNetId: "rail",
+    netId: "RAIL",
+    mspConnectionPairIds: ["return"],
+    pinIds: ["C.1", "B.1"],
+    anchorPoint: { x: 1.2, y: 0 },
+    center: { x: 1.1, y: 0 },
+    width: 0.2,
+    height: 0.1,
+    orientation: "x-",
+  })
+  const result = alignSameNetJunctions(fixture)
+  const branch = result.traces.find((trace) => trace.mspPairId === "return")!
+  expect(
+    branch.tracePath.every((point) => point.x === 0 || point.x === 2),
+  ).toBe(true)
+  expect(
+    tracePathContainsPoint(
+      branch.tracePath,
+      result.netLabelPlacements[0]!.anchorPoint,
+    ),
+  ).toBe(true)
+})
+
+test("does not combine rails belonging to different nets", () => {
+  const fixture = createFixture()
+  fixture.traces[2]!.globalConnNetId = "different"
+  const original = structuredClone(fixture.traces[2]!)
+  const result = alignSameNetJunctions(fixture)
+  expect(result.traces.find((trace) => trace.mspPairId === "return")).toEqual(
+    original,
+  )
+})
+
+test("does not force an outer return column onto staggered load pins", () => {
+  const fixture = createFixture()
+  fixture.traces[0]!.pins[1].y = 1.4
+  fixture.traces[0]!.tracePath.at(-1)!.y = 1.4
+  const original = structuredClone(fixture.traces[2]!)
+  const result = alignSameNetJunctions(fixture)
+  expect(result.traces.find((trace) => trace.mspPairId === "return")).toEqual(
+    original,
+  )
+})
+
+for (const net of ["rail", "foreign"]) {
+  test(`does not enter a ${net} label while extending the return column`, () => {
+    const fixture = createFixture()
+    fixture.netLabelPlacements.push({
+      globalConnNetId: net,
+      dcConnNetId: net,
+      netId: net,
+      mspConnectionPairIds: [],
+      pinIds: [],
+      orientation: "x+",
+      anchorPoint: { x: -0.1, y: 0 },
+      center: { x: 0, y: 0 },
+      width: 0.2,
+      height: 0.2,
+    })
+    const original = structuredClone(fixture.traces[2]!)
+    const result = alignSameNetJunctions(fixture)
+    expect(result.traces.find((trace) => trace.mspPairId === "return")).toEqual(
+      original,
+    )
+  })
+}

package/tests/solvers/SchematicTraceSingleLineSolver2/__snapshots__/SchematicTraceSingleLineSolver2_01-example17-d1_1-u1_1.snap.svg

@@ -1,4 +1,4 @@
-<svg width="2416" height="1200" viewBox="0 0 2416 1200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on the left and Circuit JSON schematic on the right">
+<svg width="1200" height="2016" viewBox="0 0 1200 2016" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on top and Circuit JSON schematic on the bottom">
   <g transform="translate(0, 0) scale(1.875, 1.875) translate(0, 0)">
     <rect width="100%" height="100%" fill="white"/><g><polyline data-points="1.15,-0.30000000000000004 1.8499999999999996,-0.3000000000000007" data-type="line" data-label="" points="336.1256544502618,395.86387434554973 387.43455497382195,395.8638743455498" fill="none" stroke="hsl(160, 100%, 50%, 0.1)" stroke-width="1px"/></g><g><polyline data-points="2.95,-0.3000000000000007 3.6500000000000004,-0.3000000000000007" data-type="line" data-label="" points="468.0628272251309,395.8638743455498 519.3717277486911,395.8638743455498" fill="none" stroke="hsl(48, 100%, 50%, 0.1)" stroke-width="1px"/></g><g><polyline data-points="-1.15,0.30000000000000004 -1.1500000000000004,1.15" data-type="line" data-label="" points="167.5392670157068,351.8848167539267 167.5392670157068,289.58115183246076" fill="none" stroke="hsl(280, 100%, 50%, 0.1)" stroke-width="1px"/></g><g><polyline data-points="-1.15,0.10000000000000003 -1.85,0.10000000000000002" data-type="line" data-label="" points="167.5392670157068,366.5445026178011 116.2303664921466,366.5445026178011" fill="none" stroke="hsl(48, 100%, 50%, 0.1)" stroke-width="1px"/></g><g><polyline data-points="-1.15,0.30000000000000004 -1.3499999999999999,0.30000000000000004 -1.3499999999999999,0.7250000000000001 -1.1500000000000004,0.7250000000000001 -1.1500000000000004,1.15" data-type="line" data-label="" points="167.5392670157068,351.8848167539267 152.87958115183247,351.8848167539267 152.87958115183247,320.73298429319374 167.5392670157068,320.73298429319374 167.5392670157068,289.58115183246076" fill="none" stroke="red" stroke-width="1px" stroke-dasharray="4 4"/></g><g><polyline data-points="-1.15,0.30000000000000004 -1.1500000000000004,1.15" data-type="line" data-label="" points="167.5392670157068,351.8848167539267 167.5392670157068,289.58115183246076" fill="none" stroke="blue" stroke-width="1px" stroke-dasharray="5 5"/></g><g><polyline data-points="-1.15,0.30000000000000004 -1.3499999999999999,0.30000000000000004 -1.3499999999999999,0.7250000000000001 -1.1500000000000004,0.7250000000000001 -1.1500000000000004,1.15" data-type="line" data-label="" points="167.5392670157068,351.8848167539267 152.87958115183247,351.8848167539267 152.87958115183247,320.73298429319374 167.5392670157068,320.73298429319374 167.5392670157068,289.58115183246076" fill="none" stroke="green" stroke-width="1px"/></g><g><rect data-type="rect" data-label="schematic_component_0" data-x="0" data-y="0" x="167.5392670157068" y="337.22513089005236" width="168.58638743455498" height="73.29842931937173" fill="hsl(24, 100%, 50%, 0.1)" stroke="black" stroke-width="0.013642857142857144"/></g><g><rect data-type="rect" data-label="schematic_component_1" data-x="-1.1500000000000004" data-y="1.6700000000000002" x="129.4240837696335" y="213.3507853403141" width="76.2303664921466" height="76.23036649214663" fill="hsl(24, 100%, 50%, 0.1)" stroke="black" stroke-width="0.013642857142857144"/></g><g><rect data-type="rect" data-label="schematic_component_2" data-x="-2.37" data-y="0.10000000000000009" x="40.000000000000014" y="346.75392670157066" width="76.2303664921466" height="39.58115183246076" fill="hsl(24, 100%, 50%, 0.1)" stroke="black" stroke-width="0.013642857142857144"/></g><g><rect data-type="rect" data-label="schematic_component_3" data-x="2.4" data-y="-0.3000000000000007" x="387.43455497382195" y="365.07853403141365" width="80.62827225130894" height="61.57068062827227" fill="hsl(24, 100%, 50%, 0.1)" stroke="black" stroke-width="0.013642857142857144"/></g><g><rect data-type="rect" data-label="schematic_component_4" data-x="4.2" data-y="-0.3000000000000007" x="519.371727748691" y="365.07853403141365" width="80.62827225130889" height="61.57068062827227" fill="hsl(24, 100%, 50%, 0.1)" stroke="black" stroke-width="0.013642857142857144"/></g><g><circle data-type="point" data-label="U1.1
 x-" data-x="-1.15" data-y="0.30000000000000004" cx="167.5392670157068" cy="351.8848167539267" r="3" fill="hsl(319, 100%, 50%, 0.8)"/></g><g><circle data-type="point" data-label="U1.2
@@ -61,7 +61,7 @@ x+" data-x="4.75" data-y="-0.3000000000000007" cx="600" cy="395.8638743455498" r
               });
             ]]></script>
   </g>
-  <g transform="translate(1216, 200)">
+  <g transform="translate(0, 1216)">
     <style>
               .boundary { fill: rgb(245, 241, 237); }
               .schematic-boundary { fill: none; stroke: #fff; }

package/tests/solvers/SchematicTraceSingleLineSolver2/__snapshots__/SchematicTraceSingleLineSolver2_repro47-short-opposing-pins.snap.svg

@@ -1,4 +1,4 @@
-<svg width="2416" height="1200" viewBox="0 0 2416 1200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on the left and Circuit JSON schematic on the right">
+<svg width="1200" height="2016" viewBox="0 0 1200 2016" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on top and Circuit JSON schematic on the bottom">
   <g transform="translate(0, 0) scale(1.875, 1.875) translate(0, 0)">
     <rect width="100%" height="100%" fill="white"/><g><polyline data-points="3.4,0.095 3.61,0.045" data-type="line" data-label="" points="261.78217821782187,306.13861386138615 378.21782178217813,333.86138613861385" fill="none" stroke="hsl(112, 100%, 50%, 0.1)" stroke-width="1px"/></g><g><polyline data-points="3.4,0.095 3.465,0.095 3.505,0.095 3.505,0.045 3.545,0.045 3.61,0.045" data-type="line" data-label="" points="261.78217821782187,306.13861386138615 297.82178217821775,306.13861386138615 320,306.13861386138615 320,333.86138613861385 342.17821782178225,333.86138613861385 378.21782178217813,333.86138613861385" fill="none" stroke="red" stroke-width="1px" stroke-dasharray="4 4"/></g><g><polyline data-points="3.4,0.095 3.61,0.045" data-type="line" data-label="" points="261.78217821782187,306.13861386138615 378.21782178217813,333.86138613861385" fill="none" stroke="blue" stroke-width="1px" stroke-dasharray="5 5"/></g><g><polyline data-points="3.4,0.095 3.465,0.095 3.505,0.095 3.505,0.045 3.545,0.045 3.61,0.045" data-type="line" data-label="" points="261.78217821782187,306.13861386138615 297.82178217821775,306.13861386138615 320,306.13861386138615 320,333.86138613861385 342.17821782178225,333.86138613861385 378.21782178217813,333.86138613861385" fill="none" stroke="green" stroke-width="1px"/></g><g><rect data-type="rect" data-label="D2" data-x="3.2" data-y="0.095" x="40" y="250.69306930693068" width="221.7821782178221" height="110.89108910891093" fill="hsl(358, 100%, 50%, 0.1)" stroke="black" stroke-width="0.0018035714285714283"/></g><g><rect data-type="rect" data-label="SW2" data-x="3.81" data-y="0.045" x="378.21782178217825" y="278.41584158415844" width="221.78217821782187" height="110.89108910891088" fill="hsl(70, 100%, 50%, 0.1)" stroke="black" stroke-width="0.0018035714285714283"/></g><g><circle data-type="point" data-label="D2.cathode
 x+" data-x="3.4" data-y="0.095" cx="261.78217821782187" cy="306.13861386138615" r="3" fill="hsl(22, 100%, 50%, 0.8)"/></g><g><circle data-type="point" data-label="SW2.pin1
@@ -47,7 +47,7 @@ x-" data-x="3.61" data-y="0.045" cx="378.21782178217813" cy="333.86138613861385"
               });
             ]]></script>
   </g>
-  <g transform="translate(1216, 200)">
+  <g transform="translate(0, 1216)">
     <style>
               .boundary { fill: rgb(245, 241, 237); }
               .schematic-boundary { fill: none; stroke: #fff; }

package/tests/solvers/TraceCleanupSolver/__snapshots__/TraceCleanupSolver.snap.svg

@@ -1,4 +1,4 @@
-<svg width="2416" height="1200" viewBox="0 0 2416 1200" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on the left and Circuit JSON schematic on the right">
+<svg width="1200" height="2016" viewBox="0 0 1200 2016" xmlns="http://www.w3.org/2000/svg" role="img" aria-label="Solver debug visualization on top and Circuit JSON schematic on the bottom">
   <g transform="translate(0, 0) scale(1.875, 1.875) translate(0, 0)">
     <rect width="100%" height="100%" fill="white"/><g><polyline data-points="1.2000000000000002,-0.30000000000000004 1.6,-2.295" data-type="line" data-label="" points="308.80000000000007,241.88 353.6,465.31999999999994" fill="none" stroke="hsl(157, 100%, 50%, 0.1)" stroke-width="1px" stroke-dasharray="4 2"/></g><g><polyline data-points="1.2000000000000002,0.30000000000000004 1.6,-1.895" data-type="line" data-label="" points="308.80000000000007,174.68 353.6,420.52" fill="none" stroke="hsl(190, 100%, 50%, 0.1)" stroke-width="1px" stroke-dasharray="4 2"/></g><g><polyline data-points="1.2000000000000002,-0.30000000000000004 1.4000000000000001,-0.30000000000000004 1.4000000000000001,-1.2975000000000003 1.049,-1.2975000000000003 1.049,-2.2950000000000004 1.6,-2.295" data-type="line" data-label="" points="308.80000000000007,241.88 331.20000000000005,241.88 331.20000000000005,353.6 291.88800000000003,353.6 291.88800000000003,465.32000000000005 353.6,465.31999999999994" fill="none" stroke="red" stroke-width="1px"/></g><g><rect data-type="rect" data-label="schematic_component_0" data-x="0" data-y="0" x="40" y="152.28000000000003" width="268.80000000000007" height="111.99999999999997" fill="hsl(24, 100%, 50%, 0.1)" stroke="black" stroke-width="0.008928571428571428"/></g><g><rect data-type="rect" data-label="schematic_component_1" data-x="2.7" data-y="-2.095" x="353.6000000000001" y="398.12" width="246.39999999999998" height="89.60000000000002" fill="hsl(24, 100%, 50%, 0.1)" stroke="black" stroke-width="0.008928571428571428"/></g><g><circle data-type="point" data-label="U1.1
 x+" data-x="1.2000000000000002" data-y="-0.30000000000000004" cx="308.80000000000007" cy="241.88" r="3" fill="hsl(319, 100%, 50%, 0.8)"/></g><g><circle data-type="point" data-label="U1.2
@@ -56,7 +56,7 @@ x-" data-x="1.6" data-y="-2.295" cx="353.6" cy="465.31999999999994" r="3" fill="
               });
             ]]></script>
   </g>
-  <g transform="translate(1216, 200)">
+  <g transform="translate(0, 1216)">
     <style>
               .boundary { fill: rgb(245, 241, 237); }
               .schematic-boundary { fill: none; stroke: #fff; }