@tscircuit/core 0.0.58 → 0.0.60

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";
             }>>;
-        }, "layer" | "pcbRotation">, {
+        }, "pcbRotation" | "layer">, {
             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";
             }>>;
-        }, "layer" | "pcbRotation">, {
+        }, "pcbRotation" | "layer">, {
             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

@@ -1693,6 +1693,13 @@ var NormalComponent = class extends PrimitiveComponent {
     if (!footprint) return;
     if (typeof footprint === "string") {
       const fpSoup = fp.string(footprint).soup();
+      if (this.props.layer) {
+        for (const elm of fpSoup) {
+          if ("layer" in elm) {
+            elm.layer = this.props.layer;
+          }
+        }
+      }
       const fpComponents = createComponentsFromSoup(fpSoup);
       this.addAll(fpComponents);
     }
@@ -2250,6 +2257,7 @@ var portToObjective = (port) => {
     layers: port.getAvailablePcbLayers()
   };
 };
+var SHOULD_USE_SINGLE_LAYER_ROUTING = false;
 var Trace = class extends PrimitiveComponent {
   source_trace_id = null;
   pcb_trace_id = null;
@@ -2464,7 +2472,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
     const candidateLayerCombinations = findPossibleTraceLayerCombinations(
       orderedRouteObjectives
     );
-    if (candidateLayerCombinations.length === 0) {
+    if (SHOULD_USE_SINGLE_LAYER_ROUTING && candidateLayerCombinations.length === 0) {
       this.renderError(
         `Could not find a common layer (using hints) for trace ${this.getString()}`
       );
@@ -2498,32 +2506,38 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
         }
       }
     }
-    const candidateLayerSelections = candidateLayerCombinations[0].layer_path;
-    const orderedRoutePoints = orderedRouteObjectives.map((t, idx) => {
-      if (t.via) {
-        return {
-          ...t,
-          via_to_layer: candidateLayerSelections[idx]
-        };
-      }
-      return { ...t, layers: [candidateLayerSelections[idx]] };
-    });
+    let orderedRoutePoints = [];
+    if (candidateLayerCombinations.length === 0) {
+      orderedRoutePoints = orderedRouteObjectives;
+    } else {
+      const candidateLayerSelections = candidateLayerCombinations[0].layer_path;
+      orderedRoutePoints = orderedRouteObjectives.map((t, idx) => {
+        if (t.via) {
+          return {
+            ...t,
+            via_to_layer: candidateLayerSelections[idx]
+          };
+        }
+        return { ...t, layers: [candidateLayerSelections[idx]] };
+      });
+    }
     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 ijump = new MultilayerIjump({
         OBSTACLE_MARGIN: 0.3,
         isRemovePathLoopsEnabled: true,
-        layerCount: 2,
         input: {
           obstacles,
           connections: [
             {
               name: connMap.getNetConnectedToId(this.source_trace_id),
               pointsToConnect: [
-                { ...a, layer: dominantLayer ?? "top" },
-                { ...b, layer: dominantLayer ?? "top" }
+                { ...a, layer: aLayer },
+                { ...b, layer: bLayer }
               ]
             }
           ],
@@ -2577,36 +2591,21 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       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
-        ];
+    for (const point of mergedRoute) {
+      if (point.route_type === "via") {
+        db.pcb_via.insert({
+          x: point.x,
+          y: point.y,
+          hole_diameter: 0.3,
+          outer_diameter: 0.6,
+          layers: [point.from_layer, point.to_layer],
+          from_layer: point.from_layer,
+          to_layer: point.to_layer
+        });
       }
-      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: routeWithVias,
+      route: mergedRoute,
       source_trace_id: this.source_trace_id
     });
     this._portsRoutedOnPcb = ports;

package/lib/components/base-components/NormalComponent.ts

@@ -119,6 +119,14 @@ export class NormalComponent<
     if (!footprint) return
     if (typeof footprint === "string") {
       const fpSoup = fp.string(footprint).soup()
+      // Adjust the layer of the footprint to match the layer of the component
+      if (this.props.layer) {
+        for (const elm of fpSoup) {
+          if ("layer" in elm) {
+            elm.layer = this.props.layer
+          }
+        }
+      }
       const fpComponents = createComponentsFromSoup(fpSoup)
       this.addAll(fpComponents)
     }

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

@@ -54,6 +54,8 @@ const portToObjective = (port: Port): PcbRouteObjective => {
   }
 }
 
+const SHOULD_USE_SINGLE_LAYER_ROUTING = false
+
 export class Trace extends PrimitiveComponent<typeof traceProps> {
   source_trace_id: string | null = null
   pcb_trace_id: string | null = null
@@ -355,7 +357,10 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       orderedRouteObjectives,
     )
 
-    if (candidateLayerCombinations.length === 0) {
+    if (
+      SHOULD_USE_SINGLE_LAYER_ROUTING &&
+      candidateLayerCombinations.length === 0
+    ) {
       this.renderError(
         `Could not find a common layer (using hints) for trace ${this.getString()}`,
       )
@@ -396,22 +401,27 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       }
     }
 
-    // TODO explore all candidate layer combinations if one fails
-    const candidateLayerSelections = candidateLayerCombinations[0].layer_path
-
-    /**
-     * Apply the candidate layer selections to the route objectives, now we
-     * have a set of points that have definite layers
-     */
-    const orderedRoutePoints = orderedRouteObjectives.map((t, idx) => {
-      if (t.via) {
-        return {
-          ...t,
-          via_to_layer: candidateLayerSelections[idx],
+    let orderedRoutePoints: PcbRouteObjective[] = []
+    if (candidateLayerCombinations.length === 0) {
+      orderedRoutePoints = orderedRouteObjectives
+    } else {
+      // TODO explore all candidate layer combinations if one fails
+      const candidateLayerSelections = candidateLayerCombinations[0].layer_path
+
+      /**
+       * Apply the candidate layer selections to the route objectives, now we
+       * have a set of points that have definite layers
+       */
+      orderedRoutePoints = orderedRouteObjectives.map((t, idx) => {
+        if (t.via) {
+          return {
+            ...t,
+            via_to_layer: candidateLayerSelections[idx],
+          }
         }
-      }
-      return { ...t, layers: [candidateLayerSelections[idx]] }
-    })
+        return { ...t, layers: [candidateLayerSelections[idx]] }
+      })
+    }
 
     const routes: PCBTrace["route"][] = []
     for (const [a, b] of pairs(orderedRoutePoints)) {
@@ -419,18 +429,26 @@ 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 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 ijump = new MultilayerIjump({
         OBSTACLE_MARGIN: 0.3,
         isRemovePathLoopsEnabled: true,
-        layerCount: 2,
         input: {
           obstacles,
           connections: [
             {
               name: connMap.getNetConnectedToId(this.source_trace_id!)!,
               pointsToConnect: [
-                { ...a, layer: dominantLayer ?? "top" },
-                { ...b, layer: dominantLayer ?? "top" },
+                { ...a, layer: aLayer },
+                { ...b, layer: bLayer },
               ],
             },
           ],
@@ -491,43 +509,22 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
 
     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,
-        ]
+    for (const point of mergedRoute) {
+      if (point.route_type === "via") {
+        db.pcb_via.insert({
+          x: point.x,
+          y: point.y,
+          hole_diameter: 0.3,
+          outer_diameter: 0.6,
+          layers: [point.from_layer as LayerRef, point.to_layer as LayerRef],
+          from_layer: point.from_layer as LayerRef,
+          to_layer: point.to_layer as LayerRef,
+        })
       }
-      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: routeWithVias,
+      route: mergedRoute,
       source_trace_id: this.source_trace_id!,
     })
     this._portsRoutedOnPcb = ports

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/core",
   "module": "index.ts",
   "type": "module",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "files": [
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@lume/kiwi": "^0.4.3",
-    "@tscircuit/infgrid-ijump-astar": "^0.0.15",
+    "@tscircuit/infgrid-ijump-astar": "^0.0.16",
     "@tscircuit/props": "^0.0.62",
     "@tscircuit/soup": "^0.0.67",
     "@tscircuit/soup-util": "^0.0.23",