@tscircuit/core 0.0.192 → 0.0.194

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import React, { ReactElement } from 'react';
 import * as zod from 'zod';
 import { z, ZodType } from 'zod';
 import { symbols, SchSymbol, BaseSymbolName } from 'schematic-symbols';
-import { PcbTraceError, PcbPlacementError, LayerRef, AnyCircuitElement, AnySourceComponent, RouteHintPoint } from 'circuit-json';
+import { PcbTraceError, PcbPlacementError, LayerRef, AnyCircuitElement, AnySourceComponent, PcbTrace, RouteHintPoint } from 'circuit-json';
 import { Matrix } from 'transformation-matrix';
 import { SoupUtilObjects } from '@tscircuit/soup-util';
 import * as _tscircuit_layout from '@tscircuit/layout';
@@ -860,7 +860,8 @@ interface SimpleRouteJson {
 
 declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps> extends NormalComponent<Props> implements ISubcircuit {
     _asyncAutoroutingResult: {
-        output_simple_route_json: SimpleRouteJson;
+        output_simple_route_json?: SimpleRouteJson;
+        output_pcb_traces?: PcbTrace[];
     } | null;
     get config(): {
         zodProps: Props;
@@ -871,6 +872,8 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     doInitialSourceAddConnectivityMapKey(): void;
     doInitialPcbTraceRender(): void;
     updatePcbTraceRender(): void;
+    _updatePcbTraceRenderFromSimpleRouteJson(): void;
+    _updatePcbTraceRenderFromPcbTraces(): void;
     doInitialSchematicLayout(): void;
     /**
      * Trace-by-trace autorouting is where each trace routes itself in a well-known
@@ -917,6 +920,19 @@ declare class Board extends Group<typeof boardProps> {
             minTraceWidth: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
             partsEngine: z.ZodOptional<z.ZodType<_tscircuit_props.PartsEngine, z.ZodTypeDef, _tscircuit_props.PartsEngine>>;
             pcbRouteCache: z.ZodOptional<z.ZodType<_tscircuit_props.PcbRouteCache, z.ZodTypeDef, _tscircuit_props.PcbRouteCache>>;
+            autorouter: z.ZodOptional<z.ZodUnion<[z.ZodObject<{
+                serverUrl: z.ZodOptional<z.ZodString>;
+                inputFormat: z.ZodOptional<z.ZodEnum<["simplified", "circuit-json"]>>;
+                cache: z.ZodOptional<z.ZodType<_tscircuit_props.PcbRouteCache, z.ZodTypeDef, _tscircuit_props.PcbRouteCache>>;
+            }, "strip", z.ZodTypeAny, {
+                serverUrl?: string | undefined;
+                inputFormat?: "simplified" | "circuit-json" | undefined;
+                cache?: _tscircuit_props.PcbRouteCache | undefined;
+            }, {
+                serverUrl?: string | undefined;
+                inputFormat?: "simplified" | "circuit-json" | undefined;
+                cache?: _tscircuit_props.PcbRouteCache | undefined;
+            }>, z.ZodLiteral<"auto">, z.ZodLiteral<"auto-local">, z.ZodLiteral<"auto-cloud">]>>;
         }>, {
             width: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
             height: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
@@ -949,6 +965,11 @@ declare class Board extends Group<typeof boardProps> {
             defaultTraceWidth?: number | undefined;
             minTraceWidth?: number | undefined;
             pcbRouteCache?: _tscircuit_props.PcbRouteCache | undefined;
+            autorouter?: "auto" | "auto-local" | "auto-cloud" | {
+                serverUrl?: string | undefined;
+                inputFormat?: "simplified" | "circuit-json" | undefined;
+                cache?: _tscircuit_props.PcbRouteCache | undefined;
+            } | undefined;
             schAutoLayoutEnabled?: boolean | undefined;
             partsEngine?: _tscircuit_props.PartsEngine | undefined;
             outline?: {
@@ -976,6 +997,11 @@ declare class Board extends Group<typeof boardProps> {
             defaultTraceWidth?: string | number | undefined;
             minTraceWidth?: string | number | undefined;
             pcbRouteCache?: _tscircuit_props.PcbRouteCache | undefined;
+            autorouter?: "auto" | "auto-local" | "auto-cloud" | {
+                serverUrl?: string | undefined;
+                inputFormat?: "simplified" | "circuit-json" | undefined;
+                cache?: _tscircuit_props.PcbRouteCache | undefined;
+            } | undefined;
             schAutoLayoutEnabled?: boolean | undefined;
             partsEngine?: _tscircuit_props.PartsEngine | undefined;
             outline?: {

package/dist/index.js

@@ -131,10 +131,7 @@ var Renderable = class {
         });
       }
     }).catch((error) => {
-      console.error(
-        `Async effect error in ${this._currentRenderPhase}:`,
-        error
-      );
+      console.error(`Async effect error in ${asyncEffect.phase}:`, error);
       asyncEffect.complete = true;
       if ("root" in this && this.root) {
         ;
@@ -3221,8 +3218,63 @@ var TraceHint = class extends PrimitiveComponent {
 
 // lib/components/primitive-components/Group/Group.ts
 import * as SAL from "@tscircuit/schematic-autolayout";
-import { getObstaclesFromSoup } from "@tscircuit/infgrid-ijump-astar";
+import "@tscircuit/infgrid-ijump-astar";
 import { ConnectivityMap } from "circuit-json-to-connectivity-map";
+
+// lib/utils/autorouting/getSimpleRouteJsonFromTracesAndDb.ts
+import { getObstaclesFromSoup } from "@tscircuit/infgrid-ijump-astar";
+var getSimpleRouteJsonFromTracesAndDb = ({
+  db,
+  traces,
+  minTraceWidth = 0.1
+}) => {
+  const obstacles = getObstaclesFromSoup([
+    ...db.pcb_component.list(),
+    ...db.pcb_smtpad.list(),
+    ...db.pcb_plated_hole.list()
+  ]);
+  const allPoints = obstacles.flatMap((o) => [
+    {
+      x: o.center.x - o.width / 2,
+      y: o.center.y - o.height / 2
+    },
+    {
+      x: o.center.x + o.width / 2,
+      y: o.center.y + o.height / 2
+    }
+  ]);
+  const bounds = {
+    minX: Math.min(...allPoints.map((p) => p.x)) - 1,
+    maxX: Math.max(...allPoints.map((p) => p.x)) + 1,
+    minY: Math.min(...allPoints.map((p) => p.y)) - 1,
+    maxY: Math.max(...allPoints.map((p) => p.y)) + 1
+  };
+  const connections = traces.map((trace) => {
+    const connectedPorts = trace._findConnectedPorts();
+    if (!connectedPorts.allPortsFound || connectedPorts.ports.length < 2)
+      return null;
+    return {
+      name: trace.source_trace_id ?? "",
+      pointsToConnect: connectedPorts.ports.map((port) => {
+        const pos = port._getGlobalPcbPositionBeforeLayout();
+        return {
+          x: pos.x,
+          y: pos.y,
+          layer: port.getAvailablePcbLayers()[0] ?? "top"
+        };
+      })
+    };
+  }).filter((c) => c !== null);
+  return {
+    bounds,
+    obstacles: [],
+    connections,
+    layerCount: 2,
+    minTraceWidth
+  };
+};
+
+// lib/components/primitive-components/Group/Group.ts
 var Group = class extends NormalComponent {
   _asyncAutoroutingResult = null;
   get config() {
@@ -3250,50 +3302,11 @@ var Group = class extends NormalComponent {
   _getSimpleRouteJsonFromPcbTraces() {
     const traces = this.selectAll("trace");
     const { db } = this.root;
-    const obstacles = getObstaclesFromSoup([
-      ...db.pcb_component.list(),
-      ...db.pcb_smtpad.list(),
-      ...db.pcb_plated_hole.list()
-    ]);
-    const allPoints = obstacles.flatMap((o) => [
-      {
-        x: o.center.x - o.width / 2,
-        y: o.center.y - o.height / 2
-      },
-      {
-        x: o.center.x + o.width / 2,
-        y: o.center.y + o.height / 2
-      }
-    ]);
-    const bounds = {
-      minX: Math.min(...allPoints.map((p) => p.x)) - 1,
-      maxX: Math.max(...allPoints.map((p) => p.x)) + 1,
-      minY: Math.min(...allPoints.map((p) => p.y)) - 1,
-      maxY: Math.max(...allPoints.map((p) => p.y)) + 1
-    };
-    const connections = traces.map((trace) => {
-      const connectedPorts = trace._findConnectedPorts();
-      if (!connectedPorts.allPortsFound || connectedPorts.ports.length < 2)
-        return null;
-      return {
-        name: trace.source_trace_id ?? "",
-        pointsToConnect: connectedPorts.ports.map((port) => {
-          const pos = port._getGlobalPcbPositionBeforeLayout();
-          return {
-            x: pos.x,
-            y: pos.y,
-            layer: port.getAvailablePcbLayers()[0] ?? "top"
-          };
-        })
-      };
-    }).filter((c) => c !== null);
-    return {
-      bounds,
-      obstacles: [],
-      connections,
-      layerCount: 2,
+    return getSimpleRouteJsonFromTracesAndDb({
+      db,
+      traces,
       minTraceWidth: this._parsedProps.minTraceWidth ?? 0.1
-    };
+    });
   }
   doInitialSourceAddConnectivityMapKey() {
     if (!this.isSubcircuit) return;
@@ -3326,18 +3339,38 @@ var Group = class extends NormalComponent {
   }
   doInitialPcbTraceRender() {
     if (this._shouldUseTraceByTraceRouting()) return;
-    if (this.props.autorouter?.serverUrl) {
+    let serverUrl = this.props.autorouter?.serverUrl;
+    if (this.props.autorouter === "auto-cloud") {
+      serverUrl = "https://registry-api.tscircuit.com/autorouting/solve";
+    }
+    if (serverUrl) {
       this._queueAsyncEffect(async () => {
-        const { autorouting_result } = await fetch(
-          this.props.autorouter.serverUrl,
-          {
+        if (this.props.autorouter?.inputFormat === "simplified") {
+          const { autorouting_result: autorouting_result2 } = await fetch(serverUrl, {
             method: "POST",
             body: JSON.stringify({
               input_simple_route_json: this._getSimpleRouteJsonFromPcbTraces()
-            })
+            }),
+            headers: {
+              "Content-Type": "application/json"
+            }
+          }).then((r) => r.json());
+          this._asyncAutoroutingResult = autorouting_result2;
+          this._markDirty("PcbTraceRender");
+        }
+        const arRes = await fetch(serverUrl, {
+          method: "POST",
+          body: JSON.stringify({
+            // TODO filter such that we're only using this subcircuit's
+            // components
+            input_circuit_json: this.root.db.toArray()
+          }),
+          headers: {
+            "Content-Type": "application/json"
           }
-        ).then((r) => r.json());
-        const { output_simple_route_json } = autorouting_result;
+        });
+        const resultText = await arRes.text();
+        const { autorouting_result } = JSON.parse(resultText);
         this._asyncAutoroutingResult = autorouting_result;
         this._markDirty("PcbTraceRender");
       });
@@ -3346,6 +3379,17 @@ var Group = class extends NormalComponent {
   updatePcbTraceRender() {
     if (!this._asyncAutoroutingResult) return;
     if (this._shouldUseTraceByTraceRouting()) return;
+    const { db } = this.root;
+    if (this._asyncAutoroutingResult.output_simple_route_json) {
+      this._updatePcbTraceRenderFromSimpleRouteJson();
+      return;
+    }
+    if (this._asyncAutoroutingResult.output_pcb_traces) {
+      this._updatePcbTraceRenderFromPcbTraces();
+      return;
+    }
+  }
+  _updatePcbTraceRenderFromSimpleRouteJson() {
     const { db } = this.root;
     const { traces: routedTraces } = this._asyncAutoroutingResult.output_simple_route_json;
     if (!routedTraces) return;
@@ -3357,6 +3401,14 @@ var Group = class extends NormalComponent {
       });
     }
   }
+  _updatePcbTraceRenderFromPcbTraces() {
+    const { output_pcb_traces } = this._asyncAutoroutingResult;
+    if (!output_pcb_traces) return;
+    const { db } = this.root;
+    for (const pcb_trace of output_pcb_traces) {
+      db.pcb_trace.insert(pcb_trace);
+    }
+  }
   doInitialSchematicLayout() {
     if (!this.isSubcircuit) return;
     const props = this._parsedProps;
@@ -3461,7 +3513,7 @@ var FTYPE = stringProxy;
 // lib/components/primitive-components/Trace/Trace.ts
 import {
   MultilayerIjump,
-  getObstaclesFromSoup as getObstaclesFromSoup2
+  getObstaclesFromSoup as getObstaclesFromSoup3
 } from "@tscircuit/infgrid-ijump-astar";
 import { traceProps } from "@tscircuit/props";
 import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map";
@@ -4186,7 +4238,7 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
       this.root.db.toArray()
     );
     const [obstacles, errGettingObstacles] = tryNow(
-      () => getObstaclesFromSoup2(this.root.db.toArray())
+      () => getObstaclesFromSoup3(this.root.db.toArray())
       // Remove as any when autorouting-dataset gets updated
     );
     if (errGettingObstacles) {
@@ -4380,6 +4432,16 @@ searched component ${targetComponent.getString()}, which has ports: ${targetComp
           connectedTo: []
         });
       }
+      if (elm.type === "schematic_box") {
+        obstacles.push({
+          type: "rect",
+          layers: ["top"],
+          center: { x: elm.x, y: elm.y },
+          width: elm.width,
+          height: elm.width,
+          connectedTo: []
+        });
+      }
     }
     const portsWithPosition = connectedPorts.map(({ port }) => ({
       port,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.192",
+  "version": "0.0.194",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -40,7 +40,7 @@
     "@tscircuit/footprinter": "^0.0.77",
     "@tscircuit/infgrid-ijump-astar": "^0.0.24",
     "@tscircuit/math-utils": "^0.0.5",
-    "@tscircuit/props": "^0.0.101",
+    "@tscircuit/props": "^0.0.102",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/soup-util": "^0.0.40",
     "circuit-json": "^0.0.104",