@tscircuit/core 0.0.49 → 0.0.51

package/dist/index.d.ts

@@ -78,7 +78,7 @@ declare abstract class Renderable implements IRenderable {
      */
     runRenderPhase(phase: RenderPhase): void;
     runRenderPhaseForChildren(phase: RenderPhase): void;
-    renderError(message: string | PCBTraceError | PCBPlacementError): void;
+    renderError(message: string | Omit<PCBTraceError, "pcb_error_id"> | Omit<PCBPlacementError, "pcb_error_id">): void;
 }
 
 interface BaseComponentConfig {
@@ -229,6 +229,7 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
     }): PrimitiveComponent | null;
     getAvailablePcbLayers(): string[];
     getDescendants(): PrimitiveComponent[];
+    renderError(message: Parameters<typeof Renderable.prototype.renderError>[0]): void;
     getString(): string;
     get [Symbol.toStringTag](): string;
 }

package/dist/index.js

@@ -125,6 +125,7 @@ var Renderable = class {
     if (typeof message === "string") {
       throw new Error(message);
     }
+    throw new Error(JSON.stringify(message, null, 2));
   }
 };
 
@@ -487,6 +488,15 @@ var PrimitiveComponent = class extends Renderable {
     }
     return descendants;
   }
+  // TODO we shouldn't need to override this, errors can be rendered and handled
+  // by the Renderable class, however, the Renderable class currently doesn't
+  // have access to the database or cleanup
+  renderError(message) {
+    if (typeof message === "string") {
+      return super.renderError(message);
+    }
+    this.root?.db.pcb_error.insert(message);
+  }
   getString() {
     const { lowercaseComponentName: cname, _parsedProps: props, parent } = this;
     if (parent?.props?.name && props?.name) {
@@ -2469,6 +2479,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 +2488,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,
@@ -2491,16 +2505,23 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       });
       const traces = ijump.solveAndMapToTraces();
       if (traces.length === 0) {
-        this.renderError(
-          `Could not find a route between ${JSON.stringify(a)} and ${JSON.stringify(b)} for ${this}`
-        );
+        this.renderError({
+          type: "pcb_error",
+          error_type: "pcb_trace_error",
+          message: `Could not find a route for ${this}`,
+          source_trace_id: this.source_trace_id,
+          center: { x: (a.x + b.x) / 2, y: (a.y + b.y) / 2 },
+          pcb_port_ids: ports.map((p) => p.pcb_port_id),
+          pcb_trace_id: this.pcb_trace_id,
+          pcb_component_ids: ports.map((p) => p.pcb_component_id)
+        });
         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 +2579,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 +2588,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/base-components/PrimitiveComponent.ts

@@ -442,6 +442,17 @@ export abstract class PrimitiveComponent<
     return descendants
   }
 
+  // TODO we shouldn't need to override this, errors can be rendered and handled
+  // by the Renderable class, however, the Renderable class currently doesn't
+  // have access to the database or cleanup
+  renderError(message: Parameters<typeof Renderable.prototype.renderError>[0]) {
+    if (typeof message === "string") {
+      return super.renderError(message)
+    }
+    // TODO this needs to be cleaned up at some point!
+    this.root?.db.pcb_error.insert(message)
+  }
+
   getString(): string {
     const { lowercaseComponentName: cname, _parsedProps: props, parent } = this
     if (parent?.props?.name && props?.name) {

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

@@ -110,11 +110,17 @@ export abstract class Renderable implements IRenderable {
     }
   }
 
-  renderError(message: string | PCBTraceError | PCBPlacementError) {
+  renderError(
+    message:
+      | string
+      | Omit<PCBTraceError, "pcb_error_id">
+      | Omit<PCBPlacementError, "pcb_error_id">,
+  ) {
     // TODO add to render phase error list and try to add position or
     // relationships etc.
     if (typeof message === "string") {
       throw new Error(message)
     }
+    throw new Error(JSON.stringify(message, null, 2))
   }
 }

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,
@@ -433,9 +439,16 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       })
       const traces = ijump.solveAndMapToTraces()
       if (traces.length === 0) {
-        this.renderError(
-          `Could not find a route between ${JSON.stringify(a)} and ${JSON.stringify(b)} for ${this}`,
-        )
+        this.renderError({
+          type: "pcb_error",
+          error_type: "pcb_trace_error",
+          message: `Could not find a route for ${this}`,
+          source_trace_id: this.source_trace_id!,
+          center: { x: (a.x + b.x) / 2, y: (a.y + b.y) / 2 },
+          pcb_port_ids: ports.map((p) => p.pcb_port_id!),
+          pcb_trace_id: this.pcb_trace_id!,
+          pcb_component_ids: ports.map((p) => p.pcb_component_id!),
+        })
         return
       }
       // TODO ijump returns multiple traces for some reason
@@ -444,10 +457,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 +534,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 +544,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.51",
   "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",