@tscircuit/core 0.0.63 → 0.0.65

package/dist/index.d.ts

@@ -3773,7 +3773,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>;
@@ -3808,7 +3808,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

@@ -2532,14 +2532,15 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       const bLayer = "layers" in b && b.layers.length === 1 ? b.layers[0] : dominantLayer ?? "top";
       const pcbPortA = "pcb_port_id" in a ? a.pcb_port_id : null;
       const pcbPortB = "pcb_port_id" in b ? b.pcb_port_id : null;
+      const minTraceWidth = this.getSubcircuit()._parsedProps.minTraceWidth ?? 0.16;
       const ijump = new MultilayerIjump({
-        OBSTACLE_MARGIN: 0.3,
+        OBSTACLE_MARGIN: minTraceWidth * 2,
         // isRemovePathLoopsEnabled: true,
-        optimizeWithGoalBoxes: false,
-        // Boolean(pcbPortA && pcbPortB),
+        optimizeWithGoalBoxes: Boolean(pcbPortA && pcbPortB),
         connMap,
         input: {
           obstacles,
+          minTraceWidth,
           connections: [
             {
               name: this.source_trace_id,
@@ -2590,7 +2591,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       const [trace] = traces;
       if (dominantLayer) {
         trace.route = trace.route.map((p) => {
-          if (p.route_type === "wire") {
+          if (p.route_type === "wire" && !p.layer) {
             p.layer = dominantLayer;
           }
           return p;
@@ -2654,6 +2655,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     }
     const bounds = computeObstacleBounds(obstacles);
     const simpleRouteJsonInput = {
+      minTraceWidth: 0.1,
       obstacles,
       connections: [connection],
       bounds,
@@ -3445,10 +3447,9 @@ var FabricationNotePath = class extends PrimitiveComponent {
           y: transformedPosition.y
         };
       }),
-      stroke_width: props.strokeWidth ?? 0.1,
-      fabrication_note_path_id: `fabrication_note_${Math.random().toString()}`
+      stroke_width: props.strokeWidth ?? 0.1
     });
-    this.fabrication_note_path_id = fabrication_note_path.fabrication_note_path_id;
+    this.fabrication_note_path_id = fabrication_note_path.pcb_fabrication_note_path_id;
   }
 };
 
@@ -3524,7 +3525,7 @@ var Circuit = class {
 "${e.message}"`
       );
     });
-    return circuitToSvg.circuitJsonToPcbSvg(this.getSoup());
+    return circuitToSvg.circuitJsonToPcbSvg(this.getCircuitJson());
   }
   async preview(previewNameOrOpts) {
     const previewOpts = typeof previewNameOrOpts === "object" ? previewNameOrOpts : { previewName: previewNameOrOpts };

package/lib/Project.ts

@@ -86,7 +86,7 @@ export class Circuit {
       )
     })
 
-    return circuitToSvg.circuitJsonToPcbSvg(this.getSoup())
+    return circuitToSvg.circuitJsonToPcbSvg(this.getCircuitJson())
   }
 
   async preview(

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

@@ -42,10 +42,9 @@ export class FabricationNotePath extends PrimitiveComponent<
         }
       }),
       stroke_width: props.strokeWidth ?? 0.1,
-      fabrication_note_path_id: `fabrication_note_${Math.random().toString()}`,
     })
 
     this.fabrication_note_path_id =
-      fabrication_note_path.fabrication_note_path_id
+      fabrication_note_path.pcb_fabrication_note_path_id
   }
 }

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

@@ -450,13 +450,17 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       const pcbPortA = "pcb_port_id" in a ? a.pcb_port_id : null
       const pcbPortB = "pcb_port_id" in b ? b.pcb_port_id : null
 
+      const minTraceWidth =
+        this.getSubcircuit()._parsedProps.minTraceWidth ?? 0.16
+
       const ijump = new MultilayerIjump({
-        OBSTACLE_MARGIN: 0.3,
+        OBSTACLE_MARGIN: minTraceWidth * 2,
         // isRemovePathLoopsEnabled: true,
-        optimizeWithGoalBoxes: false, // Boolean(pcbPortA && pcbPortB),
+        optimizeWithGoalBoxes: Boolean(pcbPortA && pcbPortB),
         connMap,
         input: {
           obstacles,
+          minTraceWidth,
           connections: [
             {
               name: this.source_trace_id!,
@@ -504,15 +508,13 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
         })
         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 the autorouter didn't specify a layer, use the dominant layer
+      // Some of the single-layer autorouters don't add the layer property
       if (dominantLayer) {
         trace.route = trace.route.map((p) => {
-          if (p.route_type === "wire") {
+          if (p.route_type === "wire" && !p.layer) {
             p.layer = dominantLayer
           }
           return p
@@ -589,6 +591,7 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
     const bounds = computeObstacleBounds(obstacles)
 
     const simpleRouteJsonInput: SimpleRouteJson = {
+      minTraceWidth: 0.1,
       obstacles,
       connections: [connection],
       bounds,

package/lib/utils/autorouting/SimpleRouteJson.ts

@@ -35,6 +35,7 @@ export interface SimpleRouteConnection {
 
 export interface SimpleRouteJson {
   layerCount: number
+  minTraceWidth: number
   obstacles: Obstacle[]
   connections: Array<SimpleRouteConnection>
   bounds: { minX: number; maxX: number; minY: number; maxY: number }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/core",
   "module": "index.ts",
   "type": "module",
-  "version": "0.0.63",
+  "version": "0.0.65",
   "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.28",
+    "circuit-to-svg": "^0.0.32",
     "debug": "^4.3.6",
     "howfat": "^0.3.8",
     "looks-same": "^9.0.1",
@@ -35,11 +35,11 @@
   },
   "dependencies": {
     "@lume/kiwi": "^0.4.3",
-    "@tscircuit/infgrid-ijump-astar": "^0.0.18",
+    "@tscircuit/infgrid-ijump-astar": "^0.0.20",
     "@tscircuit/math-utils": "^0.0.4",
     "@tscircuit/props": "^0.0.63",
-    "@tscircuit/soup": "^0.0.69",
-    "@tscircuit/soup-util": "^0.0.26",
+    "@tscircuit/soup": "^0.0.71",
+    "@tscircuit/soup-util": "^0.0.27",
     "circuit-json-to-connectivity-map": "^0.0.15",
     "footprinter": "^0.0.44",
     "nanoid": "^5.0.7",