circuit-to-canvas 0.0.49 → 0.0.51

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, { showSoldermask: 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])
 
   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])
 
   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])
 
   await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
     import.meta.path,

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

@@ -0,0 +1,140 @@
+import { expect, test } from "bun:test"
+import { createCanvas } from "@napi-rs/canvas"
+import type { AnyCircuitElement } from "circuit-json"
+import { CircuitToCanvasDrawer } from "../../lib/drawer"
+
+test("draw smt pads with asymmetric soldermask margins", async () => {
+  const canvas = createCanvas(800, 600)
+  const ctx = canvas.getContext("2d")
+  const drawer = new CircuitToCanvasDrawer(ctx)
+
+  ctx.fillStyle = "#1a1a1a"
+  ctx.fillRect(0, 0, 800, 600)
+
+  const circuit: AnyCircuitElement[] = [
+    {
+      type: "pcb_board",
+      pcb_board_id: "board0",
+      center: { x: 0, y: 0 },
+      width: 14,
+      height: 10,
+      thickness: 1.6,
+      num_layers: 2,
+      material: "fr4",
+    },
+    // Rectangle with asymmetric positive margins
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_rect_pos_asym",
+      shape: "rect",
+      layer: "top",
+      x: -4,
+      y: 2,
+      width: 2,
+      height: 1,
+      soldermask_margin_left: 0.5,
+      soldermask_margin_right: 0.1,
+      soldermask_margin_top: 0.2,
+      soldermask_margin_bottom: 0.8,
+    },
+    // Rectangle with asymmetric negative margins
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_rect_neg_asym",
+      shape: "rect",
+      layer: "top",
+      x: -4,
+      y: -2,
+      width: 2,
+      height: 1.5,
+      soldermask_margin_left: -0.2,
+      soldermask_margin_right: -0.6,
+      soldermask_margin_top: -0.1,
+      soldermask_margin_bottom: -0.4,
+    },
+    // Rotated rectangle with asymmetric positive margins
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_rot_rect_pos_asym",
+      shape: "rotated_rect",
+      layer: "top",
+      x: 4,
+      y: 2,
+      width: 2,
+      height: 1,
+      ccw_rotation: 45,
+      soldermask_margin_left: 0.8,
+      soldermask_margin_right: 0.2,
+      soldermask_margin_top: 0.1,
+      soldermask_margin_bottom: 0.5,
+    },
+    // Rotated rectangle with asymmetric negative margins
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_rot_rect_neg_asym",
+      shape: "rotated_rect",
+      layer: "top",
+      x: 4,
+      y: -2,
+      width: 2,
+      height: 1.5,
+      ccw_rotation: 30,
+      soldermask_margin_left: -0.5,
+      soldermask_margin_right: -0.1,
+      soldermask_margin_top: -0.4,
+      soldermask_margin_bottom: -0.2,
+    },
+    // Labels
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text1",
+      pcb_component_id: "comp1",
+      layer: "top",
+      anchor_position: { x: -4, y: 3.5 },
+      anchor_alignment: "center",
+      text: "Rect Pos Asym",
+      font_size: 0.4,
+      font: "tscircuit2024",
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text2",
+      pcb_component_id: "comp1",
+      layer: "top",
+      anchor_position: { x: -4, y: -3.8 },
+      anchor_alignment: "center",
+      text: "Rect Neg Asym",
+      font_size: 0.4,
+      font: "tscircuit2024",
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text3",
+      pcb_component_id: "comp1",
+      layer: "top",
+      anchor_position: { x: 4, y: 3.8 },
+      anchor_alignment: "center",
+      text: "Rot Rect Pos Asym",
+      font_size: 0.4,
+      font: "tscircuit2024",
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text4",
+      pcb_component_id: "comp1",
+      layer: "top",
+      anchor_position: { x: 4, y: -3.8 },
+      anchor_alignment: "center",
+      text: "Rot Rect Neg Asym",
+      font_size: 0.4,
+      font: "tscircuit2024",
+    },
+  ]
+
+  drawer.setCameraBounds({ minX: -7, maxX: 7, minY: -5, maxY: 5 })
+  drawer.drawElements(circuit, { showSoldermask: 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, { showSoldermask: true })
 
   await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
     import.meta.path,

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

@@ -1,5 +1,6 @@
 import { expect, test } from "bun:test"
 import { createCanvas } from "@napi-rs/canvas"
+import type { AnyCircuitElement } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 
 test("draw smt pads with positive and negative soldermask margins", async () => {
@@ -10,13 +11,16 @@ test("draw smt pads with positive and negative soldermask margins", async () =>
   ctx.fillStyle = "#1a1a1a"
   ctx.fillRect(0, 0, 800, 600)
 
-  const circuit: any = [
+  const circuit: AnyCircuitElement[] = [
     {
       type: "pcb_board",
       pcb_board_id: "board0",
       center: { x: 0, y: 0 },
       width: 14,
       height: 10,
+      thickness: 1.6,
+      num_layers: 2,
+      material: "fr4",
     },
     // Rectangle with positive margin (mask extends beyond pad)
     {
@@ -94,62 +98,74 @@ test("draw smt pads with positive and negative soldermask margins", async () =>
     {
       type: "pcb_silkscreen_text",
       pcb_silkscreen_text_id: "text_rect_pos",
+      pcb_component_id: "comp1",
       layer: "top",
       anchor_position: { x: -4, y: 3.2 },
       anchor_alignment: "center",
       text: "+0.2mm",
       font_size: 0.4,
+      font: "tscircuit2024",
     },
     {
       type: "pcb_silkscreen_text",
       pcb_silkscreen_text_id: "text_circle_pos",
+      pcb_component_id: "comp1",
       layer: "top",
       anchor_position: { x: 0, y: 3.2 },
       anchor_alignment: "center",
       text: "+0.15mm",
       font_size: 0.4,
+      font: "tscircuit2024",
     },
     {
       type: "pcb_silkscreen_text",
       pcb_silkscreen_text_id: "text_pill_pos",
+      pcb_component_id: "comp1",
       layer: "top",
       anchor_position: { x: 4, y: 3.2 },
       anchor_alignment: "center",
       text: "+0.1mm",
       font_size: 0.4,
+      font: "tscircuit2024",
     },
     // Silkscreen labels for negative margin pads (bottom row)
     {
       type: "pcb_silkscreen_text",
       pcb_silkscreen_text_id: "text_rect_neg",
+      pcb_component_id: "comp1",
       layer: "top",
       anchor_position: { x: -4, y: -3.2 },
       anchor_alignment: "center",
       text: "-0.15mm",
       font_size: 0.4,
+      font: "tscircuit2024",
     },
     {
       type: "pcb_silkscreen_text",
       pcb_silkscreen_text_id: "text_circle_neg",
+      pcb_component_id: "comp1",
       layer: "top",
       anchor_position: { x: 0, y: -3.2 },
       anchor_alignment: "center",
       text: "-0.2mm",
       font_size: 0.4,
+      font: "tscircuit2024",
     },
     {
       type: "pcb_silkscreen_text",
       pcb_silkscreen_text_id: "text_pill_neg",
+      pcb_component_id: "comp1",
       layer: "top",
       anchor_position: { x: 4, y: -3.2 },
       anchor_alignment: "center",
       text: "-0.12mm",
       font_size: 0.4,
+      font: "tscircuit2024",
     },
   ]
 
   drawer.setCameraBounds({ minX: -7, maxX: 7, minY: -5, maxY: 5 })
-  drawer.drawElements(circuit)
+  drawer.drawElements(circuit, { showSoldermask: true })
 
   await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
     import.meta.path,

package/tests/fixtures/getStackedPngSvgComparison.ts

@@ -10,6 +10,7 @@ export interface StackedPngSvgComparisonOptions {
   width?: number
   height?: number
   padding?: number
+  showSoldermask?: 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,
+    showSoldermask = 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, { showSoldermask })
 
   const canvasPng = canvas.toBuffer("image/png")