@tscircuit/capacity-autorouter 0.0.37 → 0.0.39

package/dist/index.d.ts

@@ -503,6 +503,7 @@ type FutureConnection = {
     points: {
         x: number;
         y: number;
+        z: number;
     }[];
 };
 declare class SingleHighDensityRouteSolver extends BaseSolver {
@@ -619,9 +620,10 @@ declare class IntraNodeRouteSolver extends BaseSolver {
     failedSubSolvers: SingleHighDensityRouteSolver[];
     hyperParameters: Partial<HighDensityHyperParameters>;
     minDistBetweenEnteringPoints: number;
-    activeSolver: SingleHighDensityRouteSolver | null;
+    activeSubSolver: SingleHighDensityRouteSolver | null;
     connMap?: ConnectivityMap;
     get failedSolvers(): SingleHighDensityRouteSolver[];
+    get activeSolver(): SingleHighDensityRouteSolver | null;
     constructor(params: {
         nodeWithPortPoints: NodeWithPortPoints;
         colorMap?: Record<string, string>;

package/dist/index.js

@@ -7,6 +7,7 @@ var combineVisualizations = (...visualizations) => {
     rects: []
   };
   visualizations.forEach((viz, i) => {
+    if (!viz) return;
     if (viz.lines) {
       combined.lines = [
         ...combined.lines || [],
@@ -2320,7 +2321,7 @@ var SingleHighDensityRouteSolver = class extends BaseSolver {
       goalDist,
       currentNode.z === this.B.z
     );
-    if (goalDist <= this.cellStep && currentNode.z === this.B.z) {
+    if (goalDist <= this.cellStep * Math.SQRT2 && currentNode.z === this.B.z) {
       this.solved = true;
       this.setSolvedPath(currentNode);
     }
@@ -2453,7 +2454,7 @@ var SingleHighDensityRouteSolver6_VertHorzLayer_FutureCost = class extends Singl
     let closestPoint = null;
     for (const futureConnection of this.futureConnections) {
       for (const point of futureConnection.points) {
-        const dist = distance(node, point);
+        const dist = distance(node, point) + (node.z !== point.z ? this.viaPenaltyDistance : 0);
         if (dist < minDist) {
           minDist = dist;
           closestPoint = point;
@@ -2567,6 +2568,9 @@ var getMinDistBetweenEnteringPoints = (node) => {
   const points = node.portPoints;
   for (let i = 0; i < points.length; i++) {
     for (let j = i + 1; j < points.length; j++) {
+      if (points[i].z !== points[j].z) {
+        continue;
+      }
       const p1 = points[i];
       const p2 = points[j];
       const dist = Math.sqrt((p1.x - p2.x) ** 2 + (p1.y - p2.y) ** 2);
@@ -2586,12 +2590,16 @@ var IntraNodeRouteSolver = class extends BaseSolver {
   failedSubSolvers;
   hyperParameters;
   minDistBetweenEnteringPoints;
-  activeSolver = null;
+  activeSubSolver = null;
   connMap;
   // Legacy compat
   get failedSolvers() {
     return this.failedSubSolvers;
   }
+  // Legacy compat
+  get activeSolver() {
+    return this.activeSubSolver;
+  }
   constructor(params) {
     const { nodeWithPortPoints, colorMap } = params;
     super();
@@ -2650,18 +2658,18 @@ var IntraNodeRouteSolver = class extends BaseSolver {
   //   this.unsolvedConnections = []
   // }
   computeProgress() {
-    return (this.solvedRoutes.length + (this.activeSolver?.progress || 0)) / this.totalConnections;
+    return (this.solvedRoutes.length + (this.activeSubSolver?.progress || 0)) / this.totalConnections;
   }
   _step() {
-    if (this.activeSolver) {
-      this.activeSolver.step();
+    if (this.activeSubSolver) {
+      this.activeSubSolver.step();
       this.progress = this.computeProgress();
-      if (this.activeSolver.solved) {
-        this.solvedRoutes.push(this.activeSolver.solvedPath);
-        this.activeSolver = null;
-      } else if (this.activeSolver.failed) {
-        this.failedSubSolvers.push(this.activeSolver);
-        this.activeSolver = null;
+      if (this.activeSubSolver.solved) {
+        this.solvedRoutes.push(this.activeSubSolver.solvedPath);
+        this.activeSubSolver = null;
+      } else if (this.activeSubSolver.failed) {
+        this.failedSubSolvers.push(this.activeSubSolver);
+        this.activeSubSolver = null;
         this.error = this.failedSubSolvers.map((s) => s.error).join("\n");
         this.failed = true;
       }
@@ -2683,7 +2691,7 @@ var IntraNodeRouteSolver = class extends BaseSolver {
       }
     }
     const { connectionName, points } = unsolvedConnection;
-    this.activeSolver = new SingleHighDensityRouteSolver6_VertHorzLayer_FutureCost({
+    this.activeSubSolver = new SingleHighDensityRouteSolver6_VertHorzLayer_FutureCost({
       connectionName,
       minDistBetweenEnteringPoints: this.minDistBetweenEnteringPoints,
       bounds: getBoundsFromNodeWithPortPoints(this.nodeWithPortPoints),