circuit-to-canvas 0.0.45 → 0.0.46

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

@@ -0,0 +1,330 @@
+import { expect, test } from "bun:test"
+import { createCanvas } from "@napi-rs/canvas"
+import { CircuitToCanvasDrawer } from "../../lib/drawer"
+
+/**
+ * Comprehensive test for soldermask margin functionality:
+ * - Row 1: Fully covered elements (is_covered_with_solder_mask = true)
+ * - Row 2: Positive margin (soldermask_margin = 0.5)
+ * - Row 3: Negative margin (soldermask_margin = -0.3)
+ * - Row 4: Default behavior (no margin specified)
+ *
+ * Tests different element types: SMT pads, plated holes, and holes
+ */
+test("comprehensive soldermask margin test", async () => {
+  const canvas = createCanvas(1200, 1000)
+  const ctx = canvas.getContext("2d")
+  const drawer = new CircuitToCanvasDrawer(ctx)
+
+  ctx.fillStyle = "#1a1a1a"
+  ctx.fillRect(0, 0, 1200, 1000)
+
+  const circuit: any = [
+    {
+      type: "pcb_board",
+      pcb_board_id: "board_test",
+      center: { x: 0, y: 0 },
+      width: 50,
+      height: 40,
+      thickness: 1.6,
+      num_layers: 2,
+      material: "fr4",
+    },
+    // Dummy component for silkscreen elements
+    {
+      type: "pcb_component",
+      pcb_component_id: "dummy_component",
+      center: { x: 0, y: 0 },
+      width: 50,
+      height: 40,
+      rotation: 0,
+      layer: "top",
+      source_component_id: "dummy",
+      obstructs_within_bounds: false,
+    },
+    // Row 1: Fully covered elements (is_covered_with_solder_mask = true)
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_fully_covered_1",
+      shape: "circle",
+      x: -18,
+      y: 12,
+      radius: 1,
+      layer: "top",
+      is_covered_with_solder_mask: true,
+    },
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_fully_covered_square",
+      shape: "rect",
+      x: -12,
+      y: 12,
+      width: 2,
+      height: 2,
+      layer: "top",
+      is_covered_with_solder_mask: true,
+    },
+    {
+      type: "pcb_plated_hole",
+      pcb_plated_hole_id: "hole_fully_covered",
+      shape: "circle",
+      x: -5,
+      y: 12,
+      hole_diameter: 1,
+      outer_diameter: 2,
+      layers: ["top", "bottom"],
+      is_covered_with_solder_mask: true,
+    },
+    {
+      type: "pcb_hole",
+      pcb_hole_id: "np_hole_fully_covered",
+      hole_shape: "circle",
+      x: 5,
+      y: 12,
+      hole_diameter: 1,
+      is_covered_with_solder_mask: true,
+    },
+    // Row 2: Positive margin (soldermask_margin = 0.5)
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_positive_margin_1",
+      shape: "circle",
+      x: -18,
+      y: 4,
+      radius: 1,
+      layer: "top",
+      soldermask_margin: 0.5,
+    },
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_positive_margin_square",
+      shape: "rect",
+      x: -12,
+      y: 4,
+      width: 2,
+      height: 2,
+      layer: "top",
+      soldermask_margin: 0.5,
+    },
+    {
+      type: "pcb_plated_hole",
+      pcb_plated_hole_id: "hole_positive_margin",
+      shape: "circle",
+      x: -5,
+      y: 4,
+      hole_diameter: 1,
+      outer_diameter: 2,
+      layers: ["top", "bottom"],
+      soldermask_margin: 0.5,
+    },
+    {
+      type: "pcb_hole",
+      pcb_hole_id: "np_hole_positive_margin",
+      hole_shape: "circle",
+      x: 5,
+      y: 4,
+      hole_diameter: 1,
+      soldermask_margin: 0.5,
+    },
+    // Row 3: Negative margin (soldermask_margin = -0.3)
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_negative_margin_1",
+      shape: "circle",
+      x: -18,
+      y: -4,
+      radius: 1,
+      layer: "top",
+      soldermask_margin: -0.3,
+    },
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_negative_margin_square",
+      shape: "rect",
+      x: -12,
+      y: -4,
+      width: 2,
+      height: 2,
+      layer: "top",
+      soldermask_margin: -0.3,
+    },
+    {
+      type: "pcb_plated_hole",
+      pcb_plated_hole_id: "hole_negative_margin",
+      shape: "circle",
+      x: -5,
+      y: -4,
+      hole_diameter: 1,
+      outer_diameter: 2,
+      layers: ["top", "bottom"],
+      soldermask_margin: -0.3,
+    },
+    {
+      type: "pcb_hole",
+      pcb_hole_id: "np_hole_negative_margin",
+      hole_shape: "circle",
+      x: 5,
+      y: -4,
+      hole_diameter: 1,
+      soldermask_margin: -0.3,
+    },
+    // Row 4: Default behavior (no margin specified)
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_default_1",
+      shape: "circle",
+      x: -18,
+      y: -12,
+      radius: 1,
+      layer: "top",
+    },
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_default_square",
+      shape: "rect",
+      x: -12,
+      y: -12,
+      width: 2,
+      height: 2,
+      layer: "top",
+    },
+    {
+      type: "pcb_plated_hole",
+      pcb_plated_hole_id: "hole_default",
+      shape: "circle",
+      x: -5,
+      y: -12,
+      hole_diameter: 1,
+      outer_diameter: 2,
+      layers: ["top", "bottom"],
+    },
+    {
+      type: "pcb_hole",
+      pcb_hole_id: "np_hole_default",
+      hole_shape: "circle",
+      x: 5,
+      y: -12,
+      hole_diameter: 1,
+    },
+    // Silkscreen labels for each row
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "label_fully_covered",
+      pcb_component_id: "dummy_component",
+      text: "FULLY COVERED",
+      layer: "top",
+      anchor_position: { x: 15, y: 12 },
+      anchor_alignment: "center",
+      font_size: 1,
+      font: "tscircuit2024",
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "label_positive_margin",
+      pcb_component_id: "dummy_component",
+      text: "POSITIVE MARGIN",
+      layer: "top",
+      anchor_position: { x: 15, y: 4 },
+      anchor_alignment: "center",
+      font_size: 1,
+      font: "tscircuit2024",
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "label_negative_margin",
+      pcb_component_id: "dummy_component",
+      text: "NEGATIVE MARGIN",
+      layer: "top",
+      anchor_position: { x: 15, y: -4 },
+      anchor_alignment: "center",
+      font_size: 1,
+      font: "tscircuit2024",
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "label_default",
+      pcb_component_id: "dummy_component",
+      text: "DEFAULT",
+      layer: "top",
+      anchor_position: { x: 15, y: -12 },
+      anchor_alignment: "center",
+      font_size: 1,
+      font: "tscircuit2024",
+    },
+    // Silkscreen lines separating rows
+    {
+      type: "pcb_silkscreen_path",
+      pcb_silkscreen_path_id: "separator_1",
+      pcb_component_id: "dummy_component",
+      layer: "top",
+      stroke_width: 0.1,
+      route: [
+        { x: -25, y: 8 },
+        { x: 25, y: 8 },
+      ],
+    },
+    {
+      type: "pcb_silkscreen_path",
+      pcb_silkscreen_path_id: "separator_2",
+      pcb_component_id: "dummy_component",
+      layer: "top",
+      stroke_width: 0.1,
+      route: [
+        { x: -25, y: 0 },
+        { x: 25, y: 0 },
+      ],
+    },
+    {
+      type: "pcb_silkscreen_path",
+      pcb_silkscreen_path_id: "separator_3",
+      pcb_component_id: "dummy_component",
+      layer: "top",
+      stroke_width: 0.1,
+      route: [
+        { x: -25, y: -8 },
+        { x: 25, y: -8 },
+      ],
+    },
+    // Column labels
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "label_pad",
+      pcb_component_id: "dummy_component",
+      text: "PADS",
+      layer: "top",
+      anchor_position: { x: -15, y: 16 },
+      anchor_alignment: "center",
+      font_size: 0.8,
+      font: "tscircuit2024",
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "label_plated_hole",
+      pcb_component_id: "dummy_component",
+      text: "PLATED HOLE",
+      layer: "top",
+      anchor_position: { x: -5, y: 16 },
+      anchor_alignment: "center",
+      font_size: 0.8,
+      font: "tscircuit2024",
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "label_hole",
+      pcb_component_id: "dummy_component",
+      text: "HOLE",
+      layer: "top",
+      anchor_position: { x: 5, y: 16 },
+      anchor_alignment: "center",
+      font_size: 0.8,
+      font: "tscircuit2024",
+    },
+  ]
+
+  drawer.setCameraBounds({ minX: -30, maxX: 30, minY: -20, maxY: 20 })
+  drawer.drawElements(circuit)
+
+  await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
+    import.meta.path,
+  )
+})

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

@@ -26,7 +26,7 @@ test("draw holes with positive soldermask margins", async () => {
       x: -4,
       y: 2,
       hole_diameter: 1.0,
-      is_covered_with_solder_mask: true,
+
       soldermask_margin: 0.2,
     },
     // Square with positive margin
@@ -37,7 +37,7 @@ test("draw holes with positive soldermask margins", async () => {
       x: -1,
       y: 2,
       hole_diameter: 1.0,
-      is_covered_with_solder_mask: true,
+
       soldermask_margin: 0.15,
     },
     // Oval with positive margin
@@ -49,7 +49,7 @@ test("draw holes with positive soldermask margins", async () => {
       y: 2,
       hole_width: 1.5,
       hole_height: 0.8,
-      is_covered_with_solder_mask: true,
+
       soldermask_margin: 0.1,
     },
     // Rect with positive margin
@@ -61,7 +61,7 @@ test("draw holes with positive soldermask margins", async () => {
       y: 2,
       hole_width: 1.6,
       hole_height: 1.1,
-      is_covered_with_solder_mask: true,
+
       soldermask_margin: 0.15,
     },
     // Pill with positive margin
@@ -73,7 +73,7 @@ test("draw holes with positive soldermask margins", async () => {
       y: 0,
       hole_width: 2.0,
       hole_height: 0.8,
-      is_covered_with_solder_mask: true,
+
       soldermask_margin: 0.1,
     },
     // Silkscreen labels for positive margin holes

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

@@ -29,7 +29,7 @@ test("draw plated holes with positive and negative soldermask margins", async ()
       outer_diameter: 2,
       hole_diameter: 1,
       layers: ["top", "bottom"],
-      is_covered_with_solder_mask: true,
+
       soldermask_margin: 0.2,
     },
     // Circle with negative margin (spacing around copper, copper visible)
@@ -42,7 +42,7 @@ test("draw plated holes with positive and negative soldermask margins", async ()
       outer_diameter: 2,
       hole_diameter: 1,
       layers: ["top", "bottom"],
-      is_covered_with_solder_mask: true,
+
       soldermask_margin: -0.15,
     },
     // Oval with positive margin
@@ -58,7 +58,7 @@ test("draw plated holes with positive and negative soldermask margins", async ()
       hole_height: 0.8,
       layers: ["top", "bottom"],
       ccw_rotation: 0,
-      is_covered_with_solder_mask: true,
+
       soldermask_margin: 0.15,
     },
     // Oval with negative margin
@@ -74,7 +74,7 @@ test("draw plated holes with positive and negative soldermask margins", async ()
       hole_height: 0.8,
       layers: ["top", "bottom"],
       ccw_rotation: 0,
-      is_covered_with_solder_mask: true,
+
       soldermask_margin: -0.2,
     },
     // Pill with positive margin
@@ -90,7 +90,7 @@ test("draw plated holes with positive and negative soldermask margins", async ()
       hole_height: 1,
       layers: ["top", "bottom"],
       ccw_rotation: 0,
-      is_covered_with_solder_mask: true,
+
       soldermask_margin: 0.1,
     },
     // Pill with negative margin
@@ -106,7 +106,7 @@ test("draw plated holes with positive and negative soldermask margins", async ()
       hole_height: 1,
       layers: ["top", "bottom"],
       ccw_rotation: 0,
-      is_covered_with_solder_mask: true,
+
       soldermask_margin: -0.12,
     },
     // Rectangular pad with circular hole - positive margin
@@ -121,7 +121,7 @@ test("draw plated holes with positive and negative soldermask margins", async ()
       rect_border_radius: 0.2,
       hole_diameter: 1,
       layers: ["top", "bottom"],
-      is_covered_with_solder_mask: true,
+
       soldermask_margin: 0.15,
     },
     // Rectangular pad with circular hole - negative margin
@@ -136,7 +136,7 @@ test("draw plated holes with positive and negative soldermask margins", async ()
       rect_border_radius: 0.2,
       hole_diameter: 1,
       layers: ["top", "bottom"],
-      is_covered_with_solder_mask: true,
+
       soldermask_margin: -0.1,
     },
     // Silkscreen labels for positive margin holes (top row)

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

@@ -28,7 +28,6 @@ test("draw smt pads with positive and negative soldermask margins", async () =>
       y: 2,
       width: 1.6,
       height: 1.1,
-      is_covered_with_solder_mask: true,
       soldermask_margin: 0.2,
     },
     // Rectangle with negative margin (spacing around copper, copper visible)
@@ -41,7 +40,6 @@ test("draw smt pads with positive and negative soldermask margins", async () =>
       y: -2,
       width: 1.6,
       height: 1.1,
-      is_covered_with_solder_mask: true,
       soldermask_margin: -0.15,
     },
     // Circle with positive margin
@@ -53,7 +51,6 @@ test("draw smt pads with positive and negative soldermask margins", async () =>
       x: 0,
       y: 2,
       radius: 0.75,
-      is_covered_with_solder_mask: true,
       soldermask_margin: 0.15,
     },
     // Circle with negative margin
@@ -65,7 +62,6 @@ test("draw smt pads with positive and negative soldermask margins", async () =>
       x: 0,
       y: -2,
       radius: 0.75,
-      is_covered_with_solder_mask: true,
       soldermask_margin: -0.2,
     },
     // Pill with positive margin
@@ -79,7 +75,6 @@ test("draw smt pads with positive and negative soldermask margins", async () =>
       width: 2.4,
       height: 1,
       radius: 0.5,
-      is_covered_with_solder_mask: true,
       soldermask_margin: 0.1,
     },
     // Pill with negative margin
@@ -93,7 +88,6 @@ test("draw smt pads with positive and negative soldermask margins", async () =>
       width: 2.4,
       height: 1,
       radius: 0.5,
-      is_covered_with_solder_mask: true,
       soldermask_margin: -0.12,
     },
     // Silkscreen labels for positive margin pads (top row)