@tscircuit/schematic-trace-solver 0.0.103 → 0.0.105

package/tests/repros/assets/repro-core-subcircuit-missing-ground.input.json

@@ -0,0 +1,103 @@
+{
+  "chips": [
+    {
+      "chipId": "schematic_component_0",
+      "center": {
+        "x": -4,
+        "y": 0
+      },
+      "width": 1.9000000000000004,
+      "height": 0.8,
+      "pins": [
+        {
+          "pinId": "schematic_component_0.1",
+          "x": -2.65,
+          "y": 0.2,
+          "_facingDirection": "x+"
+        },
+        {
+          "pinId": "schematic_component_0.2",
+          "x": -2.65,
+          "y": 0,
+          "_facingDirection": "x+"
+        },
+        {
+          "pinId": "schematic_component_0.3",
+          "x": -2.65,
+          "y": -0.2,
+          "_facingDirection": "x+"
+        }
+      ]
+    },
+    {
+      "chipId": "schematic_component_1",
+      "center": {
+        "x": 4,
+        "y": 0
+      },
+      "width": 1.6999999999999997,
+      "height": 0.8,
+      "pins": [
+        {
+          "pinId": "schematic_component_1.1",
+          "x": 2.75,
+          "y": 0.2,
+          "_facingDirection": "x-"
+        },
+        {
+          "pinId": "schematic_component_1.2",
+          "x": 2.75,
+          "y": 0,
+          "_facingDirection": "x-"
+        },
+        {
+          "pinId": "schematic_component_1.3",
+          "x": 2.75,
+          "y": -0.2,
+          "_facingDirection": "x-"
+        }
+      ]
+    }
+  ],
+  "directConnections": [
+    {
+      "pinIds": [
+        "schematic_component_0.2",
+        "schematic_component_1.3"
+      ],
+      "netId": ".power > .VOUT_3V3 to .load > .3V3"
+    },
+    {
+      "pinIds": [
+        "schematic_component_0.3",
+        "schematic_component_1.2"
+      ],
+      "netId": ".power > .SEC_GND to .load > .GND"
+    }
+  ],
+  "netConnections": [],
+  "textBoxes": [
+    {
+      "chipId": "schematic_component_0",
+      "center": {
+        "x": -4.65,
+        "y": 0.53
+      },
+      "width": 0.5999999999999996,
+      "height": 0.17999999999999994,
+      "text": "power"
+    },
+    {
+      "chipId": "schematic_component_1",
+      "center": {
+        "x": 3.3899999999999997,
+        "y": 0.53
+      },
+      "width": 0.48,
+      "height": 0.17999999999999994,
+      "text": "load"
+    }
+  ],
+  "availableNetLabelOrientations": {},
+  "maxMspPairDistance": 2.4
+}

package/tests/repros/repro-core-subcircuit-missing-ground.test.ts

@@ -0,0 +1,14 @@
+import { expect, test } from "bun:test"
+import { SchematicTracePipelineSolver } from "lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver"
+import "tests/fixtures/matcher"
+import inputProblem from "./assets/repro-core-subcircuit-missing-ground.input.json"
+
+// Captured from @tscircuit/core main repro154: two crossed connections enter
+// the solver, but only the VOUT_3V3-to-3V3 connection is routed.
+test("core repro154 omits one of two crossed subcircuit connections", () => {
+  const solver = new SchematicTracePipelineSolver(inputProblem as any)
+
+  solver.solve()
+
+  expect(solver).toMatchSolverSnapshot(import.meta.path)
+})

package/tests/repros/repro-vcc-pin1-detour.test.ts

@@ -0,0 +1,166 @@
+import { expect, test } from "bun:test"
+import type { NetLabelPlacement } from "lib/solvers/NetLabelPlacementSolver/NetLabelPlacementSolver"
+import type { SolvedTracePath } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceLinesSolver"
+import { TraceCleanupSolver } from "lib/solvers/TraceCleanupSolver/TraceCleanupSolver"
+import type { InputPin, InputProblem } from "lib/types/InputProblem"
+import "tests/fixtures/matcher"
+
+const inputProblem: InputProblem = {
+  chips: [
+    {
+      chipId: "J1",
+      center: { x: -1.8, y: 0.5 },
+      width: 0.6,
+      height: 0.4,
+      pins: [
+        {
+          pinId: "J1.1",
+          x: -1.5,
+          y: 0.5,
+          _facingDirection: "x+",
+        },
+      ],
+    },
+    {
+      chipId: "U1",
+      center: { x: 0, y: 0.25 },
+      width: 1,
+      height: 1.5,
+      pins: [
+        {
+          pinId: "U1.1",
+          x: -0.5,
+          y: 0.5,
+          _facingDirection: "x-",
+        },
+        {
+          pinId: "U1.6",
+          x: -0.5,
+          y: 0,
+          _facingDirection: "x-",
+        },
+      ],
+    },
+  ],
+  directConnections: [],
+  netConnections: [
+    {
+      netId: "VCC",
+      pinIds: ["J1.1", "U1.1", "U1.6"],
+      netLabelWidth: 0.48,
+      netLabelHeight: 0.42,
+    },
+  ],
+  textBoxes: [],
+  availableNetLabelOrientations: { VCC: ["y+"] },
+}
+
+const pin = (chipId: "J1" | "U1", pinId: string) => ({
+  ...inputProblem.chips
+    .find((chip) => chip.chipId === chipId)!
+    .pins.find((candidate) => candidate.pinId === pinId)!,
+  chipId,
+})
+
+const createTrace = ({
+  mspPairId,
+  pins,
+  tracePath,
+  globalConnNetId = "vcc-net",
+  userNetId = "VCC",
+}: {
+  mspPairId: string
+  pins: [InputPin & { chipId: string }, InputPin & { chipId: string }]
+  tracePath: SolvedTracePath["tracePath"]
+  globalConnNetId?: string
+  userNetId?: string
+}): SolvedTracePath => ({
+  mspPairId,
+  dcConnNetId: globalConnNetId,
+  globalConnNetId,
+  userNetId,
+  pins,
+  tracePath,
+  mspConnectionPairIds: [mspPairId],
+  pinIds: pins.map((candidate) => candidate.pinId),
+})
+
+const pin1Detour = createTrace({
+  mspPairId: "U1.1-J1.1",
+  pins: [pin("U1", "U1.1"), pin("J1", "J1.1")],
+  tracePath: [
+    { x: -0.5, y: 0.5 },
+    { x: -0.7, y: 0.5 },
+    { x: -0.7, y: 0.9 },
+    { x: -1.3, y: 0.9 },
+    { x: -1.3, y: 0.5 },
+    { x: -1.5, y: 0.5 },
+  ],
+})
+
+const pin6Branch = createTrace({
+  mspPairId: "U1.6-J1.1",
+  pins: [pin("U1", "U1.6"), pin("J1", "J1.1")],
+  tracePath: [
+    { x: -0.5, y: 0 },
+    { x: -1.3, y: 0 },
+    { x: -1.3, y: 0.5 },
+    { x: -1.5, y: 0.5 },
+  ],
+})
+
+const vccLabel: NetLabelPlacement = {
+  globalConnNetId: "vcc-net",
+  dcConnNetId: "vcc-net",
+  netId: "VCC",
+  mspConnectionPairIds: [pin1Detour.mspPairId, pin6Branch.mspPairId],
+  pinIds: ["J1.1", "U1.1", "U1.6"],
+  orientation: "y+",
+  anchorPoint: { x: -1.3, y: 0.5 },
+  center: { x: -1.3, y: 0.74 },
+  width: 0.42,
+  height: 0.48,
+}
+
+const createSolver = (traces: SolvedTracePath[]) =>
+  new TraceCleanupSolver({
+    inputProblem,
+    allTraces: traces,
+    allLabelPlacements: [vccLabel],
+    mergedLabelNetIdMap: {},
+    paddingBuffer: 0.1,
+    operations: ["minimizing_turns"],
+  })
+
+test("VCC pin 1 routes directly left through its same-net branch", () => {
+  const solver = createSolver([pin1Detour, pin6Branch])
+
+  solver.solve()
+
+  const pin1Trace = solver
+    .getOutput()
+    .traces.find((trace) => trace.mspPairId === pin1Detour.mspPairId)!
+  expect(pin1Trace.tracePath).toEqual([
+    { x: -0.5, y: 0.5 },
+    { x: -1.5, y: 0.5 },
+  ])
+  expect(solver).toMatchSolverSnapshot(import.meta.path)
+})
+
+test("pin 1 keeps the detour when the blocking branch is another net", () => {
+  const signalBranch = {
+    ...pin6Branch,
+    mspPairId: "signal-branch",
+    dcConnNetId: "signal-net",
+    globalConnNetId: "signal-net",
+    userNetId: "SIGNAL",
+  }
+  const solver = createSolver([pin1Detour, signalBranch])
+
+  solver.solve()
+
+  const pin1Trace = solver
+    .getOutput()
+    .traces.find((trace) => trace.mspPairId === pin1Detour.mspPairId)!
+  expect(pin1Trace.tracePath).toEqual(pin1Detour.tracePath)
+})