@tscircuit/capacity-autorouter 0.0.7 → 0.0.8

package/dist/index.js

@@ -4508,21 +4508,41 @@ 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 originalConnectionName = this.getOriginalConnectionName(
-        route.connectionName
-      );
+      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({
@@ -4538,7 +4558,7 @@ var CapacityMeshSolver = class extends BaseSolver {
           route_type: "wire",
           x: point.x,
           y: point.y,
-          width: route.traceThickness || this.highDensityRouteSolver.defaultTraceThickness,
+          width: traceThickness,
           layer: this.mapLayer(currentLayer)
         });
       }