@tscircuit/pcb-viewer 1.11.352 → 1.11.354

package/dist/index.d.ts

@@ -22,6 +22,7 @@ interface State {
     is_showing_pcb_groups: boolean;
     is_showing_group_anchor_offsets: boolean;
     is_showing_solder_mask: boolean;
+    is_showing_silkscreen: boolean;
     is_showing_fabrication_notes: boolean;
     pcb_group_view_mode: "all" | "named_only";
     hovered_error_id: string | null;
@@ -39,6 +40,7 @@ interface State {
     setIsShowingPcbGroups: (is_showing: boolean) => void;
     setIsShowingGroupAnchorOffsets: (is_showing: boolean) => void;
     setIsShowingSolderMask: (is_showing: boolean) => void;
+    setIsShowingSilkscreen: (is_showing: boolean) => void;
     setIsShowingFabricationNotes: (is_showing: boolean) => void;
     setPcbGroupViewMode: (mode: "all" | "named_only") => void;
     setHoveredErrorId: (errorId: string | null) => void;

package/dist/index.js

@@ -5572,6 +5572,34 @@ var cju = (circuitJsonInput, options = {}) => {
         if (prop === "subtree") {
           return (opts) => cju(buildSubtree(circuitJson, opts), options);
         }
+        if (prop === "insert") {
+          return (elm) => {
+            const component_type2 = elm.type;
+            if (!component_type2) {
+              throw new Error("insert requires an element with a type");
+            }
+            internalStore.counts[component_type2] ??= -1;
+            internalStore.counts[component_type2]++;
+            const index = internalStore.counts[component_type2];
+            const newElm = {
+              ...elm,
+              type: component_type2,
+              [`${component_type2}_id`]: `${component_type2}_${index}`
+            };
+            if (options.validateInserts) {
+              const parser = Soup[component_type2] ?? Soup.any_soup_element;
+              parser.parse(newElm);
+            }
+            circuitJson.push(newElm);
+            internalStore.editCount++;
+            return newElm;
+          };
+        }
+        if (prop === "insertAll") {
+          return (elms) => {
+            return elms.map((elm) => su2.insert(elm));
+          };
+        }
         const component_type = prop;
         return {
           get: (id) => circuitJson.find(
@@ -6199,6 +6227,43 @@ var getElementId = (elm) => {
   const id = elm[`${type}_id`];
   return id;
 };
+var mergeBounds = (currentBounds, nextBounds) => ({
+  minX: Math.min(currentBounds.minX, nextBounds.minX),
+  minY: Math.min(currentBounds.minY, nextBounds.minY),
+  maxX: Math.max(currentBounds.maxX, nextBounds.maxX),
+  maxY: Math.max(currentBounds.maxY, nextBounds.maxY)
+});
+var getCircleBounds = (x, y, diameter) => {
+  const radius = diameter / 2;
+  return {
+    minX: x - radius,
+    minY: y - radius,
+    maxX: x + radius,
+    maxY: y + radius
+  };
+};
+var getRotatedRectBounds = (x, y, width, height, rotationDegrees) => {
+  const halfWidth = width / 2;
+  const halfHeight = height / 2;
+  const theta = rotationDegrees * Math.PI / 180;
+  const cosTheta = Math.cos(theta);
+  const sinTheta = Math.sin(theta);
+  const corners = [
+    { x: -halfWidth, y: -halfHeight },
+    { x: halfWidth, y: -halfHeight },
+    { x: halfWidth, y: halfHeight },
+    { x: -halfWidth, y: halfHeight }
+  ].map((corner) => ({
+    x: x + corner.x * cosTheta - corner.y * sinTheta,
+    y: y + corner.x * sinTheta + corner.y * cosTheta
+  }));
+  return {
+    minX: Math.min(...corners.map((corner) => corner.x)),
+    minY: Math.min(...corners.map((corner) => corner.y)),
+    maxX: Math.max(...corners.map((corner) => corner.x)),
+    maxY: Math.max(...corners.map((corner) => corner.y))
+  };
+};
 var getBoundsOfPcbElements = (elements) => {
   let minX = Number.POSITIVE_INFINITY;
   let minY = Number.POSITIVE_INFINITY;
@@ -6215,6 +6280,47 @@ var getBoundsOfPcbElements = (elements) => {
       }
       continue;
     }
+    if (elm.type === "pcb_hole" && elm.hole_shape === "circle") {
+      const holeBounds = getCircleBounds(elm.x, elm.y, elm.hole_diameter);
+      minX = Math.min(minX, holeBounds.minX);
+      minY = Math.min(minY, holeBounds.minY);
+      maxX = Math.max(maxX, holeBounds.maxX);
+      maxY = Math.max(maxY, holeBounds.maxY);
+      continue;
+    }
+    if (elm.type === "pcb_plated_hole") {
+      let platedHoleBounds;
+      if ("outer_diameter" in elm && typeof elm.outer_diameter === "number") {
+        platedHoleBounds = getCircleBounds(elm.x, elm.y, elm.outer_diameter);
+      } else if ("hole_diameter" in elm && typeof elm.hole_diameter === "number") {
+        platedHoleBounds = getCircleBounds(elm.x, elm.y, elm.hole_diameter);
+      }
+      if ("rect_pad_width" in elm && typeof elm.rect_pad_width === "number" && "rect_pad_height" in elm && typeof elm.rect_pad_height === "number") {
+        const rectBounds = getRotatedRectBounds(
+          elm.x,
+          elm.y,
+          elm.rect_pad_width,
+          elm.rect_pad_height,
+          "rect_ccw_rotation" in elm ? elm.rect_ccw_rotation ?? 0 : 0
+        );
+        platedHoleBounds = platedHoleBounds ? mergeBounds(platedHoleBounds, rectBounds) : rectBounds;
+      }
+      if ("hole_diameter" in elm && typeof elm.hole_diameter === "number") {
+        const drillBounds = getCircleBounds(
+          elm.x + ("hole_offset_x" in elm ? elm.hole_offset_x ?? 0 : 0),
+          elm.y + ("hole_offset_y" in elm ? elm.hole_offset_y ?? 0 : 0),
+          elm.hole_diameter
+        );
+        platedHoleBounds = platedHoleBounds ? mergeBounds(platedHoleBounds, drillBounds) : drillBounds;
+      }
+      if (platedHoleBounds) {
+        minX = Math.min(minX, platedHoleBounds.minX);
+        minY = Math.min(minY, platedHoleBounds.minY);
+        maxX = Math.max(maxX, platedHoleBounds.maxX);
+        maxY = Math.max(maxY, platedHoleBounds.maxY);
+        continue;
+      }
+    }
     let centerX;
     let centerY;
     let width;
@@ -6261,6 +6367,20 @@ var getBoundsOfPcbElements = (elements) => {
         maxX = Math.max(maxX, point.x);
         maxY = Math.max(maxY, point.y);
       }
+    } else if (elm.type === "pcb_courtyard_outline") {
+      for (const point of elm.outline) {
+        minX = Math.min(minX, point.x);
+        minY = Math.min(minY, point.y);
+        maxX = Math.max(maxX, point.x);
+        maxY = Math.max(maxY, point.y);
+      }
+    } else if (elm.type === "pcb_courtyard_polygon") {
+      for (const point of elm.points) {
+        minX = Math.min(minX, point.x);
+        minY = Math.min(minY, point.y);
+        maxX = Math.max(maxX, point.x);
+        maxY = Math.max(maxY, point.y);
+      }
     }
   }
   return { minX, minY, maxX, maxY };
@@ -6477,7 +6597,8 @@ var STORAGE_KEYS = {
   IS_SHOWING_COURTYARDS: "pcb_viewer_is_showing_courtyards",
   IS_SHOWING_GROUP_ANCHOR_OFFSETS: "pcb_viewer_is_showing_group_anchor_offsets",
   IS_SHOWING_SOLDER_MASK: "pcb_viewer_is_showing_solder_mask",
-  IS_SHOWING_FABRICATION_NOTES: "pcb_viewer_is_showing_fabrication_notes"
+  IS_SHOWING_FABRICATION_NOTES: "pcb_viewer_is_showing_fabrication_notes",
+  IS_SHOWING_SILKSCREEN: "pcb_viewer_is_showing_silkscreen"
 };
 var getStoredBoolean = (key, defaultValue) => {
   if (typeof window === "undefined") return defaultValue;
@@ -6545,6 +6666,10 @@ var createStore = (initialState = {}, disablePcbGroups = false) => createZustand
       STORAGE_KEYS.IS_SHOWING_SOLDER_MASK,
       false
     ),
+    is_showing_silkscreen: getStoredBoolean(
+      STORAGE_KEYS.IS_SHOWING_SILKSCREEN,
+      true
+    ),
     is_showing_fabrication_notes: getStoredBoolean(
       STORAGE_KEYS.IS_SHOWING_FABRICATION_NOTES,
       false
@@ -6594,6 +6719,10 @@ var createStore = (initialState = {}, disablePcbGroups = false) => createZustand
       setStoredBoolean(STORAGE_KEYS.IS_SHOWING_SOLDER_MASK, is_showing);
       set({ is_showing_solder_mask: is_showing });
     },
+    setIsShowingSilkscreen: (is_showing) => {
+      setStoredBoolean(STORAGE_KEYS.IS_SHOWING_SILKSCREEN, is_showing);
+      set({ is_showing_silkscreen: is_showing });
+    },
     setIsShowingFabricationNotes: (is_showing) => {
       setStoredBoolean(
         STORAGE_KEYS.IS_SHOWING_FABRICATION_NOTES,
@@ -9906,9 +10035,8 @@ var CanvasPrimitiveRenderer = ({
   const isShowingFabricationNotes = useGlobalStore(
     (s) => s.is_showing_fabrication_notes
   );
-  const isShowingCourtyards = useGlobalStore(
-    (s) => s.is_showing_courtyards
-  );
+  const isShowingCourtyards = useGlobalStore((s) => s.is_showing_courtyards);
+  const isShowingSilkscreen = useGlobalStore((s) => s.is_showing_silkscreen);
   useEffect5(() => {
     if (!canvasRefs.current) return;
     if (Object.keys(canvasRefs.current).length === 0) return;
@@ -9923,7 +10051,7 @@ var CanvasPrimitiveRenderer = ({
     if (transform) drawer.transform = transform;
     drawer.clear();
     drawer.foregroundLayer = selectedLayer;
-    const filteredPrimitives = primitives.filter((p) => isShowingSolderMask || !p.layer?.includes("soldermask")).filter(
+    const filteredPrimitives = primitives.filter((p) => isShowingSolderMask || !p.layer?.includes("soldermask")).filter((p) => isShowingSilkscreen || !p.layer?.includes("silkscreen")).filter(
       (p) => isShowingFabricationNotes || !p.layer?.includes("fabrication")
     ).filter((p) => p.layer !== "board").filter((p) => p._element?.type !== "pcb_smtpad").filter((p) => p._element?.type !== "pcb_plated_hole").filter((p) => p._element?.type !== "pcb_via").filter((p) => p._element?.type !== "pcb_trace");
     drawPrimitives(drawer, filteredPrimitives);
@@ -10077,23 +10205,25 @@ var CanvasPrimitiveRenderer = ({
           realToCanvasMat: transform
         });
       }
-      const topSilkscreenCanvas = canvasRefs.current.top_silkscreen;
-      if (topSilkscreenCanvas) {
-        drawSilkscreenElementsForLayer({
-          canvas: topSilkscreenCanvas,
-          elements,
-          layers: ["top_silkscreen"],
-          realToCanvasMat: transform
-        });
-      }
-      const bottomSilkscreenCanvas = canvasRefs.current.bottom_silkscreen;
-      if (bottomSilkscreenCanvas) {
-        drawSilkscreenElementsForLayer({
-          canvas: bottomSilkscreenCanvas,
-          elements,
-          layers: ["bottom_silkscreen"],
-          realToCanvasMat: transform
-        });
+      if (isShowingSilkscreen) {
+        const topSilkscreenCanvas = canvasRefs.current.top_silkscreen;
+        if (topSilkscreenCanvas) {
+          drawSilkscreenElementsForLayer({
+            canvas: topSilkscreenCanvas,
+            elements,
+            layers: ["top_silkscreen"],
+            realToCanvasMat: transform
+          });
+        }
+        const bottomSilkscreenCanvas = canvasRefs.current.bottom_silkscreen;
+        if (bottomSilkscreenCanvas) {
+          drawSilkscreenElementsForLayer({
+            canvas: bottomSilkscreenCanvas,
+            elements,
+            layers: ["bottom_silkscreen"],
+            realToCanvasMat: transform
+          });
+        }
       }
       if (isShowingFabricationNotes) {
         const topFabCanvas = canvasRefs.current.top_fabrication;
@@ -10201,7 +10331,8 @@ var CanvasPrimitiveRenderer = ({
     selectedLayer,
     isShowingSolderMask,
     isShowingFabricationNotes,
-    isShowingCourtyards
+    isShowingCourtyards,
+    isShowingSilkscreen
   ]);
   return /* @__PURE__ */ jsxs(
     "div",
@@ -10227,9 +10358,8 @@ var CanvasPrimitiveRenderer = ({
           }
         ),
         orderedLayers.filter((layer) => {
-          if (!isShowingSolderMask) {
-            return !layer.includes("soldermask");
-          }
+          if (!isShowingSolderMask && layer.includes("soldermask")) return false;
+          if (!isShowingSilkscreen && layer.includes("silkscreen")) return false;
           return true;
         }).map((l) => l.replace(/-/g, "")).map((layer, i) => /* @__PURE__ */ jsx3(
           "canvas",
@@ -14241,7 +14371,7 @@ import { css as css3 } from "@emotion/css";
 // package.json
 var package_default = {
   name: "@tscircuit/pcb-viewer",
-  version: "1.11.351",
+  version: "1.11.353",
   main: "dist/index.js",
   type: "module",
   repository: "tscircuit/pcb-viewer",
@@ -14265,7 +14395,7 @@ var package_default = {
     "@semantic-release/npm": "^9.0.1",
     "@semantic-release/release-notes-generator": "^10.0.3",
     "@swc/core": "^1.4.12",
-    "@tscircuit/circuit-json-util": "^0.0.78",
+    "@tscircuit/circuit-json-util": "^0.0.90",
     "@tscircuit/eagle-xml-converter": "^1.0.0",
     "@types/bun": "latest",
     "@types/color": "^3.0.6",
@@ -14278,7 +14408,7 @@ var package_default = {
     "react-cosmos-plugin-vite": "7.0.0-beta.0",
     "react-dom": "19.1.0",
     "react-use": "^17.4.0",
-    tscircuit: "^0.0.1421",
+    tscircuit: "^0.0.1517",
     tsup: "^8.0.2",
     "type-fest": "^3.0.0",
     typescript: "^5.4.4",
@@ -14294,9 +14424,9 @@ var package_default = {
     "@tscircuit/alphabet": "^0.0.22",
     "@tscircuit/math-utils": "^0.0.29",
     "@vitejs/plugin-react": "^5.0.2",
-    "circuit-json": "^0.0.387",
-    "circuit-to-canvas": "^0.0.92",
-    "circuit-to-svg": "^0.0.323",
+    "circuit-json": "^0.0.403",
+    "circuit-to-canvas": "^0.0.93",
+    "circuit-to-svg": "^0.0.337",
     color: "^4.2.3",
     "react-supergrid": "^1.0.10",
     "react-toastify": "^10.0.5",
@@ -14579,6 +14709,7 @@ var ToolbarOverlay = ({ children, elements }) => {
     setIsShowingPcbGroups,
     setIsShowingGroupAnchorOffsets,
     setIsShowingSolderMask,
+    setIsShowingSilkscreen,
     setIsShowingFabricationNotes,
     setPcbGroupViewMode,
     setHoveredErrorId
@@ -14601,6 +14732,7 @@ var ToolbarOverlay = ({ children, elements }) => {
       is_showing_pcb_groups: s.is_showing_pcb_groups,
       is_showing_group_anchor_offsets: s.is_showing_group_anchor_offsets,
       is_showing_solder_mask: s.is_showing_solder_mask,
+      is_showing_silkscreen: s.is_showing_silkscreen,
       is_showing_fabrication_notes: s.is_showing_fabrication_notes,
       pcb_group_view_mode: s.pcb_group_view_mode
     },
@@ -14614,6 +14746,7 @@ var ToolbarOverlay = ({ children, elements }) => {
     setIsShowingPcbGroups: s.setIsShowingPcbGroups,
     setIsShowingGroupAnchorOffsets: s.setIsShowingGroupAnchorOffsets,
     setIsShowingSolderMask: s.setIsShowingSolderMask,
+    setIsShowingSilkscreen: s.setIsShowingSilkscreen,
     setIsShowingFabricationNotes: s.setIsShowingFabricationNotes,
     setPcbGroupViewMode: s.setPcbGroupViewMode,
     setHoveredErrorId: s.setHoveredErrorId
@@ -15178,6 +15311,16 @@ var ToolbarOverlay = ({ children, elements }) => {
                           }
                         }
                       ),
+                      /* @__PURE__ */ jsx20(
+                        CheckboxMenuItem,
+                        {
+                          label: "Show Silkscreen",
+                          checked: viewSettings.is_showing_silkscreen,
+                          onClick: () => {
+                            setIsShowingSilkscreen(!viewSettings.is_showing_silkscreen);
+                          }
+                        }
+                      ),
                       /* @__PURE__ */ jsx20(
                         CheckboxMenuItem,
                         {