@tscircuit/core 0.0.2331 → 0.0.2333

package/dist/index.d.ts

@@ -229225,9 +229225,10 @@ type FanoutPourNetMap = Readonly<Record<string, string | readonly string[]>>;
 /**
  * This function can only be called in the PcbTraceRender phase or later
  */
-declare const getSimpleRouteJsonFromCircuitJson: ({ db, circuitJson, subcircuit_id, minTraceWidth, minTraceToPadEdgeClearance, minTraceToHoleEdgeClearance, minViaEdgeToPadEdgeClearance, minViaHoleEdgeToViaHoleEdgeClearance, minPlatedHoleDrillEdgeToDrillEdgeClearance, minPadEdgeToPadEdgeClearance, minBoardEdgeClearance, minViaHoleDiameter, minViaPadDiameter, nominalTraceWidth, subcircuitComponent, routingPcbGroupId, pcb_panel_id, fanoutPourNetMap, ignoreExistingTopLevelPcbRouteState, }: {
+declare const getSimpleRouteJsonFromCircuitJson: ({ db, circuitJson, allowViaInPad, subcircuit_id, minTraceWidth, minTraceToPadEdgeClearance, minTraceToHoleEdgeClearance, minViaEdgeToPadEdgeClearance, minViaHoleEdgeToViaHoleEdgeClearance, minPlatedHoleDrillEdgeToDrillEdgeClearance, minPadEdgeToPadEdgeClearance, minBoardEdgeClearance, minViaHoleDiameter, minViaPadDiameter, nominalTraceWidth, subcircuitComponent, routingPcbGroupId, pcb_panel_id, fanoutPourNetMap, ignoreExistingTopLevelPcbRouteState, }: {
     db?: CircuitJsonUtilObjects;
     circuitJson?: AnyCircuitElement[];
+    allowViaInPad?: boolean;
     subcircuit_id?: string | null;
     minTraceWidth?: number;
     nominalTraceWidth?: number;

package/dist/index.js

@@ -150064,6 +150064,7 @@ var getOwningPcbBoardForSubcircuit = (db2, subcircuitId) => {
 var getSimpleRouteJsonFromCircuitJson = ({
   db: db2,
   circuitJson,
+  allowViaInPad,
   subcircuit_id,
   minTraceWidth,
   minTraceToPadEdgeClearance,
@@ -150711,7 +150712,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
       traces: preservedRoutedSubcircuitTraces.length > 0 ? preservedRoutedSubcircuitTraces : void 0,
       layerCount: board?.num_layers ?? 2,
       allowBlindAndBuriedVias: board?.allow_blind_and_buried_vias ?? false,
-      allowViaInPad: board?.is_via_in_pad_allowed ?? false,
+      allowViaInPad: allowViaInPad ?? board?.is_via_in_pad_allowed ?? false,
       minTraceWidth: Math.min(
         defaultTraceWidth,
         ...allConns.map((c2) => c2.width)
@@ -159612,7 +159613,7 @@ var RoutingPhasePreparationError = class extends Error {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.2330",
+  version: "0.0.2332",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -159652,7 +159653,7 @@ var package_default = {
     "@tscircuit/bga-fanout-solver": "github:tscircuit/bga-fanout-solver#247c835cb8d69b65e53891dcf869731079415b39",
     "@tscircuit/bus-lanes-solver": "https://jscdn.tscircuit.com/@tscircuit/bus-lanes-solver/0.0.51.tgz",
     "@tscircuit/cableprinter": "^0.0.6",
-    "@tscircuit/capacity-autorouter": "^0.0.1074",
+    "@tscircuit/capacity-autorouter": "^0.0.1075",
     "@tscircuit/checks": "^0.0.273",
     "@tscircuit/circuit-json-util": "^0.0.131",
     "@tscircuit/common": "^0.0.20",
@@ -161401,41 +161402,28 @@ var Group = class extends NormalComponent {
         return element.type.startsWith("source_") || element.type.startsWith("pcb_");
       }
     );
+    const preferredTraceWidth = props.defaultTraceWidth ?? props.nominalTraceWidth;
+    const { simpleRouteJson } = getSimpleRouteJsonFromCircuitJson({
+      pcb_panel_id: getOwningPanel(this)?.pcb_panel_id ?? void 0,
+      db: db2,
+      allowViaInPad: autorouterConfig.allowViaInPad,
+      minTraceWidth: Number(props.minTraceWidth ?? 0.15),
+      nominalTraceWidth: preferredTraceWidth != null ? Number(preferredTraceWidth) : void 0,
+      subcircuit_id: this.subcircuit_id,
+      subcircuitComponent: this
+    });
+    const unbrokenPlaneRouteJson = simpleRouteJson.obstacles.some(
+      (obstacle) => obstacle.isCopperPour
+    ) ? simpleRouteJson : void 0;
     if (serverMode === "solve-endpoint") {
-      if (this.props.autorouter?.inputFormat === "simplified") {
-        const preferredTraceWidth = props.defaultTraceWidth ?? props.nominalTraceWidth;
-        const { simpleRouteJson } = getSimpleRouteJsonFromCircuitJson({
-          pcb_panel_id: getOwningPanel(this)?.pcb_panel_id ?? void 0,
-          db: db2,
-          minTraceWidth: Number(props.minTraceWidth ?? 0.15),
-          nominalTraceWidth: preferredTraceWidth != null ? Number(preferredTraceWidth) : void 0,
-          subcircuit_id: this.subcircuit_id,
-          subcircuitComponent: this
-        });
-        simpleRouteJson.allowViaInPad = autorouterConfig.allowViaInPad ?? simpleRouteJson.allowViaInPad;
-        const { autorouting_result: autorouting_result2 } = await fetchWithDebug(
-          `${serverUrl}/autorouting/solve`,
-          {
-            method: "POST",
-            body: JSON.stringify({
-              input_simple_route_json: simpleRouteJson,
-              subcircuit_id: this.subcircuit_id
-            }),
-            headers: {
-              "Content-Type": "application/json"
-            }
-          }
-        ).then((r2) => r2.json());
-        this._asyncAutoroutingResult = autorouting_result2;
-        this._markDirty("PcbTraceRender");
-        return;
-      }
+      const simplifiedInput = this.props.autorouter?.inputFormat === "simplified";
       const { autorouting_result } = await fetchWithDebug(
         `${serverUrl}/autorouting/solve`,
         {
           method: "POST",
           body: JSON.stringify({
-            input_circuit_json: pcbAndSourceCircuitJson,
+            input_circuit_json: simplifiedInput ? void 0 : pcbAndSourceCircuitJson,
+            input_simple_route_json: simplifiedInput ? simpleRouteJson : unbrokenPlaneRouteJson,
             subcircuit_id: this.subcircuit_id
           }),
           headers: {
@@ -161453,6 +161441,7 @@ var Group = class extends NormalComponent {
         method: "POST",
         body: JSON.stringify({
           input_circuit_json: pcbAndSourceCircuitJson,
+          input_simple_route_json: unbrokenPlaneRouteJson,
           provider: "freerouting",
           autostart: true,
           display_name: this.root?.name,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.2331",
+  "version": "0.0.2333",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -41,7 +41,7 @@
     "@tscircuit/bga-fanout-solver": "github:tscircuit/bga-fanout-solver#247c835cb8d69b65e53891dcf869731079415b39",
     "@tscircuit/bus-lanes-solver": "https://jscdn.tscircuit.com/@tscircuit/bus-lanes-solver/0.0.51.tgz",
     "@tscircuit/cableprinter": "^0.0.6",
-    "@tscircuit/capacity-autorouter": "^0.0.1074",
+    "@tscircuit/capacity-autorouter": "^0.0.1075",
     "@tscircuit/checks": "^0.0.273",
     "@tscircuit/circuit-json-util": "^0.0.131",
     "@tscircuit/common": "^0.0.20",