circuit-json-to-lbrn 0.0.20 → 0.0.21

package/dist/index.js

@@ -6,7 +6,12 @@ import { cju as cju2 } from "@tscircuit/circuit-json-util";
 import { ShapePath } from "lbrnts";
 
 // lib/helpers/circleShape.ts
-var createCirclePath = (centerX, centerY, radius, segments = 64) => {
+var createCirclePath = ({
+  centerX,
+  centerY,
+  radius,
+  segments = 64
+}) => {
   const verts = [];
   const prims = [];
   for (let i = 0; i < segments; i++) {
@@ -65,7 +70,11 @@ var addCirclePlatedHole = (platedHole, ctx) => {
     if (netId) {
       ctx.netGeoms.get(netId)?.push(polygon);
     } else {
-      const outer = createCirclePath(centerX, centerY, outerRadius);
+      const outer = createCirclePath({
+        centerX,
+        centerY,
+        radius: outerRadius
+      });
       project.children.push(
         new ShapePath({
           cutIndex: copperCutSetting.index,
@@ -78,7 +87,11 @@ var addCirclePlatedHole = (platedHole, ctx) => {
   }
   if (platedHole.outer_diameter > 0 && includeSoldermask) {
     const smRadius = platedHole.outer_diameter / 2 + soldermaskMargin;
-    const outer = createCirclePath(centerX, centerY, smRadius);
+    const outer = createCirclePath({
+      centerX,
+      centerY,
+      radius: smRadius
+    });
     project.children.push(
       new ShapePath({
         cutIndex: soldermaskCutSetting.index,
@@ -90,7 +103,11 @@ var addCirclePlatedHole = (platedHole, ctx) => {
   }
   if (platedHole.hole_diameter > 0 && includeCopper) {
     const innerRadius = platedHole.hole_diameter / 2;
-    const inner = createCirclePath(centerX, centerY, innerRadius);
+    const inner = createCirclePath({
+      centerX,
+      centerY,
+      radius: innerRadius
+    });
     project.children.push(
       new ShapePath({
         cutIndex: throughBoardCutSetting.index,
@@ -106,7 +123,14 @@ var addCirclePlatedHole = (platedHole, ctx) => {
 import { ShapePath as ShapePath2 } from "lbrnts";
 
 // lib/helpers/ovalShape.ts
-var createOvalPath = (centerX, centerY, width, height, rotation = 0, segments = 64) => {
+var createOvalPath = ({
+  centerX,
+  centerY,
+  width,
+  height,
+  rotation = 0,
+  segments = 64
+}) => {
   const verts = [];
   const prims = [];
   const radiusX = width / 2;
@@ -151,13 +175,13 @@ var addOvalPlatedHole = (platedHole, ctx) => {
   const centerY = platedHole.y + origin.y;
   const rotation = (platedHole.ccw_rotation ?? 0) * (Math.PI / 180);
   if (platedHole.outer_width > 0 && platedHole.outer_height > 0 && includeCopper) {
-    const outer = createOvalPath(
+    const outer = createOvalPath({
       centerX,
       centerY,
-      platedHole.outer_width,
-      platedHole.outer_height,
+      width: platedHole.outer_width,
+      height: platedHole.outer_height,
       rotation
-    );
+    });
     project.children.push(
       new ShapePath2({
         cutIndex: copperCutSetting.index,
@@ -170,7 +194,13 @@ var addOvalPlatedHole = (platedHole, ctx) => {
   if (platedHole.outer_width > 0 && platedHole.outer_height > 0 && includeSoldermask) {
     const smWidth = platedHole.outer_width + 2 * soldermaskMargin;
     const smHeight = platedHole.outer_height + 2 * soldermaskMargin;
-    const outer = createOvalPath(centerX, centerY, smWidth, smHeight, rotation);
+    const outer = createOvalPath({
+      centerX,
+      centerY,
+      width: smWidth,
+      height: smHeight,
+      rotation
+    });
     project.children.push(
       new ShapePath2({
         cutIndex: soldermaskCutSetting.index,
@@ -181,13 +211,13 @@ var addOvalPlatedHole = (platedHole, ctx) => {
     );
   }
   if (platedHole.hole_width > 0 && platedHole.hole_height > 0 && includeCopper) {
-    const inner = createOvalPath(
+    const inner = createOvalPath({
       centerX,
       centerY,
-      platedHole.hole_width,
-      platedHole.hole_height,
+      width: platedHole.hole_width,
+      height: platedHole.hole_height,
       rotation
-    );
+    });
     project.children.push(
       new ShapePath2({
         cutIndex: throughBoardCutSetting.index,
@@ -203,7 +233,15 @@ var addOvalPlatedHole = (platedHole, ctx) => {
 import { ShapePath as ShapePath3 } from "lbrnts";
 
 // lib/helpers/roundedRectShape.ts
-var createRoundedRectPath = (centerX, centerY, width, height, borderRadius = 0, segments = 4, rotation = 0) => {
+var createRoundedRectPath = ({
+  centerX,
+  centerY,
+  width,
+  height,
+  borderRadius = 0,
+  segments = 4,
+  rotation = 0
+}) => {
   const verts = [];
   const prims = [];
   const halfWidth = width / 2;
@@ -301,13 +339,13 @@ var addCircularHoleWithRectPad = (platedHole, ctx) => {
   const padWidth = platedHole.rect_pad_width;
   const padHeight = platedHole.rect_pad_height;
   const borderRadius = platedHole.rect_border_radius ?? 0;
-  const padPath = createRoundedRectPath(
+  const padPath = createRoundedRectPath({
     centerX,
     centerY,
-    padWidth,
-    padHeight,
+    width: padWidth,
+    height: padHeight,
     borderRadius
-  );
+  });
   if (includeCopper) {
     project.children.push(
       new ShapePath3({
@@ -321,13 +359,13 @@ var addCircularHoleWithRectPad = (platedHole, ctx) => {
   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
-    );
+    });
     project.children.push(
       new ShapePath3({
         cutIndex: soldermaskCutSetting.index,
@@ -340,7 +378,12 @@ var addCircularHoleWithRectPad = (platedHole, ctx) => {
   if (holeRadius > 0 && includeCopper) {
     const holeCenterX = centerX + platedHole.hole_offset_x;
     const holeCenterY = centerY + platedHole.hole_offset_y;
-    const holePath = createCirclePath(holeCenterX, holeCenterY, holeRadius, 32);
+    const holePath = createCirclePath({
+      centerX: holeCenterX,
+      centerY: holeCenterY,
+      radius: holeRadius,
+      segments: 32
+    });
     project.children.push(
       new ShapePath3({
         cutIndex: throughBoardCutSetting.index,
@@ -356,7 +399,11 @@ var addCircularHoleWithRectPad = (platedHole, ctx) => {
 import { ShapePath as ShapePath4 } from "lbrnts";
 
 // lib/helpers/pathPointUtils.ts
-var createPointAdder = (verts, prims, options = {}) => {
+var createPointAdder = ({
+  verts,
+  prims,
+  options = {}
+}) => {
   const { rotation = 0, rotationCenter, translation } = options;
   const cos = Math.cos(rotation);
   const sin = Math.sin(rotation);
@@ -380,16 +427,27 @@ var createPointAdder = (verts, prims, options = {}) => {
 };
 
 // lib/helpers/pillShape.ts
-var createPillPath = (centerX, centerY, width, height, rotation = 0, segments = 32) => {
+var createPillPath = ({
+  centerX,
+  centerY,
+  width,
+  height,
+  rotation = 0,
+  segments = 32
+}) => {
   const verts = [];
   const prims = [];
   const halfWidth = width / 2;
   const halfHeight = height / 2;
   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) {
     const capOffset = halfHeight - radius;
@@ -452,13 +510,13 @@ var addPillHoleWithRectPad = (platedHole, ctx) => {
   const padHeight = platedHole.rect_pad_height;
   const borderRadius = platedHole.rect_border_radius ?? 0;
   if (padWidth > 0 && padHeight > 0) {
-    const padPath = createRoundedRectPath(
+    const padPath = createRoundedRectPath({
       centerX,
       centerY,
-      padWidth,
-      padHeight,
+      width: padWidth,
+      height: padHeight,
       borderRadius
-    );
+    });
     if (includeCopper) {
       project.children.push(
         new ShapePath4({
@@ -472,13 +530,13 @@ var addPillHoleWithRectPad = (platedHole, ctx) => {
     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
-      );
+      });
       project.children.push(
         new ShapePath4({
           cutIndex: soldermaskCutSetting.index,
@@ -494,12 +552,12 @@ var addPillHoleWithRectPad = (platedHole, ctx) => {
   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
-    );
+    const holePath = createPillPath({
+      centerX: holeCenterX,
+      centerY: holeCenterY,
+      width: holeWidth,
+      height: holeHeight
+    });
     project.children.push(
       new ShapePath4({
         cutIndex: throughBoardCutSetting.index,
@@ -531,15 +589,15 @@ var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
   const borderRadius = platedHole.rect_border_radius ?? 0;
   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
+    });
     if (includeCopper) {
       project.children.push(
         new ShapePath5({
@@ -553,15 +611,15 @@ var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
     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 ShapePath5({
           cutIndex: soldermaskCutSetting.index,
@@ -578,13 +636,13 @@ var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
   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 ShapePath5({
         cutIndex: throughBoardCutSetting.index,
@@ -600,7 +658,11 @@ var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
 import { ShapePath as ShapePath6 } from "lbrnts";
 
 // lib/helpers/polygonShape.ts
-var createPolygonPathFromOutline = (outline, offsetX, offsetY) => {
+var createPolygonPathFromOutline = ({
+  outline,
+  offsetX,
+  offsetY
+}) => {
   const verts = [];
   for (const point6 of outline) {
     const x = (point6.x ?? 0) + offsetX;
@@ -629,11 +691,11 @@ var addHoleWithPolygonPad = (platedHole, ctx) => {
     soldermaskMargin
   } = ctx;
   if (platedHole.pad_outline.length >= 3 && includeCopper) {
-    const pad = createPolygonPathFromOutline(
-      platedHole.pad_outline,
-      platedHole.x + origin.x,
-      platedHole.y + origin.y
-    );
+    const pad = createPolygonPathFromOutline({
+      outline: platedHole.pad_outline,
+      offsetX: platedHole.x + origin.x,
+      offsetY: platedHole.y + origin.y
+    });
     if (includeCopper) {
       project.children.push(
         new ShapePath6({
@@ -659,7 +721,12 @@ var addHoleWithPolygonPad = (platedHole, ctx) => {
     const centerX = platedHole.x + platedHole.hole_offset_x + origin.x;
     const centerY = platedHole.y + platedHole.hole_offset_y + origin.y;
     const radius = platedHole.hole_diameter / 2;
-    const hole = createCirclePath(centerX, centerY, radius, 64);
+    const hole = createCirclePath({
+      centerX,
+      centerY,
+      radius,
+      segments: 64
+    });
     project.children.push(
       new ShapePath6({
         cutIndex: throughBoardCutSetting.index,
@@ -673,7 +740,12 @@ var addHoleWithPolygonPad = (platedHole, ctx) => {
     const centerX = platedHole.x + platedHole.hole_offset_x + origin.x;
     const centerY = platedHole.y + platedHole.hole_offset_y + origin.y;
     const radius = platedHole.hole_diameter / 2;
-    const hole = createCirclePath(centerX, centerY, radius, 64);
+    const hole = createCirclePath({
+      centerX,
+      centerY,
+      radius,
+      segments: 64
+    });
     project.children.push(
       new ShapePath6({
         cutIndex: throughBoardCutSetting.index,
@@ -702,13 +774,13 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
   const centerY = platedHole.y + origin.y;
   const rotation = (platedHole.ccw_rotation || 0) * (Math.PI / 180);
   if (platedHole.outer_width > 0 && platedHole.outer_height > 0 && includeCopper) {
-    const outer = createPillPath(
+    const outer = createPillPath({
       centerX,
       centerY,
-      platedHole.outer_width,
-      platedHole.outer_height,
+      width: platedHole.outer_width,
+      height: platedHole.outer_height,
       rotation
-    );
+    });
     project.children.push(
       new ShapePath7({
         cutIndex: copperCutSetting.index,
@@ -721,7 +793,13 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
   if (platedHole.outer_width > 0 && platedHole.outer_height > 0 && includeSoldermask) {
     const smWidth = platedHole.outer_width + 2 * soldermaskMargin;
     const smHeight = platedHole.outer_height + 2 * soldermaskMargin;
-    const outer = createPillPath(centerX, centerY, smWidth, smHeight, rotation);
+    const outer = createPillPath({
+      centerX,
+      centerY,
+      width: smWidth,
+      height: smHeight,
+      rotation
+    });
     project.children.push(
       new ShapePath7({
         cutIndex: soldermaskCutSetting.index,
@@ -732,13 +810,13 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
     );
   }
   if (platedHole.hole_width > 0 && platedHole.hole_height > 0 && includeCopper) {
-    const inner = createPillPath(
+    const inner = createPillPath({
       centerX,
       centerY,
-      platedHole.hole_width,
-      platedHole.hole_height,
+      width: platedHole.hole_width,
+      height: platedHole.hole_height,
       rotation
-    );
+    });
     project.children.push(
       new ShapePath7({
         cutIndex: throughBoardCutSetting.index,
@@ -883,7 +961,11 @@ var addCircleSmtPad = (smtPad, ctx) => {
       if (netId) {
         ctx.netGeoms.get(netId)?.push(polygon);
       } else {
-        const outer = createCirclePath(centerX, centerY, outerRadius);
+        const outer = createCirclePath({
+          centerX,
+          centerY,
+          radius: outerRadius
+        });
         project.children.push(
           new ShapePath9({
             cutIndex: copperCutSetting.index,
@@ -896,7 +978,11 @@ var addCircleSmtPad = (smtPad, ctx) => {
     }
     if (includeSoldermask) {
       const smRadius = outerRadius + soldermaskMargin;
-      const outer = createCirclePath(centerX, centerY, smRadius);
+      const outer = createCirclePath({
+        centerX,
+        centerY,
+        radius: smRadius
+      });
       project.children.push(
         new ShapePath9({
           cutIndex: soldermaskCutSetting.index,
@@ -934,7 +1020,12 @@ var addPillSmtPad = (smtPad, ctx) => {
   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
+    });
     if (includeCopper) {
       const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id);
       const polygon = pathToPolygon(outer.verts);
@@ -954,7 +1045,12 @@ var addPillSmtPad = (smtPad, ctx) => {
     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 ShapePath10({
           cutIndex: soldermaskCutSetting.index,
@@ -983,13 +1079,13 @@ var addRotatedPillSmtPad = (smtPad, ctx) => {
   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)
+    });
     if (includeCopper) {
       const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id);
       const polygon = pathToPolygon(outer.verts);
@@ -1009,13 +1105,13 @@ var addRotatedPillSmtPad = (smtPad, ctx) => {
     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 ShapePath11({
           cutIndex: soldermaskCutSetting.index,
@@ -1071,7 +1167,11 @@ var addPolygonSmtPad = (smtPad, ctx) => {
     soldermaskMargin
   } = ctx;
   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
+    });
     if (includeCopper) {
       const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id);
       const polygon = pathToPolygon(pad.verts);
@@ -1119,15 +1219,15 @@ var addRotatedRectSmtPad = (smtPad, ctx) => {
   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
-    );
+    });
     if (includeCopper) {
       const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id);
       const polygon = pathToPolygon(outer.verts);
@@ -1147,15 +1247,15 @@ var addRotatedRectSmtPad = (smtPad, ctx) => {
     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 ShapePath13({
           cutIndex: soldermaskCutSetting.index,
@@ -1399,7 +1499,11 @@ var addPcbVia = (via, ctx) => {
     if (netId) {
       ctx.netGeoms.get(netId)?.push(polygon);
     } else {
-      const outer = createCirclePath(centerX, centerY, outerRadius);
+      const outer = createCirclePath({
+        centerX,
+        centerY,
+        radius: outerRadius
+      });
       project.children.push(
         new ShapePath15({
           cutIndex: copperCutSetting.index,
@@ -1412,7 +1516,11 @@ var addPcbVia = (via, ctx) => {
   }
   if (via.outer_diameter > 0 && includeSoldermask) {
     const smRadius = via.outer_diameter / 2 + soldermaskMargin;
-    const outer = createCirclePath(centerX, centerY, smRadius);
+    const outer = createCirclePath({
+      centerX,
+      centerY,
+      radius: smRadius
+    });
     project.children.push(
       new ShapePath15({
         cutIndex: soldermaskCutSetting.index,
@@ -1424,7 +1532,11 @@ var addPcbVia = (via, ctx) => {
   }
   if (via.hole_diameter > 0 && includeCopper) {
     const innerRadius = via.hole_diameter / 2;
-    const inner = createCirclePath(centerX, centerY, innerRadius);
+    const inner = createCirclePath({
+      centerX,
+      centerY,
+      radius: innerRadius
+    });
     project.children.push(
       new ShapePath15({
         cutIndex: throughBoardCutSetting.index,
@@ -1452,7 +1564,11 @@ var addCirclePcbHole = (hole, ctx) => {
   const centerY = hole.y + origin.y;
   if (hole.hole_diameter > 0 && includeSoldermask) {
     const smRadius = hole.hole_diameter / 2 + soldermaskMargin;
-    const soldermaskPath = createCirclePath(centerX, centerY, smRadius);
+    const soldermaskPath = createCirclePath({
+      centerX,
+      centerY,
+      radius: smRadius
+    });
     project.children.push(
       new ShapePath16({
         cutIndex: soldermaskCutSetting.index,
@@ -1464,7 +1580,11 @@ var addCirclePcbHole = (hole, ctx) => {
   }
   if (hole.hole_diameter > 0 && includeCopper) {
     const radius = hole.hole_diameter / 2;
-    const circlePath = createCirclePath(centerX, centerY, radius);
+    const circlePath = createCirclePath({
+      centerX,
+      centerY,
+      radius
+    });
     project.children.push(
       new ShapePath16({
         cutIndex: throughBoardCutSetting.index,
@@ -1491,14 +1611,14 @@ var addRectPcbHole = (hole, 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(
+    const soldermaskPath = createRoundedRectPath({
       centerX,
       centerY,
-      hole.hole_width + soldermaskMargin * 2,
-      hole.hole_height + soldermaskMargin * 2,
-      0
+      width: hole.hole_width + soldermaskMargin * 2,
+      height: hole.hole_height + soldermaskMargin * 2,
+      borderRadius: 0
       // no border radius for rect holes
-    );
+    });
     project.children.push(
       new ShapePath17({
         cutIndex: soldermaskCutSetting.index,
@@ -1509,14 +1629,14 @@ var addRectPcbHole = (hole, ctx) => {
     );
   }
   if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
-    const rectPath = createRoundedRectPath(
+    const rectPath = createRoundedRectPath({
       centerX,
       centerY,
-      hole.hole_width,
-      hole.hole_height,
-      0
+      width: hole.hole_width,
+      height: hole.hole_height,
+      borderRadius: 0
       // no border radius for rect holes
-    );
+    });
     project.children.push(
       new ShapePath17({
         cutIndex: throughBoardCutSetting.index,
@@ -1543,12 +1663,12 @@ var addOvalPcbHole = (hole, 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(
+    const soldermaskPath = createOvalPath({
       centerX,
       centerY,
-      hole.hole_width + soldermaskMargin * 2,
-      hole.hole_height + soldermaskMargin * 2
-    );
+      width: hole.hole_width + soldermaskMargin * 2,
+      height: hole.hole_height + soldermaskMargin * 2
+    });
     project.children.push(
       new ShapePath18({
         cutIndex: soldermaskCutSetting.index,
@@ -1559,12 +1679,12 @@ var addOvalPcbHole = (hole, ctx) => {
     );
   }
   if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
-    const ovalPath = createOvalPath(
+    const ovalPath = createOvalPath({
       centerX,
       centerY,
-      hole.hole_width,
-      hole.hole_height
-    );
+      width: hole.hole_width,
+      height: hole.hole_height
+    });
     project.children.push(
       new ShapePath18({
         cutIndex: throughBoardCutSetting.index,
@@ -1591,12 +1711,12 @@ var addPillPcbHole = (hole, 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(
+    const soldermaskPath = createPillPath({
       centerX,
       centerY,
-      hole.hole_width + soldermaskMargin * 2,
-      hole.hole_height + soldermaskMargin * 2
-    );
+      width: hole.hole_width + soldermaskMargin * 2,
+      height: hole.hole_height + soldermaskMargin * 2
+    });
     project.children.push(
       new ShapePath19({
         cutIndex: soldermaskCutSetting.index,
@@ -1607,12 +1727,12 @@ var addPillPcbHole = (hole, ctx) => {
     );
   }
   if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
-    const pillPath = createPillPath(
+    const pillPath = createPillPath({
       centerX,
       centerY,
-      hole.hole_width,
-      hole.hole_height
-    );
+      width: hole.hole_width,
+      height: hole.hole_height
+    });
     project.children.push(
       new ShapePath19({
         cutIndex: throughBoardCutSetting.index,
@@ -1640,13 +1760,13 @@ var addRotatedPillPcbHole = (hole, ctx) => {
   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(
+    const soldermaskPath = createPillPath({
       centerX,
       centerY,
-      hole.hole_width + soldermaskMargin * 2,
-      hole.hole_height + soldermaskMargin * 2,
+      width: hole.hole_width + soldermaskMargin * 2,
+      height: hole.hole_height + soldermaskMargin * 2,
       rotation
-    );
+    });
     project.children.push(
       new ShapePath20({
         cutIndex: soldermaskCutSetting.index,
@@ -1657,13 +1777,13 @@ var addRotatedPillPcbHole = (hole, ctx) => {
     );
   }
   if (hole.hole_width > 0 && hole.hole_height > 0 && includeCopper) {
-    const pillPath = createPillPath(
+    const pillPath = createPillPath({
       centerX,
       centerY,
-      hole.hole_width,
-      hole.hole_height,
+      width: hole.hole_width,
+      height: hole.hole_height,
       rotation
-    );
+    });
     project.children.push(
       new ShapePath20({
         cutIndex: throughBoardCutSetting.index,
@@ -1710,7 +1830,11 @@ var addCirclePcbCutout = (cutout, ctx) => {
   const centerX = cutout.center.x + origin.x;
   const centerY = cutout.center.y + origin.y;
   if (cutout.radius > 0 && includeCopper) {
-    const circlePath = createCirclePath(centerX, centerY, cutout.radius);
+    const circlePath = createCirclePath({
+      centerX,
+      centerY,
+      radius: cutout.radius
+    });
     project.children.push(
       new ShapePath21({
         cutIndex: throughBoardCutSetting.index,
@@ -1722,7 +1846,11 @@ var addCirclePcbCutout = (cutout, ctx) => {
   }
   if (cutout.radius > 0 && includeSoldermask) {
     const smRadius = cutout.radius + soldermaskMargin;
-    const outer = createCirclePath(centerX, centerY, smRadius);
+    const outer = createCirclePath({
+      centerX,
+      centerY,
+      radius: smRadius
+    });
     project.children.push(
       new ShapePath21({
         cutIndex: soldermaskCutSetting.index,
@@ -1750,17 +1878,17 @@ var addRectPcbCutout = (cutout, ctx) => {
   const centerY = cutout.center.y + origin.y;
   if (cutout.width > 0 && cutout.height > 0 && includeCopper) {
     const rotation = (cutout.rotation ?? 0) * (Math.PI / 180);
-    const rectPath = createRoundedRectPath(
+    const rectPath = createRoundedRectPath({
       centerX,
       centerY,
-      cutout.width,
-      cutout.height,
-      0,
+      width: cutout.width,
+      height: cutout.height,
+      borderRadius: 0,
       // no border radius for cutouts
-      4,
+      segments: 4,
       // segments
       rotation
-    );
+    });
     project.children.push(
       new ShapePath22({
         cutIndex: throughBoardCutSetting.index,
@@ -1774,17 +1902,17 @@ var addRectPcbCutout = (cutout, ctx) => {
     const rotation = (cutout.rotation ?? 0) * (Math.PI / 180);
     const smWidth = cutout.width + 2 * soldermaskMargin;
     const smHeight = cutout.height + 2 * soldermaskMargin;
-    const rectPath = createRoundedRectPath(
+    const rectPath = createRoundedRectPath({
       centerX,
       centerY,
-      smWidth,
-      smHeight,
-      0,
+      width: smWidth,
+      height: smHeight,
+      borderRadius: 0,
       // no border radius for cutouts
-      4,
+      segments: 4,
       // segments
       rotation
-    );
+    });
     project.children.push(
       new ShapePath22({
         cutIndex: soldermaskCutSetting.index,
@@ -1809,11 +1937,11 @@ var addPolygonPcbCutout = (cutout, ctx) => {
     soldermaskMargin
   } = ctx;
   if (cutout.points.length >= 3 && includeCopper) {
-    const polygonPath = createPolygonPathFromOutline(
-      cutout.points,
-      origin.x,
-      origin.y
-    );
+    const polygonPath = createPolygonPathFromOutline({
+      outline: cutout.points,
+      offsetX: origin.x,
+      offsetY: origin.y
+    });
     project.children.push(
       new ShapePath23({
         cutIndex: throughBoardCutSetting.index,
@@ -1828,7 +1956,11 @@ var addPolygonPcbCutout = (cutout, ctx) => {
       x: (p.x ?? 0) + (p.x ?? 0) > 0 ? soldermaskMargin : -soldermaskMargin,
       y: (p.y ?? 0) + (p.y ?? 0) > 0 ? soldermaskMargin : -soldermaskMargin
     })) : cutout.points;
-    const polygonPath = createPolygonPathFromOutline(points, origin.x, origin.y);
+    const polygonPath = createPolygonPathFromOutline({
+      outline: points,
+      offsetX: origin.x,
+      offsetY: origin.y
+    });
     project.children.push(
       new ShapePath23({
         cutIndex: soldermaskCutSetting.index,