@tscircuit/core 0.0.62 → 0.0.64

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

@@ -2521,23 +2521,31 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
         return { ...t, layers: [candidateLayerSelections[idx]] };
       });
     }
+    ;
+    orderedRoutePoints[0].pcb_port_id = ports[0].pcb_port_id;
+    orderedRoutePoints[orderedRoutePoints.length - 1].pcb_port_id = ports[1].pcb_port_id;
     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 aLayer = "layers" in a && a.layers.length === 1 ? a.layers[0] : dominantLayer ?? "top";
       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 ijump = new MultilayerIjump({
         OBSTACLE_MARGIN: 0.3,
-        isRemovePathLoopsEnabled: true,
+        // isRemovePathLoopsEnabled: true,
+        optimizeWithGoalBoxes: false,
+        // Boolean(pcbPortA && pcbPortB),
+        connMap,
         input: {
           obstacles,
           connections: [
             {
-              name: connMap.getNetConnectedToId(this.source_trace_id),
+              name: this.source_trace_id,
               pointsToConnect: [
-                { ...a, layer: aLayer },
-                { ...b, layer: bLayer }
+                { ...a, layer: aLayer, pcb_port_id: pcbPortA },
+                { ...b, layer: bLayer, pcb_port_id: pcbPortB }
               ]
             }
           ],
@@ -2582,7 +2590,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;
@@ -3437,10 +3445,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;
   }
 };
 
@@ -3516,7 +3523,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

@@ -44,7 +44,13 @@ import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectiv
 
 type PcbRouteObjective =
   | RouteHintPoint
-  | { layers: string[]; x: number; y: number; via?: boolean }
+  | {
+      layers: string[]
+      x: number
+      y: number
+      via?: boolean
+      pcb_port_id?: string
+    }
 
 const portToObjective = (port: Port): PcbRouteObjective => {
   const portPosition = port._getGlobalPcbPositionAfterLayout()
@@ -422,6 +428,9 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
         return { ...t, layers: [candidateLayerSelections[idx]] }
       })
     }
+    ;(orderedRoutePoints[0] as any).pcb_port_id = ports[0].pcb_port_id
+    ;(orderedRoutePoints[orderedRoutePoints.length - 1] as any).pcb_port_id =
+      ports[1].pcb_port_id
 
     const routes: PCBTrace["route"][] = []
     for (const [a, b] of pairs(orderedRoutePoints)) {
@@ -432,23 +441,28 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       const aLayer =
         "layers" in a && a.layers.length === 1
           ? a.layers[0]
-          : dominantLayer ?? "top"
+          : (dominantLayer ?? "top")
       const bLayer =
         "layers" in b && b.layers.length === 1
           ? b.layers[0]
-          : dominantLayer ?? "top"
+          : (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 ijump = new MultilayerIjump({
         OBSTACLE_MARGIN: 0.3,
-        isRemovePathLoopsEnabled: true,
+        // isRemovePathLoopsEnabled: true,
+        optimizeWithGoalBoxes: false, // Boolean(pcbPortA && pcbPortB),
+        connMap,
         input: {
           obstacles,
           connections: [
             {
-              name: connMap.getNetConnectedToId(this.source_trace_id!)!,
+              name: this.source_trace_id!,
               pointsToConnect: [
-                { ...a, layer: aLayer },
-                { ...b, layer: bLayer },
+                { ...a, layer: aLayer, pcb_port_id: pcbPortA! },
+                { ...b, layer: bLayer, pcb_port_id: pcbPortB! },
               ],
             },
           ],
@@ -490,15 +504,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

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/core",
   "module": "index.ts",
   "type": "module",
-  "version": "0.0.62",
+  "version": "0.0.64",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "files": [
@@ -23,10 +23,11 @@
     "@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",
+    "performance-now": "^2.1.0",
     "tsup": "^8.2.4"
   },
   "peerDependencies": {
@@ -34,12 +35,14 @@
   },
   "dependencies": {
     "@lume/kiwi": "^0.4.3",
-    "@tscircuit/infgrid-ijump-astar": "^0.0.17",
+    "@tscircuit/infgrid-ijump-astar": "^0.0.18",
+    "@tscircuit/math-utils": "^0.0.4",
     "@tscircuit/props": "^0.0.63",
-    "@tscircuit/soup": "^0.0.69",
-    "@tscircuit/soup-util": "^0.0.26",
-    "circuit-json-to-connectivity-map": "^0.0.8",
+    "@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",
     "react": "^18.3.1",
     "react-reconciler": "^0.29.2",
     "schematic-symbols": "0.0.17",