@tscircuit/cli 0.1.1894 → 0.1.1895

package/dist/cli/main.js

@@ -72006,22 +72006,23 @@ import { applyToPoint as applyToPoint82 } from "transformation-matrix";
 import { applyToPoint as applyToPoint92 } from "transformation-matrix";
 import { applyToPoint as applyToPoint102 } from "transformation-matrix";
 import { applyToPoint as applyToPoint112 } from "transformation-matrix";
-import { applyToPoint as applyToPoint152 } from "transformation-matrix";
-import { applyToPoint as applyToPoint122, compose as compose10, rotate as rotate13, translate as translate10 } from "transformation-matrix";
-import { applyToPoint as applyToPoint132, compose as compose23, rotate as rotate23, translate as translate23 } from "transformation-matrix";
-import { applyToPoint as applyToPoint142 } from "transformation-matrix";
+import { applyToPoint as applyToPoint122 } from "transformation-matrix";
 import { applyToPoint as applyToPoint162 } from "transformation-matrix";
+import { applyToPoint as applyToPoint132, compose as compose10, rotate as rotate13, translate as translate10 } from "transformation-matrix";
+import { applyToPoint as applyToPoint142, compose as compose23, rotate as rotate23, translate as translate23 } from "transformation-matrix";
+import { applyToPoint as applyToPoint152 } from "transformation-matrix";
 import { applyToPoint as applyToPoint172 } from "transformation-matrix";
 import { applyToPoint as applyToPoint182 } from "transformation-matrix";
 import { applyToPoint as applyToPoint192 } from "transformation-matrix";
 import { applyToPoint as applyToPoint202 } from "transformation-matrix";
-import { applyToPoint as applyToPoint232 } from "transformation-matrix";
-import { applyToPoint as applyToPoint222 } from "transformation-matrix";
 import { applyToPoint as applyToPoint212 } from "transformation-matrix";
 import { applyToPoint as applyToPoint242 } from "transformation-matrix";
+import { applyToPoint as applyToPoint232 } from "transformation-matrix";
+import { applyToPoint as applyToPoint222 } from "transformation-matrix";
 import { applyToPoint as applyToPoint252 } from "transformation-matrix";
 import { applyToPoint as applyToPoint262 } from "transformation-matrix";
 import { applyToPoint as applyToPoint272 } from "transformation-matrix";
+import { applyToPoint as applyToPoint282 } from "transformation-matrix";
 import { getElementRenderLayers } from "@tscircuit/circuit-json-util";
 function drawPath(params2) {
   const {
@@ -72187,41 +72188,20 @@ function drawPcbBoard(params2) {
     });
   }
 }
-function drawPolygon(params2) {
-  const { ctx, points, fill, realToCanvasMat } = params2;
-  if (points.length < 3)
-    return;
-  ctx.beginPath();
-  const canvasPoints = points.map((p3) => applyToPoint33(realToCanvasMat, [p3.x, p3.y]));
-  const firstPoint = canvasPoints[0];
-  if (!firstPoint)
-    return;
-  const [firstX, firstY] = firstPoint;
-  ctx.moveTo(firstX, firstY);
-  for (let i4 = 1;i4 < canvasPoints.length; i4++) {
-    const point9 = canvasPoints[i4];
-    if (!point9)
-      continue;
-    const [x4, y4] = point9;
-    ctx.lineTo(x4, y4);
-  }
-  ctx.closePath();
-  ctx.fillStyle = fill;
-  ctx.fill();
-}
-function layerToColor(layer, colorMap2) {
-  return colorMap2.copper[layer] ?? colorMap2.copper.top;
-}
-function computeArcFromBulge(startX, startY, endX, endY, bulge) {
-  if (Math.abs(bulge) < 0.0000000001) {
+function computeArcFromBulge({
+  startX,
+  startY,
+  endX,
+  endY,
+  bulge
+}) {
+  if (Math.abs(bulge) < 0.0000000001)
     return null;
-  }
   const chordX = endX - startX;
   const chordY = endY - startY;
   const chordLength = Math.hypot(chordX, chordY);
-  if (chordLength < 0.0000000001) {
+  if (chordLength < 0.0000000001)
     return null;
-  }
   const sagitta = Math.abs(bulge) * (chordLength / 2);
   const halfChord = chordLength / 2;
   const radius = (sagitta * sagitta + halfChord * halfChord) / (2 * sagitta);
@@ -72231,144 +72211,190 @@ function computeArcFromBulge(startX, startY, endX, endY, bulge) {
   const perpX = -chordY / chordLength;
   const perpY = chordX / chordLength;
   const sign = bulge > 0 ? -1 : 1;
-  const centerX = midX + sign * perpX * distToCenter;
-  const centerY = midY + sign * perpY * distToCenter;
-  return { centerX, centerY, radius };
+  return {
+    centerX: midX + sign * perpX * distToCenter,
+    centerY: midY + sign * perpY * distToCenter,
+    radius
+  };
 }
-function drawArcFromBulge(ctx, realStartX, realStartY, realEndX, realEndY, bulge, realToCanvasMat) {
+function addArcFromBulgeToPath({
+  ctx,
+  realStartX,
+  realStartY,
+  realEndX,
+  realEndY,
+  bulge,
+  realToCanvasMat
+}) {
   if (Math.abs(bulge) < 0.0000000001) {
-    const [endX, endY] = applyToPoint43(realToCanvasMat, [realEndX, realEndY]);
+    const [endX, endY] = applyToPoint33(realToCanvasMat, [realEndX, realEndY]);
     ctx.lineTo(endX, endY);
     return;
   }
-  const arc2 = computeArcFromBulge(realStartX, realStartY, realEndX, realEndY, bulge);
+  const arc2 = computeArcFromBulge({
+    startX: realStartX,
+    startY: realStartY,
+    endX: realEndX,
+    endY: realEndY,
+    bulge
+  });
   if (!arc2) {
-    const [endX, endY] = applyToPoint43(realToCanvasMat, [realEndX, realEndY]);
+    const [endX, endY] = applyToPoint33(realToCanvasMat, [realEndX, realEndY]);
     ctx.lineTo(endX, endY);
     return;
   }
-  const [canvasStartX, canvasStartY] = applyToPoint43(realToCanvasMat, [
+  const [canvasStartX, canvasStartY] = applyToPoint33(realToCanvasMat, [
     realStartX,
     realStartY
   ]);
-  const [canvasEndX, canvasEndY] = applyToPoint43(realToCanvasMat, [
+  const [canvasEndX, canvasEndY] = applyToPoint33(realToCanvasMat, [
     realEndX,
     realEndY
   ]);
-  const [canvasCenterX, canvasCenterY] = applyToPoint43(realToCanvasMat, [
+  const [canvasCenterX, canvasCenterY] = applyToPoint33(realToCanvasMat, [
     arc2.centerX,
     arc2.centerY
   ]);
   const canvasRadius = Math.hypot(canvasStartX - canvasCenterX, canvasStartY - canvasCenterY);
   const startAngle = Math.atan2(canvasStartY - canvasCenterY, canvasStartX - canvasCenterX);
   const endAngle = Math.atan2(canvasEndY - canvasCenterY, canvasEndX - canvasCenterX);
-  const det = realToCanvasMat.a * realToCanvasMat.d - realToCanvasMat.b * realToCanvasMat.c;
-  const isFlipped = det < 0;
+  const determinant = realToCanvasMat.a * realToCanvasMat.d - realToCanvasMat.b * realToCanvasMat.c;
+  const isFlipped = determinant < 0;
   const counterclockwise = bulge > 0 ? !isFlipped : isFlipped;
   ctx.arc(canvasCenterX, canvasCenterY, canvasRadius, startAngle, endAngle, counterclockwise);
 }
-function drawRing(ctx, ring, realToCanvasMat) {
+function addBrepRingToPath({
+  ctx,
+  ring,
+  realToCanvasMat
+}) {
   if (ring.vertices.length < 2)
     return;
   if (ring.vertices.length === 2) {
-    const v02 = ring.vertices[0];
-    const v12 = ring.vertices[1];
+    const [v02, v12] = ring.vertices;
     if (v02 && v12 && Math.abs((v02.bulge ?? 0) - 1) < 0.0000000001 && Math.abs((v12.bulge ?? 0) - 1) < 0.0000000001) {
-      const [x02, y02] = applyToPoint43(realToCanvasMat, [v02.x, v02.y]);
+      const [x02, y02] = applyToPoint33(realToCanvasMat, [v02.x, v02.y]);
       ctx.moveTo(x02, y02);
-      drawArcFromBulge(ctx, v02.x, v02.y, v12.x, v12.y, 1, realToCanvasMat);
-      drawArcFromBulge(ctx, v12.x, v12.y, v02.x, v02.y, 1, realToCanvasMat);
+      addArcFromBulgeToPath({
+        ctx,
+        realStartX: v02.x,
+        realStartY: v02.y,
+        realEndX: v12.x,
+        realEndY: v12.y,
+        bulge: 1,
+        realToCanvasMat
+      });
+      addArcFromBulgeToPath({
+        ctx,
+        realStartX: v12.x,
+        realStartY: v12.y,
+        realEndX: v02.x,
+        realEndY: v02.y,
+        bulge: 1,
+        realToCanvasMat
+      });
       return;
     }
   }
   const firstVertex = ring.vertices[0];
   if (!firstVertex)
     return;
-  const [firstX, firstY] = applyToPoint43(realToCanvasMat, [
+  const [firstX, firstY] = applyToPoint33(realToCanvasMat, [
     firstVertex.x,
     firstVertex.y
   ]);
   ctx.moveTo(firstX, firstY);
   for (let i4 = 0;i4 < ring.vertices.length; i4++) {
     const currentVertex = ring.vertices[i4];
-    const nextIndex = (i4 + 1) % ring.vertices.length;
-    const nextVertex = ring.vertices[nextIndex];
+    const nextVertex = ring.vertices[(i4 + 1) % ring.vertices.length];
     if (!currentVertex || !nextVertex)
       continue;
-    const bulge = currentVertex.bulge ?? 0;
-    if (Math.abs(bulge) < 0.0000000001) {
-      const [nextX, nextY] = applyToPoint43(realToCanvasMat, [
-        nextVertex.x,
-        nextVertex.y
-      ]);
-      ctx.lineTo(nextX, nextY);
-    } else {
-      drawArcFromBulge(ctx, currentVertex.x, currentVertex.y, nextVertex.x, nextVertex.y, bulge, realToCanvasMat);
-    }
+    addArcFromBulgeToPath({
+      ctx,
+      realStartX: currentVertex.x,
+      realStartY: currentVertex.y,
+      realEndX: nextVertex.x,
+      realEndY: nextVertex.y,
+      bulge: currentVertex.bulge ?? 0,
+      realToCanvasMat
+    });
   }
 }
-function drawPcbCopperPour(params2) {
-  const { ctx, pour, realToCanvasMat, colorMap: colorMap2 } = params2;
-  const color = layerToColor(pour.layer, colorMap2);
-  const opacity = 0.5;
-  ctx.save();
-  ctx.globalAlpha = opacity;
+function addBrepShapeToPath({
+  ctx,
+  shape,
+  realToCanvasMat
+}) {
+  addBrepRingToPath({ ctx, ring: shape.outer_ring, realToCanvasMat });
+  for (const innerRing of shape.inner_rings ?? []) {
+    addBrepRingToPath({ ctx, ring: innerRing, realToCanvasMat });
+  }
+}
+function layerToColor(layer, colorMap2) {
+  return colorMap2.copper[layer] ?? colorMap2.copper.top;
+}
+function appendPcbCopperPourPath(params2) {
+  const { ctx, pour, realToCanvasMat } = params2;
   if (pour.shape === "rect") {
-    const [cx3, cy3] = applyToPoint43(realToCanvasMat, [
-      pour.center.x,
-      pour.center.y
-    ]);
-    const scaledWidth = pour.width * Math.abs(realToCanvasMat.a);
-    const scaledHeight = pour.height * Math.abs(realToCanvasMat.a);
-    ctx.translate(cx3, cy3);
-    if (pour.rotation) {
-      ctx.rotate(-pour.rotation * (Math.PI / 180));
+    const halfWidth = pour.width / 2;
+    const halfHeight = pour.height / 2;
+    const rotation11 = (pour.rotation ?? 0) * Math.PI / 180;
+    const cos2 = Math.cos(rotation11);
+    const sin2 = Math.sin(rotation11);
+    const canvasPoints = [
+      { x: -halfWidth, y: -halfHeight },
+      { x: halfWidth, y: -halfHeight },
+      { x: halfWidth, y: halfHeight },
+      { x: -halfWidth, y: halfHeight }
+    ].map((point9) => applyToPoint43(realToCanvasMat, [
+      pour.center.x + point9.x * cos2 - point9.y * sin2,
+      pour.center.y + point9.x * sin2 + point9.y * cos2
+    ]));
+    const firstPoint = canvasPoints[0];
+    if (!firstPoint)
+      return;
+    ctx.moveTo(firstPoint[0], firstPoint[1]);
+    for (let index = 1;index < canvasPoints.length; index++) {
+      const point9 = canvasPoints[index];
+      if (point9)
+        ctx.lineTo(point9[0], point9[1]);
     }
-    ctx.beginPath();
-    ctx.rect(-scaledWidth / 2, -scaledHeight / 2, scaledWidth, scaledHeight);
-    ctx.fillStyle = color;
-    ctx.fill();
-    ctx.restore();
+    ctx.closePath();
     return;
   }
   if (pour.shape === "polygon") {
-    if (pour.points && pour.points.length >= 3) {
-      const canvasPoints = pour.points.map((p3) => applyToPoint43(realToCanvasMat, [p3.x, p3.y]));
-      const firstPoint = canvasPoints[0];
-      if (!firstPoint) {
-        ctx.restore();
-        return;
-      }
-      ctx.beginPath();
-      const [firstX, firstY] = firstPoint;
-      ctx.moveTo(firstX, firstY);
-      for (let i4 = 1;i4 < canvasPoints.length; i4++) {
-        const point9 = canvasPoints[i4];
-        if (!point9)
-          continue;
-        const [x4, y4] = point9;
-        ctx.lineTo(x4, y4);
-      }
-      ctx.closePath();
-      ctx.fillStyle = color;
-      ctx.fill();
+    const firstPoint = pour.points[0];
+    if (!firstPoint)
+      return;
+    const [firstX, firstY] = applyToPoint43(realToCanvasMat, [
+      firstPoint.x,
+      firstPoint.y
+    ]);
+    ctx.moveTo(firstX, firstY);
+    for (let index = 1;index < pour.points.length; index++) {
+      const point9 = pour.points[index];
+      if (!point9)
+        continue;
+      const [x4, y4] = applyToPoint43(realToCanvasMat, [point9.x, point9.y]);
+      ctx.lineTo(x4, y4);
     }
-    ctx.restore();
+    ctx.closePath();
     return;
   }
-  if (pour.shape === "brep") {
-    ctx.beginPath();
-    drawRing(ctx, pour.brep_shape.outer_ring, realToCanvasMat);
-    if (pour.brep_shape.inner_rings) {
-      for (const innerRing of pour.brep_shape.inner_rings) {
-        drawRing(ctx, innerRing, realToCanvasMat);
-      }
-    }
-    ctx.fillStyle = color;
-    ctx.fill("evenodd");
-    ctx.restore();
+  if (pour.shape !== "brep")
     return;
-  }
+  addBrepShapeToPath({ ctx, shape: pour.brep_shape, realToCanvasMat });
+}
+function drawPcbCopperPour(params2) {
+  const { ctx, pour, realToCanvasMat, colorMap: colorMap2 } = params2;
+  const color = layerToColor(pour.layer, colorMap2);
+  const opacity = 0.5;
+  ctx.save();
+  ctx.globalAlpha = opacity;
+  ctx.beginPath();
+  appendPcbCopperPourPath({ ctx, pour, realToCanvasMat });
+  ctx.fillStyle = color;
+  ctx.fill(pour.shape === "brep" ? "evenodd" : "nonzero");
   ctx.restore();
 }
 function addPolygonToPath(ctx, points) {
@@ -72785,6 +72811,28 @@ function drawPcbCourtyardRect(params2) {
     lineJoin: "round"
   });
 }
+function drawPolygon(params2) {
+  const { ctx, points, fill, realToCanvasMat } = params2;
+  if (points.length < 3)
+    return;
+  ctx.beginPath();
+  const canvasPoints = points.map((p3) => applyToPoint82(realToCanvasMat, [p3.x, p3.y]));
+  const firstPoint = canvasPoints[0];
+  if (!firstPoint)
+    return;
+  const [firstX, firstY] = firstPoint;
+  ctx.moveTo(firstX, firstY);
+  for (let i4 = 1;i4 < canvasPoints.length; i4++) {
+    const point9 = canvasPoints[i4];
+    if (!point9)
+      continue;
+    const [x4, y4] = point9;
+    ctx.lineTo(x4, y4);
+  }
+  ctx.closePath();
+  ctx.fillStyle = fill;
+  ctx.fill();
+}
 function drawPcbCutout(params2) {
   const { ctx, cutout, realToCanvasMat, colorMap: colorMap2 } = params2;
   if (cutout.shape === "rect") {
@@ -72951,11 +72999,11 @@ function drawDimensionLine(params2) {
       x: (from.x + to3.x) / 2 + offsetVector.x,
       y: (from.y + to3.y) / 2 + offsetVector.y
     };
-    const [screenFromX, screenFromY] = applyToPoint82(realToCanvasMat, [
+    const [screenFromX, screenFromY] = applyToPoint92(realToCanvasMat, [
       fromOffset.x,
       fromOffset.y
     ]);
-    const [screenToX, screenToY] = applyToPoint82(realToCanvasMat, [
+    const [screenToX, screenToY] = applyToPoint92(realToCanvasMat, [
       toOffset.x,
       toOffset.y
     ]);
@@ -73027,8 +73075,8 @@ function drawLine(params2) {
     realToCanvasMat,
     lineCap = "round"
   } = params2;
-  const [x12, y12] = applyToPoint92(realToCanvasMat, [start.x, start.y]);
-  const [x22, y22] = applyToPoint92(realToCanvasMat, [end.x, end.y]);
+  const [x12, y12] = applyToPoint102(realToCanvasMat, [start.x, start.y]);
+  const [x22, y22] = applyToPoint102(realToCanvasMat, [end.x, end.y]);
   const scaledStrokeWidth = strokeWidth * Math.abs(realToCanvasMat.a);
   ctx.beginPath();
   ctx.moveTo(x12, y12);
@@ -73110,7 +73158,7 @@ function drawOval(params2) {
     realToCanvasMat,
     rotation: rotation11 = 0
   } = params2;
-  const [cx3, cy3] = applyToPoint102(realToCanvasMat, [center2.x, center2.y]);
+  const [cx3, cy3] = applyToPoint112(realToCanvasMat, [center2.x, center2.y]);
   const scaledRadiusX = radius_x * Math.abs(realToCanvasMat.a);
   const scaledRadiusY = radius_y * Math.abs(realToCanvasMat.a);
   const scaledStrokeWidth = strokeWidth * Math.abs(realToCanvasMat.a);
@@ -73144,7 +73192,7 @@ function drawPill(params2) {
     stroke,
     strokeWidth
   } = params2;
-  const [cx3, cy3] = applyToPoint112(realToCanvasMat, [center2.x, center2.y]);
+  const [cx3, cy3] = applyToPoint122(realToCanvasMat, [center2.x, center2.y]);
   const scaledWidth = width * Math.abs(realToCanvasMat.a);
   const scaledHeight = height * Math.abs(realToCanvasMat.a);
   const scaledStrokeWidth = strokeWidth ? strokeWidth * Math.abs(realToCanvasMat.a) : undefined;
@@ -73291,15 +73339,15 @@ function drawPillPath(params2) {
   if (width > height) {
     const semicircleRadius = height / 2;
     const semicircleCenterOffset = (width - height) / 2;
-    const leftSemicircleCenter = applyToPoint122(realToPxTransform, {
+    const leftSemicircleCenter = applyToPoint132(realToPxTransform, {
       x: -semicircleCenterOffset,
       y: 0
     });
-    const rightSemicircleCenter = applyToPoint122(realToPxTransform, {
+    const rightSemicircleCenter = applyToPoint132(realToPxTransform, {
       x: semicircleCenterOffset,
       y: 0
     });
-    const startPoint = applyToPoint122(realToPxTransform, {
+    const startPoint = applyToPoint132(realToPxTransform, {
       x: semicircleCenterOffset,
       y: -semicircleRadius
     });
@@ -73309,15 +73357,15 @@ function drawPillPath(params2) {
   } else if (height > width) {
     const semicircleRadius = width / 2;
     const semicircleCenterOffset = (height - width) / 2;
-    const topSemicircleCenter = applyToPoint122(realToPxTransform, {
+    const topSemicircleCenter = applyToPoint132(realToPxTransform, {
       x: 0,
       y: -semicircleCenterOffset
     });
-    const bottomSemicircleCenter = applyToPoint122(realToPxTransform, {
+    const bottomSemicircleCenter = applyToPoint132(realToPxTransform, {
       x: 0,
       y: semicircleCenterOffset
     });
-    const startPoint = applyToPoint122(realToPxTransform, {
+    const startPoint = applyToPoint132(realToPxTransform, {
       x: semicircleRadius,
       y: semicircleCenterOffset
     });
@@ -73363,23 +73411,23 @@ function drawRoundedRectPath(params2) {
   const rectHalfHeight = height / 2;
   const rectCornerRadius = Math.min(radius, rectHalfWidth, rectHalfHeight);
   if (rectCornerRadius > 0) {
-    const rectTopLeftCorner = applyToPoint132(realToPxTransform, {
+    const rectTopLeftCorner = applyToPoint142(realToPxTransform, {
       x: -rectHalfWidth,
       y: -rectHalfHeight
     });
-    const rectTopRightCorner = applyToPoint132(realToPxTransform, {
+    const rectTopRightCorner = applyToPoint142(realToPxTransform, {
       x: rectHalfWidth,
       y: -rectHalfHeight
     });
-    const rectBottomRightCorner = applyToPoint132(realToPxTransform, {
+    const rectBottomRightCorner = applyToPoint142(realToPxTransform, {
       x: rectHalfWidth,
       y: rectHalfHeight
     });
-    const rectBottomLeftCorner = applyToPoint132(realToPxTransform, {
+    const rectBottomLeftCorner = applyToPoint142(realToPxTransform, {
       x: -rectHalfWidth,
       y: rectHalfHeight
     });
-    const leftEdgeMidpoint = applyToPoint132(realToPxTransform, {
+    const leftEdgeMidpoint = applyToPoint142(realToPxTransform, {
       x: -rectHalfWidth,
       y: 0
     });
@@ -73389,19 +73437,19 @@ function drawRoundedRectPath(params2) {
     ctx.arcTo(rectBottomRightCorner.x, rectBottomRightCorner.y, rectBottomLeftCorner.x, rectBottomLeftCorner.y, rectCornerRadius);
     ctx.arcTo(rectBottomLeftCorner.x, rectBottomLeftCorner.y, rectTopLeftCorner.x, rectTopLeftCorner.y, rectCornerRadius);
   } else {
-    const rectTopLeftCorner = applyToPoint132(realToPxTransform, {
+    const rectTopLeftCorner = applyToPoint142(realToPxTransform, {
       x: -rectHalfWidth,
       y: -rectHalfHeight
     });
-    const rectTopRightCorner = applyToPoint132(realToPxTransform, {
+    const rectTopRightCorner = applyToPoint142(realToPxTransform, {
       x: rectHalfWidth,
       y: -rectHalfHeight
     });
-    const rectBottomRightCorner = applyToPoint132(realToPxTransform, {
+    const rectBottomRightCorner = applyToPoint142(realToPxTransform, {
       x: rectHalfWidth,
       y: rectHalfHeight
     });
-    const rectBottomLeftCorner = applyToPoint132(realToPxTransform, {
+    const rectBottomLeftCorner = applyToPoint142(realToPxTransform, {
       x: -rectHalfWidth,
       y: rectHalfHeight
     });
@@ -73555,7 +73603,7 @@ function appendDrillCutoutPath(ctx, drillCutout, realToCanvasMat) {
 }
 function appendCirclePath(ctx, params2) {
   const { x: x4, y: y4, radius, realToCanvasMat } = params2;
-  const [cx3, cy3] = applyToPoint142(realToCanvasMat, [x4, y4]);
+  const [cx3, cy3] = applyToPoint152(realToCanvasMat, [x4, y4]);
   const scaledRadius = radius * Math.abs(realToCanvasMat.a);
   ctx.moveTo(cx3 + scaledRadius, cy3);
   ctx.arc(cx3, cy3, scaledRadius, 0, Math.PI * 2);
@@ -73563,7 +73611,7 @@ function appendCirclePath(ctx, params2) {
 }
 function appendOvalPath(ctx, params2) {
   const { x: x4, y: y4, radiusX, radiusY, rotation: rotation11 = 0, realToCanvasMat } = params2;
-  const [cx3, cy3] = applyToPoint142(realToCanvasMat, [x4, y4]);
+  const [cx3, cy3] = applyToPoint152(realToCanvasMat, [x4, y4]);
   const scaledRadiusX = radiusX * Math.abs(realToCanvasMat.a);
   const scaledRadiusY = radiusY * Math.abs(realToCanvasMat.a);
   ctx.save();
@@ -73586,7 +73634,7 @@ function appendRectPath(ctx, params2) {
     rotation: rotation11 = 0,
     realToCanvasMat
   } = params2;
-  const [cx3, cy3] = applyToPoint142(realToCanvasMat, [x4, y4]);
+  const [cx3, cy3] = applyToPoint152(realToCanvasMat, [x4, y4]);
   const scaledWidth = width * Math.abs(realToCanvasMat.a);
   const scaledHeight = height * Math.abs(realToCanvasMat.a);
   const scaledRadius = radius * Math.abs(realToCanvasMat.a);
@@ -73616,7 +73664,7 @@ function appendRectPath(ctx, params2) {
 }
 function appendPillPath(ctx, params2) {
   const { x: x4, y: y4, width, height, rotation: rotation11 = 0, realToCanvasMat } = params2;
-  const [cx3, cy3] = applyToPoint142(realToCanvasMat, [x4, y4]);
+  const [cx3, cy3] = applyToPoint152(realToCanvasMat, [x4, y4]);
   const scaledWidth = width * Math.abs(realToCanvasMat.a);
   const scaledHeight = height * Math.abs(realToCanvasMat.a);
   ctx.save();
@@ -73651,7 +73699,7 @@ function appendPolygonPath(ctx, points, realToCanvasMat) {
   const firstPoint = points[0];
   if (!firstPoint)
     return;
-  const [firstX, firstY] = applyToPoint142(realToCanvasMat, [
+  const [firstX, firstY] = applyToPoint152(realToCanvasMat, [
     firstPoint.x,
     firstPoint.y
   ]);
@@ -73660,7 +73708,7 @@ function appendPolygonPath(ctx, points, realToCanvasMat) {
     const point9 = points[i4];
     if (!point9)
       continue;
-    const [x4, y4] = applyToPoint142(realToCanvasMat, [point9.x, point9.y]);
+    const [x4, y4] = applyToPoint152(realToCanvasMat, [point9.x, point9.y]);
     ctx.lineTo(x4, y4);
   }
   ctx.closePath();
@@ -74000,7 +74048,7 @@ function drawPcbKeepout(params2) {
   const hatchSpacing = 1 * scale22;
   const hatchWidth = 0.15 * scale22;
   if (keepout.shape === "rect") {
-    const [cx3, cy3] = applyToPoint152(realToCanvasMat, [
+    const [cx3, cy3] = applyToPoint162(realToCanvasMat, [
       keepout.center.x,
       keepout.center.y
     ]);
@@ -74044,7 +74092,7 @@ function drawPcbKeepout(params2) {
     return;
   }
   if (keepout.shape === "circle") {
-    const [cx3, cy3] = applyToPoint152(realToCanvasMat, [
+    const [cx3, cy3] = applyToPoint162(realToCanvasMat, [
       keepout.center.x,
       keepout.center.y
     ]);
@@ -74104,8 +74152,8 @@ function drawPcbNoteLine(params2) {
   const color = line2.color ?? defaultColor;
   const strokeWidth = line2.stroke_width ?? 0.1;
   const isDashed = line2.is_dashed ?? false;
-  const [x12, y12] = applyToPoint162(realToCanvasMat, [line2.x1, line2.y1]);
-  const [x22, y22] = applyToPoint162(realToCanvasMat, [line2.x2, line2.y2]);
+  const [x12, y12] = applyToPoint172(realToCanvasMat, [line2.x1, line2.y1]);
+  const [x22, y22] = applyToPoint172(realToCanvasMat, [line2.x2, line2.y2]);
   const scaledStrokeWidth = strokeWidth * Math.abs(realToCanvasMat.a);
   ctx.save();
   if (isDashed) {
@@ -74565,6 +74613,14 @@ function drawPcbSilkscreenCircle(params2) {
     realToCanvasMat
   });
 }
+function drawPcbSilkscreenGraphic(params2) {
+  const { ctx, graphic, realToCanvasMat, colorMap: colorMap2 } = params2;
+  const color = graphic.layer === "bottom" ? colorMap2.silkscreen.bottom : colorMap2.silkscreen.top;
+  ctx.beginPath();
+  addBrepShapeToPath({ ctx, shape: graphic.brep_shape, realToCanvasMat });
+  ctx.fillStyle = color;
+  ctx.fill("evenodd");
+}
 function layerToSilkscreenColor2(layer, colorMap2) {
   return layer === "bottom" ? colorMap2.silkscreen.bottom : colorMap2.silkscreen.top;
 }
@@ -74779,54 +74835,68 @@ function drawPcbSmtPad(params2) {
     return;
   }
 }
-function drawBoardSoldermask(params2) {
-  const { ctx, board, realToCanvasMat, soldermaskColor } = params2;
-  const { width, height, center: center2, outline } = board;
-  if (outline && Array.isArray(outline) && outline.length >= 3) {
-    const canvasPoints = outline.map((p3) => {
-      const [x4, y4] = applyToPoint182(realToCanvasMat, [p3.x, p3.y]);
-      return { x: x4, y: y4 };
+function drawPcbSolderPaste(params2) {
+  const { ctx, solderPaste, realToCanvasMat } = params2;
+  const center2 = { x: solderPaste.x, y: solderPaste.y };
+  if (solderPaste.shape === "rect") {
+    drawRect({
+      ctx,
+      center: center2,
+      width: solderPaste.width,
+      height: solderPaste.height,
+      fill: SOLDER_PASTE_COLOR,
+      realToCanvasMat
     });
-    ctx.beginPath();
-    drawPolygonPath({ ctx, points: canvasPoints });
-    ctx.fillStyle = soldermaskColor;
-    ctx.fill();
-  } else if (width !== undefined && height !== undefined && center2) {
-    const [cx3, cy3] = applyToPoint182(realToCanvasMat, [center2.x, center2.y]);
-    const scaledWidth = width * Math.abs(realToCanvasMat.a);
-    const scaledHeight = height * Math.abs(realToCanvasMat.a);
-    ctx.fillStyle = soldermaskColor;
-    ctx.fillRect(cx3 - scaledWidth / 2, cy3 - scaledHeight / 2, scaledWidth, scaledHeight);
-  }
-}
-function isPatternCapableContext(ctx) {
-  return "createPattern" in ctx && typeof Reflect.get(ctx, "createPattern") === "function";
-}
-function mergeSoldermaskLayer(baseCtx, soldermaskCtx) {
-  if (baseCtx === soldermaskCtx)
-    return;
-  if (soldermaskCtx.canvas.width <= 0 || soldermaskCtx.canvas.height <= 0)
     return;
-  if (!isPatternCapableContext(baseCtx))
+  }
+  if (solderPaste.shape === "rotated_rect") {
+    drawRect({
+      ctx,
+      center: center2,
+      width: solderPaste.width,
+      height: solderPaste.height,
+      fill: SOLDER_PASTE_COLOR,
+      realToCanvasMat,
+      ccwRotationDegrees: solderPaste.ccw_rotation
+    });
     return;
-  let pattern = null;
-  try {
-    pattern = baseCtx.createPattern(soldermaskCtx.canvas, "no-repeat");
-  } catch {
+  }
+  if (solderPaste.shape === "pill") {
+    drawPill({
+      ctx,
+      center: center2,
+      width: solderPaste.width,
+      height: solderPaste.height,
+      fill: SOLDER_PASTE_COLOR,
+      realToCanvasMat
+    });
     return;
   }
-  if (!pattern)
+  if (solderPaste.shape === "oval") {
+    drawOval({
+      ctx,
+      center: center2,
+      radius_x: solderPaste.width / 2,
+      radius_y: solderPaste.height / 2,
+      fill: SOLDER_PASTE_COLOR,
+      realToCanvasMat
+    });
     return;
-  baseCtx.save();
-  baseCtx.globalCompositeOperation = "source-over";
-  baseCtx.fillStyle = pattern;
-  baseCtx.fillRect(0, 0, soldermaskCtx.canvas.width, soldermaskCtx.canvas.height);
-  baseCtx.restore();
+  }
+  if (solderPaste.shape === "circle") {
+    drawCircle({
+      ctx,
+      center: center2,
+      radius: solderPaste.radius,
+      fill: SOLDER_PASTE_COLOR,
+      realToCanvasMat
+    });
+  }
 }
 function isCanvasConstructor(value) {
   return typeof value === "function";
 }
-function createSoldermaskLayerContext(baseCtx, width, height) {
+function createDrawingLayerContext(baseCtx, width, height) {
   if (width <= 0 || height <= 0)
     return null;
   const g6 = globalThis;
@@ -74852,12 +74922,57 @@ function createSoldermaskLayerContext(baseCtx, width, height) {
     return null;
   return layerCanvas.getContext("2d");
 }
+function isPatternCapableContext(ctx) {
+  return "createPattern" in ctx && typeof Reflect.get(ctx, "createPattern") === "function";
+}
+function mergeDrawingLayer(baseCtx, layerCtx) {
+  if (baseCtx === layerCtx)
+    return false;
+  if (layerCtx.canvas.width <= 0 || layerCtx.canvas.height <= 0)
+    return false;
+  if (!isPatternCapableContext(baseCtx))
+    return false;
+  let pattern = null;
+  try {
+    pattern = baseCtx.createPattern(layerCtx.canvas, "no-repeat");
+  } catch {
+    return false;
+  }
+  if (!pattern)
+    return false;
+  baseCtx.save();
+  baseCtx.globalCompositeOperation = "source-over";
+  baseCtx.fillStyle = pattern;
+  baseCtx.fillRect(0, 0, layerCtx.canvas.width, layerCtx.canvas.height);
+  baseCtx.restore();
+  return true;
+}
+function drawBoardSoldermask(params2) {
+  const { ctx, board, realToCanvasMat, soldermaskColor } = params2;
+  const { width, height, center: center2, outline } = board;
+  if (outline && Array.isArray(outline) && outline.length >= 3) {
+    const canvasPoints = outline.map((p3) => {
+      const [x4, y4] = applyToPoint192(realToCanvasMat, [p3.x, p3.y]);
+      return { x: x4, y: y4 };
+    });
+    ctx.beginPath();
+    drawPolygonPath({ ctx, points: canvasPoints });
+    ctx.fillStyle = soldermaskColor;
+    ctx.fill();
+  } else if (width !== undefined && height !== undefined && center2) {
+    const [cx3, cy3] = applyToPoint192(realToCanvasMat, [center2.x, center2.y]);
+    const scaledWidth = width * Math.abs(realToCanvasMat.a);
+    const scaledHeight = height * Math.abs(realToCanvasMat.a);
+    ctx.fillStyle = soldermaskColor;
+    ctx.fillRect(cx3 - scaledWidth / 2, cy3 - scaledHeight / 2, scaledWidth, scaledHeight);
+  }
+}
 function drawPanelSoldermask(params2) {
   const { ctx, panel, realToCanvasMat, soldermaskColor } = params2;
   const { width, height, center: center2 } = panel;
   if (width === undefined || height === undefined || !center2)
     return;
-  const [cx3, cy3] = applyToPoint192(realToCanvasMat, [center2.x, center2.y]);
+  const [cx3, cy3] = applyToPoint202(realToCanvasMat, [center2.x, center2.y]);
   const scaledWidth = width * Math.abs(realToCanvasMat.a);
   const scaledHeight = height * Math.abs(realToCanvasMat.a);
   ctx.fillStyle = soldermaskColor;
@@ -74872,7 +74987,7 @@ function cutPathFromSoldermask(ctx) {
 function processCutoutSoldermask(params2) {
   const { ctx, cutout, realToCanvasMat } = params2;
   if (cutout.shape === "rect") {
-    const [cx3, cy3] = applyToPoint202(realToCanvasMat, [
+    const [cx3, cy3] = applyToPoint212(realToCanvasMat, [
       cutout.center?.x ?? 0,
       cutout.center?.y ?? 0
     ]);
@@ -74896,7 +75011,7 @@ function processCutoutSoldermask(params2) {
     ctx.restore();
     cutPathFromSoldermask(ctx);
   } else if (cutout.shape === "circle") {
-    const [cx3, cy3] = applyToPoint202(realToCanvasMat, [
+    const [cx3, cy3] = applyToPoint212(realToCanvasMat, [
       cutout.center?.x ?? 0,
       cutout.center?.y ?? 0
     ]);
@@ -74907,7 +75022,7 @@ function processCutoutSoldermask(params2) {
     cutPathFromSoldermask(ctx);
   } else if (cutout.shape === "polygon" && cutout.points && cutout.points.length >= 3) {
     const canvasPoints = cutout.points.map((p3) => {
-      const [x4, y4] = applyToPoint202(realToCanvasMat, [p3.x, p3.y]);
+      const [x4, y4] = applyToPoint212(realToCanvasMat, [p3.x, p3.y]);
       return { x: x4, y: y4 };
     });
     ctx.beginPath();
@@ -75184,27 +75299,27 @@ function computeArcFromBulge2(startX, startY, endX, endY, bulge) {
     radius
   };
 }
-function drawArcFromBulge2(ctx, realStartX, realStartY, realEndX, realEndY, bulge, realToCanvasMat) {
+function drawArcFromBulge(ctx, realStartX, realStartY, realEndX, realEndY, bulge, realToCanvasMat) {
   if (Math.abs(bulge) < 0.0000000001) {
-    const [endX, endY] = applyToPoint212(realToCanvasMat, [realEndX, realEndY]);
+    const [endX, endY] = applyToPoint222(realToCanvasMat, [realEndX, realEndY]);
     ctx.lineTo(endX, endY);
     return;
   }
   const arc2 = computeArcFromBulge2(realStartX, realStartY, realEndX, realEndY, bulge);
   if (!arc2) {
-    const [endX, endY] = applyToPoint212(realToCanvasMat, [realEndX, realEndY]);
+    const [endX, endY] = applyToPoint222(realToCanvasMat, [realEndX, realEndY]);
     ctx.lineTo(endX, endY);
     return;
   }
-  const [canvasStartX, canvasStartY] = applyToPoint212(realToCanvasMat, [
+  const [canvasStartX, canvasStartY] = applyToPoint222(realToCanvasMat, [
     realStartX,
     realStartY
   ]);
-  const [canvasEndX, canvasEndY] = applyToPoint212(realToCanvasMat, [
+  const [canvasEndX, canvasEndY] = applyToPoint222(realToCanvasMat, [
     realEndX,
     realEndY
   ]);
-  const [canvasCenterX, canvasCenterY] = applyToPoint212(realToCanvasMat, [
+  const [canvasCenterX, canvasCenterY] = applyToPoint222(realToCanvasMat, [
     arc2.centerX,
     arc2.centerY
   ]);
@@ -75216,24 +75331,24 @@ function drawArcFromBulge2(ctx, realStartX, realStartY, realEndX, realEndY, bulg
   const counterclockwise = bulge > 0 ? !isFlipped : isFlipped;
   ctx.arc(canvasCenterX, canvasCenterY, canvasRadius, startAngle, endAngle, counterclockwise);
 }
-function drawRing2(ctx, ring, realToCanvasMat) {
+function drawRing(ctx, ring, realToCanvasMat) {
   if (ring.vertices.length < 2)
     return;
   if (ring.vertices.length === 2) {
     const v02 = ring.vertices[0];
     const v12 = ring.vertices[1];
     if (v02 && v12 && Math.abs((v02.bulge ?? 0) - 1) < 0.0000000001 && Math.abs((v12.bulge ?? 0) - 1) < 0.0000000001) {
-      const [x02, y02] = applyToPoint222(realToCanvasMat, [v02.x, v02.y]);
+      const [x02, y02] = applyToPoint232(realToCanvasMat, [v02.x, v02.y]);
       ctx.moveTo(x02, y02);
-      drawArcFromBulge2(ctx, v02.x, v02.y, v12.x, v12.y, 1, realToCanvasMat);
-      drawArcFromBulge2(ctx, v12.x, v12.y, v02.x, v02.y, 1, realToCanvasMat);
+      drawArcFromBulge(ctx, v02.x, v02.y, v12.x, v12.y, 1, realToCanvasMat);
+      drawArcFromBulge(ctx, v12.x, v12.y, v02.x, v02.y, 1, realToCanvasMat);
       return;
     }
   }
   const firstVertex = ring.vertices[0];
   if (!firstVertex)
     return;
-  const [firstX, firstY] = applyToPoint222(realToCanvasMat, [
+  const [firstX, firstY] = applyToPoint232(realToCanvasMat, [
     firstVertex.x,
     firstVertex.y
   ]);
@@ -75245,13 +75360,13 @@ function drawRing2(ctx, ring, realToCanvasMat) {
       continue;
     const bulge = currentVertex.bulge ?? 0;
     if (Math.abs(bulge) < 0.0000000001) {
-      const [nextX, nextY] = applyToPoint222(realToCanvasMat, [
+      const [nextX, nextY] = applyToPoint232(realToCanvasMat, [
         nextVertex.x,
         nextVertex.y
       ]);
       ctx.lineTo(nextX, nextY);
     } else {
-      drawArcFromBulge2(ctx, currentVertex.x, currentVertex.y, nextVertex.x, nextVertex.y, bulge, realToCanvasMat);
+      drawArcFromBulge(ctx, currentVertex.x, currentVertex.y, nextVertex.x, nextVertex.y, bulge, realToCanvasMat);
     }
   }
 }
@@ -75271,7 +75386,7 @@ function processCopperPourSoldermask(params2) {
   ctx.save();
   ctx.fillStyle = soldermaskOverCopperColor;
   if (pour.shape === "rect") {
-    const [cx3, cy3] = applyToPoint232(realToCanvasMat, [
+    const [cx3, cy3] = applyToPoint242(realToCanvasMat, [
       pour.center.x,
       pour.center.y
     ]);
@@ -75295,7 +75410,7 @@ function processCopperPourSoldermask(params2) {
   }
   if (pour.shape === "polygon") {
     if (pour.points && pour.points.length >= 3) {
-      const canvasPoints = pour.points.map((p3) => applyToPoint232(realToCanvasMat, [p3.x, p3.y]));
+      const canvasPoints = pour.points.map((p3) => applyToPoint242(realToCanvasMat, [p3.x, p3.y]));
       const firstPoint = canvasPoints[0];
       if (firstPoint) {
         ctx.beginPath();
@@ -75323,10 +75438,10 @@ function processCopperPourSoldermask(params2) {
   }
   if (pour.shape === "brep") {
     ctx.beginPath();
-    drawRing2(ctx, pour.brep_shape.outer_ring, realToCanvasMat);
+    drawRing(ctx, pour.brep_shape.outer_ring, realToCanvasMat);
     if (pour.brep_shape.inner_rings) {
       for (const innerRing of pour.brep_shape.inner_rings) {
-        drawRing2(ctx, innerRing, realToCanvasMat);
+        drawRing(ctx, innerRing, realToCanvasMat);
       }
     }
     ctx.fill("evenodd");
@@ -75377,13 +75492,13 @@ function drawHoleShapePath(params2) {
   const { ctx, hole, realToCanvasMat, margin } = params2;
   const rotation11 = getHoleRotation2(hole);
   if (hole.hole_shape === "circle") {
-    const [cx3, cy3] = applyToPoint242(realToCanvasMat, [hole.x, hole.y]);
+    const [cx3, cy3] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
     const scaledRadius = (hole.hole_diameter / 2 + margin) * Math.abs(realToCanvasMat.a);
     ctx.beginPath();
     ctx.arc(cx3, cy3, scaledRadius, 0, Math.PI * 2);
     ctx.closePath();
   } else if (hole.hole_shape === "square") {
-    const [cx3, cy3] = applyToPoint242(realToCanvasMat, [hole.x, hole.y]);
+    const [cx3, cy3] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
     const scaledSize = (hole.hole_diameter + margin * 2) * Math.abs(realToCanvasMat.a);
     ctx.save();
     ctx.translate(cx3, cy3);
@@ -75395,7 +75510,7 @@ function drawHoleShapePath(params2) {
     ctx.closePath();
     ctx.restore();
   } else if (hole.hole_shape === "oval") {
-    const [cx3, cy3] = applyToPoint242(realToCanvasMat, [hole.x, hole.y]);
+    const [cx3, cy3] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
     const scaledRadiusX = (hole.hole_width / 2 + margin) * Math.abs(realToCanvasMat.a);
     const scaledRadiusY = (hole.hole_height / 2 + margin) * Math.abs(realToCanvasMat.a);
     ctx.save();
@@ -75408,7 +75523,7 @@ function drawHoleShapePath(params2) {
     ctx.closePath();
     ctx.restore();
   } else if (hole.hole_shape === "rect") {
-    const [cx3, cy3] = applyToPoint242(realToCanvasMat, [hole.x, hole.y]);
+    const [cx3, cy3] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
     const scaledWidth = (hole.hole_width + margin * 2) * Math.abs(realToCanvasMat.a);
     const scaledHeight = (hole.hole_height + margin * 2) * Math.abs(realToCanvasMat.a);
     ctx.save();
@@ -75421,7 +75536,7 @@ function drawHoleShapePath(params2) {
     ctx.closePath();
     ctx.restore();
   } else if (hole.hole_shape === "pill" || hole.hole_shape === "rotated_pill") {
-    const [cx3, cy3] = applyToPoint242(realToCanvasMat, [hole.x, hole.y]);
+    const [cx3, cy3] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
     const scaledWidth = (hole.hole_width + margin * 2) * Math.abs(realToCanvasMat.a);
     const scaledHeight = (hole.hole_height + margin * 2) * Math.abs(realToCanvasMat.a);
     ctx.save();
@@ -75446,7 +75561,7 @@ function drawNegativeMarginRingForHole(params2) {
   const rotation11 = getHoleRotation2(hole);
   ctx.fillStyle = soldermaskOverCopperColor;
   if (hole.hole_shape === "circle") {
-    const [cx3, cy3] = applyToPoint242(realToCanvasMat, [hole.x, hole.y]);
+    const [cx3, cy3] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
     const scaledRadius = hole.hole_diameter / 2 * Math.abs(realToCanvasMat.a);
     const scaledThickness = thickness * Math.abs(realToCanvasMat.a);
     const innerRadius = Math.max(0, scaledRadius - scaledThickness);
@@ -75459,7 +75574,7 @@ function drawNegativeMarginRingForHole(params2) {
     ctx.fill("evenodd");
     ctx.restore();
   } else if (hole.hole_shape === "square") {
-    const [cx3, cy3] = applyToPoint242(realToCanvasMat, [hole.x, hole.y]);
+    const [cx3, cy3] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
     const scaledSize = hole.hole_diameter * Math.abs(realToCanvasMat.a);
     const scaledThickness = thickness * Math.abs(realToCanvasMat.a);
     const innerSize = Math.max(0, scaledSize - scaledThickness * 2);
@@ -75476,7 +75591,7 @@ function drawNegativeMarginRingForHole(params2) {
     ctx.fill("evenodd");
     ctx.restore();
   } else if (hole.hole_shape === "oval") {
-    const [cx3, cy3] = applyToPoint242(realToCanvasMat, [hole.x, hole.y]);
+    const [cx3, cy3] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
     const scaledRadiusX = hole.hole_width / 2 * Math.abs(realToCanvasMat.a);
     const scaledRadiusY = hole.hole_height / 2 * Math.abs(realToCanvasMat.a);
     const scaledThickness = thickness * Math.abs(realToCanvasMat.a);
@@ -75496,7 +75611,7 @@ function drawNegativeMarginRingForHole(params2) {
     ctx.fill("evenodd");
     ctx.restore();
   } else if (hole.hole_shape === "rect") {
-    const [cx3, cy3] = applyToPoint242(realToCanvasMat, [hole.x, hole.y]);
+    const [cx3, cy3] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
     const scaledWidth = hole.hole_width * Math.abs(realToCanvasMat.a);
     const scaledHeight = hole.hole_height * Math.abs(realToCanvasMat.a);
     const scaledThickness = thickness * Math.abs(realToCanvasMat.a);
@@ -75515,7 +75630,7 @@ function drawNegativeMarginRingForHole(params2) {
     ctx.fill("evenodd");
     ctx.restore();
   } else if (hole.hole_shape === "pill" || hole.hole_shape === "rotated_pill") {
-    const [cx3, cy3] = applyToPoint242(realToCanvasMat, [hole.x, hole.y]);
+    const [cx3, cy3] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
     const scaledWidth = hole.hole_width * Math.abs(realToCanvasMat.a);
     const scaledHeight = hole.hole_height * Math.abs(realToCanvasMat.a);
     const scaledThickness = thickness * Math.abs(realToCanvasMat.a);
@@ -75578,20 +75693,20 @@ function processPlatedHoleSoldermask(params2) {
 function drawPlatedHoleShapePath(params2) {
   const { ctx, hole, realToCanvasMat, margin } = params2;
   if (hole.shape === "circle") {
-    const [centerX, centerY] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
+    const [centerX, centerY] = applyToPoint262(realToCanvasMat, [hole.x, hole.y]);
     const radius = (hole.outer_diameter / 2 + margin) * Math.abs(realToCanvasMat.a);
     ctx.beginPath();
     ctx.arc(centerX, centerY, radius, 0, Math.PI * 2);
     ctx.closePath();
   } else if (hole.shape === "oval") {
-    const [centerX, centerY] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
+    const [centerX, centerY] = applyToPoint262(realToCanvasMat, [hole.x, hole.y]);
     const ovalRadiusX = (hole.outer_width / 2 + margin) * Math.abs(realToCanvasMat.a);
     const ovalRadiusY = (hole.outer_height / 2 + margin) * Math.abs(realToCanvasMat.a);
     ctx.beginPath();
     ctx.ellipse(centerX, centerY, ovalRadiusX, ovalRadiusY, -((hole.ccw_rotation ?? 0) * Math.PI) / 180, 0, Math.PI * 2);
     ctx.closePath();
   } else if (hole.shape === "pill") {
-    const [centerX, centerY] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
+    const [centerX, centerY] = applyToPoint262(realToCanvasMat, [hole.x, hole.y]);
     const pillWidth = (hole.outer_width + margin * 2) * Math.abs(realToCanvasMat.a);
     const pillHeight = (hole.outer_height + margin * 2) * Math.abs(realToCanvasMat.a);
     ctx.beginPath();
@@ -75604,7 +75719,7 @@ function drawPlatedHoleShapePath(params2) {
       ccwRotationDegrees: hole.ccw_rotation
     });
   } else if (hole.shape === "circular_hole_with_rect_pad") {
-    const [centerX, centerY] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
+    const [centerX, centerY] = applyToPoint262(realToCanvasMat, [hole.x, hole.y]);
     const rectPadWidth = (hole.rect_pad_width + margin * 2) * Math.abs(realToCanvasMat.a);
     const rectPadHeight = (hole.rect_pad_height + margin * 2) * Math.abs(realToCanvasMat.a);
     const rectPadCornerRadius = (hole.rect_border_radius ?? 0) * Math.abs(realToCanvasMat.a);
@@ -75619,7 +75734,7 @@ function drawPlatedHoleShapePath(params2) {
       ccwRotationDegrees: hole.rect_ccw_rotation
     });
   } else if (hole.shape === "pill_hole_with_rect_pad") {
-    const [centerX, centerY] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
+    const [centerX, centerY] = applyToPoint262(realToCanvasMat, [hole.x, hole.y]);
     const rectPadWidth = (hole.rect_pad_width + margin * 2) * Math.abs(realToCanvasMat.a);
     const rectPadHeight = (hole.rect_pad_height + margin * 2) * Math.abs(realToCanvasMat.a);
     const rectPadCornerRadius = (hole.rect_border_radius ?? 0) * Math.abs(realToCanvasMat.a);
@@ -75633,7 +75748,7 @@ function drawPlatedHoleShapePath(params2) {
       radius: rectPadCornerRadius
     });
   } else if (hole.shape === "rotated_pill_hole_with_rect_pad") {
-    const [centerX, centerY] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
+    const [centerX, centerY] = applyToPoint262(realToCanvasMat, [hole.x, hole.y]);
     const rectPadWidth = (hole.rect_pad_width + margin * 2) * Math.abs(realToCanvasMat.a);
     const rectPadHeight = (hole.rect_pad_height + margin * 2) * Math.abs(realToCanvasMat.a);
     const rectPadCornerRadius = (hole.rect_border_radius ?? 0) * Math.abs(realToCanvasMat.a);
@@ -75654,7 +75769,7 @@ function drawPlatedHoleShapePath(params2) {
     }));
     const marginPoints = margin !== 0 ? offsetPolygonPoints(padPoints, margin) : padPoints;
     const canvasPoints = marginPoints.map((p3) => {
-      const [x4, y4] = applyToPoint252(realToCanvasMat, [p3.x, p3.y]);
+      const [x4, y4] = applyToPoint262(realToCanvasMat, [p3.x, p3.y]);
       return { x: x4, y: y4 };
     });
     ctx.beginPath();
@@ -75666,7 +75781,7 @@ function drawNegativeMarginRingForPlatedHole(params2) {
   const marginThickness = Math.abs(margin);
   ctx.fillStyle = soldermaskOverCopperColor;
   if (hole.shape === "circle") {
-    const [centerX, centerY] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
+    const [centerX, centerY] = applyToPoint262(realToCanvasMat, [hole.x, hole.y]);
     const outerRadius = hole.outer_diameter / 2 * Math.abs(realToCanvasMat.a);
     const marginMagnitude = marginThickness * Math.abs(realToCanvasMat.a);
     const innerRadius = Math.max(0, outerRadius - marginMagnitude);
@@ -75677,7 +75792,7 @@ function drawNegativeMarginRingForPlatedHole(params2) {
     }
     ctx.fill("evenodd");
   } else if (hole.shape === "oval") {
-    const [centerX, centerY] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
+    const [centerX, centerY] = applyToPoint262(realToCanvasMat, [hole.x, hole.y]);
     const padRadiusX = hole.outer_width / 2 * Math.abs(realToCanvasMat.a);
     const padRadiusY = hole.outer_height / 2 * Math.abs(realToCanvasMat.a);
     const marginMagnitude = marginThickness * Math.abs(realToCanvasMat.a);
@@ -75694,7 +75809,7 @@ function drawNegativeMarginRingForPlatedHole(params2) {
     }
     ctx.fill("evenodd");
   } else if (hole.shape === "pill") {
-    const [centerX, centerY] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
+    const [centerX, centerY] = applyToPoint262(realToCanvasMat, [hole.x, hole.y]);
     const padWidth = hole.outer_width * Math.abs(realToCanvasMat.a);
     const padHeight = hole.outer_height * Math.abs(realToCanvasMat.a);
     const marginMagnitude = marginThickness * Math.abs(realToCanvasMat.a);
@@ -75721,7 +75836,7 @@ function drawNegativeMarginRingForPlatedHole(params2) {
     }
     ctx.fill("evenodd");
   } else if (hole.shape === "circular_hole_with_rect_pad") {
-    const [centerX, centerY] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
+    const [centerX, centerY] = applyToPoint262(realToCanvasMat, [hole.x, hole.y]);
     const padWidth = hole.rect_pad_width * Math.abs(realToCanvasMat.a);
     const padHeight = hole.rect_pad_height * Math.abs(realToCanvasMat.a);
     const marginMagnitude = marginThickness * Math.abs(realToCanvasMat.a);
@@ -75752,7 +75867,7 @@ function drawNegativeMarginRingForPlatedHole(params2) {
     }
     ctx.fill("evenodd");
   } else if (hole.shape === "pill_hole_with_rect_pad") {
-    const [centerX, centerY] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
+    const [centerX, centerY] = applyToPoint262(realToCanvasMat, [hole.x, hole.y]);
     const padWidth = hole.rect_pad_width * Math.abs(realToCanvasMat.a);
     const padHeight = hole.rect_pad_height * Math.abs(realToCanvasMat.a);
     const marginMagnitude = marginThickness * Math.abs(realToCanvasMat.a);
@@ -75781,7 +75896,7 @@ function drawNegativeMarginRingForPlatedHole(params2) {
     }
     ctx.fill("evenodd");
   } else if (hole.shape === "rotated_pill_hole_with_rect_pad") {
-    const [centerX, centerY] = applyToPoint252(realToCanvasMat, [hole.x, hole.y]);
+    const [centerX, centerY] = applyToPoint262(realToCanvasMat, [hole.x, hole.y]);
     const padWidth = hole.rect_pad_width * Math.abs(realToCanvasMat.a);
     const padHeight = hole.rect_pad_height * Math.abs(realToCanvasMat.a);
     const marginMagnitude = marginThickness * Math.abs(realToCanvasMat.a);
@@ -75818,14 +75933,14 @@ function drawNegativeMarginRingForPlatedHole(params2) {
     }));
     ctx.beginPath();
     const outerPoints = padPoints.map((p3) => {
-      const [x4, y4] = applyToPoint252(realToCanvasMat, [p3.x, p3.y]);
+      const [x4, y4] = applyToPoint262(realToCanvasMat, [p3.x, p3.y]);
       return { x: x4, y: y4 };
     });
     drawPolygonPath({ ctx, points: outerPoints });
     const innerMarginPoints = offsetPolygonPoints(padPoints, -marginThickness);
     if (innerMarginPoints.length >= 3) {
       const innerPoints = innerMarginPoints.map((p3) => {
-        const [x4, y4] = applyToPoint252(realToCanvasMat, [p3.x, p3.y]);
+        const [x4, y4] = applyToPoint262(realToCanvasMat, [p3.x, p3.y]);
         return { x: x4, y: y4 };
       });
       drawPolygonPath({ ctx, points: innerPoints });
@@ -75884,7 +75999,7 @@ function drawPadShapePath(params2) {
     const dyLocal = (mt3 - mb3) / 2;
     const dxGlobal = dxLocal * Math.cos(radians) - dyLocal * Math.sin(radians);
     const dyGlobal = dxLocal * Math.sin(radians) + dyLocal * Math.cos(radians);
-    const [cx3, cy3] = applyToPoint262(realToCanvasMat, [
+    const [cx3, cy3] = applyToPoint272(realToCanvasMat, [
       pad2.x + dxGlobal,
       pad2.y + dyGlobal
     ]);
@@ -75908,14 +76023,14 @@ function drawPadShapePath(params2) {
     ctx.restore();
   } else if (pad2.shape === "circle") {
     const avgMargin = (ml2 + mr3 + mt3 + mb3) / 4;
-    const [cx3, cy3] = applyToPoint262(realToCanvasMat, [pad2.x, pad2.y]);
+    const [cx3, cy3] = applyToPoint272(realToCanvasMat, [pad2.x, pad2.y]);
     const scaledRadius = (pad2.radius + avgMargin) * Math.abs(realToCanvasMat.a);
     ctx.beginPath();
     ctx.arc(cx3, cy3, scaledRadius, 0, Math.PI * 2);
     ctx.closePath();
   } else if (pad2.shape === "pill" || pad2.shape === "rotated_pill") {
     const avgMargin = (ml2 + mr3) / 2;
-    const [cx3, cy3] = applyToPoint262(realToCanvasMat, [pad2.x, pad2.y]);
+    const [cx3, cy3] = applyToPoint272(realToCanvasMat, [pad2.x, pad2.y]);
     const scaledWidth = (pad2.width + avgMargin * 2) * Math.abs(realToCanvasMat.a);
     const scaledHeight = (pad2.height + avgMargin * 2) * Math.abs(realToCanvasMat.a);
     ctx.save();
@@ -75936,7 +76051,7 @@ function drawPadShapePath(params2) {
     const avgMargin = (ml2 + mr3 + mt3 + mb3) / 4;
     const points = avgMargin !== 0 ? offsetPolygonPoints(pad2.points, avgMargin) : pad2.points;
     const canvasPoints = points.map((p3) => {
-      const [x4, y4] = applyToPoint262(realToCanvasMat, [p3.x, p3.y]);
+      const [x4, y4] = applyToPoint272(realToCanvasMat, [p3.x, p3.y]);
       return { x: x4, y: y4 };
     });
     ctx.beginPath();
@@ -75962,7 +76077,7 @@ function drawNegativeMarginRingForPad(params2) {
   ctx.fillStyle = soldermaskOverCopperColor;
   if (pad2.shape === "rect" || pad2.shape === "rotated_rect") {
     const borderRadius = pad2.corner_radius ?? pad2.rect_border_radius ?? 0;
-    const [cx3, cy3] = applyToPoint262(realToCanvasMat, [pad2.x, pad2.y]);
+    const [cx3, cy3] = applyToPoint272(realToCanvasMat, [pad2.x, pad2.y]);
     const scaledWidth = pad2.width * Math.abs(realToCanvasMat.a);
     const scaledHeight = pad2.height * Math.abs(realToCanvasMat.a);
     const scaledRadius = borderRadius * Math.abs(realToCanvasMat.a);
@@ -76003,7 +76118,7 @@ function drawNegativeMarginRingForPad(params2) {
     ctx.restore();
   } else if (pad2.shape === "circle") {
     const thickness = Math.max(thicknessL, thicknessR, thicknessT, thicknessB);
-    const [cx3, cy3] = applyToPoint262(realToCanvasMat, [pad2.x, pad2.y]);
+    const [cx3, cy3] = applyToPoint272(realToCanvasMat, [pad2.x, pad2.y]);
     const scaledRadius = pad2.radius * Math.abs(realToCanvasMat.a);
     const scaledThickness = thickness * Math.abs(realToCanvasMat.a);
     const innerRadius = Math.max(0, scaledRadius - scaledThickness);
@@ -76017,7 +76132,7 @@ function drawNegativeMarginRingForPad(params2) {
     ctx.restore();
   } else if (pad2.shape === "pill" || pad2.shape === "rotated_pill") {
     const thickness = Math.max(thicknessL, thicknessR, thicknessT, thicknessB);
-    const [cx3, cy3] = applyToPoint262(realToCanvasMat, [pad2.x, pad2.y]);
+    const [cx3, cy3] = applyToPoint272(realToCanvasMat, [pad2.x, pad2.y]);
     const scaledWidth = pad2.width * Math.abs(realToCanvasMat.a);
     const scaledHeight = pad2.height * Math.abs(realToCanvasMat.a);
     const scaledThickness = thickness * Math.abs(realToCanvasMat.a);
@@ -76052,14 +76167,14 @@ function drawNegativeMarginRingForPad(params2) {
     ctx.save();
     ctx.beginPath();
     const canvasPoints = pad2.points.map((p3) => {
-      const [x4, y4] = applyToPoint262(realToCanvasMat, [p3.x, p3.y]);
+      const [x4, y4] = applyToPoint272(realToCanvasMat, [p3.x, p3.y]);
       return { x: x4, y: y4 };
     });
     drawPolygonPath({ ctx, points: canvasPoints });
     const innerPoints = offsetPolygonPoints(pad2.points, -thickness);
     if (innerPoints.length >= 3) {
       const innerCanvasPoints = innerPoints.map((p3) => {
-        const [x4, y4] = applyToPoint262(realToCanvasMat, [p3.x, p3.y]);
+        const [x4, y4] = applyToPoint272(realToCanvasMat, [p3.x, p3.y]);
         return { x: x4, y: y4 };
       });
       drawPolygonPath({ ctx, points: innerCanvasPoints });
@@ -76377,14 +76492,6 @@ function getCutoutKey(cutout) {
   }
   return `pill:${cutout.x}:${cutout.y}:${cutout.width}:${cutout.height}:${cutout.rotation ?? 0}`;
 }
-function hasVariableWidth(points) {
-  if (points.length < 2)
-    return false;
-  const baseWidth = points[0]?.width;
-  if (typeof baseWidth !== "number")
-    return false;
-  return points.some((point9) => Math.abs(point9.width - baseWidth) > Number.EPSILON);
-}
 function processTraceSoldermask(params2) {
   const { ctx, trace, realToCanvasMat, soldermaskOverCopperColor, layer } = params2;
   if (!trace.route || !Array.isArray(trace.route) || trace.route.length < 2) {
@@ -76395,11 +76502,10 @@ function processTraceSoldermask(params2) {
     const segmentLayer = segment2[0]?.layer;
     if (segmentLayer !== layer)
       continue;
-    if (hasVariableWidth(segment2)) {
-      const polygonPoints = buildTracePolygon(segment2);
+    if (trace.route_thickness_mode === "interpolated") {
       drawPolygon({
         ctx,
-        points: polygonPoints,
+        points: buildTracePolygon(segment2),
         fill: soldermaskOverCopperColor,
         realToCanvasMat
       });
@@ -76432,7 +76538,7 @@ function processTraceSoldermask(params2) {
 }
 function processViaSoldermask(params2) {
   const { ctx, via, realToCanvasMat } = params2;
-  const [cx3, cy3] = applyToPoint272(realToCanvasMat, [via.x, via.y]);
+  const [cx3, cy3] = applyToPoint282(realToCanvasMat, [via.x, via.y]);
   const scaledRadius = via.outer_diameter / 2 * Math.abs(realToCanvasMat.a);
   ctx.beginPath();
   ctx.arc(cx3, cy3, scaledRadius, 0, Math.PI * 2);
@@ -76453,7 +76559,7 @@ function drawPcbSoldermask(params2) {
   const soldermaskOverCopperColor = colorMap2.soldermaskOverCopper[layer] ?? colorMap2.soldermaskOverCopper.top;
   const vias = elements.filter((el3) => el3.type === "pcb_via");
   const platedHoles = elements.filter((el3) => el3.type === "pcb_plated_hole");
-  const soldermaskCtx = createSoldermaskLayerContext(ctx, ctx.canvas.width, ctx.canvas.height) ?? ctx;
+  const soldermaskCtx = createDrawingLayerContext(ctx, ctx.canvas.width, ctx.canvas.height) ?? ctx;
   if (panel) {
     drawPanelSoldermask({
       ctx: soldermaskCtx,
@@ -76514,7 +76620,7 @@ function drawPcbSoldermask(params2) {
       layer
     });
   }
-  mergeSoldermaskLayer(ctx, soldermaskCtx);
+  mergeDrawingLayer(ctx, soldermaskCtx);
 }
 function processElementSoldermask(params2) {
   const { ctx, element, realToCanvasMat, soldermaskOverCopperColor, layer } = params2;
@@ -76563,7 +76669,7 @@ function layerToColor4(layer, colorMap2) {
   return colorMap2.copper[layer] ?? colorMap2.copper.top;
 }
 function drawPcbTrace(params2) {
-  const { ctx, trace, realToCanvasMat, colorMap: colorMap2 } = params2;
+  const { ctx, trace, realToCanvasMat, colorMap: colorMap2, layer: layerFilter } = params2;
   if (!trace.route || !Array.isArray(trace.route) || trace.route.length < 2) {
     return;
   }
@@ -76572,12 +76678,13 @@ function drawPcbTrace(params2) {
     const layer = segment2[0]?.layer;
     if (!layer)
       continue;
+    if (layerFilter && layer !== layerFilter)
+      continue;
     const color = layerToColor4(layer, colorMap2);
-    if (hasVariableWidth(segment2)) {
-      const polygonPoints = buildTracePolygon(segment2);
+    if (trace.route_thickness_mode === "interpolated") {
       drawPolygon({
         ctx,
-        points: polygonPoints,
+        points: buildTracePolygon(segment2),
         fill: color,
         realToCanvasMat
       });
@@ -76607,9 +76714,125 @@ function drawPcbTrace(params2) {
     trace,
     realToCanvasMat,
     vias: params2.vias ?? [],
-    platedHoles: params2.platedHoles ?? []
+    platedHoles: params2.platedHoles ?? [],
+    layer: layerFilter
   });
 }
+function drawPcbTracesClippedToCopperPours(params2) {
+  const {
+    ctx,
+    traces,
+    copperPours,
+    realToCanvasMat,
+    colorMap: colorMap2,
+    vias,
+    platedHoles,
+    renderLayers
+  } = params2;
+  for (const layer of getTraceLayers(traces, renderLayers)) {
+    const layerCopperPours = copperPours.filter((pour) => pour.layer === layer);
+    if (layerCopperPours.length === 0) {
+      drawTracesOnLayer({
+        ctx,
+        traces,
+        layer,
+        realToCanvasMat,
+        colorMap: colorMap2,
+        vias,
+        platedHoles
+      });
+      continue;
+    }
+    const traceLayerCtx = createDrawingLayerContext(ctx, ctx.canvas.width, ctx.canvas.height);
+    if (traceLayerCtx) {
+      drawTracesOnLayer({
+        ctx: traceLayerCtx,
+        traces,
+        layer,
+        realToCanvasMat,
+        colorMap: colorMap2,
+        vias,
+        platedHoles
+      });
+      eraseCopperPoursFromTraceLayer({
+        ctx: traceLayerCtx,
+        copperPours: layerCopperPours,
+        realToCanvasMat
+      });
+      if (mergeDrawingLayer(ctx, traceLayerCtx))
+        continue;
+    }
+    ctx.save();
+    clipToOutsideCopperPours({
+      ctx,
+      copperPours: layerCopperPours,
+      realToCanvasMat
+    });
+    drawTracesOnLayer({
+      ctx,
+      traces,
+      layer,
+      realToCanvasMat,
+      colorMap: colorMap2,
+      vias,
+      platedHoles
+    });
+    ctx.restore();
+  }
+}
+function drawTracesOnLayer(params2) {
+  const { ctx, traces, layer, realToCanvasMat, colorMap: colorMap2, vias, platedHoles } = params2;
+  for (const trace of traces) {
+    drawPcbTrace({
+      ctx,
+      trace,
+      realToCanvasMat,
+      colorMap: colorMap2,
+      vias,
+      platedHoles,
+      layer
+    });
+  }
+}
+function eraseCopperPoursFromTraceLayer(params2) {
+  const { ctx, copperPours, realToCanvasMat } = params2;
+  if (copperPours.length === 0)
+    return;
+  ctx.save();
+  ctx.globalCompositeOperation = "destination-out";
+  ctx.fillStyle = "#000";
+  for (const pour of copperPours) {
+    ctx.beginPath();
+    appendPcbCopperPourPath({ ctx, pour, realToCanvasMat });
+    ctx.fill(pour.shape === "brep" ? "evenodd" : "nonzero");
+  }
+  ctx.restore();
+}
+function getTraceLayers(traces, renderLayers) {
+  const layers = /* @__PURE__ */ new Set;
+  for (const trace of traces) {
+    for (const point9 of trace.route ?? []) {
+      if (point9.route_type !== "wire" || !point9.layer)
+        continue;
+      if (renderLayers?.length && !renderLayers.includes(`${point9.layer}_copper`)) {
+        continue;
+      }
+      layers.add(point9.layer);
+    }
+  }
+  return [...layers];
+}
+function clipToOutsideCopperPours(params2) {
+  const { ctx, copperPours, realToCanvasMat } = params2;
+  if (copperPours.length === 0)
+    return;
+  ctx.beginPath();
+  ctx.rect(0, 0, ctx.canvas.width, ctx.canvas.height);
+  for (const pour of copperPours) {
+    appendPcbCopperPourPath({ ctx, pour, realToCanvasMat });
+  }
+  ctx.clip("evenodd");
+}
 function drawPcbVia(params2) {
   const { ctx, via, realToCanvasMat, colorMap: colorMap2, layer } = params2;
   drawCircle({
@@ -76641,6 +76864,9 @@ function shouldDrawElement(element, options) {
   if (!options.layers || options.layers.length === 0) {
     return true;
   }
+  if (element.type === "pcb_silkscreen_graphic") {
+    return options.layers.some((layer) => layer === `${element.layer}_silkscreen`);
+  }
   const elementLayers = getElementRenderLayers(element);
   if (elementLayers.length === 0) {
     return true;
@@ -76650,10 +76876,10 @@ function shouldDrawElement(element, options) {
 function getCopperLayer(layers) {
   if (!layers || layers.length === 0)
     return "top";
-  const hasBottom = layers.some((l3) => l3.startsWith("bottom"));
-  return hasBottom ? "bottom" : "top";
+  const renderLayer = layers.find((candidate) => candidate.endsWith("_copper")) ?? layers[0] ?? "top_copper";
+  return renderLayer.split("_")[0];
 }
-var getAdvanceRatio = (char) => glyphAdvanceRatio[char] ?? (char === " " ? textMetrics.spaceWidthRatio : textMetrics.glyphWidthRatio), getGlyphLines = (char) => glyphLineAlphabet[char], DEFAULT_KNOCKOUT_PADDING, TEXT_OFFSET_MULTIPLIER2 = 1.5, CHARACTER_WIDTH_MULTIPLIER2 = 0.6, TEXT_INTERSECTION_PADDING_MULTIPLIER2 = 0.3, DEFAULT_NOTE_COLOR = "rgba(255,255,255,0.5)", DEFAULT_NOTE_TEXT_COLOR = "rgb(89, 148, 220)", CUTOUT_MASK_COLOR = "rgba(255, 255, 255, 1)", COORD_EPSILON = 0.000001, DEFAULT_PCB_COLOR_MAP2, CircuitToCanvasDrawer = class {
+var getAdvanceRatio = (char) => glyphAdvanceRatio[char] ?? (char === " " ? textMetrics.spaceWidthRatio : textMetrics.glyphWidthRatio), getGlyphLines = (char) => glyphLineAlphabet[char], DEFAULT_KNOCKOUT_PADDING, TEXT_OFFSET_MULTIPLIER2 = 1.5, CHARACTER_WIDTH_MULTIPLIER2 = 0.6, TEXT_INTERSECTION_PADDING_MULTIPLIER2 = 0.3, DEFAULT_NOTE_COLOR = "rgba(255,255,255,0.5)", DEFAULT_NOTE_TEXT_COLOR = "rgb(89, 148, 220)", SOLDER_PASTE_COLOR = "rgb(105, 105, 105)", CUTOUT_MASK_COLOR = "rgba(255, 255, 255, 1)", COORD_EPSILON = 0.000001, DEFAULT_PCB_COLOR_MAP2, isOnCopperLayer = (element, layer) => element.layers?.includes(layer) ?? true, CircuitToCanvasDrawer = class _CircuitToCanvasDrawer {
   ctx;
   colorMap;
   realToCanvasMat;
@@ -76730,13 +76956,20 @@ var getAdvanceRatio = (char) => glyphAdvanceRatio[char] ?? (char === " " ? textM
     }
     const drawBoardMaterial = options.drawBoardMaterial ?? false;
     const drawSoldermask = options.drawSoldermask ?? false;
+    const drawSolderPaste = options.drawSolderPaste ?? false;
     const hasExplicitSoldermaskLayers = options.drawSoldermaskTop !== undefined || options.drawSoldermaskBottom !== undefined;
+    const hasExplicitSolderPasteLayers = options.drawSolderPasteTop !== undefined || options.drawSolderPasteBottom !== undefined;
     const renderTopSoldermask = drawSoldermask && (board !== undefined || panel !== undefined) && (options.drawSoldermaskTop ?? !hasExplicitSoldermaskLayers);
     const renderBottomSoldermask = drawSoldermask && (board !== undefined || panel !== undefined) && (options.drawSoldermaskBottom ?? false);
-    const drawableVias = elements.filter((el3) => shouldDrawElement(el3, options) && el3.type === "pcb_via");
+    const renderTopSolderPaste = drawSolderPaste && (options.drawSolderPasteTop ?? !hasExplicitSolderPasteLayers) && elements.some((element) => element.type === "pcb_solder_paste" && element.layer === "top");
+    const renderBottomSolderPaste = drawSolderPaste && (options.drawSolderPasteBottom ?? false) && elements.some((element) => element.type === "pcb_solder_paste" && element.layer === "bottom");
+    const renderTopLayerOverlay = renderTopSoldermask || renderTopSolderPaste;
+    const drawableVias = elements.filter((el3) => shouldDrawElement(el3, options) && el3.type === "pcb_via" && isOnCopperLayer(el3, layer));
     const drawableHoles = elements.filter((el3) => shouldDrawElement(el3, options) && el3.type === "pcb_hole");
-    const drawablePlatedHoles = elements.filter((el3) => shouldDrawElement(el3, options) && el3.type === "pcb_plated_hole");
+    const drawablePlatedHoles = elements.filter((el3) => shouldDrawElement(el3, options) && el3.type === "pcb_plated_hole" && isOnCopperLayer(el3, layer));
     const drawableCutouts = elements.filter((el3) => shouldDrawElement(el3, options) && el3.type === "pcb_cutout");
+    const drawableCopperPours = (options.clipContextElements ?? elements).filter((el3) => shouldDrawElement(el3, options) && el3.type === "pcb_copper_pour");
+    const drawableTraces = elements.filter((el3) => shouldDrawElement(el3, options) && el3.type === "pcb_trace");
     if (board) {
       drawPcbBoard({
         ctx: this.ctx,
@@ -76783,21 +77016,17 @@ var getAdvanceRatio = (char) => glyphAdvanceRatio[char] ?? (char === " " ? textM
         });
       }
     }
-    if (renderTopSoldermask) {
-      for (const element of elements) {
-        if (!shouldDrawElement(element, options))
-          continue;
-        if (element.type === "pcb_trace") {
-          drawPcbTrace({
-            ctx: this.ctx,
-            trace: element,
-            realToCanvasMat: this.realToCanvasMat,
-            colorMap: this.colorMap,
-            vias: drawableVias,
-            platedHoles: drawablePlatedHoles
-          });
-        }
-      }
+    if (renderTopLayerOverlay) {
+      drawPcbTracesClippedToCopperPours({
+        ctx: this.ctx,
+        traces: drawableTraces,
+        copperPours: drawableCopperPours,
+        realToCanvasMat: this.realToCanvasMat,
+        colorMap: this.colorMap,
+        vias: drawableVias,
+        platedHoles: drawablePlatedHoles,
+        renderLayers: options.layers
+      });
       for (const element of elements) {
         if (!shouldDrawElement(element, options))
           continue;
@@ -76807,22 +77036,22 @@ var getAdvanceRatio = (char) => glyphAdvanceRatio[char] ?? (char === " " ? textM
             hole: element,
             realToCanvasMat: this.realToCanvasMat,
             colorMap: this.colorMap,
-            soldermaskMargin: element.soldermask_margin,
+            soldermaskMargin: renderTopSoldermask ? element.soldermask_margin : undefined,
             drawSoldermask: renderTopSoldermask
           });
         }
-        if (element.type === "pcb_plated_hole") {
+        if (element.type === "pcb_plated_hole" && isOnCopperLayer(element, layer)) {
           drawPcbPlatedHole({
             ctx: this.ctx,
             hole: element,
             realToCanvasMat: this.realToCanvasMat,
             colorMap: this.colorMap,
-            soldermaskMargin: element.soldermask_margin,
+            soldermaskMargin: renderTopSoldermask ? element.soldermask_margin : undefined,
             drawSoldermask: renderTopSoldermask,
             layer
           });
         }
-        if (element.type === "pcb_via") {
+        if (element.type === "pcb_via" && isOnCopperLayer(element, layer)) {
           drawPcbVia({
             ctx: this.ctx,
             via: element,
@@ -76843,6 +77072,18 @@ var getAdvanceRatio = (char) => glyphAdvanceRatio[char] ?? (char === " " ? textM
         drawSoldermask: true
       });
     }
+    if (renderTopSolderPaste) {
+      for (const element of elements) {
+        if (element.type !== "pcb_solder_paste" || element.layer !== "top") {
+          continue;
+        }
+        drawPcbSolderPaste({
+          ctx: this.ctx,
+          solderPaste: element,
+          realToCanvasMat: this.realToCanvasMat
+        });
+      }
+    }
     for (const element of elements) {
       if (!shouldDrawElement(element, options))
         continue;
@@ -76902,25 +77143,31 @@ var getAdvanceRatio = (char) => glyphAdvanceRatio[char] ?? (char === " " ? textM
           colorMap: this.colorMap
         });
       }
-    }
-    for (const element of elements) {
-      if (!shouldDrawElement(element, options))
-        continue;
-      if (element.type === "pcb_trace" && !renderTopSoldermask) {
-        drawPcbTrace({
+      if (element.type === "pcb_silkscreen_graphic") {
+        drawPcbSilkscreenGraphic({
           ctx: this.ctx,
-          trace: element,
+          graphic: element,
           realToCanvasMat: this.realToCanvasMat,
-          colorMap: this.colorMap,
-          vias: drawableVias,
-          platedHoles: drawablePlatedHoles
+          colorMap: this.colorMap
         });
       }
     }
+    if (!renderTopLayerOverlay) {
+      drawPcbTracesClippedToCopperPours({
+        ctx: this.ctx,
+        traces: drawableTraces,
+        copperPours: drawableCopperPours,
+        realToCanvasMat: this.realToCanvasMat,
+        colorMap: this.colorMap,
+        vias: drawableVias,
+        platedHoles: drawablePlatedHoles,
+        renderLayers: options.layers
+      });
+    }
     for (const element of elements) {
       if (!shouldDrawElement(element, options))
         continue;
-      if (element.type === "pcb_hole" && !renderTopSoldermask) {
+      if (element.type === "pcb_hole" && !renderTopLayerOverlay) {
         drawPcbHole({
           ctx: this.ctx,
           hole: element,
@@ -76934,7 +77181,7 @@ var getAdvanceRatio = (char) => glyphAdvanceRatio[char] ?? (char === " " ? textM
     for (const element of elements) {
       if (!shouldDrawElement(element, options))
         continue;
-      if (element.type === "pcb_plated_hole" && !renderTopSoldermask) {
+      if (element.type === "pcb_plated_hole" && !renderTopLayerOverlay && isOnCopperLayer(element, layer)) {
         drawPcbPlatedHole({
           ctx: this.ctx,
           hole: element,
@@ -76945,7 +77192,7 @@ var getAdvanceRatio = (char) => glyphAdvanceRatio[char] ?? (char === " " ? textM
           layer
         });
       }
-      if (element.type === "pcb_via" && !renderTopSoldermask) {
+      if (element.type === "pcb_via" && !renderTopLayerOverlay && isOnCopperLayer(element, layer)) {
         drawPcbVia({
           ctx: this.ctx,
           via: element,
@@ -76965,6 +77212,18 @@ var getAdvanceRatio = (char) => glyphAdvanceRatio[char] ?? (char === " " ? textM
         drawSoldermask: true
       });
     }
+    if (renderBottomSolderPaste) {
+      for (const element of elements) {
+        if (element.type !== "pcb_solder_paste" || element.layer !== "bottom") {
+          continue;
+        }
+        drawPcbSolderPaste({
+          ctx: this.ctx,
+          solderPaste: element,
+          realToCanvasMat: this.realToCanvasMat
+        });
+      }
+    }
     for (const element of elements) {
       if (!shouldDrawElement(element, options))
         continue;
@@ -77086,6 +77345,41 @@ var getAdvanceRatio = (char) => glyphAdvanceRatio[char] ?? (char === " " ? textM
         });
       }
     }
+    if (options.clearDrillHoles) {
+      this.clearDrillHoles(elements, layer);
+    }
+  }
+  clearDrillHoles(elements, layer) {
+    const apertures = elements.filter((element) => element.type === "pcb_hole" || element.type === "pcb_plated_hole" || element.type === "pcb_via" || element.type === "pcb_cutout");
+    if (apertures.length === 0)
+      return;
+    const transparent = "rgba(0,0,0,0)";
+    const apertureDrawer = new _CircuitToCanvasDrawer(this.ctx);
+    apertureDrawer.realToCanvasMat = this.realToCanvasMat;
+    apertureDrawer.configure({
+      colorOverrides: {
+        copper: {
+          top: transparent,
+          bottom: transparent,
+          inner1: transparent,
+          inner2: transparent,
+          inner3: transparent,
+          inner4: transparent,
+          inner5: transparent,
+          inner6: transparent,
+          inner7: transparent,
+          inner8: transparent
+        },
+        drill: "#000"
+      }
+    });
+    this.ctx.save();
+    this.ctx.globalCompositeOperation = "destination-out";
+    apertureDrawer.drawElements(apertures, {
+      layers: [`${layer}_copper`],
+      showPcbNotes: false
+    });
+    this.ctx.restore();
   }
 };
 var init_dist2 = __esm(() => {
@@ -77104,6 +77398,8 @@ var init_dist2 = __esm(() => {
       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: {
@@ -135146,7 +135442,7 @@ var import_perfect_cli = __toESM2(require_dist2(), 1);
 // lib/getVersion.ts
 import { createRequire as createRequire2 } from "node:module";
 // package.json
-var version = "0.1.1893";
+var version = "0.1.1894";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -135197,7 +135493,7 @@ var package_default = {
     "circuit-json-to-step": "^0.0.38",
     "circuit-json-to-tscircuit": "^0.0.42",
     "circuit-json-trace-length-analysis": "github:tscircuit/circuit-json-trace-length-analysis#2b44792a40df0ca83b6bfb6ac95ed5e35e7168b8",
-    "circuit-to-canvas": "^0.0.111",
+    "circuit-to-canvas": "^0.0.123",
     "circuit-to-svg": "^0.0.393",
     commander: "^14.0.0",
     conf: "^13.1.0",