circuit-json-to-lbrn 0.0.39 → 0.0.40

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

@@ -3,6 +3,7 @@ import type { ConvertContext } from "../../ConvertContext"
 import { ShapePath } from "lbrnts"
 import { createRoundedRectPath } from "../../helpers/roundedRectShape"
 import { createCirclePath } from "../../helpers/circleShape"
+import { addCopperGeometryToNetOrProject } from "../../helpers/addCopperGeometryToNetOrProject"
 
 export const addCircularHoleWithRectPad = (
   platedHole: PcbHoleCircularWithRectPad,
@@ -10,8 +11,6 @@ export const addCircularHoleWithRectPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
@@ -39,26 +38,18 @@ export const addCircularHoleWithRectPad = (
   // Add the rectangular pad if drawing copper
   // Plated holes go through all layers, so add to both top and bottom
   if (includeCopper) {
-    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,
-        }),
-      )
-    }
+    addCopperGeometryToNetOrProject({
+      geometryId: platedHole.pcb_plated_hole_id,
+      path: padPath,
+      layer: "top",
+      ctx,
+    })
+    addCopperGeometryToNetOrProject({
+      geometryId: platedHole.pcb_plated_hole_id,
+      path: padPath,
+      layer: "bottom",
+      ctx,
+    })
   }
 
   // Add soldermask opening if drawing soldermask

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

@@ -3,6 +3,7 @@ import type { ConvertContext } from "../../ConvertContext"
 import { ShapePath } from "lbrnts"
 import { createPolygonPathFromOutline } from "../../helpers/polygonShape"
 import { createCirclePath } from "../../helpers/circleShape"
+import { addCopperGeometryToNetOrProject } from "../../helpers/addCopperGeometryToNetOrProject"
 
 export const addHoleWithPolygonPad = (
   platedHole: PcbHoleWithPolygonPad,
@@ -10,8 +11,6 @@ export const addHoleWithPolygonPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
@@ -32,26 +31,18 @@ export const addHoleWithPolygonPad = (
     // Add the polygon pad if drawing copper
     // Plated holes go through all layers, so add to both top and bottom
     if (includeCopper) {
-      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,
-          }),
-        )
-      }
+      addCopperGeometryToNetOrProject({
+        geometryId: platedHole.pcb_plated_hole_id,
+        path: pad,
+        layer: "top",
+        ctx,
+      })
+      addCopperGeometryToNetOrProject({
+        geometryId: platedHole.pcb_plated_hole_id,
+        path: pad,
+        layer: "bottom",
+        ctx,
+      })
     }
 
     // Add soldermask opening if drawing soldermask

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

@@ -3,6 +3,7 @@ import type { ConvertContext } from "../../ConvertContext"
 import { ShapePath } from "lbrnts"
 import { createRoundedRectPath } from "../../helpers/roundedRectShape"
 import { createPillPath } from "../../helpers/pillShape"
+import { addCopperGeometryToNetOrProject } from "../../helpers/addCopperGeometryToNetOrProject"
 
 export const addPillHoleWithRectPad = (
   platedHole: PcbHolePillWithRectPad,
@@ -10,8 +11,6 @@ export const addPillHoleWithRectPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
@@ -39,26 +38,18 @@ export const addPillHoleWithRectPad = (
     // Add the rectangular pad if drawing copper
     // Plated holes go through all layers, so add to both top and bottom
     if (includeCopper) {
-      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,
-          }),
-        )
-      }
+      addCopperGeometryToNetOrProject({
+        geometryId: platedHole.pcb_plated_hole_id,
+        path: padPath,
+        layer: "top",
+        ctx,
+      })
+      addCopperGeometryToNetOrProject({
+        geometryId: platedHole.pcb_plated_hole_id,
+        path: padPath,
+        layer: "bottom",
+        ctx,
+      })
     }
 
     // Add soldermask opening if drawing soldermask

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

@@ -3,6 +3,7 @@ import type { ConvertContext } from "../../ConvertContext"
 import { ShapePath } from "lbrnts"
 import { createRoundedRectPath } from "../../helpers/roundedRectShape"
 import { createPillPath } from "../../helpers/pillShape"
+import { addCopperGeometryToNetOrProject } from "../../helpers/addCopperGeometryToNetOrProject"
 
 export const addRotatedPillHoleWithRectPad = (
   platedHole: PcbHoleRotatedPillWithRectPad,
@@ -10,8 +11,6 @@ export const addRotatedPillHoleWithRectPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
@@ -42,26 +41,18 @@ export const addRotatedPillHoleWithRectPad = (
     // Add the rectangular pad if drawing copper
     // Plated holes go through all layers, so add to both top and bottom
     if (includeCopper) {
-      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,
-          }),
-        )
-      }
+      addCopperGeometryToNetOrProject({
+        geometryId: platedHole.pcb_plated_hole_id,
+        path: padPath,
+        layer: "top",
+        ctx,
+      })
+      addCopperGeometryToNetOrProject({
+        geometryId: platedHole.pcb_plated_hole_id,
+        path: padPath,
+        layer: "bottom",
+        ctx,
+      })
     }
 
     // Add soldermask opening if drawing soldermask

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

@@ -2,8 +2,7 @@ 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"
+import { addCopperGeometryToNetOrProject } from "../../helpers/addCopperGeometryToNetOrProject"
 
 export const addCircleSmtPad = (
   smtPad: PcbSmtPadCircle,
@@ -11,15 +10,10 @@ export const addCircleSmtPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
-    connMap,
     globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
@@ -33,42 +27,26 @@ export const addCircleSmtPad = (
     return
   }
 
-  // Select the correct cut setting and net geoms based on layer
-  const copperCutSetting =
-    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
-  const netGeoms = padLayer === "top" ? topCutNetGeoms : bottomCutNetGeoms
-
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
 
   if (smtPad.radius > 0) {
     const outerRadius = smtPad.radius
 
-    // Add to netGeoms for copper (will be merged with traces)
+    // Add to copper geometry (will be merged with traces if connected)
     if (includeCopper) {
-      const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id)
-      const circle = new Circle(point(centerX, centerY), outerRadius)
-      const polygon = circleToPolygon(circle)
+      const path = createCirclePath({
+        centerX,
+        centerY,
+        radius: outerRadius,
+      })
 
-      if (netId) {
-        // Add to netGeoms to be merged with other elements on the same net
-        netGeoms.get(netId)?.push(polygon)
-      } else {
-        // No net connection - draw directly
-        const outer = createCirclePath({
-          centerX,
-          centerY,
-          radius: outerRadius,
-        })
-        project.children.push(
-          new ShapePath({
-            cutIndex: copperCutSetting.index,
-            verts: outer.verts,
-            prims: outer.prims,
-            isClosed: true,
-          }),
-        )
-      }
+      addCopperGeometryToNetOrProject({
+        geometryId: smtPad.pcb_smtpad_id,
+        path,
+        layer: padLayer,
+        ctx,
+      })
     }
 
     // Add soldermask opening if drawing soldermask

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

@@ -2,7 +2,7 @@ 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"
+import { addCopperGeometryToNetOrProject } from "../../helpers/addCopperGeometryToNetOrProject"
 
 export const addPillSmtPad = (
   smtPad: PcbSmtPadPill,
@@ -10,15 +10,10 @@ export const addPillSmtPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
-    connMap,
     globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
@@ -32,11 +27,6 @@ export const addPillSmtPad = (
     return
   }
 
-  // Select the correct cut setting and net geoms based on layer
-  const copperCutSetting =
-    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
-  const netGeoms = padLayer === "top" ? topCutNetGeoms : bottomCutNetGeoms
-
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
 
@@ -48,25 +38,14 @@ export const addPillSmtPad = (
       height: smtPad.height,
     })
 
-    // Add to netGeoms for copper (will be merged with traces)
+    // Add to copper geometry (will be merged with traces if connected)
     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
-        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,
-          }),
-        )
-      }
+      addCopperGeometryToNetOrProject({
+        geometryId: smtPad.pcb_smtpad_id,
+        path: outer,
+        layer: padLayer,
+        ctx,
+      })
     }
 
     // Add soldermask opening if drawing soldermask

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

@@ -2,7 +2,7 @@ import type { PcbSmtPadPolygon } from "circuit-json"
 import type { ConvertContext } from "../../ConvertContext"
 import { ShapePath } from "lbrnts"
 import { createPolygonPathFromOutline } from "../../helpers/polygonShape"
-import { pathToPolygon } from "../../helpers/pathToPolygon"
+import { addCopperGeometryToNetOrProject } from "../../helpers/addCopperGeometryToNetOrProject"
 import { polygonToShapePathData } from "../../polygon-to-shape-path"
 
 export const addPolygonSmtPad = (
@@ -11,15 +11,10 @@ export const addPolygonSmtPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
-    connMap,
     globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
@@ -33,11 +28,6 @@ export const addPolygonSmtPad = (
     return
   }
 
-  // Select the correct cut setting and net geoms based on layer
-  const copperCutSetting =
-    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
-  const netGeoms = padLayer === "top" ? topCutNetGeoms : bottomCutNetGeoms
-
   // Create the polygon pad
   if (smtPad.points.length >= 3) {
     const pad = createPolygonPathFromOutline({
@@ -46,25 +36,14 @@ export const addPolygonSmtPad = (
       offsetY: origin.y,
     })
 
-    // Add to netGeoms for copper (will be merged with traces)
+    // Add to copper geometry (will be merged with traces if connected)
     if (includeCopper) {
-      const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id)
-      const polygon = pathToPolygon(pad.verts)
-
-      if (netId) {
-        // Add to netGeoms to be merged with other elements on the same net
-        netGeoms.get(netId)?.push(polygon)
-      } else {
-        // No net connection - draw directly
-        project.children.push(
-          new ShapePath({
-            cutIndex: copperCutSetting.index,
-            verts: pad.verts,
-            prims: pad.prims,
-            isClosed: true,
-          }),
-        )
-      }
+      addCopperGeometryToNetOrProject({
+        geometryId: smtPad.pcb_smtpad_id,
+        path: pad,
+        layer: padLayer,
+        ctx,
+      })
     }
 
     // Add soldermask opening if drawing soldermask

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

@@ -2,16 +2,12 @@ import { Box } from "@flatten-js/core"
 import type { ConvertContext } from "../../ConvertContext"
 import type { PcbSmtPadRect } from "circuit-json"
 import { ShapePath } from "lbrnts"
+import { addCopperGeometryToNetOrProject } from "../../helpers/addCopperGeometryToNetOrProject"
 
 export const addRectSmtPad = (smtPad: PcbSmtPadRect, ctx: ConvertContext) => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    connMap,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
@@ -33,54 +29,25 @@ export const addRectSmtPad = (smtPad: PcbSmtPadRect, ctx: ConvertContext) => {
   const halfWidth = smtPad.width / 2
   const halfHeight = smtPad.height / 2
 
-  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" ? topCutNetGeoms : bottomCutNetGeoms
-
   // Only add to netGeoms if drawing copper
   if (includeCopper) {
-    if (netId) {
-      // Add to netGeoms to be merged with other elements on the same net
-      netGeoms
-        .get(netId)
-        ?.push(
-          new Box(
-            centerX - halfWidth,
-            centerY - halfHeight,
-            centerX + halfWidth,
-            centerY + halfHeight,
-          ),
-        )
-    } else {
-      // No net connection - draw directly
-      const verts = [
+    const path = {
+      verts: [
         { x: centerX - halfWidth, y: centerY - halfHeight },
         { x: centerX + halfWidth, y: centerY - halfHeight },
         { x: centerX + halfWidth, y: centerY + halfHeight },
         { x: centerX - halfWidth, y: centerY + halfHeight },
         { x: centerX - halfWidth, y: centerY - halfHeight }, // Close the path
-      ]
-
-      const prims = [
-        { type: 0 },
-        { type: 0 },
-        { type: 0 },
-        { type: 0 },
-        { type: 0 },
-      ]
-
-      project.children.push(
-        new ShapePath({
-          cutIndex: copperCutSetting.index,
-          verts,
-          prims,
-          isClosed: true,
-        }),
-      )
+      ],
+      prims: [{ type: 0 }, { type: 0 }, { type: 0 }, { type: 0 }, { type: 0 }],
     }
+
+    addCopperGeometryToNetOrProject({
+      geometryId: smtPad.pcb_smtpad_id,
+      path,
+      layer: padLayer,
+      ctx,
+    })
   }
 
   // Add soldermask opening if drawing soldermask

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

@@ -2,7 +2,7 @@ import type { PcbSmtPadRotatedPill } from "circuit-json"
 import type { ConvertContext } from "../../ConvertContext"
 import { ShapePath } from "lbrnts"
 import { createPillPath } from "../../helpers/pillShape"
-import { pathToPolygon } from "../../helpers/pathToPolygon"
+import { addCopperGeometryToNetOrProject } from "../../helpers/addCopperGeometryToNetOrProject"
 
 export const addRotatedPillSmtPad = (
   smtPad: PcbSmtPadRotatedPill,
@@ -10,15 +10,10 @@ export const addRotatedPillSmtPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
-    connMap,
     globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
@@ -32,11 +27,6 @@ export const addRotatedPillSmtPad = (
     return
   }
 
-  // Select the correct cut setting and net geoms based on layer
-  const copperCutSetting =
-    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
-  const netGeoms = padLayer === "top" ? topCutNetGeoms : bottomCutNetGeoms
-
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
 
@@ -49,25 +39,14 @@ export const addRotatedPillSmtPad = (
       rotation: (smtPad.ccw_rotation ?? 0) * (Math.PI / 180),
     })
 
-    // Add to netGeoms for copper (will be merged with traces)
+    // Add to copper geometry (will be merged with traces if connected)
     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
-        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,
-          }),
-        )
-      }
+      addCopperGeometryToNetOrProject({
+        geometryId: smtPad.pcb_smtpad_id,
+        path: outer,
+        layer: padLayer,
+        ctx,
+      })
     }
 
     // Add soldermask opening if drawing soldermask

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

@@ -2,7 +2,7 @@ import type { PcbSmtPadRotatedRect } from "circuit-json"
 import type { ConvertContext } from "../../ConvertContext"
 import { ShapePath } from "lbrnts"
 import { createRoundedRectPath } from "../../helpers/roundedRectShape"
-import { pathToPolygon } from "../../helpers/pathToPolygon"
+import { addCopperGeometryToNetOrProject } from "../../helpers/addCopperGeometryToNetOrProject"
 
 export const addRotatedRectSmtPad = (
   smtPad: PcbSmtPadRotatedRect,
@@ -10,15 +10,10 @@ export const addRotatedRectSmtPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
-    connMap,
     globalCopperSoldermaskMarginAdjustment,
     includeLayers,
   } = ctx
@@ -32,11 +27,6 @@ export const addRotatedRectSmtPad = (
     return
   }
 
-  // Select the correct cut setting and net geoms based on layer
-  const copperCutSetting =
-    padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting
-  const netGeoms = padLayer === "top" ? topCutNetGeoms : bottomCutNetGeoms
-
   const centerX = smtPad.x + origin.x
   const centerY = smtPad.y + origin.y
   const rotation = (smtPad.ccw_rotation ?? 0) * (Math.PI / 180)
@@ -53,25 +43,14 @@ export const addRotatedRectSmtPad = (
       rotation,
     })
 
-    // Add to netGeoms for copper (will be merged with traces)
+    // Add to copper geometry (will be merged with traces if connected)
     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
-        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,
-          }),
-        )
-      }
+      addCopperGeometryToNetOrProject({
+        geometryId: smtPad.pcb_smtpad_id,
+        path: outer,
+        layer: padLayer,
+        ctx,
+      })
     }
 
     // Add soldermask opening if drawing soldermask