circuit-to-canvas 0.0.39 → 0.0.41

package/dist/index.js

@@ -958,12 +958,14 @@ function getSoldermaskColor2(layer, colorMap) {
 function drawPcbSmtPad(params) {
   const { ctx, pad, realToCanvasMat, colorMap } = params;
   const color = layerToColor(pad.layer, colorMap);
-  const hasSoldermask = pad.is_covered_with_solder_mask === true && pad.soldermask_margin !== void 0 && pad.soldermask_margin !== 0;
-  const margin = hasSoldermask ? pad.soldermask_margin : 0;
+  const isCoveredWithSoldermask = pad.is_covered_with_solder_mask === true;
+  const margin = isCoveredWithSoldermask && pad.soldermask_margin !== void 0 ? pad.soldermask_margin : 0;
+  const hasSoldermask = isCoveredWithSoldermask && pad.soldermask_margin !== void 0 && pad.soldermask_margin !== 0;
   const soldermaskRingColor = getSoldermaskColor2(pad.layer, colorMap);
   const positiveMarginColor = colorMap.substrate;
+  const soldermaskOverlayColor = getSoldermaskColor2(pad.layer, colorMap);
   if (pad.shape === "rect") {
-    if (hasSoldermask && margin > 0) {
+    if (isCoveredWithSoldermask && margin >= 0) {
       drawRect({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -997,10 +999,21 @@ function drawPcbSmtPad(params) {
         color
       );
     }
+    if (isCoveredWithSoldermask && margin === 0) {
+      drawRect({
+        ctx,
+        center: { x: pad.x, y: pad.y },
+        width: pad.width,
+        height: pad.height,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat,
+        borderRadius: pad.corner_radius ?? pad.rect_border_radius ?? 0
+      });
+    }
     return;
   }
   if (pad.shape === "rotated_rect") {
-    if (hasSoldermask && margin > 0) {
+    if (isCoveredWithSoldermask && margin >= 0) {
       drawRect({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -1036,10 +1049,22 @@ function drawPcbSmtPad(params) {
         color
       );
     }
+    if (isCoveredWithSoldermask && margin === 0) {
+      drawRect({
+        ctx,
+        center: { x: pad.x, y: pad.y },
+        width: pad.width,
+        height: pad.height,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat,
+        borderRadius: pad.corner_radius ?? pad.rect_border_radius ?? 0,
+        rotation: pad.ccw_rotation ?? 0
+      });
+    }
     return;
   }
   if (pad.shape === "circle") {
-    if (hasSoldermask && margin > 0) {
+    if (isCoveredWithSoldermask && margin >= 0) {
       drawCircle({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -1066,10 +1091,19 @@ function drawPcbSmtPad(params) {
         color
       );
     }
+    if (isCoveredWithSoldermask && margin === 0) {
+      drawCircle({
+        ctx,
+        center: { x: pad.x, y: pad.y },
+        radius: pad.radius,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat
+      });
+    }
     return;
   }
   if (pad.shape === "pill") {
-    if (hasSoldermask && margin > 0) {
+    if (isCoveredWithSoldermask && margin >= 0) {
       drawPill({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -1100,10 +1134,20 @@ function drawPcbSmtPad(params) {
         color
       );
     }
+    if (isCoveredWithSoldermask && margin === 0) {
+      drawPill({
+        ctx,
+        center: { x: pad.x, y: pad.y },
+        width: pad.width,
+        height: pad.height,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat
+      });
+    }
     return;
   }
   if (pad.shape === "rotated_pill") {
-    if (hasSoldermask && margin > 0) {
+    if (isCoveredWithSoldermask && margin >= 0) {
       drawPill({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -1136,6 +1180,17 @@ function drawPcbSmtPad(params) {
         color
       );
     }
+    if (isCoveredWithSoldermask && margin === 0) {
+      drawPill({
+        ctx,
+        center: { x: pad.x, y: pad.y },
+        width: pad.width,
+        height: pad.height,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat,
+        rotation: pad.ccw_rotation ?? 0
+      });
+    }
     return;
   }
   if (pad.shape === "polygon") {
@@ -1146,6 +1201,14 @@ function drawPcbSmtPad(params) {
         fill: color,
         realToCanvasMat
       });
+      if (isCoveredWithSoldermask && margin >= 0) {
+        drawPolygon({
+          ctx,
+          points: pad.points,
+          fill: soldermaskOverlayColor,
+          realToCanvasMat
+        });
+      }
     }
     return;
   }
@@ -1582,7 +1645,8 @@ function drawPcbCutout(params) {
       height: cutout.height,
       fill: colorMap.drill,
       realToCanvasMat,
-      rotation: cutout.rotation ?? 0
+      rotation: cutout.rotation ?? 0,
+      borderRadius: cutout.corner_radius ?? 0
     });
     return;
   }

package/lib/drawer/elements/pcb-cutout.ts

@@ -24,6 +24,7 @@ export function drawPcbCutout(params: DrawPcbCutoutParams): void {
       fill: colorMap.drill,
       realToCanvasMat,
       rotation: cutout.rotation ?? 0,
+      borderRadius: cutout.corner_radius ?? 0,
     })
     return
   }

package/lib/drawer/elements/pcb-smtpad.ts

@@ -37,18 +37,24 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
   const { ctx, pad, realToCanvasMat, colorMap } = params
 
   const color = layerToColor(pad.layer, colorMap)
+  const isCoveredWithSoldermask = pad.is_covered_with_solder_mask === true
+  // When covered with soldermask, treat margin 0 or undefined as 0 positive margin
+  const margin =
+    isCoveredWithSoldermask && pad.soldermask_margin !== undefined
+      ? pad.soldermask_margin
+      : 0
   const hasSoldermask =
-    pad.is_covered_with_solder_mask === true &&
+    isCoveredWithSoldermask &&
     pad.soldermask_margin !== undefined &&
     pad.soldermask_margin !== 0
-  const margin = hasSoldermask ? pad.soldermask_margin! : 0
   const soldermaskRingColor = getSoldermaskColor(pad.layer, colorMap)
   const positiveMarginColor = colorMap.substrate
+  const soldermaskOverlayColor = getSoldermaskColor(pad.layer, colorMap)
 
   // Draw the copper pad
   if (pad.shape === "rect") {
-    // For positive margins, draw extended mask area first
-    if (hasSoldermask && margin > 0) {
+    // For positive margins (including 0), draw extended mask area first
+    if (isCoveredWithSoldermask && margin >= 0) {
       drawRect({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -94,12 +100,28 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
         color,
       )
     }
+
+    // If covered with soldermask and margin == 0 (treat as 0 positive margin), draw soldermaskOverCopper overlay
+    if (isCoveredWithSoldermask && margin === 0) {
+      drawRect({
+        ctx,
+        center: { x: pad.x, y: pad.y },
+        width: pad.width,
+        height: pad.height,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat,
+        borderRadius:
+          (pad as { corner_radius?: number }).corner_radius ??
+          pad.rect_border_radius ??
+          0,
+      })
+    }
     return
   }
 
   if (pad.shape === "rotated_rect") {
-    // For positive margins, draw extended mask area first
-    if (hasSoldermask && margin > 0) {
+    // For positive margins (including 0), draw extended mask area first
+    if (isCoveredWithSoldermask && margin >= 0) {
       drawRect({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -147,12 +169,29 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
         color,
       )
     }
+
+    // If covered with soldermask and margin == 0 (treat as 0 positive margin), draw soldermaskOverCopper overlay
+    if (isCoveredWithSoldermask && margin === 0) {
+      drawRect({
+        ctx,
+        center: { x: pad.x, y: pad.y },
+        width: pad.width,
+        height: pad.height,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat,
+        borderRadius:
+          (pad as { corner_radius?: number }).corner_radius ??
+          pad.rect_border_radius ??
+          0,
+        rotation: pad.ccw_rotation ?? 0,
+      })
+    }
     return
   }
 
   if (pad.shape === "circle") {
-    // For positive margins, draw extended mask area first
-    if (hasSoldermask && margin > 0) {
+    // For positive margins (including 0), draw extended mask area first
+    if (isCoveredWithSoldermask && margin >= 0) {
       drawCircle({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -183,12 +222,23 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
         color,
       )
     }
+
+    // If covered with soldermask and margin == 0 (treat as 0 positive margin), draw soldermaskOverCopper overlay
+    if (isCoveredWithSoldermask && margin === 0) {
+      drawCircle({
+        ctx,
+        center: { x: pad.x, y: pad.y },
+        radius: pad.radius,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat,
+      })
+    }
     return
   }
 
   if (pad.shape === "pill") {
-    // For positive margins, draw extended mask area first
-    if (hasSoldermask && margin > 0) {
+    // For positive margins (including 0), draw extended mask area first
+    if (isCoveredWithSoldermask && margin >= 0) {
       drawPill({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -223,12 +273,24 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
         color,
       )
     }
+
+    // If covered with soldermask and margin == 0 (treat as 0 positive margin), draw soldermaskOverCopper overlay
+    if (isCoveredWithSoldermask && margin === 0) {
+      drawPill({
+        ctx,
+        center: { x: pad.x, y: pad.y },
+        width: pad.width,
+        height: pad.height,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat,
+      })
+    }
     return
   }
 
   if (pad.shape === "rotated_pill") {
-    // For positive margins, draw extended mask area first
-    if (hasSoldermask && margin > 0) {
+    // For positive margins (including 0), draw extended mask area first
+    if (isCoveredWithSoldermask && margin >= 0) {
       drawPill({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -265,17 +327,41 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
         color,
       )
     }
+
+    // If covered with soldermask and margin == 0 (treat as 0 positive margin), draw soldermaskOverCopper overlay
+    if (isCoveredWithSoldermask && margin === 0) {
+      drawPill({
+        ctx,
+        center: { x: pad.x, y: pad.y },
+        width: pad.width,
+        height: pad.height,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat,
+        rotation: pad.ccw_rotation ?? 0,
+      })
+    }
     return
   }
 
   if (pad.shape === "polygon") {
     if (pad.points && pad.points.length >= 3) {
+      // Draw the copper pad
       drawPolygon({
         ctx,
         points: pad.points,
         fill: color,
         realToCanvasMat,
       })
+
+      // If covered with soldermask and margin >= 0, draw soldermaskOverCopper overlay
+      if (isCoveredWithSoldermask && margin >= 0) {
+        drawPolygon({
+          ctx,
+          points: pad.points,
+          fill: soldermaskOverlayColor,
+          realToCanvasMat,
+        })
+      }
     }
     return
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-to-canvas",
   "main": "dist/index.js",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "type": "module",
   "scripts": {
     "build": "tsup-node ./lib/index.ts --format esm --dts",

package/tests/elements/pcb-cutout.test.ts

@@ -26,7 +26,31 @@ test("draw rectangular cutout", async () => {
     import.meta.path,
   )
 })
+test("draw rectangular cutout with corner radius", async () => {
+  const canvas = createCanvas(100, 100)
+  const ctx = canvas.getContext("2d")
+  const drawer = new CircuitToCanvasDrawer(ctx)
+
+  ctx.fillStyle = "#1a1a1a"
+  ctx.fillRect(0, 0, 100, 100)
 
+  const cutout: PcbCutout = {
+    type: "pcb_cutout",
+    pcb_cutout_id: "cutout1",
+    shape: "rect",
+    center: { x: 50, y: 50 },
+    width: 30,
+    height: 20,
+    corner_radius: 10,
+  }
+
+  drawer.drawElements([cutout])
+
+  await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
+    import.meta.path,
+    "rect-cutout-with-corner-radius",
+  )
+})
 test("draw circular cutout", async () => {
   const canvas = createCanvas(100, 100)
   const ctx = canvas.getContext("2d")

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

@@ -0,0 +1,162 @@
+import { expect, test } from "bun:test"
+import { createCanvas } from "@napi-rs/canvas"
+import { CircuitToCanvasDrawer } from "../../lib/drawer"
+
+test("draw smt pads fully covered with soldermask and board with soldermask", 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: any = [
+    {
+      type: "pcb_board",
+      pcb_board_id: "board0",
+      center: { x: 0, y: 0 },
+      width: 14,
+      height: 10,
+    },
+    // Rectangle pad fully covered with soldermask (no margin)
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_rect_covered",
+      shape: "rect",
+      layer: "top",
+      x: -4,
+      y: 2,
+      width: 1.6,
+      height: 1.1,
+      is_covered_with_solder_mask: true,
+    },
+    // Circle pad fully covered with soldermask (no margin)
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_circle_covered",
+      shape: "circle",
+      layer: "top",
+      x: 0,
+      y: 2,
+      radius: 0.75,
+      is_covered_with_solder_mask: true,
+    },
+    // Pill fully covered with soldermask (no margin)
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_pill_covered",
+      shape: "pill",
+      layer: "top",
+      x: 4,
+      y: 2,
+      width: 2.4,
+      height: 1,
+      is_covered_with_solder_mask: true,
+    },
+    // Rotated rectangle pad fully covered with soldermask
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_rotated_rect_covered",
+      shape: "rotated_rect",
+      layer: "top",
+      x: -4,
+      y: -2,
+      width: 1.6,
+      height: 1.1,
+      ccw_rotation: 45,
+      is_covered_with_solder_mask: true,
+    },
+    // Rotated pill pad fully covered with soldermask
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_rotated_pill_covered",
+      shape: "rotated_pill",
+      layer: "top",
+      x: 0,
+      y: -2,
+      width: 2.4,
+      height: 1,
+      ccw_rotation: 30,
+      is_covered_with_solder_mask: true,
+    },
+    // Polygon pad fully covered with soldermask
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_polygon_covered",
+      shape: "polygon",
+      layer: "top",
+      x: 4,
+      y: -2,
+      points: [
+        { x: 3.5, y: -2.5 },
+        { x: 4.5, y: -2.5 },
+        { x: 4.5, y: -1.5 },
+        { x: 4, y: -1 },
+        { x: 3.5, y: -1.5 },
+      ],
+      is_covered_with_solder_mask: true,
+    },
+    // Silkscreen labels
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text_rect",
+      layer: "top",
+      anchor_position: { x: -4, y: 3.2 },
+      anchor_alignment: "center",
+      text: "Rect",
+      font_size: 0.4,
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text_circle",
+      layer: "top",
+      anchor_position: { x: 0, y: 3.2 },
+      anchor_alignment: "center",
+      text: "Circle",
+      font_size: 0.4,
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text_pill",
+      layer: "top",
+      anchor_position: { x: 4, y: 3.2 },
+      anchor_alignment: "center",
+      text: "Pill",
+      font_size: 0.4,
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text_rotated_rect",
+      layer: "top",
+      anchor_position: { x: -4, y: -3.2 },
+      anchor_alignment: "center",
+      text: "Rotated Rect",
+      font_size: 0.4,
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text_rotated_pill",
+      layer: "top",
+      anchor_position: { x: 0, y: -3.2 },
+      anchor_alignment: "center",
+      text: "Rot Pill",
+      font_size: 0.4,
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text_polygon",
+      layer: "top",
+      anchor_position: { x: 4, y: -3.2 },
+      anchor_alignment: "center",
+      text: "Polygon",
+      font_size: 0.4,
+    },
+  ]
+
+  drawer.setCameraBounds({ minX: -7, maxX: 7, minY: -5, maxY: 5 })
+  drawer.drawElements(circuit)
+
+  await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
+    import.meta.path,
+  )
+})