@tscircuit/core 0.0.307 → 0.0.308

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _tscircuit_props from '@tscircuit/props';
-import { subcircuitGroupProps, traceProps, SupplierPartNumbers, SchematicPortArrangement, groupProps, boardProps, capacitorProps, chipProps, diodeProps, jumperProps, ledProps, powerSourceProps, resistorProps, constraintProps, fabricationNotePathProps, fabricationNoteTextProps, footprintProps, subcircuitProps, holeProps, pcbKeepoutProps, netAliasProps, platedHoleProps, silkscreenCircleProps, silkscreenPathProps, silkscreenRectProps, silkscreenTextProps, silkscreenLineProps, smtPadProps, traceHintProps, viaProps, batteryProps, pinHeaderProps, resonatorProps, inductorProps, potentiometerProps, pushButtonProps, crystalProps, transistorProps, mosfetProps, CapacitorProps, ChipProps, ResistorProps, ManualEditEvent, manual_edits_file } from '@tscircuit/props';
+import { subcircuitGroupProps, traceProps, SupplierPartNumbers, SchematicPortArrangement, groupProps, AutorouterConfig, boardProps, capacitorProps, chipProps, diodeProps, jumperProps, ledProps, powerSourceProps, resistorProps, constraintProps, fabricationNotePathProps, fabricationNoteTextProps, footprintProps, subcircuitProps, holeProps, pcbKeepoutProps, netAliasProps, platedHoleProps, silkscreenCircleProps, silkscreenPathProps, silkscreenRectProps, silkscreenTextProps, silkscreenLineProps, smtPadProps, traceHintProps, viaProps, batteryProps, pinHeaderProps, resonatorProps, inductorProps, potentiometerProps, pushButtonProps, crystalProps, transistorProps, mosfetProps, CapacitorProps, ChipProps, ResistorProps, ManualEditEvent, manual_edits_file } from '@tscircuit/props';
 import React, { ReactElement } from 'react';
 export { createElement } from 'react';
 import * as zod from 'zod';
@@ -965,6 +965,7 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     doInitialSourceAddConnectivityMapKey(): void;
     _areChildSubcircuitsRouted(): boolean;
     _shouldRouteAsync(): boolean;
+    _hasTracesToRoute(): boolean;
     _runEffectMakeHttpAutoroutingRequest(): Promise<void>;
     _startAsyncAutorouting(): void;
     doInitialPcbTraceRender(): void;
@@ -972,6 +973,7 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
     _updatePcbTraceRenderFromSimpleRouteJson(): void;
     _updatePcbTraceRenderFromPcbTraces(): void;
     doInitialSchematicLayout(): void;
+    _getAutorouterConfig(): AutorouterConfig;
     /**
      * Trace-by-trace autorouting is where each trace routes itself in a well-known
      * order. It's the most deterministic way to autoroute, because a new trace
@@ -1190,18 +1192,24 @@ declare class Board extends Group<typeof boardProps> {
                 serverMode: z.ZodOptional<z.ZodEnum<["job", "solve-endpoint"]>>;
                 serverCacheEnabled: z.ZodOptional<z.ZodBoolean>;
                 cache: z.ZodOptional<z.ZodType<_tscircuit_props.PcbRouteCache, z.ZodTypeDef, _tscircuit_props.PcbRouteCache>>;
+                groupMode: z.ZodOptional<z.ZodEnum<["sequential-trace", "subcircuit"]>>;
+                local: z.ZodOptional<z.ZodBoolean>;
             }, "strip", z.ZodTypeAny, {
                 serverUrl?: string | undefined;
                 inputFormat?: "simplified" | "circuit-json" | undefined;
                 serverMode?: "job" | "solve-endpoint" | undefined;
                 serverCacheEnabled?: boolean | undefined;
                 cache?: _tscircuit_props.PcbRouteCache | undefined;
+                groupMode?: "sequential-trace" | "subcircuit" | undefined;
+                local?: boolean | undefined;
             }, {
                 serverUrl?: string | undefined;
                 inputFormat?: "simplified" | "circuit-json" | undefined;
                 serverMode?: "job" | "solve-endpoint" | undefined;
                 serverCacheEnabled?: boolean | undefined;
                 cache?: _tscircuit_props.PcbRouteCache | undefined;
+                groupMode?: "sequential-trace" | "subcircuit" | undefined;
+                local?: boolean | undefined;
             }>, z.ZodLiteral<"sequential-trace">, z.ZodLiteral<"subcircuit">, 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>>;
@@ -1269,6 +1277,8 @@ declare class Board extends Group<typeof boardProps> {
                 serverMode?: "job" | "solve-endpoint" | undefined;
                 serverCacheEnabled?: boolean | undefined;
                 cache?: _tscircuit_props.PcbRouteCache | undefined;
+                groupMode?: "sequential-trace" | "subcircuit" | undefined;
+                local?: boolean | undefined;
             } | undefined;
             schAutoLayoutEnabled?: boolean | undefined;
             schTraceAutoLabelEnabled?: boolean | undefined;
@@ -1336,6 +1346,8 @@ declare class Board extends Group<typeof boardProps> {
                 serverMode?: "job" | "solve-endpoint" | undefined;
                 serverCacheEnabled?: boolean | undefined;
                 cache?: _tscircuit_props.PcbRouteCache | undefined;
+                groupMode?: "sequential-trace" | "subcircuit" | undefined;
+                local?: boolean | undefined;
             } | undefined;
             schAutoLayoutEnabled?: boolean | undefined;
             schTraceAutoLabelEnabled?: boolean | undefined;

package/dist/index.js

@@ -3810,25 +3810,23 @@ var Group = class extends NormalComponent {
     return true;
   }
   _shouldRouteAsync() {
-    const props = this._parsedProps;
-    if (props.autorouter === "auto-local") return true;
-    if (props.autorouter === "auto-cloud") return true;
-    if (props.autorouter === "sequential-trace") return false;
-    if (typeof props.autorouter === "object") return true;
-    return false;
+    const autorouter = this._getAutorouterConfig();
+    if (autorouter.local) return false;
+    if (autorouter.groupMode === "sequential-trace") return false;
+    return true;
+  }
+  _hasTracesToRoute() {
+    const debug4 = Debug5("tscircuit:core:_hasTracesToRoute");
+    const traces = this.selectAll("trace");
+    debug4(`[${this.getString()}] has ${traces.length} traces to route`);
+    return traces.length > 0;
   }
   async _runEffectMakeHttpAutoroutingRequest() {
     const debug4 = Debug5("tscircuit:core:_runEffectMakeHttpAutoroutingRequest");
     const props = this._parsedProps;
-    const autorouterPropObj = typeof props.autorouter === "object" ? props.autorouter : {};
-    const autoroutingOptions = {
-      ...autorouterPropObj,
-      serverUrl: autorouterPropObj.serverUrl ?? "https://registry-api.tscircuit.com",
-      serverMode: autorouterPropObj.serverMode ?? "job",
-      serverCacheEnabled: autorouterPropObj.serverCacheEnabled ?? false
-    };
-    const serverUrl = autoroutingOptions.serverUrl;
-    const serverMode = autoroutingOptions.serverMode;
+    const autorouterConfig = this._getAutorouterConfig();
+    const serverUrl = autorouterConfig.serverUrl;
+    const serverMode = autorouterConfig.serverMode;
     const fetchWithDebug = (url, options) => {
       debug4("fetching", url);
       return fetch(url, options);
@@ -3880,7 +3878,7 @@ var Group = class extends NormalComponent {
           autostart: true,
           display_name: this.root?.name,
           subcircuit_id: this.subcircuit_id,
-          server_cache_enabled: autoroutingOptions.serverCacheEnabled
+          server_cache_enabled: autorouterConfig.serverCacheEnabled
         }),
         headers: { "Content-Type": "application/json" }
       }
@@ -3928,6 +3926,7 @@ var Group = class extends NormalComponent {
   }
   doInitialPcbTraceRender() {
     const debug4 = Debug5("tscircuit:core:doInitialPcbTraceRender");
+    if (!this.isSubcircuit) return;
     if (this.root?.pcbDisabled) return;
     if (this._shouldUseTraceByTraceRouting()) return;
     if (!this._areChildSubcircuitsRouted()) {
@@ -3939,11 +3938,13 @@ var Group = class extends NormalComponent {
     debug4(
       `[${this.getString()}] no child subcircuits to wait for, initiating async routing`
     );
+    if (!this._hasTracesToRoute()) return;
     this._startAsyncAutorouting();
   }
   updatePcbTraceRender() {
     const debug4 = Debug5("tscircuit:core:updatePcbTraceRender");
-    if (this._shouldRouteAsync() && !this._hasStartedAsyncAutorouting) {
+    if (!this.isSubcircuit) return;
+    if (this._shouldRouteAsync() && this._hasTracesToRoute() && !this._hasStartedAsyncAutorouting) {
       if (this._areChildSubcircuitsRouted()) {
         debug4(
           `[${this.getString()}] child subcircuits are now routed, starting async autorouting`
@@ -4010,6 +4011,34 @@ var Group = class extends NormalComponent {
     const laidOutScene = SAL.ascendingCentralLrBug1(scene);
     SAL.mutateSoupForScene(db.toArray(), laidOutScene);
   }
+  _getAutorouterConfig() {
+    const defaults = {
+      serverUrl: "https://registry-api.tscircuit.com",
+      serverMode: "job",
+      serverCacheEnabled: false
+    };
+    const autorouter = this._parsedProps.autorouter ?? this.getInheritedProperty("autorouter");
+    if (typeof autorouter === "object") {
+      return {
+        local: !(autorouter.serverUrl || autorouter.serverMode || autorouter.serverCacheEnabled),
+        ...defaults,
+        ...autorouter
+      };
+    }
+    if (autorouter === "auto-local")
+      return {
+        local: true
+      };
+    if (autorouter === "sequential-trace")
+      return {
+        local: true,
+        groupMode: "sequential-trace"
+      };
+    return {
+      local: true,
+      groupMode: "sequential-trace"
+    };
+  }
   /**
    * Trace-by-trace autorouting is where each trace routes itself in a well-known
    * order. It's the most deterministic way to autoroute, because a new trace
@@ -4019,11 +4048,8 @@ var Group = class extends NormalComponent {
    * or if using a "fullview" or "rip and replace" autorouting mode
    */
   _shouldUseTraceByTraceRouting() {
-    const autorouter = this._parsedProps.autorouter ?? this.getInheritedProperty("autorouter");
-    if (autorouter === "auto-local") return true;
-    if (autorouter === "sequential-trace") return true;
-    if (autorouter) return false;
-    return true;
+    const autorouter = this._getAutorouterConfig();
+    return autorouter.groupMode === "sequential-trace";
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.307",
+  "version": "0.0.308",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -54,7 +54,7 @@
     "@tscircuit/footprinter": "^0.0.97",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",
     "@tscircuit/math-utils": "^0.0.9",
-    "@tscircuit/props": "^0.0.142",
+    "@tscircuit/props": "^0.0.144",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/soup-util": "^0.0.41",
     "circuit-json": "^0.0.136",