@tscircuit/core 0.0.534 → 0.0.536

package/dist/index.d.ts

@@ -145,7 +145,10 @@ interface SimpleRouteConnection {
         x: number;
         y: number;
         layer: string;
+        pointId?: string;
+        pcb_port_id?: string;
     }>;
+    externallyConnectedPointIds?: string[][];
 }
 interface SimpleRouteJson {
     layerCount: number;

package/dist/index.js

@@ -7022,13 +7022,17 @@ var getSimpleRouteJsonFromCircuitJson = ({
         {
           x: portA.x,
           y: portA.y,
-          layer: layerA
+          layer: layerA,
+          pointId: portA.pcb_port_id,
+          pcb_port_id: portA.pcb_port_id
         },
         ...hintPoints,
         {
           x: portB.x,
           y: portB.y,
-          layer: layerB
+          layer: layerB,
+          pointId: portB.pcb_port_id,
+          pcb_port_id: portB.pcb_port_id
         }
       ]
     };
@@ -7052,6 +7056,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
           x: p.x,
           y: p.y,
           layer: p.layers?.[0] ?? "top",
+          pointId: p.pcb_port_id,
           pcb_port_id: p.pcb_port_id
         }));
       })
@@ -7101,6 +7106,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
               x: pcb_port.x,
               y: pcb_port.y,
               layer: pcb_port.layers?.[0] ?? "top",
+              pointId: pcb_port.pcb_port_id,
               // @ts-ignore
               pcb_port_id: pcb_port.pcb_port_id
             },
@@ -7110,15 +7116,41 @@ var getSimpleRouteJsonFromCircuitJson = ({
       }
     }
   }
+  const allConns = [
+    ...directTraceConnections,
+    ...connectionsFromNets,
+    ...connectionsFromBreakoutPoints
+  ];
+  const pointIdToConn = /* @__PURE__ */ new Map();
+  for (const conn of allConns) {
+    for (const pt of conn.pointsToConnect) {
+      if (pt.pointId) pointIdToConn.set(pt.pointId, conn);
+    }
+  }
+  const existingTraces = db.pcb_trace.list().filter(
+    (t) => !subcircuit_id || relevantSubcircuitIds?.has(t.subcircuit_id)
+  );
+  for (const tr of existingTraces) {
+    const tracePortIds = /* @__PURE__ */ new Set();
+    for (const seg of tr.route) {
+      if (seg.start_pcb_port_id) tracePortIds.add(seg.start_pcb_port_id);
+      if (seg.end_pcb_port_id) tracePortIds.add(seg.end_pcb_port_id);
+    }
+    if (tracePortIds.size < 2) continue;
+    const firstId = tracePortIds.values().next().value;
+    if (!firstId) continue;
+    const conn = pointIdToConn.get(firstId);
+    if (!conn) continue;
+    if (![...tracePortIds].every((pid) => pointIdToConn.get(pid) === conn))
+      continue;
+    conn.externallyConnectedPointIds ??= [];
+    conn.externallyConnectedPointIds.push([...tracePortIds]);
+  }
   return {
     simpleRouteJson: {
       bounds,
       obstacles,
-      connections: [
-        ...directTraceConnections,
-        ...connectionsFromNets,
-        ...connectionsFromBreakoutPoints
-      ],
+      connections: allConns,
       // TODO add traces so that we don't run into things routed by another
       // subcircuit
       layerCount: 2,
@@ -7983,15 +8015,11 @@ var Group = class extends NormalComponent {
     const debug4 = Debug5("tscircuit:core:_runLocalAutorouting");
     debug4(`[${this.getString()}] starting local autorouting`);
     const autorouterConfig = this._getAutorouterConfig();
-    const sourceTraceIdsToRoute = this.selectAll("trace").filter((t) => !t.pcb_trace_id).map((t) => t.source_trace_id);
     const { simpleRouteJson } = getSimpleRouteJsonFromCircuitJson({
       db,
       minTraceWidth: this.props.autorouter?.minTraceWidth ?? 0.15,
       subcircuit_id: this.subcircuit_id
     });
-    simpleRouteJson.connections = simpleRouteJson.connections.filter(
-      (conn) => sourceTraceIdsToRoute.includes(conn.name)
-    );
     this.root?.emit("autorouting:start", {
       subcircuit_id: this.subcircuit_id,
       componentDisplayName: this.getString(),
@@ -10670,7 +10698,7 @@ import { identity as identity4 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.533",
+  version: "0.0.535",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -10693,7 +10721,7 @@ var package_default = {
   },
   devDependencies: {
     "@biomejs/biome": "^1.8.3",
-    "@tscircuit/capacity-autorouter": "^0.0.75",
+    "@tscircuit/capacity-autorouter": "^0.0.89",
     "@tscircuit/checks": "^0.0.52",
     "@tscircuit/circuit-json-util": "^0.0.50",
     "@tscircuit/footprinter": "^0.0.186",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.534",
+  "version": "0.0.536",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^1.8.3",
-    "@tscircuit/capacity-autorouter": "^0.0.75",
+    "@tscircuit/capacity-autorouter": "^0.0.89",
     "@tscircuit/checks": "^0.0.52",
     "@tscircuit/circuit-json-util": "^0.0.50",
     "@tscircuit/footprinter": "^0.0.186",