@tscircuit/core 0.0.2305 → 0.0.2306

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);
@@ -159360,7 +159370,7 @@ var RoutingPhasePreparationError = class extends Error {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.2304",
+  version: "0.0.2305",
   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.2306",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",