@tscircuit/copper-pour-solver 0.0.19 → 0.0.21

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { BasePipelineSolver } from '@tscircuit/solver-utils';
 import { Bounds, Point } from '@tscircuit/math-utils';
-import { BRepShape, AnyCircuitElement, LayerRef } from 'circuit-json';
+import { BRepShape, AnyCircuitElement, LayerRef, Point as Point$1 } from 'circuit-json';
 
 interface InputPourRegion {
     shape: "rect";
@@ -61,6 +61,7 @@ declare const convertCircuitJsonToInputProblem: (circuitJson: AnyCircuitElement[
     trace_margin: number;
     board_edge_margin?: number;
     cutout_margin?: number;
+    outline?: Point$1[];
 }) => InputProblem;
 
 export { type BaseInputPad, CopperPourPipelineSolver, type InputCircularPad, type InputPad, type InputPolygonPad, type InputPourRegion, type InputProblem, type InputRectPad, type InputTracePad, type PipelineOutput, convertCircuitJsonToInputProblem };

package/dist/index.js

@@ -237,7 +237,6 @@ var processObstaclesForPour = (pads, pourConnectivityKey, margins, boardOutline)
           )
         );
       }
-      continue;
     }
   }
   return { polygonsToSubtract };
@@ -294,6 +293,7 @@ var CopperPourPipelineSolver = class extends BasePipelineSolver {
     super(input);
     this.input = input;
   }
+  input;
   pipelineDef = [];
   getSolverName() {
     return "CopperPourPipelineSolver";
@@ -385,7 +385,6 @@ var convertCircuitJsonToInputProblem = (circuitJson, options) => {
       }
     } else if (elm.type === "pcb_plated_hole") {
       const platedHole = elm;
-      if (platedHole.shape !== "circle") continue;
       if (!platedHole.layers.includes(options.layer)) continue;
       let connectivityKey = connectivityMap.getNetConnectedToId(
         platedHole.pcb_plated_hole_id
@@ -393,15 +392,35 @@ var convertCircuitJsonToInputProblem = (circuitJson, options) => {
       if (!connectivityKey) {
         connectivityKey = `unconnected-plated-hole:${platedHole.pcb_plated_hole_id}`;
       }
-      pads.push({
-        shape: "circle",
-        padId: platedHole.pcb_plated_hole_id,
-        layer: options.layer,
-        connectivityKey,
-        x: platedHole.x,
-        y: platedHole.y,
-        radius: platedHole.outer_diameter / 2
-      });
+      if (platedHole.shape === "circle") {
+        pads.push({
+          shape: "circle",
+          padId: platedHole.pcb_plated_hole_id,
+          layer: options.layer,
+          connectivityKey,
+          x: platedHole.x,
+          y: platedHole.y,
+          radius: platedHole.outer_diameter / 2
+        });
+      } else if (platedHole.shape === "circular_hole_with_rect_pad") {
+        const rectWidth = platedHole.rect_pad_width;
+        const rectHeight = platedHole.rect_pad_height;
+        if (typeof rectWidth !== "number" || typeof rectHeight !== "number") {
+          continue;
+        }
+        pads.push({
+          shape: "rect",
+          padId: platedHole.pcb_plated_hole_id,
+          layer: options.layer,
+          connectivityKey,
+          bounds: {
+            minX: platedHole.x - rectWidth / 2,
+            minY: platedHole.y - rectHeight / 2,
+            maxX: platedHole.x + rectWidth / 2,
+            maxY: platedHole.y + rectHeight / 2
+          }
+        });
+      }
     } else if (elm.type === "pcb_hole") {
       const hole = elm;
       if (hole.hole_shape !== "circle") continue;
@@ -501,17 +520,31 @@ var convertCircuitJsonToInputProblem = (circuitJson, options) => {
     }
   }
   const { width, height } = pcb_board;
+  const outline = options.outline ?? pcb_board.outline;
+  let bounds;
+  if (outline && outline.length > 0) {
+    const xs = outline.map((p) => p.x);
+    const ys = outline.map((p) => p.y);
+    bounds = {
+      minX: Math.min(...xs),
+      minY: Math.min(...ys),
+      maxX: Math.max(...xs),
+      maxY: Math.max(...ys)
+    };
+  } else {
+    bounds = {
+      minX: -width / 2,
+      minY: -height / 2,
+      maxX: width / 2,
+      maxY: height / 2
+    };
+  }
   const regionsForPour = [
     {
       shape: "rect",
       layer: options.layer,
-      bounds: {
-        minX: -width / 2,
-        minY: -height / 2,
-        maxX: width / 2,
-        maxY: height / 2
-      },
-      outline: pcb_board.outline,
+      bounds,
+      outline,
       connectivityKey: options.pour_connectivity_key,
       padMargin: options.pad_margin,
       traceMargin: options.trace_margin,

package/lib/circuit-json/convert-circuit-json-to-input-problem.ts

@@ -32,6 +32,7 @@ export const convertCircuitJsonToInputProblem = (
     trace_margin: number
     board_edge_margin?: number
     cutout_margin?: number
+    outline?: Point[]
   },
 ): InputProblem => {
   const pcb_board = circuitJson.find((e) => e.type === "pcb_board") as
@@ -83,7 +84,6 @@ export const convertCircuitJsonToInputProblem = (
       }
     } else if (elm.type === "pcb_plated_hole") {
       const platedHole = elm as PcbPlatedHole
-      if (platedHole.shape !== "circle") continue
       if (!platedHole.layers.includes(options.layer)) continue
 
       let connectivityKey = connectivityMap.getNetConnectedToId(
@@ -93,15 +93,35 @@ export const convertCircuitJsonToInputProblem = (
         connectivityKey = `unconnected-plated-hole:${platedHole.pcb_plated_hole_id}`
       }
 
-      pads.push({
-        shape: "circle",
-        padId: platedHole.pcb_plated_hole_id,
-        layer: options.layer,
-        connectivityKey,
-        x: platedHole.x,
-        y: platedHole.y,
-        radius: platedHole.outer_diameter / 2,
-      } as InputCircularPad)
+      if (platedHole.shape === "circle") {
+        pads.push({
+          shape: "circle",
+          padId: platedHole.pcb_plated_hole_id,
+          layer: options.layer,
+          connectivityKey,
+          x: platedHole.x,
+          y: platedHole.y,
+          radius: platedHole.outer_diameter / 2,
+        } as InputCircularPad)
+      } else if (platedHole.shape === "circular_hole_with_rect_pad") {
+        const rectWidth = (platedHole as any).rect_pad_width
+        const rectHeight = (platedHole as any).rect_pad_height
+        if (typeof rectWidth !== "number" || typeof rectHeight !== "number") {
+          continue
+        }
+        pads.push({
+          shape: "rect",
+          padId: platedHole.pcb_plated_hole_id,
+          layer: options.layer,
+          connectivityKey,
+          bounds: {
+            minX: platedHole.x - rectWidth / 2,
+            minY: platedHole.y - rectHeight / 2,
+            maxX: platedHole.x + rectWidth / 2,
+            maxY: platedHole.y + rectHeight / 2,
+          },
+        } as InputRectPad)
+      }
     } else if (elm.type === "pcb_hole") {
       const hole = elm as PcbHole
       if (hole.hole_shape !== "circle") continue
@@ -207,17 +227,35 @@ export const convertCircuitJsonToInputProblem = (
   }
 
   const { width, height } = pcb_board
+
+  // Use pour-specific outline if provided, otherwise fall back to board outline
+  const outline = options.outline ?? pcb_board.outline
+
+  let bounds: { minX: number; minY: number; maxX: number; maxY: number }
+  if (outline && outline.length > 0) {
+    const xs = outline.map((p) => p.x)
+    const ys = outline.map((p) => p.y)
+    bounds = {
+      minX: Math.min(...xs),
+      minY: Math.min(...ys),
+      maxX: Math.max(...xs),
+      maxY: Math.max(...ys),
+    }
+  } else {
+    bounds = {
+      minX: -width! / 2,
+      minY: -height! / 2,
+      maxX: width! / 2,
+      maxY: height! / 2,
+    }
+  }
+
   const regionsForPour = [
     {
       shape: "rect" as const,
       layer: options.layer,
-      bounds: {
-        minX: -width! / 2,
-        minY: -height! / 2,
-        maxX: width! / 2,
-        maxY: height! / 2,
-      },
-      outline: pcb_board.outline,
+      bounds,
+      outline,
       connectivityKey: options.pour_connectivity_key,
       padMargin: options.pad_margin,
       traceMargin: options.trace_margin,

package/lib/solvers/copper-pour/process-obstacles.ts

@@ -271,7 +271,6 @@ export const processObstaclesForPour = (
           ),
         )
       }
-      continue
     }
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/copper-pour-solver",
   "main": "dist/index.js",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "scripts": {
     "format": "biome format . --write",
     "format:check": "biome format .",

package/tests/__snapshots__/multiple-pours.snap.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="600" data-software-used-string="@tscircuit/core@0.0.985"><style></style><rect class="boundary" x="0" y="0" fill="#000" width="800" height="600" data-type="pcb_background" data-pcb-layer="global"/><rect class="pcb-boundary" fill="none" stroke="#fff" stroke-width="0.3" x="150" y="50" width="500" height="500" data-type="pcb_boundary" data-pcb-layer="global"/><path class="pcb-board" d="M 150 550 L 650 550 L 650 50 L 150 50 Z" fill="none" stroke="rgba(255, 255, 255, 0.5)" stroke-width="5" data-type="pcb_board" data-pcb-layer="board"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="463.75" y="276.25" width="40" height="47.5" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="546.25" y="276.25" width="40" height="47.5" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="213.75" y="276.25" width="40" height="47.5" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="296.25" y="276.25" width="40" height="47.5" data-type="pcb_smtpad" data-pcb-layer="top"/><path class="pcb-trace" stroke="rgb(200, 52, 52)" fill="none" d="M 316.25 300 L 483.75 300" stroke-width="7.5" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-type="pcb_trace" data-pcb-layer="top"/><path class="pcb-trace" stroke="rgb(200, 52, 52)" fill="none" d="M 483.75 300 L 483.75 300" stroke-width="7.5" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-type="pcb_trace" data-pcb-layer="top"/><path class="pcb-copper-pour pcb-copper-pour-brep" d="M 382.75 313.75 L 400 400 L 250 500 L 200 550 L 150 550 L 150 450 L 150 150 L 350 150 L 377.25 286.25 L 346.25 286.25 L 346.25 266.25 L 286.25 266.25 L 286.25 333.75 L 346.25 333.75 L 346.25 313.75 L 382.75 313.75 Z" fill="rgb(200, 52, 52)" fill-rule="evenodd" fill-opacity="0.5" data-type="pcb_copper_pour" data-pcb-layer="top"/><path class="pcb-copper-pour pcb-copper-pour-brep" d="M 550 550 L 550 500 L 400 400 L 450 150 L 650 150 L 650 550 L 550 550 Z M 536.25 333.75 L 596.25 333.75 L 596.25 266.25 L 536.25 266.25 L 536.25 333.75 Z" fill="rgb(200, 52, 52)" fill-rule="evenodd" fill-opacity="0.5" data-type="pcb_copper_pour" data-pcb-layer="top"/><path class="pcb-silkscreen pcb-silkscreen-top" d="M 566.25 256.25 L 453.75 256.25 L 453.75 343.75 L 566.25 343.75" fill="none" stroke="#f2eda1" stroke-width="5" stroke-linecap="round" stroke-linejoin="round" data-pcb-component-id="pcb_component_0" data-pcb-silkscreen-path-id="pcb_silkscreen_path_0" data-type="pcb_silkscreen_path" data-pcb-layer="top"/><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="20" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,525,231.25)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_component_0" stroke="none" data-type="pcb_silkscreen_text" data-pcb-layer="top">R1</text><path class="pcb-silkscreen pcb-silkscreen-top" d="M 316.25 256.25 L 203.75 256.25 L 203.75 343.75 L 316.25 343.75" fill="none" stroke="#f2eda1" stroke-width="5" stroke-linecap="round" stroke-linejoin="round" data-pcb-component-id="pcb_component_1" data-pcb-silkscreen-path-id="pcb_silkscreen_path_1" data-type="pcb_silkscreen_path" data-pcb-layer="top"/><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="20" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,275,231.25)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_component_1" stroke="none" data-type="pcb_silkscreen_text" data-pcb-layer="top">C1</text></svg>