circuit-to-canvas 0.0.44 → 0.0.46

package/lib/drawer/elements/pcb-plated-hole.ts

@@ -35,11 +35,12 @@ function getSoldermaskColor(
 export function drawPcbPlatedHole(params: DrawPcbPlatedHoleParams): void {
   const { ctx, hole, realToCanvasMat, colorMap } = params
 
+  const isCoveredWithSoldermask = hole.is_covered_with_solder_mask === true
+  const margin = isCoveredWithSoldermask ? 0 : (hole.soldermask_margin ?? 0)
   const hasSoldermask =
-    hole.is_covered_with_solder_mask === true &&
+    !isCoveredWithSoldermask &&
     hole.soldermask_margin !== undefined &&
     hole.soldermask_margin !== 0
-  const margin = hasSoldermask ? hole.soldermask_margin! : 0
   const soldermaskRingColor = getSoldermaskColor(hole.layers, colorMap)
   const positiveMarginColor = colorMap.substrate
   const copperColor = colorMap.copper.top
@@ -78,14 +79,27 @@ export function drawPcbPlatedHole(params: DrawPcbPlatedHoleParams): void {
       )
     }
 
-    // Draw inner drill hole
-    drawCircle({
-      ctx,
-      center: { x: hole.x, y: hole.y },
-      radius: hole.hole_diameter / 2,
-      fill: colorMap.drill,
-      realToCanvasMat,
-    })
+    // If fully covered, draw soldermask overlay
+    if (isCoveredWithSoldermask) {
+      drawCircle({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        radius: hole.outer_diameter / 2,
+        fill: soldermaskRingColor,
+        realToCanvasMat,
+      })
+    }
+
+    // Draw inner drill hole (only if not fully covered with soldermask)
+    if (!isCoveredWithSoldermask) {
+      drawCircle({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        radius: hole.hole_diameter / 2,
+        fill: colorMap.drill,
+        realToCanvasMat,
+      })
+    }
     return
   }
 
@@ -129,16 +143,31 @@ export function drawPcbPlatedHole(params: DrawPcbPlatedHoleParams): void {
       )
     }
 
-    // Draw inner drill hole
-    drawOval({
-      ctx,
-      center: { x: hole.x, y: hole.y },
-      radius_x: hole.hole_width / 2,
-      radius_y: hole.hole_height / 2,
-      fill: colorMap.drill,
-      realToCanvasMat,
-      rotation: hole.ccw_rotation,
-    })
+    // If fully covered, draw soldermask overlay
+    if (isCoveredWithSoldermask) {
+      drawOval({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        radius_x: hole.outer_width / 2,
+        radius_y: hole.outer_height / 2,
+        fill: soldermaskRingColor,
+        realToCanvasMat,
+        rotation: hole.ccw_rotation,
+      })
+    }
+
+    // Draw inner drill hole (only if not fully covered with soldermask)
+    if (!isCoveredWithSoldermask) {
+      drawOval({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        radius_x: hole.hole_width / 2,
+        radius_y: hole.hole_height / 2,
+        fill: colorMap.drill,
+        realToCanvasMat,
+        rotation: hole.ccw_rotation,
+      })
+    }
     return
   }
 
@@ -182,16 +211,31 @@ export function drawPcbPlatedHole(params: DrawPcbPlatedHoleParams): void {
       )
     }
 
-    // Draw inner drill hole
-    drawPill({
-      ctx,
-      center: { x: hole.x, y: hole.y },
-      width: hole.hole_width,
-      height: hole.hole_height,
-      fill: colorMap.drill,
-      realToCanvasMat,
-      rotation: hole.ccw_rotation,
-    })
+    // If fully covered, draw soldermask overlay
+    if (isCoveredWithSoldermask) {
+      drawPill({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.outer_width,
+        height: hole.outer_height,
+        fill: soldermaskRingColor,
+        realToCanvasMat,
+        rotation: hole.ccw_rotation,
+      })
+    }
+
+    // Draw inner drill hole (only if not fully covered with soldermask)
+    if (!isCoveredWithSoldermask) {
+      drawPill({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.hole_width,
+        height: hole.hole_height,
+        fill: colorMap.drill,
+        realToCanvasMat,
+        rotation: hole.ccw_rotation,
+      })
+    }
     return
   }
 
@@ -236,16 +280,31 @@ export function drawPcbPlatedHole(params: DrawPcbPlatedHoleParams): void {
       )
     }
 
-    // Draw circular drill hole (with offset)
-    const holeX = hole.x + (hole.hole_offset_x ?? 0)
-    const holeY = hole.y + (hole.hole_offset_y ?? 0)
-    drawCircle({
-      ctx,
-      center: { x: holeX, y: holeY },
-      radius: hole.hole_diameter / 2,
-      fill: colorMap.drill,
-      realToCanvasMat,
-    })
+    // If fully covered, draw soldermask overlay
+    if (isCoveredWithSoldermask) {
+      drawRect({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.rect_pad_width,
+        height: hole.rect_pad_height,
+        fill: soldermaskRingColor,
+        realToCanvasMat,
+        borderRadius: hole.rect_border_radius ?? 0,
+      })
+    }
+
+    // Draw circular drill hole (with offset, only if not fully covered with soldermask)
+    if (!isCoveredWithSoldermask) {
+      const holeX = hole.x + (hole.hole_offset_x ?? 0)
+      const holeY = hole.y + (hole.hole_offset_y ?? 0)
+      drawCircle({
+        ctx,
+        center: { x: holeX, y: holeY },
+        radius: hole.hole_diameter / 2,
+        fill: colorMap.drill,
+        realToCanvasMat,
+      })
+    }
     return
   }
 
@@ -290,17 +349,32 @@ export function drawPcbPlatedHole(params: DrawPcbPlatedHoleParams): void {
       )
     }
 
-    // Draw pill drill hole (with offset)
-    const holeX = hole.x + (hole.hole_offset_x ?? 0)
-    const holeY = hole.y + (hole.hole_offset_y ?? 0)
-    drawPill({
-      ctx,
-      center: { x: holeX, y: holeY },
-      width: hole.hole_width,
-      height: hole.hole_height,
-      fill: colorMap.drill,
-      realToCanvasMat,
-    })
+    // If fully covered, draw soldermask overlay
+    if (isCoveredWithSoldermask) {
+      drawRect({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.rect_pad_width,
+        height: hole.rect_pad_height,
+        fill: soldermaskRingColor,
+        realToCanvasMat,
+        borderRadius: hole.rect_border_radius ?? 0,
+      })
+    }
+
+    // Draw pill drill hole (with offset, only if not fully covered with soldermask)
+    if (!isCoveredWithSoldermask) {
+      const holeX = hole.x + (hole.hole_offset_x ?? 0)
+      const holeY = hole.y + (hole.hole_offset_y ?? 0)
+      drawPill({
+        ctx,
+        center: { x: holeX, y: holeY },
+        width: hole.hole_width,
+        height: hole.hole_height,
+        fill: colorMap.drill,
+        realToCanvasMat,
+      })
+    }
     return
   }
 
@@ -347,18 +421,34 @@ export function drawPcbPlatedHole(params: DrawPcbPlatedHoleParams): void {
       )
     }
 
-    // Draw rotated pill drill hole (with offset)
-    const holeX = hole.x + (hole.hole_offset_x ?? 0)
-    const holeY = hole.y + (hole.hole_offset_y ?? 0)
-    drawPill({
-      ctx,
-      center: { x: holeX, y: holeY },
-      width: hole.hole_width,
-      height: hole.hole_height,
-      fill: colorMap.drill,
-      realToCanvasMat,
-      rotation: hole.hole_ccw_rotation,
-    })
+    // If fully covered, draw soldermask overlay
+    if (isCoveredWithSoldermask) {
+      drawRect({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.rect_pad_width,
+        height: hole.rect_pad_height,
+        fill: soldermaskRingColor,
+        realToCanvasMat,
+        borderRadius: hole.rect_border_radius ?? 0,
+        rotation: hole.rect_ccw_rotation,
+      })
+    }
+
+    // Draw rotated pill drill hole (with offset, only if not fully covered with soldermask)
+    if (!isCoveredWithSoldermask) {
+      const holeX = hole.x + (hole.hole_offset_x ?? 0)
+      const holeY = hole.y + (hole.hole_offset_y ?? 0)
+      drawPill({
+        ctx,
+        center: { x: holeX, y: holeY },
+        width: hole.hole_width,
+        height: hole.hole_height,
+        fill: colorMap.drill,
+        realToCanvasMat,
+        rotation: hole.hole_ccw_rotation,
+      })
+    }
     return
   }
 
@@ -380,46 +470,48 @@ export function drawPcbPlatedHole(params: DrawPcbPlatedHoleParams): void {
       })
     }
 
-    // Draw drill hole (with offset)
-    const holeX = hole.x + (hole.hole_offset_x ?? 0)
-    const holeY = hole.y + (hole.hole_offset_y ?? 0)
-    const holeShape = hole.hole_shape
+    // Draw drill hole (with offset, only if not fully covered with soldermask)
+    if (!isCoveredWithSoldermask) {
+      const holeX = hole.x + (hole.hole_offset_x ?? 0)
+      const holeY = hole.y + (hole.hole_offset_y ?? 0)
+      const holeShape = hole.hole_shape
 
-    if (holeShape === "circle") {
-      drawCircle({
-        ctx,
-        center: { x: holeX, y: holeY },
-        radius: (hole.hole_diameter ?? 0) / 2,
-        fill: colorMap.drill,
-        realToCanvasMat,
-      })
-    } else if (holeShape === "oval") {
-      drawOval({
-        ctx,
-        center: { x: holeX, y: holeY },
-        radius_x: (hole.hole_width ?? 0) / 2,
-        radius_y: (hole.hole_height ?? 0) / 2,
-        fill: colorMap.drill,
-        realToCanvasMat,
-      })
-    } else if (holeShape === "pill") {
-      drawPill({
-        ctx,
-        center: { x: holeX, y: holeY },
-        width: hole.hole_width ?? 0,
-        height: hole.hole_height ?? 0,
-        fill: colorMap.drill,
-        realToCanvasMat,
-      })
-    } else if (holeShape === "rotated_pill") {
-      drawPill({
-        ctx,
-        center: { x: holeX, y: holeY },
-        width: hole.hole_width ?? 0,
-        height: hole.hole_height ?? 0,
-        fill: colorMap.drill,
-        realToCanvasMat,
-      })
+      if (holeShape === "circle") {
+        drawCircle({
+          ctx,
+          center: { x: holeX, y: holeY },
+          radius: (hole.hole_diameter ?? 0) / 2,
+          fill: colorMap.drill,
+          realToCanvasMat,
+        })
+      } else if (holeShape === "oval") {
+        drawOval({
+          ctx,
+          center: { x: holeX, y: holeY },
+          radius_x: (hole.hole_width ?? 0) / 2,
+          radius_y: (hole.hole_height ?? 0) / 2,
+          fill: colorMap.drill,
+          realToCanvasMat,
+        })
+      } else if (holeShape === "pill") {
+        drawPill({
+          ctx,
+          center: { x: holeX, y: holeY },
+          width: hole.hole_width ?? 0,
+          height: hole.hole_height ?? 0,
+          fill: colorMap.drill,
+          realToCanvasMat,
+        })
+      } else if (holeShape === "rotated_pill") {
+        drawPill({
+          ctx,
+          center: { x: holeX, y: holeY },
+          width: hole.hole_width ?? 0,
+          height: hole.hole_height ?? 0,
+          fill: colorMap.drill,
+          realToCanvasMat,
+        })
+      }
     }
     return
   }

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

@@ -33,7 +33,7 @@ function getSoldermaskColor(layer: string, colorMap: PcbColorMap): string {
   )
 }
 
-function getBorderRadius(pad: PcbSmtPad, margin: number = 0): number {
+function getBorderRadius(pad: PcbSmtPad, margin = 0): number {
   return (
     ((pad as { corner_radius?: number }).corner_radius ??
       (pad as { rect_border_radius?: number }).rect_border_radius ??
@@ -46,13 +46,10 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
 
   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
+  // If covered with soldermask, fully covered with no margin; otherwise use soldermask_margin if set
+  const margin = isCoveredWithSoldermask ? 0 : (pad.soldermask_margin ?? 0)
   const hasSoldermask =
-    isCoveredWithSoldermask &&
+    !isCoveredWithSoldermask &&
     pad.soldermask_margin !== undefined &&
     pad.soldermask_margin !== 0
   const soldermaskRingColor = getSoldermaskColor(pad.layer, colorMap)
@@ -61,8 +58,8 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
 
   // Draw the copper pad
   if (pad.shape === "rect") {
-    // For positive margins (including 0), draw extended mask area first
-    if (isCoveredWithSoldermask && margin >= 0) {
+    // For positive margins, draw extended mask area first
+    if (hasSoldermask && margin > 0) {
       drawRect({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -117,8 +114,8 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
   }
 
   if (pad.shape === "rotated_rect") {
-    // For positive margins (including 0), draw extended mask area first
-    if (isCoveredWithSoldermask && margin >= 0) {
+    // For positive margins, draw extended mask area first
+    if (hasSoldermask && margin > 0) {
       drawRect({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -176,8 +173,8 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
   }
 
   if (pad.shape === "circle") {
-    // For positive margins (including 0), draw extended mask area first
-    if (isCoveredWithSoldermask && margin >= 0) {
+    // For positive margins, draw extended mask area first
+    if (hasSoldermask && margin > 0) {
       drawCircle({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -223,8 +220,8 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
   }
 
   if (pad.shape === "pill") {
-    // For positive margins (including 0), draw extended mask area first
-    if (isCoveredWithSoldermask && margin >= 0) {
+    // For positive margins, draw extended mask area first
+    if (hasSoldermask && margin > 0) {
       drawPill({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -275,8 +272,8 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
   }
 
   if (pad.shape === "rotated_pill") {
-    // For positive margins (including 0), draw extended mask area first
-    if (isCoveredWithSoldermask && margin >= 0) {
+    // For positive margins, draw extended mask area first
+    if (hasSoldermask && margin > 0) {
       drawPill({
         ctx,
         center: { x: pad.x, y: pad.y },

package/package.json

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