@tscircuit/schematic-trace-solver 0.0.56 → 0.0.57

package/dist/index.js

@@ -5487,6 +5487,14 @@ var segmentCrossesBoundsInterior = (p1, p2, bounds) => {
   }
   return false;
 };
+var tracePathCrossesAnyBounds = (tracePath, bounds) => {
+  for (let i = 0; i < tracePath.length - 1; i++) {
+    if (segmentCrossesBoundsInterior(tracePath[i], tracePath[i + 1], bounds)) {
+      return true;
+    }
+  }
+  return false;
+};
 var tracePathCrossesAnyTrace = (tracePath, traceMap) => {
   for (const trace of Object.values(traceMap)) {
     const points = trace.tracePath;
@@ -5968,16 +5976,24 @@ var AvailableNetOrientationSolver = class extends BaseSolver {
       labelIndex
     );
     if (boundsStatus !== "valid") return boundsStatus;
-    if (tracePathCrossesAnyTrace(
-      getConnectorTracePath(
-        label.anchorPoint,
-        candidate.anchorPoint,
-        candidate.orientation
-      ),
-      this.traceMap
-    )) {
+    const connectorTrace = getConnectorTracePath(
+      label.anchorPoint,
+      candidate.anchorPoint,
+      candidate.orientation
+    );
+    if (tracePathCrossesAnyTrace(connectorTrace, this.traceMap)) {
       return "trace-collision";
     }
+    for (let i = 0; i < this.outputNetLabelPlacements.length; i++) {
+      if (i === labelIndex) continue;
+      const otherLabel = this.outputNetLabelPlacements[i];
+      if (tracePathCrossesAnyBounds(
+        connectorTrace,
+        getRectBounds(otherLabel.center, otherLabel.width, otherLabel.height)
+      )) {
+        return "netlabel-collision";
+      }
+    }
     return "valid";
   }
   getBoundsStatus(bounds, labelIndex) {

package/lib/solvers/AvailableNetOrientationSolver/AvailableNetOrientationSolver.ts

@@ -21,6 +21,7 @@ import {
   rangesOverlap,
   rectsOverlap,
   traceCrossesBoundsInterior,
+  tracePathCrossesAnyBounds,
   tracePathCrossesAnyTrace,
 } from "./geometry"
 import { getPinMap, getTracePins, toNetLabelPlacementPatch } from "./traces"
@@ -447,19 +448,29 @@ export class AvailableNetOrientationSolver extends BaseSolver {
     )
     if (boundsStatus !== "valid") return boundsStatus
 
-    if (
-      tracePathCrossesAnyTrace(
-        getConnectorTracePath(
-          label.anchorPoint,
-          candidate.anchorPoint,
-          candidate.orientation,
-        ),
-        this.traceMap,
-      )
-    ) {
+    const connectorTrace = getConnectorTracePath(
+      label.anchorPoint,
+      candidate.anchorPoint,
+      candidate.orientation,
+    )
+
+    if (tracePathCrossesAnyTrace(connectorTrace, this.traceMap)) {
       return "trace-collision"
     }
 
+    for (let i = 0; i < this.outputNetLabelPlacements.length; i++) {
+      if (i === labelIndex) continue
+      const otherLabel = this.outputNetLabelPlacements[i]!
+      if (
+        tracePathCrossesAnyBounds(
+          connectorTrace,
+          getRectBounds(otherLabel.center, otherLabel.width, otherLabel.height),
+        )
+      ) {
+        return "netlabel-collision"
+      }
+    }
+
     return "valid"
   }
 

package/lib/solvers/AvailableNetOrientationSolver/geometry.ts

@@ -88,6 +88,20 @@ const segmentCrossesBoundsInterior = (p1: Point, p2: Point, bounds: Bounds) => {
   return false
 }
 
+export const tracePathCrossesAnyBounds = (
+  tracePath: Point[],
+  bounds: Bounds,
+) => {
+  for (let i = 0; i < tracePath.length - 1; i++) {
+    if (
+      segmentCrossesBoundsInterior(tracePath[i]!, tracePath[i + 1]!, bounds)
+    ) {
+      return true
+    }
+  }
+  return false
+}
+
 export const tracePathCrossesAnyTrace = (
   tracePath: Point[],
   traceMap: Record<string, SolvedTracePath>,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/schematic-trace-solver",
   "main": "dist/index.js",
-  "version": "0.0.56",
+  "version": "0.0.57",
   "type": "module",
   "scripts": {
     "start": "cosmos",

package/site/examples/example34.page.tsx

@@ -0,0 +1,4 @@
+import { PipelineDebugger } from "site/components/PipelineDebugger"
+import inputProblem from "../../tests/assets/example34.json"
+
+export default () => <PipelineDebugger inputProblem={inputProblem as any} />

package/tests/assets/example34.json

@@ -0,0 +1,61 @@
+{
+  "chips": [
+    {
+      "chipId": "schematic_component_0",
+      "center": {
+        "x": 0,
+        "y": 0
+      },
+      "width": 1,
+      "height": 1,
+      "pins": [
+        {
+          "pinId": "U1.1",
+          "x": 1.1,
+          "y": 0.30000000000000004
+        },
+        {
+          "pinId": "U1.2",
+          "x": 1.1,
+          "y": 0.09999999999999998
+        },
+        {
+          "pinId": "U1.3",
+          "x": 1.1,
+          "y": -0.10000000000000003
+        },
+        {
+          "pinId": "U1.4",
+          "x": 1.1,
+          "y": -0.30000000000000004
+        }
+      ]
+    }
+  ],
+  "directConnections": [],
+  "netConnections": [
+    {
+      "netId": "SCL",
+      "pinIds": ["U1.1"]
+    },
+    {
+      "netId": "SDA",
+      "pinIds": ["U1.2"]
+    },
+    {
+      "netId": "V3_3",
+      "pinIds": ["U1.3"]
+    },
+    {
+      "netId": "GND",
+      "pinIds": ["U1.4"]
+    }
+  ],
+  "availableNetLabelOrientations": {
+    "SCL": ["x-", "x+"],
+    "SDA": ["x-", "x+"],
+    "V3_3": ["y+"],
+    "GND": ["y-"]
+  },
+  "maxMspPairDistance": 2.4
+}

package/tests/examples/__snapshots__/example34.snap.svg

@@ -0,0 +1,113 @@
+<svg width="640" height="640" viewBox="0 0 640 640" xmlns="http://www.w3.org/2000/svg">
+  <rect width="100%" height="100%" fill="white" />
+  <g>
+    <circle data-type="point" data-label="U1.1
+x+" data-x="1.1" data-y="0.30000000000000004" cx="487.83715012722644" cy="248.75318066157763" r="3" fill="hsl(319, 100%, 50%, 0.8)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="U1.2
+x+" data-x="1.1" data-y="0.09999999999999998" cx="487.83715012722644" cy="289.46564885496184" r="3" fill="hsl(320, 100%, 50%, 0.8)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="U1.3
+x+" data-x="1.1" data-y="-0.10000000000000003" cx="487.83715012722644" cy="330.17811704834605" r="3" fill="hsl(321, 100%, 50%, 0.8)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="U1.4
+x+" data-x="1.1" data-y="-0.30000000000000004" cx="487.83715012722644" cy="370.89058524173026" r="3" fill="hsl(322, 100%, 50%, 0.8)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="1.1" data-y="0.30000000000000004" cx="487.83715012722644" cy="248.75318066157763" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="1.1" data-y="0.09999999999999998" cx="487.83715012722644" cy="289.46564885496184" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="1.5510000000000002" data-y="0.4009999999999999" cx="579.6437659033079" cy="228.1933842239186" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <circle data-type="point" data-label="" data-x="1.201" data-y="-0.5010000000000001" cx="508.39694656488547" cy="411.80661577608146" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+  </g>
+  <g>
+    <polyline data-points="1.1,-0.10000000000000003 1.5510000000000002,-0.10000000000000003 1.5510000000000002,0.4009999999999999" data-type="line" data-label="" points="487.83715012722644,330.17811704834605 579.6437659033079,330.17811704834605 579.6437659033079,228.1933842239186" fill="none" stroke="purple" stroke-width="1" />
+  </g>
+  <g>
+    <polyline data-points="1.1,-0.30000000000000004 1.201,-0.30000000000000004 1.201,-0.5010000000000001" data-type="line" data-label="" points="487.83715012722644,370.89058524173026 508.39694656488547,370.89058524173026 508.39694656488547,411.80661577608146" fill="none" stroke="purple" stroke-width="1" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="schematic_component_0" data-x="0" data-y="0" x="40" y="208.04071246819342" width="447.83715012722644" height="203.56234096692106" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.004912500000000001" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: SCL
+globalConnNetId: connectivity_net0" data-x="1.326" data-y="0.30000000000000004" x="488.0407124681933" y="228.39694656488552" width="91.60305343511459" height="40.71246819338421" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.004912500000000001" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: SDA
+globalConnNetId: connectivity_net1" data-x="1.326" data-y="0.09999999999999998" x="488.0407124681933" y="269.10941475826974" width="91.60305343511459" height="40.71246819338421" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.004912500000000001" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: V3_3
+globalConnNetId: connectivity_net2" data-x="1.5510000000000002" data-y="0.6259999999999999" x="559.2875318066158" y="136.59033078880412" width="40.71246819338421" height="91.60305343511448" fill="#ef444466" stroke="#ef4444" stroke-width="0.004912500000000001" />
+  </g>
+  <g>
+    <rect data-type="rect" data-label="netId: GND
+globalConnNetId: connectivity_net3" data-x="1.201" data-y="-0.7260000000000001" x="488.0407124681933" y="411.80661577608146" width="40.71246819338421" height="91.60305343511448" fill="#00000066" stroke="#000000" stroke-width="0.004912500000000001" />
+  </g>
+  <g id="crosshair" style="display: none">
+    <line id="crosshair-h" y1="0" y2="640" 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', '640');
+
+      // Calculate real coordinates using inverse transformation
+      const matrix = {
+        "a": 203.56234096692108,
+        "c": 0,
+        "e": 263.9185750636132,
+        "b": 0,
+        "d": -203.56234096692108,
+        "f": 309.82188295165395
+      };
+      // 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/examples/example34.test.ts

@@ -0,0 +1,12 @@
+import { test, expect } from "bun:test"
+import { SchematicTracePipelineSolver } from "lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver"
+import inputProblem from "../assets/example34.json"
+import "tests/fixtures/matcher"
+
+test("example34", () => {
+  const solver = new SchematicTracePipelineSolver(inputProblem as any)
+
+  solver.solve()
+
+  expect(solver).toMatchSolverSnapshot(import.meta.path)
+})