@tscircuit/capacity-autorouter 0.0.17 → 0.0.18

package/README.md

@@ -1,5 +1,7 @@
 # @tscircuit/capacity-autorouter
 
+[View Online Playground](https://unraveller.vercel.app) · [tscircuit docs](https://docs.tscircuit.com)
+
 A high-density PCB autorouter library for node.js and TypeScript projects. Part of the [tscircuit project](https://github.com/tscircuit/tscircuit) · [discord](https://tscircuit.com/join) · [twitter](https://x.com/seveibar) · [try tscircuit online](https://tscircuit.com)
 
 Check out this [short youtube explanation of this autorouter](https://youtu.be/MmTk0806fAo)

package/dist/index.d.ts

@@ -66,6 +66,7 @@ interface CapacityMeshNode {
     width: number;
     height: number;
     layer: string;
+    availableZ: number[];
     _depth?: number;
     _completelyInsideObstacle?: boolean;
     _containsObstacle?: boolean;
@@ -113,6 +114,12 @@ declare class CapacityMeshEdgeSolver extends BaseSolver {
 interface CapacityMeshNodeSolverOptions {
     capacityDepth?: number;
 }
+interface Target {
+    x: number;
+    y: number;
+    connectionName: string;
+    availableZ: number[];
+}
 declare class CapacityMeshNodeSolver extends BaseSolver {
     srj: SimpleRouteJson;
     opts: CapacityMeshNodeSolverOptions;
@@ -120,16 +127,12 @@ declare class CapacityMeshNodeSolver extends BaseSolver {
     finishedNodes: CapacityMeshNode[];
     nodeToOverlappingObstaclesMap: Map<CapacityMeshNodeId, Obstacle[]>;
     MAX_DEPTH: number;
-    targets: Array<{
-        x: number;
-        y: number;
-        connectionName: string;
-    }>;
+    targets: Target[];
     constructor(srj: SimpleRouteJson, opts?: CapacityMeshNodeSolverOptions);
     _nextNodeCounter: number;
     getNextNodeId(): string;
     getCapacityFromDepth(depth: number): number;
-    getTargetNameIfNodeContainsTarget(node: CapacityMeshNode): string | null;
+    getTargetIfNodeContainsTarget(node: CapacityMeshNode): Target | null;
     getOverlappingObstacles(node: CapacityMeshNode): Obstacle[];
     /**
      * Checks if the given mesh node overlaps with any obstacle.
@@ -234,6 +237,7 @@ interface NodePortSegment {
         x: number;
         y: number;
     };
+    availableZ: number[];
     connectionNames: string[];
 }
 

package/dist/index.js

@@ -1093,6 +1093,7 @@ var CapacityMeshNodeSolver = class extends BaseSolver {
         width: maxWidthHeight,
         height: maxWidthHeight,
         layer: "top",
+        availableZ: [0, 1],
         _depth: 0,
         _containsTarget: true,
         _containsObstacle: true,
@@ -1102,7 +1103,11 @@ var CapacityMeshNodeSolver = class extends BaseSolver {
     this.finishedNodes = [];
     this.nodeToOverlappingObstaclesMap = /* @__PURE__ */ new Map();
     this.targets = this.srj.connections.flatMap(
-      (c) => c.pointsToConnect.map((p) => ({ ...p, connectionName: c.name }))
+      (c) => c.pointsToConnect.map((p) => ({
+        ...p,
+        connectionName: c.name,
+        availableZ: p.layer === "top" ? [0] : [1]
+      }))
     );
   }
   unfinishedNodes;
@@ -1118,7 +1123,7 @@ var CapacityMeshNodeSolver = class extends BaseSolver {
   getCapacityFromDepth(depth) {
     return (this.MAX_DEPTH - depth + 1) ** 2;
   }
-  getTargetNameIfNodeContainsTarget(node) {
+  getTargetIfNodeContainsTarget(node) {
     const overlappingObstacles = this.getOverlappingObstacles(node);
     for (const target of this.targets) {
       const targetObstacle = overlappingObstacles.find(
@@ -1126,11 +1131,11 @@ var CapacityMeshNodeSolver = class extends BaseSolver {
       );
       if (targetObstacle) {
         if (doRectsOverlap(node, targetObstacle)) {
-          return target.connectionName;
+          return target;
         }
       }
       if (target.x >= node.center.x - node.width / 2 && target.x <= node.center.x + node.width / 2 && target.y >= node.center.y - node.height / 2 && target.y <= node.center.y + node.height / 2) {
-        return target.connectionName;
+        return target;
       }
     }
     return null;
@@ -1233,12 +1238,17 @@ var CapacityMeshNodeSolver = class extends BaseSolver {
         width: childNodeSize.width,
         height: childNodeSize.height,
         layer: parent.layer,
+        availableZ: [0, 1],
         _depth: (parent._depth ?? 0) + 1,
         _parent: parent
       };
       childNode._containsObstacle = this.doesNodeOverlapObstacle(childNode);
-      childNode._targetConnectionName = this.getTargetNameIfNodeContainsTarget(childNode) ?? void 0;
-      childNode._containsTarget = Boolean(childNode._targetConnectionName);
+      const target = this.getTargetIfNodeContainsTarget(childNode);
+      if (target) {
+        childNode._targetConnectionName = target.connectionName;
+        childNode.availableZ = target.availableZ;
+        childNode._containsTarget = true;
+      }
       if (childNode._containsObstacle) {
         childNode._completelyInsideObstacle = this.isNodeCompletelyInsideObstacle(childNode);
       }
@@ -1295,16 +1305,6 @@ var CapacityMeshNodeSolver = class extends BaseSolver {
       coordinateSystem: "cartesian",
       title: "Capacity Mesh Visualization"
     };
-    const allNodes = [...this.finishedNodes, ...this.unfinishedNodes];
-    for (const node of allNodes) {
-      graphics.rects.push({
-        center: node.center,
-        width: Math.max(node.width - 2, node.width * 0.8),
-        height: Math.max(node.height - 2, node.height * 0.8),
-        fill: node._containsObstacle ? "rgba(255,0,0,0.1)" : "rgba(0,0,0,0.1)",
-        label: node.capacityMeshNodeId
-      });
-    }
     for (const obstacle of this.srj.obstacles) {
       graphics.rects.push({
         center: obstacle.center,
@@ -1315,13 +1315,24 @@ var CapacityMeshNodeSolver = class extends BaseSolver {
         label: "obstacle"
       });
     }
+    const allNodes = [...this.finishedNodes, ...this.unfinishedNodes];
+    for (const node of allNodes) {
+      graphics.rects.push({
+        center: node.center,
+        width: Math.max(node.width - 2, node.width * 0.8),
+        height: Math.max(node.height - 2, node.height * 0.8),
+        fill: node._containsObstacle ? "rgba(255,0,0,0.1)" : "rgba(0,0,0,0.1)",
+        label: `${node.capacityMeshNodeId}
+availableZ: ${node.availableZ.join(",")}`
+      });
+    }
     this.srj.connections.forEach((connection, index) => {
       const color = COLORS[index % COLORS.length];
       for (const pt of connection.pointsToConnect) {
         graphics.points.push({
           x: pt.x,
           y: pt.y,
-          label: `conn-${index}`,
+          label: `conn-${index} (${pt.layer})`,
           color
         });
       }
@@ -1391,11 +1402,16 @@ var CapacityEdgeToPortSegmentSolver = class extends BaseSolver {
         const adjNode = this.nodeMap.get(adjNodeId);
         if (!adjNode) continue;
         const segment = findOverlappingSegment(node, adjNode);
+        const mutuallyAvailableZ = adjNode.availableZ.filter(
+          (z) => node.availableZ.includes(z)
+        );
+        if (mutuallyAvailableZ.length === 0) continue;
         const portSegment = {
           capacityMeshNodeId: nodeId,
           start: segment.start,
           end: segment.end,
-          connectionNames: [path.connectionName]
+          connectionNames: [path.connectionName],
+          availableZ: mutuallyAvailableZ
         };
         nodePortSegments.push(portSegment);
       }
@@ -1414,7 +1430,7 @@ var CapacityEdgeToPortSegmentSolver = class extends BaseSolver {
       const node = this.nodeMap.get(nodeId);
       segments.forEach((segment) => {
         const isVertical = segment.start.x === segment.end.x;
-        const THICKNESS = 0.5 / segment.connectionNames.length;
+        const THICKNESS = 0.1 / segment.connectionNames.length;
         for (let i = 0; i < segment.connectionNames.length; i++) {
           const offsetAmount = (i / (segment.connectionNames.length - 1 + 1e-6) - 0.5) * THICKNESS;
           const offset = {
@@ -1436,7 +1452,8 @@ var CapacityEdgeToPortSegmentSolver = class extends BaseSolver {
               this.colorMap[segment.connectionNames[i]],
               0.6
             ),
-            label: `${nodeId}: ${segment.connectionNames.join(", ")}`
+            label: `${nodeId}: ${segment.connectionNames.join(", ")}
+availableZ: ${segment.availableZ.join(",")}`
           });
         }
       });
@@ -1537,7 +1554,7 @@ var CapacitySegmentToPointSolver = class extends BaseSolver {
         const center = {
           x: (seg.start.x + seg.end.x) / 2,
           y: (seg.start.y + seg.end.y) / 2,
-          z: 0
+          z: seg.availableZ[0]
         };
         seg.assignedPoints = [
           { connectionName: seg.connectionNames[0], point: center }
@@ -1564,7 +1581,7 @@ var CapacitySegmentToPointSolver = class extends BaseSolver {
         points.push({
           x: candidate.start.x + dx * fraction,
           y: candidate.start.y + dy * fraction,
-          z: 0
+          z: candidate.availableZ[0]
         });
       }
       ;
@@ -3300,6 +3317,7 @@ var CapacityNodeTargetMerger = class extends BaseSolver {
       width: bounds.maxX - bounds.minX,
       height: bounds.maxY - bounds.minY,
       layer: connectedNodes[0].layer,
+      availableZ: connectedNodes[0].availableZ,
       _completelyInsideObstacle: false,
       _containsObstacle: true,
       _containsTarget: true,
@@ -3558,11 +3576,6 @@ var CapacitySegmentPointOptimizer = class extends BaseSolver {
     const segments = segmentIds.map(
       (segmentId) => this.currentMutatedSegments.get(segmentId)
     );
-    const points = segments.flatMap((s) => s.assignedPoints);
-    if (points.length <= 2) {
-      if (points.length <= 1) return 0;
-      return 0;
-    }
     const {
       numEntryExitLayerChanges,
       numSameLayerCrossings,
@@ -3637,10 +3650,6 @@ var CapacitySegmentPointOptimizer = class extends BaseSolver {
         point2Index: randomPointIndex2
       };
     }
-    const nodeIds = this.segmentIdToNodeIds.get(segment.nodePortSegmentId);
-    if (nodeIds?.some((nodeId) => this.nodesThatCantFitVias.has(nodeId))) {
-      return null;
-    }
     const randomPointIndex = Math.floor(
       this.random() * segment.assignedPoints.length
     );
@@ -3846,9 +3855,7 @@ var CapacitySegmentPointOptimizer = class extends BaseSolver {
       this.solved = true;
       return;
     }
-    const op = this.getRandomCombinedOperationNearNode(
-      this.getRandomWeightedNodeId()
-    );
+    const op = this.getRandomCombinedOperationOnSingleNode();
     this.lastCreatedOperation = op;
     this.applyOperation(op);
     const {
@@ -4720,6 +4727,7 @@ var convertSrjToGraphicsObject = (srj) => {
               { x: routePoint.x, y: routePoint.y },
               { x: nextRoutePoint.x, y: nextRoutePoint.y }
             ],
+            strokeWidth: 0.15,
             strokeColor: safeTransparentize(
               {
                 top: "red",