circuit-json-to-tscircuit 0.0.31 → 0.0.32

package/dist/{chunk-JVWZSO65.js → chunk-Z6C3I2GJ.js}

@@ -9,6 +9,7 @@ var formatOptionalMmAttr = (attrName, value) => {
   if (value === void 0) return "";
   return ` ${attrName}="${mmStr(value)}"`;
 };
+var formatSolderMaskAttrs = (platedHole) => `${platedHole.is_covered_with_solder_mask === void 0 ? "" : ` coveredWithSolderMask={${platedHole.is_covered_with_solder_mask}}`}${formatOptionalMmAttr("solderMaskMargin", platedHole.soldermask_margin)}`;
 var formatPcbRotationAttr = (rotation, attrName = "pcbRotation") => {
   if (rotation === void 0) return "";
   const formatted = typeof rotation === "number" ? `${rotation}deg` : rotation;
@@ -381,24 +382,26 @@ var convertPlatedHoles = (circuitJson) => {
   for (const platedHole of platedHoles) {
     if (platedHole.shape === "oval" || platedHole.shape === "pill") {
       elementStrings.push(
-        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr3(platedHole.x)}" pcbY="${mmStr3(platedHole.y)}" outerHeight="${mmStr3(platedHole.outer_height)}" outerWidth="${mmStr3(platedHole.outer_width)}" holeHeight="${mmStr3(platedHole.hole_height)}" holeWidth="${mmStr3(platedHole.hole_width)}" height="${mmStr3(platedHole.hole_height)}" shape="${platedHole.shape}"${formatPcbRotationAttr("ccw_rotation" in platedHole ? platedHole.ccw_rotation : void 0)} />`
+        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr3(platedHole.x)}" pcbY="${mmStr3(platedHole.y)}"${formatSolderMaskAttrs(platedHole)} outerHeight="${mmStr3(platedHole.outer_height)}" outerWidth="${mmStr3(platedHole.outer_width)}" holeHeight="${mmStr3(platedHole.hole_height)}" holeWidth="${mmStr3(platedHole.hole_width)}" height="${mmStr3(platedHole.hole_height)}" shape="${platedHole.shape}"${formatPcbRotationAttr("ccw_rotation" in platedHole ? platedHole.ccw_rotation : void 0)} />`
       );
     } else if (platedHole.shape === "circle") {
       elementStrings.push(
-        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr3(platedHole.x)}" pcbY="${mmStr3(platedHole.y)}" outerDiameter="${mmStr3(platedHole.outer_diameter)}" holeDiameter="${mmStr3(platedHole.hole_diameter)}" shape="circle" />`
+        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr3(platedHole.x)}" pcbY="${mmStr3(platedHole.y)}"${formatSolderMaskAttrs(platedHole)} outerDiameter="${mmStr3(platedHole.outer_diameter)}" holeDiameter="${mmStr3(platedHole.hole_diameter)}" shape="circle" />`
       );
     } else if (platedHole.shape === "circular_hole_with_rect_pad") {
       elementStrings.push(
-        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr3(platedHole.x)}" pcbY="${mmStr3(platedHole.y)}" holeDiameter="${mmStr3(platedHole.hole_diameter)}" rectPadWidth="${mmStr3(platedHole.rect_pad_width)}" rectPadHeight="${mmStr3(platedHole.rect_pad_height)}"${formatOptionalMmAttr("rectBorderRadius", platedHole.rect_border_radius)}${formatOptionalMmAttr("holeOffsetX", platedHole.hole_offset_x)}${formatOptionalMmAttr("holeOffsetY", platedHole.hole_offset_y)} shape="circular_hole_with_rect_pad" />`
+        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr3(platedHole.x)}" pcbY="${mmStr3(platedHole.y)}"${platedHole.hole_shape === void 0 ? "" : ` holeShape="${platedHole.hole_shape}"`}${platedHole.pad_shape === void 0 ? "" : ` padShape="${platedHole.pad_shape}"`}${formatSolderMaskAttrs(platedHole)} holeDiameter="${mmStr3(platedHole.hole_diameter)}" rectPadWidth="${mmStr3(platedHole.rect_pad_width)}" rectPadHeight="${mmStr3(platedHole.rect_pad_height)}"${formatOptionalMmAttr("rectBorderRadius", platedHole.rect_border_radius)}${formatOptionalMmAttr("holeOffsetX", platedHole.hole_offset_x)}${formatOptionalMmAttr("holeOffsetY", platedHole.hole_offset_y)}${formatPcbRotationAttr(platedHole.rect_ccw_rotation)} shape="circular_hole_with_rect_pad" />`
       );
-    } else if (platedHole.shape === "pill_hole_with_rect_pad") {
+    } else if (platedHole.shape === "pill_hole_with_rect_pad" || platedHole.shape === "rotated_pill_hole_with_rect_pad") {
+      const holeShape = platedHole.shape === "rotated_pill_hole_with_rect_pad" ? "pill" : platedHole.hole_shape;
+      const rotation = platedHole.shape === "rotated_pill_hole_with_rect_pad" ? platedHole.hole_ccw_rotation : void 0;
       elementStrings.push(
-        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr3(platedHole.x)}" pcbY="${mmStr3(platedHole.y)}" holeWidth="${mmStr3(platedHole.hole_width)}" holeHeight="${mmStr3(platedHole.hole_height)}" rectPadWidth="${mmStr3(platedHole.rect_pad_width)}" rectPadHeight="${mmStr3(platedHole.rect_pad_height)}"${formatOptionalMmAttr("rectBorderRadius", platedHole.rect_border_radius)}${formatOptionalMmAttr("holeOffsetX", platedHole.hole_offset_x)}${formatOptionalMmAttr("holeOffsetY", platedHole.hole_offset_y)} shape="pill_hole_with_rect_pad" />`
+        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr3(platedHole.x)}" pcbY="${mmStr3(platedHole.y)}"${holeShape === void 0 ? "" : ` holeShape="${holeShape}"`}${platedHole.pad_shape === void 0 ? "" : ` padShape="${platedHole.pad_shape}"`}${formatSolderMaskAttrs(platedHole)} holeWidth="${mmStr3(platedHole.hole_width)}" holeHeight="${mmStr3(platedHole.hole_height)}" rectPadWidth="${mmStr3(platedHole.rect_pad_width)}" rectPadHeight="${mmStr3(platedHole.rect_pad_height)}"${formatOptionalMmAttr("rectBorderRadius", platedHole.rect_border_radius)}${formatOptionalMmAttr("holeOffsetX", platedHole.hole_offset_x)}${formatOptionalMmAttr("holeOffsetY", platedHole.hole_offset_y)}${formatPcbRotationAttr(rotation)} shape="pill_hole_with_rect_pad" />`
       );
     } else if (platedHole.shape === "hole_with_polygon_pad") {
       const holeSizeAttrs = platedHole.hole_shape === "circle" ? ` holeDiameter="${mmStr3(platedHole.hole_diameter ?? 0)}"` : `${formatOptionalMmAttr("holeWidth", platedHole.hole_width)}${formatOptionalMmAttr("holeHeight", platedHole.hole_height)}`;
       elementStrings.push(
-        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr3(platedHole.x)}" pcbY="${mmStr3(platedHole.y)}" holeShape="${platedHole.hole_shape}"${holeSizeAttrs} padOutline={${JSON.stringify(platedHole.pad_outline)}} holeOffsetX="${mmStr3(platedHole.hole_offset_x)}" holeOffsetY="${mmStr3(platedHole.hole_offset_y)}" shape="hole_with_polygon_pad" />`
+        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr3(platedHole.x)}" pcbY="${mmStr3(platedHole.y)}"${platedHole.hole_shape === void 0 ? "" : ` holeShape="${platedHole.hole_shape}"`}${formatSolderMaskAttrs(platedHole)}${holeSizeAttrs} padOutline={${JSON.stringify(platedHole.pad_outline)}} holeOffsetX="${mmStr3(platedHole.hole_offset_x ?? 0)}" holeOffsetY="${mmStr3(platedHole.hole_offset_y ?? 0)}" shape="hole_with_polygon_pad" />`
       );
     }
   }

package/dist/cli/main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-JVWZSO65.js";
+} from "../chunk-Z6C3I2GJ.js";
 
 // cli/main.ts
 import { Command } from "commander";
@@ -16,7 +16,7 @@ var package_default = {
     "./cli": "./dist/cli/main.js"
   },
   type: "module",
-  version: "0.0.30",
+  version: "0.0.31",
   scripts: {
     build: "tsup-node lib/index.ts cli/main.ts --format esm --dts",
     test: "bun test",

package/dist/lib/index.js

@@ -1,6 +1,6 @@
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-JVWZSO65.js";
+} from "../chunk-Z6C3I2GJ.js";
 export {
   convertCircuitJsonToTscircuit
 };

package/lib/generate-footprint-tsx/convert-plated-holes.ts

@@ -1,7 +1,11 @@
 import { su } from "@tscircuit/soup-util"
 import { mmStr } from "@tscircuit/mm"
 import type { FootprintElementConverter } from "./converter-types"
-import { formatOptionalMmAttr, formatPcbRotationAttr } from "./helpers"
+import {
+  formatOptionalMmAttr,
+  formatPcbRotationAttr,
+  formatSolderMaskAttrs,
+} from "./helpers"
 
 export const convertPlatedHoles: FootprintElementConverter = (circuitJson) => {
   const platedHoles = su(circuitJson).pcb_plated_hole.list()
@@ -10,19 +14,45 @@ export const convertPlatedHoles: FootprintElementConverter = (circuitJson) => {
   for (const platedHole of platedHoles) {
     if (platedHole.shape === "oval" || platedHole.shape === "pill") {
       elementStrings.push(
-        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}" outerHeight="${mmStr(platedHole.outer_height)}" outerWidth="${mmStr(platedHole.outer_width)}" holeHeight="${mmStr(platedHole.hole_height)}" holeWidth="${mmStr(platedHole.hole_width)}" height="${mmStr(platedHole.hole_height)}" shape="${platedHole.shape}"${formatPcbRotationAttr("ccw_rotation" in platedHole ? platedHole.ccw_rotation : undefined)} />`,
+        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}"${formatSolderMaskAttrs(platedHole)} outerHeight="${mmStr(platedHole.outer_height)}" outerWidth="${mmStr(platedHole.outer_width)}" holeHeight="${mmStr(platedHole.hole_height)}" holeWidth="${mmStr(platedHole.hole_width)}" height="${mmStr(platedHole.hole_height)}" shape="${platedHole.shape}"${formatPcbRotationAttr("ccw_rotation" in platedHole ? platedHole.ccw_rotation : undefined)} />`,
       )
     } else if (platedHole.shape === "circle") {
       elementStrings.push(
-        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}" outerDiameter="${mmStr(platedHole.outer_diameter)}" holeDiameter="${mmStr(platedHole.hole_diameter)}" shape="circle" />`,
+        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}"${formatSolderMaskAttrs(platedHole)} outerDiameter="${mmStr(platedHole.outer_diameter)}" holeDiameter="${mmStr(platedHole.hole_diameter)}" shape="circle" />`,
       )
     } else if (platedHole.shape === "circular_hole_with_rect_pad") {
       elementStrings.push(
-        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}" holeDiameter="${mmStr(platedHole.hole_diameter)}" rectPadWidth="${mmStr(platedHole.rect_pad_width)}" rectPadHeight="${mmStr(platedHole.rect_pad_height)}"${formatOptionalMmAttr("rectBorderRadius", platedHole.rect_border_radius)}${formatOptionalMmAttr("holeOffsetX", platedHole.hole_offset_x)}${formatOptionalMmAttr("holeOffsetY", platedHole.hole_offset_y)} shape="circular_hole_with_rect_pad" />`,
+        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}"${
+          platedHole.hole_shape === undefined
+            ? ""
+            : ` holeShape="${platedHole.hole_shape}"`
+        }${
+          platedHole.pad_shape === undefined
+            ? ""
+            : ` padShape="${platedHole.pad_shape}"`
+        }${formatSolderMaskAttrs(platedHole)} holeDiameter="${mmStr(platedHole.hole_diameter)}" rectPadWidth="${mmStr(platedHole.rect_pad_width)}" rectPadHeight="${mmStr(platedHole.rect_pad_height)}"${formatOptionalMmAttr("rectBorderRadius", platedHole.rect_border_radius)}${formatOptionalMmAttr("holeOffsetX", platedHole.hole_offset_x)}${formatOptionalMmAttr("holeOffsetY", platedHole.hole_offset_y)}${formatPcbRotationAttr(platedHole.rect_ccw_rotation)} shape="circular_hole_with_rect_pad" />`,
       )
-    } else if (platedHole.shape === "pill_hole_with_rect_pad") {
+    } else if (
+      platedHole.shape === "pill_hole_with_rect_pad" ||
+      platedHole.shape === "rotated_pill_hole_with_rect_pad"
+    ) {
+      const holeShape =
+        platedHole.shape === "rotated_pill_hole_with_rect_pad"
+          ? "pill"
+          : platedHole.hole_shape
+      const rotation =
+        platedHole.shape === "rotated_pill_hole_with_rect_pad"
+          ? platedHole.hole_ccw_rotation
+          : undefined
+
       elementStrings.push(
-        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}" holeWidth="${mmStr(platedHole.hole_width)}" holeHeight="${mmStr(platedHole.hole_height)}" rectPadWidth="${mmStr(platedHole.rect_pad_width)}" rectPadHeight="${mmStr(platedHole.rect_pad_height)}"${formatOptionalMmAttr("rectBorderRadius", platedHole.rect_border_radius)}${formatOptionalMmAttr("holeOffsetX", platedHole.hole_offset_x)}${formatOptionalMmAttr("holeOffsetY", platedHole.hole_offset_y)} shape="pill_hole_with_rect_pad" />`,
+        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}"${
+          holeShape === undefined ? "" : ` holeShape="${holeShape}"`
+        }${
+          platedHole.pad_shape === undefined
+            ? ""
+            : ` padShape="${platedHole.pad_shape}"`
+        }${formatSolderMaskAttrs(platedHole)} holeWidth="${mmStr(platedHole.hole_width)}" holeHeight="${mmStr(platedHole.hole_height)}" rectPadWidth="${mmStr(platedHole.rect_pad_width)}" rectPadHeight="${mmStr(platedHole.rect_pad_height)}"${formatOptionalMmAttr("rectBorderRadius", platedHole.rect_border_radius)}${formatOptionalMmAttr("holeOffsetX", platedHole.hole_offset_x)}${formatOptionalMmAttr("holeOffsetY", platedHole.hole_offset_y)}${formatPcbRotationAttr(rotation)} shape="pill_hole_with_rect_pad" />`,
       )
     } else if (platedHole.shape === "hole_with_polygon_pad") {
       const holeSizeAttrs =
@@ -31,7 +61,11 @@ export const convertPlatedHoles: FootprintElementConverter = (circuitJson) => {
           : `${formatOptionalMmAttr("holeWidth", platedHole.hole_width)}${formatOptionalMmAttr("holeHeight", platedHole.hole_height)}`
 
       elementStrings.push(
-        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}" holeShape="${platedHole.hole_shape}"${holeSizeAttrs} padOutline={${JSON.stringify(platedHole.pad_outline)}} holeOffsetX="${mmStr(platedHole.hole_offset_x)}" holeOffsetY="${mmStr(platedHole.hole_offset_y)}" shape="hole_with_polygon_pad" />`,
+        `<platedhole  portHints={${JSON.stringify(platedHole.port_hints)}} pcbX="${mmStr(platedHole.x)}" pcbY="${mmStr(platedHole.y)}"${
+          platedHole.hole_shape === undefined
+            ? ""
+            : ` holeShape="${platedHole.hole_shape}"`
+        }${formatSolderMaskAttrs(platedHole)}${holeSizeAttrs} padOutline={${JSON.stringify(platedHole.pad_outline)}} holeOffsetX="${mmStr(platedHole.hole_offset_x ?? 0)}" holeOffsetY="${mmStr(platedHole.hole_offset_y ?? 0)}" shape="hole_with_polygon_pad" />`,
       )
     }
   }

package/lib/generate-footprint-tsx/helpers.ts

@@ -13,6 +13,16 @@ export const formatOptionalMmAttr = (
   return ` ${attrName}="${mmStr(value)}"`
 }
 
+export const formatSolderMaskAttrs = (platedHole: {
+  is_covered_with_solder_mask?: boolean
+  soldermask_margin?: number
+}): string =>
+  `${
+    platedHole.is_covered_with_solder_mask === undefined
+      ? ""
+      : ` coveredWithSolderMask={${platedHole.is_covered_with_solder_mask}}`
+  }${formatOptionalMmAttr("solderMaskMargin", platedHole.soldermask_margin)}`
+
 export const formatPcbRotationAttr = (
   rotation: string | number | undefined,
   attrName = "pcbRotation",

package/package.json

@@ -6,7 +6,7 @@
     "./cli": "./dist/cli/main.js"
   },
   "type": "module",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "scripts": {
     "build": "tsup-node lib/index.ts cli/main.ts --format esm --dts",
     "test": "bun test",

package/tests/__snapshots__/test9-support-plated-hole-shapes-pcb.snap.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="800" height="600" data-software-used-string="@tscircuit/core@0.0.1300"><style></style><rect class="boundary" x="0" y="0" fill="#000" width="800" height="600" data-type="pcb_background" data-pcb-layer="global"/><rect class="pcb-boundary" fill="none" stroke="#fff" stroke-width="0.3" x="127.27272727272725" y="27.272727272727252" width="545.4545454545455" height="545.4545454545455" data-type="pcb_boundary" data-pcb-layer="global"/><path class="pcb-board" d="M 127.27272727272725 572.7272727272727 L 672.7272727272727 572.7272727272727 L 672.7272727272727 27.272727272727252 L 127.27272727272725 27.272727272727252 Z" fill="none" stroke="rgba(255, 255, 255, 0.5)" stroke-width="2.7272727272727275" data-type="pcb_board" data-pcb-layer="board"/><g data-type="pcb_plated_hole" data-pcb-layer="through"><path class="pcb-hole-outer" fill="rgb(200, 52, 52)" d="M-15,-16.363636363636363 h30 a16.363636363636363,16.363636363636363 0 0 1 0,32.72727272727273 h-30 a16.363636363636363,16.363636363636363 0 0 1 0,-32.72727272727273 z" transform="translate(296.0909090909091 300) rotate(-90)" data-type="pcb_plated_hole" data-pcb-layer="top"/><path class="pcb-hole-inner" fill="#FF26E2" d="M-11.59090909090909,-8.863636363636363 h23.18181818181818 a8.863636363636363,8.863636363636363 0 0 1 0,17.727272727272727 h-23.18181818181818 a8.863636363636363,8.863636363636363 0 0 1 0,-17.727272727272727 z" transform="translate(296.0909090909091 300) rotate(-90)" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><ellipse class="pcb-hole-outer" fill="rgb(200, 52, 52)" cx="0" cy="0" rx="32.72727272727273" ry="19.09090909090909" transform="translate(400 300) rotate(-90)" data-type="pcb_plated_hole" data-pcb-layer="top"/><ellipse class="pcb-hole-inner" fill="#FF26E2" cx="0" cy="0" rx="20.454545454545453" ry="10.90909090909091" transform="translate(400 300) rotate(-90)" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><rect class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" x="475.27272727272725" y="278.1818181818182" width="57.27272727272727" height="43.63636363636364" rx="6.818181818181818" ry="6.818181818181818" data-type="pcb_plated_hole" data-pcb-layer="top"/><circle class="pcb-hole-inner" fill="#FF26E2" cx="503.9090909090909" cy="300" r="13.636363636363637" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><rect class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" x="315.45454545454544" y="211.63636363636363" width="65.45454545454545" height="38.18181818181818" rx="6.818181818181818" ry="6.818181818181818" data-type="pcb_plated_hole" data-pcb-layer="top"/><rect class="pcb-hole-inner" fill="#FF26E2" x="331.8181818181818" y="221.1818181818182" width="43.63636363636364" height="19.09090909090909" rx="9.545454545454545" ry="9.545454545454545" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><polygon class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" points="419.09090909090907,230.72727272727272 442.27272727272725,208.9090909090909 470.9090909090909,208.9090909090909 484.5454545454545,230.72727272727272 470.9090909090909,252.54545454545456 442.27272727272725,252.54545454545456" data-type="pcb_plated_hole" data-pcb-layer="top"/><ellipse class="pcb-hole-inner" fill="#FF26E2" cx="451.8181818181818" cy="230.72727272727272" rx="19.09090909090909" ry="10.227272727272727" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><path class="pcb-hole-outer" fill="rgb(200, 52, 52)" d="M-15,-16.363636363636363 h30 a16.363636363636363,16.363636363636363 0 0 1 0,32.72727272727273 h-30 a16.363636363636363,16.363636363636363 0 0 1 0,-32.72727272727273 z" transform="translate(296.0909090909091 300) rotate(-90)" data-type="pcb_plated_hole" data-pcb-layer="top"/><path class="pcb-hole-inner" fill="#FF26E2" d="M-11.59090909090909,-8.863636363636363 h23.18181818181818 a8.863636363636363,8.863636363636363 0 0 1 0,17.727272727272727 h-23.18181818181818 a8.863636363636363,8.863636363636363 0 0 1 0,-17.727272727272727 z" transform="translate(296.0909090909091 300) rotate(-90)" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><ellipse class="pcb-hole-outer" fill="rgb(200, 52, 52)" cx="0" cy="0" rx="32.72727272727273" ry="19.09090909090909" transform="translate(400 300) rotate(-90)" data-type="pcb_plated_hole" data-pcb-layer="top"/><ellipse class="pcb-hole-inner" fill="#FF26E2" cx="0" cy="0" rx="20.454545454545453" ry="10.90909090909091" transform="translate(400 300) rotate(-90)" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><rect class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" x="475.27272727272725" y="278.1818181818182" width="57.27272727272727" height="43.63636363636364" rx="6.818181818181818" ry="6.818181818181818" data-type="pcb_plated_hole" data-pcb-layer="top"/><circle class="pcb-hole-inner" fill="#FF26E2" cx="503.9090909090909" cy="300" r="13.636363636363637" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><rect class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" x="315.45454545454544" y="211.63636363636363" width="65.45454545454545" height="38.18181818181818" rx="6.818181818181818" ry="6.818181818181818" data-type="pcb_plated_hole" data-pcb-layer="top"/><rect class="pcb-hole-inner" fill="#FF26E2" x="331.8181818181818" y="221.1818181818182" width="43.63636363636364" height="19.09090909090909" rx="9.545454545454545" ry="9.545454545454545" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><polygon class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" points="419.09090909090907,230.72727272727272 442.27272727272725,208.9090909090909 470.9090909090909,208.9090909090909 484.5454545454545,230.72727272727272 470.9090909090909,252.54545454545456 442.27272727272725,252.54545454545456" data-type="pcb_plated_hole" data-pcb-layer="top"/><ellipse class="pcb-hole-inner" fill="#FF26E2" cx="451.8181818181818" cy="230.72727272727272" rx="19.09090909090909" ry="10.227272727272727" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="600" data-software-used-string="@tscircuit/core@0.0.1306"><style></style><rect class="boundary" x="0" y="0" fill="#000" width="800" height="600" data-type="pcb_background" data-pcb-layer="global"/><rect class="pcb-boundary" fill="none" stroke="#fff" stroke-width="0.3" x="127.27272727272725" y="27.272727272727252" width="545.4545454545455" height="545.4545454545455" data-type="pcb_boundary" data-pcb-layer="global"/><path class="pcb-board" d="M 127.27272727272725 572.7272727272727 L 672.7272727272727 572.7272727272727 L 672.7272727272727 27.272727272727252 L 127.27272727272725 27.272727272727252 Z" fill="none" stroke="rgba(255, 255, 255, 0.5)" stroke-width="2.7272727272727275" data-type="pcb_board" data-pcb-layer="board"/><g data-type="pcb_plated_hole" data-pcb-layer="through"><path class="pcb-hole-outer" fill="rgb(200, 52, 52)" d="M-15,-16.363636363636363 h30 a16.363636363636363,16.363636363636363 0 0 1 0,32.72727272727273 h-30 a16.363636363636363,16.363636363636363 0 0 1 0,-32.72727272727273 z" transform="translate(296.0909090909091 300) rotate(-90)" data-type="pcb_plated_hole" data-pcb-layer="top"/><path class="pcb-hole-inner" fill="#FF26E2" d="M-11.59090909090909,-8.863636363636363 h23.18181818181818 a8.863636363636363,8.863636363636363 0 0 1 0,17.727272727272727 h-23.18181818181818 a8.863636363636363,8.863636363636363 0 0 1 0,-17.727272727272727 z" transform="translate(296.0909090909091 300) rotate(-90)" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><ellipse class="pcb-hole-outer" fill="rgb(200, 52, 52)" cx="0" cy="0" rx="32.72727272727273" ry="19.09090909090909" transform="translate(400 300) rotate(-90)" data-type="pcb_plated_hole" data-pcb-layer="top"/><ellipse class="pcb-hole-inner" fill="#FF26E2" cx="0" cy="0" rx="20.454545454545453" ry="10.90909090909091" transform="translate(400 300) rotate(-90)" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><rect class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" x="475.27272727272725" y="278.1818181818182" width="57.27272727272727" height="43.63636363636364" rx="6.818181818181818" ry="6.818181818181818" data-type="pcb_plated_hole" data-pcb-layer="top"/><circle class="pcb-hole-inner" fill="#FF26E2" cx="503.9090909090909" cy="300" r="13.636363636363637" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><rect class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" x="315.45454545454544" y="211.63636363636363" width="65.45454545454545" height="38.18181818181818" rx="6.818181818181818" ry="6.818181818181818" data-type="pcb_plated_hole" data-pcb-layer="top"/><rect class="pcb-hole-inner" fill="#FF26E2" x="331.8181818181818" y="221.1818181818182" width="43.63636363636364" height="19.09090909090909" rx="9.545454545454545" ry="9.545454545454545" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><polygon class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" points="419.09090909090907,230.72727272727272 442.27272727272725,208.9090909090909 470.9090909090909,208.9090909090909 484.5454545454545,230.72727272727272 470.9090909090909,252.54545454545456 442.27272727272725,252.54545454545456" data-type="pcb_plated_hole" data-pcb-layer="top"/><ellipse class="pcb-hole-inner" fill="#FF26E2" cx="451.8181818181818" cy="230.72727272727272" rx="19.09090909090909" ry="10.227272727272727" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><rect class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" x="-31.363636363636363" y="-20.454545454545453" width="62.72727272727273" height="40.90909090909091" transform="translate(400 169.0909090909091) rotate(-35)" rx="5.454545454545455" ry="5.454545454545455" data-type="pcb_plated_hole" data-pcb-layer="top"/><rect class="pcb-hole-inner" fill="#FF26E2" x="-20.454545454545453" y="-8.181818181818182" width="40.90909090909091" height="16.363636363636363" rx="8.181818181818182" ry="8.181818181818182" transform="translate(404.09090909090907 170.45454545454544) rotate(-35)" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><path class="pcb-hole-outer" fill="rgb(200, 52, 52)" d="M-15,-16.363636363636363 h30 a16.363636363636363,16.363636363636363 0 0 1 0,32.72727272727273 h-30 a16.363636363636363,16.363636363636363 0 0 1 0,-32.72727272727273 z" transform="translate(296.0909090909091 300) rotate(-90)" data-type="pcb_plated_hole" data-pcb-layer="top"/><path class="pcb-hole-inner" fill="#FF26E2" d="M-11.59090909090909,-8.863636363636363 h23.18181818181818 a8.863636363636363,8.863636363636363 0 0 1 0,17.727272727272727 h-23.18181818181818 a8.863636363636363,8.863636363636363 0 0 1 0,-17.727272727272727 z" transform="translate(296.0909090909091 300) rotate(-90)" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><ellipse class="pcb-hole-outer" fill="rgb(200, 52, 52)" cx="0" cy="0" rx="32.72727272727273" ry="19.09090909090909" transform="translate(400 300) rotate(-90)" data-type="pcb_plated_hole" data-pcb-layer="top"/><ellipse class="pcb-hole-inner" fill="#FF26E2" cx="0" cy="0" rx="20.454545454545453" ry="10.90909090909091" transform="translate(400 300) rotate(-90)" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><rect class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" x="475.27272727272725" y="278.1818181818182" width="57.27272727272727" height="43.63636363636364" rx="6.818181818181818" ry="6.818181818181818" data-type="pcb_plated_hole" data-pcb-layer="top"/><circle class="pcb-hole-inner" fill="#FF26E2" cx="503.9090909090909" cy="300" r="13.636363636363637" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><rect class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" x="315.45454545454544" y="211.63636363636363" width="65.45454545454545" height="38.18181818181818" rx="6.818181818181818" ry="6.818181818181818" data-type="pcb_plated_hole" data-pcb-layer="top"/><rect class="pcb-hole-inner" fill="#FF26E2" x="331.8181818181818" y="221.1818181818182" width="43.63636363636364" height="19.09090909090909" rx="9.545454545454545" ry="9.545454545454545" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><polygon class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" points="419.09090909090907,230.72727272727272 442.27272727272725,208.9090909090909 470.9090909090909,208.9090909090909 484.5454545454545,230.72727272727272 470.9090909090909,252.54545454545456 442.27272727272725,252.54545454545456" data-type="pcb_plated_hole" data-pcb-layer="top"/><ellipse class="pcb-hole-inner" fill="#FF26E2" cx="451.8181818181818" cy="230.72727272727272" rx="19.09090909090909" ry="10.227272727272727" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g><g data-type="pcb_plated_hole" data-pcb-layer="through"><rect class="pcb-hole-outer-pad" fill="rgb(200, 52, 52)" x="-31.363636363636363" y="-20.454545454545453" width="62.72727272727273" height="40.90909090909091" transform="translate(400 169.0909090909091) rotate(-35)" rx="5.454545454545455" ry="5.454545454545455" data-type="pcb_plated_hole" data-pcb-layer="top"/><rect class="pcb-hole-inner" fill="#FF26E2" x="-20.454545454545453" y="-8.181818181818182" width="40.90909090909091" height="16.363636363636363" rx="8.181818181818182" ry="8.181818181818182" transform="translate(404.09090909090907 170.45454545454544) rotate(-35)" data-type="pcb_plated_hole_drill" data-pcb-layer="drill"/></g></svg>

package/tests/test9-support-plated-hole-shapes.test.tsx

@@ -1,5 +1,5 @@
 import { test, expect } from "bun:test"
-import type { AnyCircuitElement } from "circuit-json"
+import type { AnyCircuitElement, PcbPlatedHole } from "circuit-json"
 import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
 import { convertCircuitJsonToTscircuit } from "lib/index"
 import { runTscircuitCode } from "tscircuit"
@@ -18,6 +18,8 @@ test("test plated hole conversion", async () => {
       hole_height: 0.65,
       ccw_rotation: 90,
       layers: ["top", "bottom"],
+      is_covered_with_solder_mask: true,
+      soldermask_margin: 0.05,
       port_hints: ["1"],
     },
     {
@@ -32,6 +34,8 @@ test("test plated hole conversion", async () => {
       hole_height: 0.8,
       ccw_rotation: 90,
       layers: ["top", "bottom"],
+      is_covered_with_solder_mask: true,
+      soldermask_margin: 0.06,
       port_hints: ["2"],
     },
     {
@@ -49,6 +53,8 @@ test("test plated hole conversion", async () => {
       hole_offset_x: 0,
       hole_offset_y: 0,
       layers: ["top", "bottom"],
+      is_covered_with_solder_mask: true,
+      soldermask_margin: 0.07,
       port_hints: ["3"],
     },
     {
@@ -67,6 +73,8 @@ test("test plated hole conversion", async () => {
       hole_offset_x: 0.2,
       hole_offset_y: 0,
       layers: ["top", "bottom"],
+      is_covered_with_solder_mask: true,
+      soldermask_margin: 0.08,
       port_hints: ["4"],
     },
     {
@@ -89,8 +97,32 @@ test("test plated hole conversion", async () => {
       hole_offset_x: 0,
       hole_offset_y: 0,
       layers: ["top", "bottom"],
+      is_covered_with_solder_mask: true,
+      soldermask_margin: 0.09,
       port_hints: ["5"],
     },
+    {
+      type: "pcb_plated_hole",
+      pcb_plated_hole_id: "ph_rotated_rect_pill",
+      shape: "rotated_pill_hole_with_rect_pad",
+      x: 0,
+      y: 4.8,
+      hole_shape: "rotated_pill",
+      pad_shape: "rect",
+      hole_width: 1.5,
+      hole_height: 0.6,
+      hole_ccw_rotation: 35,
+      rect_pad_width: 2.3,
+      rect_pad_height: 1.5,
+      rect_border_radius: 0.2,
+      rect_ccw_rotation: 35,
+      hole_offset_x: 0.15,
+      hole_offset_y: -0.05,
+      layers: ["top", "bottom"],
+      is_covered_with_solder_mask: true,
+      soldermask_margin: 0.1,
+      port_hints: ["6"],
+    },
   ]
 
   const tscircuit = convertCircuitJsonToTscircuit(circuitJson, {
@@ -102,11 +134,12 @@ test("test plated hole conversion", async () => {
     export const PlatedHoleComponent = (props: ChipProps) => (
       <chip
         footprint={<footprint>
-            <platedhole  portHints={["1"]} pcbX="-3.81mm" pcbY="0mm" outerHeight="1.2mm" outerWidth="2.3mm" holeHeight="0.65mm" holeWidth="1.5mm" height="0.65mm" shape="pill" pcbRotation="90deg" />
-    <platedhole  portHints={["2"]} pcbX="0mm" pcbY="0mm" outerHeight="1.4mm" outerWidth="2.4mm" holeHeight="0.8mm" holeWidth="1.5mm" height="0.8mm" shape="oval" pcbRotation="90deg" />
-    <platedhole  portHints={["3"]} pcbX="3.81mm" pcbY="0mm" holeDiameter="1mm" rectPadWidth="2.1mm" rectPadHeight="1.6mm" rectBorderRadius="0.25mm" holeOffsetX="0mm" holeOffsetY="0mm" shape="circular_hole_with_rect_pad" />
-    <platedhole  portHints={["4"]} pcbX="-1.9mm" pcbY="2.54mm" holeWidth="1.6mm" holeHeight="0.7mm" rectPadWidth="2.4mm" rectPadHeight="1.4mm" rectBorderRadius="0.25mm" holeOffsetX="0.2mm" holeOffsetY="0mm" shape="pill_hole_with_rect_pad" />
-    <platedhole  portHints={["5"]} pcbX="1.9mm" pcbY="2.54mm" holeShape="oval" holeWidth="1.4mm" holeHeight="0.75mm" padOutline={[{"x":-1.2,"y":0},{"x":-0.35,"y":0.8},{"x":0.7,"y":0.8},{"x":1.2,"y":0},{"x":0.7,"y":-0.8},{"x":-0.35,"y":-0.8}]} holeOffsetX="0mm" holeOffsetY="0mm" shape="hole_with_polygon_pad" />
+            <platedhole  portHints={["1"]} pcbX="-3.81mm" pcbY="0mm" coveredWithSolderMask={true} solderMaskMargin="0.05mm" outerHeight="1.2mm" outerWidth="2.3mm" holeHeight="0.65mm" holeWidth="1.5mm" height="0.65mm" shape="pill" pcbRotation="90deg" />
+    <platedhole  portHints={["2"]} pcbX="0mm" pcbY="0mm" coveredWithSolderMask={true} solderMaskMargin="0.06mm" outerHeight="1.4mm" outerWidth="2.4mm" holeHeight="0.8mm" holeWidth="1.5mm" height="0.8mm" shape="oval" pcbRotation="90deg" />
+    <platedhole  portHints={["3"]} pcbX="3.81mm" pcbY="0mm" holeShape="circle" padShape="rect" coveredWithSolderMask={true} solderMaskMargin="0.07mm" holeDiameter="1mm" rectPadWidth="2.1mm" rectPadHeight="1.6mm" rectBorderRadius="0.25mm" holeOffsetX="0mm" holeOffsetY="0mm" shape="circular_hole_with_rect_pad" />
+    <platedhole  portHints={["4"]} pcbX="-1.9mm" pcbY="2.54mm" holeShape="pill" padShape="rect" coveredWithSolderMask={true} solderMaskMargin="0.08mm" holeWidth="1.6mm" holeHeight="0.7mm" rectPadWidth="2.4mm" rectPadHeight="1.4mm" rectBorderRadius="0.25mm" holeOffsetX="0.2mm" holeOffsetY="0mm" shape="pill_hole_with_rect_pad" />
+    <platedhole  portHints={["5"]} pcbX="1.9mm" pcbY="2.54mm" holeShape="oval" coveredWithSolderMask={true} solderMaskMargin="0.09mm" holeWidth="1.4mm" holeHeight="0.75mm" padOutline={[{"x":-1.2,"y":0},{"x":-0.35,"y":0.8},{"x":0.7,"y":0.8},{"x":1.2,"y":0},{"x":0.7,"y":-0.8},{"x":-0.35,"y":-0.8}]} holeOffsetX="0mm" holeOffsetY="0mm" shape="hole_with_polygon_pad" />
+    <platedhole  portHints={["6"]} pcbX="0mm" pcbY="4.8mm" holeShape="pill" padShape="rect" coveredWithSolderMask={true} solderMaskMargin="0.1mm" holeWidth="1.5mm" holeHeight="0.6mm" rectPadWidth="2.3mm" rectPadHeight="1.5mm" rectBorderRadius="0.2mm" holeOffsetX="0.15mm" holeOffsetY="-0.05mm" pcbRotation="35deg" shape="pill_hole_with_rect_pad" />
           </footprint>}
         {...props}
       />
@@ -126,6 +159,67 @@ circuit.add(
   expect(Array.isArray(renderedCircuitJson)).toBe(true)
   expect(renderedCircuitJson).not.toHaveLength(0)
 
+  const renderedPlatedHoles = renderedCircuitJson.filter(
+    (elm): elm is PcbPlatedHole => elm.type === "pcb_plated_hole",
+  )
+
+  expect(renderedPlatedHoles).toEqual(
+    expect.arrayContaining([
+      expect.objectContaining({
+        port_hints: expect.arrayContaining(["1"]),
+        shape: "pill",
+        is_covered_with_solder_mask: true,
+        soldermask_margin: 0.05,
+      }),
+      expect.objectContaining({
+        port_hints: expect.arrayContaining(["3"]),
+        shape: "circular_hole_with_rect_pad",
+        rect_pad_width: 2.1,
+        rect_pad_height: 1.6,
+        rect_border_radius: 0.25,
+        hole_offset_x: 0,
+        hole_offset_y: 0,
+        is_covered_with_solder_mask: true,
+        soldermask_margin: 0.07,
+      }),
+      expect.objectContaining({
+        port_hints: expect.arrayContaining(["4"]),
+        shape: "pill_hole_with_rect_pad",
+        rect_pad_width: 2.4,
+        rect_pad_height: 1.4,
+        hole_offset_x: 0.2,
+        hole_offset_y: 0,
+        is_covered_with_solder_mask: true,
+        soldermask_margin: 0.08,
+      }),
+      expect.objectContaining({
+        port_hints: expect.arrayContaining(["5"]),
+        shape: "hole_with_polygon_pad",
+        hole_shape: "oval",
+        hole_width: 1.4,
+        hole_height: 0.75,
+        hole_offset_x: 0,
+        hole_offset_y: 0,
+        is_covered_with_solder_mask: true,
+        soldermask_margin: 0.09,
+      }),
+      expect.objectContaining({
+        port_hints: expect.arrayContaining(["6"]),
+        shape: "rotated_pill_hole_with_rect_pad",
+        hole_shape: "rotated_pill",
+        pad_shape: "rect",
+        hole_width: 1.5,
+        hole_height: 0.6,
+        rect_pad_width: 2.3,
+        rect_pad_height: 1.5,
+        hole_offset_x: 0.15,
+        hole_offset_y: -0.05,
+        is_covered_with_solder_mask: true,
+        soldermask_margin: 0.1,
+      }),
+    ]),
+  )
+
   const pcbSvg = convertCircuitJsonToPcbSvg(renderedCircuitJson)
   await expect(pcbSvg).toMatchSvgSnapshot(import.meta.path, "pcb")
 }, 10000)