circuit-to-canvas 0.0.24 → 0.0.25

package/dist/index.d.ts

@@ -216,17 +216,14 @@ interface DrawArrowParams {
  */
 declare function drawArrow(params: DrawArrowParams): void;
 
-type AlphabetLayout = {
-    width: number;
-    height: number;
-    glyphWidth: number;
-    letterSpacing: number;
-    spaceWidth: number;
-    strokeWidth: number;
-};
-declare function getAlphabetLayout(text: string, fontSize: number): AlphabetLayout;
-
-declare function strokeAlphabetText(ctx: CanvasContext, text: string, layout: AlphabetLayout, startX: number, startY: number): void;
+interface StrokeAlphabetTextParams {
+    ctx: CanvasContext;
+    text: string;
+    fontSize: number;
+    startX: number;
+    startY: number;
+}
+declare function strokeAlphabetText(params: StrokeAlphabetTextParams): void;
 interface DrawTextParams {
     ctx: CanvasContext;
     text: string;
@@ -240,6 +237,16 @@ interface DrawTextParams {
 }
 declare function drawText(params: DrawTextParams): void;
 
+type AlphabetLayout = {
+    width: number;
+    height: number;
+    glyphWidth: number;
+    letterSpacing: number;
+    spaceWidth: number;
+    strokeWidth: number;
+};
+declare function getAlphabetLayout(text: string, fontSize: number): AlphabetLayout;
+
 type AnchorAlignment = NinePointAnchor;
 declare function getTextStartPosition(alignment: NinePointAnchor, layout: AlphabetLayout): {
     x: number;

package/dist/index.js

@@ -708,7 +708,9 @@ function getTextStartPosition(alignment, layout) {
 
 // lib/drawer/shapes/text/text.ts
 var getGlyphLines = (char) => lineAlphabet[char] ?? lineAlphabet[char.toUpperCase()];
-function strokeAlphabetText(ctx, text, layout, startX, startY) {
+function strokeAlphabetText(params) {
+  const { ctx, text, fontSize, startX, startY } = params;
+  const layout = getAlphabetLayout(text, fontSize);
   const { glyphWidth, letterSpacing, spaceWidth, height, strokeWidth } = layout;
   const topY = startY;
   const characters = Array.from(text);
@@ -761,7 +763,13 @@ function drawText(params) {
   ctx.lineCap = "round";
   ctx.lineJoin = "round";
   ctx.strokeStyle = color;
-  strokeAlphabetText(ctx, text, layout, startPos.x, startPos.y);
+  strokeAlphabetText({
+    ctx,
+    text,
+    fontSize: scaledFontSize,
+    startX: startPos.x,
+    startY: startPos.y
+  });
   ctx.restore();
 }
 
@@ -800,7 +808,13 @@ function drawPcbSilkscreenText(params) {
   ctx.lineCap = "round";
   ctx.lineJoin = "round";
   ctx.strokeStyle = color;
-  strokeAlphabetText(ctx, content, layout, startPos.x, startPos.y);
+  strokeAlphabetText({
+    ctx,
+    text: content,
+    fontSize,
+    startX: startPos.x,
+    startY: startPos.y
+  });
   ctx.restore();
 }
 
@@ -1032,7 +1046,7 @@ function drawPcbCopperText(params) {
     ctx.globalCompositeOperation = "destination-out";
     ctx.fillStyle = "rgba(0,0,0,1)";
     ctx.strokeStyle = "rgba(0,0,0,1)";
-    strokeAlphabetText(ctx, content, layout, startX, startY);
+    strokeAlphabetText({ ctx, text: content, fontSize, startX, startY });
     if (previousCompositeOperation) {
       ctx.globalCompositeOperation = previousCompositeOperation;
     } else {
@@ -1040,7 +1054,7 @@ function drawPcbCopperText(params) {
     }
   } else {
     ctx.strokeStyle = textColor;
-    strokeAlphabetText(ctx, content, layout, startX, startY);
+    strokeAlphabetText({ ctx, text: content, fontSize, startX, startY });
   }
   ctx.restore();
 }

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

@@ -88,7 +88,7 @@ export function drawPcbCopperText(params: DrawPcbCopperTextParams): void {
     ctx.globalCompositeOperation = "destination-out"
     ctx.fillStyle = "rgba(0,0,0,1)"
     ctx.strokeStyle = "rgba(0,0,0,1)"
-    strokeAlphabetText(ctx, content, layout, startX, startY)
+    strokeAlphabetText({ ctx, text: content, fontSize, startX, startY })
     if (previousCompositeOperation) {
       ctx.globalCompositeOperation = previousCompositeOperation
     } else {
@@ -96,7 +96,7 @@ export function drawPcbCopperText(params: DrawPcbCopperTextParams): void {
     }
   } else {
     ctx.strokeStyle = textColor
-    strokeAlphabetText(ctx, content, layout, startX, startY)
+    strokeAlphabetText({ ctx, text: content, fontSize, startX, startY })
   }
   ctx.restore()
 }

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

@@ -65,7 +65,13 @@ export function drawPcbSilkscreenText(
   ctx.lineJoin = "round"
   ctx.strokeStyle = color
 
-  strokeAlphabetText(ctx, content, layout, startPos.x, startPos.y)
+  strokeAlphabetText({
+    ctx,
+    text: content,
+    fontSize,
+    startX: startPos.x,
+    startY: startPos.y,
+  })
 
   ctx.restore()
 }

package/lib/drawer/shapes/text/text.ts

@@ -9,13 +9,17 @@ import { getTextStartPosition } from "./getTextStartPosition"
 const getGlyphLines = (char: string) =>
   lineAlphabet[char] ?? lineAlphabet[char.toUpperCase()]
 
-export function strokeAlphabetText(
-  ctx: CanvasContext,
-  text: string,
-  layout: AlphabetLayout,
-  startX: number,
-  startY: number,
-): void {
+export interface StrokeAlphabetTextParams {
+  ctx: CanvasContext
+  text: string
+  fontSize: number
+  startX: number
+  startY: number
+}
+
+export function strokeAlphabetText(params: StrokeAlphabetTextParams): void {
+  const { ctx, text, fontSize, startX, startY } = params
+  const layout = getAlphabetLayout(text, fontSize)
   const { glyphWidth, letterSpacing, spaceWidth, height, strokeWidth } = layout
   const topY = startY
   const characters = Array.from(text)
@@ -92,7 +96,13 @@ export function drawText(params: DrawTextParams): void {
   ctx.lineJoin = "round"
   ctx.strokeStyle = color
 
-  strokeAlphabetText(ctx, text, layout, startPos.x, startPos.y)
+  strokeAlphabetText({
+    ctx,
+    text,
+    fontSize: scaledFontSize,
+    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.24",
+  "version": "0.0.25",
   "type": "module",
   "scripts": {
     "build": "tsup-node ./lib/index.ts --format esm --dts",