@tscircuit/core 0.0.56 → 0.0.58

package/dist/index.d.ts

@@ -789,6 +789,7 @@ declare class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
         height: number;
     };
     doInitialPortMatching(): void;
+    getAvailablePcbLayers(): string[];
     doInitialPcbPrimitiveRender(): void;
     doInitialPcbPortAttachment(): void;
     _getPcbCircuitJsonBounds(): {
@@ -3837,6 +3838,7 @@ declare class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
             portHints?: (string | number)[] | undefined;
         }>]>;
     };
+    getAvailablePcbLayers(): string[];
     getPcbSize(): {
         width: number;
         height: number;

package/dist/index.js

@@ -879,7 +879,7 @@ var Port = class extends PrimitiveComponent {
     if ("_getPcbCircuitJsonBounds" in pcbMatch) {
       const pcb_port = db.pcb_port.insert({
         pcb_component_id: this.parent?.pcb_component_id,
-        layers: ["top"],
+        layers: this.getAvailablePcbLayers(),
         ...pcbMatch._getPcbCircuitJsonBounds().center,
         source_port_id: this.source_port_id
       });
@@ -1129,6 +1129,9 @@ var SmtPad = class extends PrimitiveComponent {
       }
     }
   }
+  getAvailablePcbLayers() {
+    return this.props.layer ? [this.props.layer] : [];
+  }
   doInitialPcbPrimitiveRender() {
     const { db } = this.root;
     const { _parsedProps: props } = this;
@@ -1269,6 +1272,9 @@ var PlatedHole = class extends PrimitiveComponent {
       zodProps: platedHoleProps
     };
   }
+  getAvailablePcbLayers() {
+    return ["top", "inner1", "inner2", "bottom"];
+  }
   getPcbSize() {
     const { _parsedProps: props } = this;
     if (props.shape === "circle") {
@@ -2075,6 +2081,7 @@ import "zod";
 // lib/components/primitive-components/Trace.ts
 import { traceProps } from "@tscircuit/props";
 import {
+  MultilayerIjump,
   IJumpAutorouter,
   getObstaclesFromSoup
 } from "@tscircuit/infgrid-ijump-astar";
@@ -2505,8 +2512,10 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     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({
+      const ijump = new MultilayerIjump({
         OBSTACLE_MARGIN: 0.3,
+        isRemovePathLoopsEnabled: true,
+        layerCount: 2,
         input: {
           obstacles,
           connections: [

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

@@ -14,6 +14,11 @@ export class PlatedHole extends PrimitiveComponent<typeof platedHoleProps> {
     }
   }
 
+  getAvailablePcbLayers(): string[] {
+    // TODO use project layerCount
+    return ["top", "inner1", "inner2", "bottom"]
+  }
+
   getPcbSize(): { width: number; height: number } {
     const { _parsedProps: props } = this
     if (props.shape === "circle") {

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

@@ -189,7 +189,7 @@ export class Port extends PrimitiveComponent<typeof portProps> {
     if ("_getPcbCircuitJsonBounds" in pcbMatch) {
       const pcb_port = db.pcb_port.insert({
         pcb_component_id: this.parent?.pcb_component_id!,
-        layers: ["top"],
+        layers: this.getAvailablePcbLayers(),
 
         ...pcbMatch._getPcbCircuitJsonBounds().center,
 

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

@@ -2,7 +2,7 @@ import { PrimitiveComponent } from "../base-components/PrimitiveComponent"
 import { smtPadProps } from "@tscircuit/props"
 import type { Port } from "./Port"
 import type { RenderPhaseFn } from "../base-components/Renderable"
-import type { PCBSMTPad } from "@tscircuit/soup"
+import type { LayerRef, PCBSMTPad } from "@tscircuit/soup"
 import { decomposeTSR } from "transformation-matrix"
 
 export class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
@@ -49,6 +49,10 @@ export class SmtPad extends PrimitiveComponent<typeof smtPadProps> {
     }
   }
 
+  getAvailablePcbLayers(): string[] {
+    return this.props.layer ? [this.props.layer as LayerRef] : []
+  }
+
   doInitialPcbPrimitiveRender(): void {
     const { db } = this.root!
     const { _parsedProps: props } = this

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

@@ -2,6 +2,7 @@ import { traceProps } from "@tscircuit/props"
 import { PrimitiveComponent } from "../base-components/PrimitiveComponent"
 import type { Port } from "./Port"
 import {
+  MultilayerIjump,
   IJumpAutorouter,
   autoroute,
   getObstaclesFromSoup,
@@ -418,8 +419,10 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
         "via_to_layer" in a ? (a.via_to_layer as LayerRef) : null
       const BOUNDS_MARGIN = 2 //mm
 
-      const ijump = new IJumpAutorouter({
+      const ijump = new MultilayerIjump({
         OBSTACLE_MARGIN: 0.3,
+        isRemovePathLoopsEnabled: true,
+        layerCount: 2,
         input: {
           obstacles,
           connections: [

package/lib/utils/autorouting/SimpleRouteJson.ts

@@ -1,13 +1,22 @@
 export type SimplifiedPcbTrace = {
   type: "pcb_trace"
   pcb_trace_id: string
-  route: Array<{
-    route_type: "wire" | "via"
-    x: number
-    y: number
-    width: number
-    layer: string
-  }>
+  route: Array<
+    | {
+        route_type: "wire"
+        x: number
+        y: number
+        width: number
+        layer: string
+      }
+    | {
+        route_type: "via"
+        x: number
+        y: number
+        to_layer: string
+        from_layer: string
+      }
+  >
 }
 export type Obstacle = {
   // TODO include ovals

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/core",
   "module": "index.ts",
   "type": "module",
-  "version": "0.0.56",
+  "version": "0.0.58",
   "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.22",
+    "circuit-to-svg": "^0.0.28",
     "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.13",
+    "@tscircuit/infgrid-ijump-astar": "^0.0.15",
     "@tscircuit/props": "^0.0.62",
     "@tscircuit/soup": "^0.0.67",
     "@tscircuit/soup-util": "^0.0.23",