@tscircuit/core 0.0.2305 → 0.0.2307

package/dist/index.js

@@ -22770,7 +22770,8 @@ function routeSystemBlocks(tree, bounds, initialRoutes) {
   const labels = /* @__PURE__ */ new Map();
   const labelCenters = /* @__PURE__ */ new Map();
   const labelAttachments = /* @__PURE__ */ new Map();
-  const portObstacles = [...portsByConnection.values()].flat().map(({ escape }) => ({
+  const portObstacles = [...portsByConnection.values()].flat().map(({ escape, connection }) => ({
+    connection,
     left: escape.x - 1,
     right: escape.x + 1,
     bottom: escape.y - 1,
@@ -22781,13 +22782,16 @@ function routeSystemBlocks(tree, bounds, initialRoutes) {
     const center = initialRoutes.get(connection).label_anchor_center;
     if (label !== void 0 && center) {
       const halfWidth = getSystemConnectionLabelWidth(label) / 2;
-      const occupied = [...obstacles, ...labels.values(), ...portObstacles];
-      const fits = (rectangle) => !occupied.some(
-        (r2) => rectangle.left < r2.right + 1 && rectangle.right > r2.left - 1 && rectangle.bottom < r2.top + 1 && rectangle.top > r2.bottom - 1
-      );
       const [start, end] = portsByConnection.get(connection);
       const endpoints = tree.endpoints.get(connection);
       const selfLoop = endpoints.from === endpoints.to;
+      const occupied = [...obstacles, ...labels.values(), ...portObstacles];
+      const fits = (rectangle, besideOwnLoop = false) => !occupied.some((r2) => {
+        if (besideOwnLoop && "connection" in r2 && r2.connection === connection)
+          return false;
+        const margin = besideOwnLoop && "connection" in r2 ? 0 : 1;
+        return rectangle.left < r2.right + margin && rectangle.right > r2.left - margin && rectangle.bottom < r2.top + margin && rectangle.top > r2.bottom - margin;
+      });
       const vertical = start.escape.x === end.escape.x;
       const horizontal = start.escape.y === end.escape.y;
       const oppositeFaces = (start.side + 2) % 4 === end.side;
@@ -22804,14 +22808,20 @@ function routeSystemBlocks(tree, bounds, initialRoutes) {
         };
         const signs = selfLoop ? [start.side < 2 ? 1 : -1] : [1, -1];
         for (const sign of signs) {
-          const candidate = vertical ? { x: attachment.x + sign * (halfWidth + 2), y: attachment.y } : { x: attachment.x, y: attachment.y + sign * 4.5 };
+          const candidate = vertical ? {
+            x: attachment.x + sign * (halfWidth + (selfLoop ? 0 : 2)),
+            y: attachment.y
+          } : {
+            x: attachment.x,
+            y: attachment.y + sign * (selfLoop ? 3.5 : 4.5)
+          };
           const rectangle = {
             left: candidate.x - halfWidth,
             right: candidate.x + halfWidth,
             bottom: candidate.y - 2.5,
             top: candidate.y + 2.5
           };
-          if (!fits(rectangle)) continue;
+          if (!fits(rectangle, sameFaceReturn)) continue;
           labels.set(connection, rectangle);
           labelCenters.set(connection, candidate);
           labelAttachments.set(connection, attachment);
@@ -149707,6 +149717,71 @@ var getDifferentialPairsForSimpleRouteJson = ({
   return srjDifferentialPairs.length > 0 ? srjDifferentialPairs : void 0;
 };
 
+// lib/utils/autorouting/getDifferentialPairSourceTraceIds.ts
+var getDifferentialPairSourceTraceIds = ({
+  differentialPairs,
+  sourceTraces,
+  subcircuitId
+}) => {
+  const sourceTraceIds = /* @__PURE__ */ new Set();
+  for (const differentialPair of differentialPairs) {
+    const pairSubcircuitId = differentialPair.getSubcircuit().subcircuit_id;
+    if (subcircuitId && pairSubcircuitId !== subcircuitId) continue;
+    const differentialPairSourceTraces = sourceTraces.filter(
+      (trace) => trace.subcircuit_id === pairSubcircuitId
+    );
+    for (const traceNameOrPortSelector of [
+      differentialPair._parsedProps.positiveConnection,
+      differentialPair._parsedProps.negativeConnection
+    ]) {
+      sourceTraceIds.add(
+        getDifferentialPairSourceTraceOrThrow({
+          differentialPair,
+          differentialPairSourceTraces,
+          traceNameOrPortSelector
+        }).sourceTraceId
+      );
+    }
+  }
+  return sourceTraceIds;
+};
+
+// lib/utils/autorouting/reduceNetConnectionPointsForDifferentialPairPaths.ts
+var reduceNetConnectionPointsForDifferentialPairPaths = ({
+  netConnections,
+  differentialPairConnections
+}) => {
+  if (differentialPairConnections.length === 0) return;
+  const parentPointId = /* @__PURE__ */ new Map();
+  const root = (pointId) => {
+    const parent = parentPointId.get(pointId);
+    if (parent === void 0 || parent === pointId) return pointId;
+    const representative = root(parent);
+    parentPointId.set(pointId, representative);
+    return representative;
+  };
+  for (const connection of differentialPairConnections) {
+    const pointIds = connection.pointsToConnect.flatMap(
+      (point8) => point8.pointId ? [point8.pointId] : []
+    );
+    for (const pointId of pointIds.slice(1)) {
+      parentPointId.set(root(pointId), root(pointIds[0]));
+    }
+  }
+  for (const netConnection of netConnections) {
+    const representedPointIds = /* @__PURE__ */ new Set();
+    netConnection.pointsToConnect = netConnection.pointsToConnect.filter(
+      (point8) => {
+        if (!point8.pointId) return true;
+        const representative = root(point8.pointId);
+        if (representedPointIds.has(representative)) return false;
+        representedPointIds.add(representative);
+        return true;
+      }
+    );
+  }
+};
+
 // lib/utils/autorouting/getPreservedRoutedSubcircuitTraces.ts
 var getLayerName = (layer) => typeof layer === "string" ? layer : layer.name;
 var getPreservedTraceConnectionName = (trace) => trace.source_trace_id ?? trace.connection_name ?? trace.pcb_trace_id;
@@ -150222,6 +150297,17 @@ var getSimpleRouteJsonFromCircuitJson = ({
     };
   };
   const sourceTraces = db2.source_trace.list();
+  const differentialPairs = subcircuitComponent?.selectAll("differentialpair") ?? [];
+  const differentialPairSourceTraceIds = getDifferentialPairSourceTraceIds({
+    differentialPairs,
+    sourceTraces,
+    subcircuitId: subcircuit_id
+  });
+  const differentialPairPathSourceTraceIds = new Set(
+    sourceTraces.filter(
+      (trace) => differentialPairSourceTraceIds.has(trace.source_trace_id) && trace.connected_source_port_ids.length === 2
+    ).map((trace) => trace.source_trace_id)
+  );
   const planeTerminatedSourceTraceLayers = getPlaneTerminatedSourceTraceLayers({
     fanoutPourNetMap,
     sourceNets: db2.source_net.list(),
@@ -150239,7 +150325,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
   ).filter(
     (trace) => !subcircuit_id || trace.subcircuit_id === subcircuit_id
   ).filter(
-    (sourceTrace) => sourceTrace.connected_source_net_ids.length === 0 || planeTerminatedSourceTraceLayers.has(sourceTrace.source_trace_id)
+    (sourceTrace) => sourceTrace.connected_source_net_ids.length === 0 || differentialPairPathSourceTraceIds.has(sourceTrace.source_trace_id) || planeTerminatedSourceTraceLayers.has(sourceTrace.source_trace_id)
   ).map((trace) => {
     const connectedPcbPorts = trace.connected_source_port_ids.map(
       (sourcePortId) => db2.pcb_port.getWhere({ source_port_id: sourcePortId })
@@ -150277,6 +150363,14 @@ var getSimpleRouteJsonFromCircuitJson = ({
       ]
     };
   }).filter((c2) => c2 !== null);
+  const differentialPairPathConnections = directTraceConnections.filter(
+    (connection) => connection.source_trace_id !== void 0 && differentialPairPathSourceTraceIds.has(connection.source_trace_id)
+  );
+  const differentialPairPathSourcePortIds = new Set(
+    differentialPairPathConnections.flatMap(
+      (connection) => sourceTraceById.get(connection.source_trace_id).connected_source_port_ids
+    )
+  );
   const source_nets = db2.source_net.list().filter((e2) => !subcircuit_id || e2.subcircuit_id === subcircuit_id);
   const connectionsFromNets = [];
   const connectionFromNetId = /* @__PURE__ */ new Map();
@@ -150353,6 +150447,15 @@ var getSimpleRouteJsonFromCircuitJson = ({
         sourceTrace.min_trace_thickness
       );
     }
+    const connectedSourceTraceIds = new Set(
+      connectedSourceTraces.map((trace) => trace.source_trace_id)
+    );
+    for (const connection2 of differentialPairPathConnections) {
+      if (!connectedSourceTraceIds.has(connection2.source_trace_id)) continue;
+      connection2.netConnectionName = net.source_net_id;
+      connection2.nominalTraceWidth = nominalTraceWidthForConnection;
+      connection2.width = nominalTraceWidthForConnection;
+    }
     const pointsToConnect = [];
     const addedPointIds = /* @__PURE__ */ new Set();
     const connectedPcbPorts = [];
@@ -150367,7 +150470,12 @@ var getSimpleRouteJsonFromCircuitJson = ({
       }
     }
     pointsToConnect.push(
-      ...getSrjConnectionPointsFromPcbTraceHints(connectedPcbPorts, traceHints)
+      ...getSrjConnectionPointsFromPcbTraceHints(
+        connectedPcbPorts.filter(
+          (port) => !differentialPairPathSourcePortIds.has(port.source_port_id)
+        ),
+        traceHints
+      )
     );
     const connection = {
       name: net.source_net_id ?? sharedConnMap.getNetConnectedToId(net.source_net_id),
@@ -150436,6 +150544,10 @@ var getSimpleRouteJsonFromCircuitJson = ({
       }
     }
   }
+  reduceNetConnectionPointsForDifferentialPairPaths({
+    netConnections: connectionsFromNets,
+    differentialPairConnections: differentialPairPathConnections
+  });
   const routableConnectionsFromNets = connectionsFromNets.filter(
     (connection) => connection.pointsToConnect.length >= 2
   );
@@ -150480,7 +150592,6 @@ var getSimpleRouteJsonFromCircuitJson = ({
     bounds,
     connections: allConns
   });
-  const differentialPairs = subcircuitComponent?.selectAll("differentialpair") ?? [];
   const buses = subcircuitComponent?.selectAll("bus") ?? [];
   const srjDifferentialPairs = getDifferentialPairsForSimpleRouteJson({
     srjConnections: allConns,
@@ -159360,7 +159471,7 @@ var RoutingPhasePreparationError = class extends Error {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.2304",
+  version: "0.0.2306",
   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.2305",
+  "version": "0.0.2307",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",