@tscircuit/copper-pour-solver 0.0.18 → 0.0.20

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 };
@@ -501,17 +500,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
@@ -207,17 +208,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.18",
+  "version": "0.0.20",
   "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>

package/tests/assets/multiple-pours.json

@@ -0,0 +1,657 @@
+[
+  {
+    "type": "source_project_metadata",
+    "source_project_metadata_id": "source_project_metadata_0",
+    "software_used_string": "@tscircuit/core@0.0.985"
+  },
+  {
+    "type": "source_group",
+    "source_group_id": "source_group_0",
+    "is_subcircuit": true,
+    "was_automatically_named": true,
+    "subcircuit_id": "subcircuit_source_group_0"
+  },
+  {
+    "type": "source_port",
+    "source_port_id": "source_port_0",
+    "name": "pin1",
+    "pin_number": 1,
+    "port_hints": ["pin1", "anode", "pos", "left", "1"],
+    "source_component_id": "source_component_0",
+    "subcircuit_id": "subcircuit_source_group_0",
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit654_connectivity_net0"
+  },
+  {
+    "type": "source_port",
+    "source_port_id": "source_port_1",
+    "name": "pin2",
+    "pin_number": 2,
+    "port_hints": ["pin2", "cathode", "neg", "right", "2"],
+    "source_component_id": "source_component_0",
+    "subcircuit_id": "subcircuit_source_group_0"
+  },
+  {
+    "type": "source_component",
+    "source_component_id": "source_component_0",
+    "ftype": "simple_resistor",
+    "name": "R1",
+    "supplier_part_numbers": {
+      "jlcpcb": ["C21190", "C2907002", "C2907113"]
+    },
+    "resistance": 1000,
+    "display_resistance": "1kΩ",
+    "are_pins_interchangeable": true,
+    "source_group_id": "source_group_0"
+  },
+  {
+    "type": "source_port",
+    "source_port_id": "source_port_2",
+    "name": "pin1",
+    "pin_number": 1,
+    "port_hints": ["pin1", "pos", "anode", "1"],
+    "source_component_id": "source_component_1",
+    "subcircuit_id": "subcircuit_source_group_0",
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit654_connectivity_net1"
+  },
+  {
+    "type": "source_port",
+    "source_port_id": "source_port_3",
+    "name": "pin2",
+    "pin_number": 2,
+    "port_hints": ["pin2", "neg", "cathode", "2"],
+    "source_component_id": "source_component_1",
+    "subcircuit_id": "subcircuit_source_group_0",
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit654_connectivity_net0"
+  },
+  {
+    "type": "source_component",
+    "source_component_id": "source_component_1",
+    "ftype": "simple_capacitor",
+    "name": "C1",
+    "supplier_part_numbers": {
+      "jlcpcb": ["C1588", "C100040", "C5375733"]
+    },
+    "capacitance": 1e-9,
+    "display_capacitance": "1000pF",
+    "are_pins_interchangeable": true,
+    "source_group_id": "source_group_0"
+  },
+  {
+    "type": "source_net",
+    "source_net_id": "source_net_0",
+    "name": "VCC",
+    "member_source_group_ids": [],
+    "is_ground": false,
+    "is_power": true,
+    "is_positive_voltage_source": true,
+    "subcircuit_id": "subcircuit_source_group_0",
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit654_connectivity_net0"
+  },
+  {
+    "type": "source_net",
+    "source_net_id": "source_net_1",
+    "name": "GND",
+    "member_source_group_ids": [],
+    "is_ground": true,
+    "is_power": false,
+    "is_positive_voltage_source": false,
+    "subcircuit_id": "subcircuit_source_group_0",
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit654_connectivity_net1"
+  },
+  {
+    "type": "source_board",
+    "source_board_id": "source_board_0",
+    "source_group_id": "source_group_0"
+  },
+  {
+    "type": "source_trace",
+    "source_trace_id": "source_trace_0",
+    "connected_source_port_ids": ["source_port_0"],
+    "connected_source_net_ids": ["source_net_0"],
+    "subcircuit_id": "subcircuit_source_group_0",
+    "display_name": ".R1 > .pin1 to net.VCC",
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit654_connectivity_net0"
+  },
+  {
+    "type": "source_trace",
+    "source_trace_id": "source_trace_1",
+    "connected_source_port_ids": ["source_port_2"],
+    "connected_source_net_ids": ["source_net_1"],
+    "subcircuit_id": "subcircuit_source_group_0",
+    "max_length": null,
+    "display_name": ".C1 > .pin1 to net.GND",
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit654_connectivity_net1"
+  },
+  {
+    "type": "source_trace",
+    "source_trace_id": "source_trace_2",
+    "connected_source_port_ids": ["source_port_3"],
+    "connected_source_net_ids": ["source_net_0"],
+    "subcircuit_id": "subcircuit_source_group_0",
+    "max_length": null,
+    "display_name": ".C1 > .pin2 to net.VCC",
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit654_connectivity_net0"
+  },
+  {
+    "type": "source_pin_missing_trace_warning",
+    "source_pin_missing_trace_warning_id": "source_pin_missing_trace_warning_0",
+    "message": "Port pin2 on R1 is missing a trace",
+    "source_component_id": "source_component_0",
+    "source_port_id": "source_port_1",
+    "subcircuit_id": "subcircuit_source_group_0",
+    "warning_type": "source_pin_missing_trace_warning"
+  },
+  {
+    "type": "schematic_component",
+    "schematic_component_id": "schematic_component_0",
+    "center": {
+      "x": 0,
+      "y": 0
+    },
+    "size": {
+      "width": 1.1,
+      "height": 0.388910699999999
+    },
+    "source_component_id": "source_component_0",
+    "is_box_with_pins": true,
+    "symbol_name": "boxresistor_right",
+    "symbol_display_value": "1kΩ",
+    "schematic_group_id": "schematic_group_0"
+  },
+  {
+    "type": "schematic_component",
+    "schematic_component_id": "schematic_component_1",
+    "center": {
+      "x": -2.31,
+      "y": 0
+    },
+    "size": {
+      "width": 1.1,
+      "height": 0.84
+    },
+    "source_component_id": "source_component_1",
+    "is_box_with_pins": true,
+    "symbol_name": "capacitor_right",
+    "symbol_display_value": "1000pF",
+    "schematic_group_id": "schematic_group_0"
+  },
+  {
+    "type": "schematic_group",
+    "schematic_group_id": "schematic_group_0",
+    "is_subcircuit": true,
+    "subcircuit_id": "subcircuit_source_group_0",
+    "name": "unnamed_board1",
+    "center": {
+      "x": 0,
+      "y": 0
+    },
+    "width": 0,
+    "height": 0,
+    "schematic_component_ids": [],
+    "source_group_id": "source_group_0"
+  },
+  {
+    "type": "schematic_port",
+    "schematic_port_id": "schematic_port_0",
+    "schematic_component_id": "schematic_component_0",
+    "center": {
+      "x": -0.55,
+      "y": 0
+    },
+    "source_port_id": "source_port_0",
+    "facing_direction": "left",
+    "distance_from_component_edge": 0.4,
+    "pin_number": 1,
+    "display_pin_label": "anode",
+    "is_connected": true
+  },
+  {
+    "type": "schematic_port",
+    "schematic_port_id": "schematic_port_1",
+    "schematic_component_id": "schematic_component_0",
+    "center": {
+      "x": 0.55,
+      "y": 0
+    },
+    "source_port_id": "source_port_1",
+    "facing_direction": "right",
+    "distance_from_component_edge": 0.4,
+    "pin_number": 2,
+    "display_pin_label": "cathode",
+    "is_connected": false
+  },
+  {
+    "type": "schematic_port",
+    "schematic_port_id": "schematic_port_2",
+    "schematic_component_id": "schematic_component_1",
+    "center": {
+      "x": -2.8600000000000003,
+      "y": 0
+    },
+    "source_port_id": "source_port_2",
+    "facing_direction": "left",
+    "distance_from_component_edge": 0.4,
+    "pin_number": 1,
+    "display_pin_label": "pos",
+    "is_connected": false
+  },
+  {
+    "type": "schematic_port",
+    "schematic_port_id": "schematic_port_3",
+    "schematic_component_id": "schematic_component_1",
+    "center": {
+      "x": -1.76,
+      "y": 0
+    },
+    "source_port_id": "source_port_3",
+    "facing_direction": "right",
+    "distance_from_component_edge": 0.4,
+    "pin_number": 2,
+    "display_pin_label": "neg",
+    "is_connected": true
+  },
+  {
+    "type": "schematic_trace",
+    "schematic_trace_id": "schematic_trace_0",
+    "source_trace_id": "solver_R1.1-C1.2",
+    "edges": [
+      {
+        "from": {
+          "x": -0.55,
+          "y": 0
+        },
+        "to": {
+          "x": -1.7599999999999998,
+          "y": 0
+        }
+      }
+    ],
+    "junctions": [],
+    "subcircuit_connectivity_map_key": "unnamedsubcircuit654_connectivity_net0"
+  },
+  {
+    "type": "schematic_net_label",
+    "schematic_net_label_id": "schematic_net_label_0",
+    "text": "VCC",
+    "anchor_position": {
+      "x": -1.1549999999999998,
+      "y": 0
+    },
+    "center": {
+      "x": -1.1549999999999998,
+      "y": 0.09
+    },
+    "anchor_side": "bottom",
+    "source_net_id": "source_net_0",
+    "symbol_name": "rail_up"
+  },
+  {
+    "type": "schematic_net_label",
+    "schematic_net_label_id": "schematic_net_label_1",
+    "text": "GND",
+    "anchor_position": {
+      "x": -2.8600000000000003,
+      "y": 0
+    },
+    "center": {
+      "x": -3.0100000000000002,
+      "y": 0
+    },
+    "anchor_side": "right",
+    "source_net_id": "source_net_1"
+  },
+  {
+    "type": "pcb_component",
+    "pcb_component_id": "pcb_component_0",
+    "center": {
+      "x": 2.5,
+      "y": 0
+    },
+    "width": 2.45,
+    "height": 0.95,
+    "layer": "top",
+    "rotation": 0,
+    "source_component_id": "source_component_0",
+    "subcircuit_id": "subcircuit_source_group_0",
+    "do_not_place": false,
+    "obstructs_within_bounds": true,
+    "position_mode": "relative_to_group_anchor",
+    "positioned_relative_to_pcb_board_id": "pcb_board_0",
+    "display_offset_x": 2.5
+  },
+  {
+    "type": "pcb_component",
+    "pcb_component_id": "pcb_component_1",
+    "center": {
+      "x": -2.5,
+      "y": 0
+    },
+    "width": 2.45,
+    "height": 0.95,
+    "layer": "top",
+    "rotation": 0,
+    "source_component_id": "source_component_1",
+    "subcircuit_id": "subcircuit_source_group_0",
+    "do_not_place": false,
+    "obstructs_within_bounds": true,
+    "position_mode": "relative_to_group_anchor",
+    "positioned_relative_to_pcb_board_id": "pcb_board_0",
+    "display_offset_x": -2.5
+  },
+  {
+    "type": "pcb_board",
+    "pcb_board_id": "pcb_board_0",
+    "source_board_id": "source_board_0",
+    "center": {
+      "x": 0,
+      "y": 0
+    },
+    "thickness": 1.4,
+    "num_layers": 2,
+    "width": 10,
+    "height": 10,
+    "material": "fr4"
+  },
+  {
+    "type": "pcb_smtpad",
+    "pcb_smtpad_id": "pcb_smtpad_0",
+    "pcb_component_id": "pcb_component_0",
+    "pcb_port_id": "pcb_port_0",
+    "layer": "top",
+    "shape": "rect",
+    "width": 0.8,
+    "height": 0.95,
+    "port_hints": ["1", "left"],
+    "is_covered_with_solder_mask": false,
+    "x": 1.675,
+    "y": 0,
+    "subcircuit_id": "subcircuit_source_group_0"
+  },
+  {
+    "type": "pcb_solder_paste",
+    "pcb_solder_paste_id": "pcb_solder_paste_0",
+    "layer": "top",
+    "shape": "rect",
+    "width": 0.5599999999999999,
+    "height": 0.6649999999999999,
+    "x": 1.675,
+    "y": 0,
+    "pcb_component_id": "pcb_component_0",
+    "pcb_smtpad_id": "pcb_smtpad_0",
+    "subcircuit_id": "subcircuit_source_group_0"
+  },
+  {
+    "type": "pcb_smtpad",
+    "pcb_smtpad_id": "pcb_smtpad_1",
+    "pcb_component_id": "pcb_component_0",
+    "pcb_port_id": "pcb_port_1",
+    "layer": "top",
+    "shape": "rect",
+    "width": 0.8,
+    "height": 0.95,
+    "port_hints": ["2", "right"],
+    "is_covered_with_solder_mask": false,
+    "x": 3.325,
+    "y": 0,
+    "subcircuit_id": "subcircuit_source_group_0"
+  },
+  {
+    "type": "pcb_solder_paste",
+    "pcb_solder_paste_id": "pcb_solder_paste_1",
+    "layer": "top",
+    "shape": "rect",
+    "width": 0.5599999999999999,
+    "height": 0.6649999999999999,
+    "x": 3.325,
+    "y": 0,
+    "pcb_component_id": "pcb_component_0",
+    "pcb_smtpad_id": "pcb_smtpad_1",
+    "subcircuit_id": "subcircuit_source_group_0"
+  },
+  {
+    "type": "pcb_silkscreen_path",
+    "pcb_silkscreen_path_id": "pcb_silkscreen_path_0",
+    "pcb_component_id": "pcb_component_0",
+    "layer": "top",
+    "route": [
+      {
+        "x": 3.325,
+        "y": 0.875
+      },
+      {
+        "x": 1.075,
+        "y": 0.875
+      },
+      {
+        "x": 1.075,
+        "y": -0.875
+      },
+      {
+        "x": 3.325,
+        "y": -0.875
+      }
+    ],
+    "stroke_width": 0.1,
+    "subcircuit_id": "subcircuit_source_group_0"
+  },
+  {
+    "type": "pcb_silkscreen_text",
+    "pcb_silkscreen_text_id": "pcb_silkscreen_text_0",
+    "anchor_alignment": "center",
+    "anchor_position": {
+      "x": 2.5,
+      "y": 1.375
+    },
+    "font": "tscircuit2024",
+    "font_size": 0.4,
+    "layer": "top",
+    "text": "R1",
+    "ccw_rotation": 0,
+    "pcb_component_id": "pcb_component_0",
+    "subcircuit_id": "subcircuit_source_group_0"
+  },
+  {
+    "type": "pcb_smtpad",
+    "pcb_smtpad_id": "pcb_smtpad_2",
+    "pcb_component_id": "pcb_component_1",
+    "pcb_port_id": "pcb_port_2",
+    "layer": "top",
+    "shape": "rect",
+    "width": 0.8,
+    "height": 0.95,
+    "port_hints": ["1", "left"],
+    "is_covered_with_solder_mask": false,
+    "x": -3.325,
+    "y": 0,
+    "subcircuit_id": "subcircuit_source_group_0"
+  },
+  {
+    "type": "pcb_solder_paste",
+    "pcb_solder_paste_id": "pcb_solder_paste_2",
+    "layer": "top",
+    "shape": "rect",
+    "width": 0.5599999999999999,
+    "height": 0.6649999999999999,
+    "x": -3.325,
+    "y": 0,
+    "pcb_component_id": "pcb_component_1",
+    "pcb_smtpad_id": "pcb_smtpad_2",
+    "subcircuit_id": "subcircuit_source_group_0"
+  },
+  {
+    "type": "pcb_smtpad",
+    "pcb_smtpad_id": "pcb_smtpad_3",
+    "pcb_component_id": "pcb_component_1",
+    "pcb_port_id": "pcb_port_3",
+    "layer": "top",
+    "shape": "rect",
+    "width": 0.8,
+    "height": 0.95,
+    "port_hints": ["2", "right"],
+    "is_covered_with_solder_mask": false,
+    "x": -1.675,
+    "y": 0,
+    "subcircuit_id": "subcircuit_source_group_0"
+  },
+  {
+    "type": "pcb_solder_paste",
+    "pcb_solder_paste_id": "pcb_solder_paste_3",
+    "layer": "top",
+    "shape": "rect",
+    "width": 0.5599999999999999,
+    "height": 0.6649999999999999,
+    "x": -1.675,
+    "y": 0,
+    "pcb_component_id": "pcb_component_1",
+    "pcb_smtpad_id": "pcb_smtpad_3",
+    "subcircuit_id": "subcircuit_source_group_0"
+  },
+  {
+    "type": "pcb_silkscreen_path",
+    "pcb_silkscreen_path_id": "pcb_silkscreen_path_1",
+    "pcb_component_id": "pcb_component_1",
+    "layer": "top",
+    "route": [
+      {
+        "x": -1.675,
+        "y": 0.875
+      },
+      {
+        "x": -3.925,
+        "y": 0.875
+      },
+      {
+        "x": -3.925,
+        "y": -0.875
+      },
+      {
+        "x": -1.675,
+        "y": -0.875
+      }
+    ],
+    "stroke_width": 0.1,
+    "subcircuit_id": "subcircuit_source_group_0"
+  },
+  {
+    "type": "pcb_silkscreen_text",
+    "pcb_silkscreen_text_id": "pcb_silkscreen_text_1",
+    "anchor_alignment": "center",
+    "anchor_position": {
+      "x": -2.5,
+      "y": 1.375
+    },
+    "font": "tscircuit2024",
+    "font_size": 0.4,
+    "layer": "top",
+    "text": "C1",
+    "ccw_rotation": 0,
+    "pcb_component_id": "pcb_component_1",
+    "subcircuit_id": "subcircuit_source_group_0"
+  },
+  {
+    "type": "pcb_port",
+    "pcb_port_id": "pcb_port_0",
+    "pcb_component_id": "pcb_component_0",
+    "layers": ["top"],
+    "subcircuit_id": "subcircuit_source_group_0",
+    "x": 1.675,
+    "y": 0,
+    "source_port_id": "source_port_0"
+  },
+  {
+    "type": "pcb_port",
+    "pcb_port_id": "pcb_port_1",
+    "pcb_component_id": "pcb_component_0",
+    "layers": ["top"],
+    "subcircuit_id": "subcircuit_source_group_0",
+    "x": 3.325,
+    "y": 0,
+    "source_port_id": "source_port_1"
+  },
+  {
+    "type": "pcb_port",
+    "pcb_port_id": "pcb_port_2",
+    "pcb_component_id": "pcb_component_1",
+    "layers": ["top"],
+    "subcircuit_id": "subcircuit_source_group_0",
+    "x": -3.325,
+    "y": 0,
+    "source_port_id": "source_port_2"
+  },
+  {
+    "type": "pcb_port",
+    "pcb_port_id": "pcb_port_3",
+    "pcb_component_id": "pcb_component_1",
+    "layers": ["top"],
+    "subcircuit_id": "subcircuit_source_group_0",
+    "x": -1.675,
+    "y": 0,
+    "source_port_id": "source_port_3"
+  },
+  {
+    "type": "cad_component",
+    "cad_component_id": "cad_component_0",
+    "position": {
+      "x": 2.5,
+      "y": 0,
+      "z": 0.7
+    },
+    "rotation": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "pcb_component_id": "pcb_component_0",
+    "source_component_id": "source_component_0",
+    "footprinter_string": "0603"
+  },
+  {
+    "type": "cad_component",
+    "cad_component_id": "cad_component_1",
+    "position": {
+      "x": -2.5,
+      "y": 0,
+      "z": 0.7
+    },
+    "rotation": {
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "pcb_component_id": "pcb_component_1",
+    "source_component_id": "source_component_1",
+    "footprinter_string": "0603"
+  },
+  {
+    "type": "pcb_trace",
+    "pcb_trace_id": "source_net_0_0",
+    "connection_name": "source_net_0",
+    "route": [
+      {
+        "route_type": "wire",
+        "x": -1.675,
+        "y": 0,
+        "width": 0.15,
+        "layer": "top",
+        "start_pcb_port_id": "pcb_port_3"
+      },
+      {
+        "route_type": "wire",
+        "x": 1.675,
+        "y": 0,
+        "width": 0.15,
+        "layer": "top"
+      },
+      {
+        "route_type": "wire",
+        "x": 1.675,
+        "y": 0,
+        "width": 0.15,
+        "layer": "top",
+        "end_pcb_port_id": "pcb_port_0"
+      }
+    ],
+    "subcircuit_id": "subcircuit_source_group_0",
+    "source_trace_id": "source_net_0"
+  }
+]

package/tests/multiple-pours.test.ts

@@ -0,0 +1,42 @@
+import { expect, test } from "bun:test"
+import type { AnyCircuitElement } from "circuit-json"
+import circuitJson from "./assets/multiple-pours.json"
+import { runSolverAndRenderToSvg } from "./utils/run-solver-and-render-to-svg"
+
+test("multiple copper pours with complex outlines", async () => {
+  const svg = runSolverAndRenderToSvg(circuitJson as AnyCircuitElement[], [
+    {
+      layer: "top",
+      net_name: "GND",
+      pad_margin: 0.2,
+      trace_margin: 0.2,
+      outline: [
+        { x: -5, y: -5 },
+        { x: -4, y: -5 },
+        { x: -3, y: -4 },
+        { x: 0, y: -2 },
+        { x: -1, y: 3 },
+        { x: -5, y: 3 },
+        { x: -5, y: -3 },
+        { x: -5, y: -5 },
+      ],
+    },
+    {
+      layer: "top",
+      net_name: "VCC",
+      pad_margin: 0.2,
+      trace_margin: 0.2,
+      outline: [
+        { x: 3, y: -5 },
+        { x: 5, y: -5 },
+        { x: 5, y: 3 },
+        { x: 1, y: 3 },
+        { x: 0, y: -2 },
+        { x: 3, y: -4 },
+        { x: 3, y: -5 },
+      ],
+    },
+  ])
+
+  await expect(svg).toMatchSvgSnapshot(import.meta.path, "multiple-pours")
+})

package/tests/utils/run-solver-and-render-to-svg.ts

@@ -10,67 +10,79 @@ import type {
 } from "circuit-json"
 import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map"
 import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
+import type { Point } from "@tscircuit/math-utils"
+
+interface PourOptions {
+  layer: LayerRef
+  net_name: string
+  pad_margin: number
+  trace_margin: number
+  board_edge_margin?: number
+  cutout_margin?: number
+  outline?: Point[]
+}
 
 export const runSolverAndRenderToSvg = (
   circuitJson: AnyCircuitElement[],
-  pour_options: {
-    layer: LayerRef
-    net_name: string
-    pad_margin: number
-    trace_margin: number
-    board_edge_margin?: number
-    cutout_margin?: number
-  },
+  pour_options: PourOptions | PourOptions[],
 ) => {
-  const source_net = circuitJson.find(
-    (elm): elm is SourceNet =>
-      elm.type === "source_net" && elm.name === pour_options.net_name,
-  )
-
-  if (!source_net) {
-    throw new Error(`Net with name "${pour_options.net_name}" not found`)
-  }
+  const pourOptionsArray = Array.isArray(pour_options)
+    ? pour_options
+    : [pour_options]
 
   const connectivityMap = getFullConnectivityMapFromCircuitJson(circuitJson)
-  let pour_connectivity_key = connectivityMap.getNetConnectedToId(
-    source_net.source_net_id,
-  )
+  const allCopperPours: PcbCopperPourBRep[] = []
 
-  if (!pour_connectivity_key && source_net.subcircuit_connectivity_map_key) {
-    pour_connectivity_key = source_net.subcircuit_connectivity_map_key
-  }
+  for (const options of pourOptionsArray) {
+    const source_net = circuitJson.find(
+      (elm): elm is SourceNet =>
+        elm.type === "source_net" && elm.name === options.net_name,
+    )
+
+    if (!source_net) {
+      throw new Error(`Net with name "${options.net_name}" not found`)
+    }
 
-  if (!pour_connectivity_key) {
-    throw new Error(
-      `Net "${pour_options.net_name}" has no connectivity mapping`,
+    let pour_connectivity_key = connectivityMap.getNetConnectedToId(
+      source_net.source_net_id,
     )
-  }
 
-  const inputProblem = convertCircuitJsonToInputProblem(circuitJson, {
-    ...pour_options,
-    pour_connectivity_key,
-  })
+    if (!pour_connectivity_key && source_net.subcircuit_connectivity_map_key) {
+      pour_connectivity_key = source_net.subcircuit_connectivity_map_key
+    }
+
+    if (!pour_connectivity_key) {
+      throw new Error(`Net "${options.net_name}" has no connectivity mapping`)
+    }
+
+    const inputProblem = convertCircuitJsonToInputProblem(circuitJson, {
+      ...options,
+      pour_connectivity_key,
+    })
 
-  const solver = new CopperPourPipelineSolver(inputProblem)
-  const output = solver.getOutput()
+    const solver = new CopperPourPipelineSolver(inputProblem)
+    const output = solver.getOutput()
 
-  const pcb_copper_pours: PcbCopperPourBRep[] = output.brep_shapes.map(
-    (brep_shape, i) =>
-      ({
-        type: "pcb_copper_pour",
-        shape: "brep",
-        pcb_copper_pour_id: `pcb_copper_pour_${i}`,
-        layer: pour_options.layer,
-        source_net_id: source_net.source_net_id,
-        brep_shape: {
-          outer_ring: brep_shape.outer_ring,
-          inner_rings: brep_shape.inner_rings,
-        },
-        covered_with_solder_mask: true,
-      }) as PcbCopperPourBRep,
-  )
+    const pcb_copper_pours: PcbCopperPourBRep[] = output.brep_shapes.map(
+      (brep_shape, i) =>
+        ({
+          type: "pcb_copper_pour",
+          shape: "brep",
+          pcb_copper_pour_id: `pcb_copper_pour_${allCopperPours.length + i}`,
+          layer: options.layer,
+          source_net_id: source_net.source_net_id,
+          brep_shape: {
+            outer_ring: brep_shape.outer_ring,
+            inner_rings: brep_shape.inner_rings,
+          },
+          covered_with_solder_mask: true,
+        }) as PcbCopperPourBRep,
+    )
+
+    allCopperPours.push(...pcb_copper_pours)
+  }
 
-  const finalCircuitJson = [...circuitJson, ...pcb_copper_pours]
+  const finalCircuitJson = [...circuitJson, ...allCopperPours]
 
   const svg = convertCircuitJsonToPcbSvg(finalCircuitJson as any)
   return svg