@tscircuit/core 0.0.1482 → 0.0.1483

package/dist/index.js

@@ -9709,19 +9709,63 @@ function Port_tryRenderGroupPcbPort(port) {
 }
 
 // lib/utils/schematic/getSourcePortNetLabelText.ts
+var compareNamesAlphanumerically = (firstName, secondName) => firstName.localeCompare(secondName, void 0, {
+  numeric: true,
+  sensitivity: "base"
+});
+var getSourcePortOwnerName = (db, sourcePort) => {
+  const sourceComponent = sourcePort.source_component_id ? db.source_component.get(sourcePort.source_component_id) : void 0;
+  const sourceGroup = !sourceComponent ? db.source_group.list().find((group) => group.subcircuit_id === sourcePort.subcircuit_id) : void 0;
+  return sourceComponent?.name ?? sourceGroup?.name;
+};
 var getSourcePortNetLabelText = (db, sourcePortId) => {
   const sourcePort = db.source_port.get(sourcePortId);
   if (!sourcePort?.name) return void 0;
-  const sourceComponent = sourcePort.source_component_id ? db.source_component.get(sourcePort.source_component_id) : void 0;
-  const sourceGroup = !sourceComponent ? db.source_group.list().find((group) => group.subcircuit_id === sourcePort.subcircuit_id) : void 0;
-  const ownerName = sourceComponent?.name ?? sourceGroup?.name;
+  const ownerName = getSourcePortOwnerName(db, sourcePort);
   if (!ownerName) return void 0;
   return `${ownerName}_${sourcePort.name}`;
 };
 var getNetNameFromSourcePorts = (db, sourcePortIds) => {
-  const portNames = sourcePortIds.map((sourcePortId) => getSourcePortNetLabelText(db, sourcePortId)).filter((name) => Boolean(name));
-  if (portNames.length === 0) return void 0;
-  return [...new Set(portNames)].join("/");
+  const sourcePorts = sourcePortIds.map((sourcePortId) => db.source_port.get(sourcePortId)).filter((sourcePort) => Boolean(sourcePort));
+  if (sourcePorts.length === 0) return void 0;
+  const pinCountByComponentId = /* @__PURE__ */ new Map();
+  for (const sourcePort of db.source_port.list()) {
+    if (!sourcePort.source_component_id) continue;
+    pinCountByComponentId.set(
+      sourcePort.source_component_id,
+      (pinCountByComponentId.get(sourcePort.source_component_id) ?? 0) + 1
+    );
+  }
+  const candidates = sourcePorts.map((sourcePort) => {
+    const ownerName = getSourcePortOwnerName(db, sourcePort);
+    if (!ownerName || !sourcePort.name) return null;
+    return {
+      sourcePort,
+      ownerName,
+      label: `${ownerName}_${sourcePort.name}`,
+      ownerPinCount: sourcePort.source_component_id ? pinCountByComponentId.get(sourcePort.source_component_id) ?? 0 : 0
+    };
+  }).filter(
+    (candidate) => Boolean(candidate)
+  );
+  candidates.sort((firstCandidate, secondCandidate) => {
+    const pinCountDifference = secondCandidate.ownerPinCount - firstCandidate.ownerPinCount;
+    if (pinCountDifference !== 0) return pinCountDifference;
+    const ownerNameDifference = compareNamesAlphanumerically(
+      firstCandidate.ownerName,
+      secondCandidate.ownerName
+    );
+    if (ownerNameDifference !== 0) return ownerNameDifference;
+    const firstPinNumber = firstCandidate.sourcePort.pin_number ?? Number.POSITIVE_INFINITY;
+    const secondPinNumber = secondCandidate.sourcePort.pin_number ?? Number.POSITIVE_INFINITY;
+    const pinNumberDifference = firstPinNumber - secondPinNumber;
+    if (pinNumberDifference !== 0) return pinNumberDifference;
+    return compareNamesAlphanumerically(
+      firstCandidate.sourcePort.name,
+      secondCandidate.sourcePort.name
+    );
+  });
+  return candidates[0]?.label;
 };
 
 // lib/components/primitive-components/Port/internalCircuitPortMapping.ts
@@ -21760,8 +21804,12 @@ var getNetNameFromPorts = (ports) => {
       }
     }
   }
-  const netName = ports.map((p) => p._getNetLabelText()).join("/");
-  return { name: netName, wasAssignedDisplayLabel: false };
+  const db = ports.find((port) => port.root)?.root?.db;
+  const sourcePortIds = ports.map((port) => port.source_port_id).filter((sourcePortId) => Boolean(sourcePortId));
+  const netName = db ? getNetNameFromSourcePorts(db, sourcePortIds) : ports.map((port) => port._getNetLabelText()).filter((name) => Boolean(name)).sort(
+    (a, b) => a.localeCompare(b, void 0, { numeric: true, sensitivity: "base" })
+  )[0];
+  return { name: netName ?? "", wasAssignedDisplayLabel: false };
 };
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/getNetLabelTextBounds.ts
@@ -22043,9 +22091,13 @@ var insertNetLabelsForPortsMissingTrace = ({
     if (wasAssignedDisplayLabel) {
       assignedPortNetLabelText = resolvedPortNetLabelText;
     }
-    const implicitPortLabelText = connectedSourcePortIdsForKey.map((sourcePortId) => getSourcePortNetLabelText(db, sourcePortId)).filter((label) => Boolean(label)).join("/");
+    const fallbackPortNetLabelText = wasAssignedDisplayLabel ? void 0 : resolvedPortNetLabelText || void 0;
+    const implicitPortLabelText = getNetNameFromSourcePorts(
+      db,
+      connectedSourcePortIdsForKey
+    );
     const directCrossSubcircuitConnectionLabelText = getDirectCrossSubcircuitConnectionLabelText(db, srcPortId);
-    const text = sourceNet?.name || sourceNet?.source_net_id || assignedPortNetLabelText || directCrossSubcircuitConnectionLabelText || implicitPortLabelText || connKey;
+    const text = sourceNet?.name || sourceNet?.source_net_id || assignedPortNetLabelText || directCrossSubcircuitConnectionLabelText || fallbackPortNetLabelText || implicitPortLabelText || connKey;
     const isCollapsedBoxPort = schComponent?.is_box_with_pins && sourcePort && !sourcePort.source_component_id;
     const hasExternalTrace = db.source_trace.list().some(
       (trace) => trace.connected_source_port_ids.includes(srcPortId) && trace.subcircuit_id !== sourcePort?.subcircuit_id
@@ -23077,7 +23129,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1481",
+  version: "0.0.1482",
   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.1482",
+  "version": "0.0.1483",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",