circuit-to-canvas 0.0.111 → 0.0.112

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AnyCircuitElement, PcbRenderLayer, NinePointAnchor, PcbPlatedHole, PCBVia, PcbHole, PcbSmtPad, PcbVia, PcbCutout, PcbTrace, PcbBoard, PcbPanel, PcbSilkscreenText, PcbSilkscreenRect, PcbSilkscreenCircle, PcbSilkscreenLine, PcbSilkscreenPath, PcbSilkscreenPill, PcbSilkscreenOval, PCBKeepout, PcbCopperPour, PcbCopperText, PcbFabricationNoteText, PcbFabricationNoteRect, PcbNoteRect, PcbFabricationNotePath, PcbNotePath, PcbNoteText, PcbNoteDimension, PcbFabricationNoteDimension, PcbCourtyardCircle } from 'circuit-json';
+import { LayerRef, AnyCircuitElement, PcbRenderLayer, NinePointAnchor, PcbPlatedHole, PCBVia, PcbHole, PcbSmtPad, PcbVia, PcbCutout, PcbTrace, PcbBoard, PcbPanel, PcbSilkscreenText, PcbSilkscreenRect, PcbSilkscreenCircle, PcbSilkscreenLine, PcbSilkscreenPath, PcbSilkscreenPill, PcbSilkscreenOval, PCBKeepout, PcbCopperPour, PcbCopperText, PcbFabricationNoteText, PcbFabricationNoteRect, PcbNoteRect, PcbFabricationNotePath, PcbNotePath, PcbNoteText, PcbNoteDimension, PcbFabricationNoteDimension, PcbCourtyardCircle } from 'circuit-json';
 import { Matrix } from 'transformation-matrix';
 
 /**
@@ -44,7 +44,7 @@ interface CanvasContext {
     font: string;
     textAlign: "start" | "end" | "left" | "right" | "center";
 }
-type CopperLayerName = "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
+type CopperLayerName = LayerRef;
 type CopperColorMap = Record<CopperLayerName, string> & {
     [layer: string]: string;
 };
@@ -333,7 +333,7 @@ interface DrawPcbPlatedHoleParams {
     colorMap: PcbColorMap;
     soldermaskMargin?: number;
     drawSoldermask?: boolean;
-    layer?: "top" | "bottom";
+    layer?: LayerRef;
 }
 declare function drawPcbPlatedHole(params: DrawPcbPlatedHoleParams): void;
 
@@ -342,7 +342,7 @@ interface DrawPcbViaParams {
     via: PCBVia;
     realToCanvasMat: Matrix;
     colorMap: PcbColorMap;
-    layer?: "top" | "bottom";
+    layer?: LayerRef;
 }
 declare function drawPcbVia(params: DrawPcbViaParams): void;
 

package/dist/index.js

@@ -5217,6 +5217,8 @@ var DEFAULT_PCB_COLOR_MAP = {
     inner4: "rgb(64, 224, 208)",
     inner5: "rgb(138, 43, 226)",
     inner6: "rgb(255, 105, 180)",
+    inner7: "rgb(232, 178, 167)",
+    inner8: "rgb(242, 237, 161)",
     bottom: "rgb(77, 127, 196)"
   },
   copperPour: {
@@ -5256,9 +5258,10 @@ var DEFAULT_PCB_COLOR_MAP = {
 // lib/drawer/CircuitToCanvasDrawer.ts
 function getCopperLayer(layers) {
   if (!layers || layers.length === 0) return "top";
-  const hasBottom = layers.some((l) => l.startsWith("bottom"));
-  return hasBottom ? "bottom" : "top";
+  const copperLayer = layers.find((candidate) => candidate.endsWith("_copper"));
+  return copperLayer ? copperLayer.slice(0, -"_copper".length) : "top";
 }
+var isOnCopperLayer = (element, layer) => element.layers?.includes(layer) ?? true;
 var CircuitToCanvasDrawer = class {
   ctx;
   colorMap;
@@ -5344,13 +5347,13 @@ var CircuitToCanvasDrawer = class {
     const renderTopSoldermask = drawSoldermask && (board !== void 0 || panel !== void 0) && (options.drawSoldermaskTop ?? !hasExplicitSoldermaskLayers);
     const renderBottomSoldermask = drawSoldermask && (board !== void 0 || panel !== void 0) && (options.drawSoldermaskBottom ?? false);
     const drawableVias = elements.filter(
-      (el) => shouldDrawElement(el, options) && el.type === "pcb_via"
+      (el) => shouldDrawElement(el, options) && el.type === "pcb_via" && isOnCopperLayer(el, layer)
     );
     const drawableHoles = elements.filter(
       (el) => shouldDrawElement(el, options) && el.type === "pcb_hole"
     );
     const drawablePlatedHoles = elements.filter(
-      (el) => shouldDrawElement(el, options) && el.type === "pcb_plated_hole"
+      (el) => shouldDrawElement(el, options) && el.type === "pcb_plated_hole" && isOnCopperLayer(el, layer)
     );
     const drawableCutouts = elements.filter(
       (el) => shouldDrawElement(el, options) && el.type === "pcb_cutout"
@@ -5425,7 +5428,7 @@ var CircuitToCanvasDrawer = class {
             drawSoldermask: renderTopSoldermask
           });
         }
-        if (element.type === "pcb_plated_hole") {
+        if (element.type === "pcb_plated_hole" && isOnCopperLayer(element, layer)) {
           drawPcbPlatedHole({
             ctx: this.ctx,
             hole: element,
@@ -5436,7 +5439,7 @@ var CircuitToCanvasDrawer = class {
             layer
           });
         }
-        if (element.type === "pcb_via") {
+        if (element.type === "pcb_via" && isOnCopperLayer(element, layer)) {
           drawPcbVia({
             ctx: this.ctx,
             via: element,
@@ -5544,7 +5547,7 @@ var CircuitToCanvasDrawer = class {
     }
     for (const element of elements) {
       if (!shouldDrawElement(element, options)) continue;
-      if (element.type === "pcb_plated_hole" && !renderTopSoldermask) {
+      if (element.type === "pcb_plated_hole" && !renderTopSoldermask && isOnCopperLayer(element, layer)) {
         drawPcbPlatedHole({
           ctx: this.ctx,
           hole: element,
@@ -5555,7 +5558,7 @@ var CircuitToCanvasDrawer = class {
           layer
         });
       }
-      if (element.type === "pcb_via" && !renderTopSoldermask) {
+      if (element.type === "pcb_via" && !renderTopSoldermask && isOnCopperLayer(element, layer)) {
         drawPcbVia({
           ctx: this.ctx,
           via: element,

package/lib/drawer/CircuitToCanvasDrawer.ts

@@ -1,5 +1,6 @@
 import type {
   AnyCircuitElement,
+  LayerRef,
   PCBKeepout,
   PcbBoard,
   PcbCopperPour,
@@ -94,12 +95,17 @@ interface CanvasLike {
   getContext(contextId: "2d"): CanvasContext | null
 }
 
-function getCopperLayer(layers?: PcbRenderLayer[]): "top" | "bottom" {
+function getCopperLayer(layers?: PcbRenderLayer[]): LayerRef {
   if (!layers || layers.length === 0) return "top"
-  const hasBottom = layers.some((l) => l.startsWith("bottom"))
-  return hasBottom ? "bottom" : "top"
+  const copperLayer = layers.find((candidate) => candidate.endsWith("_copper"))
+  return copperLayer
+    ? (copperLayer.slice(0, -"_copper".length) as LayerRef)
+    : "top"
 }
 
+const isOnCopperLayer = (element: PcbVia | PcbPlatedHole, layer: LayerRef) =>
+  element.layers?.includes(layer) ?? true
+
 export class CircuitToCanvasDrawer {
   private ctx: CanvasContext
   private colorMap: PcbColorMap
@@ -233,7 +239,9 @@ export class CircuitToCanvasDrawer {
       (options.drawSoldermaskBottom ?? false)
     const drawableVias = elements.filter(
       (el): el is PcbVia =>
-        shouldDrawElement(el, options) && el.type === "pcb_via",
+        shouldDrawElement(el, options) &&
+        el.type === "pcb_via" &&
+        isOnCopperLayer(el, layer),
     )
     const drawableHoles = elements.filter(
       (el): el is PcbHole =>
@@ -241,7 +249,9 @@ export class CircuitToCanvasDrawer {
     )
     const drawablePlatedHoles = elements.filter(
       (el): el is PcbPlatedHole =>
-        shouldDrawElement(el, options) && el.type === "pcb_plated_hole",
+        shouldDrawElement(el, options) &&
+        el.type === "pcb_plated_hole" &&
+        isOnCopperLayer(el, layer),
     )
     const drawableCutouts = elements.filter(
       (el): el is PcbCutout =>
@@ -332,7 +342,10 @@ export class CircuitToCanvasDrawer {
           })
         }
 
-        if (element.type === "pcb_plated_hole") {
+        if (
+          element.type === "pcb_plated_hole" &&
+          isOnCopperLayer(element, layer)
+        ) {
           drawPcbPlatedHole({
             ctx: this.ctx,
             hole: element as PcbPlatedHole,
@@ -344,7 +357,7 @@ export class CircuitToCanvasDrawer {
           })
         }
 
-        if (element.type === "pcb_via") {
+        if (element.type === "pcb_via" && isOnCopperLayer(element, layer)) {
           drawPcbVia({
             ctx: this.ctx,
             via: element as PcbVia,
@@ -474,7 +487,11 @@ export class CircuitToCanvasDrawer {
     for (const element of elements) {
       if (!shouldDrawElement(element, options)) continue
 
-      if (element.type === "pcb_plated_hole" && !renderTopSoldermask) {
+      if (
+        element.type === "pcb_plated_hole" &&
+        !renderTopSoldermask &&
+        isOnCopperLayer(element, layer)
+      ) {
         drawPcbPlatedHole({
           ctx: this.ctx,
           hole: element as PcbPlatedHole,
@@ -488,7 +505,11 @@ export class CircuitToCanvasDrawer {
         })
       }
 
-      if (element.type === "pcb_via" && !renderTopSoldermask) {
+      if (
+        element.type === "pcb_via" &&
+        !renderTopSoldermask &&
+        isOnCopperLayer(element, layer)
+      ) {
         drawPcbVia({
           ctx: this.ctx,
           via: element as PcbVia,

package/lib/drawer/elements/pcb-plated-hole.ts

@@ -1,4 +1,4 @@
-import type { PcbPlatedHole } from "circuit-json"
+import type { LayerRef, PcbPlatedHole } from "circuit-json"
 import type { Matrix } from "transformation-matrix"
 import { drawCircle } from "../shapes/circle"
 import { drawOval } from "../shapes/oval"
@@ -15,7 +15,7 @@ export interface DrawPcbPlatedHoleParams {
   colorMap: PcbColorMap
   soldermaskMargin?: number
   drawSoldermask?: boolean
-  layer?: "top" | "bottom"
+  layer?: LayerRef
 }
 
 export function drawPcbPlatedHole(params: DrawPcbPlatedHoleParams): void {

package/lib/drawer/elements/pcb-via.ts

@@ -1,4 +1,4 @@
-import type { PCBVia } from "circuit-json"
+import type { LayerRef, PCBVia } from "circuit-json"
 import type { Matrix } from "transformation-matrix"
 import { drawCircle } from "../shapes/circle"
 import type { CanvasContext, PcbColorMap } from "../types"
@@ -8,7 +8,7 @@ export interface DrawPcbViaParams {
   via: PCBVia
   realToCanvasMat: Matrix
   colorMap: PcbColorMap
-  layer?: "top" | "bottom"
+  layer?: LayerRef
 }
 
 export function drawPcbVia(params: DrawPcbViaParams): void {

package/lib/drawer/types.ts

@@ -1,3 +1,4 @@
+import type { LayerRef } from "circuit-json"
 import type { Matrix } from "transformation-matrix"
 
 /**
@@ -56,15 +57,7 @@ export interface CanvasContext {
   textAlign: "start" | "end" | "left" | "right" | "center"
 }
 
-export type CopperLayerName =
-  | "top"
-  | "bottom"
-  | "inner1"
-  | "inner2"
-  | "inner3"
-  | "inner4"
-  | "inner5"
-  | "inner6"
+export type CopperLayerName = LayerRef
 
 export type CopperColorMap = Record<CopperLayerName, string> & {
   [layer: string]: string
@@ -115,6 +108,8 @@ export const DEFAULT_PCB_COLOR_MAP: PcbColorMap = {
     inner4: "rgb(64, 224, 208)",
     inner5: "rgb(138, 43, 226)",
     inner6: "rgb(255, 105, 180)",
+    inner7: "rgb(232, 178, 167)",
+    inner8: "rgb(242, 237, 161)",
     bottom: "rgb(77, 127, 196)",
   },
   copperPour: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-to-canvas",
   "main": "dist/index.js",
-  "version": "0.0.111",
+  "version": "0.0.112",
   "type": "module",
   "scripts": {
     "build": "tsup-node ./lib/index.ts --format esm --dts",
@@ -13,13 +13,14 @@
     "@napi-rs/canvas": "^0.1.84",
     "@resvg/resvg-js": "^2.6.2",
     "@tscircuit/alphabet": "^0.0.23",
-    "@tscircuit/circuit-json-util": "^0.0.91",
+    "@tscircuit/circuit-json-util": "^0.0.99",
     "@tscircuit/math-utils": "^0.0.36",
     "@types/bun": "latest",
     "bun-match-svg": "^0.0.14",
-    "circuit-json": "^0.0.433",
+    "circuit-json": "^0.0.450",
     "circuit-json-to-connectivity-map": "^0.0.23",
-    "circuit-to-svg": "^0.0.324",
+    "circuit-to-svg": "^0.0.390",
+    "format-si-unit": "^0.0.7",
     "looks-same": "^10.0.1",
     "schematic-symbols": "^0.0.202",
     "tsup": "^8.5.1"

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

@@ -1,9 +1,12 @@
 import { expect, test } from "bun:test"
 import { createCanvas } from "@napi-rs/canvas"
-import type { AnyCircuitElement } from "circuit-json"
+import type { AnyCircuitElement, LayerRef, PcbRenderLayer } from "circuit-json"
 import { CircuitToCanvasDrawer } from "../../lib/drawer"
 
-function renderCopperPourScene(elements: AnyCircuitElement[]): Buffer {
+function renderCopperPourScene(
+  elements: AnyCircuitElement[],
+  layer: LayerRef,
+): Buffer {
   const canvas = createCanvas(100, 100)
   const ctx = canvas.getContext("2d")
   const drawer = new CircuitToCanvasDrawer(ctx)
@@ -11,7 +14,9 @@ function renderCopperPourScene(elements: AnyCircuitElement[]): Buffer {
   ctx.fillStyle = "#1a1a1a"
   ctx.fillRect(0, 0, 100, 100)
 
-  drawer.drawElements(elements)
+  drawer.drawElements(elements, {
+    layers: [`${layer}_copper` as PcbRenderLayer],
+  })
 
   return canvas.toBuffer("image/png")
 }
@@ -23,6 +28,8 @@ const INNER_LAYERS = [
   "inner4",
   "inner5",
   "inner6",
+  "inner7",
+  "inner8",
 ] as const
 
 function createCopperPourWithTraceScene(
@@ -78,9 +85,10 @@ for (const layer of INNER_LAYERS) {
   test(`draw ${layer} copper pour with trace`, async () => {
     const elements = createCopperPourWithTraceScene(layer)
 
-    const withTrace = renderCopperPourScene(elements)
+    const withTrace = renderCopperPourScene(elements, layer)
     const withoutTrace = renderCopperPourScene(
       elements.filter((element) => element.type !== "pcb_trace"),
+      layer,
     )
 
     expect(Buffer.compare(withTrace, withoutTrace)).not.toBe(0)

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

@@ -0,0 +1,36 @@
+import { expect, test } from "bun:test"
+import { createCanvas } from "@napi-rs/canvas"
+import type { PcbRenderLayer, PcbVia } from "circuit-json"
+import { CircuitToCanvasDrawer } from "../../lib/drawer"
+
+const renderViaLayer = (via: PcbVia | undefined, layer: PcbRenderLayer) => {
+  const canvas = createCanvas(100, 100)
+  const ctx = canvas.getContext("2d")
+  const drawer = new CircuitToCanvasDrawer(ctx)
+
+  ctx.fillStyle = "#1a1a1a"
+  ctx.fillRect(0, 0, 100, 100)
+  drawer.drawElements(via ? [via] : [], { layers: [layer] })
+
+  return canvas.toBuffer("image/png")
+}
+
+test("draw buried via only on layers in its span", async () => {
+  const via: PcbVia = {
+    type: "pcb_via",
+    pcb_via_id: "via_inner8",
+    x: 50,
+    y: 50,
+    outer_diameter: 40,
+    hole_diameter: 20,
+    layers: ["inner7", "inner8"],
+  }
+
+  const inner8 = renderViaLayer(via, "inner8_copper")
+  const inner6 = renderViaLayer(via, "inner6_copper")
+  const blank = renderViaLayer(undefined, "inner6_copper")
+
+  expect(Buffer.compare(inner8, blank)).not.toBe(0)
+  expect(Buffer.compare(inner6, blank)).toBe(0)
+  await expect(inner8).toMatchPngSnapshot(import.meta.path)
+})