@tscircuit/core 0.0.1808 → 0.0.1809

package/dist/index.js

@@ -38452,7 +38452,13 @@ var debug8 = Debug10("Group_doInitialSchematicTraceRender");
 var INLINE_NET_LABEL_COLOR = "rgb(132, 0, 0)";
 var VERTICAL_INLINE_NET_LABEL_ROTATION = -90;
 function applyInlineNetLabelPlacements(args) {
-  const { group, solver, userNetIdToConnKey, sourceTraceIdByPinPairKey } = args;
+  const {
+    group,
+    solver,
+    userNetIdToConnKey,
+    sourceTraceIdByPinPairKey,
+    crossScopeSourceTraceIdBySchematicPortIdAndNetId
+  } = args;
   const { db } = group.root;
   const inlineNetLabelPlacements = solver.inlineNetLabelSolver?.getOutput().inlineNetLabelPlacements ?? [];
   if (inlineNetLabelPlacements.length === 0) return;
@@ -38461,17 +38467,18 @@ function applyInlineNetLabelPlacements(args) {
   for (const placement of inlineNetLabelPlacements) {
     const schematicPortIds = placement.pinIds.map(asSchematicPortId);
     const placementUserNetId = globalConnMap.getIdsConnectedToNet(placement.globalConnNetId).find((id) => userNetIdToConnKey.has(id));
-    const connKey = placementUserNetId ? userNetIdToConnKey.get(placementUserNetId) : void 0;
-    const text = connKey ? resolveCanonicalNetLabelText({ subcircuitConnectivityMapKey: connKey }).name : placement.netId ?? placement.globalConnNetId;
+    const crossScopeSourceTraceId = schematicPortIds.length === 1 ? crossScopeSourceTraceIdBySchematicPortIdAndNetId.get(schematicPortIds[0])?.get(placement.netId ?? placement.globalConnNetId) : void 0;
+    const connKey = (crossScopeSourceTraceId ? db.source_trace.get(crossScopeSourceTraceId)?.subcircuit_connectivity_map_key : void 0) ?? (placementUserNetId ? userNetIdToConnKey.get(placementUserNetId) : void 0);
+    const text = placement.netLabelText ?? (connKey ? resolveCanonicalNetLabelText({
+      subcircuitConnectivityMapKey: connKey
+    }).name : placement.netId ?? placement.globalConnNetId);
     if (!text) {
       debug8(
         `skipping inline net label for "${placement.netId}" REASON:no resolvable text`
       );
       continue;
     }
-    let sourceTraceId = sourceTraceIdByPinPairKey.get(
-      [...schematicPortIds].sort().join("::")
-    );
+    let sourceTraceId = crossScopeSourceTraceId ?? sourceTraceIdByPinPairKey.get([...schematicPortIds].sort().join("::"));
     if (!sourceTraceId && connKey) {
       const sourcePortIds = schematicPortIds.flatMap((schematicPortId) => {
         const sourcePortId = db.schematic_port.get(schematicPortId)?.source_port_id;
@@ -38640,7 +38647,7 @@ function applyNetLabelPlacements(args) {
     solver,
     connKeyToSourceNet,
     userNetIdToConnKey,
-    crossSubcircuitTraceLabelBySchematicPortId,
+    crossScopeSourceTraceIdBySchematicPortIdAndNetId,
     sourceTraceIdByPortOnlyLabelSchematicPortId,
     connKeysWithExplicitPortNetTraces,
     schematicPortIdsWithPreExistingNetLabels,
@@ -38696,8 +38703,8 @@ function applyNetLabelPlacements(args) {
   for (const placement of dedupedNetLabelPlacements) {
     debug9(`processing placement: ${placement.netId}`);
     const schPortIds = placement.pinIds.map(asSchematicPortId);
-    const crossSubcircuitTraceLabel = schPortIds.length === 1 ? crossSubcircuitTraceLabelBySchematicPortId.get(schPortIds[0]) : void 0;
-    const placementSourceTraceId = crossSubcircuitTraceLabel?.sourceTraceId ?? (schPortIds.length === 1 ? sourceTraceIdByPortOnlyLabelSchematicPortId.get(schPortIds[0]) : void 0);
+    const crossScopeSourceTraceId = schPortIds.length === 1 ? crossScopeSourceTraceIdBySchematicPortIdAndNetId.get(schPortIds[0])?.get(placement.netId ?? placement.globalConnNetId) : void 0;
+    const placementSourceTraceId = crossScopeSourceTraceId ?? (schPortIds.length === 1 ? sourceTraceIdByPortOnlyLabelSchematicPortId.get(schPortIds[0]) : void 0);
     const placementSourceTrace = placementSourceTraceId ? db.source_trace.get(placementSourceTraceId) : void 0;
     const placementUserNetId = globalConnMap.getIdsConnectedToNet(placement.globalConnNetId).find((id) => userNetIdToConnKey.get(id));
     const placementConnKey = placementSourceTrace?.subcircuit_connectivity_map_key ?? userNetIdToConnKey.get(placementUserNetId);
@@ -38707,15 +38714,16 @@ function applyNetLabelPlacements(args) {
     if (placementConnKey) {
       sourceNet = connKeyToSourceNet.get(placementConnKey);
     }
-    const canonicalNetLabel = placementConnKey ? crossSubcircuitTraceLabel ? {
-      name: crossSubcircuitTraceLabel.text,
-      wasAssignedDisplayLabel: false
-    } : resolveCanonicalNetLabelText({
+    const resolvedCanonicalNetLabel = placementConnKey ? resolveCanonicalNetLabelText({
       subcircuitConnectivityMapKey: placementConnKey
     }) : {
       name: placement.netId ?? placement.globalConnNetId,
       wasAssignedDisplayLabel: false
     };
+    const canonicalNetLabel = placement.netLabelText ? {
+      name: placement.netLabelText,
+      wasAssignedDisplayLabel: true
+    } : resolvedCanonicalNetLabel;
     let schematicSheetId = group._resolveSchematicSheetId();
     const schematicPort = db.schematic_port.get(schPortIds[0]);
     if (schematicPort?.schematic_sheet_id) {
@@ -39572,9 +39580,23 @@ import {
   getBoundsCenter as getBoundsCenter2
 } from "@tscircuit/math-utils";
 import "@tscircuit/schematic-trace-solver";
+import { getSourcePortConnectivityMapFromCircuitJson as getSourcePortConnectivityMapFromCircuitJson2 } from "circuit-json-to-connectivity-map";
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/applyInlineNetLabelEligibility.ts
 var INLINE_NET_LABEL_FONT_SIZE = 0.12;
+var markConnectionEligibleForInlineNetLabel = (connection, name) => {
+  connection.anchoredNetLabelWidth ??= Number(
+    getSchematicNetLabelTextWidth({ text: name }).toFixed(2)
+  );
+  connection.allowInlineNetLabel = true;
+  connection.inlineNetLabelHeight = INLINE_NET_LABEL_FONT_SIZE;
+  connection.inlineNetLabelWidth = Number(
+    getSchematicNetLabelTextWidth({
+      text: name,
+      font_size: INLINE_NET_LABEL_FONT_SIZE
+    }).toFixed(2)
+  );
+};
 var applyInlineNetLabelEligibility = ({
   directConnections,
   netConnections,
@@ -39586,19 +39608,6 @@ var applyInlineNetLabelEligibility = ({
   areSchematicPortsOnDifferentComponents,
   resolveCanonicalNetLabelText
 }) => {
-  const markEligible = (connection, name) => {
-    connection.anchoredNetLabelWidth ??= Number(
-      getSchematicNetLabelTextWidth({ text: name }).toFixed(2)
-    );
-    connection.allowInlineNetLabel = true;
-    connection.inlineNetLabelHeight = INLINE_NET_LABEL_FONT_SIZE;
-    connection.inlineNetLabelWidth = Number(
-      getSchematicNetLabelTextWidth({
-        text: name,
-        font_size: INLINE_NET_LABEL_FONT_SIZE
-      }).toFixed(2)
-    );
-  };
   for (const directConnection of directConnections) {
     const { connKey } = directConnection;
     if (!connKey) continue;
@@ -39610,10 +39619,11 @@ var applyInlineNetLabelEligibility = ({
       subcircuitConnectivityMapKey: connKey
     });
     if (!name || !wasAssignedDisplayLabel) continue;
-    markEligible(directConnection, name);
+    markConnectionEligibleForInlineNetLabel(directConnection, name);
   }
   for (const netConnection of netConnections) {
     const { schematicPortIds } = netConnection;
+    const { isSameSheetCrossSectionConnection } = netConnection;
     const hasInlineNetLabel = schematicPortIds.some(
       (schematicPortId) => schematicPortIdsWithInlineNetLabels.has(schematicPortId)
     );
@@ -39625,7 +39635,7 @@ var applyInlineNetLabelEligibility = ({
         otherSchematicPortId
       ])
     );
-    if (!hasInlineNetLabel && !isSinglePort && !hasPortsOnDifferentComponents) {
+    if (!hasInlineNetLabel && !isSameSheetCrossSectionConnection && !isSinglePort && !hasPortsOnDifferentComponents) {
       continue;
     }
     if (!hasInlineNetLabel && schematicPortIds.some(
@@ -39633,17 +39643,25 @@ var applyInlineNetLabelEligibility = ({
     ))
       continue;
     const { connKey } = netConnection;
-    if (!connKey) continue;
-    if (!connKeysWithExplicitPortNetTraces.has(connKey)) continue;
-    const sourceNet = connKeyToSourceNet.get(connKey);
-    if (!hasInlineNetLabel && (sourceNet?.is_power || sourceNet?.is_ground)) {
+    if (!connKey && !isSameSheetCrossSectionConnection) continue;
+    if (connKey && !isSameSheetCrossSectionConnection && !connKeysWithExplicitPortNetTraces.has(connKey))
+      continue;
+    const sourceNet = connKey ? connKeyToSourceNet.get(connKey) : void 0;
+    if (!hasInlineNetLabel && (netConnection.isPowerOrGroundConnection || sourceNet?.is_power || sourceNet?.is_ground)) {
       continue;
     }
-    const { name, wasAssignedDisplayLabel } = resolveCanonicalNetLabelText({
-      subcircuitConnectivityMapKey: connKey
-    });
+    let name = netConnection.netLabelText ?? "";
+    let wasAssignedDisplayLabel = Boolean(name);
+    if (!isSameSheetCrossSectionConnection) {
+      if (!connKey) continue;
+      const resolvedLabel = resolveCanonicalNetLabelText({
+        subcircuitConnectivityMapKey: connKey
+      });
+      name = resolvedLabel.name;
+      wasAssignedDisplayLabel = resolvedLabel.wasAssignedDisplayLabel;
+    }
     if (!name || !hasInlineNetLabel && !wasAssignedDisplayLabel) continue;
-    markEligible(netConnection, name);
+    markConnectionEligibleForInlineNetLabel(netConnection, name);
   }
 };
 
@@ -39829,6 +39847,36 @@ var DEFAULT_MAX_MSP_PAIR_DISTANCE = 2.4;
 var SCHEMATIC_RAIL_NET_LABEL_HEIGHT = 0.42;
 function createSchematicTraceSolverInputProblem(group, opts = {}) {
   const { db } = group.root;
+  const sourcePortConnectivityMap = getSourcePortConnectivityMapFromCircuitJson2(
+    db.toArray()
+  );
+  const getStableSourceConnectivityNetId = (connectivityNetId) => {
+    const canonicalSourceId = [
+      ...sourcePortConnectivityMap.getIdsConnectedToNet(connectivityNetId)
+    ].sort()[0];
+    return canonicalSourceId ? `source_connectivity_${canonicalSourceId}` : `source_${connectivityNetId}`;
+  };
+  const getSourceConnectivityNetId = (sourceTrace) => {
+    const connectivityNetId = [
+      ...sourceTrace.connected_source_port_ids,
+      ...sourceTrace.connected_source_net_ids
+    ].map(
+      (sourceId) => sourcePortConnectivityMap.getNetConnectedToId(sourceId)
+    ).find((netId) => Boolean(netId));
+    return connectivityNetId ? getStableSourceConnectivityNetId(connectivityNetId) : sourceTrace.subcircuit_connectivity_map_key ?? sourceTrace.source_trace_id;
+  };
+  const powerOrGroundSourceConnectivityNetIds = /* @__PURE__ */ new Set();
+  for (const sourceNet of db.source_net.list()) {
+    if (!sourceNet.is_power && !sourceNet.is_ground) continue;
+    const connectivityNetId = sourcePortConnectivityMap.getNetConnectedToId(
+      sourceNet.source_net_id
+    );
+    if (connectivityNetId) {
+      powerOrGroundSourceConnectivityNetIds.add(
+        getStableSourceConnectivityNetId(connectivityNetId)
+      );
+    }
+  }
   const connKeyToSourceNet = /* @__PURE__ */ new Map();
   const childGroups = [];
   const componentsToVisit = [...group.children].reverse();
@@ -39877,7 +39925,8 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
     });
   }).filter((textBox) => Boolean(textBox));
   const sectionIdBySchematicComponentId = /* @__PURE__ */ new Map();
-  for (const component of group.getDescendants()) {
+  const boardDescendants = group._getBoard()?.getDescendants() ?? [];
+  for (const component of boardDescendants) {
     const schematicComponentId = component.schematic_component_id;
     const sectionId = component.getSchematicSectionName();
     if (schematicComponentId && sectionId) {
@@ -40023,9 +40072,67 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
     }
   }
   const directConnections = [];
-  const singlePortTraceNetConnections = [];
+  const boundaryTraceNetConnections = [];
   const connectedPairKeys = /* @__PURE__ */ new Set();
-  const crossSubcircuitTraceLabelBySchematicPortId = /* @__PURE__ */ new Map();
+  const crossScopeSourceTraceIdBySchematicPortIdAndNetId = /* @__PURE__ */ new Map();
+  const crossSectionNetConnectionByKey = /* @__PURE__ */ new Map();
+  const setCrossScopeSourceTraceId = ({
+    schematicPortId,
+    netId,
+    sourceTraceId,
+    replaceExisting = false
+  }) => {
+    const sourceTraceIdByNetId = crossScopeSourceTraceIdBySchematicPortIdAndNetId.get(schematicPortId) ?? /* @__PURE__ */ new Map();
+    if (sourceTraceIdByNetId.has(netId) && !replaceExisting) return false;
+    sourceTraceIdByNetId.set(netId, sourceTraceId);
+    crossScopeSourceTraceIdBySchematicPortIdAndNetId.set(
+      schematicPortId,
+      sourceTraceIdByNetId
+    );
+    return true;
+  };
+  const addPortToCrossSectionInlineNetConnection = ({
+    sourceConnectivityNetId,
+    schematicPortId,
+    text,
+    sourceTraceId,
+    connKey,
+    preferInScopeTraceMetadata = false
+  }) => {
+    const netId = sourceConnectivityNetId;
+    setCrossScopeSourceTraceId({
+      schematicPortId,
+      netId,
+      sourceTraceId,
+      replaceExisting: preferInScopeTraceMetadata
+    });
+    if (schematicPortIdsWithExplicitNetLabels.has(schematicPortId)) return;
+    let connection = crossSectionNetConnectionByKey.get(sourceConnectivityNetId);
+    if (!connection) {
+      connection = {
+        netId,
+        netLabelText: text,
+        schematicPortIds: [],
+        netLabelWidth: Number(
+          getSchematicNetLabelTextWidth({ text }).toFixed(2)
+        ),
+        connKey,
+        isSameSheetCrossSectionConnection: true,
+        isPowerOrGroundConnection: powerOrGroundSourceConnectivityNetIds.has(netId)
+      };
+      crossSectionNetConnectionByKey.set(sourceConnectivityNetId, connection);
+      boundaryTraceNetConnections.push(connection);
+    } else if (preferInScopeTraceMetadata) {
+      connection.netLabelText = text;
+      connection.netLabelWidth = Number(
+        getSchematicNetLabelTextWidth({ text }).toFixed(2)
+      );
+      connection.connKey = connKey ?? connection.connKey;
+    }
+    if (!connection.schematicPortIds.includes(schematicPortId)) {
+      connection.schematicPortIds.push(schematicPortId);
+    }
+  };
   const sourceTraceIdsByPortOnlyLabelSchematicPortId = /* @__PURE__ */ new Map();
   const sourceTraceIdByPinPairKey = /* @__PURE__ */ new Map();
   const connKeysWithExplicitPortNetTraces = /* @__PURE__ */ new Set();
@@ -40036,6 +40143,30 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
       );
     }
   }
+  const areSchematicPortsInDifferentSectionsOnSameSheet = (firstSchematicPortId, secondSchematicPortId) => {
+    const firstSchematicPort = db.schematic_port.get(firstSchematicPortId);
+    const secondSchematicPort = db.schematic_port.get(secondSchematicPortId);
+    if (!firstSchematicPort || !secondSchematicPort) return false;
+    const sharesSheet = firstSchematicPort.schematic_sheet_id === secondSchematicPort.schematic_sheet_id;
+    if (!sharesSheet) return false;
+    const firstSectionId = firstSchematicPort.schematic_component_id ? sectionIdBySchematicComponentId.get(
+      firstSchematicPort.schematic_component_id
+    ) : void 0;
+    const secondSectionId = secondSchematicPort.schematic_component_id ? sectionIdBySchematicComponentId.get(
+      secondSchematicPort.schematic_component_id
+    ) : void 0;
+    const crossesSection = firstSectionId !== secondSectionId && (firstSectionId !== void 0 || secondSectionId !== void 0);
+    return crossesSection;
+  };
+  const doesSourcePortCrossSectionOnSameSheet = ({
+    schematicPortId,
+    otherSourcePortId
+  }) => db.schematic_port.list({ source_port_id: otherSourcePortId }).some(
+    (otherSchematicPort) => areSchematicPortsInDifferentSectionsOnSameSheet(
+      schematicPortId,
+      asSchematicPortId(otherSchematicPort.schematic_port_id)
+    )
+  );
   for (const st of tracesInScope) {
     const connected = (st.connected_source_port_ids ?? []).map(
       (sourcePortId) => sourcePortIdToSchPortId.get(asSourcePortId(sourcePortId))
@@ -40055,11 +40186,25 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
         schematicSheetId: opts.schematicSheetId
       })
     );
+    const crossesSchematicSectionOnSameSheet = Boolean(
+      connected.length === 1 && otherSourcePortId && doesSourcePortCrossSectionOnSameSheet({
+        schematicPortId: connected[0],
+        otherSourcePortId
+      })
+    );
     if (connected.length === 1 && st.connected_source_port_ids.length === 2 && crossesSchematicScopeBoundary && st.connected_source_net_ids.length === 0 && st.subcircuit_connectivity_map_key) {
       const schematicPortId = connected[0];
       const sourcePortId = schPortIdToSourcePortId.get(schematicPortId);
       if (sourcePortId) {
         const connKey = st.subcircuit_connectivity_map_key;
+        const sourcePortConnKey = db.source_port.get(sourcePortId)?.subcircuit_connectivity_map_key;
+        const sourceNetInCurrentSubcircuit = db.source_net.list().find(
+          (sourceNet) => sourceNet.subcircuit_id === group.subcircuit_id && sourcePortConnectivityMap.areIdsConnected(
+            sourceNet.source_net_id,
+            sourcePortId
+          )
+        );
+        const sourceNetForLabel = connKeyToSourceNet.get(connKey) ?? (sourcePortConnKey ? connKeyToSourceNet.get(sourcePortConnKey) : void 0) ?? sourceNetInCurrentSubcircuit;
         const connectedSourcePortIdsForKey = Array.from(schematicPortIdsInScope).map((portId) => schPortIdToSourcePortId.get(portId)).filter((sourcePortId2) => {
           if (!sourcePortId2) return false;
           return db.source_port.get(sourcePortId2)?.subcircuit_connectivity_map_key === connKey;
@@ -40071,21 +40216,36 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
           sourcePortIdsInSchematicScope,
           schematicSheetId: opts.schematicSheetId,
           connKey,
-          sourceNet: connKeyToSourceNet.get(connKey)
+          sourceNet: sourceNetForLabel
         });
-        if (text && !crossSubcircuitTraceLabelBySchematicPortId.has(schematicPortId)) {
-          crossSubcircuitTraceLabelBySchematicPortId.set(schematicPortId, {
-            text,
+        if (text) {
+          const sourceConnectivityNetId = getSourceConnectivityNetId(st);
+          if (!userNetIdToConnKey.has(sourceConnectivityNetId)) {
+            userNetIdToConnKey.set(sourceConnectivityNetId, connKey);
+          }
+          if (crossesSchematicSectionOnSameSheet) {
+            addPortToCrossSectionInlineNetConnection({
+              sourceConnectivityNetId,
+              schematicPortId,
+              text,
+              sourceTraceId: st.source_trace_id,
+              connKey
+            });
+          } else if (setCrossScopeSourceTraceId({
+            schematicPortId,
+            netId: sourceConnectivityNetId,
             sourceTraceId: st.source_trace_id
-          });
-          userNetIdToConnKey.set(text, connKey);
-          singlePortTraceNetConnections.push({
-            netId: text,
-            schematicPortIds: [schematicPortId],
-            netLabelWidth: Number(
-              getSchematicNetLabelTextWidth({ text }).toFixed(2)
-            )
-          });
+          })) {
+            boundaryTraceNetConnections.push({
+              netId: sourceConnectivityNetId,
+              netLabelText: text,
+              schematicPortIds: [schematicPortId],
+              netLabelWidth: Number(
+                getSchematicNetLabelTextWidth({ text }).toFixed(2)
+              ),
+              connKey
+            });
+          }
         }
       }
     } else if (connected.length >= 2) {
@@ -40123,12 +40283,39 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
           text: renderedNetLabelText
         }).toFixed(2)
       ) : void 0;
+      const crossSectionNetLabelText = renderedNetLabelText;
       for (let i = 0; i < connected.length - 1; i++) {
         const a = connected[i];
         const b = connected[i + 1];
         const pairKey = [a, b].sort().join("::");
         if (connectedPairKeys.has(pairKey)) continue;
         connectedPairKeys.add(pairKey);
+        if (crossSectionNetLabelText && areSchematicPortsInDifferentSectionsOnSameSheet(a, b)) {
+          const sourceConnectivityNetId = getSourceConnectivityNetId(st);
+          if (st.subcircuit_connectivity_map_key) {
+            userNetIdToConnKey.set(
+              sourceConnectivityNetId,
+              st.subcircuit_connectivity_map_key
+            );
+          }
+          addPortToCrossSectionInlineNetConnection({
+            sourceConnectivityNetId,
+            schematicPortId: a,
+            text: crossSectionNetLabelText,
+            sourceTraceId: st.source_trace_id,
+            connKey: st.subcircuit_connectivity_map_key,
+            preferInScopeTraceMetadata: true
+          });
+          addPortToCrossSectionInlineNetConnection({
+            sourceConnectivityNetId,
+            schematicPortId: b,
+            text: crossSectionNetLabelText,
+            sourceTraceId: st.source_trace_id,
+            connKey: st.subcircuit_connectivity_map_key,
+            preferInScopeTraceMetadata: true
+          });
+          continue;
+        }
         sourceTraceIdByPinPairKey.set(pairKey, st.source_trace_id);
         directConnections.push({
           schematicPortIds: [a, b],
@@ -40139,7 +40326,7 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
       }
     }
   }
-  const netConnections = [...singlePortTraceNetConnections];
+  const netConnections = [...boundaryTraceNetConnections];
   const connKeyToSchematicPortIds = /* @__PURE__ */ new Map();
   for (const [schId, srcPortId] of schPortIdToSourcePortId) {
     if (schematicPortIdsWithExternallyRoutedRepresentations.has(schId)) continue;
@@ -40224,7 +40411,7 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
         netToAllowedOrientations[net.name] = ["x-", "x+"];
       }
     }
-    for (const { netId } of singlePortTraceNetConnections) {
+    for (const { netId } of boundaryTraceNetConnections) {
       netToAllowedOrientations[netId] ??= ["x-", "x+"];
     }
     return netToAllowedOrientations;
@@ -40238,7 +40425,13 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
       })
     ),
     netConnections: netConnections.map(
-      ({ schematicPortIds, connKey, ...connection }) => ({
+      ({
+        schematicPortIds,
+        connKey,
+        isSameSheetCrossSectionConnection,
+        isPowerOrGroundConnection,
+        ...connection
+      }) => ({
         ...connection,
         pinIds: schematicPortIds
       })
@@ -40259,7 +40452,7 @@ function createSchematicTraceSolverInputProblem(group, opts = {}) {
     inputProblem,
     connKeyToSourceNet,
     userNetIdToConnKey,
-    crossSubcircuitTraceLabelBySchematicPortId,
+    crossScopeSourceTraceIdBySchematicPortIdAndNetId,
     sourceTraceIdByPortOnlyLabelSchematicPortId,
     connKeysWithExplicitPortNetTraces,
     schematicPortIdsInScope,
@@ -40532,7 +40725,7 @@ var renderSchematicTracesForSheet = ({
     schematicPortIdsWithExternallyRoutedRepresentations,
     schPortIdToSourcePortId,
     userNetIdToConnKey,
-    crossSubcircuitTraceLabelBySchematicPortId,
+    crossScopeSourceTraceIdBySchematicPortIdAndNetId,
     sourceTraceIdByPortOnlyLabelSchematicPortId,
     connKeysWithExplicitPortNetTraces,
     netLabelsInScope,
@@ -40587,7 +40780,7 @@ var renderSchematicTracesForSheet = ({
     solver,
     connKeyToSourceNet,
     userNetIdToConnKey,
-    crossSubcircuitTraceLabelBySchematicPortId,
+    crossScopeSourceTraceIdBySchematicPortIdAndNetId,
     sourceTraceIdByPortOnlyLabelSchematicPortId,
     connKeysWithExplicitPortNetTraces,
     schematicPortIdsWithPreExistingNetLabels,
@@ -40598,7 +40791,8 @@ var renderSchematicTracesForSheet = ({
     group,
     solver,
     userNetIdToConnKey,
-    sourceTraceIdByPinPairKey
+    sourceTraceIdByPinPairKey,
+    crossScopeSourceTraceIdBySchematicPortIdAndNetId
   });
   insertNetLabelsForPortsMissingTrace({
     group,

package/package.json

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