circuit-json-to-lbrn 0.0.17 → 0.0.19

package/dist/index.js

@@ -1,5 +1,5 @@
 // lib/index.ts
-import { LightBurnProject, CutSetting, ShapePath as ShapePath21 } from "lbrnts";
+import { LightBurnProject, CutSetting, ShapePath as ShapePath25 } from "lbrnts";
 import { cju as cju2 } from "@tscircuit/circuit-json-util";
 
 // lib/element-handlers/addPlatedHole/addCirclePlatedHole.ts
@@ -88,7 +88,7 @@ var addCirclePlatedHole = (platedHole, ctx) => {
       })
     );
   }
-  if (platedHole.hole_diameter > 0) {
+  if (platedHole.hole_diameter > 0 && includeCopper) {
     const innerRadius = platedHole.hole_diameter / 2;
     const inner = createCirclePath(centerX, centerY, innerRadius);
     project.children.push(
@@ -180,7 +180,7 @@ var addOvalPlatedHole = (platedHole, ctx) => {
       })
     );
   }
-  if (platedHole.hole_width > 0 && platedHole.hole_height > 0) {
+  if (platedHole.hole_width > 0 && platedHole.hole_height > 0 && includeCopper) {
     const inner = createOvalPath(
       centerX,
       centerY,
@@ -337,7 +337,7 @@ var addCircularHoleWithRectPad = (platedHole, ctx) => {
       })
     );
   }
-  if (holeRadius > 0) {
+  if (holeRadius > 0 && includeCopper) {
     const holeCenterX = centerX + platedHole.hole_offset_x;
     const holeCenterY = centerY + platedHole.hole_offset_y;
     const holePath = createCirclePath(holeCenterX, holeCenterY, holeRadius, 32);
@@ -491,7 +491,7 @@ var addPillHoleWithRectPad = (platedHole, ctx) => {
   }
   const holeWidth = platedHole.hole_width;
   const holeHeight = platedHole.hole_height;
-  if (holeWidth > 0 && holeHeight > 0) {
+  if (holeWidth > 0 && holeHeight > 0 && includeCopper) {
     const holeCenterX = centerX + platedHole.hole_offset_x;
     const holeCenterY = centerY + platedHole.hole_offset_y;
     const holePath = createPillPath(
@@ -575,7 +575,7 @@ var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
   const holeWidth = platedHole.hole_width;
   const holeHeight = platedHole.hole_height;
   const holeRotation = (platedHole.hole_ccw_rotation ?? 0) * (Math.PI / 180);
-  if (holeWidth > 0 && holeHeight > 0) {
+  if (holeWidth > 0 && holeHeight > 0 && includeCopper) {
     const holeCenterX = centerX + platedHole.hole_offset_x;
     const holeCenterY = centerY + platedHole.hole_offset_y;
     const holePath = createPillPath(
@@ -628,7 +628,7 @@ var addHoleWithPolygonPad = (platedHole, ctx) => {
     includeSoldermask,
     soldermaskMargin
   } = ctx;
-  if (platedHole.pad_outline.length >= 3) {
+  if (platedHole.pad_outline.length >= 3 && includeCopper) {
     const pad = createPolygonPathFromOutline(
       platedHole.pad_outline,
       platedHole.x + origin.x,
@@ -655,7 +655,7 @@ var addHoleWithPolygonPad = (platedHole, ctx) => {
       );
     }
   }
-  if (platedHole.hole_shape === "circle" && platedHole.hole_diameter) {
+  if (platedHole.hole_shape === "circle" && platedHole.hole_diameter && includeCopper) {
     const centerX = platedHole.x + platedHole.hole_offset_x + origin.x;
     const centerY = platedHole.y + platedHole.hole_offset_y + origin.y;
     const radius = platedHole.hole_diameter / 2;
@@ -669,7 +669,7 @@ var addHoleWithPolygonPad = (platedHole, ctx) => {
       })
     );
   }
-  if (platedHole.hole_shape === "pill" && platedHole.hole_diameter) {
+  if (platedHole.hole_shape === "pill" && platedHole.hole_diameter && includeCopper) {
     const centerX = platedHole.x + platedHole.hole_offset_x + origin.x;
     const centerY = platedHole.y + platedHole.hole_offset_y + origin.y;
     const radius = platedHole.hole_diameter / 2;
@@ -731,7 +731,7 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
       })
     );
   }
-  if (platedHole.hole_width > 0 && platedHole.hole_height > 0) {
+  if (platedHole.hole_width > 0 && platedHole.hole_height > 0 && includeCopper) {
     const inner = createPillPath(
       centerX,
       centerY,
@@ -1422,7 +1422,7 @@ var addPcbVia = (via, ctx) => {
       })
     );
   }
-  if (via.hole_diameter > 0) {
+  if (via.hole_diameter > 0 && includeCopper) {
     const innerRadius = via.hole_diameter / 2;
     const inner = createCirclePath(centerX, centerY, innerRadius);
     project.children.push(
@@ -1445,7 +1445,8 @@ var addCirclePcbHole = (hole, ctx) => {
     soldermaskCutSetting,
     origin,
     includeSoldermask,
-    soldermaskMargin
+    soldermaskMargin,
+    includeCopper
   } = ctx;
   const centerX = hole.x + origin.x;
   const centerY = hole.y + origin.y;
@@ -1461,7 +1462,7 @@ var addCirclePcbHole = (hole, ctx) => {
       })
     );
   }
-  if (hole.hole_diameter > 0) {
+  if (hole.hole_diameter > 0 && includeCopper) {
     const radius = hole.hole_diameter / 2;
     const circlePath = createCirclePath(centerX, centerY, radius);
     project.children.push(
@@ -1484,7 +1485,8 @@ var addRectPcbHole = (hole, ctx) => {
     soldermaskCutSetting,
     origin,
     includeSoldermask,
-    soldermaskMargin
+    soldermaskMargin,
+    includeCopper
   } = ctx;
   const centerX = hole.x + origin.x;
   const centerY = hole.y + origin.y;
@@ -1506,7 +1508,7 @@ var addRectPcbHole = (hole, ctx) => {
       })
     );
   }
-  if (hole.hole_width > 0 && hole.hole_height > 0) {
+  if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
     const rectPath = createRoundedRectPath(
       centerX,
       centerY,
@@ -1535,7 +1537,8 @@ var addOvalPcbHole = (hole, ctx) => {
     soldermaskCutSetting,
     origin,
     includeSoldermask,
-    soldermaskMargin
+    soldermaskMargin,
+    includeCopper
   } = ctx;
   const centerX = hole.x + origin.x;
   const centerY = hole.y + origin.y;
@@ -1555,7 +1558,7 @@ var addOvalPcbHole = (hole, ctx) => {
       })
     );
   }
-  if (hole.hole_width > 0 && hole.hole_height > 0) {
+  if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
     const ovalPath = createOvalPath(
       centerX,
       centerY,
@@ -1582,7 +1585,8 @@ var addPillPcbHole = (hole, ctx) => {
     soldermaskCutSetting,
     origin,
     includeSoldermask,
-    soldermaskMargin
+    soldermaskMargin,
+    includeCopper
   } = ctx;
   const centerX = hole.x + origin.x;
   const centerY = hole.y + origin.y;
@@ -1602,7 +1606,7 @@ var addPillPcbHole = (hole, ctx) => {
       })
     );
   }
-  if (hole.hole_width > 0 && hole.hole_height > 0) {
+  if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
     const pillPath = createPillPath(
       centerX,
       centerY,
@@ -1629,7 +1633,8 @@ var addRotatedPillPcbHole = (hole, ctx) => {
     soldermaskCutSetting,
     origin,
     includeSoldermask,
-    soldermaskMargin
+    soldermaskMargin,
+    includeCopper
   } = ctx;
   const centerX = hole.x + origin.x;
   const centerY = hole.y + origin.y;
@@ -1651,7 +1656,7 @@ var addRotatedPillPcbHole = (hole, ctx) => {
       })
     );
   }
-  if (hole.hole_width > 0 && hole.hole_height > 0) {
+  if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
     const pillPath = createPillPath(
       centerX,
       centerY,
@@ -1690,6 +1695,222 @@ var addPcbHole = (hole, ctx) => {
   }
 };
 
+// lib/element-handlers/addPcbCutout/addCirclePcbCutout.ts
+import { ShapePath as ShapePath21 } from "lbrnts";
+var addCirclePcbCutout = (cutout, ctx) => {
+  const {
+    project,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    soldermaskMargin,
+    soldermaskCutSetting
+  } = ctx;
+  const centerX = cutout.center.x + origin.x;
+  const centerY = cutout.center.y + origin.y;
+  if (cutout.radius > 0 && includeCopper) {
+    const circlePath = createCirclePath(centerX, centerY, cutout.radius);
+    project.children.push(
+      new ShapePath21({
+        cutIndex: throughBoardCutSetting.index,
+        verts: circlePath.verts,
+        prims: circlePath.prims,
+        isClosed: true
+      })
+    );
+  }
+  if (cutout.radius > 0 && includeSoldermask) {
+    const smRadius = cutout.radius + soldermaskMargin;
+    const outer = createCirclePath(centerX, centerY, smRadius);
+    project.children.push(
+      new ShapePath21({
+        cutIndex: soldermaskCutSetting.index,
+        verts: outer.verts,
+        prims: outer.prims,
+        isClosed: true
+      })
+    );
+  }
+};
+
+// lib/element-handlers/addPcbCutout/addRectPcbCutout.ts
+import { ShapePath as ShapePath22 } from "lbrnts";
+var addRectPcbCutout = (cutout, ctx) => {
+  const {
+    project,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    soldermaskMargin,
+    soldermaskCutSetting
+  } = ctx;
+  const centerX = cutout.center.x + origin.x;
+  const centerY = cutout.center.y + origin.y;
+  if (cutout.width > 0 && cutout.height > 0 && includeCopper) {
+    const rotation = (cutout.rotation ?? 0) * (Math.PI / 180);
+    const rectPath = createRoundedRectPath(
+      centerX,
+      centerY,
+      cutout.width,
+      cutout.height,
+      0,
+      // no border radius for cutouts
+      4,
+      // segments
+      rotation
+    );
+    project.children.push(
+      new ShapePath22({
+        cutIndex: throughBoardCutSetting.index,
+        verts: rectPath.verts,
+        prims: rectPath.prims,
+        isClosed: true
+      })
+    );
+  }
+  if (cutout.width > 0 && cutout.height > 0 && includeSoldermask) {
+    const rotation = (cutout.rotation ?? 0) * (Math.PI / 180);
+    const smWidth = cutout.width + 2 * soldermaskMargin;
+    const smHeight = cutout.height + 2 * soldermaskMargin;
+    const rectPath = createRoundedRectPath(
+      centerX,
+      centerY,
+      smWidth,
+      smHeight,
+      0,
+      // no border radius for cutouts
+      4,
+      // segments
+      rotation
+    );
+    project.children.push(
+      new ShapePath22({
+        cutIndex: soldermaskCutSetting.index,
+        verts: rectPath.verts,
+        prims: rectPath.prims,
+        isClosed: true
+      })
+    );
+  }
+};
+
+// lib/element-handlers/addPcbCutout/addPolygonPcbCutout.ts
+import { ShapePath as ShapePath23 } from "lbrnts";
+var addPolygonPcbCutout = (cutout, ctx) => {
+  const {
+    project,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    soldermaskCutSetting,
+    soldermaskMargin
+  } = ctx;
+  if (cutout.points.length >= 3 && includeCopper) {
+    const polygonPath = createPolygonPathFromOutline(
+      cutout.points,
+      origin.x,
+      origin.y
+    );
+    project.children.push(
+      new ShapePath23({
+        cutIndex: throughBoardCutSetting.index,
+        verts: polygonPath.verts,
+        prims: polygonPath.prims,
+        isClosed: true
+      })
+    );
+  }
+  if (cutout.points.length >= 3 && includeSoldermask) {
+    const points = soldermaskMargin && soldermaskMargin > 0 ? cutout.points.map((p) => ({
+      x: (p.x ?? 0) + (p.x ?? 0) > 0 ? soldermaskMargin : -soldermaskMargin,
+      y: (p.y ?? 0) + (p.y ?? 0) > 0 ? soldermaskMargin : -soldermaskMargin
+    })) : cutout.points;
+    const polygonPath = createPolygonPathFromOutline(points, origin.x, origin.y);
+    project.children.push(
+      new ShapePath23({
+        cutIndex: soldermaskCutSetting.index,
+        verts: polygonPath.verts,
+        prims: polygonPath.prims,
+        isClosed: true
+      })
+    );
+  }
+};
+
+// lib/element-handlers/addPcbCutout/addPathPcbCutout.ts
+import { ShapePath as ShapePath24 } from "lbrnts";
+var addPathPcbCutout = (cutout, ctx) => {
+  const {
+    project,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    soldermaskMargin,
+    soldermaskCutSetting
+  } = ctx;
+  if (cutout.route.length >= 2 && includeCopper) {
+    const verts = [];
+    const prims = [];
+    for (const point6 of cutout.route) {
+      verts.push({
+        x: point6.x + origin.x,
+        y: point6.y + origin.y
+      });
+      prims.push({ type: 0 });
+    }
+    project.children.push(
+      new ShapePath24({
+        cutIndex: throughBoardCutSetting.index,
+        verts,
+        prims,
+        isClosed: false
+        // Paths are typically not closed
+      })
+    );
+  }
+  if (cutout.route.length >= 2 && includeSoldermask) {
+    const verts = [];
+    const prims = [];
+    for (const point6 of cutout.route) {
+      verts.push({
+        x: point6.x + origin.x,
+        y: point6.y + origin.y
+      });
+      prims.push({ type: 0 });
+    }
+    project.children.push(
+      new ShapePath24({
+        cutIndex: soldermaskCutSetting.index,
+        verts,
+        prims,
+        isClosed: false
+        // Match the same path as the copper cutout
+      })
+    );
+  }
+};
+
+// lib/element-handlers/addPcbCutout/index.ts
+var addPcbCutout = (cutout, ctx) => {
+  switch (cutout.shape) {
+    case "circle":
+      return addCirclePcbCutout(cutout, ctx);
+    case "rect":
+      return addRectPcbCutout(cutout, ctx);
+    case "polygon":
+      return addPolygonPcbCutout(cutout, ctx);
+    case "path":
+      return addPathPcbCutout(cutout, ctx);
+    default:
+      const _exhaustive = cutout;
+      console.warn(`Unknown cutout shape: ${cutout.shape}`);
+  }
+};
+
 // lib/index.ts
 var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
   const db = cju2(circuitJson);
@@ -1767,6 +1988,9 @@ var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
   for (const hole of db.pcb_hole.list()) {
     addPcbHole(hole, ctx);
   }
+  for (const cutout of db.pcb_cutout.list()) {
+    addPcbCutout(cutout, ctx);
+  }
   if (ctx.includeCopper) {
     for (const net of Object.keys(connMap.netMap)) {
       const netGeoms = ctx.netGeoms.get(net);
@@ -1787,7 +2011,7 @@ var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
       for (const island of union.splitToIslands()) {
         const { verts, prims } = polygonToShapePathData(island);
         project.children.push(
-          new ShapePath21({
+          new ShapePath25({
             cutIndex: copperCutSetting.index,
             verts,
             prims,

package/lib/element-handlers/addPcbCutout/addCirclePcbCutout.ts

@@ -0,0 +1,52 @@
+import type { PcbCutoutCircle } from "circuit-json"
+import type { ConvertContext } from "../../ConvertContext"
+import { ShapePath } from "lbrnts"
+import { createCirclePath } from "../../helpers/circleShape"
+
+/**
+ * Adds a circular PCB cutout to the project
+ * Cutouts are regions removed from the board entirely
+ */
+export const addCirclePcbCutout = (
+  cutout: PcbCutoutCircle,
+  ctx: ConvertContext,
+): void => {
+  const {
+    project,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    soldermaskMargin,
+    soldermaskCutSetting,
+  } = ctx
+  const centerX = cutout.center.x + origin.x
+  const centerY = cutout.center.y + origin.y
+
+  // Add the cutout - cut through the board
+  if (cutout.radius > 0 && includeCopper) {
+    const circlePath = createCirclePath(centerX, centerY, cutout.radius)
+    project.children.push(
+      new ShapePath({
+        cutIndex: throughBoardCutSetting.index,
+        verts: circlePath.verts,
+        prims: circlePath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+
+  // Add soldermask opening if drawing soldermask
+  if (cutout.radius > 0 && includeSoldermask) {
+    const smRadius = cutout.radius + soldermaskMargin
+    const outer = createCirclePath(centerX, centerY, smRadius)
+    project.children.push(
+      new ShapePath({
+        cutIndex: soldermaskCutSetting.index,
+        verts: outer.verts,
+        prims: outer.prims,
+        isClosed: true,
+      }),
+    )
+  }
+}

package/lib/element-handlers/addPcbCutout/addPathPcbCutout.ts

@@ -0,0 +1,73 @@
+import type { PcbCutoutPath } from "circuit-json"
+import type { ConvertContext } from "../../ConvertContext"
+import { ShapePath } from "lbrnts"
+
+/**
+ * Adds a path-based PCB cutout to the project
+ * Path cutouts create slots along a route (e.g., for routed slots or complex cutout paths)
+ */
+export const addPathPcbCutout = (
+  cutout: PcbCutoutPath,
+  ctx: ConvertContext,
+): void => {
+  const {
+    project,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    soldermaskMargin,
+    soldermaskCutSetting,
+  } = ctx
+
+  // For path cutouts, we need to create a stroke along the route with the given width
+  // For simplicity, we'll convert the path to a polyline
+  if (cutout.route.length >= 2 && includeCopper) {
+    const verts: { x: number; y: number }[] = []
+    const prims: { type: number }[] = []
+
+    for (const point of cutout.route) {
+      verts.push({
+        x: point.x + origin.x,
+        y: point.y + origin.y,
+      })
+      prims.push({ type: 0 })
+    }
+
+    // Note: slot_width, slot_length, space_between_slots, and slot_corner_radius
+    // would require more complex path offsetting and aren't currently implemented
+    // For now, we just create a simple path along the route
+    project.children.push(
+      new ShapePath({
+        cutIndex: throughBoardCutSetting.index,
+        verts,
+        prims,
+        isClosed: false, // Paths are typically not closed
+      }),
+    )
+  }
+
+  // Add soldermask opening if drawing soldermask
+  if (cutout.route.length >= 2 && includeSoldermask) {
+    const verts: { x: number; y: number }[] = []
+    const prims: { type: number }[] = []
+
+    // Create path with soldermask margin
+    for (const point of cutout.route) {
+      verts.push({
+        x: point.x + origin.x,
+        y: point.y + origin.y,
+      })
+      prims.push({ type: 0 })
+    }
+
+    project.children.push(
+      new ShapePath({
+        cutIndex: soldermaskCutSetting.index,
+        verts,
+        prims,
+        isClosed: false, // Match the same path as the copper cutout
+      }),
+    )
+  }
+}

package/lib/element-handlers/addPcbCutout/addPolygonPcbCutout.ts

@@ -0,0 +1,68 @@
+import type { PcbCutoutPolygon } from "circuit-json"
+import type { ConvertContext } from "../../ConvertContext"
+import { ShapePath } from "lbrnts"
+import { createPolygonPathFromOutline } from "../../helpers/polygonShape"
+
+/**
+ * Adds a polygon PCB cutout to the project
+ * Cutouts are regions removed from the board entirely
+ */
+export const addPolygonPcbCutout = (
+  cutout: PcbCutoutPolygon,
+  ctx: ConvertContext,
+): void => {
+  const {
+    project,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    soldermaskCutSetting,
+    soldermaskMargin,
+  } = ctx
+
+  // Add the cutout - cut through the board
+  if (cutout.points.length >= 3 && includeCopper) {
+    const polygonPath = createPolygonPathFromOutline(
+      cutout.points,
+      origin.x,
+      origin.y,
+    )
+    project.children.push(
+      new ShapePath({
+        cutIndex: throughBoardCutSetting.index,
+        verts: polygonPath.verts,
+        prims: polygonPath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+
+  // Add soldermask opening if drawing soldermask
+  if (cutout.points.length >= 3 && includeSoldermask) {
+    // Apply soldermask margin to the points if margin is specified
+    const points =
+      soldermaskMargin && soldermaskMargin > 0
+        ? cutout.points.map((p) => ({
+            x:
+              (p.x ?? 0) + (p.x ?? 0) > 0
+                ? soldermaskMargin
+                : -soldermaskMargin,
+            y:
+              (p.y ?? 0) + (p.y ?? 0) > 0
+                ? soldermaskMargin
+                : -soldermaskMargin,
+          }))
+        : cutout.points
+
+    const polygonPath = createPolygonPathFromOutline(points, origin.x, origin.y)
+    project.children.push(
+      new ShapePath({
+        cutIndex: soldermaskCutSetting.index,
+        verts: polygonPath.verts,
+        prims: polygonPath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+}

package/lib/element-handlers/addPcbCutout/addRectPcbCutout.ts

@@ -0,0 +1,71 @@
+import type { PcbCutoutRect } from "circuit-json"
+import type { ConvertContext } from "../../ConvertContext"
+import { ShapePath } from "lbrnts"
+import { createRoundedRectPath } from "../../helpers/roundedRectShape"
+
+/**
+ * Adds a rectangular PCB cutout to the project
+ * Cutouts are regions removed from the board entirely
+ */
+export const addRectPcbCutout = (
+  cutout: PcbCutoutRect,
+  ctx: ConvertContext,
+): void => {
+  const {
+    project,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    soldermaskMargin,
+    soldermaskCutSetting,
+  } = ctx
+  const centerX = cutout.center.x + origin.x
+  const centerY = cutout.center.y + origin.y
+
+  // Add the cutout - cut through the board
+  if (cutout.width > 0 && cutout.height > 0 && includeCopper) {
+    const rotation = (cutout.rotation ?? 0) * (Math.PI / 180) // Convert degrees to radians
+    const rectPath = createRoundedRectPath(
+      centerX,
+      centerY,
+      cutout.width,
+      cutout.height,
+      0, // no border radius for cutouts
+      4, // segments
+      rotation,
+    )
+    project.children.push(
+      new ShapePath({
+        cutIndex: throughBoardCutSetting.index,
+        verts: rectPath.verts,
+        prims: rectPath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+
+  // Add soldermask opening if drawing soldermask
+  if (cutout.width > 0 && cutout.height > 0 && includeSoldermask) {
+    const rotation = (cutout.rotation ?? 0) * (Math.PI / 180) // Convert degrees to radians
+    const smWidth = cutout.width + 2 * soldermaskMargin
+    const smHeight = cutout.height + 2 * soldermaskMargin
+    const rectPath = createRoundedRectPath(
+      centerX,
+      centerY,
+      smWidth,
+      smHeight,
+      0, // no border radius for cutouts
+      4, // segments
+      rotation,
+    )
+    project.children.push(
+      new ShapePath({
+        cutIndex: soldermaskCutSetting.index,
+        verts: rectPath.verts,
+        prims: rectPath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+}