circuit-json-to-lbrn 0.0.39 → 0.0.41

package/lib/ConvertContext.ts

@@ -43,4 +43,7 @@ export interface ConvertContext {
   // Cut settings for trace clearance areas
   topTraceClearanceAreaCutSetting?: CutSetting
   bottomTraceClearanceAreaCutSetting?: CutSetting
+
+  // Percent-based solder mask margin (scales with element size)
+  solderMaskMarginPercent: number
 }

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

@@ -20,6 +20,7 @@ export const addPcbVia = (via: PcbVia, ctx: ConvertContext): void => {
     includeSoldermask,
     connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
   const centerX = via.x + origin.x
@@ -93,8 +94,16 @@ export const addPcbVia = (via: PcbVia, ctx: ConvertContext): void => {
 
   // Add soldermask opening if drawing soldermask
   if (via.outer_diameter > 0 && includeSoldermask) {
-    const smRadius =
-      via.outer_diameter / 2 + globalCopperSoldermaskMarginAdjustment
+    // Percent margin is additive and may be negative.
+    // Global adjustment is always applied.
+    // Percent margin is applied to full diameter
+    const percentMargin = (solderMaskMarginPercent / 100) * via.outer_diameter
+
+    // Total margin is additive
+    const totalMargin = globalCopperSoldermaskMarginAdjustment + percentMargin
+
+    // Clamp so radius never goes below zero
+    const smRadius = Math.max(via.outer_diameter / 2 + totalMargin, 0)
     const outer = createCirclePath({
       centerX,
       centerY,

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

@@ -22,6 +22,7 @@ export const addCirclePlatedHole = (
     includeSoldermask,
     connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
@@ -75,10 +76,15 @@ export const addCirclePlatedHole = (
 
   // Add soldermask opening if drawing soldermask
   if (platedHole.outer_diameter > 0 && includeSoldermask) {
-    const smRadius =
-      platedHole.outer_diameter / 2 +
+    // Percent margin is additive and may be negative.
+    // Absolute per-element margin and global adjustment are always applied.
+    const percentMargin =
+      (solderMaskMarginPercent / 100) * platedHole.outer_diameter
+    const totalMargin =
       globalCopperSoldermaskMarginAdjustment +
-      (platedHole.soldermask_margin ?? 0)
+      (platedHole.soldermask_margin ?? 0) +
+      percentMargin
+    const smRadius = Math.max(platedHole.outer_diameter / 2 + totalMargin, 0)
     const outer = createCirclePath({
       centerX,
       centerY,

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,14 +11,13 @@ export const addCircularHoleWithRectPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
@@ -39,38 +39,41 @@ 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
   if (includeSoldermask) {
-    const smPadWidth =
-      padWidth +
-      2 * globalCopperSoldermaskMarginAdjustment +
-      (platedHole.soldermask_margin ?? 0)
-    const smPadHeight =
-      padHeight +
-      2 * globalCopperSoldermaskMarginAdjustment +
-      (platedHole.soldermask_margin ?? 0)
+    // Percent margin is additive and may be negative.
+    // Absolute per-element margin and global adjustment are always applied.
+    const percentMarginX = (solderMaskMarginPercent / 100) * padWidth
+    const percentMarginY = (solderMaskMarginPercent / 100) * padHeight
+
+    const totalMarginX = Math.max(
+      globalCopperSoldermaskMarginAdjustment +
+        (platedHole.soldermask_margin ?? 0) +
+        percentMarginX,
+      -padWidth / 2,
+    )
+    const totalMarginY = Math.max(
+      globalCopperSoldermaskMarginAdjustment +
+        (platedHole.soldermask_margin ?? 0) +
+        percentMarginY,
+      -padHeight / 2,
+    )
+    const smPadWidth = padWidth + 2 * totalMarginX
+    const smPadHeight = padHeight + 2 * totalMarginY
     const smPadPath = createRoundedRectPath({
       centerX,
       centerY,

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/addOvalPlatedHole.ts

@@ -17,6 +17,7 @@ export const addOvalPlatedHole = (
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
 
@@ -70,11 +71,26 @@ export const addOvalPlatedHole = (
     platedHole.outer_height > 0 &&
     includeSoldermask
   ) {
-    const soldermaskMargin =
+    // Percent margin is additive and may be negative.
+    // Absolute per-element margin and global adjustment are always applied.
+    const percentMarginX =
+      (solderMaskMarginPercent / 100) * platedHole.outer_width
+    const percentMarginY =
+      (solderMaskMarginPercent / 100) * platedHole.outer_height
+    const totalMarginX = Math.max(
       globalCopperSoldermaskMarginAdjustment +
-      (platedHole.soldermask_margin ?? 0)
-    const smWidth = platedHole.outer_width + 2 * soldermaskMargin
-    const smHeight = platedHole.outer_height + 2 * soldermaskMargin
+        (platedHole.soldermask_margin ?? 0) +
+        percentMarginX,
+      -platedHole.outer_width / 2,
+    )
+    const totalMarginY = Math.max(
+      globalCopperSoldermaskMarginAdjustment +
+        (platedHole.soldermask_margin ?? 0) +
+        percentMarginY,
+      -platedHole.outer_height / 2,
+    )
+    const smWidth = platedHole.outer_width + 2 * totalMarginX
+    const smHeight = platedHole.outer_height + 2 * totalMarginY
     const outer = createOvalPath({
       centerX,
       centerY,

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,14 +11,13 @@ export const addPillHoleWithRectPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
@@ -39,38 +39,40 @@ 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
     if (includeSoldermask) {
-      const smPadWidth =
-        padWidth +
-        2 * globalCopperSoldermaskMarginAdjustment +
-        (platedHole.soldermask_margin ?? 0)
-      const smPadHeight =
-        padHeight +
-        2 * globalCopperSoldermaskMarginAdjustment +
-        (platedHole.soldermask_margin ?? 0)
+      // Percent margin is additive and may be negative.
+      // Absolute per-element margin and global adjustment are always applied.
+      const percentMarginX = (solderMaskMarginPercent / 100) * padWidth
+      const percentMarginY = (solderMaskMarginPercent / 100) * padHeight
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (platedHole.soldermask_margin ?? 0) +
+          percentMarginX,
+        -padWidth / 2,
+      )
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (platedHole.soldermask_margin ?? 0) +
+          percentMarginY,
+        -padHeight / 2,
+      )
+      const smPadWidth = padWidth + 2 * totalMarginX
+      const smPadHeight = padHeight + 2 * totalMarginY
       const smPadPath = createRoundedRectPath({
         centerX,
         centerY,

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

@@ -17,6 +17,7 @@ export const addPcbPlatedHolePill = (
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
@@ -65,14 +66,26 @@ export const addPcbPlatedHolePill = (
     platedHole.outer_height > 0 &&
     includeSoldermask
   ) {
-    const smWidth =
-      platedHole.outer_width +
-      2 * globalCopperSoldermaskMarginAdjustment +
-      (platedHole.soldermask_margin ?? 0)
-    const smHeight =
-      platedHole.outer_height +
-      2 * globalCopperSoldermaskMarginAdjustment +
-      (platedHole.soldermask_margin ?? 0)
+    // Percent margin is additive and may be negative.
+    // Absolute per-element margin and global adjustment are always applied.
+    const percentMarginX =
+      (solderMaskMarginPercent / 100) * platedHole.outer_width
+    const percentMarginY =
+      (solderMaskMarginPercent / 100) * platedHole.outer_height
+    const totalMarginX = Math.max(
+      globalCopperSoldermaskMarginAdjustment +
+        (platedHole.soldermask_margin ?? 0) +
+        percentMarginX,
+      -platedHole.outer_width / 2,
+    )
+    const totalMarginY = Math.max(
+      globalCopperSoldermaskMarginAdjustment +
+        (platedHole.soldermask_margin ?? 0) +
+        percentMarginY,
+      -platedHole.outer_height / 2,
+    )
+    const smWidth = platedHole.outer_width + 2 * totalMarginX
+    const smHeight = platedHole.outer_height + 2 * totalMarginY
     const outer = createPillPath({
       centerX,
       centerY,

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,14 +11,13 @@ export const addRotatedPillHoleWithRectPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
   const centerX = platedHole.x + origin.x
@@ -42,38 +42,40 @@ 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
     if (includeSoldermask) {
-      const smPadWidth =
-        padWidth +
-        2 * globalCopperSoldermaskMarginAdjustment +
-        (platedHole.soldermask_margin ?? 0)
-      const smPadHeight =
-        padHeight +
-        2 * globalCopperSoldermaskMarginAdjustment +
-        (platedHole.soldermask_margin ?? 0)
+      // Percent margin is additive and may be negative.
+      // Absolute per-element margin and global adjustment are always applied.
+      const percentMarginX = (solderMaskMarginPercent / 100) * padWidth
+      const percentMarginY = (solderMaskMarginPercent / 100) * padHeight
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (platedHole.soldermask_margin ?? 0) +
+          percentMarginX,
+        -padWidth / 2,
+      )
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (platedHole.soldermask_margin ?? 0) +
+          percentMarginY,
+        -padHeight / 2,
+      )
+      const smPadWidth = padWidth + 2 * totalMarginX
+      const smPadHeight = padHeight + 2 * totalMarginY
       const smPadPath = createRoundedRectPath({
         centerX,
         centerY,

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,16 +10,12 @@ export const addCircleSmtPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
-    connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
 
@@ -33,50 +28,50 @@ 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
     if (includeSoldermask) {
-      const smRadius =
-        outerRadius +
+      // Percent margin is additive and may be negative.
+      // Absolute per-element margin and global adjustment are always applied.
+      const elementWidth = 2 * outerRadius
+      const elementHeight = 2 * outerRadius
+      const percentMarginX = (solderMaskMarginPercent / 100) * elementWidth
+      const percentMarginY = (solderMaskMarginPercent / 100) * elementHeight
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (smtPad.soldermask_margin ?? 0) +
+          percentMarginX,
+        -elementWidth / 2,
+      )
+      const totalMarginY = Math.max(
         globalCopperSoldermaskMarginAdjustment +
-        (smtPad.soldermask_margin ?? 0)
+          (smtPad.soldermask_margin ?? 0) +
+          percentMarginY,
+        -elementHeight / 2,
+      )
+      // Since symmetric, use totalMarginX (same as totalMarginY)
+      const smRadius = outerRadius + totalMarginX
       const outer = createCirclePath({
         centerX,
         centerY,