@tscircuit/core 0.0.50 → 0.0.52

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) {
@@ -2213,6 +2223,17 @@ function getClosest(point, candidates) {
 
 // lib/components/primitive-components/Trace.ts
 import "zod";
+
+// lib/utils/try-now.ts
+function tryNow(fn) {
+  try {
+    return [fn(), null];
+  } catch (e) {
+    return [null, e];
+  }
+}
+
+// lib/components/primitive-components/Trace.ts
 var portToObjective = (port) => {
   const portPosition = port._getGlobalPcbPositionAfterLayout();
   return {
@@ -2390,10 +2411,6 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       );
       return;
     }
-    const pcbElements = db.toArray().filter(
-      (elm) => elm.type === "pcb_smtpad" || elm.type === "pcb_trace" || elm.type === "pcb_plated_hole" || elm.type === "pcb_hole" || elm.type === "source_port" || elm.type === "pcb_port" || elm.type === "source_trace" || elm.type === "pcb_keepout"
-    );
-    const source_trace = db.source_trace.get(this.source_trace_id);
     const hints = ports.flatMap(
       (port) => port.matchedComponents.filter((c) => c.componentName === "TraceHint")
     );
@@ -2441,7 +2458,22 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       );
       return;
     }
-    const obstacles = getObstaclesFromSoup(this.root.db.toArray());
+    const [obstacles, err] = tryNow(
+      () => getObstaclesFromSoup(this.root.db.toArray())
+    );
+    if (err) {
+      this.renderError({
+        type: "pcb_error",
+        error_type: "pcb_trace_error",
+        message: `Error getting obstacles for autorouting: ${err.message}`,
+        source_trace_id: this.source_trace_id,
+        center: { x: 0, y: 0 },
+        pcb_port_ids: ports.map((p) => p.pcb_port_id),
+        pcb_trace_id: this.pcb_trace_id,
+        pcb_component_ids: []
+      });
+      return;
+    }
     markObstaclesAsConnected(
       obstacles,
       orderedRouteObjectives,
@@ -2493,11 +2525,33 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
           }
         }
       });
-      const traces = ijump.solveAndMapToTraces();
+      let traces = null;
+      try {
+        traces = ijump.solveAndMapToTraces();
+      } catch (e) {
+        this.renderError({
+          type: "pcb_error",
+          error_type: "pcb_trace_error",
+          message: `error solving route: ${e.message}`,
+          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)
+        });
+      }
+      if (!traces) return;
       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;

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

@@ -19,6 +19,7 @@ import type {
   Obstacle,
   SimpleRouteConnection,
   SimpleRouteJson,
+  SimplifiedPcbTrace,
 } from "lib/utils/autorouting/SimpleRouteJson"
 import { computeObstacleBounds } from "lib/utils/autorouting/computeObstacleBounds"
 import { projectPointInDirection } from "lib/utils/projectPointInDirection"
@@ -37,6 +38,7 @@ import {
   isMatchingPathSelector,
   isMatchingSelector,
 } from "lib/utils/selector-matching"
+import { tryNow } from "lib/utils/try-now"
 
 type PcbRouteObjective =
   | RouteHintPoint
@@ -285,22 +287,6 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
       return
     }
 
-    const pcbElements: AnySoupElement[] = db
-      .toArray()
-      .filter(
-        (elm) =>
-          elm.type === "pcb_smtpad" ||
-          elm.type === "pcb_trace" ||
-          elm.type === "pcb_plated_hole" ||
-          elm.type === "pcb_hole" ||
-          elm.type === "source_port" ||
-          elm.type === "pcb_port" ||
-          elm.type === "source_trace" ||
-          elm.type === "pcb_keepout",
-      )
-
-    const source_trace = db.source_trace.get(this.source_trace_id!)!
-
     const hints = ports.flatMap((port) =>
       port.matchedComponents.filter((c) => c.componentName === "TraceHint"),
     ) as TraceHint[]
@@ -372,7 +358,24 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
 
     // Cache the PCB obstacles, they'll be needed for each segment between
     // ports/hints
-    const obstacles = getObstaclesFromSoup(this.root!.db.toArray())
+    const [obstacles, err] = tryNow(() =>
+      getObstaclesFromSoup(this.root!.db.toArray()),
+    )
+
+    if (err) {
+      this.renderError({
+        type: "pcb_error",
+        error_type: "pcb_trace_error",
+        message: `Error getting obstacles for autorouting: ${err.message}`,
+        source_trace_id: this.source_trace_id!,
+        center: { x: 0, y: 0 },
+        pcb_port_ids: ports.map((p) => p.pcb_port_id!),
+        pcb_trace_id: this.pcb_trace_id!,
+        pcb_component_ids: [],
+      })
+      return
+    }
+
     markObstaclesAsConnected(
       obstacles,
       orderedRouteObjectives,
@@ -437,11 +440,33 @@ export class Trace extends PrimitiveComponent<typeof traceProps> {
           },
         },
       })
-      const traces = ijump.solveAndMapToTraces()
+      let traces: SimplifiedPcbTrace[] | null = null
+      try {
+        traces = ijump.solveAndMapToTraces()
+      } catch (e: any) {
+        this.renderError({
+          type: "pcb_error",
+          error_type: "pcb_trace_error",
+          message: `error solving route: ${e.message}`,
+          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!),
+        })
+      }
+      if (!traces) return
       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

package/lib/utils/try-now.ts

@@ -0,0 +1,7 @@
+export function tryNow<T>(fn: () => T): [T, null] | [null, Error] {
+  try {
+    return [fn(), null]
+  } catch (e: any) {
+    return [null, e]
+  }
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/core",
   "module": "index.ts",
   "type": "module",
-  "version": "0.0.50",
+  "version": "0.0.52",
   "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.10",
+    "@tscircuit/infgrid-ijump-astar": "^0.0.11",
     "@tscircuit/props": "^0.0.62",
     "@tscircuit/soup": "^0.0.67",
     "@tscircuit/soup-util": "^0.0.23",