@tscircuit/core 0.0.1313 → 0.0.1315

package/dist/index.js

@@ -15718,7 +15718,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
     };
   }
   const routedTraceIds = new Set(
-    db.pcb_trace.list().filter((t) => !subcircuit_id || t.subcircuit_id === subcircuit_id).map((t) => t.source_trace_id).filter((id) => Boolean(id))
+    subcircuit_id ? db.pcb_trace.list().filter((t) => t.subcircuit_id === subcircuit_id).map((t) => t.source_trace_id).filter((id) => Boolean(id)) : []
   );
   const sourcePortIdToBreakoutPoint = /* @__PURE__ */ new Map();
   for (const bp of breakoutPoints) {
@@ -15814,22 +15814,27 @@ var getSimpleRouteJsonFromCircuitJson = ({
         sourceTrace.min_trace_thickness
       );
     }
-    connectionsFromNets.push({
-      name: net.source_net_id ?? connMap.getNetConnectedToId(net.source_net_id),
-      nominalTraceWidth: nominalTraceWidthFromConnectedTraces,
-      width: nominalTraceWidthFromConnectedTraces,
-      pointsToConnect: connectedSourceTraces.flatMap((st) => {
-        const pcb_ports = db.pcb_port.list().filter(
-          (p) => st.connected_source_port_ids.includes(p.source_port_id)
-        );
-        return pcb_ports.map((p) => ({
+    const pointsToConnect = [];
+    const addedPointIds = /* @__PURE__ */ new Set();
+    for (const st of connectedSourceTraces) {
+      const pcb_ports = db.pcb_port.list().filter((p) => st.connected_source_port_ids.includes(p.source_port_id));
+      for (const p of pcb_ports) {
+        if (addedPointIds.has(p.pcb_port_id)) continue;
+        addedPointIds.add(p.pcb_port_id);
+        pointsToConnect.push({
           x: p.x,
           y: p.y,
           layer: p.layers?.[0] ?? "top",
           pointId: p.pcb_port_id,
           pcb_port_id: p.pcb_port_id
-        }));
-      })
+        });
+      }
+    }
+    connectionsFromNets.push({
+      name: net.source_net_id ?? connMap.getNetConnectedToId(net.source_net_id),
+      nominalTraceWidth: nominalTraceWidthFromConnectedTraces,
+      width: nominalTraceWidthFromConnectedTraces,
+      pointsToConnect
     });
   }
   const connectionsFromBreakoutPoints = [];
@@ -15881,31 +15886,34 @@ var getSimpleRouteJsonFromCircuitJson = ({
     ...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);
+  if (subcircuit_id) {
+    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) => {
+      return 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]);
     }
   }
-  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]);
-  }
   const resolvedMinViaHoleDiameter = minViaHoleDiameter ?? board?.min_via_hole_diameter;
   const resolvedMinViaPadDiameter = minViaPadDiameter ?? board?.min_via_pad_diameter;
   const resolvedMinTraceToPadEdgeClearance = minTraceToPadEdgeClearance ?? board?.min_trace_to_pad_edge_clearance;
@@ -19724,6 +19732,24 @@ var getSourcePortNetLabelText = (db, sourcePortId) => {
   if (!sourceComponent?.name || !sourcePort.name) return void 0;
   return `${sourceComponent.name}_${sourcePort.name}`;
 };
+var getDirectCrossSubcircuitConnectionLabelText = (db, sourcePortId) => {
+  const sourcePort = db.source_port.get(sourcePortId);
+  if (!sourcePort) return void 0;
+  for (const sourceTrace of db.source_trace.list()) {
+    const connectedSourcePortIds = sourceTrace.connected_source_port_ids ?? [];
+    if (connectedSourcePortIds.length !== 2) continue;
+    if ((sourceTrace.connected_source_net_ids ?? []).length > 0) continue;
+    if (!connectedSourcePortIds.includes(sourcePortId)) continue;
+    const otherSourcePortId = connectedSourcePortIds.find(
+      (portId) => portId !== sourcePortId
+    );
+    if (!otherSourcePortId) continue;
+    const otherSourcePort = db.source_port.get(otherSourcePortId);
+    if (!otherSourcePort) continue;
+    if (otherSourcePort.subcircuit_id === sourcePort.subcircuit_id) continue;
+    return getSourcePortNetLabelText(db, otherSourcePortId);
+  }
+};
 var insertNetLabelsForPortsMissingTrace = ({
   allSourceAndSchematicPortIdsInScope,
   group,
@@ -19750,7 +19776,8 @@ var insertNetLabelsForPortsMissingTrace = ({
       return db.source_port.get(sourcePortId)?.subcircuit_connectivity_map_key === connKey;
     });
     const implicitPortLabelText = connectedSourcePortIdsForKey.map((sourcePortId) => getSourcePortNetLabelText(db, sourcePortId)).filter((label) => Boolean(label)).join("/");
-    const text = sourceNet?.name || sourceNet?.source_net_id || implicitPortLabelText || connKey;
+    const directCrossSubcircuitConnectionLabelText = getDirectCrossSubcircuitConnectionLabelText(db, srcPortId);
+    const text = sourceNet?.name || sourceNet?.source_net_id || directCrossSubcircuitConnectionLabelText || implicitPortLabelText || connKey;
     const connectedPortCountForKey = Array.from(
       allSourceAndSchematicPortIdsInScope
     ).filter((portId) => {
@@ -23490,7 +23517,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1312",
+  version: "0.0.1314",
   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.1313",
+  "version": "0.0.1315",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",