Merge branch 'tscircuit:main' into main

Author: AnasSarkiz

lib/testing/utils/convertToCircuitJson.ts

@@ -304,6 +304,45 @@ function createPcbPorts(srj: SimpleRouteJson): AnyCircuitElement[] {
   return Array.from(portMap.values())
 }
 
+function getPcbPortPositionMap(srj: SimpleRouteJson) {
+  const portPositionMap = new Map<string, { x: number; y: number }>()
+
+  for (const connection of srj.connections) {
+    for (const point of connection.pointsToConnect) {
+      if (!point.pcb_port_id) continue
+      portPositionMap.set(point.pcb_port_id, { x: point.x, y: point.y })
+    }
+  }
+
+  return portPositionMap
+}
+
+function getBestObstaclePcbPortId(
+  obstacleCenter: Obstacle["center"],
+  candidatePortIds: string[],
+  portPositionMap: Map<string, { x: number; y: number }>,
+): string | undefined {
+  let bestPcbPortId: string | undefined
+  let bestDistance = Number.POSITIVE_INFINITY
+
+  for (const pcbPortId of candidatePortIds) {
+    const position = portPositionMap.get(pcbPortId)
+    if (!position) continue
+
+    const distance = Math.hypot(
+      position.x - obstacleCenter.x,
+      position.y - obstacleCenter.y,
+    )
+
+    if (distance < bestDistance) {
+      bestDistance = distance
+      bestPcbPortId = pcbPortId
+    }
+  }
+
+  return bestPcbPortId ?? candidatePortIds[0]
+}
+
 /**
  * Create pad-like circuit-json elements from SRJ obstacles.
  * Multi-layer obstacles represent plated holes and must not be deduped away
@@ -313,41 +352,34 @@ function createPcbPadElements(srj: SimpleRouteJson): AnyCircuitElement[] {
   const pads: AnyCircuitElement[] = []
   const addedSmtPadIds = new Set<string>()
   const addedPlatedHoleIds = new Set<string>()
+  const portPositionMap = getPcbPortPositionMap(srj)
 
-  for (const obstacle of srj.obstacles as any[]) {
-    const connectedTo: string[] = obstacle?.connectedTo || []
+  for (const obstacle of srj.obstacles) {
+    const connectedTo = obstacle.connectedTo
     const smtPadId: string | undefined = connectedTo.find((id) =>
       id.startsWith("pcb_smtpad_"),
     )
     const platedHoleId: string | undefined = connectedTo.find((id) =>
       id.startsWith("pcb_plated_hole_"),
     )
-    const pcbPortId: string | undefined = connectedTo.find((id) =>
+    const candidatePortIds = connectedTo.filter((id) =>
       id.startsWith("pcb_port_"),
     )
+    const pcbPortId = getBestObstaclePcbPortId(
+      obstacle.center,
+      candidatePortIds,
+      portPositionMap,
+    )
 
     if (!smtPadId && !platedHoleId && !pcbPortId) continue
 
-    const layers: string[] = Array.isArray(obstacle.layers)
-      ? obstacle.layers
-      : obstacle.layer
-        ? [obstacle.layer]
-        : []
+    const layers = obstacle.layers
     if (layers.length === 0) continue
 
-    const width = obstacle.width ?? 0
-    const height = obstacle.height ?? 0
-    const x = obstacle.center?.x ?? obstacle.x
-    const y = obstacle.center?.y ?? obstacle.y
-
-    if (
-      typeof x !== "number" ||
-      typeof y !== "number" ||
-      typeof width !== "number" ||
-      typeof height !== "number"
-    ) {
-      continue
-    }
+    const width = obstacle.width
+    const height = obstacle.height
+    const x = obstacle.center.x
+    const y = obstacle.center.y
 
     const isMultiLayerObstacle = layers.length > 1
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/capacity-autorouter",
   "main": "./dist/index.js",
-  "version": "0.0.380",
+  "version": "0.0.381",
   "type": "module",
   "files": [
     "dist"
@@ -72,7 +72,7 @@
   "dependencies": {
     "@tscircuit/high-density-a01": "^0.0.25",
     "fast-json-stable-stringify": "^2.1.0",
-    "high-density-repair02": "git+https://github.com/tscircuit/high-density-repair02.git#6ebacc31e987b093e6d16fb35e15af86848f7682",
+    "high-density-repair02": "git+https://github.com/tscircuit/high-density-repair02.git#5509821634433b6a4f74fa76e530004dffc2f907",
     "object-hash": "^3.0.0"
   }
 }

tests/bugs/__snapshots__/bugreport44-0ec411.snap.svg

@@ -0,0 +1,111 @@
+import { expect, test } from "bun:test"
+import { convertToCircuitJson } from "lib/testing/utils/convertToCircuitJson"
+import type { SimpleRouteJson, SimplifiedPcbTrace } from "lib/types"
+
+test("obstacles use the nearest pcb_port_id instead of the first connected port", () => {
+  const srj: SimpleRouteJson = {
+    layerCount: 2,
+    minTraceWidth: 0.15,
+    bounds: { minX: -5, maxX: 5, minY: -5, maxY: 5 },
+    obstacles: [
+      {
+        type: "rect",
+        layers: ["top"],
+        center: { x: -2, y: 0 },
+        width: 1.2,
+        height: 1.2,
+        connectedTo: [
+          "pcb_smtpad_0",
+          "pcb_port_0",
+          "pcb_smtpad_1",
+          "pcb_port_1",
+          "pcb_smtpad_2",
+          "pcb_port_2",
+        ],
+      },
+      {
+        type: "rect",
+        layers: ["top"],
+        center: { x: 2, y: 0 },
+        width: 1.2,
+        height: 1.2,
+        connectedTo: [
+          "pcb_smtpad_1",
+          "pcb_port_0",
+          "pcb_smtpad_1",
+          "pcb_port_1",
+          "pcb_smtpad_2",
+          "pcb_port_2",
+        ],
+      },
+      {
+        type: "rect",
+        layers: ["top"],
+        center: { x: 2, y: 2 },
+        width: 1.2,
+        height: 1.2,
+        connectedTo: [
+          "pcb_smtpad_2",
+          "pcb_port_0",
+          "pcb_smtpad_1",
+          "pcb_port_1",
+          "pcb_smtpad_2",
+          "pcb_port_2",
+        ],
+      },
+    ],
+    connections: [
+      {
+        name: "source_trace_0",
+        pointsToConnect: [
+          { x: -2, y: 0, layer: "top", pcb_port_id: "pcb_port_0" },
+          { x: 2, y: 0, layer: "top", pcb_port_id: "pcb_port_1" },
+        ],
+      },
+      {
+        name: "source_trace_1",
+        pointsToConnect: [
+          { x: 2, y: 2, layer: "top", pcb_port_id: "pcb_port_2" },
+        ],
+      },
+    ],
+  }
+
+  const traces: SimplifiedPcbTrace[] = [
+    {
+      type: "pcb_trace",
+      pcb_trace_id: "source_trace_0_0",
+      connection_name: "source_trace_0",
+      route: [
+        { route_type: "wire", x: -2, y: 0, width: 0.15, layer: "top" },
+        { route_type: "wire", x: 2, y: 0, width: 0.15, layer: "top" },
+      ],
+    },
+    {
+      type: "pcb_trace",
+      pcb_trace_id: "source_trace_1_0",
+      connection_name: "source_trace_1",
+      route: [
+        { route_type: "wire", x: 2, y: 0, width: 0.15, layer: "top" },
+        { route_type: "wire", x: 2, y: 2, width: 0.15, layer: "top" },
+      ],
+    },
+  ]
+
+  const circuitJson = convertToCircuitJson(srj, traces, srj.minTraceWidth)
+  const smtPads = circuitJson.filter(
+    (
+      element,
+    ): element is Extract<
+      (typeof circuitJson)[number],
+      { type: "pcb_smtpad" }
+    > => element.type === "pcb_smtpad",
+  )
+
+  expect(smtPads).toHaveLength(3)
+  expect(smtPads.map((pad) => pad.pcb_port_id)).toEqual([
+    "pcb_port_0",
+    "pcb_port_1",
+    "pcb_port_2",
+  ])
+})