circuit-json-to-lbrn 0.0.39 → 0.0.41

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,16 +10,12 @@ export const addPillSmtPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
-    connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
 
@@ -32,11 +28,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,37 +39,36 @@ 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
     if (includeSoldermask) {
-      const smWidth =
-        smtPad.width +
-        2 * globalCopperSoldermaskMarginAdjustment +
-        (smtPad.soldermask_margin ?? 0)
-      const smHeight =
-        smtPad.height +
-        2 * globalCopperSoldermaskMarginAdjustment +
-        (smtPad.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) * smtPad.width
+      const percentMarginY = (solderMaskMarginPercent / 100) * smtPad.height
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (smtPad.soldermask_margin ?? 0) +
+          percentMarginX,
+        -smtPad.width / 2,
+      )
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (smtPad.soldermask_margin ?? 0) +
+          percentMarginY,
+        -smtPad.height / 2,
+      )
+      const smWidth = smtPad.width + 2 * totalMarginX
+      const smHeight = smtPad.height + 2 * totalMarginY
       const smOuter = createPillPath({
         centerX,
         centerY,

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,16 +11,12 @@ export const addPolygonSmtPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
-    connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
 
@@ -33,11 +29,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 +37,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,20 +2,17 @@ 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,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
 
@@ -33,66 +30,47 @@ 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
   if (includeSoldermask) {
-    const smHalfWidth =
-      halfWidth +
+    // Percent margin is additive and may be negative.
+    // Absolute per-element margin and global adjustment are always applied.
+    const percentMarginX = (solderMaskMarginPercent / 100) * smtPad.width
+    const percentMarginY = (solderMaskMarginPercent / 100) * smtPad.height
+    const totalMarginX = Math.max(
       globalCopperSoldermaskMarginAdjustment +
-      (smtPad.soldermask_margin ?? 0)
-    const smHalfHeight =
-      halfHeight +
+        (smtPad.soldermask_margin ?? 0) +
+        percentMarginX,
+      -smtPad.width / 2,
+    )
+    const totalMarginY = Math.max(
       globalCopperSoldermaskMarginAdjustment +
-      (smtPad.soldermask_margin ?? 0)
+        (smtPad.soldermask_margin ?? 0) +
+        percentMarginY,
+      -smtPad.height / 2,
+    )
+    const smHalfWidth = halfWidth + totalMarginX
+    const smHalfHeight = halfHeight + totalMarginY
 
     const verts = [
       { x: centerX - smHalfWidth, y: centerY - smHalfHeight },

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,16 +10,12 @@ export const addRotatedPillSmtPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
-    connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
 
@@ -32,11 +28,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,37 +40,36 @@ 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
     if (includeSoldermask) {
-      const smWidth =
-        smtPad.width +
-        2 * globalCopperSoldermaskMarginAdjustment +
-        (smtPad.soldermask_margin ?? 0)
-      const smHeight =
-        smtPad.height +
-        2 * globalCopperSoldermaskMarginAdjustment +
-        (smtPad.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) * smtPad.width
+      const percentMarginY = (solderMaskMarginPercent / 100) * smtPad.height
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (smtPad.soldermask_margin ?? 0) +
+          percentMarginX,
+        -smtPad.width / 2,
+      )
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (smtPad.soldermask_margin ?? 0) +
+          percentMarginY,
+        -smtPad.height / 2,
+      )
+      const smWidth = smtPad.width + 2 * totalMarginX
+      const smHeight = smtPad.height + 2 * totalMarginY
       const smOuter = createPillPath({
         centerX,
         centerY,

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,16 +10,12 @@ export const addRotatedRectSmtPad = (
 ): void => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
-    connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers,
   } = ctx
 
@@ -32,11 +28,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,37 +44,36 @@ 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
     if (includeSoldermask) {
-      const smWidth =
-        smtPad.width +
-        2 * globalCopperSoldermaskMarginAdjustment +
-        (smtPad.soldermask_margin ?? 0)
-      const smHeight =
-        smtPad.height +
-        2 * globalCopperSoldermaskMarginAdjustment +
-        (smtPad.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) * smtPad.width
+      const percentMarginY = (solderMaskMarginPercent / 100) * smtPad.height
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (smtPad.soldermask_margin ?? 0) +
+          percentMarginX,
+        -smtPad.width / 2,
+      )
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment +
+          (smtPad.soldermask_margin ?? 0) +
+          percentMarginY,
+        -smtPad.height / 2,
+      )
+      const smWidth = smtPad.width + 2 * totalMarginX
+      const smHeight = smtPad.height + 2 * totalMarginY
       const smOuter = createRoundedRectPath({
         centerX,
         centerY,

package/lib/helpers/addCopperGeometryToNetOrProject.ts

@@ -0,0 +1,48 @@
+import type { ConvertContext } from "../ConvertContext"
+import { ShapePath } from "lbrnts"
+import { pathToPolygon } from "./pathToPolygon"
+
+export const addCopperGeometryToNetOrProject = ({
+  geometryId,
+  path,
+  layer,
+  ctx,
+}: {
+  geometryId: string
+  path: { verts: { x: number; y: number }[]; prims: Array<{ type: number }> }
+  layer: "top" | "bottom"
+  ctx: ConvertContext
+}) => {
+  const {
+    project,
+    connMap,
+    topCutNetGeoms,
+    bottomCutNetGeoms,
+    topCopperCutSetting,
+    bottomCopperCutSetting,
+    includeLayers,
+  } = ctx
+
+  if (!includeLayers.includes(layer)) return
+
+  const netId = connMap.getNetConnectedToId(geometryId)
+  const cutSetting =
+    layer === "top" ? topCopperCutSetting : bottomCopperCutSetting
+  const netGeoms = layer === "top" ? topCutNetGeoms : bottomCutNetGeoms
+
+  if (netId) {
+    // Add to netGeoms for union with other elements on same net
+    const polygon = pathToPolygon(path.verts)
+    netGeoms.get(netId)?.push(polygon)
+  } else {
+    // No net connection - draw directly to project
+    project.children.push(
+      new ShapePath({
+        cutIndex: cutSetting.index,
+        verts: path.verts,
+        prims: path.prims,
+        isClosed: true,
+      }),
+    )
+  }
+}

package/lib/index.ts

@@ -24,6 +24,7 @@ export interface ConvertCircuitJsonToLbrnOptions {
   includeCopper?: boolean
   includeSoldermask?: boolean
   globalCopperSoldermaskMarginAdjustment?: number
+  solderMaskMarginPercent?: number
   includeLayers?: Array<"top" | "bottom">
   traceMargin?: number
   laserSpotSize?: number
@@ -60,6 +61,7 @@ export const convertCircuitJsonToLbrn = (
   const includeSoldermask = options.includeSoldermask ?? false
   const globalCopperSoldermaskMarginAdjustment =
     options.globalCopperSoldermaskMarginAdjustment ?? 0
+  const solderMaskMarginPercent = options.solderMaskMarginPercent ?? 0
   const laserProfile = options.laserProfile
 
   // Default laser settings from GitHub issue
@@ -198,6 +200,7 @@ export const convertCircuitJsonToLbrn = (
     laserSpotSize,
     topTraceClearanceAreaCutSetting,
     bottomTraceClearanceAreaCutSetting,
+    solderMaskMarginPercent,
   }
 
   // Initialize net geometry maps

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "circuit-json-to-lbrn",
   "main": "dist/index.js",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "type": "module",
   "scripts": {
     "start": "bun run site/index.html",