@tscircuit/core 0.0.48 → 0.0.50

package/dist/index.d.ts

@@ -3771,7 +3771,7 @@ declare class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
             }>]>, "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6", "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
                 name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
             }>>;
-        }, "pcbRotation" | "layer">, {
+        }, "layer" | "pcbRotation">, {
             name: zod.ZodOptional<zod.ZodString>;
             shape: zod.ZodLiteral<"circle">;
             holeDiameter: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;
@@ -3806,7 +3806,7 @@ declare class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
             }>]>, "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6", "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | {
                 name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
             }>>;
-        }, "pcbRotation" | "layer">, {
+        }, "layer" | "pcbRotation">, {
             name: zod.ZodOptional<zod.ZodString>;
             shape: zod.ZodLiteral<"oval">;
             outerWidth: zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>;

package/dist/index.js

@@ -2439,6 +2439,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       this.renderError(
         `Could not find a common layer (using hints) for trace ${this.getString()}`
       );
+      return;
     }
     const obstacles = getObstaclesFromSoup(this.root.db.toArray());
     markObstaclesAsConnected(
@@ -2468,6 +2469,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     });
     const routes = [];
     for (const [a, b] of pairs(orderedRoutePoints)) {
+      const dominantLayer = "via_to_layer" in a ? a.via_to_layer : null;
       const BOUNDS_MARGIN = 2;
       const ijump = new IJumpAutorouter({
         OBSTACLE_MARGIN: 0.3,
@@ -2476,10 +2478,13 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
           connections: [
             {
               name: this.source_trace_id,
-              pointsToConnect: [a, b]
+              pointsToConnect: [
+                { ...a, layer: dominantLayer ?? "top" },
+                { ...b, layer: dominantLayer ?? "top" }
+              ]
             }
           ],
-          layerCount: 1,
+          layerCount: 2,
           bounds: {
             minX: Math.min(a.x, b.x) - BOUNDS_MARGIN,
             maxX: Math.max(a.x, b.x) + BOUNDS_MARGIN,
@@ -2490,16 +2495,53 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       });
       const traces = ijump.solveAndMapToTraces();
       if (traces.length === 0) {
-        console.log(
-          `Could not find a route between ${a} and ${b} for ${this} (TODO render error)`
+        this.renderError(
+          `Could not find a route between ${JSON.stringify(a)} and ${JSON.stringify(b)} for ${this}`
         );
         return;
       }
       const [trace] = traces;
+      if (dominantLayer) {
+        trace.route = trace.route.map((p) => {
+          if (p.route_type === "wire") {
+            p.layer = dominantLayer;
+          }
+          return p;
+        });
+      }
       routes.push(trace.route);
     }
+    const mergedRoute = mergeRoutes(routes);
+    const routeWithVias = mergedRoute.flatMap((point, index) => {
+      const nextPoint = mergedRoute[index + 1];
+      if (!nextPoint) return [point];
+      if (point.route_type === "wire" && nextPoint.route_type === "wire" && point.layer !== nextPoint.layer) {
+        return [
+          {
+            route_type: "via",
+            from_layer: point.layer,
+            to_layer: nextPoint.layer,
+            x: nextPoint.x,
+            y: nextPoint.y
+          },
+          point
+        ];
+      }
+      return [point];
+    });
+    for (const via of routeWithVias.filter((p) => p.route_type === "via")) {
+      db.pcb_via.insert({
+        x: via.x,
+        y: via.y,
+        hole_diameter: 0.3,
+        outer_diameter: 0.6,
+        layers: [via.from_layer, via.to_layer],
+        from_layer: via.from_layer,
+        to_layer: via.to_layer
+      });
+    }
     const pcb_trace = db.pcb_trace.insert({
-      route: mergeRoutes(routes),
+      route: routeWithVias,
       source_trace_id: this.source_trace_id
     });
     this._portsRoutedOnPcb = ports;
@@ -2520,6 +2562,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       if (elm.type === "schematic_component") {
         obstacles.push({
           type: "rect",
+          layers: ["top"],
           center: elm.center,
           width: elm.size.width,
           height: elm.size.height,
@@ -2528,13 +2571,14 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       }
     }
     for (const { port } of ports) {
-      connection.pointsToConnect.push(
-        projectPointInDirection(
+      connection.pointsToConnect.push({
+        ...projectPointInDirection(
           port._getGlobalSchematicPositionBeforeLayout(),
           port.facingDirection,
           0.1501
-        )
-      );
+        ),
+        layer: "top"
+      });
     }
     const bounds = computeObstacleBounds(obstacles);
     const simpleRouteJsonInput = {

package/lib/components/primitive-components/Trace.ts

@@ -9,6 +9,7 @@ import {
 } from "@tscircuit/infgrid-ijump-astar"
 import type {
   AnySoupElement,
+  LayerRef,
   PCBTrace,
   RouteHintPoint,
   SchematicTrace,
@@ -366,6 +367,7 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       this.renderError(
         `Could not find a common layer (using hints) for trace ${this.getString()}`,
       )
+      return
     }
 
     // Cache the PCB obstacles, they'll be needed for each segment between
@@ -409,7 +411,10 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
 
     const routes: PCBTrace["route"][] = []
     for (const [a, b] of pairs(orderedRoutePoints)) {
+      const dominantLayer =
+        "via_to_layer" in a ? (a.via_to_layer as LayerRef) : null
       const BOUNDS_MARGIN = 2 //mm
+
       const ijump = new IJumpAutorouter({
         OBSTACLE_MARGIN: 0.3,
         input: {
@@ -417,10 +422,13 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
           connections: [
             {
               name: this.source_trace_id!,
-              pointsToConnect: [a, b],
+              pointsToConnect: [
+                { ...a, layer: dominantLayer ?? "top" },
+                { ...b, layer: dominantLayer ?? "top" },
+              ],
             },
           ],
-          layerCount: 1,
+          layerCount: 2,
           bounds: {
             minX: Math.min(a.x, b.x) - BOUNDS_MARGIN,
             maxX: Math.max(a.x, b.x) + BOUNDS_MARGIN,
@@ -431,18 +439,67 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       })
       const traces = ijump.solveAndMapToTraces()
       if (traces.length === 0) {
-        console.log(
-          `Could not find a route between ${a} and ${b} for ${this} (TODO render error)`,
+        this.renderError(
+          `Could not find a route between ${JSON.stringify(a)} and ${JSON.stringify(b)} for ${this}`,
         )
         return
       }
       // TODO ijump returns multiple traces for some reason
       const [trace] = traces as PCBTrace[]
+      // TODO ijump always returns on top layer and has no multilayer support
+      // https://github.com/tscircuit/autorouting-dataset/issues/35
+      // For now, we'll move the trace to whatever layer the first point
+      // specifies we should have "via'd" to
+      if (dominantLayer) {
+        trace.route = trace.route.map((p) => {
+          if (p.route_type === "wire") {
+            p.layer = dominantLayer
+          }
+          return p
+        })
+      }
       routes.push(trace.route)
     }
 
+    const mergedRoute = mergeRoutes(routes)
+
+    // Add vias where layer changes occur
+    const routeWithVias = mergedRoute.flatMap((point, index) => {
+      const nextPoint = mergedRoute[index + 1]
+      if (!nextPoint) return [point]
+      if (
+        point.route_type === "wire" &&
+        nextPoint.route_type === "wire" &&
+        point.layer !== nextPoint.layer
+      ) {
+        return [
+          {
+            route_type: "via",
+            from_layer: point.layer,
+            to_layer: nextPoint.layer,
+            x: nextPoint.x,
+            y: nextPoint.y,
+          } as (typeof mergedRoute)[number],
+          point,
+        ]
+      }
+      return [point]
+    })
+
+    for (const via of routeWithVias.filter((p) => p.route_type === "via")) {
+      db.pcb_via.insert({
+        x: via.x,
+        y: via.y,
+        hole_diameter: 0.3,
+        outer_diameter: 0.6,
+        layers: [via.from_layer as LayerRef, via.to_layer as LayerRef],
+        from_layer: via.from_layer as LayerRef,
+        to_layer: via.to_layer as LayerRef,
+      })
+    }
+
     const pcb_trace = db.pcb_trace.insert({
-      route: mergeRoutes(routes),
+      route: routeWithVias,
       source_trace_id: this.source_trace_id!,
     })
     this._portsRoutedOnPcb = ports
@@ -470,6 +527,7 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       if (elm.type === "schematic_component") {
         obstacles.push({
           type: "rect",
+          layers: ["top"],
           center: elm.center,
           width: elm.size.width,
           height: elm.size.height,
@@ -479,13 +537,14 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
     }
 
     for (const { port } of ports) {
-      connection.pointsToConnect.push(
-        projectPointInDirection(
+      connection.pointsToConnect.push({
+        ...projectPointInDirection(
           port._getGlobalSchematicPositionBeforeLayout(),
           port.facingDirection!,
           0.1501,
         ),
-      )
+        layer: "top",
+      })
     }
 
     const bounds = computeObstacleBounds(obstacles)

package/lib/utils/autorouting/SimpleRouteJson.ts

@@ -12,6 +12,7 @@ export type SimplifiedPcbTrace = {
 export type Obstacle = {
   // TODO include ovals
   type: "rect" // NOTE: most datasets do not contain ovals
+  layers: string[]
   center: { x: number; y: number }
   width: number
   height: number
@@ -20,7 +21,7 @@ export type Obstacle = {
 
 export interface SimpleRouteConnection {
   name: string
-  pointsToConnect: Array<{ x: number; y: number }>
+  pointsToConnect: Array<{ x: number; y: number; layer: string }>
 }
 
 export interface SimpleRouteJson {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/core",
   "module": "index.ts",
   "type": "module",
-  "version": "0.0.48",
+  "version": "0.0.50",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "files": [
@@ -23,7 +23,7 @@
     "@types/react": "^18.3.3",
     "@types/react-reconciler": "^0.28.8",
     "bun-match-svg": "0.0.2",
-    "circuit-to-svg": "^0.0.18",
+    "circuit-to-svg": "^0.0.22",
     "debug": "^4.3.6",
     "howfat": "^0.3.8",
     "looks-same": "^9.0.1",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@lume/kiwi": "^0.4.3",
-    "@tscircuit/infgrid-ijump-astar": "^0.0.9",
+    "@tscircuit/infgrid-ijump-astar": "^0.0.10",
     "@tscircuit/props": "^0.0.62",
     "@tscircuit/soup": "^0.0.67",
     "@tscircuit/soup-util": "^0.0.23",