@tscircuit/copper-pour-solver 0.0.24 → 0.0.25

package/tests/__snapshots__/via.snap.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="800" height="600" data-software-used-string="@tscircuit/core@0.0.849"><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"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="284" y="284" width="27" height="32" data-type="pcb_smtpad" data-pcb-layer="bottom"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="233" y="284" width="27" height="32" data-type="pcb_smtpad" data-pcb-layer="bottom"/><path class="pcb-trace" stroke="rgb(77, 127, 196)" fill="none" d="M 297.5 300 L 297.5 379.512341162088" stroke-width="7.5" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-type="pcb_trace" data-pcb-layer="bottom"/><path class="pcb-trace" stroke="rgb(77, 127, 196)" fill="none" d="M 297.5 379.512341162088 L 303.1454224777405 385.1577636398285" stroke-width="7.5" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-type="pcb_trace" data-pcb-layer="bottom"/><path class="pcb-trace" stroke="rgb(77, 127, 196)" fill="none" d="M 303.1454224777405 385.1577636398285 L 306.25 393.75" stroke-width="7.5" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-type="pcb_trace" data-pcb-layer="bottom"/><path class="pcb-trace" stroke="rgb(77, 127, 196)" fill="none" d="M 306.25 393.75 L 306.25 393.75" stroke-width="7.5" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-type="pcb_trace" data-pcb-layer="bottom"/><path class="pcb-silkscreen pcb-silkscreen-bottom" d="M 246.5 264 L 321 264 L 321 336 L 246.5 336" fill="none" stroke="#5da9e9" 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="bottom"/><text x="0" y="0" dx="0" dy="0" fill="#5da9e9" font-family="Arial, sans-serif" font-size="20" text-anchor="middle" dominant-baseline="central" transform="matrix(-1,0,0,1,272,239)" class="pcb-silkscreen-text pcb-silkscreen-bottom" data-pcb-silkscreen-text-id="pcb_component_1" stroke="none" data-type="pcb_silkscreen_text" data-pcb-layer="bottom">C1</text><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="361" y="284" width="27" height="32" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="412" y="284" width="27" height="32" data-type="pcb_smtpad" data-pcb-layer="top"/><path class="pcb-trace" stroke="rgb(200, 52, 52)" fill="none" d="M 306.25 393.75 L 306.25 393.75" 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 306.25 393.75 L 306.25 368.25" 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 306.25 368.25 L 374.5 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 150 550 L 150 50 L 650 50 L 650 550 L 150 550 Z M 316.0805385563561 370.7938301144085 L 360.87436867076457 326 L 398 326 L 398 274 L 351 274 L 351 311.12563132923543 L 300.0628156646177 362.0628156646177 L 298.97464089235274 363.3887604610785 L 298.16605409052625 364.9015199668055 L 297.6681287964717 366.54295968235886 L 297.5 368.25 L 297.5 370.40515141679646 L 296.6829141908728 370.6530116872178 L 292.36074417450993 372.9632596924364 L 288.5723304703363 376.0723304703363 L 285.4632596924364 379.86074417450993 L 283.1530116872178 384.18291419087274 L 281.7303679899193 388.8727419495968 L 281.25 393.75 L 281.7303679899193 398.6272580504032 L 283.1530116872178 403.3170858091272 L 285.46325969243634 407.63925582549007 L 288.5723304703363 411.4276695296637 L 292.36074417450993 414.5367403075636 L 296.68291419087274 416.8469883127822 L 301.3727419495968 418.2696320100807 L 306.25 418.75 L 311.1272580504032 418.2696320100807 L 315.81708580912726 416.8469883127822 L 320.13925582549007 414.53674030756366 L 323.9276695296637 411.4276695296637 L 327.0367403075636 407.63925582549007 L 329.3469883127822 403.31708580912726 L 330.7696320100807 398.6272580504032 L 331.25 393.75 L 330.7696320100807 388.8727419495968 L 329.3469883127822 384.1829141908728 L 327.0367403075636 379.86074417450993 L 323.9276695296637 376.0723304703363 L 320.13925582549007 372.9632596924364 L 316.0805385563561 370.7938301144085 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 425.5 264 L 351 264 L 351 336 L 425.5 336" 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,400,239)" 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><g data-type="pcb_via" data-pcb-layer="through"><circle class="pcb-hole-outer" fill="rgb(200, 52, 52)" cx="306.25" cy="393.75" r="15" data-type="pcb_via" data-pcb-layer="top"/><circle class="pcb-hole-inner" fill="#FF26E2" cx="306.25" cy="393.75" r="7.5" data-type="pcb_via" data-pcb-layer="drill"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="600" data-software-used-string="@tscircuit/core@0.0.849"><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"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="284" y="284" width="27" height="32" data-type="pcb_smtpad" data-pcb-layer="bottom"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="233" y="284" width="27" height="32" data-type="pcb_smtpad" data-pcb-layer="bottom"/><path class="pcb-trace" stroke="rgb(77, 127, 196)" fill="none" d="M 297.5 300 L 297.5 379.512341162088" stroke-width="7.5" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-type="pcb_trace" data-pcb-layer="bottom"/><path class="pcb-trace" stroke="rgb(77, 127, 196)" fill="none" d="M 297.5 379.512341162088 L 303.1454224777405 385.1577636398285" stroke-width="7.5" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-type="pcb_trace" data-pcb-layer="bottom"/><path class="pcb-trace" stroke="rgb(77, 127, 196)" fill="none" d="M 303.1454224777405 385.1577636398285 L 306.25 393.75" stroke-width="7.5" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-type="pcb_trace" data-pcb-layer="bottom"/><path class="pcb-trace" stroke="rgb(77, 127, 196)" fill="none" d="M 306.25 393.75 L 306.25 393.75" stroke-width="7.5" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-type="pcb_trace" data-pcb-layer="bottom"/><path class="pcb-silkscreen pcb-silkscreen-bottom" d="M 246.5 264 L 321 264 L 321 336 L 246.5 336" fill="none" stroke="#5da9e9" 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="bottom"/><text x="0" y="0" dx="0" dy="0" fill="#5da9e9" font-family="Arial, sans-serif" font-size="20" text-anchor="middle" dominant-baseline="central" transform="matrix(-1,0,0,1,272,239)" class="pcb-silkscreen-text pcb-silkscreen-bottom" data-pcb-silkscreen-text-id="pcb_component_1" stroke="none" data-type="pcb_silkscreen_text" data-pcb-layer="bottom">C1</text><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="361" y="284" width="27" height="32" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="412" y="284" width="27" height="32" data-type="pcb_smtpad" data-pcb-layer="top"/><path class="pcb-trace" stroke="rgb(200, 52, 52)" fill="none" d="M 306.25 393.75 L 306.25 393.75" 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 306.25 393.75 L 306.25 368.25" 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 306.25 368.25 L 374.5 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 650 550 L 150 550 L 150 50 L 650 50 L 650 550 Z M 306.25 418.75 L 311.12725 418.26965 L 315.8171 416.847 L 320.13925 414.53675 L 323.92764999999997 411.42764999999997 L 327.03675 407.63925 L 329.347 403.3171 L 330.76965 398.62725 L 331.25 393.75 L 330.76965 388.87275 L 329.347 384.1829 L 327.03675 379.86075 L 323.92764999999997 376.07235000000003 L 320.13925 372.96325 L 316.08055 370.79385 L 360.8744 326 L 398 326 L 398 274 L 351 274 L 351 311.1256 L 300.0628 362.0628 L 298.97465 363.38875 L 298.16605 364.9015 L 297.66814999999997 366.54295 L 297.5 368.25 L 297.5 370.40515 L 296.6829 370.653 L 292.36075 372.96325 L 288.57235000000003 376.07235000000003 L 285.46325 379.86075 L 283.153 384.1829 L 281.73035 388.87275 L 281.25 393.75 L 281.73035 398.62725 L 283.153 403.3171 L 285.46325 407.63925 L 288.57235000000003 411.42764999999997 L 292.36075 414.53675 L 296.6829 416.847 L 301.37275 418.26965 L 306.25 418.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 425.5 264 L 351 264 L 351 336 L 425.5 336" 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,400,239)" 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><g data-type="pcb_via" data-pcb-layer="through"><circle class="pcb-hole-outer" fill="rgb(200, 52, 52)" cx="306.25" cy="393.75" r="15" data-type="pcb_via" data-pcb-layer="top"/><circle class="pcb-hole-inner" fill="#FF26E2" cx="306.25" cy="393.75" r="7.5" data-type="pcb_via" data-pcb-layer="drill"/></g></svg>

package/tests/manifold-copper-pour-geometry.test.ts

@@ -0,0 +1,194 @@
+import { expect, test } from "bun:test"
+import type { BRepShape } from "circuit-json"
+import { CopperPourPipelineSolver } from "lib/index"
+import {
+  composeCrossSections,
+  crossSectionFromPolygon,
+  crossSectionToCopperPourIslands,
+  removeTinyIslands,
+} from "lib/solvers/copper-pour/manifold-geometry-adapter"
+import type { InputPad, InputProblem } from "lib/types"
+
+const baseProblem = (pads: InputPad[]): InputProblem => ({
+  regionsForPour: [
+    {
+      shape: "rect",
+      layer: "top",
+      bounds: { minX: 0, minY: 0, maxX: 10, maxY: 10 },
+      connectivityKey: "net:GND",
+      padMargin: 0.2,
+      traceMargin: 0.2,
+    },
+  ],
+  pads,
+})
+
+const solve = (pads: InputPad[]) =>
+  new CopperPourPipelineSolver(baseProblem(pads)).getOutput().brep_shapes
+
+const ringArea = (ring: { vertices: { x: number; y: number }[] }) => {
+  let area = 0
+  for (let i = 0; i < ring.vertices.length; i++) {
+    const current = ring.vertices[i]!
+    const next = ring.vertices[(i + 1) % ring.vertices.length]!
+    area += current.x * next.y - next.x * current.y
+  }
+  return area / 2
+}
+
+const brepArea = (shape: BRepShape) =>
+  Math.abs(ringArea(shape.outer_ring)) -
+  shape.inner_rings.reduce((sum, ring) => sum + Math.abs(ringArea(ring)), 0)
+
+const totalArea = (shapes: BRepShape[]) =>
+  shapes.reduce((sum, shape) => sum + brepArea(shape), 0)
+
+const assertValidRings = (shapes: BRepShape[]) => {
+  for (const shape of shapes) {
+    expect(shape.outer_ring.vertices.length).toBeGreaterThanOrEqual(3)
+    for (const point of shape.outer_ring.vertices) {
+      expect(Number.isFinite(point.x)).toBe(true)
+      expect(Number.isFinite(point.y)).toBe(true)
+    }
+    for (const ring of shape.inner_rings) {
+      expect(ring.vertices.length).toBeGreaterThanOrEqual(3)
+      for (const point of ring.vertices) {
+        expect(Number.isFinite(point.x)).toBe(true)
+        expect(Number.isFinite(point.y)).toBe(true)
+      }
+    }
+  }
+}
+
+test("trace clearance subtracts from rectangular pour", () => {
+  const shapes = solve([
+    {
+      padId: "trace-1",
+      shape: "trace",
+      layer: "top",
+      connectivityKey: "net:OTHER",
+      width: 0.4,
+      segments: [
+        { x: 2, y: 5 },
+        { x: 8, y: 5 },
+      ],
+    },
+  ])
+
+  expect(shapes).toHaveLength(1)
+  expect(shapes[0]!.inner_rings.length).toBe(1)
+  expect(totalArea(shapes)).toBeLessThan(100)
+  assertValidRings(shapes)
+})
+
+test("overlapping near-touching trace clearances compose before subtraction", () => {
+  const shapes = solve([
+    {
+      padId: "trace-1",
+      shape: "trace",
+      layer: "top",
+      connectivityKey: "net:OTHER",
+      width: 0.4,
+      segments: [
+        { x: 2, y: 4.7 },
+        { x: 8, y: 4.7 },
+      ],
+    },
+    {
+      padId: "trace-2",
+      shape: "trace",
+      layer: "top",
+      connectivityKey: "net:OTHER",
+      width: 0.4,
+      segments: [
+        { x: 2, y: 5.25 },
+        { x: 8, y: 5.25 },
+      ],
+    },
+  ])
+
+  expect(shapes).toHaveLength(1)
+  expect(shapes[0]!.inner_rings.length).toBe(1)
+  expect(totalArea(shapes)).toBeGreaterThan(90)
+  assertValidRings(shapes)
+})
+
+test("pads and vias inside pour become holes", () => {
+  const shapes = solve([
+    {
+      padId: "pad-1",
+      shape: "rect",
+      layer: "top",
+      connectivityKey: "net:OTHER",
+      bounds: { minX: 2, minY: 2, maxX: 3, maxY: 3 },
+    },
+    {
+      padId: "via-1",
+      shape: "circle",
+      layer: "top",
+      connectivityKey: "net:OTHER",
+      x: 7,
+      y: 7,
+      radius: 0.35,
+    },
+  ])
+
+  expect(shapes).toHaveLength(1)
+  expect(shapes[0]!.inner_rings.length).toBe(2)
+  assertValidRings(shapes)
+})
+
+test("blocker covering pour returns empty result", () => {
+  const shapes = solve([
+    {
+      padId: "pad-1",
+      shape: "rect",
+      layer: "top",
+      connectivityKey: "net:OTHER",
+      bounds: { minX: -1, minY: -1, maxX: 11, maxY: 11 },
+    },
+  ])
+
+  expect(shapes).toHaveLength(0)
+})
+
+test("clearance can split pour into multiple disconnected islands", () => {
+  const shapes = solve([
+    {
+      padId: "trace-1",
+      shape: "trace",
+      layer: "top",
+      connectivityKey: "net:OTHER",
+      width: 0.6,
+      segments: [
+        { x: 5, y: -1 },
+        { x: 5, y: 11 },
+      ],
+    },
+  ])
+
+  expect(shapes).toHaveLength(2)
+  assertValidRings(shapes)
+})
+
+test("tiny copper islands are removed below threshold", () => {
+  const normalIsland = crossSectionFromPolygon([
+    { x: 0, y: 0 },
+    { x: 1, y: 0 },
+    { x: 1, y: 1 },
+    { x: 0, y: 1 },
+  ])
+  const tinyIsland = crossSectionFromPolygon([
+    { x: 2, y: 0 },
+    { x: 2.00001, y: 0 },
+    { x: 2.00001, y: 0.00001 },
+    { x: 2, y: 0.00001 },
+  ])
+
+  const cleaned = removeTinyIslands(
+    composeCrossSections([normalIsland, tinyIsland]),
+    1e-8,
+  )
+
+  expect(crossSectionToCopperPourIslands(cleaned)).toHaveLength(1)
+})

package/tests/stm32f746g-disco.test.ts

@@ -4,23 +4,23 @@ import circuitJson from "./assets/tsci_AnasSarkiz.STM32F746G-DISCO.circuit.json"
 import { runSolverAndRenderToSvg } from "./utils/run-solver-and-render-to-svg"
 
 test("stm32f746g-disco top layer full board repro", () => {
-  expect(() =>
-    runSolverAndRenderToSvg(circuitJson as AnyCircuitElement[], {
-      layer: "top",
-      net_name: "GND",
-      pad_margin: 0.2,
-      trace_margin: 0.2,
-    }),
-  ).toThrowErrorMatchingInlineSnapshot(`"Cannot complete boolean operation"`)
+  const svg = runSolverAndRenderToSvg(circuitJson as AnyCircuitElement[], {
+    layer: "top",
+    net_name: "GND",
+    pad_margin: 0.2,
+    trace_margin: 0.2,
+  })
+
+ expect(svg).toMatchSvgSnapshot(import.meta.path+"top")
 })
 
 test("stm32f746g-disco bottom layer full board repro", () => {
-  expect(() =>
-    runSolverAndRenderToSvg(circuitJson as AnyCircuitElement[], {
-      layer: "bottom",
-      net_name: "GND",
-      pad_margin: 0.2,
-      trace_margin: 0.2,
-    }),
-  ).toThrowErrorMatchingInlineSnapshot(`"Cannot complete boolean operation"`)
+  const svg = runSolverAndRenderToSvg(circuitJson as AnyCircuitElement[], {
+    layer: "bottom",
+    net_name: "GND",
+    pad_margin: 0.2,
+    trace_margin: 0.2,
+  })
+
+ expect(svg).toMatchSvgSnapshot(import.meta.path+"bottom")
 })

package/lib/solvers/copper-pour/circle-to-polygon.ts

@@ -1,15 +0,0 @@
-import Flatten from "@flatten-js/core"
-
-export const circleToPolygon = (circle: Flatten.Circle, numSegments = 32) => {
-  const points: Flatten.Point[] = []
-  for (let i = 0; i < numSegments; i++) {
-    const angle = (i / numSegments) * 2 * Math.PI
-    points.push(
-      new Flatten.Point(
-        circle.center.x + circle.r * Math.cos(angle),
-        circle.center.y + circle.r * Math.sin(angle),
-      ),
-    )
-  }
-  return new Flatten.Polygon(points)
-}