@tscircuit/core 0.0.49 → 0.0.50

package/dist/index.js

@@ -2469,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,
@@ -2477,7 +2478,10 @@ 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: 2,
@@ -2497,10 +2501,10 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
         return;
       }
       const [trace] = traces;
-      if ("via_to_layer" in a) {
+      if (dominantLayer) {
         trace.route = trace.route.map((p) => {
           if (p.route_type === "wire") {
-            p.layer = a.via_to_layer;
+            p.layer = dominantLayer;
           }
           return p;
         });
@@ -2558,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,
@@ -2566,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

@@ -411,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: {
@@ -419,7 +422,10 @@ 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: 2,
@@ -444,10 +450,10 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       // 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 ("via_to_layer" in a) {
+      if (dominantLayer) {
         trace.route = trace.route.map((p) => {
           if (p.route_type === "wire") {
-            p.layer = a.via_to_layer as LayerRef
+            p.layer = dominantLayer
           }
           return p
         })
@@ -521,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,
@@ -530,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.49",
+  "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",