@tscircuit/schematic-trace-solver 0.0.202 → 0.0.203

package/dist/index.js

@@ -7810,6 +7810,36 @@ var is4PointRectangle = (path) => {
   return isHVHC || isVHVC;
 };
 
+// lib/solvers/TraceCleanupSolver/getInteriorShortcutPaths.ts
+var getInteriorShortcutPaths = (path) => {
+  const candidates = [path];
+  for (let startIndex = 1; startIndex < path.length - 3; startIndex++) {
+    for (let endIndex = startIndex + 2; endIndex < path.length - 1; endIndex++) {
+      for (const connection of tryConnectPoints(
+        path[startIndex],
+        path[endIndex]
+      )) {
+        const candidate = simplifyPath([
+          ...path.slice(0, startIndex),
+          ...connection,
+          ...path.slice(endIndex + 1)
+        ]);
+        const preservesTerminalDirections = [
+          [0, 1],
+          [-1, -2]
+        ].every(([endIndex2, neighborIndex]) => {
+          const endpoint = path.at(endIndex2);
+          const neighbor = path.at(neighborIndex);
+          const candidateNeighbor = candidate.at(neighborIndex);
+          return (neighbor.x - endpoint.x) * (candidateNeighbor.x - endpoint.x) + (neighbor.y - endpoint.y) * (candidateNeighbor.y - endpoint.y) > 0;
+        });
+        if (preservesTerminalDirections) candidates.push(candidate);
+      }
+    }
+  }
+  return candidates;
+};
+
 // lib/solvers/TraceCleanupSolver/rerouteGeneratedNetLabelConnectorCrossings.ts
 var EPS13 = 1e-6;
 var getConnectorObstacleBounds = (connector, segmentIndex, labels) => {
@@ -7902,7 +7932,12 @@ var rerouteGeneratedNetLabelConnectorCrossings = ({
         obstacleBounds,
         chipBounds: [],
         clearance
-      }).filter(
+      }).flatMap(
+        (candidate) => getInteriorShortcutPaths(candidate.path).map((path) => ({
+          ...candidate,
+          path
+        }))
+      ).filter(
         (candidate) => getPathLength4(candidate.path) <= getPathLength4(trace.tracePath) + EPS13 && countTurns(candidate.path) <= countTurns(trace.tracePath) + 2 && !isPathCollidingWithObstacles(
           candidate.path,
           componentAndTextObstacles

package/lib/solvers/TraceCleanupSolver/getInteriorShortcutPaths.ts

@@ -0,0 +1,41 @@
+import type { Point } from "@tscircuit/math-utils"
+import { simplifyPath } from "./simplifyPath"
+import { tryConnectPoints } from "./tryConnectPoints"
+
+export const getInteriorShortcutPaths = (path: Point[]): Point[][] => {
+  const candidates: Point[][] = [path]
+  // Reconnect interior points to remove old loops left behind by a connector detour.
+  for (let startIndex = 1; startIndex < path.length - 3; startIndex++) {
+    for (
+      let endIndex = startIndex + 2;
+      endIndex < path.length - 1;
+      endIndex++
+    ) {
+      for (const connection of tryConnectPoints(
+        path[startIndex]!,
+        path[endIndex]!,
+      )) {
+        const candidate = simplifyPath([
+          ...path.slice(0, startIndex),
+          ...connection,
+          ...path.slice(endIndex + 1),
+        ])
+        const preservesTerminalDirections = [
+          [0, 1],
+          [-1, -2],
+        ].every(([endIndex, neighborIndex]) => {
+          const endpoint = path.at(endIndex!)!
+          const neighbor = path.at(neighborIndex!)!
+          const candidateNeighbor = candidate.at(neighborIndex!)!
+          return (
+            (neighbor.x - endpoint.x) * (candidateNeighbor.x - endpoint.x) +
+              (neighbor.y - endpoint.y) * (candidateNeighbor.y - endpoint.y) >
+            0
+          )
+        })
+        if (preservesTerminalDirections) candidates.push(candidate)
+      }
+    }
+  }
+  return candidates
+}

package/lib/solvers/TraceCleanupSolver/rerouteGeneratedNetLabelConnectorCrossings.ts

@@ -9,6 +9,7 @@ import { getObstacleRects } from "lib/solvers/SchematicTraceLinesSolver/Schemati
 import type { InputProblem } from "lib/types/InputProblem"
 import { doesPathCoincideWithTraces } from "lib/utils/doesPathCoincideWithTraces"
 import { countTurns } from "./countTurns"
+import { getInteriorShortcutPaths } from "./getInteriorShortcutPaths"
 import { hasCollisionsWithLabels } from "./hasCollisionsWithLabels"
 import { findPerpendicularPathCrossings } from "./sub-solver/findIntersectionsWithObstacles"
 import { generatePerpendicularTraceDetours } from "./sub-solver/generateLShapeRerouteCandidates"
@@ -150,6 +151,12 @@ export const rerouteGeneratedNetLabelConnectorCrossings = ({
         chipBounds: [],
         clearance,
       })
+        .flatMap((candidate) =>
+          getInteriorShortcutPaths(candidate.path).map((path) => ({
+            ...candidate,
+            path,
+          })),
+        )
         .filter(
           (candidate) =>
             getPathLength(candidate.path) <=

package/package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/tscircuit/schematic-trace-solver.git"
   },
   "main": "dist/index.js",
-  "version": "0.0.202",
+  "version": "0.0.203",
   "type": "module",
   "scripts": {
     "start": "cosmos",