@tscircuit/core 0.0.1469 → 0.0.1471

package/dist/index.d.ts

@@ -35,11 +35,11 @@ declare const SOLVERS: {
 };
 type SolverName = keyof typeof SOLVERS;
 
-type SimplifiedPcbTrace = Omit<SimplifiedPcbTrace$1, "connection_name" | "connectedTo" | "route"> & {
+type SimplifiedPcbTrace = Omit<SimplifiedPcbTrace$1, "connection_name" | "route"> & {
     type: "pcb_trace";
     pcb_trace_id: string;
     connection_name?: string;
-    connectedTo?: string[];
+    connectsTo?: string[];
     route: Array<{
         route_type: "wire";
         x: number;

package/dist/index.js

@@ -9680,6 +9680,22 @@ function Port_tryRenderGroupPcbPort(port) {
   return true;
 }
 
+// lib/utils/schematic/getSourcePortNetLabelText.ts
+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;
+  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("/");
+};
+
 // lib/components/primitive-components/Port/Port.ts
 var Port = class extends PrimitiveComponent2 {
   source_port_id = null;
@@ -10267,7 +10283,8 @@ var Port = class extends PrimitiveComponent2 {
    * port, but appears at the port it connects to.
    */
   _getNetLabelText() {
-    return `${this.parent?.props.name}_${this.props.name}`;
+    if (!this.root || !this.source_port_id) return void 0;
+    return getSourcePortNetLabelText(this.root.db, this.source_port_id);
   }
 };
 
@@ -16477,54 +16494,23 @@ var getDifferentialPairsForSimpleRouteJson = ({
 
 // lib/utils/autorouting/getPreservedRoutedSubcircuitTraces.ts
 var getPreservedTraceConnectionName = (trace) => trace.source_trace_id ?? trace.connection_name ?? trace.pcb_trace_id;
-var getConnectedToIdsForPreservedTrace = ({
-  trace,
-  connectionName,
-  scopedDb,
-  sharedConnMap
-}) => {
-  const connectedToIds = /* @__PURE__ */ new Set();
-  const addConnectedId = (id) => {
-    if (!id) return;
-    connectedToIds.add(id);
-    const connectivityNetId = sharedConnMap.getNetConnectedToId(id);
-    if (!connectivityNetId) return;
-    connectedToIds.add(connectivityNetId);
-    for (const connectedId of sharedConnMap.getIdsConnectedToNet(
-      connectivityNetId
-    )) {
-      connectedToIds.add(connectedId);
-    }
-  };
-  addConnectedId(connectionName);
-  addConnectedId(trace.source_trace_id);
-  const sourceTrace = trace.source_trace_id ? scopedDb.source_trace.get(trace.source_trace_id) : null;
-  if (sourceTrace) {
-    for (const id of sourceTrace.connected_source_net_ids ?? []) {
-      addConnectedId(id);
-    }
-    for (const id of sourceTrace.connected_source_port_ids ?? []) {
-      addConnectedId(id);
-    }
-  }
+var getPhysicalConnectionIdsForPreservedTrace = (trace) => {
+  const physicallyConnectedIds = new Set(trace.connectsTo ?? []);
   for (const routePoint of trace.route ?? []) {
     if (routePoint.route_type !== "wire") continue;
     for (const pcbPortId of [
       routePoint.start_pcb_port_id,
       routePoint.end_pcb_port_id
     ]) {
-      addConnectedId(pcbPortId);
-      const pcbPort = pcbPortId ? scopedDb.pcb_port.get(pcbPortId) : null;
-      addConnectedId(pcbPort?.source_port_id);
+      if (pcbPortId) physicallyConnectedIds.add(pcbPortId);
     }
   }
-  return Array.from(connectedToIds);
+  return Array.from(physicallyConnectedIds);
 };
 var getPreservedRoutedSubcircuitTraces = ({
   scopedDb,
   currentSubcircuitId,
-  relevantSubcircuitIds,
-  sharedConnMap
+  relevantSubcircuitIds
 }) => scopedDb.pcb_trace.list().filter((trace) => {
   if (!trace.subcircuit_id) return false;
   if (!currentSubcircuitId) return true;
@@ -16537,12 +16523,7 @@ var getPreservedRoutedSubcircuitTraces = ({
     pcb_trace_id: trace.pcb_trace_id,
     source_trace_id: trace.source_trace_id,
     connection_name: connectionName,
-    connectedTo: getConnectedToIdsForPreservedTrace({
-      trace: preservedTrace,
-      connectionName,
-      scopedDb,
-      sharedConnMap
-    }),
+    connectsTo: getPhysicalConnectionIdsForPreservedTrace(preservedTrace),
     route: trace.route
   };
 }).filter((trace) => trace.route.length >= 2);
@@ -16748,8 +16729,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
   const preservedRoutedSubcircuitTraces = getPreservedRoutedSubcircuitTraces({
     scopedDb: db,
     currentSubcircuitId: subcircuit_id,
-    relevantSubcircuitIds,
-    sharedConnMap
+    relevantSubcircuitIds
   });
   for (const obstacle of obstacles) {
     const additionalIds = obstacle.connectedTo.flatMap(
@@ -21797,7 +21777,11 @@ function applyNetLabelPlacements(args) {
       continue;
     }
     const ports = group.selectAll("port").filter((p) => p._getSubcircuitConnectivityKey() === placementConnKey);
-    const { name: text, wasAssignedDisplayLabel } = getNetNameFromPorts(ports);
+    const { name: portInstanceText, wasAssignedDisplayLabel } = getNetNameFromPorts(ports);
+    const sourcePortIdsForConnection = placementConnKey ? db.source_port.list().filter(
+      (sourcePort) => sourcePort.subcircuit_connectivity_map_key === placementConnKey
+    ).map((sourcePort) => sourcePort.source_port_id) : [];
+    const text = portInstanceText || getNetNameFromSourcePorts(db, sourcePortIdsForConnection) || "";
     const isRoutedPairPlacement = (placement.pinIds?.length ?? 0) > 1;
     const shouldKeepRoutedPairLabel = isRoutedPairPlacement && (globalNetIdsWithPortOnlyPlacements.has(placement.globalConnNetId) || (routedPairKeysByGlobalNetId.get(placement.globalConnNetId)?.size ?? 0) > 1);
     if (!wasAssignedDisplayLabel && !shouldKeepRoutedPairLabel && schPortIds.some(
@@ -21838,16 +21822,6 @@ var doesSchematicNetLabelRepresentCurrentSourceConnection = (args) => {
   }
   return nl.text === text;
 };
-var getSourcePortNetLabelText = (db, sourcePortId) => {
-  const sourcePort = db.source_port.get(sourcePortId);
-  if (!sourcePort) return void 0;
-  let sourceComponent;
-  if (sourcePort.source_component_id) {
-    sourceComponent = db.source_component.get(sourcePort.source_component_id);
-  }
-  if (!sourceComponent?.name || !sourcePort.name) return void 0;
-  return `${sourceComponent.name}_${sourcePort.name}`;
-};
 var getDirectCrossSubcircuitConnectedSourcePortId = (db, sourcePortId) => {
   const sourcePort = db.source_port.get(sourcePortId);
   if (!sourcePort) return void 0;
@@ -21912,36 +21886,13 @@ var insertNetLabelsForPortsMissingTrace = ({
     }
     const implicitPortLabelText = connectedSourcePortIdsForKey.map((sourcePortId) => getSourcePortNetLabelText(db, sourcePortId)).filter((label) => Boolean(label)).join("/");
     const directCrossSubcircuitConnectionLabelText = getDirectCrossSubcircuitConnectionLabelText(db, srcPortId);
-    const isConnectivityKeyFallback = !sourceNet?.name && !sourceNet?.source_net_id && !assignedPortNetLabelText && !directCrossSubcircuitConnectionLabelText && !implicitPortLabelText;
     const text = sourceNet?.name || sourceNet?.source_net_id || assignedPortNetLabelText || directCrossSubcircuitConnectionLabelText || implicitPortLabelText || connKey;
-    if (isConnectivityKeyFallback) {
-      const sourcePortComponent = connectedPortsForKey.find(
-        (port) => port.source_port_id === srcPortId
-      );
-      const collapsedGroup = sourcePortComponent?.parent;
-      if (sourcePortComponent?.isGroupPort() && collapsedGroup?._parsedProps?.showAsSchematicBox) {
-        const sourceTracesConnectedToPort = db.source_trace.list().filter(
-          (trace) => trace.connected_source_port_ids?.includes(srcPortId)
-        );
-        const isPortInsideCollapsedGroup = (port) => {
-          let parent = port.parent;
-          while (parent) {
-            if (parent === collapsedGroup) return true;
-            parent = parent.parent;
-          }
-          return false;
-        };
-        const allConnectionsAreInternal = sourceTracesConnectedToPort.length > 0 && sourceTracesConnectedToPort.every(
-          (trace) => (trace.connected_source_net_ids?.length ?? 0) === 0 && trace.connected_source_port_ids.filter((sourcePortId) => sourcePortId !== srcPortId).every((sourcePortId) => {
-            const connectedPort = connectedPortsForKey.find(
-              (port) => port.source_port_id === sourcePortId
-            );
-            return connectedPort ? isPortInsideCollapsedGroup(connectedPort) : false;
-          })
-        );
-        if (allConnectionsAreInternal) continue;
-      }
-    }
+    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
+    );
+    const hasExplicitLabel = Boolean(sourceNet || assignedPortNetLabelText);
+    if (isCollapsedBoxPort && !hasExternalTrace && !hasExplicitLabel) continue;
     const connectedPortCountForKey = Array.from(
       allSourceAndSchematicPortIdsInScope
     ).filter((portId) => {
@@ -22938,7 +22889,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1468",
+  version: "0.0.1470",
   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.1469",
+  "version": "0.0.1471",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",