@tscircuit/pcb-viewer 1.11.269 → 1.11.270

package/dist/index.js

@@ -7262,7 +7262,7 @@ var convertElementToPrimitives = (element, allElements) => {
     }
     case "pcb_smtpad": {
       if (element.shape === "rect" || element.shape === "rotated_rect") {
-        const { shape, x, y, width, height, layer, rect_border_radius } = element;
+        const { x, y, width, height, layer, rect_border_radius } = element;
         const corner_radius = element.corner_radius ?? rect_border_radius ?? 0;
         const primitives = [
           {
@@ -7282,26 +7282,146 @@ var convertElementToPrimitives = (element, allElements) => {
           }
         ];
         if (element.is_covered_with_solder_mask) {
+          const rawMargin = element.soldermask_margin;
           const maskLayer = layer === "bottom" ? "soldermask_with_copper_bottom" : "soldermask_with_copper_top";
-          const maskPrimitive = {
-            _pcb_drawing_object_id: `rect_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "rect",
-            x,
-            y,
-            w: width,
-            h: height,
-            layer: maskLayer,
-            _element: element,
-            _parent_pcb_component,
-            _parent_source_component,
-            _source_port,
-            ccw_rotation: element.ccw_rotation,
-            roundness: corner_radius
-          };
-          if (element.solder_mask_color) {
-            maskPrimitive.color = element.solder_mask_color;
+          if (rawMargin === void 0 || rawMargin === null) {
+            const soldermask_margin2 = 0;
+            const openingWidth = Math.max(0.01, width + 2 * soldermask_margin2);
+            const openingHeight = Math.max(0.01, height + 2 * soldermask_margin2);
+            const openingPrimitive = {
+              _pcb_drawing_object_id: `rect_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "rect",
+              x,
+              y,
+              w: openingWidth,
+              h: openingHeight,
+              layer: maskLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              ccw_rotation: element.ccw_rotation,
+              roundness: corner_radius
+            };
+            if (element.solder_mask_color) {
+              openingPrimitive.color = element.solder_mask_color;
+            }
+            primitives.push(openingPrimitive);
+            const maskCoverageLayer = layer === "bottom" ? "soldermask_bottom" : "soldermask_top";
+            const fullMaskCoverage = {
+              _pcb_drawing_object_id: `rect_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "rect",
+              x,
+              y,
+              w: width,
+              h: height,
+              layer: maskCoverageLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              ccw_rotation: element.ccw_rotation,
+              roundness: corner_radius
+            };
+            primitives.push(fullMaskCoverage);
+            const cutoutOpening = {
+              _pcb_drawing_object_id: `rect_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "rect",
+              x,
+              y,
+              w: openingWidth,
+              h: openingHeight,
+              layer: maskCoverageLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              ccw_rotation: element.ccw_rotation,
+              roundness: corner_radius,
+              composite_mode: "destination-out"
+            };
+            primitives.push(cutoutOpening);
+            return primitives;
+          }
+          const soldermask_margin = rawMargin;
+          if (soldermask_margin === 0) {
+            return primitives;
+          }
+          if (soldermask_margin > 0) {
+            const marginRing = {
+              _pcb_drawing_object_id: `rect_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "rect",
+              x,
+              y,
+              w: width + 2 * soldermask_margin,
+              h: height + 2 * soldermask_margin,
+              layer: maskLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              ccw_rotation: element.ccw_rotation,
+              roundness: corner_radius,
+              color: "rgb(201, 162, 110)"
+            };
+            primitives.push(marginRing);
+            const cutout = {
+              _pcb_drawing_object_id: `rect_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "rect",
+              x,
+              y,
+              w: width,
+              h: height,
+              layer: maskLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              ccw_rotation: element.ccw_rotation,
+              roundness: corner_radius,
+              composite_mode: "destination-out"
+            };
+            primitives.push(cutout);
+          } else {
+            const openingWidth = Math.max(0.01, width + 2 * soldermask_margin);
+            const openingHeight = Math.max(0.01, height + 2 * soldermask_margin);
+            const innerRingBase = {
+              _pcb_drawing_object_id: `rect_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "rect",
+              x,
+              y,
+              w: width,
+              h: height,
+              layer: maskLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              ccw_rotation: element.ccw_rotation,
+              roundness: corner_radius
+            };
+            if (element.solder_mask_color) {
+              innerRingBase.color = element.solder_mask_color;
+            }
+            primitives.push(innerRingBase);
+            const innerCutout = {
+              _pcb_drawing_object_id: `rect_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "rect",
+              x,
+              y,
+              w: openingWidth,
+              h: openingHeight,
+              layer: maskLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              ccw_rotation: element.ccw_rotation,
+              roundness: corner_radius,
+              composite_mode: "destination-out"
+            };
+            primitives.push(innerCutout);
           }
-          primitives.push(maskPrimitive);
         }
         return primitives;
       } else if (element.shape === "circle") {
@@ -7321,23 +7441,123 @@ var convertElementToPrimitives = (element, allElements) => {
           }
         ];
         if (element.is_covered_with_solder_mask) {
+          const rawMargin = element.soldermask_margin;
           const maskLayer = layer === "bottom" ? "soldermask_with_copper_bottom" : "soldermask_with_copper_top";
-          const maskPrimitive = {
-            _pcb_drawing_object_id: `circle_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "circle",
-            x,
-            y,
-            r: radius,
-            layer: maskLayer,
-            _element: element,
-            _parent_pcb_component,
-            _parent_source_component,
-            _source_port
-          };
-          if (element.solder_mask_color) {
-            maskPrimitive.color = element.solder_mask_color;
+          if (rawMargin === void 0 || rawMargin === null) {
+            const soldermask_margin2 = 0;
+            const openingRadius = Math.max(0.01, radius + soldermask_margin2);
+            const openingPrimitive = {
+              _pcb_drawing_object_id: `circle_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "circle",
+              x,
+              y,
+              r: openingRadius,
+              layer: maskLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port
+            };
+            if (element.solder_mask_color) {
+              openingPrimitive.color = element.solder_mask_color;
+            }
+            primitives.push(openingPrimitive);
+            const maskCoverageLayer = layer === "bottom" ? "soldermask_bottom" : "soldermask_top";
+            const fullMaskCoverage = {
+              _pcb_drawing_object_id: `circle_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "circle",
+              x,
+              y,
+              r: radius,
+              layer: maskCoverageLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port
+            };
+            primitives.push(fullMaskCoverage);
+            const cutoutOpening = {
+              _pcb_drawing_object_id: `circle_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "circle",
+              x,
+              y,
+              r: openingRadius,
+              layer: maskCoverageLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              composite_mode: "destination-out"
+            };
+            primitives.push(cutoutOpening);
+            return primitives;
+          }
+          const soldermask_margin = rawMargin;
+          if (soldermask_margin === 0) {
+            return primitives;
+          }
+          if (soldermask_margin > 0) {
+            const marginRing = {
+              _pcb_drawing_object_id: `circle_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "circle",
+              x,
+              y,
+              r: radius + soldermask_margin,
+              layer: maskLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              color: "rgb(201, 162, 110)"
+            };
+            primitives.push(marginRing);
+            const cutout = {
+              _pcb_drawing_object_id: `circle_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "circle",
+              x,
+              y,
+              r: radius,
+              layer: maskLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              composite_mode: "destination-out"
+            };
+            primitives.push(cutout);
+          } else {
+            const openingRadius = Math.max(0.01, radius + soldermask_margin);
+            const innerRingBase = {
+              _pcb_drawing_object_id: `circle_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "circle",
+              x,
+              y,
+              r: radius,
+              layer: maskLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port
+            };
+            if (element.solder_mask_color) {
+              innerRingBase.color = element.solder_mask_color;
+            }
+            primitives.push(innerRingBase);
+            const innerCutout = {
+              _pcb_drawing_object_id: `circle_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "circle",
+              x,
+              y,
+              r: openingRadius,
+              layer: maskLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              composite_mode: "destination-out"
+            };
+            primitives.push(innerCutout);
           }
-          primitives.push(maskPrimitive);
         }
         return primitives;
       } else if (element.shape === "polygon") {
@@ -7391,25 +7611,139 @@ var convertElementToPrimitives = (element, allElements) => {
           }
         ];
         if (element.is_covered_with_solder_mask) {
+          const rawMargin = element.soldermask_margin;
           const maskLayer = layer === "bottom" ? "soldermask_with_copper_bottom" : "soldermask_with_copper_top";
-          const maskPrimitive = {
-            _pcb_drawing_object_id: `pill_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "pill",
-            x,
-            y,
-            w: width,
-            h: height,
-            layer: maskLayer,
-            _element: element,
-            _parent_pcb_component,
-            _parent_source_component,
-            _source_port,
-            ccw_rotation: element.ccw_rotation
-          };
-          if (element.solder_mask_color) {
-            maskPrimitive.color = element.solder_mask_color;
+          if (rawMargin === void 0 || rawMargin === null) {
+            const soldermask_margin2 = 0;
+            const openingWidth = Math.max(0.01, width + 2 * soldermask_margin2);
+            const openingHeight = Math.max(0.01, height + 2 * soldermask_margin2);
+            const openingPrimitive = {
+              _pcb_drawing_object_id: `pill_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "pill",
+              x,
+              y,
+              w: openingWidth,
+              h: openingHeight,
+              layer: maskLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              ccw_rotation: element.ccw_rotation
+            };
+            if (element.solder_mask_color) {
+              openingPrimitive.color = element.solder_mask_color;
+            }
+            primitives.push(openingPrimitive);
+            const maskCoverageLayer = layer === "bottom" ? "soldermask_bottom" : "soldermask_top";
+            const fullMaskCoverage = {
+              _pcb_drawing_object_id: `pill_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "pill",
+              x,
+              y,
+              w: width,
+              h: height,
+              layer: maskCoverageLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              ccw_rotation: element.ccw_rotation
+            };
+            primitives.push(fullMaskCoverage);
+            const cutoutOpening = {
+              _pcb_drawing_object_id: `pill_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "pill",
+              x,
+              y,
+              w: openingWidth,
+              h: openingHeight,
+              layer: maskCoverageLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              ccw_rotation: element.ccw_rotation,
+              composite_mode: "destination-out"
+            };
+            primitives.push(cutoutOpening);
+            return primitives;
+          }
+          const soldermask_margin = rawMargin;
+          if (soldermask_margin === 0) {
+            return primitives;
+          }
+          if (soldermask_margin > 0) {
+            const marginRing = {
+              _pcb_drawing_object_id: `pill_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "pill",
+              x,
+              y,
+              w: width + 2 * soldermask_margin,
+              h: height + 2 * soldermask_margin,
+              layer: maskLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              ccw_rotation: element.ccw_rotation,
+              color: "rgb(201, 162, 110)"
+            };
+            primitives.push(marginRing);
+            const cutout = {
+              _pcb_drawing_object_id: `pill_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "pill",
+              x,
+              y,
+              w: width,
+              h: height,
+              layer: maskLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              ccw_rotation: element.ccw_rotation,
+              composite_mode: "destination-out"
+            };
+            primitives.push(cutout);
+          } else {
+            const openingWidth = Math.max(0.01, width + 2 * soldermask_margin);
+            const openingHeight = Math.max(0.01, height + 2 * soldermask_margin);
+            const innerRingBase = {
+              _pcb_drawing_object_id: `pill_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "pill",
+              x,
+              y,
+              w: width,
+              h: height,
+              layer: maskLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              ccw_rotation: element.ccw_rotation
+            };
+            if (element.solder_mask_color) {
+              innerRingBase.color = element.solder_mask_color;
+            }
+            primitives.push(innerRingBase);
+            const innerCutout = {
+              _pcb_drawing_object_id: `pill_${globalPcbDrawingObjectCount++}`,
+              pcb_drawing_type: "pill",
+              x,
+              y,
+              w: openingWidth,
+              h: openingHeight,
+              layer: maskLayer,
+              _element: element,
+              _parent_pcb_component,
+              _parent_source_component,
+              _source_port,
+              ccw_rotation: element.ccw_rotation,
+              composite_mode: "destination-out"
+            };
+            primitives.push(innerCutout);
           }
-          primitives.push(maskPrimitive);
         }
         return primitives;
       }
@@ -8918,6 +9252,7 @@ var Drawer = class {
   transform;
   foregroundLayer = "top";
   lastPoint;
+  _tempCompositeMode;
   constructor(canvasLayerMap) {
     this.canvasLayerMap = canvasLayerMap;
     this.ctxLayerMap = Object.fromEntries(
@@ -9258,6 +9593,9 @@ var Drawer = class {
       ctx.fillStyle = "rgba(0,0,0,1)";
       ctx.strokeStyle = "rgba(0,0,0,1)";
     }
+    if (this._tempCompositeMode) {
+      ctx.globalCompositeOperation = this._tempCompositeMode;
+    }
     ctx.font = `${scaleOnly(inverse(transform), fontSize)}px sans-serif`;
   }
   moveTo(x, y) {
@@ -9547,6 +9885,9 @@ var drawRect = (drawer, rect) => {
     layer: rect.layer,
     size: rect.stroke_width
   });
+  if (rect.composite_mode) {
+    drawer._tempCompositeMode = rect.composite_mode;
+  }
   drawer.rect({
     x: rect.x,
     y: rect.y,
@@ -9559,12 +9900,18 @@ var drawRect = (drawer, rect) => {
     stroke_width: rect.stroke_width,
     roundness: rect.roundness
   });
+  if (rect.composite_mode) {
+    drawer._tempCompositeMode = void 0;
+  }
 };
 var drawRotatedRect = (drawer, rect) => {
   drawer.equip({
     color: getColor(rect),
     layer: rect.layer
   });
+  if (rect.composite_mode) {
+    drawer._tempCompositeMode = rect.composite_mode;
+  }
   drawer.rotatedRect(
     rect.x,
     rect.y,
@@ -9574,20 +9921,35 @@ var drawRotatedRect = (drawer, rect) => {
     rect.roundness,
     rect.mesh_fill
   );
+  if (rect.composite_mode) {
+    drawer._tempCompositeMode = void 0;
+  }
 };
 var drawRotatedPill = (drawer, pill) => {
   drawer.equip({
     color: getColor(pill),
     layer: pill.layer
   });
+  if (pill.composite_mode) {
+    drawer._tempCompositeMode = pill.composite_mode;
+  }
   drawer.rotatedPill(pill.x, pill.y, pill.w, pill.h, pill.ccw_rotation);
+  if (pill.composite_mode) {
+    drawer._tempCompositeMode = void 0;
+  }
 };
 var drawCircle = (drawer, circle) => {
   drawer.equip({
     color: getColor(circle),
     layer: circle.layer
   });
+  if (circle.composite_mode) {
+    drawer._tempCompositeMode = circle.composite_mode;
+  }
   drawer.circle(circle.x, circle.y, circle.r, circle.mesh_fill);
+  if (circle.composite_mode) {
+    drawer._tempCompositeMode = void 0;
+  }
 };
 var drawOval = (drawer, oval) => {
   drawer.equip({
@@ -9601,7 +9963,13 @@ var drawPill = (drawer, pill) => {
     color: getColor(pill),
     layer: pill.layer
   });
+  if (pill.composite_mode) {
+    drawer._tempCompositeMode = pill.composite_mode;
+  }
   drawer.pill(pill.x, pill.y, pill.w, pill.h);
+  if (pill.composite_mode) {
+    drawer._tempCompositeMode = void 0;
+  }
 };
 var drawPolygon = (drawer, polygon) => {
   drawer.equip({
@@ -13261,7 +13629,7 @@ import { css as css3 } from "@emotion/css";
 // package.json
 var package_default = {
   name: "@tscircuit/pcb-viewer",
-  version: "1.11.268",
+  version: "1.11.269",
   main: "dist/index.js",
   type: "module",
   repository: "tscircuit/pcb-viewer",
@@ -13314,7 +13682,7 @@ var package_default = {
     "@tscircuit/alphabet": "^0.0.3",
     "@tscircuit/math-utils": "^0.0.29",
     "@vitejs/plugin-react": "^5.0.2",
-    "circuit-json": "^0.0.321",
+    "circuit-json": "^0.0.325",
     "circuit-to-svg": "^0.0.271",
     color: "^4.2.3",
     "react-supergrid": "^1.0.10",