@tscircuit/schematic-trace-solver 0.0.163 → 0.0.165

package/tests/examples/example51.test.ts

@@ -10,5 +10,29 @@ test("example51", () => {
 
   solver.solve()
 
+  const output = solver.netLabelToTraceSolver!.getOutput()
+  const expectedRecoveredPairs = [
+    ["schematic_port_113", "schematic_port_110"],
+    ["schematic_port_116", "schematic_port_111"],
+    ["schematic_port_60", "schematic_port_72"],
+    ["schematic_port_73", "schematic_port_112"],
+    ["schematic_port_68", "schematic_port_74"],
+    ["schematic_port_75", "schematic_port_12"],
+  ]
+
+  for (const expectedPair of expectedRecoveredPairs) {
+    expect(
+      output.traces.some((trace) =>
+        expectedPair.every((pinId) => trace.pinIds.includes(pinId)),
+      ),
+    ).toBe(true)
+    expect(
+      output.netLabelPlacements.some(
+        (label) =>
+          label.pinIds.length === 1 && expectedPair.includes(label.pinIds[0]!),
+      ),
+    ).toBe(false)
+  }
+
   expect(solver).toMatchSolverSnapshot(import.meta.path)
 })

package/tests/fixtures/convertSolverOutputToCircuitJson.ts

@@ -17,7 +17,12 @@ import type { InlineNetLabelPlacement } from "lib/solvers/InlineNetLabelSolver/I
 import type { NetLabelPlacement } from "lib/solvers/NetLabelPlacementSolver/NetLabelPlacementSolver"
 import type { SolvedTracePath } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceLinesSolver"
 import { getPinDirection } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceSingleLineSolver/getPinDirection"
-import type { InputChip, InputPin, InputProblem } from "lib/types/InputProblem"
+import type {
+  InputChip,
+  InputPin,
+  InputProblem,
+  NetId,
+} from "lib/types/InputProblem"
 import type { FacingDirection } from "lib/utils/dir"
 import { type SchSymbol, symbols } from "schematic-symbols"
 
@@ -63,6 +68,7 @@ type SolverLike = BaseSolver & {
   label?: NetLabelPlacement
   getOutput?: () => SolverOutput
   inlineNetLabelSolver?: { getOutput: () => SolverOutput }
+  netLabelToTraceSolver?: { getOutput: () => SolverOutput }
 }
 
 const isInputProblem = (value: unknown): value is InputProblem => {
@@ -92,6 +98,9 @@ export const getInputProblemFromSolver = (
 
 const safelyGetOutput = (solver: SolverLike): SolverOutput | undefined => {
   try {
+    if (solver.netLabelToTraceSolver?.getOutput) {
+      return solver.netLabelToTraceSolver.getOutput()
+    }
     if (solver.inlineNetLabelSolver?.getOutput) {
       return solver.inlineNetLabelSolver.getOutput()
     }
@@ -947,6 +956,10 @@ export const convertSolverOutputToCircuitJson = (
   }
 
   const netNames = new Set<string>()
+  const groundNetIds = new Set<NetId>()
+  for (const connection of inputProblem.netConnections) {
+    if (connection.isGround) groundNetIds.add(connection.netId)
+  }
   for (const connection of [
     ...inputProblem.directConnections,
     ...inputProblem.netConnections,
@@ -973,7 +986,7 @@ export const convertSolverOutputToCircuitJson = (
       source_net_id: sourceNetId,
       name: netName,
       member_source_group_ids: [],
-      is_ground: /(^|[._-])gnd($|[._-])/i.test(netName),
+      is_ground: groundNetIds.has(netName),
       is_power: /(^|[._-])(vcc|vdd|vss|gnd)($|[._-])/i.test(netName),
     } satisfies SourceNet)
   }
@@ -1055,14 +1068,20 @@ export const convertSolverOutputToCircuitJson = (
 
   for (const [labelIndex, label] of snapshotData.netLabelPlacements.entries()) {
     const netName = getNetLabelNetName(label)
+    const anchorSide = orientationToAnchorSide(label.orientation)
+    let symbolName: string | undefined
+    if (groundNetIds.has(netName) && anchorSide === "top") {
+      symbolName = "rail_down"
+    }
     circuitJson.push({
       type: "schematic_net_label",
       schematic_net_label_id: `schematic_net_label_${labelIndex}`,
       source_net_id: sourceNetIdByName.get(netName)!,
       center: label.center,
       anchor_position: label.anchorPoint,
-      anchor_side: orientationToAnchorSide(label.orientation),
+      anchor_side: anchorSide,
       text: getNetLabelText(label),
+      symbol_name: symbolName,
     } satisfies SchematicNetLabel)
   }