circuit-json-to-lbrn 0.0.37 → 0.0.38

package/dist/index.js

@@ -2029,31 +2029,9 @@ var addPcbVia = (via, ctx) => {
 // lib/element-handlers/addPcbHole/addCirclePcbHole.ts
 import { ShapePath as ShapePath16 } from "lbrnts";
 var addCirclePcbHole = (hole, ctx) => {
-  const {
-    project,
-    throughBoardCutSetting,
-    soldermaskCutSetting,
-    origin,
-    includeSoldermask,
-    includeCopper
-  } = ctx;
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   const centerX = hole.x + origin.x;
   const centerY = hole.y + origin.y;
-  if (hole.hole_diameter > 0 && includeSoldermask) {
-    const soldermaskPath = createCirclePath({
-      centerX,
-      centerY,
-      radius: hole.hole_diameter / 2 + (hole.soldermask_margin ?? 0)
-    });
-    project.children.push(
-      new ShapePath16({
-        cutIndex: soldermaskCutSetting.index,
-        verts: soldermaskPath.verts,
-        prims: soldermaskPath.prims,
-        isClosed: true
-      })
-    );
-  }
   if (hole.hole_diameter > 0 && includeCopper) {
     const radius = hole.hole_diameter / 2;
     const circlePath = createCirclePath({
@@ -2075,34 +2053,9 @@ var addCirclePcbHole = (hole, ctx) => {
 // lib/element-handlers/addPcbHole/addRectPcbHole.ts
 import { ShapePath as ShapePath17 } from "lbrnts";
 var addRectPcbHole = (hole, ctx) => {
-  const {
-    project,
-    throughBoardCutSetting,
-    soldermaskCutSetting,
-    origin,
-    includeSoldermask,
-    includeCopper
-  } = ctx;
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   const centerX = hole.x + origin.x;
   const centerY = hole.y + origin.y;
-  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
-    const soldermaskPath = createRoundedRectPath({
-      centerX,
-      centerY,
-      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
-      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0),
-      borderRadius: 0
-      // no border radius for rect holes
-    });
-    project.children.push(
-      new ShapePath17({
-        cutIndex: soldermaskCutSetting.index,
-        verts: soldermaskPath.verts,
-        prims: soldermaskPath.prims,
-        isClosed: true
-      })
-    );
-  }
   if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
     const rectPath = createRoundedRectPath({
       centerX,
@@ -2126,32 +2079,9 @@ var addRectPcbHole = (hole, ctx) => {
 // lib/element-handlers/addPcbHole/addOvalPcbHole.ts
 import { ShapePath as ShapePath18 } from "lbrnts";
 var addOvalPcbHole = (hole, ctx) => {
-  const {
-    project,
-    throughBoardCutSetting,
-    soldermaskCutSetting,
-    origin,
-    includeSoldermask,
-    includeCopper
-  } = ctx;
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   const centerX = hole.x + origin.x;
   const centerY = hole.y + origin.y;
-  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
-    const soldermaskPath = createOvalPath({
-      centerX,
-      centerY,
-      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
-      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0)
-    });
-    project.children.push(
-      new ShapePath18({
-        cutIndex: soldermaskCutSetting.index,
-        verts: soldermaskPath.verts,
-        prims: soldermaskPath.prims,
-        isClosed: true
-      })
-    );
-  }
   if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
     const ovalPath = createOvalPath({
       centerX,
@@ -2173,32 +2103,9 @@ var addOvalPcbHole = (hole, ctx) => {
 // lib/element-handlers/addPcbHole/addPillPcbHole.ts
 import { ShapePath as ShapePath19 } from "lbrnts";
 var addPillPcbHole = (hole, ctx) => {
-  const {
-    project,
-    throughBoardCutSetting,
-    soldermaskCutSetting,
-    origin,
-    includeSoldermask,
-    includeCopper
-  } = ctx;
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   const centerX = hole.x + origin.x;
   const centerY = hole.y + origin.y;
-  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
-    const soldermaskPath = createPillPath({
-      centerX,
-      centerY,
-      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
-      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0)
-    });
-    project.children.push(
-      new ShapePath19({
-        cutIndex: soldermaskCutSetting.index,
-        verts: soldermaskPath.verts,
-        prims: soldermaskPath.prims,
-        isClosed: true
-      })
-    );
-  }
   if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
     const pillPath = createPillPath({
       centerX,
@@ -2220,34 +2127,10 @@ var addPillPcbHole = (hole, ctx) => {
 // lib/element-handlers/addPcbHole/addRotatedPillPcbHole.ts
 import { ShapePath as ShapePath20 } from "lbrnts";
 var addRotatedPillPcbHole = (hole, ctx) => {
-  const {
-    project,
-    throughBoardCutSetting,
-    soldermaskCutSetting,
-    origin,
-    includeSoldermask,
-    includeCopper
-  } = ctx;
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   const centerX = hole.x + origin.x;
   const centerY = hole.y + origin.y;
   const rotation = (hole.ccw_rotation || 0) * (Math.PI / 180);
-  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
-    const soldermaskPath = createPillPath({
-      centerX,
-      centerY,
-      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
-      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0),
-      rotation
-    });
-    project.children.push(
-      new ShapePath20({
-        cutIndex: soldermaskCutSetting.index,
-        verts: soldermaskPath.verts,
-        prims: soldermaskPath.prims,
-        isClosed: true
-      })
-    );
-  }
   if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
     const pillPath = createPillPath({
       centerX,
@@ -2290,14 +2173,7 @@ var addPcbHole = (hole, ctx) => {
 // lib/element-handlers/addPcbCutout/addCirclePcbCutout.ts
 import { ShapePath as ShapePath21 } from "lbrnts";
 var addCirclePcbCutout = (cutout, ctx) => {
-  const {
-    project,
-    throughBoardCutSetting,
-    origin,
-    includeCopper,
-    includeSoldermask,
-    soldermaskCutSetting
-  } = ctx;
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   const centerX = cutout.center.x + origin.x;
   const centerY = cutout.center.y + origin.y;
   if (cutout.radius > 0 && includeCopper) {
@@ -2315,34 +2191,12 @@ var addCirclePcbCutout = (cutout, ctx) => {
       })
     );
   }
-  if (cutout.radius > 0 && includeSoldermask) {
-    const outer = createCirclePath({
-      centerX,
-      centerY,
-      radius: cutout.radius
-    });
-    project.children.push(
-      new ShapePath21({
-        cutIndex: soldermaskCutSetting.index,
-        verts: outer.verts,
-        prims: outer.prims,
-        isClosed: true
-      })
-    );
-  }
 };
 
 // lib/element-handlers/addPcbCutout/addRectPcbCutout.ts
 import { ShapePath as ShapePath22 } from "lbrnts";
 var addRectPcbCutout = (cutout, ctx) => {
-  const {
-    project,
-    throughBoardCutSetting,
-    origin,
-    includeCopper,
-    includeSoldermask,
-    soldermaskCutSetting
-  } = ctx;
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   const centerX = cutout.center.x + origin.x;
   const centerY = cutout.center.y + origin.y;
   if (cutout.width > 0 && cutout.height > 0 && includeCopper) {
@@ -2367,41 +2221,12 @@ var addRectPcbCutout = (cutout, ctx) => {
       })
     );
   }
-  if (cutout.width > 0 && cutout.height > 0 && includeSoldermask) {
-    const rotation = (cutout.rotation ?? 0) * (Math.PI / 180);
-    const rectPath = createRoundedRectPath({
-      centerX,
-      centerY,
-      width: cutout.width,
-      height: cutout.height,
-      borderRadius: 0,
-      // no border radius for cutouts
-      segments: 4,
-      // segments
-      rotation
-    });
-    project.children.push(
-      new ShapePath22({
-        cutIndex: soldermaskCutSetting.index,
-        verts: rectPath.verts,
-        prims: rectPath.prims,
-        isClosed: true
-      })
-    );
-  }
 };
 
 // lib/element-handlers/addPcbCutout/addPolygonPcbCutout.ts
 import { ShapePath as ShapePath23 } from "lbrnts";
 var addPolygonPcbCutout = (cutout, ctx) => {
-  const {
-    project,
-    throughBoardCutSetting,
-    origin,
-    includeCopper,
-    includeSoldermask,
-    soldermaskCutSetting
-  } = ctx;
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   if (cutout.points.length >= 3 && includeCopper) {
     const polygonPath = createPolygonPathFromOutline({
       outline: cutout.points,
@@ -2417,34 +2242,12 @@ var addPolygonPcbCutout = (cutout, ctx) => {
       })
     );
   }
-  if (cutout.points.length >= 3 && includeSoldermask) {
-    const polygonPath = createPolygonPathFromOutline({
-      outline: cutout.points,
-      offsetX: origin.x,
-      offsetY: origin.y
-    });
-    project.children.push(
-      new ShapePath23({
-        cutIndex: soldermaskCutSetting.index,
-        verts: polygonPath.verts,
-        prims: polygonPath.prims,
-        isClosed: true
-      })
-    );
-  }
 };
 
 // lib/element-handlers/addPcbCutout/addPathPcbCutout.ts
 import { ShapePath as ShapePath24 } from "lbrnts";
 var addPathPcbCutout = (cutout, ctx) => {
-  const {
-    project,
-    throughBoardCutSetting,
-    origin,
-    includeCopper,
-    includeSoldermask,
-    soldermaskCutSetting
-  } = ctx;
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   if (cutout.route.length >= 2 && includeCopper) {
     const verts = [];
     const prims = [];
@@ -2465,26 +2268,6 @@ var addPathPcbCutout = (cutout, ctx) => {
       })
     );
   }
-  if (cutout.route.length >= 2 && includeSoldermask) {
-    const verts = [];
-    const prims = [];
-    for (const point6 of cutout.route) {
-      verts.push({
-        x: point6.x + origin.x,
-        y: point6.y + origin.y
-      });
-      prims.push({ type: 0 });
-    }
-    project.children.push(
-      new ShapePath24({
-        cutIndex: soldermaskCutSetting.index,
-        verts,
-        prims,
-        isClosed: false
-        // Match the same path as the copper cutout
-      })
-    );
-  }
 };
 
 // lib/element-handlers/addPcbCutout/index.ts

package/lib/element-handlers/addPcbCutout/addCirclePcbCutout.ts

@@ -11,14 +11,7 @@ export const addCirclePcbCutout = (
   cutout: PcbCutoutCircle,
   ctx: ConvertContext,
 ): void => {
-  const {
-    project,
-    throughBoardCutSetting,
-    origin,
-    includeCopper,
-    includeSoldermask,
-    soldermaskCutSetting,
-  } = ctx
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx
   const centerX = cutout.center.x + origin.x
   const centerY = cutout.center.y + origin.y
 
@@ -38,21 +31,4 @@ export const addCirclePcbCutout = (
       }),
     )
   }
-
-  // Add soldermask opening if drawing soldermask
-  if (cutout.radius > 0 && includeSoldermask) {
-    const outer = createCirclePath({
-      centerX,
-      centerY,
-      radius: cutout.radius,
-    })
-    project.children.push(
-      new ShapePath({
-        cutIndex: soldermaskCutSetting.index,
-        verts: outer.verts,
-        prims: outer.prims,
-        isClosed: true,
-      }),
-    )
-  }
 }

package/lib/element-handlers/addPcbCutout/addPathPcbCutout.ts

@@ -10,14 +10,7 @@ export const addPathPcbCutout = (
   cutout: PcbCutoutPath,
   ctx: ConvertContext,
 ): void => {
-  const {
-    project,
-    throughBoardCutSetting,
-    origin,
-    includeCopper,
-    includeSoldermask,
-    soldermaskCutSetting,
-  } = ctx
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx
 
   // For path cutouts, we need to create a stroke along the route with the given width
   // For simplicity, we'll convert the path to a polyline
@@ -45,28 +38,4 @@ export const addPathPcbCutout = (
       }),
     )
   }
-
-  // Add soldermask opening if drawing soldermask
-  if (cutout.route.length >= 2 && includeSoldermask) {
-    const verts: { x: number; y: number }[] = []
-    const prims: { type: number }[] = []
-
-    // Create path with soldermask margin
-    for (const point of cutout.route) {
-      verts.push({
-        x: point.x + origin.x,
-        y: point.y + origin.y,
-      })
-      prims.push({ type: 0 })
-    }
-
-    project.children.push(
-      new ShapePath({
-        cutIndex: soldermaskCutSetting.index,
-        verts,
-        prims,
-        isClosed: false, // Match the same path as the copper cutout
-      }),
-    )
-  }
 }

package/lib/element-handlers/addPcbCutout/addPolygonPcbCutout.ts

@@ -11,14 +11,7 @@ export const addPolygonPcbCutout = (
   cutout: PcbCutoutPolygon,
   ctx: ConvertContext,
 ): void => {
-  const {
-    project,
-    throughBoardCutSetting,
-    origin,
-    includeCopper,
-    includeSoldermask,
-    soldermaskCutSetting,
-  } = ctx
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx
 
   // Add the cutout - cut through the board
   if (cutout.points.length >= 3 && includeCopper) {
@@ -36,21 +29,4 @@ export const addPolygonPcbCutout = (
       }),
     )
   }
-
-  // Add soldermask opening if drawing soldermask
-  if (cutout.points.length >= 3 && includeSoldermask) {
-    const polygonPath = createPolygonPathFromOutline({
-      outline: cutout.points,
-      offsetX: origin.x,
-      offsetY: origin.y,
-    })
-    project.children.push(
-      new ShapePath({
-        cutIndex: soldermaskCutSetting.index,
-        verts: polygonPath.verts,
-        prims: polygonPath.prims,
-        isClosed: true,
-      }),
-    )
-  }
 }

package/lib/element-handlers/addPcbCutout/addRectPcbCutout.ts

@@ -11,14 +11,7 @@ export const addRectPcbCutout = (
   cutout: PcbCutoutRect,
   ctx: ConvertContext,
 ): void => {
-  const {
-    project,
-    throughBoardCutSetting,
-    origin,
-    includeCopper,
-    includeSoldermask,
-    soldermaskCutSetting,
-  } = ctx
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx
   const centerX = cutout.center.x + origin.x
   const centerY = cutout.center.y + origin.y
 
@@ -43,26 +36,4 @@ export const addRectPcbCutout = (
       }),
     )
   }
-
-  // Add soldermask opening if drawing soldermask
-  if (cutout.width > 0 && cutout.height > 0 && includeSoldermask) {
-    const rotation = (cutout.rotation ?? 0) * (Math.PI / 180) // Convert degrees to radians
-    const rectPath = createRoundedRectPath({
-      centerX,
-      centerY,
-      width: cutout.width,
-      height: cutout.height,
-      borderRadius: 0, // no border radius for cutouts
-      segments: 4, // segments
-      rotation,
-    })
-    project.children.push(
-      new ShapePath({
-        cutIndex: soldermaskCutSetting.index,
-        verts: rectPath.verts,
-        prims: rectPath.prims,
-        isClosed: true,
-      }),
-    )
-  }
 }

package/lib/element-handlers/addPcbHole/addCirclePcbHole.ts

@@ -10,34 +10,10 @@ export const addCirclePcbHole = (
   hole: PcbHoleCircle | PcbHoleCircleOrSquare,
   ctx: ConvertContext,
 ): void => {
-  const {
-    project,
-    throughBoardCutSetting,
-    soldermaskCutSetting,
-    origin,
-    includeSoldermask,
-    includeCopper,
-  } = ctx
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx
   const centerX = hole.x + origin.x
   const centerY = hole.y + origin.y
 
-  // Add soldermask opening if drawing soldermask
-  if (hole.hole_diameter > 0 && includeSoldermask) {
-    const soldermaskPath = createCirclePath({
-      centerX,
-      centerY,
-      radius: hole.hole_diameter / 2 + (hole.soldermask_margin ?? 0),
-    })
-    project.children.push(
-      new ShapePath({
-        cutIndex: soldermaskCutSetting.index,
-        verts: soldermaskPath.verts,
-        prims: soldermaskPath.prims,
-        isClosed: true,
-      }),
-    )
-  }
-
   // Add the hole - cut through the board
   if (hole.hole_diameter > 0 && includeCopper) {
     const radius = hole.hole_diameter / 2

package/lib/element-handlers/addPcbHole/addOvalPcbHole.ts

@@ -10,35 +10,10 @@ export const addOvalPcbHole = (
   hole: PcbHoleOval,
   ctx: ConvertContext,
 ): void => {
-  const {
-    project,
-    throughBoardCutSetting,
-    soldermaskCutSetting,
-    origin,
-    includeSoldermask,
-    includeCopper,
-  } = ctx
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx
   const centerX = hole.x + origin.x
   const centerY = hole.y + origin.y
 
-  // Add soldermask opening if drawing soldermask
-  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
-    const soldermaskPath = createOvalPath({
-      centerX,
-      centerY,
-      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
-      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0),
-    })
-    project.children.push(
-      new ShapePath({
-        cutIndex: soldermaskCutSetting.index,
-        verts: soldermaskPath.verts,
-        prims: soldermaskPath.prims,
-        isClosed: true,
-      }),
-    )
-  }
-
   // Add the hole - cut through the board
   if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
     const ovalPath = createOvalPath({

package/lib/element-handlers/addPcbHole/addPillPcbHole.ts

@@ -10,35 +10,10 @@ export const addPillPcbHole = (
   hole: PcbHolePill,
   ctx: ConvertContext,
 ): void => {
-  const {
-    project,
-    throughBoardCutSetting,
-    soldermaskCutSetting,
-    origin,
-    includeSoldermask,
-    includeCopper,
-  } = ctx
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx
   const centerX = hole.x + origin.x
   const centerY = hole.y + origin.y
 
-  // Add soldermask opening if drawing soldermask
-  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
-    const soldermaskPath = createPillPath({
-      centerX,
-      centerY,
-      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
-      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0),
-    })
-    project.children.push(
-      new ShapePath({
-        cutIndex: soldermaskCutSetting.index,
-        verts: soldermaskPath.verts,
-        prims: soldermaskPath.prims,
-        isClosed: true,
-      }),
-    )
-  }
-
   // Add the hole - cut through the board
   if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
     const pillPath = createPillPath({

package/lib/element-handlers/addPcbHole/addRectPcbHole.ts

@@ -10,36 +10,10 @@ export const addRectPcbHole = (
   hole: PcbHoleRect,
   ctx: ConvertContext,
 ): void => {
-  const {
-    project,
-    throughBoardCutSetting,
-    soldermaskCutSetting,
-    origin,
-    includeSoldermask,
-    includeCopper,
-  } = ctx
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx
   const centerX = hole.x + origin.x
   const centerY = hole.y + origin.y
 
-  // Add soldermask opening if drawing soldermask
-  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
-    const soldermaskPath = createRoundedRectPath({
-      centerX,
-      centerY,
-      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
-      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0),
-      borderRadius: 0, // no border radius for rect holes
-    })
-    project.children.push(
-      new ShapePath({
-        cutIndex: soldermaskCutSetting.index,
-        verts: soldermaskPath.verts,
-        prims: soldermaskPath.prims,
-        isClosed: true,
-      }),
-    )
-  }
-
   // Add the hole - cut through the board
   if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
     const rectPath = createRoundedRectPath({

package/lib/element-handlers/addPcbHole/addRotatedPillPcbHole.ts

@@ -10,37 +10,11 @@ export const addRotatedPillPcbHole = (
   hole: PcbHoleRotatedPill,
   ctx: ConvertContext,
 ): void => {
-  const {
-    project,
-    throughBoardCutSetting,
-    soldermaskCutSetting,
-    origin,
-    includeSoldermask,
-    includeCopper,
-  } = ctx
+  const { project, throughBoardCutSetting, origin, includeCopper } = ctx
   const centerX = hole.x + origin.x
   const centerY = hole.y + origin.y
   const rotation = (hole.ccw_rotation || 0) * (Math.PI / 180) // Convert degrees to radians
 
-  // Add soldermask opening if drawing soldermask
-  if (hole.hole_width > 0 && hole.hole_height > 0 && includeSoldermask) {
-    const soldermaskPath = createPillPath({
-      centerX,
-      centerY,
-      width: hole.hole_width + 2 * (hole.soldermask_margin ?? 0),
-      height: hole.hole_height + 2 * (hole.soldermask_margin ?? 0),
-      rotation,
-    })
-    project.children.push(
-      new ShapePath({
-        cutIndex: soldermaskCutSetting.index,
-        verts: soldermaskPath.verts,
-        prims: soldermaskPath.prims,
-        isClosed: true,
-      }),
-    )
-  }
-
   // Add the hole - cut through the board
   if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
     const pillPath = createPillPath({

package/package.json

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