@tscircuit/core 0.0.1278 → 0.0.1279

package/dist/index.d.ts

@@ -2363,6 +2363,13 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     doInitialCreateTraceHintsFromProps(): void;
     doInitialSourceAddConnectivityMapKey(): void;
     _areChildSubcircuitsRouted(): boolean;
+    /**
+     * Find subcircuit groups that are direct children of this subcircuit in
+     * the component tree. Unlike selectAll("group"), this walks the children
+     * array directly because the css-select adapter used by selectAll
+     * intentionally skips subcircuit boundaries.
+     */
+    _findDirectChildSubcircuits(): Group[];
     _shouldRouteAsync(): boolean;
     _getRoutingPhasePlans(): RoutingPhasePlan[];
     _hasTracesToRoute(): boolean;

package/dist/index.js

@@ -14436,6 +14436,9 @@ var getSimpleRouteJsonFromCircuitJson = ({
   db = su4(subcircuitElements);
   const pcbGroup = subcircuit_id ? db.pcb_group.getWhere({ subcircuit_id }) : void 0;
   const connMap = getFullConnectivityMapFromCircuitJson3(subcircuitElements);
+  const breakoutPoints = db.pcb_breakout_point.list().filter(
+    (bp) => !subcircuit_id || relevantSubcircuitIds?.has(bp.subcircuit_id)
+  );
   const obstacles = getObstaclesFromCircuitJson(
     [
       ...db.pcb_component.list(),
@@ -14445,8 +14448,6 @@ var getSimpleRouteJsonFromCircuitJson = ({
       ...db.pcb_via.list(),
       ...db.pcb_keepout.list(),
       ...db.pcb_cutout.list()
-      // getObstaclesFromSoup is old and doesn't support diagonal traces
-      // ...db.pcb_trace.list(),
     ].filter(
       (e) => !subcircuit_id || relevantSubcircuitIds?.has(e.subcircuit_id)
     ),
@@ -14460,6 +14461,13 @@ var getSimpleRouteJsonFromCircuitJson = ({
       group: pcbGroup
     })
   );
+  const descendantTraces = subcircuit_id ? db.pcb_trace.list().filter(
+    (t) => t.subcircuit_id && t.subcircuit_id !== subcircuit_id && relevantSubcircuitIds.has(t.subcircuit_id)
+  ).map((t) => ({
+    type: "pcb_trace",
+    pcb_trace_id: t.pcb_trace_id,
+    route: t.route
+  })) : [];
   for (const obstacle of obstacles) {
     const additionalIds = obstacle.connectedTo.flatMap(
       (id) => connMap.getIdsConnectedToNet(id)
@@ -14555,7 +14563,14 @@ var getSimpleRouteJsonFromCircuitJson = ({
   const routedTraceIds = new Set(
     db.pcb_trace.list().map((t) => t.source_trace_id).filter((id) => Boolean(id))
   );
-  const directTraceConnections = db.source_trace.list().filter((trace) => !routedTraceIds.has(trace.source_trace_id)).map((trace) => {
+  const sourcePortIdToBreakoutPoint = /* @__PURE__ */ new Map();
+  for (const bp of breakoutPoints) {
+    const spId = bp.source_port_id;
+    if (spId) sourcePortIdToBreakoutPoint.set(spId, bp);
+  }
+  const directTraceConnections = db.source_trace.list().filter((trace) => !routedTraceIds.has(trace.source_trace_id)).filter(
+    (trace) => !subcircuit_id || trace.subcircuit_id === subcircuit_id
+  ).map((trace) => {
     const connectedPorts = trace.connected_source_port_ids.map((id) => {
       const source_port = db.source_port.get(id);
       const pcb_port = db.pcb_port.getWhere({ source_port_id: id });
@@ -14595,33 +14610,39 @@ var getSimpleRouteJsonFromCircuitJson = ({
         });
       }
     }
+    const getPortOrBreakoutPoint = (port, layer, sourcePortId) => {
+      const bp = sourcePortIdToBreakoutPoint.get(sourcePortId);
+      if (bp && bp.subcircuit_id !== subcircuit_id) {
+        return { x: bp.x, y: bp.y, layer };
+      }
+      return {
+        x: port.x,
+        y: port.y,
+        layer,
+        pointId: port.pcb_port_id,
+        pcb_port_id: port.pcb_port_id
+      };
+    };
     return {
       name: trace.source_trace_id ?? connMap.getNetConnectedToId(trace.source_trace_id) ?? "",
       source_trace_id: trace.source_trace_id,
       nominalTraceWidth: trace.min_trace_thickness,
       width: trace.min_trace_thickness,
       pointsToConnect: [
-        {
-          x: portA.x,
-          y: portA.y,
-          layer: layerA,
-          pointId: portA.pcb_port_id,
-          pcb_port_id: portA.pcb_port_id
-        },
+        getPortOrBreakoutPoint(
+          portA,
+          layerA,
+          trace.connected_source_port_ids[0]
+        ),
         ...hintPoints,
-        {
-          x: portB.x,
-          y: portB.y,
-          layer: layerB,
-          pointId: portB.pcb_port_id,
-          pcb_port_id: portB.pcb_port_id
-        }
+        getPortOrBreakoutPoint(
+          portB,
+          layerB,
+          trace.connected_source_port_ids[1]
+        )
       ]
     };
   }).filter((c) => c !== null);
-  const directTraceConnectionsById = new Map(
-    directTraceConnections.map((c) => [c.source_trace_id, c])
-  );
   const source_nets = db.source_net.list().filter(
     (e) => !subcircuit_id || relevantSubcircuitIds?.has(e.subcircuit_id)
   );
@@ -14654,27 +14675,38 @@ var getSimpleRouteJsonFromCircuitJson = ({
       })
     });
   }
-  const breakoutPoints = db.pcb_breakout_point.list().filter(
-    (bp) => !subcircuit_id || relevantSubcircuitIds?.has(bp.subcircuit_id)
-  );
   const connectionsFromBreakoutPoints = [];
-  const breakoutTraceConnectionsById = /* @__PURE__ */ new Map();
   for (const bp of breakoutPoints) {
+    const bpSourcePortId = bp.source_port_id;
     const pt = { x: bp.x, y: bp.y, layer: "top" };
-    if (bp.source_trace_id) {
-      const conn = directTraceConnectionsById.get(bp.source_trace_id) ?? breakoutTraceConnectionsById.get(bp.source_trace_id);
-      if (conn) {
-        conn.pointsToConnect.push(pt);
-      } else {
-        const newConn = {
-          name: bp.source_trace_id,
-          source_trace_id: bp.source_trace_id,
-          pointsToConnect: [pt]
-        };
-        connectionsFromBreakoutPoints.push(newConn);
-        breakoutTraceConnectionsById.set(bp.source_trace_id, newConn);
+    if (bpSourcePortId) {
+      const pcb_port = db.pcb_port.getWhere({
+        source_port_id: bpSourcePortId
+      });
+      if (!pcb_port) continue;
+      const portPt = {
+        x: pcb_port.x,
+        y: pcb_port.y,
+        layer: pcb_port.layers?.[0] ?? "top",
+        pointId: pcb_port.pcb_port_id,
+        pcb_port_id: pcb_port.pcb_port_id
+      };
+      if (bp.subcircuit_id === subcircuit_id) {
+        connectionsFromBreakoutPoints.push({
+          name: bpSourcePortId,
+          pointsToConnect: [portPt, pt]
+        });
+        continue;
+      }
+      if (!bp.source_trace_id) {
+        connectionsFromBreakoutPoints.push({
+          name: bpSourcePortId,
+          pointsToConnect: [portPt, pt]
+        });
       }
-    } else if (bp.source_net_id) {
+      continue;
+    }
+    if (bp.source_net_id) {
       const conn = connectionsFromNets.find((c) => c.name === bp.source_net_id);
       if (conn) {
         conn.pointsToConnect.push(pt);
@@ -14684,28 +14716,6 @@ var getSimpleRouteJsonFromCircuitJson = ({
           pointsToConnect: [pt]
         });
       }
-    } else if (bp.source_port_id) {
-      const pcb_port = db.pcb_port.getWhere({
-        source_port_id: bp.source_port_id
-      });
-      if (pcb_port) {
-        connectionsFromBreakoutPoints.push({
-          name: bp.source_port_id,
-          // direct connection from port to breakout point
-          source_trace_id: void 0,
-          pointsToConnect: [
-            {
-              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
-            },
-            pt
-          ]
-        });
-      }
     }
   }
   const allConns = [
@@ -14751,8 +14761,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
       bounds,
       obstacles,
       connections: allConns,
-      // TODO add traces so that we don't run into things routed by another
-      // subcircuit
+      traces: descendantTraces.length > 0 ? descendantTraces : void 0,
       layerCount: board?.num_layers ?? 2,
       minTraceWidth: minTraceWidth ?? board?.min_trace_width ?? 0.1,
       minViaDiameter: resolvedMinViaPadDiameter,
@@ -19930,16 +19939,36 @@ var Group5 = class extends NormalComponent3 {
     Group_doInitialSourceAddConnectivityMapKey(this);
   }
   _areChildSubcircuitsRouted() {
-    const subcircuitChildren = this.selectAll("group").filter(
-      (g) => g.isSubcircuit
-    );
+    const subcircuitChildren = this._findDirectChildSubcircuits();
     for (const subcircuitChild of subcircuitChildren) {
+      if (subcircuitChild._isInflatedFromCircuitJson) continue;
+      if (!subcircuitChild._hasTracesToRoute()) continue;
       if (subcircuitChild._shouldRouteAsync() && !subcircuitChild._asyncAutoroutingResult) {
         return false;
       }
     }
     return true;
   }
+  /**
+   * Find subcircuit groups that are direct children of this subcircuit in
+   * the component tree. Unlike selectAll("group"), this walks the children
+   * array directly because the css-select adapter used by selectAll
+   * intentionally skips subcircuit boundaries.
+   */
+  _findDirectChildSubcircuits() {
+    const result = [];
+    const visit = (children) => {
+      for (const child of children) {
+        if (child.isSubcircuit && child !== this) {
+          result.push(child);
+        } else {
+          visit(child.children);
+        }
+      }
+    };
+    visit(this.children);
+    return result;
+  }
   _shouldRouteAsync() {
     const autorouter = this._getAutorouterConfig();
     if (autorouter.groupMode === "sequential-trace") return false;
@@ -21827,7 +21856,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1277",
+  version: "0.0.1278",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -21862,7 +21891,7 @@ var package_default = {
     "@tscircuit/breakout-point-solver": "github:tscircuit/breakout-point-solver#bac9629",
     "@tscircuit/capacity-autorouter": "^0.0.529",
     "@tscircuit/checks": "0.0.133",
-    "@tscircuit/circuit-json-util": "^0.0.94",
+    "@tscircuit/circuit-json-util": "^0.0.95",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.29",
     "@tscircuit/footprinter": "^0.0.357",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1278",
+  "version": "0.0.1279",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -36,7 +36,7 @@
     "@tscircuit/breakout-point-solver": "github:tscircuit/breakout-point-solver#bac9629",
     "@tscircuit/capacity-autorouter": "^0.0.529",
     "@tscircuit/checks": "0.0.133",
-    "@tscircuit/circuit-json-util": "^0.0.94",
+    "@tscircuit/circuit-json-util": "^0.0.95",
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.29",
     "@tscircuit/footprinter": "^0.0.357",