@tscircuit/copper-pour-solver 0.0.32 → 0.0.34

package/lib/circuit-json/getElementSubcircuitConnectivityKey.ts

@@ -0,0 +1,8 @@
+import type { AnyCircuitElement } from "circuit-json"
+
+export const getElementSubcircuitConnectivityKey = (
+  element: AnyCircuitElement,
+): string | undefined => {
+  const key = (element as any).subcircuit_connectivity_map_key
+  return typeof key === "string" && key.length > 0 ? key : undefined
+}

package/lib/circuit-json/resolvePourConnectivityKey.ts

@@ -0,0 +1,61 @@
+import type { AnyCircuitElement, SourceNet } from "circuit-json"
+import type { ConvertCircuitJsonToInputProblemOptions } from "./ConvertCircuitJsonToInputProblemOptions"
+
+export const resolvePourConnectivityKey = (
+  circuitJson: AnyCircuitElement[],
+  options: ConvertCircuitJsonToInputProblemOptions,
+  knownSubcircuitConnectivityKeys: Set<string>,
+): string => {
+  if (options.subcircuit_connectivity_map_key) {
+    return options.subcircuit_connectivity_map_key
+  }
+
+  if (options.source_net_id) {
+    const sourceNet = circuitJson.find(
+      (element): element is SourceNet =>
+        element.type === "source_net" &&
+        element.source_net_id === options.source_net_id,
+    )
+    if (!sourceNet) {
+      throw new Error(`No source_net found with id "${options.source_net_id}"`)
+    }
+    if (!sourceNet.subcircuit_connectivity_map_key) {
+      throw new Error(
+        `source_net "${options.source_net_id}" has no subcircuit_connectivity_map_key`,
+      )
+    }
+    return sourceNet.subcircuit_connectivity_map_key
+  }
+
+  if (options.source_net_name) {
+    const sourceNet = circuitJson.find(
+      (element): element is SourceNet =>
+        element.type === "source_net" &&
+        element.name === options.source_net_name,
+    )
+    if (!sourceNet) {
+      throw new Error(
+        `No source_net found with name "${options.source_net_name}"`,
+      )
+    }
+    if (!sourceNet.subcircuit_connectivity_map_key) {
+      throw new Error(
+        `source_net "${options.source_net_name}" has no subcircuit_connectivity_map_key`,
+      )
+    }
+    return sourceNet.subcircuit_connectivity_map_key
+  }
+
+  if (options.pour_connectivity_key) {
+    if (!knownSubcircuitConnectivityKeys.has(options.pour_connectivity_key)) {
+      throw new Error(
+        `pour_connectivity_key must be a subcircuit_connectivity_map_key. Use subcircuit_connectivity_map_key, source_net_id, or source_net_name instead of a generated connectivity-map id.`,
+      )
+    }
+    return options.pour_connectivity_key
+  }
+
+  throw new Error(
+    "Copper pour requires source_net_id, source_net_name, or subcircuit_connectivity_map_key",
+  )
+}

package/lib/index.ts

@@ -1,4 +1,5 @@
 export * from "./solvers/CopperPourPipelineSolver"
 export { initializeManifoldGeometry } from "./solvers/copper-pour/manifold-runtime"
+export type { ConvertCircuitJsonToInputProblemOptions } from "./circuit-json/ConvertCircuitJsonToInputProblemOptions"
 export * from "./circuit-json/convert-circuit-json-to-input-problem"
 export * from "./types"

package/lib/solvers/copper-pour/polygon-primitives.ts

@@ -55,3 +55,56 @@ export const segmentToPolygon = (
     y: centerY + point.x * sinAngle + point.y * cosAngle,
   }))
 }
+
+export const pillToPolygon = (
+  center: Point,
+  width: number,
+  height: number,
+  radius: number,
+  ccwRotation = 0,
+  numSegments = 32,
+): PolygonRing => {
+  if (radius <= 0) return []
+
+  const isVertical = height >= width
+  const centerlineLength = Math.max(width, height) - 2 * radius
+  const halfCenterline = Math.max(0, centerlineLength / 2)
+  const baseAngle = isVertical ? Math.PI / 2 : 0
+  const rotation = baseAngle + (ccwRotation * Math.PI) / 180
+
+  const cosAngle = Math.cos(rotation)
+  const sinAngle = Math.sin(rotation)
+  const start = {
+    x: center.x - halfCenterline * cosAngle,
+    y: center.y - halfCenterline * sinAngle,
+  }
+  const end = {
+    x: center.x + halfCenterline * cosAngle,
+    y: center.y + halfCenterline * sinAngle,
+  }
+
+  if (halfCenterline === 0) {
+    return circleToPolygon(center, radius, numSegments)
+  }
+
+  const points: PolygonRing = []
+  const halfSegments = Math.max(4, Math.floor(numSegments / 2))
+
+  for (let i = 0; i <= halfSegments; i++) {
+    const angle = rotation - Math.PI / 2 + (i / halfSegments) * Math.PI
+    points.push({
+      x: end.x + radius * Math.cos(angle),
+      y: end.y + radius * Math.sin(angle),
+    })
+  }
+
+  for (let i = 0; i <= halfSegments; i++) {
+    const angle = rotation + Math.PI / 2 + (i / halfSegments) * Math.PI
+    points.push({
+      x: start.x + radius * Math.cos(angle),
+      y: start.y + radius * Math.sin(angle),
+    })
+  }
+
+  return points
+}

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

@@ -2,6 +2,7 @@ import type { Point } from "@tscircuit/math-utils"
 import type {
   InputCircularPad,
   InputPad,
+  InputPillPad,
   InputPolygonPad,
   InputRectPad,
   InputTracePad,
@@ -10,6 +11,7 @@ import { offsetPolygon } from "./manifold-geometry-adapter"
 import {
   boxToPolygon,
   circleToPolygon,
+  pillToPolygon,
   segmentToPolygon,
 } from "./polygon-primitives"
 import { normalizeRing, type PolygonRing } from "./polygon-ring"
@@ -23,6 +25,7 @@ const isTracePad = (pad: InputPad): pad is InputTracePad =>
   pad.shape === "trace"
 const isCircularPad = (pad: InputPad): pad is InputCircularPad =>
   pad.shape === "circle"
+const isPillPad = (pad: InputPad): pad is InputPillPad => pad.shape === "pill"
 const isPolygonPad = (pad: InputPad): pad is InputPolygonPad =>
   pad.shape === "polygon"
 
@@ -111,6 +114,20 @@ export const processObstaclesForPour = (
       continue
     }
 
+    if (isPillPad(pad)) {
+      const margin = isHoleOrCutout ? (cutoutMargin ?? 0) : padMargin
+      polygonsToSubtract.push(
+        pillToPolygon(
+          { x: pad.x, y: pad.y },
+          pad.width + margin * 2,
+          pad.height + margin * 2,
+          pad.radius + margin,
+          pad.ccwRotation,
+        ),
+      )
+      continue
+    }
+
     if (isRectPad(pad)) {
       const margin = isHoleOrCutout ? (cutoutMargin ?? 0) : padMargin
       const { bounds } = pad

package/lib/types.ts

@@ -31,6 +31,16 @@ export interface InputCircularPad extends BaseInputPad {
   radius: number
 }
 
+export interface InputPillPad extends BaseInputPad {
+  shape: "pill"
+  x: number
+  y: number
+  width: number
+  height: number
+  radius: number
+  ccwRotation: number
+}
+
 export interface InputTracePad extends BaseInputPad {
   shape: "trace"
   width: number
@@ -45,6 +55,7 @@ export interface InputPolygonPad extends BaseInputPad {
 export type InputPad =
   | InputRectPad
   | InputCircularPad
+  | InputPillPad
   | InputTracePad
   | InputPolygonPad
 

package/package.json

@@ -1,15 +1,19 @@
 {
   "name": "@tscircuit/copper-pour-solver",
   "main": "dist/index.js",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "scripts": {
     "format": "biome format . --write",
     "format:check": "biome format .",
+    "start": "cosmos",
+    "cosmos": "react-cosmos",
+    "build:site": "cosmos-export",
     "build": "tsup-node lib/index.ts --dts --format esm"
   },
   "type": "module",
   "devDependencies": {
     "@biomejs/biome": "^2.2.4",
+    "@tscircuit/circuit-json-util": "^0.0.77",
     "@flatten-js/core": "^1.6.2",
     "@tscircuit/math-utils": "^0.0.25",
     "@tscircuit/solver-utils": "^0.0.14",

package/site/Welcome.page.tsx

@@ -0,0 +1,214 @@
+import type React from "react"
+
+const codeSample = `import {
+  CopperPourPipelineSolver,
+  convertCircuitJsonToInputProblem,
+  initializeManifoldGeometry,
+} from "@tscircuit/copper-pour-solver"
+
+await initializeManifoldGeometry()
+
+const inputProblem = convertCircuitJsonToInputProblem(circuitJson, {
+  layer: "top",
+  source_net_name: "GND",
+  pad_margin: 0.4,
+  trace_margin: 0.2,
+  board_edge_margin: 0.1,
+  cutout_margin: 0.2,
+})
+
+const solver = new CopperPourPipelineSolver(inputProblem)
+const { brep_shapes } = solver.getOutput()`
+
+const developmentSample = `bun install
+bun run build
+bun test
+bun start
+bun run build:site`
+
+export default function WelcomePage() {
+  return (
+    <main style={styles.main}>
+      <header style={styles.header}>
+        <p style={styles.eyebrow}>tscircuit geometry</p>
+        <h1 style={styles.title}>@tscircuit/copper-pour-solver</h1>
+        <p style={styles.lede}>
+          Generate PCB copper pour B-Rep polygons from Circuit JSON or from a
+          direct geometry input format.
+        </p>
+        <nav style={styles.actions} aria-label="Project links">
+          <a style={{ ...styles.button, ...styles.primaryButton }} href="/">
+            Cosmos docs
+          </a>
+          <a
+            style={styles.button}
+            href="https://github.com/tscircuit/copper-pour-solver"
+          >
+            GitHub
+          </a>
+          <a
+            style={styles.button}
+            href="https://www.npmjs.com/package/@tscircuit/copper-pour-solver"
+          >
+            npm
+          </a>
+        </nav>
+      </header>
+
+      <section style={styles.section}>
+        <h2 style={styles.heading}>Install</h2>
+        <pre style={styles.pre}>
+          <code>bun add @tscircuit/copper-pour-solver</code>
+        </pre>
+      </section>
+
+      <section style={styles.section}>
+        <h2 style={styles.heading}>Use With Circuit JSON</h2>
+        <p style={styles.copy}>
+          Initialize the Manifold geometry runtime once, convert Circuit JSON
+          into a solver input problem by source net name, then read the
+          generated B-Rep shapes.
+        </p>
+        <pre style={styles.pre}>
+          <code>{codeSample}</code>
+        </pre>
+      </section>
+
+      <section style={styles.section}>
+        <h2 style={styles.heading}>What The Converter Reads</h2>
+        <div style={styles.grid}>
+          <div style={styles.item}>
+            <strong>Board geometry</strong>
+            <span>
+              Board bounds, board outlines, and optional pour outlines.
+            </span>
+          </div>
+          <div style={styles.item}>
+            <strong>Obstacles</strong>
+            <span>
+              SMT pads, plated holes, mechanical holes, vias, traces, and
+              cutouts.
+            </span>
+          </div>
+          <div style={styles.item}>
+            <strong>Connectivity</strong>
+            <span>
+              Source net ids, source net names, or stable
+              subcircuit_connectivity_map_key values.
+            </span>
+          </div>
+          <div style={styles.item}>
+            <strong>Clearances</strong>
+            <span>Pad, trace, board edge, and cutout margin controls.</span>
+          </div>
+        </div>
+      </section>
+
+      <section style={styles.section}>
+        <h2 style={styles.heading}>Development</h2>
+        <pre style={styles.pre}>
+          <code>{developmentSample}</code>
+        </pre>
+      </section>
+    </main>
+  )
+}
+
+const styles: Record<string, React.CSSProperties> = {
+  main: {
+    width: "min(980px, calc(100% - 32px))",
+    margin: "0 auto",
+    padding: "48px 0 64px",
+    color: "#17202a",
+    fontFamily:
+      'Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif',
+    lineHeight: 1.55,
+  },
+  header: {
+    borderBottom: "1px solid #d7dee4",
+    paddingBottom: 28,
+    marginBottom: 32,
+  },
+  eyebrow: {
+    margin: "0 0 10px",
+    color: "#0b766e",
+    fontSize: 13,
+    fontWeight: 700,
+    textTransform: "uppercase",
+    letterSpacing: 0,
+  },
+  title: {
+    margin: "0 0 12px",
+    fontSize: "clamp(2rem, 7vw, 4rem)",
+    lineHeight: 1,
+    letterSpacing: 0,
+  },
+  lede: {
+    maxWidth: 760,
+    margin: "0 0 16px",
+    color: "#5f6f7a",
+    fontSize: "1.12rem",
+  },
+  actions: {
+    display: "flex",
+    flexWrap: "wrap",
+    gap: 10,
+    marginTop: 22,
+  },
+  button: {
+    display: "inline-flex",
+    alignItems: "center",
+    minHeight: 38,
+    padding: "7px 12px",
+    border: "1px solid #d7dee4",
+    borderRadius: 6,
+    textDecoration: "none",
+    color: "#17202a",
+    background: "#ffffff",
+    fontWeight: 650,
+  },
+  primaryButton: {
+    color: "#ffffff",
+    background: "#0b766e",
+    borderColor: "#0b766e",
+  },
+  section: {
+    marginTop: 34,
+  },
+  heading: {
+    margin: "0 0 12px",
+    fontSize: "1.35rem",
+    letterSpacing: 0,
+  },
+  copy: {
+    maxWidth: 760,
+    margin: "0 0 16px",
+    color: "#34444f",
+  },
+  pre: {
+    overflowX: "auto",
+    margin: "14px 0 24px",
+    padding: 16,
+    border: "1px solid #d7dee4",
+    borderRadius: 8,
+    background: "#f7f9fb",
+    color: "#10212d",
+    fontFamily:
+      '"SFMono-Regular", Consolas, "Liberation Mono", Menlo, monospace',
+    fontSize: 14,
+  },
+  grid: {
+    display: "grid",
+    gridTemplateColumns: "repeat(auto-fit, minmax(230px, 1fr))",
+    gap: 14,
+    margin: "18px 0 8px",
+  },
+  item: {
+    display: "grid",
+    gap: 4,
+    border: "1px solid #d7dee4",
+    borderRadius: 8,
+    padding: 14,
+    background: "#ffffff",
+  },
+}

package/tests/__snapshots__/pill-pad-copper-pour.snap.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="600"><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="50" y="50" width="700" height="500" data-type="pcb_boundary" data-pcb-layer="global"/><path class="pcb-board" d="M 50 550 L 750 550 L 750 50 L 50 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="163.750155" y="399.999165" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="227.250155" y="399.999165" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="290.750155" y="399.999165" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="354.250155" y="399.999165" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="417.750155" y="399.999165" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="481.250155" y="399.999165" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="544.750155" y="399.999165" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="608.250155" y="399.999165" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="163.750155" y="112.750565" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="227.250155" y="112.750565" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="290.750155" y="112.750565" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="354.250155" y="112.750565" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="417.750155" y="112.750565" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="481.250155" y="112.750565" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="544.750155" y="112.750565" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="608.250155" y="112.750565" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="-13.999845" y="-43.625135" width="27.99969" height="87.25027" rx="13.999845" ry="13.999845" data-type="pcb_smtpad" data-pcb-layer="top" transform="translate(400 300) rotate(-90)"/><path class="pcb-copper-pour pcb-copper-pour-brep" d="M 750 550 L 50 550 L 50 50 L 750 50 L 750 550 Z M 177.75 207.50085 L 181.94439999999997 207.08769999999998 L 185.97765 205.86425 L 189.69465 203.87745 L 192.95270000000002 201.2037 L 195.62645 197.94565 L 197.61325 194.2286 L 198.83675 190.1954 L 199.24984999999998 186.00099999999998 L 199.24984999999998 126.75039999999998 L 198.83675 122.55600000000001 L 197.61325 118.52279999999999 L 195.62645 114.80574999999999 L 192.95270000000002 111.54769999999999 L 189.69465 108.87395000000001 L 185.97765 106.88714999999999 L 181.94439999999997 105.6637 L 177.75 105.25055 L 173.5556 105.6637 L 169.52235 106.88714999999999 L 165.80534999999998 108.87395000000001 L 162.5473 111.54769999999999 L 159.87355000000002 114.80574999999999 L 157.88674999999998 118.52279999999999 L 156.66324999999998 122.55600000000001 L 156.25015000000002 126.75039999999998 L 156.25015000000002 186.00099999999998 L 156.66324999999998 190.1954 L 157.88674999999998 194.2286 L 159.87355000000002 197.94565 L 162.5473 201.2037 L 165.80534999999998 203.87745 L 169.52235 205.86425 L 173.5556 207.08769999999998 L 177.75 207.50085 Z M 241.25 207.50085 L 245.4444 207.08769999999998 L 249.47764999999998 205.86425 L 253.19465000000002 203.87745 L 256.4527 201.2037 L 259.12645 197.94565 L 261.11325 194.2286 L 262.33675 190.1954 L 262.74985000000004 186.00099999999998 L 262.74985000000004 126.75039999999998 L 262.33675 122.55600000000001 L 261.11325 118.52279999999999 L 259.12645 114.80574999999999 L 256.4527 111.54769999999999 L 253.19465000000002 108.87395000000001 L 249.47764999999998 106.88714999999999 L 245.4444 105.6637 L 241.25 105.25055 L 237.0556 105.6637 L 233.02235 106.88714999999999 L 229.30535 108.87395000000001 L 226.0473 111.54769999999999 L 223.37355000000002 114.80574999999999 L 221.38675 118.52279999999999 L 220.16325 122.55600000000001 L 219.75015 126.75039999999998 L 219.75015 186.00099999999998 L 220.16325 190.1954 L 221.38675 194.2286 L 223.37355000000002 197.94565 L 226.0473 201.2037 L 229.30535 203.87745 L 233.02235 205.86425 L 237.0556 207.08769999999998 L 241.25 207.50085 Z M 304.75 207.50085 L 308.9444 207.08769999999998 L 312.97765 205.86425 L 316.69465 203.87745 L 319.9527 201.2037 L 322.62645 197.94565 L 324.61325 194.2286 L 325.83675 190.1954 L 326.24985 186.00099999999998 L 326.24985 126.75039999999998 L 325.83675 122.55600000000001 L 324.61325 118.52279999999999 L 322.62645 114.80574999999999 L 319.9527 111.54769999999999 L 316.69465 108.87395000000001 L 312.97765 106.88714999999999 L 308.9444 105.6637 L 304.75 105.25055 L 300.5556 105.6637 L 296.52235 106.88714999999999 L 292.80535 108.87395000000001 L 289.5473 111.54769999999999 L 286.87355 114.80574999999999 L 284.88675 118.52279999999999 L 283.66325 122.55600000000001 L 283.25015 126.75039999999998 L 283.25015 186.00099999999998 L 283.66325 190.1954 L 284.88675 194.2286 L 286.87355 197.94565 L 289.5473 201.2037 L 292.80535 203.87745 L 296.52235 205.86425 L 300.5556 207.08769999999998 L 304.75 207.50085 Z M 368.25 207.50085 L 372.4444 207.08769999999998 L 376.47765 205.86425 L 380.19465 203.87745 L 383.4527 201.2037 L 386.12645 197.94565 L 388.11325 194.2286 L 389.33675 190.1954 L 389.74985 186.00099999999998 L 389.74985 126.75039999999998 L 389.33675 122.55600000000001 L 388.11325 118.52279999999999 L 386.12645 114.80574999999999 L 383.4527 111.54769999999999 L 380.19465 108.87395000000001 L 376.47765 106.88714999999999 L 372.4444 105.6637 L 368.25 105.25055 L 364.0556 105.6637 L 360.02235 106.88714999999999 L 356.30535 108.87395000000001 L 353.0473 111.54769999999999 L 350.37355 114.80574999999999 L 348.38675 118.52279999999999 L 347.16325 122.55600000000001 L 346.75015 126.75039999999998 L 346.75015 186.00099999999998 L 347.16325 190.1954 L 348.38675 194.2286 L 350.37355 197.94565 L 353.0473 201.2037 L 356.30535 203.87745 L 360.02235 205.86425 L 364.0556 207.08769999999998 L 368.25 207.50085 Z M 431.75 207.50085 L 435.9444 207.08769999999998 L 439.97765 205.86425 L 443.69465 203.87745 L 446.9527 201.2037 L 449.62645 197.94565 L 451.61325 194.2286 L 452.83675 190.1954 L 453.24985 186.00099999999998 L 453.24985 126.75039999999998 L 452.83675 122.55600000000001 L 451.61325 118.52279999999999 L 449.62645 114.80574999999999 L 446.9527 111.54769999999999 L 443.69465 108.87395000000001 L 439.97765 106.88714999999999 L 435.9444 105.6637 L 431.75 105.25055 L 427.5556 105.6637 L 423.52235 106.88714999999999 L 419.80535 108.87395000000001 L 416.5473 111.54769999999999 L 413.87355 114.80574999999999 L 411.88675 118.52279999999999 L 410.66325 122.55600000000001 L 410.25015 126.75039999999998 L 410.25015 186.00099999999998 L 410.66325 190.1954 L 411.88675 194.2286 L 413.87355 197.94565 L 416.5473 201.2037 L 419.80535 203.87745 L 423.52235 205.86425 L 427.5556 207.08769999999998 L 431.75 207.50085 Z M 495.25 207.50085 L 499.4444 207.08769999999998 L 503.47765 205.86425 L 507.19465 203.87745 L 510.4527 201.2037 L 513.12645 197.94565 L 515.11325 194.2286 L 516.33675 190.1954 L 516.74985 186.00099999999998 L 516.74985 126.75039999999998 L 516.33675 122.55600000000001 L 515.11325 118.52279999999999 L 513.12645 114.80574999999999 L 510.4527 111.54769999999999 L 507.19465 108.87395000000001 L 503.47765 106.88714999999999 L 499.4444 105.6637 L 495.25 105.25055 L 491.0556 105.6637 L 487.02235 106.88714999999999 L 483.30535 108.87395000000001 L 480.0473 111.54769999999999 L 477.37355 114.80574999999999 L 475.38675 118.52279999999999 L 474.16325 122.55600000000001 L 473.75015 126.75039999999998 L 473.75015 186.00099999999998 L 474.16325 190.1954 L 475.38675 194.2286 L 477.37355 197.94565 L 480.0473 201.2037 L 483.30535 203.87745 L 487.02235 205.86425 L 491.0556 207.08769999999998 L 495.25 207.50085 Z M 558.75 207.50085 L 562.9444 207.08769999999998 L 566.97765 205.86425 L 570.69465 203.87745 L 573.9527 201.2037 L 576.62645 197.94565 L 578.61325 194.2286 L 579.8367499999999 190.1954 L 580.24985 186.00099999999998 L 580.24985 126.75039999999998 L 579.8367499999999 122.55600000000001 L 578.61325 118.52279999999999 L 576.62645 114.80574999999999 L 573.9527 111.54769999999999 L 570.69465 108.87395000000001 L 566.97765 106.88714999999999 L 562.9444 105.6637 L 558.75 105.25055 L 554.5556 105.6637 L 550.52235 106.88714999999999 L 546.80535 108.87395000000001 L 543.5473 111.54769999999999 L 540.87355 114.80574999999999 L 538.88675 118.52279999999999 L 537.6632500000001 122.55600000000001 L 537.25015 126.75039999999998 L 537.25015 186.00099999999998 L 537.6632500000001 190.1954 L 538.88675 194.2286 L 540.87355 197.94565 L 543.5473 201.2037 L 546.80535 203.87745 L 550.52235 205.86425 L 554.5556 207.08769999999998 L 558.75 207.50085 Z M 622.25 207.50085 L 626.4444 207.08769999999998 L 630.47765 205.86425 L 634.19465 203.87745 L 637.4527 201.2037 L 640.12645 197.94565 L 642.11325 194.2286 L 643.33675 190.1954 L 643.7498499999999 186.00099999999998 L 643.7498499999999 126.75039999999998 L 643.33675 122.55600000000001 L 642.11325 118.52279999999999 L 640.12645 114.80574999999999 L 637.4527 111.54769999999999 L 634.19465 108.87395000000001 L 630.47765 106.88714999999999 L 626.4444 105.6637 L 622.25 105.25055 L 618.0556 105.6637 L 614.02235 106.88714999999999 L 610.30535 108.87395000000001 L 607.0473 111.54769999999999 L 604.37355 114.80574999999999 L 602.38675 118.52279999999999 L 601.1632500000001 122.55600000000001 L 600.7501500000001 126.75039999999998 L 600.7501500000001 186.00099999999998 L 601.1632500000001 190.1954 L 602.38675 194.2286 L 604.37355 197.94565 L 607.0473 201.2037 L 610.30535 203.87745 L 614.02235 205.86425 L 618.0556 207.08769999999998 L 622.25 207.50085 Z M 370.3747 321.49985 L 429.6253 321.49985 L 433.8197 321.08675 L 437.8529 319.86325 L 441.56995 317.87645 L 444.828 315.2027 L 447.50175 311.94465 L 449.48855 308.22765 L 450.712 304.1944 L 451.12515 300 L 450.712 295.8056 L 449.48855 291.77235 L 447.50175 288.05535 L 444.828 284.7973 L 441.56995 282.12355 L 437.8529 280.13675 L 433.8197 278.91325 L 429.6253 278.50015 L 370.3747 278.50015 L 366.1803 278.91325 L 362.1471 280.13675 L 358.43005 282.12355 L 355.172 284.7973 L 352.49825 288.05535 L 350.51145 291.77235 L 349.288 295.8056 L 348.87485 300 L 349.288 304.1944 L 350.51145 308.22765 L 352.49825 311.94465 L 355.172 315.2027 L 358.43005 317.87645 L 362.1471 319.86325 L 366.1803 321.08675 L 370.3747 321.49985 Z M 177.75 494.74945 L 181.94439999999997 494.3363 L 185.97765 493.11285 L 189.69465 491.12604999999996 L 192.95270000000002 488.45230000000004 L 195.62645 485.19425 L 197.61325 481.47720000000004 L 198.83675 477.44399999999996 L 199.24984999999998 473.2496 L 199.24984999999998 413.999 L 198.83675 409.8046 L 197.61325 405.77139999999997 L 195.62645 402.05435 L 192.95270000000002 398.7963 L 189.69465 396.12255 L 185.97765 394.13575000000003 L 181.94439999999997 392.9123 L 177.75 392.49915 L 173.5556 392.9123 L 169.52235 394.13575000000003 L 165.80534999999998 396.12255 L 162.5473 398.7963 L 159.87355000000002 402.05435 L 157.88674999999998 405.77139999999997 L 156.66324999999998 409.8046 L 156.25015000000002 413.999 L 156.25015000000002 473.2496 L 156.66324999999998 477.44399999999996 L 157.88674999999998 481.47720000000004 L 159.87355000000002 485.19425 L 162.5473 488.45230000000004 L 165.80534999999998 491.12604999999996 L 169.52235 493.11285 L 173.5556 494.3363 L 177.75 494.74945 Z M 241.25 494.74945 L 245.4444 494.3363 L 249.47764999999998 493.11285 L 253.19465000000002 491.12604999999996 L 256.4527 488.45230000000004 L 259.12645 485.19425 L 261.11325 481.47720000000004 L 262.33675 477.44399999999996 L 262.74985000000004 473.2496 L 262.74985000000004 413.999 L 262.33675 409.8046 L 261.11325 405.77139999999997 L 259.12645 402.05435 L 256.4527 398.7963 L 253.19465000000002 396.12255 L 249.47764999999998 394.13575000000003 L 245.4444 392.9123 L 241.25 392.49915 L 237.0556 392.9123 L 233.02235 394.13575000000003 L 229.30535 396.12255 L 226.0473 398.7963 L 223.37355000000002 402.05435 L 221.38675 405.77139999999997 L 220.16325 409.8046 L 219.75015 413.999 L 219.75015 473.2496 L 220.16325 477.44399999999996 L 221.38675 481.47720000000004 L 223.37355000000002 485.19425 L 226.0473 488.45230000000004 L 229.30535 491.12604999999996 L 233.02235 493.11285 L 237.0556 494.3363 L 241.25 494.74945 Z M 304.75 494.74945 L 308.9444 494.3363 L 312.97765 493.11285 L 316.69465 491.12604999999996 L 319.9527 488.45230000000004 L 322.62645 485.19425 L 324.61325 481.47720000000004 L 325.83675 477.44399999999996 L 326.24985 473.2496 L 326.24985 413.999 L 325.83675 409.8046 L 324.61325 405.77139999999997 L 322.62645 402.05435 L 319.9527 398.7963 L 316.69465 396.12255 L 312.97765 394.13575000000003 L 308.9444 392.9123 L 304.75 392.49915 L 300.5556 392.9123 L 296.52235 394.13575000000003 L 292.80535 396.12255 L 289.5473 398.7963 L 286.87355 402.05435 L 284.88675 405.77139999999997 L 283.66325 409.8046 L 283.25015 413.999 L 283.25015 473.2496 L 283.66325 477.44399999999996 L 284.88675 481.47720000000004 L 286.87355 485.19425 L 289.5473 488.45230000000004 L 292.80535 491.12604999999996 L 296.52235 493.11285 L 300.5556 494.3363 L 304.75 494.74945 Z M 368.25 494.74945 L 372.4444 494.3363 L 376.47765 493.11285 L 380.19465 491.12604999999996 L 383.4527 488.45230000000004 L 386.12645 485.19425 L 388.11325 481.47720000000004 L 389.33675 477.44399999999996 L 389.74985 473.2496 L 389.74985 413.999 L 389.33675 409.8046 L 388.11325 405.77139999999997 L 386.12645 402.05435 L 383.4527 398.7963 L 380.19465 396.12255 L 376.47765 394.13575000000003 L 372.4444 392.9123 L 368.25 392.49915 L 364.0556 392.9123 L 360.02235 394.13575000000003 L 356.30535 396.12255 L 353.0473 398.7963 L 350.37355 402.05435 L 348.38675 405.77139999999997 L 347.16325 409.8046 L 346.75015 413.999 L 346.75015 473.2496 L 347.16325 477.44399999999996 L 348.38675 481.47720000000004 L 350.37355 485.19425 L 353.0473 488.45230000000004 L 356.30535 491.12604999999996 L 360.02235 493.11285 L 364.0556 494.3363 L 368.25 494.74945 Z M 431.75 494.74945 L 435.9444 494.3363 L 439.97765 493.11285 L 443.69465 491.12604999999996 L 446.9527 488.45230000000004 L 449.62645 485.19425 L 451.61325 481.47720000000004 L 452.83675 477.44399999999996 L 453.24985 473.2496 L 453.24985 413.999 L 452.83675 409.8046 L 451.61325 405.77139999999997 L 449.62645 402.05435 L 446.9527 398.7963 L 443.69465 396.12255 L 439.97765 394.13575000000003 L 435.9444 392.9123 L 431.75 392.49915 L 427.5556 392.9123 L 423.52235 394.13575000000003 L 419.80535 396.12255 L 416.5473 398.7963 L 413.87355 402.05435 L 411.88675 405.77139999999997 L 410.66325 409.8046 L 410.25015 413.999 L 410.25015 473.2496 L 410.66325 477.44399999999996 L 411.88675 481.47720000000004 L 413.87355 485.19425 L 416.5473 488.45230000000004 L 419.80535 491.12604999999996 L 423.52235 493.11285 L 427.5556 494.3363 L 431.75 494.74945 Z M 495.25 494.74945 L 499.4444 494.3363 L 503.47765 493.11285 L 507.19465 491.12604999999996 L 510.4527 488.45230000000004 L 513.12645 485.19425 L 515.11325 481.47720000000004 L 516.33675 477.44399999999996 L 516.74985 473.2496 L 516.74985 413.999 L 516.33675 409.8046 L 515.11325 405.77139999999997 L 513.12645 402.05435 L 510.4527 398.7963 L 507.19465 396.12255 L 503.47765 394.13575000000003 L 499.4444 392.9123 L 495.25 392.49915 L 491.0556 392.9123 L 487.02235 394.13575000000003 L 483.30535 396.12255 L 480.0473 398.7963 L 477.37355 402.05435 L 475.38675 405.77139999999997 L 474.16325 409.8046 L 473.75015 413.999 L 473.75015 473.2496 L 474.16325 477.44399999999996 L 475.38675 481.47720000000004 L 477.37355 485.19425 L 480.0473 488.45230000000004 L 483.30535 491.12604999999996 L 487.02235 493.11285 L 491.0556 494.3363 L 495.25 494.74945 Z M 558.75 494.74945 L 562.9444 494.3363 L 566.97765 493.11285 L 570.69465 491.12604999999996 L 573.9527 488.45230000000004 L 576.62645 485.19425 L 578.61325 481.47720000000004 L 579.8367499999999 477.44399999999996 L 580.24985 473.2496 L 580.24985 413.999 L 579.8367499999999 409.8046 L 578.61325 405.77139999999997 L 576.62645 402.05435 L 573.9527 398.7963 L 570.69465 396.12255 L 566.97765 394.13575000000003 L 562.9444 392.9123 L 558.75 392.49915 L 554.5556 392.9123 L 550.52235 394.13575000000003 L 546.80535 396.12255 L 543.5473 398.7963 L 540.87355 402.05435 L 538.88675 405.77139999999997 L 537.6632500000001 409.8046 L 537.25015 413.999 L 537.25015 473.2496 L 537.6632500000001 477.44399999999996 L 538.88675 481.47720000000004 L 540.87355 485.19425 L 543.5473 488.45230000000004 L 546.80535 491.12604999999996 L 550.52235 493.11285 L 554.5556 494.3363 L 558.75 494.74945 Z M 622.25 494.74945 L 626.4444 494.3363 L 630.47765 493.11285 L 634.19465 491.12604999999996 L 637.4527 488.45230000000004 L 640.12645 485.19425 L 642.11325 481.47720000000004 L 643.33675 477.44399999999996 L 643.7498499999999 473.2496 L 643.7498499999999 413.999 L 643.33675 409.8046 L 642.11325 405.77139999999997 L 640.12645 402.05435 L 637.4527 398.7963 L 634.19465 396.12255 L 630.47765 394.13575000000003 L 626.4444 392.9123 L 622.25 392.49915 L 618.0556 392.9123 L 614.02235 394.13575000000003 L 610.30535 396.12255 L 607.0473 398.7963 L 604.37355 402.05435 L 602.38675 405.77139999999997 L 601.1632500000001 409.8046 L 600.7501500000001 413.999 L 600.7501500000001 473.2496 L 601.1632500000001 477.44399999999996 L 602.38675 481.47720000000004 L 604.37355 485.19425 L 607.0473 488.45230000000004 L 610.30535 491.12604999999996 L 614.02235 493.11285 L 618.0556 494.3363 L 622.25 494.74945 Z" fill="rgb(200, 52, 52)" fill-rule="evenodd" fill-opacity="0.5" data-type="pcb_copper_pour" data-pcb-layer="top"/></svg>

package/tests/connectivity-key-api.test.ts

@@ -0,0 +1,100 @@
+import { expect, test } from "bun:test"
+import type { AnyCircuitElement } from "circuit-json"
+import { getFullConnectivityMapFromCircuitJson } from "circuit-json-to-connectivity-map"
+import { convertCircuitJsonToInputProblem } from "lib/circuit-json/convert-circuit-json-to-input-problem"
+
+const circuitJson = [
+  {
+    type: "pcb_board",
+    pcb_board_id: "pcb_board_0",
+    center: { x: 0, y: 0 },
+    width: 10,
+    height: 10,
+    thickness: 1.4,
+    num_layers: 2,
+    material: "fr4",
+  },
+  {
+    type: "source_net",
+    source_net_id: "source_net_gnd",
+    name: "GND",
+    subcircuit_connectivity_map_key: "stable_subcircuit_net_gnd",
+  },
+  {
+    type: "source_trace",
+    source_trace_id: "source_trace_gnd",
+    connected_source_net_ids: ["source_net_gnd"],
+    connected_source_port_ids: ["source_port_gnd"],
+    subcircuit_connectivity_map_key: "stable_subcircuit_net_gnd",
+  },
+  {
+    type: "source_port",
+    source_port_id: "source_port_gnd",
+    source_component_id: "source_component_r1",
+    name: "1",
+    subcircuit_connectivity_map_key: "stable_subcircuit_net_gnd",
+  },
+  {
+    type: "pcb_port",
+    pcb_port_id: "pcb_port_gnd",
+    pcb_component_id: "pcb_component_r1",
+    source_port_id: "source_port_gnd",
+    x: 0,
+    y: 0,
+    layers: ["top"],
+  },
+  {
+    type: "pcb_smtpad",
+    pcb_smtpad_id: "pcb_smtpad_gnd",
+    pcb_component_id: "pcb_component_r1",
+    pcb_port_id: "pcb_port_gnd",
+    layer: "top",
+    shape: "rect",
+    x: 0,
+    y: 0,
+    width: 1,
+    height: 1,
+    port_hints: ["1"],
+  },
+] as AnyCircuitElement[]
+
+test("circuit-json adapter resolves pours to subcircuit connectivity keys", () => {
+  const connectivityMap = getFullConnectivityMapFromCircuitJson(circuitJson)
+  const generatedConnectivityMapKey =
+    connectivityMap.getNetConnectedToId("source_net_gnd")
+
+  expect(generatedConnectivityMapKey).toBeDefined()
+  expect(generatedConnectivityMapKey).not.toBe("stable_subcircuit_net_gnd")
+
+  const inputProblem = convertCircuitJsonToInputProblem(circuitJson, {
+    layer: "top",
+    source_net_id: "source_net_gnd",
+    pad_margin: 0.2,
+    trace_margin: 0.2,
+  })
+
+  expect(inputProblem.regionsForPour[0]?.connectivityKey).toBe(
+    "stable_subcircuit_net_gnd",
+  )
+  expect(
+    inputProblem.pads.find((pad) => pad.padId === "pcb_smtpad_gnd"),
+  ).toMatchObject({
+    connectivityKey: "stable_subcircuit_net_gnd",
+  })
+})
+
+test("circuit-json adapter rejects generated connectivity map keys", () => {
+  const generatedConnectivityMapKey =
+    getFullConnectivityMapFromCircuitJson(circuitJson).getNetConnectedToId(
+      "source_net_gnd",
+    )
+
+  expect(() =>
+    convertCircuitJsonToInputProblem(circuitJson, {
+      layer: "top",
+      pour_connectivity_key: generatedConnectivityMapKey!,
+      pad_margin: 0.2,
+      trace_margin: 0.2,
+    }),
+  ).toThrow(/subcircuit_connectivity_map_key/)
+})