circuit-json-to-lbrn 0.0.9 → 0.0.11

package/lib/ConvertContext.ts

@@ -1,6 +1,6 @@
 import type { CircuitJsonUtilObjects } from "@tscircuit/circuit-json-util"
 import type { CutSetting, LightBurnProject } from "lbrnts"
-import type { AnyShape, Box, Polygon } from "@flatten-js/core"
+import type { Box, Polygon } from "@flatten-js/core"
 import type { ConnectivityMap } from "circuit-json-to-connectivity-map"
 
 export type ConnectivityMapKey = string
@@ -11,10 +11,15 @@ export interface ConvertContext {
 
   copperCutSetting: CutSetting
   throughBoardCutSetting: CutSetting
+  soldermaskCutSetting: CutSetting
 
   connMap: ConnectivityMap
 
   netGeoms: Map<ConnectivityMapKey, Array<Polygon | Box>>
 
   origin: { x: number; y: number }
+
+  // Include flags
+  includeCopper: boolean
+  includeSoldermask: boolean
 }

package/lib/element-handlers/addPcbBoard/index.ts

@@ -5,7 +5,14 @@ import type { ConvertContext } from "../../ConvertContext"
 import { polygonToShapePathData } from "../../polygon-to-shape-path"
 
 export const addPcbBoard = (board: PcbBoard, ctx: ConvertContext) => {
-  const { origin, project, throughBoardCutSetting } = ctx
+  const {
+    origin,
+    project,
+    throughBoardCutSetting,
+    soldermaskCutSetting,
+    includeCopper,
+    includeSoldermask,
+  } = ctx
 
   let polygon: Polygon | null = null
 
@@ -39,12 +46,24 @@ export const addPcbBoard = (board: PcbBoard, ctx: ConvertContext) => {
 
   const { verts, prims } = polygonToShapePathData(polygon)
 
-  project.children.push(
-    new ShapePath({
-      cutIndex: throughBoardCutSetting.index,
-      verts,
-      prims,
-      isClosed: true,
-    }),
-  )
+  if (includeCopper) {
+    project.children.push(
+      new ShapePath({
+        cutIndex: throughBoardCutSetting.index,
+        verts,
+        prims,
+        isClosed: true,
+      }),
+    )
+  }
+  if (includeSoldermask) {
+    project.children.push(
+      new ShapePath({
+        cutIndex: soldermaskCutSetting.index,
+        verts,
+        prims,
+        isClosed: true,
+      }),
+    )
+  }
 }

package/lib/element-handlers/addPcbTrace/index.ts

@@ -4,7 +4,13 @@ import Flatten, { BooleanOperations } from "@flatten-js/core"
 import { circleToPolygon } from "./circle-to-polygon"
 
 export const addPcbTrace = (trace: PcbTrace, ctx: ConvertContext) => {
-  const { netGeoms, connMap, origin } = ctx
+  const { netGeoms, connMap, origin, includeCopper, includeSoldermask } = ctx
+
+  // Only include traces when including copper
+  // Traces are NOT included in soldermask-only mode to prevent accidental bridging
+  if (!includeCopper) {
+    return
+  }
 
   const netId = connMap.getNetConnectedToId(
     trace.source_trace_id ?? trace.pcb_trace_id,

package/lib/element-handlers/addPlatedHole/addCirclePlatedHole.ts

@@ -2,22 +2,57 @@ import type { PcbPlatedHoleCircle } from "circuit-json"
 import type { ConvertContext } from "../../ConvertContext"
 import { ShapePath } from "lbrnts"
 import { createCirclePath } from "../../helpers/circleShape"
+import { Circle, point } from "@flatten-js/core"
+import { circleToPolygon } from "../addPcbTrace/circle-to-polygon"
 
 export const addCirclePlatedHole = (
   platedHole: PcbPlatedHoleCircle,
   ctx: ConvertContext,
 ): void => {
-  const { project, copperCutSetting, throughBoardCutSetting, origin } = ctx
+  const {
+    project,
+    copperCutSetting,
+    soldermaskCutSetting,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    connMap,
+  } = ctx
   const centerX = platedHole.x + origin.x
   const centerY = platedHole.y + origin.y
 
-  // Add outer circle (copper annulus)
-  if (platedHole.outer_diameter > 0) {
+  // Add outer circle (copper annulus) if drawing copper - add to netGeoms for merging
+  if (platedHole.outer_diameter > 0 && includeCopper) {
+    const netId = connMap.getNetConnectedToId(platedHole.pcb_plated_hole_id)
+    const outerRadius = platedHole.outer_diameter / 2
+    const circle = new Circle(point(centerX, centerY), outerRadius)
+    const polygon = circleToPolygon(circle)
+
+    if (netId) {
+      // Add to netGeoms to be merged with other elements on the same net
+      ctx.netGeoms.get(netId)?.push(polygon)
+    } else {
+      // No net connection - draw directly
+      const outer = createCirclePath(centerX, centerY, outerRadius)
+      project.children.push(
+        new ShapePath({
+          cutIndex: copperCutSetting.index,
+          verts: outer.verts,
+          prims: outer.prims,
+          isClosed: true,
+        }),
+      )
+    }
+  }
+
+  // Add soldermask opening if drawing soldermask
+  if (platedHole.outer_diameter > 0 && includeSoldermask) {
     const outerRadius = platedHole.outer_diameter / 2
     const outer = createCirclePath(centerX, centerY, outerRadius)
     project.children.push(
       new ShapePath({
-        cutIndex: copperCutSetting.index,
+        cutIndex: soldermaskCutSetting.index,
         verts: outer.verts,
         prims: outer.prims,
         isClosed: true,
@@ -25,7 +60,7 @@ export const addCirclePlatedHole = (
     )
   }
 
-  // Add inner circle (hole)
+  // Add inner circle (hole) - always cut through the board regardless of mode
   if (platedHole.hole_diameter > 0) {
     const innerRadius = platedHole.hole_diameter / 2
     const inner = createCirclePath(centerX, centerY, innerRadius)

package/lib/element-handlers/addPlatedHole/addCircularHoleWithRectPad.ts

@@ -8,7 +8,15 @@ export const addCircularHoleWithRectPad = (
   platedHole: PcbHoleCircularWithRectPad,
   ctx: ConvertContext,
 ): void => {
-  const { project, copperCutSetting, throughBoardCutSetting, origin } = ctx
+  const {
+    project,
+    copperCutSetting,
+    soldermaskCutSetting,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+  } = ctx
   const centerX = platedHole.x + origin.x
   const centerY = platedHole.y + origin.y
   const holeRadius = platedHole.hole_diameter / 2
@@ -25,17 +33,31 @@ export const addCircularHoleWithRectPad = (
     borderRadius,
   )
 
-  // Add the rectangular pad
-  project.children.push(
-    new ShapePath({
-      cutIndex: copperCutSetting.index,
-      verts: padPath.verts,
-      prims: padPath.prims,
-      isClosed: true,
-    }),
-  )
+  // Add the rectangular pad if drawing copper
+  if (includeCopper) {
+    project.children.push(
+      new ShapePath({
+        cutIndex: copperCutSetting.index,
+        verts: padPath.verts,
+        prims: padPath.prims,
+        isClosed: true,
+      }),
+    )
+  }
+
+  // Add soldermask opening if drawing soldermask
+  if (includeSoldermask) {
+    project.children.push(
+      new ShapePath({
+        cutIndex: soldermaskCutSetting.index,
+        verts: padPath.verts,
+        prims: padPath.prims,
+        isClosed: true,
+      }),
+    )
+  }
 
-  // Add the circular hole (as a cutout)
+  // Add the circular hole (as a cutout) - always cut through the board regardless of mode
   if (holeRadius > 0) {
     const holeCenterX = centerX + platedHole.hole_offset_x
     const holeCenterY = centerY + platedHole.hole_offset_y

package/lib/element-handlers/addPlatedHole/addHoleWithPolygonPad.ts

@@ -8,7 +8,15 @@ export const addHoleWithPolygonPad = (
   platedHole: PcbHoleWithPolygonPad,
   ctx: ConvertContext,
 ): void => {
-  const { project, copperCutSetting, throughBoardCutSetting, origin } = ctx
+  const {
+    project,
+    copperCutSetting,
+    soldermaskCutSetting,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+  } = ctx
 
   // Create the polygon pad
   if (platedHole.pad_outline.length >= 3) {
@@ -18,14 +26,29 @@ export const addHoleWithPolygonPad = (
       platedHole.y + origin.y,
     )
 
-    project.children.push(
-      new ShapePath({
-        cutIndex: copperCutSetting.index,
-        verts: pad.verts,
-        prims: pad.prims,
-        isClosed: true,
-      }),
-    )
+    // Add the polygon pad if drawing copper
+    if (includeCopper) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: copperCutSetting.index,
+          verts: pad.verts,
+          prims: pad.prims,
+          isClosed: true,
+        }),
+      )
+    }
+
+    // Add soldermask opening if drawing soldermask
+    if (includeSoldermask) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: soldermaskCutSetting.index,
+          verts: pad.verts,
+          prims: pad.prims,
+          isClosed: true,
+        }),
+      )
+    }
   }
 
   if (platedHole.hole_shape === "circle" && platedHole.hole_diameter) {

package/lib/element-handlers/addPlatedHole/addOvalPlatedHole.ts

@@ -7,7 +7,15 @@ export const addOvalPlatedHole = (
   platedHole: PcbPlatedHoleOval,
   ctx: ConvertContext,
 ): void => {
-  const { project, copperCutSetting, throughBoardCutSetting, origin } = ctx
+  const {
+    project,
+    copperCutSetting,
+    soldermaskCutSetting,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+  } = ctx
 
   if (platedHole.outer_width <= 0 || platedHole.outer_height <= 0) {
     return
@@ -17,8 +25,12 @@ export const addOvalPlatedHole = (
   const centerY = platedHole.y + origin.y
   const rotation = (platedHole.ccw_rotation ?? 0) * (Math.PI / 180)
 
-  // Add outer oval (copper)
-  if (platedHole.outer_width > 0 && platedHole.outer_height > 0) {
+  // Add outer oval (copper) if drawing copper
+  if (
+    platedHole.outer_width > 0 &&
+    platedHole.outer_height > 0 &&
+    includeCopper
+  ) {
     const outer = createOvalPath(
       centerX,
       centerY,
@@ -36,7 +48,30 @@ export const addOvalPlatedHole = (
     )
   }
 
-  // Add inner oval (hole)
+  // Add soldermask opening if drawing soldermask
+  if (
+    platedHole.outer_width > 0 &&
+    platedHole.outer_height > 0 &&
+    includeSoldermask
+  ) {
+    const outer = createOvalPath(
+      centerX,
+      centerY,
+      platedHole.outer_width,
+      platedHole.outer_height,
+      rotation,
+    )
+    project.children.push(
+      new ShapePath({
+        cutIndex: soldermaskCutSetting.index,
+        verts: outer.verts,
+        prims: outer.prims,
+        isClosed: true,
+      }),
+    )
+  }
+
+  // Add inner oval (hole) - always cut through the board regardless of mode
   if (platedHole.hole_width > 0 && platedHole.hole_height > 0) {
     const inner = createOvalPath(
       centerX,

package/lib/element-handlers/addPlatedHole/addPillHoleWithRectPad.ts

@@ -8,7 +8,15 @@ export const addPillHoleWithRectPad = (
   platedHole: PcbHolePillWithRectPad,
   ctx: ConvertContext,
 ): void => {
-  const { project, copperCutSetting, throughBoardCutSetting, origin } = ctx
+  const {
+    project,
+    copperCutSetting,
+    soldermaskCutSetting,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+  } = ctx
   const centerX = platedHole.x + origin.x
   const centerY = platedHole.y + origin.y
 
@@ -25,14 +33,29 @@ export const addPillHoleWithRectPad = (
       borderRadius,
     )
 
-    project.children.push(
-      new ShapePath({
-        cutIndex: copperCutSetting.index,
-        verts: padPath.verts,
-        prims: padPath.prims,
-        isClosed: true,
-      }),
-    )
+    // Add the rectangular pad if drawing copper
+    if (includeCopper) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: copperCutSetting.index,
+          verts: padPath.verts,
+          prims: padPath.prims,
+          isClosed: true,
+        }),
+      )
+    }
+
+    // Add soldermask opening if drawing soldermask
+    if (includeSoldermask) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: soldermaskCutSetting.index,
+          verts: padPath.verts,
+          prims: padPath.prims,
+          isClosed: true,
+        }),
+      )
+    }
   }
 
   const holeWidth = platedHole.hole_width

package/lib/element-handlers/addPlatedHole/addPillPlatedHole.ts

@@ -7,13 +7,25 @@ export const addPcbPlatedHolePill = (
   platedHole: PcbPlatedHoleOval,
   ctx: ConvertContext,
 ): void => {
-  const { project, copperCutSetting, throughBoardCutSetting, origin } = ctx
+  const {
+    project,
+    copperCutSetting,
+    soldermaskCutSetting,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+  } = ctx
   const centerX = platedHole.x + origin.x
   const centerY = platedHole.y + origin.y
   const rotation = (platedHole.ccw_rotation || 0) * (Math.PI / 180) // Convert degrees to radians
 
-  // Add outer pill shape (copper)
-  if (platedHole.outer_width > 0 && platedHole.outer_height > 0) {
+  // Add outer pill shape (copper) if drawing copper
+  if (
+    platedHole.outer_width > 0 &&
+    platedHole.outer_height > 0 &&
+    includeCopper
+  ) {
     const outer = createPillPath(
       centerX,
       centerY,
@@ -31,6 +43,29 @@ export const addPcbPlatedHolePill = (
     )
   }
 
+  // Add soldermask opening if drawing soldermask
+  if (
+    platedHole.outer_width > 0 &&
+    platedHole.outer_height > 0 &&
+    includeSoldermask
+  ) {
+    const outer = createPillPath(
+      centerX,
+      centerY,
+      platedHole.outer_width,
+      platedHole.outer_height,
+      rotation,
+    )
+    project.children.push(
+      new ShapePath({
+        cutIndex: soldermaskCutSetting.index,
+        verts: outer.verts,
+        prims: outer.prims,
+        isClosed: true,
+      }),
+    )
+  }
+
   // Add inner pill shape (hole)
   if (platedHole.hole_width > 0 && platedHole.hole_height > 0) {
     const inner = createPillPath(

package/lib/element-handlers/addPlatedHole/addRotatedPillHoleWithRectPad.ts

@@ -8,7 +8,15 @@ export const addRotatedPillHoleWithRectPad = (
   platedHole: PcbHoleRotatedPillWithRectPad,
   ctx: ConvertContext,
 ): void => {
-  const { project, copperCutSetting, throughBoardCutSetting, origin } = ctx
+  const {
+    project,
+    copperCutSetting,
+    soldermaskCutSetting,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+  } = ctx
   const centerX = platedHole.x + origin.x
   const centerY = platedHole.y + origin.y
 
@@ -28,14 +36,29 @@ export const addRotatedPillHoleWithRectPad = (
       padRotation,
     )
 
-    project.children.push(
-      new ShapePath({
-        cutIndex: copperCutSetting.index,
-        verts: padPath.verts,
-        prims: padPath.prims,
-        isClosed: true,
-      }),
-    )
+    // Add the rectangular pad if drawing copper
+    if (includeCopper) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: copperCutSetting.index,
+          verts: padPath.verts,
+          prims: padPath.prims,
+          isClosed: true,
+        }),
+      )
+    }
+
+    // Add soldermask opening if drawing soldermask
+    if (includeSoldermask) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: soldermaskCutSetting.index,
+          verts: padPath.verts,
+          prims: padPath.prims,
+          isClosed: true,
+        }),
+      )
+    }
   }
 
   const holeWidth = platedHole.hole_width

package/lib/element-handlers/addSmtPad/addCircleSmtPad.ts

@@ -2,25 +2,62 @@ import type { PcbSmtPadCircle } from "circuit-json"
 import type { ConvertContext } from "../../ConvertContext"
 import { ShapePath } from "lbrnts"
 import { createCirclePath } from "../../helpers/circleShape"
+import { Circle, Polygon, point } from "@flatten-js/core"
+import { circleToPolygon } from "../addPcbTrace/circle-to-polygon"
 
 export const addCircleSmtPad = (
   smtPad: PcbSmtPadCircle,
   ctx: ConvertContext,
 ): void => {
-  const { project, copperCutSetting, origin } = ctx
+  const {
+    project,
+    copperCutSetting,
+    soldermaskCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    connMap,
+  } = ctx
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
 
   if (smtPad.radius > 0) {
     const outerRadius = smtPad.radius
-    const outer = createCirclePath(centerX, centerY, outerRadius)
-    project.children.push(
-      new ShapePath({
-        cutIndex: copperCutSetting.index,
-        verts: outer.verts,
-        prims: outer.prims,
-        isClosed: true,
-      }),
-    )
+
+    // Add to netGeoms for copper (will be merged with traces)
+    if (includeCopper) {
+      const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id)
+      const circle = new Circle(point(centerX, centerY), outerRadius)
+      const polygon = circleToPolygon(circle)
+
+      if (netId) {
+        // Add to netGeoms to be merged with other elements on the same net
+        ctx.netGeoms.get(netId)?.push(polygon)
+      } else {
+        // No net connection - draw directly
+        const outer = createCirclePath(centerX, centerY, outerRadius)
+        project.children.push(
+          new ShapePath({
+            cutIndex: copperCutSetting.index,
+            verts: outer.verts,
+            prims: outer.prims,
+            isClosed: true,
+          }),
+        )
+      }
+    }
+
+    // Add soldermask opening if drawing soldermask
+    if (includeSoldermask) {
+      const outer = createCirclePath(centerX, centerY, outerRadius)
+      project.children.push(
+        new ShapePath({
+          cutIndex: soldermaskCutSetting.index,
+          verts: outer.verts,
+          prims: outer.prims,
+          isClosed: true,
+        }),
+      )
+    }
   }
 }

package/lib/element-handlers/addSmtPad/addPillSmtPad.ts

@@ -2,24 +2,58 @@ import type { PcbSmtPadPill } from "circuit-json"
 import type { ConvertContext } from "../../ConvertContext"
 import { ShapePath } from "lbrnts"
 import { createPillPath } from "../../helpers/pillShape"
+import { pathToPolygon } from "../../helpers/pathToPolygon"
 
 export const addPillSmtPad = (
   smtPad: PcbSmtPadPill,
   ctx: ConvertContext,
 ): void => {
-  const { project, copperCutSetting, origin } = ctx
+  const {
+    project,
+    copperCutSetting,
+    soldermaskCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    connMap,
+  } = ctx
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
 
   if (smtPad.width > 0 && smtPad.height > 0) {
     const outer = createPillPath(centerX, centerY, smtPad.width, smtPad.height)
-    project.children.push(
-      new ShapePath({
-        cutIndex: copperCutSetting.index,
-        verts: outer.verts,
-        prims: outer.prims,
-        isClosed: true,
-      }),
-    )
+
+    // Add to netGeoms for copper (will be merged with traces)
+    if (includeCopper) {
+      const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id)
+      const polygon = pathToPolygon(outer.verts)
+
+      if (netId) {
+        // Add to netGeoms to be merged with other elements on the same net
+        ctx.netGeoms.get(netId)?.push(polygon)
+      } else {
+        // No net connection - draw directly
+        project.children.push(
+          new ShapePath({
+            cutIndex: copperCutSetting.index,
+            verts: outer.verts,
+            prims: outer.prims,
+            isClosed: true,
+          }),
+        )
+      }
+    }
+
+    // Add soldermask opening if drawing soldermask
+    if (includeSoldermask) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: soldermaskCutSetting.index,
+          verts: outer.verts,
+          prims: outer.prims,
+          isClosed: true,
+        }),
+      )
+    }
   }
 }