circuit-json-to-lbrn 0.0.20 → 0.0.22

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

@@ -11,19 +11,24 @@ export const addCirclePlatedHole = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
+    topNetGeoms,
+    bottomNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
     connMap,
     soldermaskMargin,
+    includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
   const centerY = platedHole.y + origin.y
 
   // Add outer circle (copper annulus) if drawing copper - add to netGeoms for merging
+  // Plated holes go through all layers, so add to both top and bottom
   if (platedHole.outer_diameter > 0 && includeCopper) {
     const netId = connMap.getNetConnectedToId(platedHole.pcb_plated_hole_id)
     const outerRadius = platedHole.outer_diameter / 2
@@ -31,26 +36,51 @@ export const addCirclePlatedHole = (
     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)
+      // Add to both top and bottom netGeoms since plated holes go through the board
+      if (includeLayers.includes("top")) {
+        topNetGeoms.get(netId)?.push(polygon.clone())
+      }
+      if (includeLayers.includes("bottom")) {
+        bottomNetGeoms.get(netId)?.push(polygon.clone())
+      }
     } 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,
-        }),
-      )
+      // No net connection - draw directly for each included layer
+      const outer = createCirclePath({
+        centerX,
+        centerY,
+        radius: outerRadius,
+      })
+      if (includeLayers.includes("top")) {
+        project.children.push(
+          new ShapePath({
+            cutIndex: topCopperCutSetting.index,
+            verts: outer.verts,
+            prims: outer.prims,
+            isClosed: true,
+          }),
+        )
+      }
+      if (includeLayers.includes("bottom")) {
+        project.children.push(
+          new ShapePath({
+            cutIndex: bottomCopperCutSetting.index,
+            verts: outer.verts,
+            prims: outer.prims,
+            isClosed: true,
+          }),
+        )
+      }
     }
   }
 
   // Add soldermask opening if drawing soldermask
   if (platedHole.outer_diameter > 0 && includeSoldermask) {
     const smRadius = platedHole.outer_diameter / 2 + soldermaskMargin
-    const outer = createCirclePath(centerX, centerY, smRadius)
+    const outer = createCirclePath({
+      centerX,
+      centerY,
+      radius: smRadius,
+    })
     project.children.push(
       new ShapePath({
         cutIndex: soldermaskCutSetting.index,
@@ -63,7 +93,11 @@ export const addCirclePlatedHole = (
 
   if (platedHole.hole_diameter > 0 && includeCopper) {
     const innerRadius = platedHole.hole_diameter / 2
-    const inner = createCirclePath(centerX, centerY, innerRadius)
+    const inner = createCirclePath({
+      centerX,
+      centerY,
+      radius: innerRadius,
+    })
     project.children.push(
       new ShapePath({
         cutIndex: throughBoardCutSetting.index,

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

@@ -10,13 +10,15 @@ export const addCircularHoleWithRectPad = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
     includeCopper,
     includeSoldermask,
     soldermaskMargin,
+    includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
   const centerY = platedHole.y + origin.y
@@ -26,37 +28,50 @@ export const addCircularHoleWithRectPad = (
   const borderRadius = platedHole.rect_border_radius ?? 0
 
   // Create rectangle pad vertices
-  const padPath = createRoundedRectPath(
+  const padPath = createRoundedRectPath({
     centerX,
     centerY,
-    padWidth,
-    padHeight,
+    width: padWidth,
+    height: padHeight,
     borderRadius,
-  )
+  })
 
   // Add the rectangular pad if drawing copper
+  // Plated holes go through all layers, so add to both top and bottom
   if (includeCopper) {
-    project.children.push(
-      new ShapePath({
-        cutIndex: copperCutSetting.index,
-        verts: padPath.verts,
-        prims: padPath.prims,
-        isClosed: true,
-      }),
-    )
+    if (includeLayers.includes("top")) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: topCopperCutSetting.index,
+          verts: padPath.verts,
+          prims: padPath.prims,
+          isClosed: true,
+        }),
+      )
+    }
+    if (includeLayers.includes("bottom")) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: bottomCopperCutSetting.index,
+          verts: padPath.verts,
+          prims: padPath.prims,
+          isClosed: true,
+        }),
+      )
+    }
   }
 
   // Add soldermask opening if drawing soldermask
   if (includeSoldermask) {
     const smPadWidth = padWidth + 2 * soldermaskMargin
     const smPadHeight = padHeight + 2 * soldermaskMargin
-    const smPadPath = createRoundedRectPath(
+    const smPadPath = createRoundedRectPath({
       centerX,
       centerY,
-      smPadWidth,
-      smPadHeight,
+      width: smPadWidth,
+      height: smPadHeight,
       borderRadius,
-    )
+    })
 
     project.children.push(
       new ShapePath({
@@ -72,7 +87,12 @@ export const addCircularHoleWithRectPad = (
   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)
+    const holePath = createCirclePath({
+      centerX: holeCenterX,
+      centerY: holeCenterY,
+      radius: holeRadius,
+      segments: 32,
+    })
 
     project.children.push(
       new ShapePath({

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

@@ -10,33 +10,48 @@ export const addHoleWithPolygonPad = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
     includeCopper,
     includeSoldermask,
     soldermaskMargin,
+    includeLayers,
   } = ctx
 
   // Create the polygon pad
   if (platedHole.pad_outline.length >= 3 && includeCopper) {
-    const pad = createPolygonPathFromOutline(
-      platedHole.pad_outline,
-      platedHole.x + origin.x,
-      platedHole.y + origin.y,
-    )
+    const pad = createPolygonPathFromOutline({
+      outline: platedHole.pad_outline,
+      offsetX: platedHole.x + origin.x,
+      offsetY: platedHole.y + origin.y,
+    })
 
     // Add the polygon pad if drawing copper
+    // Plated holes go through all layers, so add to both top and bottom
     if (includeCopper) {
-      project.children.push(
-        new ShapePath({
-          cutIndex: copperCutSetting.index,
-          verts: pad.verts,
-          prims: pad.prims,
-          isClosed: true,
-        }),
-      )
+      if (includeLayers.includes("top")) {
+        project.children.push(
+          new ShapePath({
+            cutIndex: topCopperCutSetting.index,
+            verts: pad.verts,
+            prims: pad.prims,
+            isClosed: true,
+          }),
+        )
+      }
+      if (includeLayers.includes("bottom")) {
+        project.children.push(
+          new ShapePath({
+            cutIndex: bottomCopperCutSetting.index,
+            verts: pad.verts,
+            prims: pad.prims,
+            isClosed: true,
+          }),
+        )
+      }
     }
 
     // Add soldermask opening if drawing soldermask
@@ -62,7 +77,12 @@ export const addHoleWithPolygonPad = (
     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
-    const hole = createCirclePath(centerX, centerY, radius, 64)
+    const hole = createCirclePath({
+      centerX,
+      centerY,
+      radius,
+      segments: 64,
+    })
 
     project.children.push(
       new ShapePath({
@@ -81,7 +101,12 @@ export const addHoleWithPolygonPad = (
     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
-    const hole = createCirclePath(centerX, centerY, radius, 64)
+    const hole = createCirclePath({
+      centerX,
+      centerY,
+      radius,
+      segments: 64,
+    })
 
     // Note: rotation is not supported for holes with polygon pad
 

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

@@ -9,13 +9,15 @@ export const addOvalPlatedHole = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
     includeCopper,
     includeSoldermask,
     soldermaskMargin,
+    includeLayers,
   } = ctx
 
   if (platedHole.outer_width <= 0 || platedHole.outer_height <= 0) {
@@ -27,26 +29,39 @@ export const addOvalPlatedHole = (
   const rotation = (platedHole.ccw_rotation ?? 0) * (Math.PI / 180)
 
   // Add outer oval (copper) if drawing copper
+  // Plated holes go through all layers, so add to both top and bottom
   if (
     platedHole.outer_width > 0 &&
     platedHole.outer_height > 0 &&
     includeCopper
   ) {
-    const outer = createOvalPath(
+    const outer = createOvalPath({
       centerX,
       centerY,
-      platedHole.outer_width,
-      platedHole.outer_height,
+      width: platedHole.outer_width,
+      height: platedHole.outer_height,
       rotation,
-    )
-    project.children.push(
-      new ShapePath({
-        cutIndex: copperCutSetting.index,
-        verts: outer.verts,
-        prims: outer.prims,
-        isClosed: true,
-      }),
-    )
+    })
+    if (includeLayers.includes("top")) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: topCopperCutSetting.index,
+          verts: outer.verts,
+          prims: outer.prims,
+          isClosed: true,
+        }),
+      )
+    }
+    if (includeLayers.includes("bottom")) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: bottomCopperCutSetting.index,
+          verts: outer.verts,
+          prims: outer.prims,
+          isClosed: true,
+        }),
+      )
+    }
   }
 
   // Add soldermask opening if drawing soldermask
@@ -57,7 +72,13 @@ export const addOvalPlatedHole = (
   ) {
     const smWidth = platedHole.outer_width + 2 * soldermaskMargin
     const smHeight = platedHole.outer_height + 2 * soldermaskMargin
-    const outer = createOvalPath(centerX, centerY, smWidth, smHeight, rotation)
+    const outer = createOvalPath({
+      centerX,
+      centerY,
+      width: smWidth,
+      height: smHeight,
+      rotation,
+    })
     project.children.push(
       new ShapePath({
         cutIndex: soldermaskCutSetting.index,
@@ -74,13 +95,13 @@ export const addOvalPlatedHole = (
     platedHole.hole_height > 0 &&
     includeCopper
   ) {
-    const inner = createOvalPath(
+    const inner = createOvalPath({
       centerX,
       centerY,
-      platedHole.hole_width,
-      platedHole.hole_height,
+      width: platedHole.hole_width,
+      height: platedHole.hole_height,
       rotation,
-    )
+    })
     project.children.push(
       new ShapePath({
         cutIndex: throughBoardCutSetting.index,

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

@@ -10,13 +10,15 @@ export const addPillHoleWithRectPad = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
     includeCopper,
     includeSoldermask,
     soldermaskMargin,
+    includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
   const centerY = platedHole.y + origin.y
@@ -26,37 +28,50 @@ export const addPillHoleWithRectPad = (
   const borderRadius = platedHole.rect_border_radius ?? 0
 
   if (padWidth > 0 && padHeight > 0) {
-    const padPath = createRoundedRectPath(
+    const padPath = createRoundedRectPath({
       centerX,
       centerY,
-      padWidth,
-      padHeight,
+      width: padWidth,
+      height: padHeight,
       borderRadius,
-    )
+    })
 
     // Add the rectangular pad if drawing copper
+    // Plated holes go through all layers, so add to both top and bottom
     if (includeCopper) {
-      project.children.push(
-        new ShapePath({
-          cutIndex: copperCutSetting.index,
-          verts: padPath.verts,
-          prims: padPath.prims,
-          isClosed: true,
-        }),
-      )
+      if (includeLayers.includes("top")) {
+        project.children.push(
+          new ShapePath({
+            cutIndex: topCopperCutSetting.index,
+            verts: padPath.verts,
+            prims: padPath.prims,
+            isClosed: true,
+          }),
+        )
+      }
+      if (includeLayers.includes("bottom")) {
+        project.children.push(
+          new ShapePath({
+            cutIndex: bottomCopperCutSetting.index,
+            verts: padPath.verts,
+            prims: padPath.prims,
+            isClosed: true,
+          }),
+        )
+      }
     }
 
     // Add soldermask opening if drawing soldermask
     if (includeSoldermask) {
       const smPadWidth = padWidth + 2 * soldermaskMargin
       const smPadHeight = padHeight + 2 * soldermaskMargin
-      const smPadPath = createRoundedRectPath(
+      const smPadPath = createRoundedRectPath({
         centerX,
         centerY,
-        smPadWidth,
-        smPadHeight,
+        width: smPadWidth,
+        height: smPadHeight,
         borderRadius,
-      )
+      })
 
       project.children.push(
         new ShapePath({
@@ -75,12 +90,12 @@ export const addPillHoleWithRectPad = (
   if (holeWidth > 0 && holeHeight > 0 && includeCopper) {
     const holeCenterX = centerX + platedHole.hole_offset_x
     const holeCenterY = centerY + platedHole.hole_offset_y
-    const holePath = createPillPath(
-      holeCenterX,
-      holeCenterY,
-      holeWidth,
-      holeHeight,
-    )
+    const holePath = createPillPath({
+      centerX: holeCenterX,
+      centerY: holeCenterY,
+      width: holeWidth,
+      height: holeHeight,
+    })
 
     project.children.push(
       new ShapePath({

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

@@ -9,39 +9,54 @@ export const addPcbPlatedHolePill = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
     includeCopper,
     includeSoldermask,
     soldermaskMargin,
+    includeLayers,
   } = 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 drawing copper
+  // Plated holes go through all layers, so add to both top and bottom
   if (
     platedHole.outer_width > 0 &&
     platedHole.outer_height > 0 &&
     includeCopper
   ) {
-    const outer = createPillPath(
+    const outer = createPillPath({
       centerX,
       centerY,
-      platedHole.outer_width,
-      platedHole.outer_height,
+      width: platedHole.outer_width,
+      height: platedHole.outer_height,
       rotation,
-    )
-    project.children.push(
-      new ShapePath({
-        cutIndex: copperCutSetting.index,
-        verts: outer.verts,
-        prims: outer.prims,
-        isClosed: true,
-      }),
-    )
+    })
+    if (includeLayers.includes("top")) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: topCopperCutSetting.index,
+          verts: outer.verts,
+          prims: outer.prims,
+          isClosed: true,
+        }),
+      )
+    }
+    if (includeLayers.includes("bottom")) {
+      project.children.push(
+        new ShapePath({
+          cutIndex: bottomCopperCutSetting.index,
+          verts: outer.verts,
+          prims: outer.prims,
+          isClosed: true,
+        }),
+      )
+    }
   }
 
   // Add soldermask opening if drawing soldermask
@@ -52,7 +67,13 @@ export const addPcbPlatedHolePill = (
   ) {
     const smWidth = platedHole.outer_width + 2 * soldermaskMargin
     const smHeight = platedHole.outer_height + 2 * soldermaskMargin
-    const outer = createPillPath(centerX, centerY, smWidth, smHeight, rotation)
+    const outer = createPillPath({
+      centerX,
+      centerY,
+      width: smWidth,
+      height: smHeight,
+      rotation,
+    })
     project.children.push(
       new ShapePath({
         cutIndex: soldermaskCutSetting.index,
@@ -69,13 +90,13 @@ export const addPcbPlatedHolePill = (
     platedHole.hole_height > 0 &&
     includeCopper
   ) {
-    const inner = createPillPath(
+    const inner = createPillPath({
       centerX,
       centerY,
-      platedHole.hole_width,
-      platedHole.hole_height,
+      width: platedHole.hole_width,
+      height: platedHole.hole_height,
       rotation,
-    )
+    })
     project.children.push(
       new ShapePath({
         cutIndex: throughBoardCutSetting.index,