@tscircuit/capacity-autorouter 0.0.6 → 0.0.8

package/dist/index.d.ts

@@ -32,11 +32,13 @@ interface SimpleRouteConnection {
         x: number;
         y: number;
         layer: string;
+        pcb_port_id?: string;
     }>;
 }
 type SimplifiedPcbTraces = Array<{
     type: "pcb_trace";
     pcb_trace_id: TraceId;
+    connection_name: string;
     route: Array<{
         route_type: "wire";
         x: number;
@@ -822,6 +824,18 @@ declare class CapacityMeshSolver extends BaseSolver {
      * Simplifies a route by merging consecutive points along the same line
      */
     private simplifyRoute;
+    /**
+     * Maps numeric layer to named layer
+     * @param layer Numeric layer (0, 1, etc)
+     * @returns Named layer ("top", "bottom", etc)
+     */
+    private mapLayer;
+    /**
+     * Get original connection name from connection name with MST suffix
+     * @param mstConnectionName The MST-suffixed connection name (e.g. "connection1_mst0")
+     * @returns The original connection name (e.g. "connection1")
+     */
+    private getOriginalConnectionName;
     /**
      * Returns the SimpleRouteJson with routes converted to SimplifiedPcbTraces
      */

package/dist/index.js

@@ -4477,6 +4477,30 @@ var CapacityMeshSolver = class extends BaseSolver {
     result.push(points[points.length - 1]);
     return result;
   }
+  /**
+   * Maps numeric layer to named layer
+   * @param layer Numeric layer (0, 1, etc)
+   * @returns Named layer ("top", "bottom", etc)
+   */
+  mapLayer(layer) {
+    switch (layer) {
+      case "0":
+        return "top";
+      case "1":
+        return "bottom";
+      default:
+        return `layer${layer}`;
+    }
+  }
+  /**
+   * Get original connection name from connection name with MST suffix
+   * @param mstConnectionName The MST-suffixed connection name (e.g. "connection1_mst0")
+   * @returns The original connection name (e.g. "connection1")
+   */
+  getOriginalConnectionName(mstConnectionName) {
+    const match = mstConnectionName.match(/^(.+?)_mst\d+$/);
+    return match ? match[1] : mstConnectionName;
+  }
   /**
    * Returns the SimpleRouteJson with routes converted to SimplifiedPcbTraces
    */
@@ -4484,25 +4508,49 @@ var CapacityMeshSolver = class extends BaseSolver {
     if (!this.solved || !this.highDensityRouteSolver) {
       throw new Error("Cannot get output before solving is complete");
     }
-    const traces = [];
+    const traceIdToRoutes = {};
     for (const route of this.highDensityRouteSolver.routes) {
-      const simplifiedRoute = this.simplifyRoute(route.route);
+      const traceId = route.connectionName;
+      if (!traceIdToRoutes[traceId]) {
+        traceIdToRoutes[traceId] = [];
+      }
+      traceIdToRoutes[traceId].push(route);
+    }
+    const traces = [];
+    for (const [traceId, routes] of Object.entries(traceIdToRoutes)) {
+      if (routes.length === 0) continue;
+      const originalConnectionName = this.getOriginalConnectionName(traceId);
       const trace = {
         type: "pcb_trace",
-        pcb_trace_id: route.connectionName,
+        pcb_trace_id: traceId,
+        connection_name: originalConnectionName,
         route: []
       };
-      let currentLayer = simplifiedRoute[0]?.z.toString() || "0";
-      for (let i = 0; i < simplifiedRoute.length; i++) {
-        const point = simplifiedRoute[i];
+      const traceThickness = routes[0].traceThickness || this.highDensityRouteSolver.defaultTraceThickness;
+      const allPoints = [];
+      routes.forEach((route, routeIndex) => {
+        const simplifiedRoute = this.simplifyRoute(route.route);
+        simplifiedRoute.forEach((point, pointIndex) => {
+          allPoints.push({ ...point, routeIndex, pointIndex });
+        });
+      });
+      if (allPoints.length === 0) continue;
+      allPoints.sort((a, b) => {
+        if (a.z !== b.z) return a.z - b.z;
+        if (a.x !== b.x) return a.x - b.x;
+        return a.y - b.y;
+      });
+      let currentLayer = allPoints[0].z.toString();
+      for (let i = 0; i < allPoints.length; i++) {
+        const point = allPoints[i];
         const nextLayerStr = point.z.toString();
         if (nextLayerStr !== currentLayer) {
           trace.route.push({
             route_type: "via",
             x: point.x,
             y: point.y,
-            from_layer: currentLayer,
-            to_layer: nextLayerStr
+            from_layer: this.mapLayer(currentLayer),
+            to_layer: this.mapLayer(nextLayerStr)
           });
           currentLayer = nextLayerStr;
         }
@@ -4510,8 +4558,8 @@ var CapacityMeshSolver = class extends BaseSolver {
           route_type: "wire",
           x: point.x,
           y: point.y,
-          width: route.traceThickness || this.highDensityRouteSolver.defaultTraceThickness,
-          layer: currentLayer
+          width: traceThickness,
+          layer: this.mapLayer(currentLayer)
         });
       }
       traces.push(trace);