circuit-to-canvas 0.0.29 → 0.0.31

package/lib/drawer/pcb-render-layer-filter.ts

@@ -0,0 +1,30 @@
+import type { AnyCircuitElement } from "circuit-json"
+import type { DrawElementsOptions } from "./CircuitToCanvasDrawer"
+import { getElementRenderLayers } from "@tscircuit/circuit-json-util"
+
+/**
+ * Gets the render layer(s) for an element based on its type and layer property
+ */
+
+/**
+ * Checks if an element should be drawn based on layer options
+ */
+export function shouldDrawElement(
+  element: AnyCircuitElement,
+  options: DrawElementsOptions,
+): boolean {
+  // If no layers specified, draw all elements
+  if (!options.layers || options.layers.length === 0) {
+    return true
+  }
+
+  const elementLayers = getElementRenderLayers(element)
+
+  // If element has no layer info (board, holes, etc.), always draw
+  if (elementLayers.length === 0) {
+    return true
+  }
+
+  // Check if any of the element's layers match the requested layers
+  return elementLayers.some((layer) => options.layers!.includes(layer))
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-to-canvas",
   "main": "dist/index.js",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "type": "module",
   "scripts": {
     "build": "tsup-node ./lib/index.ts --format esm --dts",
@@ -13,11 +13,11 @@
     "@napi-rs/canvas": "^0.1.84",
     "@resvg/resvg-js": "^2.6.2",
     "@tscircuit/alphabet": "^0.0.17",
-    "@tscircuit/circuit-json-util": "^0.0.73",
+    "@tscircuit/circuit-json-util": "^0.0.75",
     "@tscircuit/math-utils": "^0.0.29",
     "@types/bun": "latest",
     "bun-match-svg": "^0.0.14",
-    "circuit-json": "^0.0.342",
+    "circuit-json": "^0.0.346",
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-to-svg": "^0.0.297",
     "looks-same": "^10.0.1",

package/tests/elements/layer-filter.test.ts

@@ -0,0 +1,42 @@
+import { expect, test } from "bun:test"
+import { createCanvas } from "@napi-rs/canvas"
+import type { PcbSmtPad } from "circuit-json"
+import { CircuitToCanvasDrawer } from "../../lib/drawer"
+
+test("layer filter only draws elements on specified layers", 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 topPad: PcbSmtPad = {
+    type: "pcb_smtpad",
+    pcb_smtpad_id: "pad1",
+    shape: "rect",
+    x: 30,
+    y: 50,
+    width: 20,
+    height: 20,
+    layer: "top",
+  }
+
+  const bottomPad: PcbSmtPad = {
+    type: "pcb_smtpad",
+    pcb_smtpad_id: "pad2",
+    shape: "rect",
+    x: 70,
+    y: 50,
+    width: 20,
+    height: 20,
+    layer: "bottom",
+  }
+
+  // Draw only top layer - should only show top pad (left side)
+  drawer.drawElements([topPad, bottomPad], { layers: ["top_copper"] })
+
+  await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
+    import.meta.path,
+  )
+})

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

@@ -0,0 +1,163 @@
+import { expect, test } from "bun:test"
+import { createCanvas } from "@napi-rs/canvas"
+import { CircuitToCanvasDrawer } from "../../lib/drawer"
+
+test("draw smt pads with positive and negative soldermask margins", async () => {
+  const canvas = createCanvas(800, 600)
+  const ctx = canvas.getContext("2d")
+  const drawer = new CircuitToCanvasDrawer(ctx)
+
+  ctx.fillStyle = "#1a1a1a"
+  ctx.fillRect(0, 0, 800, 600)
+
+  const circuit: any = [
+    {
+      type: "pcb_board",
+      pcb_board_id: "board0",
+      center: { x: 0, y: 0 },
+      width: 14,
+      height: 10,
+    },
+    // Rectangle with positive margin (mask extends beyond pad)
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_rect_positive",
+      shape: "rect",
+      layer: "top",
+      x: -4,
+      y: 2,
+      width: 1.6,
+      height: 1.1,
+      is_covered_with_solder_mask: true,
+      soldermask_margin: 0.2,
+    },
+    // Rectangle with negative margin (spacing around copper, copper visible)
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_rect_negative",
+      shape: "rect",
+      layer: "top",
+      x: -4,
+      y: -2,
+      width: 1.6,
+      height: 1.1,
+      is_covered_with_solder_mask: true,
+      soldermask_margin: -0.15,
+    },
+    // Circle with positive margin
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_circle_positive",
+      shape: "circle",
+      layer: "top",
+      x: 0,
+      y: 2,
+      radius: 0.75,
+      is_covered_with_solder_mask: true,
+      soldermask_margin: 0.15,
+    },
+    // Circle with negative margin
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_circle_negative",
+      shape: "circle",
+      layer: "top",
+      x: 0,
+      y: -2,
+      radius: 0.75,
+      is_covered_with_solder_mask: true,
+      soldermask_margin: -0.2,
+    },
+    // Pill with positive margin
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_pill_positive",
+      shape: "pill",
+      layer: "top",
+      x: 4,
+      y: 2,
+      width: 2.4,
+      height: 1,
+      radius: 0.5,
+      is_covered_with_solder_mask: true,
+      soldermask_margin: 0.1,
+    },
+    // Pill with negative margin
+    {
+      type: "pcb_smtpad",
+      pcb_smtpad_id: "pad_pill_negative",
+      shape: "pill",
+      layer: "top",
+      x: 4,
+      y: -2,
+      width: 2.4,
+      height: 1,
+      radius: 0.5,
+      is_covered_with_solder_mask: true,
+      soldermask_margin: -0.12,
+    },
+    // Silkscreen labels for positive margin pads (top row)
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text_rect_pos",
+      layer: "top",
+      anchor_position: { x: -4, y: 3.2 },
+      anchor_alignment: "center",
+      text: "+0.2mm",
+      font_size: 0.4,
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text_circle_pos",
+      layer: "top",
+      anchor_position: { x: 0, y: 3.2 },
+      anchor_alignment: "center",
+      text: "+0.15mm",
+      font_size: 0.4,
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text_pill_pos",
+      layer: "top",
+      anchor_position: { x: 4, y: 3.2 },
+      anchor_alignment: "center",
+      text: "+0.1mm",
+      font_size: 0.4,
+    },
+    // Silkscreen labels for negative margin pads (bottom row)
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text_rect_neg",
+      layer: "top",
+      anchor_position: { x: -4, y: -3.2 },
+      anchor_alignment: "center",
+      text: "-0.15mm",
+      font_size: 0.4,
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text_circle_neg",
+      layer: "top",
+      anchor_position: { x: 0, y: -3.2 },
+      anchor_alignment: "center",
+      text: "-0.2mm",
+      font_size: 0.4,
+    },
+    {
+      type: "pcb_silkscreen_text",
+      pcb_silkscreen_text_id: "text_pill_neg",
+      layer: "top",
+      anchor_position: { x: 4, y: -3.2 },
+      anchor_alignment: "center",
+      text: "-0.12mm",
+      font_size: 0.4,
+    },
+  ]
+
+  drawer.setCameraBounds({ minX: -7, maxX: 7, minY: -5, maxY: 5 })
+  drawer.drawElements(circuit)
+
+  await expect(canvas.toBuffer("image/png")).toMatchPngSnapshot(
+    import.meta.path,
+  )
+})