circuit-json-to-lbrn 0.0.20 → 0.0.22

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

@@ -10,13 +10,15 @@ export const addRotatedPillHoleWithRectPad = (
 ): 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
@@ -27,41 +29,54 @@ export const addRotatedPillHoleWithRectPad = (
   const padRotation = (platedHole.rect_ccw_rotation ?? 0) * (Math.PI / 180)
 
   if (padWidth > 0 && padHeight > 0) {
-    const padPath = createRoundedRectPath(
+    const padPath = createRoundedRectPath({
       centerX,
       centerY,
-      padWidth,
-      padHeight,
+      width: padWidth,
+      height: padHeight,
       borderRadius,
-      4,
-      padRotation,
-    )
+      segments: 4,
+      rotation: padRotation,
+    })
 
     // 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,
-        4,
-        padRotation,
-      )
+        segments: 4,
+        rotation: padRotation,
+      })
 
       project.children.push(
         new ShapePath({
@@ -81,13 +96,13 @@ export const addRotatedPillHoleWithRectPad = (
   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,
-      holeRotation,
-    )
+    const holePath = createPillPath({
+      centerX: holeCenterX,
+      centerY: holeCenterY,
+      width: holeWidth,
+      height: holeHeight,
+      rotation: holeRotation,
+    })
 
     project.children.push(
       new ShapePath({

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

@@ -11,14 +11,33 @@ export const addCircleSmtPad = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
+    topNetGeoms,
+    bottomNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
     connMap,
     soldermaskMargin,
+    includeLayers,
   } = ctx
+
+  // Filter by layer - only process top and bottom layers
+  const padLayer = smtPad.layer || "top"
+  if (padLayer !== "top" && padLayer !== "bottom") {
+    return // Skip inner layers
+  }
+  if (!includeLayers.includes(padLayer)) {
+    return
+  }
+
+  // Select the correct cut setting and net geoms based on layer
+  const copperCutSetting =
+    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
+  const netGeoms = padLayer === "top" ? topNetGeoms : bottomNetGeoms
+
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
 
@@ -33,10 +52,14 @@ export const addCircleSmtPad = (
 
       if (netId) {
         // Add to netGeoms to be merged with other elements on the same net
-        ctx.netGeoms.get(netId)?.push(polygon)
+        netGeoms.get(netId)?.push(polygon)
       } else {
         // No net connection - draw directly
-        const outer = createCirclePath(centerX, centerY, outerRadius)
+        const outer = createCirclePath({
+          centerX,
+          centerY,
+          radius: outerRadius,
+        })
         project.children.push(
           new ShapePath({
             cutIndex: copperCutSetting.index,
@@ -51,7 +74,11 @@ export const addCircleSmtPad = (
     // Add soldermask opening if drawing soldermask
     if (includeSoldermask) {
       const smRadius = outerRadius + soldermaskMargin
-      const outer = createCirclePath(centerX, centerY, smRadius)
+      const outer = createCirclePath({
+        centerX,
+        centerY,
+        radius: smRadius,
+      })
       project.children.push(
         new ShapePath({
           cutIndex: soldermaskCutSetting.index,

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

@@ -10,19 +10,43 @@ export const addPillSmtPad = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
+    topNetGeoms,
+    bottomNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
     connMap,
     soldermaskMargin,
+    includeLayers,
   } = ctx
+
+  // Filter by layer - only process top and bottom layers
+  const padLayer = smtPad.layer || "top"
+  if (padLayer !== "top" && padLayer !== "bottom") {
+    return // Skip inner layers
+  }
+  if (!includeLayers.includes(padLayer)) {
+    return
+  }
+
+  // Select the correct cut setting and net geoms based on layer
+  const copperCutSetting =
+    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
+  const netGeoms = padLayer === "top" ? topNetGeoms : bottomNetGeoms
+
   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)
+    const outer = createPillPath({
+      centerX,
+      centerY,
+      width: smtPad.width,
+      height: smtPad.height,
+    })
 
     // Add to netGeoms for copper (will be merged with traces)
     if (includeCopper) {
@@ -31,7 +55,7 @@ export const addPillSmtPad = (
 
       if (netId) {
         // Add to netGeoms to be merged with other elements on the same net
-        ctx.netGeoms.get(netId)?.push(polygon)
+        netGeoms.get(netId)?.push(polygon)
       } else {
         // No net connection - draw directly
         project.children.push(
@@ -49,7 +73,12 @@ export const addPillSmtPad = (
     if (includeSoldermask) {
       const smWidth = smtPad.width + 2 * soldermaskMargin
       const smHeight = smtPad.height + 2 * soldermaskMargin
-      const smOuter = createPillPath(centerX, centerY, smWidth, smHeight)
+      const smOuter = createPillPath({
+        centerX,
+        centerY,
+        width: smWidth,
+        height: smHeight,
+      })
 
       project.children.push(
         new ShapePath({

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

@@ -11,18 +11,40 @@ export const addPolygonSmtPad = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
+    topNetGeoms,
+    bottomNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
     connMap,
     soldermaskMargin,
+    includeLayers,
   } = ctx
 
+  // Filter by layer - only process top and bottom layers
+  const padLayer = smtPad.layer || "top"
+  if (padLayer !== "top" && padLayer !== "bottom") {
+    return // Skip inner layers
+  }
+  if (!includeLayers.includes(padLayer)) {
+    return
+  }
+
+  // Select the correct cut setting and net geoms based on layer
+  const copperCutSetting =
+    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
+  const netGeoms = padLayer === "top" ? topNetGeoms : bottomNetGeoms
+
   // Create the polygon pad
   if (smtPad.points.length >= 3) {
-    const pad = createPolygonPathFromOutline(smtPad.points, origin.x, origin.y)
+    const pad = createPolygonPathFromOutline({
+      outline: smtPad.points,
+      offsetX: origin.x,
+      offsetY: origin.y,
+    })
 
     // Add to netGeoms for copper (will be merged with traces)
     if (includeCopper) {
@@ -31,7 +53,7 @@ export const addPolygonSmtPad = (
 
       if (netId) {
         // Add to netGeoms to be merged with other elements on the same net
-        ctx.netGeoms.get(netId)?.push(polygon)
+        netGeoms.get(netId)?.push(polygon)
       } else {
         // No net connection - draw directly
         project.children.push(

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

@@ -6,16 +6,28 @@ import { ShapePath } from "lbrnts"
 export const addRectSmtPad = (smtPad: PcbSmtPadRect, ctx: ConvertContext) => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
     connMap,
-    netGeoms,
+    topNetGeoms,
+    bottomNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
     soldermaskMargin,
+    includeLayers,
   } = ctx
 
+  // Filter by layer - only process top and bottom layers
+  const padLayer = smtPad.layer || "top"
+  if (padLayer !== "top" && padLayer !== "bottom") {
+    return // Skip inner layers
+  }
+  if (!includeLayers.includes(padLayer)) {
+    return
+  }
+
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
   const halfWidth = smtPad.width / 2
@@ -23,11 +35,16 @@ export const addRectSmtPad = (smtPad: PcbSmtPadRect, ctx: ConvertContext) => {
 
   const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id)
 
+  // Select the correct cut setting and net geoms based on layer
+  const copperCutSetting =
+    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
+  const netGeoms = padLayer === "top" ? topNetGeoms : bottomNetGeoms
+
   // Only add to netGeoms if drawing copper
   if (includeCopper) {
     if (netId) {
       // Add to netGeoms to be merged with other elements on the same net
-      ctx.netGeoms
+      netGeoms
         .get(netId)
         ?.push(
           new Box(

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

@@ -10,25 +10,44 @@ export const addRotatedPillSmtPad = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
+    topNetGeoms,
+    bottomNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
     connMap,
     soldermaskMargin,
+    includeLayers,
   } = ctx
+
+  // Filter by layer - only process top and bottom layers
+  const padLayer = smtPad.layer || "top"
+  if (padLayer !== "top" && padLayer !== "bottom") {
+    return // Skip inner layers
+  }
+  if (!includeLayers.includes(padLayer)) {
+    return
+  }
+
+  // Select the correct cut setting and net geoms based on layer
+  const copperCutSetting =
+    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
+  const netGeoms = padLayer === "top" ? topNetGeoms : bottomNetGeoms
+
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
 
   if (smtPad.width > 0 && smtPad.height > 0) {
-    const outer = createPillPath(
+    const outer = createPillPath({
       centerX,
       centerY,
-      smtPad.width,
-      smtPad.height,
-      (smtPad.ccw_rotation ?? 0) * (Math.PI / 180),
-    )
+      width: smtPad.width,
+      height: smtPad.height,
+      rotation: (smtPad.ccw_rotation ?? 0) * (Math.PI / 180),
+    })
 
     // Add to netGeoms for copper (will be merged with traces)
     if (includeCopper) {
@@ -37,7 +56,7 @@ export const addRotatedPillSmtPad = (
 
       if (netId) {
         // Add to netGeoms to be merged with other elements on the same net
-        ctx.netGeoms.get(netId)?.push(polygon)
+        netGeoms.get(netId)?.push(polygon)
       } else {
         // No net connection - draw directly
         project.children.push(
@@ -55,13 +74,13 @@ export const addRotatedPillSmtPad = (
     if (includeSoldermask) {
       const smWidth = smtPad.width + 2 * soldermaskMargin
       const smHeight = smtPad.height + 2 * soldermaskMargin
-      const smOuter = createPillPath(
+      const smOuter = createPillPath({
         centerX,
         centerY,
-        smWidth,
-        smHeight,
-        (smtPad.ccw_rotation ?? 0) * (Math.PI / 180),
-      )
+        width: smWidth,
+        height: smHeight,
+        rotation: (smtPad.ccw_rotation ?? 0) * (Math.PI / 180),
+      })
 
       project.children.push(
         new ShapePath({

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

@@ -10,29 +10,48 @@ export const addRotatedRectSmtPad = (
 ): void => {
   const {
     project,
-    copperCutSetting,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
     soldermaskCutSetting,
+    topNetGeoms,
+    bottomNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
     connMap,
     soldermaskMargin,
+    includeLayers,
   } = ctx
+
+  // Filter by layer - only process top and bottom layers
+  const padLayer = smtPad.layer || "top"
+  if (padLayer !== "top" && padLayer !== "bottom") {
+    return // Skip inner layers
+  }
+  if (!includeLayers.includes(padLayer)) {
+    return
+  }
+
+  // Select the correct cut setting and net geoms based on layer
+  const copperCutSetting =
+    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
+  const netGeoms = padLayer === "top" ? topNetGeoms : bottomNetGeoms
+
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
   const rotation = (smtPad.ccw_rotation ?? 0) * (Math.PI / 180)
   const borderRadius = smtPad.rect_border_radius ?? 0
 
   if (smtPad.width > 0 && smtPad.height > 0) {
-    const outer = createRoundedRectPath(
+    const outer = createRoundedRectPath({
       centerX,
       centerY,
-      smtPad.width,
-      smtPad.height,
+      width: smtPad.width,
+      height: smtPad.height,
       borderRadius,
-      4,
+      segments: 4,
       rotation,
-    )
+    })
 
     // Add to netGeoms for copper (will be merged with traces)
     if (includeCopper) {
@@ -41,7 +60,7 @@ export const addRotatedRectSmtPad = (
 
       if (netId) {
         // Add to netGeoms to be merged with other elements on the same net
-        ctx.netGeoms.get(netId)?.push(polygon)
+        netGeoms.get(netId)?.push(polygon)
       } else {
         // No net connection - draw directly
         project.children.push(
@@ -59,15 +78,15 @@ export const addRotatedRectSmtPad = (
     if (includeSoldermask) {
       const smWidth = smtPad.width + 2 * soldermaskMargin
       const smHeight = smtPad.height + 2 * soldermaskMargin
-      const smOuter = createRoundedRectPath(
+      const smOuter = createRoundedRectPath({
         centerX,
         centerY,
-        smWidth,
-        smHeight,
+        width: smWidth,
+        height: smHeight,
         borderRadius,
-        4,
+        segments: 4,
         rotation,
-      )
+      })
 
       project.children.push(
         new ShapePath({

package/lib/helpers/circleShape.ts

@@ -12,12 +12,19 @@ export interface CirclePath {
   prims: Prim[]
 }
 
-export const createCirclePath = (
-  centerX: number,
-  centerY: number,
-  radius: number,
-  segments: number = 64,
-): CirclePath => {
+export interface CreateCirclePathParams {
+  centerX: number
+  centerY: number
+  radius: number
+  segments?: number
+}
+
+export const createCirclePath = ({
+  centerX,
+  centerY,
+  radius,
+  segments = 64,
+}: CreateCirclePathParams): CirclePath => {
   const verts: Point[] = []
   const prims: Prim[] = []
 

package/lib/helpers/ovalShape.ts

@@ -12,14 +12,23 @@ export interface OvalPath {
   prims: Prim[]
 }
 
-export const createOvalPath = (
-  centerX: number,
-  centerY: number,
-  width: number,
-  height: number,
-  rotation: number = 0,
-  segments: number = 64,
-): OvalPath => {
+export interface CreateOvalPathParams {
+  centerX: number
+  centerY: number
+  width: number
+  height: number
+  rotation?: number
+  segments?: number
+}
+
+export const createOvalPath = ({
+  centerX,
+  centerY,
+  width,
+  height,
+  rotation = 0,
+  segments = 64,
+}: CreateOvalPathParams): OvalPath => {
   const verts: Point[] = []
   const prims: Prim[] = []
   const radiusX = width / 2

package/lib/helpers/pathPointUtils.ts

@@ -13,11 +13,17 @@ export interface PointAdderOptions {
   translation?: PathPoint
 }
 
-export const createPointAdder = (
-  verts: PathPoint[],
-  prims: PathPrim[],
-  options: PointAdderOptions = {},
-): ((x: number, y: number) => void) => {
+export interface CreatePointAdderParams {
+  verts: PathPoint[]
+  prims: PathPrim[]
+  options?: PointAdderOptions
+}
+
+export const createPointAdder = ({
+  verts,
+  prims,
+  options = {},
+}: CreatePointAdderParams): ((x: number, y: number) => void) => {
   const { rotation = 0, rotationCenter, translation } = options
   const cos = Math.cos(rotation)
   const sin = Math.sin(rotation)

package/lib/helpers/pillShape.ts

@@ -14,14 +14,23 @@ export interface PillPath {
   prims: Prim[]
 }
 
-export const createPillPath = (
-  centerX: number,
-  centerY: number,
-  width: number,
-  height: number,
-  rotation: number = 0,
-  segments: number = 32,
-): PillPath => {
+export interface CreatePillPathParams {
+  centerX: number
+  centerY: number
+  width: number
+  height: number
+  rotation?: number
+  segments?: number
+}
+
+export const createPillPath = ({
+  centerX,
+  centerY,
+  width,
+  height,
+  rotation = 0,
+  segments = 32,
+}: CreatePillPathParams): PillPath => {
   const verts: Point[] = []
   const prims: Prim[] = []
   const halfWidth = width / 2
@@ -29,9 +38,13 @@ export const createPillPath = (
   const radius = Math.min(halfWidth, halfHeight)
   const isVertical = height > width
 
-  const addPoint = createPointAdder(verts, prims, {
-    rotation,
-    rotationCenter: { x: centerX, y: centerY },
+  const addPoint = createPointAdder({
+    verts,
+    prims,
+    options: {
+      rotation,
+      rotationCenter: { x: centerX, y: centerY },
+    },
   })
 
   if (isVertical) {

package/lib/helpers/polygonShape.ts

@@ -12,11 +12,17 @@ export interface PolygonPath {
   prims: Prim[]
 }
 
-export const createPolygonPathFromOutline = (
-  outline: Array<{ x?: number | null; y?: number | null }>,
-  offsetX: number,
-  offsetY: number,
-): PolygonPath => {
+export interface CreatePolygonPathFromOutlineParams {
+  outline: Array<{ x?: number | null; y?: number | null }>
+  offsetX: number
+  offsetY: number
+}
+
+export const createPolygonPathFromOutline = ({
+  outline,
+  offsetX,
+  offsetY,
+}: CreatePolygonPathFromOutlineParams): PolygonPath => {
   const verts: Point[] = []
 
   for (const point of outline) {