circuit-to-canvas 0.0.63 → 0.0.65

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AnyCircuitElement, PcbRenderLayer, NinePointAnchor, PcbPlatedHole, PCBVia, PcbHole, PcbSmtPad, PcbTrace, PcbBoard, PcbPanel, PcbSilkscreenText, PcbSilkscreenRect, PcbSilkscreenCircle, PcbSilkscreenLine, PcbSilkscreenPath, PcbSilkscreenPill, PcbSilkscreenOval, PcbCutout, PCBKeepout, PcbCopperPour, PcbCopperText, PcbFabricationNoteText, PcbFabricationNoteRect, PcbNoteRect, PcbFabricationNotePath, PcbNotePath, PcbNoteText, PcbNoteDimension, PcbFabricationNoteDimension } from 'circuit-json';
+import { AnyCircuitElement, PcbRenderLayer, NinePointAnchor, PcbPlatedHole, PCBVia, PcbHole, PcbSmtPad, PcbTrace, PcbBoard, PcbPanel, PcbSilkscreenText, PcbSilkscreenRect, PcbSilkscreenCircle, PcbSilkscreenLine, PcbSilkscreenPath, PcbSilkscreenPill, PcbSilkscreenOval, PcbCutout, PCBKeepout, PcbCopperPour, PcbCopperText, PcbFabricationNoteText, PcbFabricationNoteRect, PcbNoteRect, PcbFabricationNotePath, PcbNotePath, PcbNoteText, PcbNoteDimension, PcbFabricationNoteDimension, PcbCourtyardCircle } from 'circuit-json';
 import { Matrix } from 'transformation-matrix';
 
 /**
@@ -550,4 +550,12 @@ interface DrawPcbFabricationNoteDimensionParams {
 }
 declare function drawPcbFabricationNoteDimension(params: DrawPcbFabricationNoteDimensionParams): void;
 
-export { type AlphabetLayout, type AnchorAlignment, type CameraBounds, type CanvasContext, CircuitToCanvasDrawer, type CopperColorMap, type CopperLayerName, DEFAULT_PCB_COLOR_MAP, type DrawArrowParams, type DrawCircleParams, type DrawContext, type DrawDimensionLineParams, type DrawElementsOptions, type DrawLineParams, type DrawOvalParams, type DrawPathParams, type DrawPcbBoardParams, type DrawPcbCopperPourParams, type DrawPcbCopperTextParams, type DrawPcbCutoutParams, type DrawPcbFabricationNoteDimensionParams, type DrawPcbFabricationNotePathParams, type DrawPcbFabricationNoteRectParams, type DrawPcbFabricationNoteTextParams, type DrawPcbHoleParams, type DrawPcbKeepoutParams, type DrawPcbNoteDimensionParams, type DrawPcbNotePathParams, type DrawPcbNoteRectParams, type DrawPcbNoteTextParams, type DrawPcbPanelParams, type DrawPcbPlatedHoleParams, type DrawPcbSilkscreenCircleParams, type DrawPcbSilkscreenLineParams, type DrawPcbSilkscreenOvalParams, type DrawPcbSilkscreenPathParams, type DrawPcbSilkscreenPillParams, type DrawPcbSilkscreenRectParams, type DrawPcbSilkscreenTextParams, type DrawPcbSmtPadParams, type DrawPcbTraceParams, type DrawPcbViaParams, type DrawPillParams, type DrawPolygonParams, type DrawRectParams, type DrawTextParams, type DrawerConfig, type PcbColorMap, drawArrow, drawCircle, drawDimensionLine, drawLine, drawOval, drawPath, drawPcbBoard, drawPcbCopperPour, drawPcbCopperText, drawPcbCutout, drawPcbFabricationNoteDimension, drawPcbFabricationNotePath, drawPcbFabricationNoteRect, drawPcbFabricationNoteText, drawPcbHole, drawPcbKeepout, drawPcbNoteDimension, drawPcbNotePath, drawPcbNoteRect, drawPcbNoteText, drawPcbPanelElement, drawPcbPlatedHole, drawPcbSilkscreenCircle, drawPcbSilkscreenLine, drawPcbSilkscreenOval, drawPcbSilkscreenPath, drawPcbSilkscreenPill, drawPcbSilkscreenRect, drawPcbSilkscreenText, drawPcbSmtPad, drawPcbTrace, drawPcbVia, drawPill, drawPolygon, drawRect, drawSoldermaskRingForCircle, drawSoldermaskRingForOval, drawSoldermaskRingForPill, drawSoldermaskRingForRect, drawText, getAlphabetLayout, getTextStartPosition, strokeAlphabetText };
+interface DrawPcbCourtyardCircleParams {
+    ctx: CanvasContext;
+    circle: PcbCourtyardCircle;
+    realToCanvasMat: Matrix;
+    colorMap: PcbColorMap;
+}
+declare function drawPcbCourtyardCircle(params: DrawPcbCourtyardCircleParams): void;
+
+export { type AlphabetLayout, type AnchorAlignment, type CameraBounds, type CanvasContext, CircuitToCanvasDrawer, type CopperColorMap, type CopperLayerName, DEFAULT_PCB_COLOR_MAP, type DrawArrowParams, type DrawCircleParams, type DrawContext, type DrawDimensionLineParams, type DrawElementsOptions, type DrawLineParams, type DrawOvalParams, type DrawPathParams, type DrawPcbBoardParams, type DrawPcbCopperPourParams, type DrawPcbCopperTextParams, type DrawPcbCourtyardCircleParams, type DrawPcbCutoutParams, type DrawPcbFabricationNoteDimensionParams, type DrawPcbFabricationNotePathParams, type DrawPcbFabricationNoteRectParams, type DrawPcbFabricationNoteTextParams, type DrawPcbHoleParams, type DrawPcbKeepoutParams, type DrawPcbNoteDimensionParams, type DrawPcbNotePathParams, type DrawPcbNoteRectParams, type DrawPcbNoteTextParams, type DrawPcbPanelParams, type DrawPcbPlatedHoleParams, type DrawPcbSilkscreenCircleParams, type DrawPcbSilkscreenLineParams, type DrawPcbSilkscreenOvalParams, type DrawPcbSilkscreenPathParams, type DrawPcbSilkscreenPillParams, type DrawPcbSilkscreenRectParams, type DrawPcbSilkscreenTextParams, type DrawPcbSmtPadParams, type DrawPcbTraceParams, type DrawPcbViaParams, type DrawPillParams, type DrawPolygonParams, type DrawRectParams, type DrawTextParams, type DrawerConfig, type PcbColorMap, drawArrow, drawCircle, drawDimensionLine, drawLine, drawOval, drawPath, drawPcbBoard, drawPcbCopperPour, drawPcbCopperText, drawPcbCourtyardCircle, drawPcbCutout, drawPcbFabricationNoteDimension, drawPcbFabricationNotePath, drawPcbFabricationNoteRect, drawPcbFabricationNoteText, drawPcbHole, drawPcbKeepout, drawPcbNoteDimension, drawPcbNotePath, drawPcbNoteRect, drawPcbNoteText, drawPcbPanelElement, drawPcbPlatedHole, drawPcbSilkscreenCircle, drawPcbSilkscreenLine, drawPcbSilkscreenOval, drawPcbSilkscreenPath, drawPcbSilkscreenPill, drawPcbSilkscreenRect, drawPcbSilkscreenText, drawPcbSmtPad, drawPcbTrace, drawPcbVia, drawPill, drawPolygon, drawRect, drawSoldermaskRingForCircle, drawSoldermaskRingForOval, drawSoldermaskRingForPill, drawSoldermaskRingForRect, drawText, getAlphabetLayout, getTextStartPosition, strokeAlphabetText };

package/dist/index.js

@@ -673,6 +673,35 @@ function drawCircle(params) {
   }
 }
 
+// lib/drawer/elements/pcb-courtyard-circle.ts
+function drawPcbCourtyardCircle(params) {
+  const { ctx, circle, realToCanvasMat, colorMap } = params;
+  drawCircle({
+    ctx,
+    center: circle.center,
+    radius: circle.radius,
+    stroke: colorMap.courtyard,
+    strokeWidth: 0.05,
+    // Default thin line for courtyard info
+    realToCanvasMat
+  });
+}
+
+// lib/drawer/elements/pcb-courtyard-rect.ts
+function drawPcbCourtyardRect(params) {
+  const { ctx, rect, realToCanvasMat, colorMap } = params;
+  drawRect({
+    ctx,
+    center: rect.center,
+    width: rect.width,
+    height: rect.height,
+    stroke: colorMap.courtyard,
+    strokeWidth: 0.05,
+    // Default thin line for courtyard info
+    realToCanvasMat
+  });
+}
+
 // lib/drawer/elements/pcb-cutout.ts
 function drawPcbCutout(params) {
   const { ctx, cutout, realToCanvasMat, colorMap } = params;
@@ -3657,6 +3686,22 @@ var CircuitToCanvasDrawer = class {
           colorMap: this.colorMap
         });
       }
+      if (element.type === "pcb_courtyard_circle") {
+        drawPcbCourtyardCircle({
+          ctx: this.ctx,
+          circle: element,
+          realToCanvasMat: this.realToCanvasMat,
+          colorMap: this.colorMap
+        });
+      }
+      if (element.type === "pcb_courtyard_rect") {
+        drawPcbCourtyardRect({
+          ctx: this.ctx,
+          rect: element,
+          realToCanvasMat: this.realToCanvasMat,
+          colorMap: this.colorMap
+        });
+      }
     }
   }
 };
@@ -3688,6 +3733,7 @@ export {
   drawPcbBoard,
   drawPcbCopperPour,
   drawPcbCopperText,
+  drawPcbCourtyardCircle,
   drawPcbCutout,
   drawPcbFabricationNoteDimension,
   drawPcbFabricationNotePath,

package/lib/drawer/CircuitToCanvasDrawer.ts

@@ -4,6 +4,8 @@ import type {
   PcbBoard,
   PcbCopperPour,
   PcbCopperText,
+  PcbCourtyardCircle,
+  PcbCourtyardRect,
   PcbCutout,
   PcbFabricationNoteDimension,
   PcbFabricationNotePath,
@@ -40,6 +42,8 @@ import {
 import { drawPcbBoard } from "./elements/pcb-board"
 import { drawPcbCopperPour } from "./elements/pcb-copper-pour"
 import { drawPcbCopperText } from "./elements/pcb-copper-text"
+import { drawPcbCourtyardCircle } from "./elements/pcb-courtyard-circle"
+import { drawPcbCourtyardRect } from "./elements/pcb-courtyard-rect"
 import { drawPcbCutout } from "./elements/pcb-cutout"
 import { drawPcbFabricationNoteDimension } from "./elements/pcb-fabrication-note-dimension"
 import { drawPcbFabricationNotePath } from "./elements/pcb-fabrication-note-path"
@@ -490,6 +494,24 @@ export class CircuitToCanvasDrawer {
           colorMap: this.colorMap,
         })
       }
+
+      if (element.type === "pcb_courtyard_circle") {
+        drawPcbCourtyardCircle({
+          ctx: this.ctx,
+          circle: element as PcbCourtyardCircle,
+          realToCanvasMat: this.realToCanvasMat,
+          colorMap: this.colorMap,
+        })
+      }
+
+      if (element.type === "pcb_courtyard_rect") {
+        drawPcbCourtyardRect({
+          ctx: this.ctx,
+          rect: element as PcbCourtyardRect,
+          realToCanvasMat: this.realToCanvasMat,
+          colorMap: this.colorMap,
+        })
+      }
     }
   }
 }

package/lib/drawer/elements/index.ts

@@ -109,3 +109,8 @@ export {
   drawPcbFabricationNoteDimension,
   type DrawPcbFabricationNoteDimensionParams,
 } from "./pcb-fabrication-note-dimension"
+
+export {
+  drawPcbCourtyardCircle,
+  type DrawPcbCourtyardCircleParams,
+} from "./pcb-courtyard-circle"

package/lib/drawer/elements/pcb-courtyard-circle.ts

@@ -0,0 +1,26 @@
+import type { PcbCourtyardCircle } from "circuit-json"
+import type { Matrix } from "transformation-matrix"
+import type { PcbColorMap, CanvasContext } from "../types"
+import { drawCircle } from "../shapes/circle"
+
+export interface DrawPcbCourtyardCircleParams {
+  ctx: CanvasContext
+  circle: PcbCourtyardCircle
+  realToCanvasMat: Matrix
+  colorMap: PcbColorMap
+}
+
+export function drawPcbCourtyardCircle(
+  params: DrawPcbCourtyardCircleParams,
+): void {
+  const { ctx, circle, realToCanvasMat, colorMap } = params
+
+  drawCircle({
+    ctx,
+    center: circle.center,
+    radius: circle.radius,
+    stroke: colorMap.courtyard,
+    strokeWidth: 0.05, // Default thin line for courtyard info
+    realToCanvasMat,
+  })
+}

package/lib/drawer/elements/pcb-courtyard-rect.ts

@@ -0,0 +1,25 @@
+import type { PcbCourtyardRect } from "circuit-json"
+import type { Matrix } from "transformation-matrix"
+import type { PcbColorMap, CanvasContext } from "../types"
+import { drawRect } from "../shapes/rect"
+
+export interface DrawPcbCourtyardRectParams {
+  ctx: CanvasContext
+  rect: PcbCourtyardRect
+  realToCanvasMat: Matrix
+  colorMap: PcbColorMap
+}
+
+export function drawPcbCourtyardRect(params: DrawPcbCourtyardRectParams): void {
+  const { ctx, rect, realToCanvasMat, colorMap } = params
+
+  drawRect({
+    ctx,
+    center: rect.center,
+    width: rect.width,
+    height: rect.height,
+    stroke: colorMap.courtyard,
+    strokeWidth: 0.05, // Default thin line for courtyard info
+    realToCanvasMat,
+  })
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-to-canvas",
   "main": "dist/index.js",
-  "version": "0.0.63",
+  "version": "0.0.65",
   "type": "module",
   "scripts": {
     "build": "tsup-node ./lib/index.ts --format esm --dts",
@@ -17,9 +17,9 @@
     "@tscircuit/math-utils": "^0.0.29",
     "@types/bun": "latest",
     "bun-match-svg": "^0.0.14",
-    "circuit-json": "^0.0.356",
+    "circuit-json": "^0.0.374",
     "circuit-json-to-connectivity-map": "^0.0.23",
-    "circuit-to-svg": "^0.0.303",
+    "circuit-to-svg": "^0.0.323",
     "looks-same": "^10.0.1",
     "schematic-symbols": "^0.0.202",
     "tsup": "^8.5.1"

package/tests/elements/pcb-courtyard-circle.test.ts

@@ -0,0 +1,44 @@
+import { expect, test } from "bun:test"
+import { createCanvas } from "@napi-rs/canvas"
+import type { PcbCourtyardCircle } from "circuit-json"
+import { CircuitToCanvasDrawer } from "../../lib/drawer"
+
+test("draw courtyard circle", async () => {
+  const canvas = createCanvas(1000, 1000)
+  const ctx = canvas.getContext("2d")
+  const drawer = new CircuitToCanvasDrawer(ctx)
+
+  ctx.fillStyle = "#1a1a1a"
+  ctx.fillRect(0, 0, 1000, 1000)
+
+  const circle: PcbCourtyardCircle = {
+    type: "pcb_courtyard_circle",
+    pcb_courtyard_circle_id: "courtyard_circle1",
+    pcb_component_id: "component1",
+    layer: "top",
+    center: { x: 0, y: 0 },
+    radius: 2,
+  }
+
+  const circle2: PcbCourtyardCircle = {
+    type: "pcb_courtyard_circle",
+    pcb_courtyard_circle_id: "courtyard_circle2",
+    pcb_component_id: "component2",
+    layer: "bottom",
+    center: { x: 3, y: 3 },
+    radius: 1,
+  }
+
+  drawer.setCameraBounds({
+    minX: -5,
+    maxX: 5,
+    minY: -5,
+    maxY: 5,
+  })
+
+  drawer.drawElements([circle, circle2])
+
+  await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
+    import.meta.path,
+  )
+})

package/tests/elements/pcb-courtyard-rect.test.ts

@@ -0,0 +1,46 @@
+import { expect, test } from "bun:test"
+import { createCanvas } from "@napi-rs/canvas"
+import type { PcbCourtyardRect } from "circuit-json"
+import { CircuitToCanvasDrawer } from "../../lib/drawer"
+
+test("draw courtyard rect", async () => {
+  const canvas = createCanvas(1000, 1000)
+  const ctx = canvas.getContext("2d")
+  const drawer = new CircuitToCanvasDrawer(ctx)
+
+  ctx.fillStyle = "#1a1a1a"
+  ctx.fillRect(0, 0, 1000, 1000)
+
+  const rect1: PcbCourtyardRect = {
+    type: "pcb_courtyard_rect",
+    pcb_courtyard_rect_id: "courtyard_rect1",
+    pcb_component_id: "component1",
+    layer: "top",
+    center: { x: 0, y: 0 },
+    width: 4,
+    height: 2,
+  }
+
+  const rect2: PcbCourtyardRect = {
+    type: "pcb_courtyard_rect",
+    pcb_courtyard_rect_id: "courtyard_rect2",
+    pcb_component_id: "component2",
+    layer: "bottom",
+    center: { x: 3, y: 3 },
+    width: 2,
+    height: 4,
+  }
+
+  drawer.setCameraBounds({
+    minX: -5,
+    maxX: 5,
+    minY: -5,
+    maxY: 5,
+  })
+
+  drawer.drawElements([rect1, rect2])
+
+  await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
+    import.meta.path,
+  )
+})