@tscircuit/copper-pour-solver 0.0.19 → 0.0.21

package/tests/repro02-pinrow4-copper-pour/repro02-pinrow4-copper-pour.test.ts

@@ -0,0 +1,18 @@
+import { expect, test } from "bun:test"
+import type { AnyCircuitElement } from "circuit-json"
+import circuitJson from "./repro02-pinrow4-copper-pour.json"
+import { runSolverAndRenderToSvg } from "../utils/run-solver-and-render-to-svg"
+
+test("repro02-pinrow4-copper-pour", async () => {
+  const svg = runSolverAndRenderToSvg(circuitJson as AnyCircuitElement[], {
+    layer: "top",
+    net_name: "GND",
+    pad_margin: 0.2,
+    trace_margin: 0.2,
+  })
+
+  await expect(svg).toMatchSvgSnapshot(
+    import.meta.path,
+    "repro02-pinrow4-copper-pour",
+  )
+})

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