circuit-to-canvas 0.0.44 → 0.0.45

package/dist/index.js

@@ -1843,9 +1843,6 @@ function drawPcbCopperPour(params) {
 // lib/drawer/elements/pcb-copper-text.ts
 import { applyToPoint as applyToPoint13 } from "transformation-matrix";
 var DEFAULT_PADDING = { left: 0.2, right: 0.2, top: 0.2, bottom: 0.2 };
-function layerToCopperColor(layer, colorMap) {
-  return colorMap.copper[layer] ?? colorMap.copper.top;
-}
 function mapAnchorAlignment2(alignment) {
   if (!alignment) return "center";
   if (alignment.includes("left")) return "center_left";
@@ -1867,13 +1864,11 @@ function drawPcbCopperText(params) {
     ...DEFAULT_PADDING,
     ...text.knockout_padding
   };
-  const textColor = layerToCopperColor(text.layer, colorMap);
+  const textColor = colorMap.copper[text.layer] ?? colorMap.copper.top;
   const layout = getAlphabetLayout(content, fontSize);
   const totalWidth = layout.width + layout.strokeWidth;
   const alignment = mapAnchorAlignment2(text.anchor_alignment);
   const startPos = getTextStartPosition(alignment, layout);
-  const startX = startPos.x;
-  const startY = startPos.y;
   ctx.save();
   ctx.translate(x, y);
   if (text.is_mirrored) ctx.scale(-1, 1);
@@ -1886,29 +1881,22 @@ function drawPcbCopperText(params) {
     const paddingRight = padding.right * scale2;
     const paddingTop = padding.top * scale2;
     const paddingBottom = padding.bottom * scale2;
-    const textBoxTop = startY - layout.strokeWidth / 2;
-    const textBoxBottom = startY + layout.height + layout.strokeWidth / 2;
-    const textBoxHeight = textBoxBottom - textBoxTop;
-    const xOffset = startX - paddingLeft;
-    const yOffset = textBoxTop - paddingTop;
-    const knockoutWidth = totalWidth + paddingLeft + paddingRight;
-    const knockoutHeight = textBoxHeight + paddingTop + paddingBottom;
+    const rectX = startPos.x - paddingLeft * 4;
+    const rectY = startPos.y - paddingTop * 4;
+    const rectWidth = totalWidth + paddingLeft * 2 + paddingRight * 2;
+    const rectHeight = layout.height + layout.strokeWidth + paddingTop * 2 + paddingBottom * 2;
     ctx.fillStyle = textColor;
-    ctx.fillRect(xOffset, yOffset, knockoutWidth, knockoutHeight);
-    const previousCompositeOperation = ctx.globalCompositeOperation;
-    ctx.globalCompositeOperation = "destination-out";
-    ctx.fillStyle = "rgba(0,0,0,1)";
-    ctx.strokeStyle = "rgba(0,0,0,1)";
-    strokeAlphabetText({ ctx, text: content, fontSize, startX, startY });
-    if (previousCompositeOperation) {
-      ctx.globalCompositeOperation = previousCompositeOperation;
-    } else {
-      ctx.globalCompositeOperation = "source-over";
-    }
+    ctx.fillRect(rectX, rectY, rectWidth, rectHeight);
   } else {
     ctx.strokeStyle = textColor;
-    strokeAlphabetText({ ctx, text: content, fontSize, startX, startY });
   }
+  strokeAlphabetText({
+    ctx,
+    text: content,
+    fontSize,
+    startX: startPos.x,
+    startY: startPos.y
+  });
   ctx.restore();
 }
 

package/lib/drawer/elements/pcb-copper-text.ts

@@ -1,13 +1,12 @@
-import type { PcbCopperText } from "circuit-json"
+import type { NinePointAnchor, PcbCopperText } from "circuit-json"
 import type { Matrix } from "transformation-matrix"
 import { applyToPoint } from "transformation-matrix"
-import type { PcbColorMap, CanvasContext } from "../types"
 import {
   getAlphabetLayout,
-  strokeAlphabetText,
   getTextStartPosition,
-  type AnchorAlignment,
+  strokeAlphabetText,
 } from "../shapes/text"
+import type { CanvasContext, PcbColorMap } from "../types"
 
 export interface DrawPcbCopperTextParams {
   ctx: CanvasContext
@@ -18,14 +17,8 @@ export interface DrawPcbCopperTextParams {
 
 const DEFAULT_PADDING = { left: 0.2, right: 0.2, top: 0.2, bottom: 0.2 }
 
-function layerToCopperColor(layer: string, colorMap: PcbColorMap): string {
-  return (
-    colorMap.copper[layer as keyof typeof colorMap.copper] ??
-    colorMap.copper.top
-  )
-}
-
-function mapAnchorAlignment(alignment?: string): AnchorAlignment {
+function mapAnchorAlignment(alignment?: string): NinePointAnchor {
+  // Vertical component is intentionally collapsed to center; callers only care about left/center/right.
   if (!alignment) return "center"
   if (alignment.includes("left")) return "center_left"
   if (alignment.includes("right")) return "center_right"
@@ -49,13 +42,13 @@ export function drawPcbCopperText(params: DrawPcbCopperTextParams): void {
     ...DEFAULT_PADDING,
     ...text.knockout_padding,
   }
-  const textColor = layerToCopperColor(text.layer, colorMap)
+  const textColor =
+    colorMap.copper[text.layer as keyof typeof colorMap.copper] ??
+    colorMap.copper.top
   const layout = getAlphabetLayout(content, fontSize)
   const totalWidth = layout.width + layout.strokeWidth
   const alignment = mapAnchorAlignment(text.anchor_alignment)
   const startPos = getTextStartPosition(alignment, layout)
-  const startX = startPos.x
-  const startY = startPos.y
 
   ctx.save()
   ctx.translate(x, y)
@@ -71,32 +64,25 @@ export function drawPcbCopperText(params: DrawPcbCopperTextParams): void {
     const paddingRight = padding.right * scale
     const paddingTop = padding.top * scale
     const paddingBottom = padding.bottom * scale
-    // Calculate knockout rectangle to cover the text box
-    const textBoxTop = startY - layout.strokeWidth / 2
-    const textBoxBottom = startY + layout.height + layout.strokeWidth / 2
-    const textBoxHeight = textBoxBottom - textBoxTop
-
-    const xOffset = startX - paddingLeft
-    const yOffset = textBoxTop - paddingTop
-    const knockoutWidth = totalWidth + paddingLeft + paddingRight
-    const knockoutHeight = textBoxHeight + paddingTop + paddingBottom
+    const rectX = startPos.x - paddingLeft * 4
+    const rectY = startPos.y - paddingTop * 4
+    const rectWidth = totalWidth + paddingLeft * 2 + paddingRight * 2
+    const rectHeight =
+      layout.height + layout.strokeWidth + paddingTop * 2 + paddingBottom * 2
 
+    // Draw knockout rectangle
     ctx.fillStyle = textColor
-    ctx.fillRect(xOffset, yOffset, knockoutWidth, knockoutHeight)
-
-    const previousCompositeOperation = ctx.globalCompositeOperation
-    ctx.globalCompositeOperation = "destination-out"
-    ctx.fillStyle = "rgba(0,0,0,1)"
-    ctx.strokeStyle = "rgba(0,0,0,1)"
-    strokeAlphabetText({ ctx, text: content, fontSize, startX, startY })
-    if (previousCompositeOperation) {
-      ctx.globalCompositeOperation = previousCompositeOperation
-    } else {
-      ctx.globalCompositeOperation = "source-over"
-    }
+    ctx.fillRect(rectX, rectY, rectWidth, rectHeight)
   } else {
     ctx.strokeStyle = textColor
-    strokeAlphabetText({ ctx, text: content, fontSize, startX, startY })
   }
+
+  strokeAlphabetText({
+    ctx,
+    text: content,
+    fontSize,
+    startX: startPos.x,
+    startY: startPos.y,
+  })
   ctx.restore()
 }

package/package.json

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