@tscircuit/core 0.0.1371 → 0.0.1373

package/dist/index.js

@@ -16044,8 +16044,24 @@ var getSimpleRouteJsonFromCircuitJson = ({
   }).filter((c) => c !== null);
   const source_nets = db.source_net.list().filter((e) => !subcircuit_id || e.subcircuit_id === subcircuit_id);
   const connectionsFromNets = [];
+  const connectionFromNetId = /* @__PURE__ */ new Map();
+  const handledNetConnectivityKeys = /* @__PURE__ */ new Set();
+  const sourceTraces = db.source_trace.list();
+  const getSourceConnectivityKey = (id) => id ? connMap.getNetConnectedToId(id) ?? id : null;
   for (const net of source_nets) {
-    const connectedSourceTraces = db.source_trace.list().filter((st) => st.connected_source_net_ids?.includes(net.source_net_id));
+    const netConnectivityKey = getSourceConnectivityKey(net.source_net_id);
+    if (!netConnectivityKey || handledNetConnectivityKeys.has(netConnectivityKey)) {
+      continue;
+    }
+    handledNetConnectivityKeys.add(netConnectivityKey);
+    const connectedSourceNetIds = source_nets.filter(
+      (sourceNet) => getSourceConnectivityKey(sourceNet.source_net_id) === netConnectivityKey
+    ).map((sourceNet) => sourceNet.source_net_id);
+    const connectedSourceTraces = sourceTraces.filter(
+      (st) => [st.source_trace_id, ...st.connected_source_net_ids ?? []].some(
+        (id) => getSourceConnectivityKey(id) === netConnectivityKey
+      )
+    );
     let nominalTraceWidthFromConnectedTraces;
     for (const sourceTrace of connectedSourceTraces) {
       if (sourceTrace.min_trace_thickness === void 0) continue;
@@ -16070,12 +16086,16 @@ var getSimpleRouteJsonFromCircuitJson = ({
         });
       }
     }
-    connectionsFromNets.push({
+    const connection = {
       name: net.source_net_id ?? connMap.getNetConnectedToId(net.source_net_id),
       nominalTraceWidth: nominalTraceWidthFromConnectedTraces,
       width: nominalTraceWidthFromConnectedTraces,
       pointsToConnect
-    });
+    };
+    connectionsFromNets.push(connection);
+    for (const sourceNetId of connectedSourceNetIds) {
+      connectionFromNetId.set(sourceNetId, connection);
+    }
   }
   const connectionsFromBreakoutPoints = [];
   for (const bp of breakoutPoints) {
@@ -16110,7 +16130,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
       continue;
     }
     if (bp.source_net_id) {
-      const conn = connectionsFromNets.find((c) => c.name === bp.source_net_id);
+      const conn = connectionFromNetId.get(bp.source_net_id);
       if (conn) {
         conn.pointsToConnect.push(pt);
       } else {
@@ -20553,9 +20573,15 @@ var insertNetLabelsForPortsMissingTrace = ({
       if (!sourcePortId) return false;
       return db.source_port.get(sourcePortId)?.subcircuit_connectivity_map_key === connKey;
     });
+    const connectedPortsForKey = group.selectAll("port").filter((port) => port._getSubcircuitConnectivityKey() === connKey);
+    const { name: resolvedPortNetLabelText, wasAssignedDisplayLabel } = getNetNameFromPorts(connectedPortsForKey);
+    let assignedPortNetLabelText;
+    if (wasAssignedDisplayLabel) {
+      assignedPortNetLabelText = resolvedPortNetLabelText;
+    }
     const implicitPortLabelText = connectedSourcePortIdsForKey.map((sourcePortId) => getSourcePortNetLabelText(db, sourcePortId)).filter((label) => Boolean(label)).join("/");
     const directCrossSubcircuitConnectionLabelText = getDirectCrossSubcircuitConnectionLabelText(db, srcPortId);
-    const text = sourceNet?.name || sourceNet?.source_net_id || directCrossSubcircuitConnectionLabelText || implicitPortLabelText || connKey;
+    const text = sourceNet?.name || sourceNet?.source_net_id || assignedPortNetLabelText || directCrossSubcircuitConnectionLabelText || implicitPortLabelText || connKey;
     const connectedPortCountForKey = Array.from(
       allSourceAndSchematicPortIdsInScope
     ).filter((portId) => {
@@ -23528,6 +23554,7 @@ var Group5 = class extends NormalComponent3 {
       const subcircuitComponentsByName = /* @__PURE__ */ new Map();
       for (const child of this.children) {
         if (child.isSubcircuit) continue;
+        if (child instanceof Trace3) continue;
         if (child._parsedProps.name) {
           const components = subcircuitComponentsByName.get(child._parsedProps.name) || [];
           components.push(child);
@@ -24660,7 +24687,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1370",
+  version: "0.0.1372",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -25767,15 +25794,17 @@ var Subcircuit = class extends Group5 {
       const parentNetSelector = `> net.${netName}`;
       const childNetSelector = `.${this.name} > net.${netName}`;
       const traceName = `exposed_net.${netName}`;
-      const parentHasDirectNet = parentSubcircuit.children.some(
+      const parentNet = parentSubcircuit.children.find(
         (child) => child instanceof Net && child._parsedProps.name === netName
       );
-      if (!parentHasDirectNet) {
+      if (!parentNet) {
         parentSubcircuit.add(new Net({ name: netName }));
       }
-      const existingTrace = parentSubcircuit.children.find(
-        (child) => child instanceof Trace3 && child._parsedProps.name === traceName
-      );
+      const existingTrace = parentSubcircuit.children.find((child) => {
+        if (!(child instanceof Trace3)) return false;
+        const childProps = child._parsedProps;
+        return childProps.name === traceName && childProps.from === childNetSelector && childProps.to === parentNetSelector;
+      });
       if (existingTrace) continue;
       parentSubcircuit.add(
         new Trace3({

package/package.json

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