circuit-to-canvas 0.0.42 → 0.0.44

package/dist/index.js

@@ -816,6 +816,12 @@ function drawPcbVia(params) {
 }
 
 // lib/drawer/elements/pcb-hole.ts
+function getRotation(hole) {
+  if ("ccw_rotation" in hole && typeof hole.ccw_rotation === "number") {
+    return hole.ccw_rotation;
+  }
+  return 0;
+}
 function drawPcbHole(params) {
   const { ctx, hole, realToCanvasMat, colorMap } = params;
   const hasSoldermask = hole.is_covered_with_solder_mask === true && hole.soldermask_margin !== void 0 && hole.soldermask_margin > 0;
@@ -841,6 +847,7 @@ function drawPcbHole(params) {
     return;
   }
   if (hole.hole_shape === "square") {
+    const rotation = getRotation(hole);
     if (hasSoldermask && margin > 0) {
       drawRect({
         ctx,
@@ -848,7 +855,8 @@ function drawPcbHole(params) {
         width: hole.hole_diameter + margin * 2,
         height: hole.hole_diameter + margin * 2,
         fill: positiveMarginColor,
-        realToCanvasMat
+        realToCanvasMat,
+        rotation
       });
     }
     drawRect({
@@ -857,11 +865,13 @@ function drawPcbHole(params) {
       width: hole.hole_diameter,
       height: hole.hole_diameter,
       fill: colorMap.drill,
-      realToCanvasMat
+      realToCanvasMat,
+      rotation
     });
     return;
   }
   if (hole.hole_shape === "oval") {
+    const rotation = getRotation(hole);
     if (hasSoldermask && margin > 0) {
       drawOval({
         ctx,
@@ -869,7 +879,8 @@ function drawPcbHole(params) {
         radius_x: hole.hole_width / 2 + margin,
         radius_y: hole.hole_height / 2 + margin,
         fill: positiveMarginColor,
-        realToCanvasMat
+        realToCanvasMat,
+        rotation
       });
     }
     drawOval({
@@ -878,11 +889,13 @@ function drawPcbHole(params) {
       radius_x: hole.hole_width / 2,
       radius_y: hole.hole_height / 2,
       fill: colorMap.drill,
-      realToCanvasMat
+      realToCanvasMat,
+      rotation
     });
     return;
   }
   if (hole.hole_shape === "rect") {
+    const rotation = getRotation(hole);
     if (hasSoldermask && margin > 0) {
       drawRect({
         ctx,
@@ -890,7 +903,8 @@ function drawPcbHole(params) {
         width: hole.hole_width + margin * 2,
         height: hole.hole_height + margin * 2,
         fill: positiveMarginColor,
-        realToCanvasMat
+        realToCanvasMat,
+        rotation
       });
     }
     drawRect({
@@ -899,11 +913,13 @@ function drawPcbHole(params) {
       width: hole.hole_width,
       height: hole.hole_height,
       fill: colorMap.drill,
-      realToCanvasMat
+      realToCanvasMat,
+      rotation
     });
     return;
   }
   if (hole.hole_shape === "pill") {
+    const rotation = getRotation(hole);
     if (hasSoldermask && margin > 0) {
       drawPill({
         ctx,
@@ -911,7 +927,8 @@ function drawPcbHole(params) {
         width: hole.hole_width + margin * 2,
         height: hole.hole_height + margin * 2,
         fill: positiveMarginColor,
-        realToCanvasMat
+        realToCanvasMat,
+        rotation
       });
     }
     drawPill({
@@ -920,12 +937,13 @@ function drawPcbHole(params) {
       width: hole.hole_width,
       height: hole.hole_height,
       fill: colorMap.drill,
-      realToCanvasMat
+      realToCanvasMat,
+      rotation
     });
     return;
   }
   if (hole.hole_shape === "rotated_pill") {
-    const rotation = hole.ccw_rotation ?? 0;
+    const rotation = getRotation(hole);
     if (hasSoldermask && margin > 0) {
       drawPill({
         ctx,
@@ -957,6 +975,9 @@ function layerToColor(layer, colorMap) {
 function getSoldermaskColor2(layer, colorMap) {
   return colorMap.soldermaskOverCopper[layer] ?? colorMap.soldermaskOverCopper.top;
 }
+function getBorderRadius(pad, margin = 0) {
+  return (pad.corner_radius ?? pad.rect_border_radius ?? 0) + margin;
+}
 function drawPcbSmtPad(params) {
   const { ctx, pad, realToCanvasMat, colorMap } = params;
   const color = layerToColor(pad.layer, colorMap);
@@ -975,7 +996,7 @@ function drawPcbSmtPad(params) {
         height: pad.height + margin * 2,
         fill: positiveMarginColor,
         realToCanvasMat,
-        borderRadius: (pad.corner_radius ?? pad.rect_border_radius ?? 0) + margin
+        borderRadius: getBorderRadius(pad, margin)
       });
     }
     drawRect({
@@ -985,7 +1006,7 @@ function drawPcbSmtPad(params) {
       height: pad.height,
       fill: color,
       realToCanvasMat,
-      borderRadius: pad.corner_radius ?? pad.rect_border_radius ?? 0
+      borderRadius: getBorderRadius(pad)
     });
     if (hasSoldermask && margin < 0) {
       drawSoldermaskRingForRect(
@@ -994,7 +1015,7 @@ function drawPcbSmtPad(params) {
         pad.width,
         pad.height,
         margin,
-        pad.corner_radius ?? pad.rect_border_radius ?? 0,
+        getBorderRadius(pad),
         0,
         realToCanvasMat,
         soldermaskRingColor,
@@ -1009,7 +1030,7 @@ function drawPcbSmtPad(params) {
         height: pad.height,
         fill: soldermaskOverlayColor,
         realToCanvasMat,
-        borderRadius: pad.corner_radius ?? pad.rect_border_radius ?? 0
+        borderRadius: getBorderRadius(pad)
       });
     }
     return;
@@ -1023,7 +1044,7 @@ function drawPcbSmtPad(params) {
         height: pad.height + margin * 2,
         fill: positiveMarginColor,
         realToCanvasMat,
-        borderRadius: (pad.corner_radius ?? pad.rect_border_radius ?? 0) + margin,
+        borderRadius: getBorderRadius(pad, margin),
         rotation: pad.ccw_rotation ?? 0
       });
     }
@@ -1034,7 +1055,7 @@ function drawPcbSmtPad(params) {
       height: pad.height,
       fill: color,
       realToCanvasMat,
-      borderRadius: pad.corner_radius ?? pad.rect_border_radius ?? 0,
+      borderRadius: getBorderRadius(pad),
       rotation: pad.ccw_rotation ?? 0
     });
     if (hasSoldermask && margin < 0) {
@@ -1044,7 +1065,7 @@ function drawPcbSmtPad(params) {
         pad.width,
         pad.height,
         margin,
-        pad.corner_radius ?? pad.rect_border_radius ?? 0,
+        getBorderRadius(pad),
         pad.ccw_rotation ?? 0,
         realToCanvasMat,
         soldermaskRingColor,
@@ -1059,7 +1080,7 @@ function drawPcbSmtPad(params) {
         height: pad.height,
         fill: soldermaskOverlayColor,
         realToCanvasMat,
-        borderRadius: pad.corner_radius ?? pad.rect_border_radius ?? 0,
+        borderRadius: getBorderRadius(pad),
         rotation: pad.ccw_rotation ?? 0
       });
     }

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

@@ -13,6 +13,14 @@ export interface DrawPcbHoleParams {
   colorMap: PcbColorMap
 }
 
+// Helper function to safely access ccw_rotation property
+function getRotation(hole: PCBHole): number {
+  if ("ccw_rotation" in hole && typeof hole.ccw_rotation === "number") {
+    return hole.ccw_rotation
+  }
+  return 0
+}
+
 export function drawPcbHole(params: DrawPcbHoleParams): void {
   const { ctx, hole, realToCanvasMat, colorMap } = params
 
@@ -47,6 +55,7 @@ export function drawPcbHole(params: DrawPcbHoleParams): void {
   }
 
   if (hole.hole_shape === "square") {
+    const rotation = getRotation(hole)
     // For positive margins, draw extended mask area first
     if (hasSoldermask && margin > 0) {
       drawRect({
@@ -56,6 +65,7 @@ export function drawPcbHole(params: DrawPcbHoleParams): void {
         height: hole.hole_diameter + margin * 2,
         fill: positiveMarginColor,
         realToCanvasMat,
+        rotation,
       })
     }
 
@@ -67,11 +77,13 @@ export function drawPcbHole(params: DrawPcbHoleParams): void {
       height: hole.hole_diameter,
       fill: colorMap.drill,
       realToCanvasMat,
+      rotation,
     })
     return
   }
 
   if (hole.hole_shape === "oval") {
+    const rotation = getRotation(hole)
     // For positive margins, draw extended mask area first
     if (hasSoldermask && margin > 0) {
       drawOval({
@@ -81,6 +93,7 @@ export function drawPcbHole(params: DrawPcbHoleParams): void {
         radius_y: hole.hole_height / 2 + margin,
         fill: positiveMarginColor,
         realToCanvasMat,
+        rotation,
       })
     }
 
@@ -92,11 +105,13 @@ export function drawPcbHole(params: DrawPcbHoleParams): void {
       radius_y: hole.hole_height / 2,
       fill: colorMap.drill,
       realToCanvasMat,
+      rotation,
     })
     return
   }
 
   if (hole.hole_shape === "rect") {
+    const rotation = getRotation(hole)
     // For positive margins, draw extended mask area first
     if (hasSoldermask && margin > 0) {
       drawRect({
@@ -106,6 +121,7 @@ export function drawPcbHole(params: DrawPcbHoleParams): void {
         height: hole.hole_height + margin * 2,
         fill: positiveMarginColor,
         realToCanvasMat,
+        rotation,
       })
     }
 
@@ -117,11 +133,13 @@ export function drawPcbHole(params: DrawPcbHoleParams): void {
       height: hole.hole_height,
       fill: colorMap.drill,
       realToCanvasMat,
+      rotation,
     })
     return
   }
 
   if (hole.hole_shape === "pill") {
+    const rotation = getRotation(hole)
     // For positive margins, draw extended mask area first
     if (hasSoldermask && margin > 0) {
       drawPill({
@@ -131,6 +149,7 @@ export function drawPcbHole(params: DrawPcbHoleParams): void {
         height: hole.hole_height + margin * 2,
         fill: positiveMarginColor,
         realToCanvasMat,
+        rotation,
       })
     }
 
@@ -142,12 +161,13 @@ export function drawPcbHole(params: DrawPcbHoleParams): void {
       height: hole.hole_height,
       fill: colorMap.drill,
       realToCanvasMat,
+      rotation,
     })
     return
   }
 
   if (hole.hole_shape === "rotated_pill") {
-    const rotation = (hole as any).ccw_rotation ?? 0
+    const rotation = getRotation(hole)
 
     // For positive margins, draw extended mask area first
     if (hasSoldermask && margin > 0) {

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

@@ -33,6 +33,14 @@ function getSoldermaskColor(layer: string, colorMap: PcbColorMap): string {
   )
 }
 
+function getBorderRadius(pad: PcbSmtPad, margin: number = 0): number {
+  return (
+    ((pad as { corner_radius?: number }).corner_radius ??
+      (pad as { rect_border_radius?: number }).rect_border_radius ??
+      0) + margin
+  )
+}
+
 export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
   const { ctx, pad, realToCanvasMat, colorMap } = params
 
@@ -62,10 +70,7 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
         height: pad.height + margin * 2,
         fill: positiveMarginColor,
         realToCanvasMat,
-        borderRadius:
-          ((pad as { corner_radius?: number }).corner_radius ??
-            pad.rect_border_radius ??
-            0) + margin,
+        borderRadius: getBorderRadius(pad, margin),
       })
     }
 
@@ -77,10 +82,7 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
       height: pad.height,
       fill: color,
       realToCanvasMat,
-      borderRadius:
-        (pad as { corner_radius?: number }).corner_radius ??
-        pad.rect_border_radius ??
-        0,
+      borderRadius: getBorderRadius(pad),
     })
 
     // For negative margins, draw soldermask ring on top of the pad
@@ -91,9 +93,7 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
         pad.width,
         pad.height,
         margin,
-        (pad as { corner_radius?: number }).corner_radius ??
-          pad.rect_border_radius ??
-          0,
+        getBorderRadius(pad),
         0,
         realToCanvasMat,
         soldermaskRingColor,
@@ -110,10 +110,7 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
         height: pad.height,
         fill: soldermaskOverlayColor,
         realToCanvasMat,
-        borderRadius:
-          (pad as { corner_radius?: number }).corner_radius ??
-          pad.rect_border_radius ??
-          0,
+        borderRadius: getBorderRadius(pad),
       })
     }
     return
@@ -129,10 +126,7 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
         height: pad.height + margin * 2,
         fill: positiveMarginColor,
         realToCanvasMat,
-        borderRadius:
-          ((pad as { corner_radius?: number }).corner_radius ??
-            pad.rect_border_radius ??
-            0) + margin,
+        borderRadius: getBorderRadius(pad, margin),
         rotation: pad.ccw_rotation ?? 0,
       })
     }
@@ -145,10 +139,7 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
       height: pad.height,
       fill: color,
       realToCanvasMat,
-      borderRadius:
-        (pad as { corner_radius?: number }).corner_radius ??
-        pad.rect_border_radius ??
-        0,
+      borderRadius: getBorderRadius(pad),
       rotation: pad.ccw_rotation ?? 0,
     })
 
@@ -160,9 +151,7 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
         pad.width,
         pad.height,
         margin,
-        (pad as { corner_radius?: number }).corner_radius ??
-          pad.rect_border_radius ??
-          0,
+        getBorderRadius(pad),
         pad.ccw_rotation ?? 0,
         realToCanvasMat,
         soldermaskRingColor,
@@ -179,10 +168,7 @@ export function drawPcbSmtPad(params: DrawPcbSmtPadParams): void {
         height: pad.height,
         fill: soldermaskOverlayColor,
         realToCanvasMat,
-        borderRadius:
-          (pad as { corner_radius?: number }).corner_radius ??
-          pad.rect_border_radius ??
-          0,
+        borderRadius: getBorderRadius(pad),
         rotation: pad.ccw_rotation ?? 0,
       })
     }

package/package.json

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

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

@@ -103,3 +103,110 @@ test("draw pill hole", async () => {
     "pill-hole",
   )
 })
+
+test("draw rotated oval hole", 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 hole: PCBHole & { ccw_rotation?: number } = {
+    type: "pcb_hole",
+    pcb_hole_id: "hole1",
+    hole_shape: "oval",
+    hole_width: 50,
+    hole_height: 30,
+    x: 50,
+    y: 50,
+    ccw_rotation: 45,
+  }
+
+  drawer.drawElements([hole])
+
+  await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
+    import.meta.path,
+    "rotated-oval-hole",
+  )
+})
+
+test("draw rotated rect hole", 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 hole: PCBHole & { ccw_rotation?: number } = {
+    type: "pcb_hole",
+    pcb_hole_id: "hole1",
+    hole_shape: "rect",
+    hole_width: 50,
+    hole_height: 30,
+    x: 50,
+    y: 50,
+    ccw_rotation: 45,
+  }
+
+  drawer.drawElements([hole])
+
+  await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
+    import.meta.path,
+    "rotated-rect-hole",
+  )
+})
+
+test("draw rotated square hole", 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 hole: PCBHole & { ccw_rotation?: number } = {
+    type: "pcb_hole",
+    pcb_hole_id: "hole1",
+    hole_shape: "square",
+    hole_diameter: 30,
+    x: 50,
+    y: 50,
+    ccw_rotation: 45,
+  }
+
+  drawer.drawElements([hole])
+
+  await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
+    import.meta.path,
+    "rotated-square-hole",
+  )
+})
+
+test("draw rotated pill hole", 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 hole: PCBHole & { ccw_rotation?: number } = {
+    type: "pcb_hole",
+    pcb_hole_id: "hole1",
+    hole_shape: "pill",
+    hole_width: 60,
+    hole_height: 30,
+    x: 50,
+    y: 50,
+    ccw_rotation: 45,
+  }
+
+  drawer.drawElements([hole])
+
+  await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
+    import.meta.path,
+    "rotated-pill-hole",
+  )
+})