@tscircuit/core 0.0.1462 → 0.0.1464

package/dist/index.js

@@ -3122,7 +3122,7 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
             }
           ];
         }),
-        element.source_trace_id
+        element.source_trace_id ?? element.pcb_trace_id
       );
       obstacles.push(
         ...traceObstacles.map((obstacle) => ({
@@ -16686,6 +16686,8 @@ var getSimpleRouteJsonFromCircuitJson = ({
       ...db.pcb_smtpad.list(),
       ...db.pcb_plated_hole.list(),
       ...db.pcb_hole.list(),
+      // Footprint copper primitives such as solder-jumper bridges are fixed.
+      ...db.pcb_trace.list().filter((trace) => !trace.source_trace_id),
       ...db.pcb_via.list().filter(
         (via) => !ignoreExistingTopLevelPcbRouteState || Boolean(via.subcircuit_id)
       ),
@@ -16905,8 +16907,42 @@ var getSimpleRouteJsonFromCircuitJson = ({
   const connectionsFromNets = [];
   const connectionFromNetId = /* @__PURE__ */ new Map();
   const handledNetConnectivityKeys = /* @__PURE__ */ new Set();
+  const sourceNetIds = new Set(source_nets.map((net) => net.source_net_id));
+  const currentSubcircuitSourceTraces = db.source_trace.list().filter((trace) => !subcircuit_id || trace.subcircuit_id === subcircuit_id);
+  const exposedBridgeSourceTraceIds = new Set(
+    (subcircuitComponent?.selectAll("trace") ?? []).flatMap((trace) => {
+      const candidate = trace;
+      return candidate._exposesSubcircuitConnection && candidate.source_trace_id ? [candidate.source_trace_id] : [];
+    })
+  );
+  const exposedDescendantSourceNetIds = /* @__PURE__ */ new Set();
+  for (const trace of currentSubcircuitSourceTraces) {
+    if (!exposedBridgeSourceTraceIds.has(trace.source_trace_id)) {
+      continue;
+    }
+    for (const sourceNetId of trace.connected_source_net_ids ?? []) {
+      if (!sourceNetIds.has(sourceNetId)) {
+        exposedDescendantSourceNetIds.add(sourceNetId);
+      }
+    }
+  }
+  const routedDescendantSourceTraceIds = new Set(
+    subcircuit_id ? db.pcb_trace.list().filter(
+      (trace) => trace.subcircuit_id && trace.subcircuit_id !== subcircuit_id && relevantSubcircuitIds?.has(trace.subcircuit_id)
+    ).map((trace) => trace.source_trace_id).filter((id) => Boolean(id)) : []
+  );
   const sourceTracesEligibleForNetConnections = db.source_trace.list().filter(
-    (st) => subcircuit_id || !sourceTraceIdsAlreadyPreservedAsSrjTraces.has(st.source_trace_id)
+    (trace) => (
+      // Existing copper must still contribute endpoint connectivity when it
+      // belongs to the scope currently being routed. Descendant copper is
+      // preserved as static geometry only, preventing it from being routed
+      // a second time by its parent.
+      !sourceTraceIdsAlreadyPreservedAsSrjTraces.has(trace.source_trace_id) || subcircuit_id != null && trace.subcircuit_id === subcircuit_id
+    )
+  ).filter(
+    (trace) => !subcircuit_id || trace.subcircuit_id === subcircuit_id || (trace.connected_source_net_ids?.some((id) => sourceNetIds.has(id)) ?? false) || (trace.connected_source_net_ids?.some(
+      (id) => exposedDescendantSourceNetIds.has(id)
+    ) ?? false) && !routedDescendantSourceTraceIds.has(trace.source_trace_id)
   );
   const getSourceConnectivityKey = (id) => id ? sharedConnMap.getNetConnectedToId(id) ?? id : null;
   for (const net of source_nets) {
@@ -22863,7 +22899,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1461",
+  version: "0.0.1463",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1462",
+  "version": "0.0.1464",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",