circuit-to-canvas 0.0.11 → 0.0.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-to-canvas",
   "main": "dist/index.js",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "type": "module",
   "scripts": {
     "build": "tsup-node ./lib/index.ts --format esm --dts",
@@ -10,11 +10,17 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.3.8",
+    "@napi-rs/canvas": "^0.1.84",
+    "@resvg/resvg-js": "^2.6.2",
     "@tscircuit/alphabet": "^0.0.9",
+    "@tscircuit/circuit-json-util": "^0.0.73",
+    "@tscircuit/math-utils": "^0.0.29",
     "@types/bun": "latest",
     "bun-match-svg": "^0.0.14",
-    "canvas": "^3.2.0",
     "circuit-json": "^0.0.335",
+    "circuit-json-to-connectivity-map": "^0.0.23",
+    "circuit-to-svg": "^0.0.297",
+    "schematic-symbols": "^0.0.202",
     "tsup": "^8.5.1"
   },
   "peerDependencies": {

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

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbBoard } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 
@@ -80,6 +80,9 @@ test("draw board with elements", async () => {
       center: { x: 100, y: 75 },
       width: 180,
       height: 130,
+      thickness: 1.6,
+      num_layers: 2,
+      material: "fr4" as const,
     },
     {
       type: "pcb_smtpad" as const,
@@ -142,7 +145,7 @@ test("draw board with elements", async () => {
       y: 75,
       outer_diameter: 10,
       hole_diameter: 5,
-      layers: ["top", "bottom"],
+      layers: ["top", "bottom"] as ("top" | "bottom")[],
     },
   ]
 

package/tests/elements/pcb-copper-pour.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbCopperPour } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 
@@ -79,6 +79,7 @@ test("draw copper pour with trace", async () => {
         { x: 90, y: 90 },
         { x: 10, y: 90 },
       ],
+      covered_with_solder_mask: false,
     },
     {
       type: "pcb_trace" as const,
@@ -107,7 +108,7 @@ test("draw copper pour with trace", async () => {
       y: 50,
       outer_diameter: 15,
       hole_diameter: 8,
-      layers: ["top", "bottom"],
+      layers: ["top", "bottom"] as ("top" | "bottom")[],
     },
   ]
 

package/tests/elements/pcb-copper-text.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbCopperText } from "circuit-json"
 import { scale } from "transformation-matrix"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"

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

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbCutout } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-fabrication-note-path-custom-color.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbFabricationNotePath } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-fabrication-note-path-thick-stroke.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbFabricationNotePath } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-fabrication-note-path.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbFabricationNotePath } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-fabrication-note-rect-all-features.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbFabricationNoteRect } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-fabrication-note-rect-corner-radius.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbFabricationNoteRect } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-fabrication-note-rect-custom-color.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbFabricationNoteRect } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-fabrication-note-rect-dashed.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbFabricationNoteRect } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-fabrication-note-rect-default-color.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbFabricationNoteRect } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-fabrication-note-text-descenders.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbFabricationNoteText } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-fabrication-note-text-full-charset.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbFabricationNoteText } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-fabrication-note-text-rgba-color.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbFabricationNoteText } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-fabrication-note-text-small.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbFabricationNoteText } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

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

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PCBHole } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-note-path.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbNotePath } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-note-rect-all-features.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbNoteRect } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-note-rect-dashed-stroke.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbNoteRect } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-note-rect-filled-no-stroke.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbNoteRect } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-note-text-anchor-alignment.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbNoteText } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-note-text-custom-color.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbNoteText } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/elements/pcb-note-text-small.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbNoteText } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

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

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbPlatedHole } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

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

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type {
   PcbSilkscreenText,
   PcbSilkscreenRect,
@@ -191,26 +191,33 @@ test("draw silkscreen on component", async () => {
     {
       type: "pcb_silkscreen_rect" as const,
       pcb_silkscreen_rect_id: "outline1",
+      pcb_component_id: "component1",
       layer: "top" as const,
       center: { x: 75, y: 50 },
       width: 60,
       height: 30,
+      stroke_width: 0.2,
     },
     // Pin 1 indicator
     {
       type: "pcb_silkscreen_circle" as const,
       pcb_silkscreen_circle_id: "pin1marker",
+      pcb_component_id: "component1",
       layer: "top" as const,
       center: { x: 55, y: 40 },
       radius: 3,
+      stroke_width: 0.2,
     },
     // Component label
     {
       type: "pcb_silkscreen_text" as const,
       pcb_silkscreen_text_id: "label1",
+      pcb_component_id: "component1",
       layer: "top" as const,
       text: "IC1",
       anchor_position: { x: 75, y: 50 },
+      anchor_alignment: "center" as const,
+      font: "tscircuit2024" as const,
       font_size: 8,
     },
     // SMT pads

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

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PcbSmtPad } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

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

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PCBTrace } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

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

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import type { PCBVia } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 

package/tests/shapes/circle.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import { identity } from "transformation-matrix"
 import { drawCircle } from "../../lib/drawer/shapes/circle"
 

package/tests/shapes/oval.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import { identity } from "transformation-matrix"
 import { drawOval } from "../../lib/drawer/shapes/oval"
 

package/tests/shapes/pill.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import { identity } from "transformation-matrix"
 import { drawPill } from "../../lib/drawer/shapes/pill"
 

package/tests/shapes/rect.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { createCanvas } from "canvas"
+import { createCanvas } from "@napi-rs/canvas"
 import { identity } from "transformation-matrix"
 import { drawRect } from "../../lib/drawer/shapes/rect"