circuit-to-canvas 0.0.50 → 0.0.52

package/tests/elements/pcb-plated-hole-soldermask-margin.test.ts

@@ -217,7 +217,7 @@ test("draw plated holes with positive and negative soldermask margins", async ()
   ]
 
   drawer.setCameraBounds({ minX: -8, maxX: 8, minY: -6.5, maxY: 6.5 })
-  drawer.drawElements(circuit)
+  drawer.drawElements(circuit, { drawSoldermask: true })
 
   await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
     import.meta.path,

package/tests/elements/pcb-plated-hole.test.ts

@@ -1,6 +1,6 @@
 import { expect, test } from "bun:test"
 import { createCanvas } from "@napi-rs/canvas"
-import type { PcbPlatedHole } from "circuit-json"
+import type { PcbBoard, PcbPlatedHole } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 
 test("draw circular plated hole", async () => {
@@ -22,7 +22,19 @@ test("draw circular plated hole", async () => {
     layers: ["top", "bottom"],
   }
 
-  drawer.drawElements([hole])
+  const board: PcbBoard = {
+    type: "pcb_board",
+    pcb_board_id: "board1",
+    center: { x: 50, y: 50 },
+    width: 100,
+    height: 100,
+    thickness: 1.6,
+    num_layers: 2,
+    material: "fr4",
+  }
+
+  drawer.setCameraBounds({ minX: 0, maxX: 100, minY: 0, maxY: 100 })
+  drawer.drawElements([board, hole], { drawBoardMaterial: true })
 
   await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
     import.meta.path,
@@ -51,7 +63,19 @@ test("draw oval plated hole", async () => {
     ccw_rotation: 0,
   }
 
-  drawer.drawElements([hole])
+  const board: PcbBoard = {
+    type: "pcb_board",
+    pcb_board_id: "board1",
+    center: { x: 50, y: 50 },
+    width: 100,
+    height: 100,
+    thickness: 1.6,
+    num_layers: 2,
+    material: "fr4",
+  }
+
+  drawer.setCameraBounds({ minX: 0, maxX: 100, minY: 0, maxY: 100 })
+  drawer.drawElements([board, hole], { drawBoardMaterial: true })
 
   await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
     import.meta.path,
@@ -81,7 +105,19 @@ test("draw pill plated hole", async () => {
     ccw_rotation: 0,
   }
 
-  drawer.drawElements([hole])
+  const board: PcbBoard = {
+    type: "pcb_board",
+    pcb_board_id: "board1",
+    center: { x: 50, y: 50 },
+    width: 100,
+    height: 100,
+    thickness: 1.6,
+    num_layers: 2,
+    material: "fr4",
+  }
+
+  drawer.setCameraBounds({ minX: 0, maxX: 100, minY: 0, maxY: 100 })
+  drawer.drawElements([board, hole], { drawBoardMaterial: true })
 
   await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
     import.meta.path,

package/tests/elements/pcb-smtpad-asymmetric-soldermask-margin.test.ts

@@ -132,7 +132,7 @@ test("draw smt pads with asymmetric soldermask margins", async () => {
   ]
 
   drawer.setCameraBounds({ minX: -7, maxX: 7, minY: -5, maxY: 5 })
-  drawer.drawElements(circuit)
+  drawer.drawElements(circuit, { drawSoldermask: true })
 
   await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
     import.meta.path,

package/tests/elements/pcb-smtpad-soldermask-coverage.test.ts

@@ -154,7 +154,7 @@ test("draw smt pads fully covered with soldermask and board with soldermask", as
   ]
 
   drawer.setCameraBounds({ minX: -7, maxX: 7, minY: -5, maxY: 5 })
-  drawer.drawElements(circuit)
+  drawer.drawElements(circuit, { drawSoldermask: true })
 
   await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
     import.meta.path,

package/tests/elements/pcb-smtpad-soldermask-margin.test.ts

@@ -165,7 +165,7 @@ test("draw smt pads with positive and negative soldermask margins", async () =>
   ]
 
   drawer.setCameraBounds({ minX: -7, maxX: 7, minY: -5, maxY: 5 })
-  drawer.drawElements(circuit)
+  drawer.drawElements(circuit, { drawSoldermask: true })
 
   await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
     import.meta.path,

package/tests/fixtures/getStackedPngSvgComparison.ts

@@ -1,15 +1,16 @@
 import { createCanvas } from "@napi-rs/canvas"
+import { getBoundsOfPcbElements } from "@tscircuit/circuit-json-util"
+import type { Bounds } from "@tscircuit/math-utils"
 import type { AnyCircuitElement } from "circuit-json"
 import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
-import type { Bounds } from "@tscircuit/math-utils"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 import { stackPngsVertically, svgToPng } from "./stackPngsVertically"
-import { getBoundsOfPcbElements } from "@tscircuit/circuit-json-util"
 
 export interface StackedPngSvgComparisonOptions {
   width?: number
   height?: number
   padding?: number
+  drawSoldermask?: boolean
 }
 
 /**
@@ -23,7 +24,12 @@ export async function getStackedPngSvgComparison(
   circuitJson: AnyCircuitElement[],
   options: StackedPngSvgComparisonOptions = {},
 ): Promise<Buffer> {
-  const { width = 400, height = 800, padding = 4 } = options
+  const {
+    width = 400,
+    height = 800,
+    padding = 4,
+    drawSoldermask = false,
+  } = options
 
   const bounds = getBoundsOfPcbElements(circuitJson)
 
@@ -41,7 +47,7 @@ export async function getStackedPngSvgComparison(
     minY: bounds.minY,
     maxY: bounds.maxY,
   })
-  drawer.drawElements(circuitJson)
+  drawer.drawElements(circuitJson, { drawSoldermask })
 
   const canvasPng = canvas.toBuffer("image/png")