@tscircuit/core 0.0.276 → 0.0.278

package/dist/index.d.ts

@@ -45,8 +45,9 @@ declare abstract class Renderable implements IRenderable {
     _renderId: string;
     _currentRenderPhase: RenderPhase | null;
     private _asyncEffects;
+    parent: Renderable | null;
     constructor(props: any);
-    protected _markDirty(phase: RenderPhase): void;
+    _markDirty(phase: RenderPhase): void;
     protected _queueAsyncEffect(effectName: string, effect: () => Promise<void>): void;
     protected _emitRenderLifecycleEvent(phase: RenderPhase, startOrEnd: "start" | "end"): void;
     getString(): string;
@@ -928,6 +929,7 @@ interface SimpleRouteJson {
 declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps> extends NormalComponent<Props> implements ISubcircuit {
     pcb_group_id: string | null;
     subcircuit_id: string | null;
+    _hasStartedAsyncAutorouting: boolean;
     _asyncAutoroutingResult: {
         output_simple_route_json?: SimpleRouteJson;
         output_pcb_traces?: PcbTrace[];
@@ -937,10 +939,15 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
         componentName: string;
     };
     doInitialSourceRender(): void;
+    doInitialSourceParentAttachment(): void;
     doInitialPcbComponentRender(): void;
     doInitialCreateTraceHintsFromProps(): void;
     _getSimpleRouteJsonFromPcbTraces(): SimpleRouteJson;
     doInitialSourceAddConnectivityMapKey(): void;
+    _areChildSubcircuitsRouted(): boolean;
+    _shouldRouteAsync(): boolean;
+    _runEffectMakeHttpAutoroutingRequest(): Promise<void>;
+    _startAsyncAutorouting(): void;
     doInitialPcbTraceRender(): void;
     updatePcbTraceRender(): void;
     _updatePcbTraceRenderFromSimpleRouteJson(): void;

package/dist/index.js

@@ -105,6 +105,7 @@ var Renderable = class {
   _renderId;
   _currentRenderPhase = null;
   _asyncEffects = [];
+  parent = null;
   constructor(props) {
     this._renderId = `${globalRenderCounter++}`;
     this.children = [];
@@ -122,6 +123,9 @@ var Renderable = class {
     for (let i = phaseIndex + 1; i < orderedRenderPhases.length; i++) {
       this.renderPhaseStates[orderedRenderPhases[i]].dirty = true;
     }
+    if (this.parent?._markDirty) {
+      this.parent._markDirty(phase);
+    }
   }
   _queueAsyncEffect(effectName, effect) {
     const asyncEffect = {
@@ -3133,6 +3137,7 @@ var NormalComponent = class extends PrimitiveComponent {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
+    const subcircuit = this.getSubcircuit();
     const pcb_component = db.pcb_component.insert({
       center: this._getGlobalPcbPositionBeforeLayout(),
       // width/height are computed in the PcbComponentSizeCalculation phase
@@ -3140,7 +3145,8 @@ var NormalComponent = class extends PrimitiveComponent {
       height: 0,
       layer: props.layer ?? "top",
       rotation: props.pcbRotation ?? 0,
-      source_component_id: this.source_component_id
+      source_component_id: this.source_component_id,
+      subcircuit_id: subcircuit.subcircuit_id ?? void 0
     });
     if (!props.footprint && !this.isGroup) {
       const footprint_error = db.pcb_missing_footprint_error.insert({
@@ -3620,6 +3626,7 @@ var TraceHint = class extends PrimitiveComponent {
 var Group = class extends NormalComponent {
   pcb_group_id = null;
   subcircuit_id = null;
+  _hasStartedAsyncAutorouting = false;
   _asyncAutoroutingResult = null;
   get config() {
     return {
@@ -3639,6 +3646,15 @@ var Group = class extends NormalComponent {
       subcircuit_id: this.subcircuit_id
     });
   }
+  doInitialSourceParentAttachment() {
+    const { db } = this.root;
+    if (!this.isSubcircuit) return;
+    const parent_subcircuit_id = this.parent?.getSubcircuit?.()?.subcircuit_id;
+    if (!parent_subcircuit_id) return;
+    db.source_group.update(this.source_group_id, {
+      parent_subcircuit_id
+    });
+  }
   doInitialPcbComponentRender() {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
@@ -3709,63 +3725,98 @@ var Group = class extends NormalComponent {
       });
     }
   }
-  doInitialPcbTraceRender() {
-    if (this.root?.pcbDisabled) return;
-    if (this._shouldUseTraceByTraceRouting()) return;
-    const serverUrl = this.props.autorouter?.serverUrl ?? "https://registry-api.tscircuit.com";
-    const serverMode = this.props.autorouter?.serverMode ?? "job";
-    const debug4 = Debug5("tscircuit:core:autorouting");
+  _areChildSubcircuitsRouted() {
+    const subcircuitChildren = this.selectAll("group").filter(
+      (g) => g.isSubcircuit
+    );
+    for (const subcircuitChild of subcircuitChildren) {
+      if (subcircuitChild._shouldRouteAsync() && !subcircuitChild._asyncAutoroutingResult) {
+        return false;
+      }
+    }
+    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;
+  }
+  async _runEffectMakeHttpAutoroutingRequest() {
+    const debug4 = Debug5("tscircuit:core:_runEffectMakeHttpAutoroutingRequest");
+    const props = this._parsedProps;
+    const serverUrl = props.autorouter?.serverUrl ?? "https://registry-api.tscircuit.com";
+    const serverMode = props.autorouter?.serverMode ?? "job";
     const fetchWithDebug = (url, options) => {
       debug4("fetching", url);
       return fetch(url, options);
     };
-    this._queueAsyncEffect("make-http-autorouting-request", async () => {
-      if (serverMode === "solve-endpoint") {
-        if (this.props.autorouter?.inputFormat === "simplified") {
-          const { autorouting_result: autorouting_result2 } = await fetchWithDebug(
-            `${serverUrl}/autorouting/solve`,
-            {
-              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");
-          return;
-        }
-        const { autorouting_result } = await fetchWithDebug(
+    const pcbAndSourceCircuitJson = this.root.db.toArray().filter(
+      (element) => {
+        return element.type.startsWith("source_") || element.type.startsWith("pcb_");
+      }
+    );
+    if (serverMode === "solve-endpoint") {
+      if (this.props.autorouter?.inputFormat === "simplified") {
+        const { autorouting_result: autorouting_result2 } = await fetchWithDebug(
           `${serverUrl}/autorouting/solve`,
           {
             method: "POST",
             body: JSON.stringify({
-              input_circuit_json: this.root.db.toArray()
+              input_simple_route_json: this._getSimpleRouteJsonFromPcbTraces()
             }),
             headers: { "Content-Type": "application/json" }
           }
         ).then((r) => r.json());
-        this._asyncAutoroutingResult = autorouting_result;
+        this._asyncAutoroutingResult = autorouting_result2;
         this._markDirty("PcbTraceRender");
         return;
       }
-      const { autorouting_job } = await fetchWithDebug(
-        `${serverUrl}/autorouting/jobs/create`,
+      const { autorouting_result } = await fetchWithDebug(
+        `${serverUrl}/autorouting/solve`,
+        {
+          method: "POST",
+          body: JSON.stringify({
+            input_circuit_json: pcbAndSourceCircuitJson,
+            subcircuit_id: this.subcircuit_id
+          }),
+          headers: { "Content-Type": "application/json" }
+        }
+      ).then((r) => r.json());
+      this._asyncAutoroutingResult = autorouting_result;
+      this._markDirty("PcbTraceRender");
+      return;
+    }
+    const { autorouting_job } = await fetchWithDebug(
+      `${serverUrl}/autorouting/jobs/create`,
+      {
+        method: "POST",
+        body: JSON.stringify({
+          input_circuit_json: pcbAndSourceCircuitJson,
+          provider: "freerouting",
+          autostart: true,
+          display_name: this.root?.name,
+          subcircuit_id: this.subcircuit_id
+        }),
+        headers: { "Content-Type": "application/json" }
+      }
+    ).then((r) => r.json());
+    while (true) {
+      const { autorouting_job: job } = await fetchWithDebug(
+        `${serverUrl}/autorouting/jobs/get`,
         {
           method: "POST",
           body: JSON.stringify({
-            input_circuit_json: this.root.db.toArray(),
-            provider: "freerouting",
-            autostart: true,
-            display_name: this.root?.name
+            autorouting_job_id: autorouting_job.autorouting_job_id
           }),
           headers: { "Content-Type": "application/json" }
         }
       ).then((r) => r.json());
-      while (true) {
-        const { autorouting_job: job } = await fetchWithDebug(
-          `${serverUrl}/autorouting/jobs/get`,
+      if (job.is_finished) {
+        const { autorouting_job_output } = await fetchWithDebug(
+          `${serverUrl}/autorouting/jobs/get_output`,
           {
             method: "POST",
             body: JSON.stringify({
@@ -3774,33 +3825,51 @@ var Group = class extends NormalComponent {
             headers: { "Content-Type": "application/json" }
           }
         ).then((r) => r.json());
-        if (job.is_finished) {
-          const { autorouting_job_output } = await fetchWithDebug(
-            `${serverUrl}/autorouting/jobs/get_output`,
-            {
-              method: "POST",
-              body: JSON.stringify({
-                autorouting_job_id: autorouting_job.autorouting_job_id
-              }),
-              headers: { "Content-Type": "application/json" }
-            }
-          ).then((r) => r.json());
-          this._asyncAutoroutingResult = {
-            output_pcb_traces: autorouting_job_output.output_pcb_traces
-          };
-          this._markDirty("PcbTraceRender");
-          break;
-        }
-        if (job.has_error) {
-          throw new Error(
-            `Autorouting job failed: ${JSON.stringify(job.error)}`
-          );
-        }
-        await new Promise((resolve) => setTimeout(resolve, 100));
+        this._asyncAutoroutingResult = {
+          output_pcb_traces: autorouting_job_output.output_pcb_traces
+        };
+        this._markDirty("PcbTraceRender");
+        break;
       }
-    });
+      if (job.has_error) {
+        throw new Error(`Autorouting job failed: ${JSON.stringify(job.error)}`);
+      }
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+  }
+  _startAsyncAutorouting() {
+    this._hasStartedAsyncAutorouting = true;
+    this._queueAsyncEffect(
+      "make-http-autorouting-request",
+      async () => this._runEffectMakeHttpAutoroutingRequest()
+    );
+  }
+  doInitialPcbTraceRender() {
+    const debug4 = Debug5("tscircuit:core:doInitialPcbTraceRender");
+    if (this.root?.pcbDisabled) return;
+    if (this._shouldUseTraceByTraceRouting()) return;
+    if (!this._areChildSubcircuitsRouted()) {
+      debug4(
+        `[${this.getString()}] child subcircuits are not routed, skipping async autorouting until subcircuits routed`
+      );
+      return;
+    }
+    debug4(
+      `[${this.getString()}] no child subcircuits to wait for, initiating async routing`
+    );
+    this._startAsyncAutorouting();
   }
   updatePcbTraceRender() {
+    const debug4 = Debug5("tscircuit:core:updatePcbTraceRender");
+    if (this._shouldRouteAsync() && !this._hasStartedAsyncAutorouting) {
+      if (this._areChildSubcircuitsRouted()) {
+        debug4(
+          `[${this.getString()}] child subcircuits are now routed, starting async autorouting`
+        );
+        this._startAsyncAutorouting();
+      }
+      return;
+    }
     if (!this._asyncAutoroutingResult) return;
     if (this._shouldUseTraceByTraceRouting()) return;
     const { db } = this.root;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.276",
+  "version": "0.0.278",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -57,7 +57,7 @@
     "@tscircuit/props": "^0.0.130",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/soup-util": "^0.0.41",
-    "circuit-json": "^0.0.133",
+    "circuit-json": "^0.0.134",
     "circuit-json-to-connectivity-map": "^0.0.17",
     "format-si-unit": "^0.0.2",
     "nanoid": "^5.0.7",