circuit-json-to-lbrn 0.0.15 → 0.0.17

package/dist/index.js

@@ -1,5 +1,5 @@
 // lib/index.ts
-import { LightBurnProject, CutSetting, ShapePath as ShapePath15 } from "lbrnts";
+import { LightBurnProject, CutSetting, ShapePath as ShapePath21 } from "lbrnts";
 import { cju as cju2 } from "@tscircuit/circuit-json-util";
 
 // lib/element-handlers/addPlatedHole/addCirclePlatedHole.ts
@@ -602,9 +602,9 @@ import { ShapePath as ShapePath6 } from "lbrnts";
 // lib/helpers/polygonShape.ts
 var createPolygonPathFromOutline = (outline, offsetX, offsetY) => {
   const verts = [];
-  for (const point5 of outline) {
-    const x = (point5.x ?? 0) + offsetX;
-    const y = (point5.y ?? 0) + offsetY;
+  for (const point6 of outline) {
+    const x = (point6.x ?? 0) + offsetX;
+    const y = (point6.y ?? 0) + offsetY;
     verts.push({ x, y });
   }
   if (verts.length === 0) {
@@ -1207,7 +1207,7 @@ var addPcbTrace = (trace, ctx) => {
     return;
   }
   const { route } = trace;
-  const traceWidth = route.find((point5) => point5.route_type === "wire")?.width ?? 0.15;
+  const traceWidth = route.find((point6) => point6.route_type === "wire")?.width ?? 0.15;
   const polygons = [];
   for (const routePoint of route) {
     const circle = new Flatten2.Circle(
@@ -1341,14 +1341,14 @@ var calculateCircuitBounds = (circuitJson) => {
     }
   }
   for (const trace of db.pcb_trace.list()) {
-    const isWidthPoint = (point5) => "width" in point5 && typeof point5.width === "number";
+    const isWidthPoint = (point6) => "width" in point6 && typeof point6.width === "number";
     const halfWidth = trace.route_thickness_mode === "interpolated" ? 0 : (trace.route.find(isWidthPoint)?.width ?? 0) / 2;
-    for (const point5 of trace.route) {
-      const pointWidth = trace.route_thickness_mode === "interpolated" ? isWidthPoint(point5) ? point5.width / 2 : 0 : halfWidth;
-      minX = Math.min(minX, point5.x - pointWidth);
-      minY = Math.min(minY, point5.y - pointWidth);
-      maxX = Math.max(maxX, point5.x + pointWidth);
-      maxY = Math.max(maxY, point5.y + pointWidth);
+    for (const point6 of trace.route) {
+      const pointWidth = trace.route_thickness_mode === "interpolated" ? isWidthPoint(point6) ? point6.width / 2 : 0 : halfWidth;
+      minX = Math.min(minX, point6.x - pointWidth);
+      minY = Math.min(minY, point6.y - pointWidth);
+      maxX = Math.max(maxX, point6.x + pointWidth);
+      maxY = Math.max(maxY, point6.y + pointWidth);
     }
   }
   for (const hole of db.pcb_plated_hole.list()) {
@@ -1372,6 +1372,324 @@ var calculateOriginFromBounds = (bounds, margin) => {
   return { x: originX, y: originY };
 };
 
+// lib/element-handlers/addPcbVia/index.ts
+import { ShapePath as ShapePath15 } from "lbrnts";
+import { Circle as Circle3, point as point5 } from "@flatten-js/core";
+var addPcbVia = (via, ctx) => {
+  const {
+    db,
+    project,
+    copperCutSetting,
+    soldermaskCutSetting,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    connMap,
+    soldermaskMargin
+  } = ctx;
+  const centerX = via.x + origin.x;
+  const centerY = via.y + origin.y;
+  if (via.outer_diameter > 0 && includeCopper) {
+    const viaPort = db.pcb_port.list().find((port) => port.x === via.x && port.y === via.y);
+    const netId = viaPort ? connMap.getNetConnectedToId(viaPort.pcb_port_id) : void 0;
+    const outerRadius = via.outer_diameter / 2;
+    const circle = new Circle3(point5(centerX, centerY), outerRadius);
+    const polygon = circleToPolygon(circle);
+    if (netId) {
+      ctx.netGeoms.get(netId)?.push(polygon);
+    } else {
+      const outer = createCirclePath(centerX, centerY, outerRadius);
+      project.children.push(
+        new ShapePath15({
+          cutIndex: copperCutSetting.index,
+          verts: outer.verts,
+          prims: outer.prims,
+          isClosed: true
+        })
+      );
+    }
+  }
+  if (via.outer_diameter > 0 && includeSoldermask) {
+    const smRadius = via.outer_diameter / 2 + soldermaskMargin;
+    const outer = createCirclePath(centerX, centerY, smRadius);
+    project.children.push(
+      new ShapePath15({
+        cutIndex: soldermaskCutSetting.index,
+        verts: outer.verts,
+        prims: outer.prims,
+        isClosed: true
+      })
+    );
+  }
+  if (via.hole_diameter > 0) {
+    const innerRadius = via.hole_diameter / 2;
+    const inner = createCirclePath(centerX, centerY, innerRadius);
+    project.children.push(
+      new ShapePath15({
+        cutIndex: throughBoardCutSetting.index,
+        verts: inner.verts,
+        prims: inner.prims,
+        isClosed: true
+      })
+    );
+  }
+};
+
+// lib/element-handlers/addPcbHole/addCirclePcbHole.ts
+import { ShapePath as ShapePath16 } from "lbrnts";
+var addCirclePcbHole = (hole, ctx) => {
+  const {
+    project,
+    throughBoardCutSetting,
+    soldermaskCutSetting,
+    origin,
+    includeSoldermask,
+    soldermaskMargin
+  } = ctx;
+  const centerX = hole.x + origin.x;
+  const centerY = hole.y + origin.y;
+  if (hole.hole_diameter > 0 && includeSoldermask) {
+    const smRadius = hole.hole_diameter / 2 + soldermaskMargin;
+    const soldermaskPath = createCirclePath(centerX, centerY, smRadius);
+    project.children.push(
+      new ShapePath16({
+        cutIndex: soldermaskCutSetting.index,
+        verts: soldermaskPath.verts,
+        prims: soldermaskPath.prims,
+        isClosed: true
+      })
+    );
+  }
+  if (hole.hole_diameter > 0) {
+    const radius = hole.hole_diameter / 2;
+    const circlePath = createCirclePath(centerX, centerY, radius);
+    project.children.push(
+      new ShapePath16({
+        cutIndex: throughBoardCutSetting.index,
+        verts: circlePath.verts,
+        prims: circlePath.prims,
+        isClosed: true
+      })
+    );
+  }
+};
+
+// lib/element-handlers/addPcbHole/addRectPcbHole.ts
+import { ShapePath as ShapePath17 } from "lbrnts";
+var addRectPcbHole = (hole, ctx) => {
+  const {
+    project,
+    throughBoardCutSetting,
+    soldermaskCutSetting,
+    origin,
+    includeSoldermask,
+    soldermaskMargin
+  } = ctx;
+  const centerX = hole.x + origin.x;
+  const centerY = hole.y + origin.y;
+  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
+    const soldermaskPath = createRoundedRectPath(
+      centerX,
+      centerY,
+      hole.hole_width + soldermaskMargin * 2,
+      hole.hole_height + soldermaskMargin * 2,
+      0
+      // no border radius for rect holes
+    );
+    project.children.push(
+      new ShapePath17({
+        cutIndex: soldermaskCutSetting.index,
+        verts: soldermaskPath.verts,
+        prims: soldermaskPath.prims,
+        isClosed: true
+      })
+    );
+  }
+  if (hole.hole_width > 0 && hole.hole_height > 0) {
+    const rectPath = createRoundedRectPath(
+      centerX,
+      centerY,
+      hole.hole_width,
+      hole.hole_height,
+      0
+      // no border radius for rect holes
+    );
+    project.children.push(
+      new ShapePath17({
+        cutIndex: throughBoardCutSetting.index,
+        verts: rectPath.verts,
+        prims: rectPath.prims,
+        isClosed: true
+      })
+    );
+  }
+};
+
+// lib/element-handlers/addPcbHole/addOvalPcbHole.ts
+import { ShapePath as ShapePath18 } from "lbrnts";
+var addOvalPcbHole = (hole, ctx) => {
+  const {
+    project,
+    throughBoardCutSetting,
+    soldermaskCutSetting,
+    origin,
+    includeSoldermask,
+    soldermaskMargin
+  } = ctx;
+  const centerX = hole.x + origin.x;
+  const centerY = hole.y + origin.y;
+  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
+    const soldermaskPath = createOvalPath(
+      centerX,
+      centerY,
+      hole.hole_width + soldermaskMargin * 2,
+      hole.hole_height + soldermaskMargin * 2
+    );
+    project.children.push(
+      new ShapePath18({
+        cutIndex: soldermaskCutSetting.index,
+        verts: soldermaskPath.verts,
+        prims: soldermaskPath.prims,
+        isClosed: true
+      })
+    );
+  }
+  if (hole.hole_width > 0 && hole.hole_height > 0) {
+    const ovalPath = createOvalPath(
+      centerX,
+      centerY,
+      hole.hole_width,
+      hole.hole_height
+    );
+    project.children.push(
+      new ShapePath18({
+        cutIndex: throughBoardCutSetting.index,
+        verts: ovalPath.verts,
+        prims: ovalPath.prims,
+        isClosed: true
+      })
+    );
+  }
+};
+
+// lib/element-handlers/addPcbHole/addPillPcbHole.ts
+import { ShapePath as ShapePath19 } from "lbrnts";
+var addPillPcbHole = (hole, ctx) => {
+  const {
+    project,
+    throughBoardCutSetting,
+    soldermaskCutSetting,
+    origin,
+    includeSoldermask,
+    soldermaskMargin
+  } = ctx;
+  const centerX = hole.x + origin.x;
+  const centerY = hole.y + origin.y;
+  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
+    const soldermaskPath = createPillPath(
+      centerX,
+      centerY,
+      hole.hole_width + soldermaskMargin * 2,
+      hole.hole_height + soldermaskMargin * 2
+    );
+    project.children.push(
+      new ShapePath19({
+        cutIndex: soldermaskCutSetting.index,
+        verts: soldermaskPath.verts,
+        prims: soldermaskPath.prims,
+        isClosed: true
+      })
+    );
+  }
+  if (hole.hole_width > 0 && hole.hole_height > 0) {
+    const pillPath = createPillPath(
+      centerX,
+      centerY,
+      hole.hole_width,
+      hole.hole_height
+    );
+    project.children.push(
+      new ShapePath19({
+        cutIndex: throughBoardCutSetting.index,
+        verts: pillPath.verts,
+        prims: pillPath.prims,
+        isClosed: true
+      })
+    );
+  }
+};
+
+// lib/element-handlers/addPcbHole/addRotatedPillPcbHole.ts
+import { ShapePath as ShapePath20 } from "lbrnts";
+var addRotatedPillPcbHole = (hole, ctx) => {
+  const {
+    project,
+    throughBoardCutSetting,
+    soldermaskCutSetting,
+    origin,
+    includeSoldermask,
+    soldermaskMargin
+  } = ctx;
+  const centerX = hole.x + origin.x;
+  const centerY = hole.y + origin.y;
+  const rotation = (hole.ccw_rotation || 0) * (Math.PI / 180);
+  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
+    const soldermaskPath = createPillPath(
+      centerX,
+      centerY,
+      hole.hole_width + soldermaskMargin * 2,
+      hole.hole_height + soldermaskMargin * 2,
+      rotation
+    );
+    project.children.push(
+      new ShapePath20({
+        cutIndex: soldermaskCutSetting.index,
+        verts: soldermaskPath.verts,
+        prims: soldermaskPath.prims,
+        isClosed: true
+      })
+    );
+  }
+  if (hole.hole_width > 0 && hole.hole_height > 0) {
+    const pillPath = createPillPath(
+      centerX,
+      centerY,
+      hole.hole_width,
+      hole.hole_height,
+      rotation
+    );
+    project.children.push(
+      new ShapePath20({
+        cutIndex: throughBoardCutSetting.index,
+        verts: pillPath.verts,
+        prims: pillPath.prims,
+        isClosed: true
+      })
+    );
+  }
+};
+
+// lib/element-handlers/addPcbHole/index.ts
+var addPcbHole = (hole, ctx) => {
+  switch (hole.hole_shape) {
+    case "circle":
+    case "square":
+      return addCirclePcbHole(hole, ctx);
+    case "rect":
+      return addRectPcbHole(hole, ctx);
+    case "oval":
+      return addOvalPcbHole(hole, ctx);
+    case "pill":
+      return addPillPcbHole(hole, ctx);
+    case "rotated_pill":
+      return addRotatedPillPcbHole(hole, ctx);
+    default:
+      const _exhaustive = hole;
+      console.warn(`Unknown hole shape: ${hole.hole_shape}`);
+  }
+};
+
 // lib/index.ts
 var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
   const db = cju2(circuitJson);
@@ -1443,6 +1761,12 @@ var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
   for (const board of db.pcb_board.list()) {
     addPcbBoard(board, ctx);
   }
+  for (const via of db.pcb_via.list()) {
+    addPcbVia(via, ctx);
+  }
+  for (const hole of db.pcb_hole.list()) {
+    addPcbHole(hole, ctx);
+  }
   if (ctx.includeCopper) {
     for (const net of Object.keys(connMap.netMap)) {
       const netGeoms = ctx.netGeoms.get(net);
@@ -1463,7 +1787,7 @@ var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
       for (const island of union.splitToIslands()) {
         const { verts, prims } = polygonToShapePathData(island);
         project.children.push(
-          new ShapePath15({
+          new ShapePath21({
             cutIndex: copperCutSetting.index,
             verts,
             prims,

package/lib/element-handlers/addPcbHole/addCirclePcbHole.ts

@@ -0,0 +1,51 @@
+import type { PcbHoleCircle, PcbHoleCircleOrSquare } from "circuit-json"
+import type { ConvertContext } from "../../ConvertContext"
+import { ShapePath } from "lbrnts"
+import { createCirclePath } from "../../helpers/circleShape"
+
+/**
+ * Adds a circular PCB hole (non-plated) to the project
+ */
+export const addCirclePcbHole = (
+  hole: PcbHoleCircle | PcbHoleCircleOrSquare,
+  ctx: ConvertContext,
+): void => {
+  const {
+    project,
+    throughBoardCutSetting,
+    soldermaskCutSetting,
+    origin,
+    includeSoldermask,
+    soldermaskMargin,
+  } = ctx
+  const centerX = hole.x + origin.x
+  const centerY = hole.y + origin.y
+
+  // Add soldermask opening if drawing soldermask
+  if (hole.hole_diameter > 0 && includeSoldermask) {
+    const smRadius = hole.hole_diameter / 2 + soldermaskMargin
+    const soldermaskPath = createCirclePath(centerX, centerY, smRadius)
+    project.children.push(
+      new ShapePath({
+        cutIndex: soldermaskCutSetting.index,
+        verts: soldermaskPath.verts,
+        prims: soldermaskPath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+
+  // Add the hole - cut through the board
+  if (hole.hole_diameter > 0) {
+    const radius = hole.hole_diameter / 2
+    const circlePath = createCirclePath(centerX, centerY, radius)
+    project.children.push(
+      new ShapePath({
+        cutIndex: throughBoardCutSetting.index,
+        verts: circlePath.verts,
+        prims: circlePath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+}

package/lib/element-handlers/addPcbHole/addOvalPcbHole.ts

@@ -0,0 +1,59 @@
+import type { PcbHoleOval } from "circuit-json"
+import type { ConvertContext } from "../../ConvertContext"
+import { ShapePath } from "lbrnts"
+import { createOvalPath } from "../../helpers/ovalShape"
+
+/**
+ * Adds an oval PCB hole (non-plated) to the project
+ */
+export const addOvalPcbHole = (
+  hole: PcbHoleOval,
+  ctx: ConvertContext,
+): void => {
+  const {
+    project,
+    throughBoardCutSetting,
+    soldermaskCutSetting,
+    origin,
+    includeSoldermask,
+    soldermaskMargin,
+  } = ctx
+  const centerX = hole.x + origin.x
+  const centerY = hole.y + origin.y
+
+  // Add soldermask opening if drawing soldermask
+  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
+    const soldermaskPath = createOvalPath(
+      centerX,
+      centerY,
+      hole.hole_width + soldermaskMargin * 2,
+      hole.hole_height + soldermaskMargin * 2,
+    )
+    project.children.push(
+      new ShapePath({
+        cutIndex: soldermaskCutSetting.index,
+        verts: soldermaskPath.verts,
+        prims: soldermaskPath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+
+  // Add the hole - cut through the board
+  if (hole.hole_width > 0 && hole.hole_height > 0) {
+    const ovalPath = createOvalPath(
+      centerX,
+      centerY,
+      hole.hole_width,
+      hole.hole_height,
+    )
+    project.children.push(
+      new ShapePath({
+        cutIndex: throughBoardCutSetting.index,
+        verts: ovalPath.verts,
+        prims: ovalPath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+}

package/lib/element-handlers/addPcbHole/addPillPcbHole.ts

@@ -0,0 +1,59 @@
+import type { PcbHolePill } from "circuit-json"
+import type { ConvertContext } from "../../ConvertContext"
+import { ShapePath } from "lbrnts"
+import { createPillPath } from "../../helpers/pillShape"
+
+/**
+ * Adds a pill-shaped PCB hole (non-plated) to the project
+ */
+export const addPillPcbHole = (
+  hole: PcbHolePill,
+  ctx: ConvertContext,
+): void => {
+  const {
+    project,
+    throughBoardCutSetting,
+    soldermaskCutSetting,
+    origin,
+    includeSoldermask,
+    soldermaskMargin,
+  } = ctx
+  const centerX = hole.x + origin.x
+  const centerY = hole.y + origin.y
+
+  // Add soldermask opening if drawing soldermask
+  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
+    const soldermaskPath = createPillPath(
+      centerX,
+      centerY,
+      hole.hole_width + soldermaskMargin * 2,
+      hole.hole_height + soldermaskMargin * 2,
+    )
+    project.children.push(
+      new ShapePath({
+        cutIndex: soldermaskCutSetting.index,
+        verts: soldermaskPath.verts,
+        prims: soldermaskPath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+
+  // Add the hole - cut through the board
+  if (hole.hole_width > 0 && hole.hole_height > 0) {
+    const pillPath = createPillPath(
+      centerX,
+      centerY,
+      hole.hole_width,
+      hole.hole_height,
+    )
+    project.children.push(
+      new ShapePath({
+        cutIndex: throughBoardCutSetting.index,
+        verts: pillPath.verts,
+        prims: pillPath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+}

package/lib/element-handlers/addPcbHole/addRectPcbHole.ts

@@ -0,0 +1,61 @@
+import type { PcbHoleRect } from "circuit-json"
+import type { ConvertContext } from "../../ConvertContext"
+import { ShapePath } from "lbrnts"
+import { createRoundedRectPath } from "../../helpers/roundedRectShape"
+
+/**
+ * Adds a rectangular PCB hole (non-plated) to the project
+ */
+export const addRectPcbHole = (
+  hole: PcbHoleRect,
+  ctx: ConvertContext,
+): void => {
+  const {
+    project,
+    throughBoardCutSetting,
+    soldermaskCutSetting,
+    origin,
+    includeSoldermask,
+    soldermaskMargin,
+  } = ctx
+  const centerX = hole.x + origin.x
+  const centerY = hole.y + origin.y
+
+  // Add soldermask opening if drawing soldermask
+  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
+    const soldermaskPath = createRoundedRectPath(
+      centerX,
+      centerY,
+      hole.hole_width + soldermaskMargin * 2,
+      hole.hole_height + soldermaskMargin * 2,
+      0, // no border radius for rect holes
+    )
+    project.children.push(
+      new ShapePath({
+        cutIndex: soldermaskCutSetting.index,
+        verts: soldermaskPath.verts,
+        prims: soldermaskPath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+
+  // Add the hole - cut through the board
+  if (hole.hole_width > 0 && hole.hole_height > 0) {
+    const rectPath = createRoundedRectPath(
+      centerX,
+      centerY,
+      hole.hole_width,
+      hole.hole_height,
+      0, // no border radius for rect holes
+    )
+    project.children.push(
+      new ShapePath({
+        cutIndex: throughBoardCutSetting.index,
+        verts: rectPath.verts,
+        prims: rectPath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+}

package/lib/element-handlers/addPcbHole/addRotatedPillPcbHole.ts

@@ -0,0 +1,62 @@
+import type { PcbHoleRotatedPill } from "circuit-json"
+import type { ConvertContext } from "../../ConvertContext"
+import { ShapePath } from "lbrnts"
+import { createPillPath } from "../../helpers/pillShape"
+
+/**
+ * Adds a rotated pill-shaped PCB hole (non-plated) to the project
+ */
+export const addRotatedPillPcbHole = (
+  hole: PcbHoleRotatedPill,
+  ctx: ConvertContext,
+): void => {
+  const {
+    project,
+    throughBoardCutSetting,
+    soldermaskCutSetting,
+    origin,
+    includeSoldermask,
+    soldermaskMargin,
+  } = ctx
+  const centerX = hole.x + origin.x
+  const centerY = hole.y + origin.y
+  const rotation = (hole.ccw_rotation || 0) * (Math.PI / 180) // Convert degrees to radians
+
+  // Add soldermask opening if drawing soldermask
+  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
+    const soldermaskPath = createPillPath(
+      centerX,
+      centerY,
+      hole.hole_width + soldermaskMargin * 2,
+      hole.hole_height + soldermaskMargin * 2,
+      rotation,
+    )
+    project.children.push(
+      new ShapePath({
+        cutIndex: soldermaskCutSetting.index,
+        verts: soldermaskPath.verts,
+        prims: soldermaskPath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+
+  // Add the hole - cut through the board
+  if (hole.hole_width > 0 && hole.hole_height > 0) {
+    const pillPath = createPillPath(
+      centerX,
+      centerY,
+      hole.hole_width,
+      hole.hole_height,
+      rotation,
+    )
+    project.children.push(
+      new ShapePath({
+        cutIndex: throughBoardCutSetting.index,
+        verts: pillPath.verts,
+        prims: pillPath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+}