circuit-json-to-tscircuit 0.0.36 → 0.0.37

package/dist/{chunk-PIWUZ3WB.js → chunk-7VZ63UWJ.js}

@@ -500,26 +500,98 @@ var convertSmtPads = (circuitJson) => {
   const smtPads = su11(circuitJson).pcb_smtpad.list();
   const elementStrings = [];
   for (const smtPad of smtPads) {
+    const commonAttrs = [];
+    if (smtPad.port_hints !== void 0) {
+      commonAttrs.push(`portHints={${JSON.stringify(smtPad.port_hints)}}`);
+    }
+    if ("x" in smtPad && smtPad.x !== void 0) {
+      commonAttrs.push(`pcbX="${mmStr5(smtPad.x)}"`);
+    }
+    if ("y" in smtPad && smtPad.y !== void 0) {
+      commonAttrs.push(`pcbY="${mmStr5(smtPad.y)}"`);
+    }
+    if (smtPad.layer !== void 0) {
+      commonAttrs.push(`layer="${smtPad.layer}"`);
+    }
+    if (smtPad.is_covered_with_solder_mask !== void 0) {
+      commonAttrs.push(
+        `coveredWithSolderMask={${smtPad.is_covered_with_solder_mask}}`
+      );
+    }
+    if (smtPad.soldermask_margin !== void 0) {
+      commonAttrs.push(`solderMaskMargin="${mmStr5(smtPad.soldermask_margin)}"`);
+    }
     if (smtPad.shape === "circle") {
       elementStrings.push(
-        `<smtpad portHints={${JSON.stringify(smtPad.port_hints)}} pcbX="${mmStr5(smtPad.x)}" pcbY="${mmStr5(smtPad.y)}" radius="${mmStr5(smtPad.radius)}" shape="circle" />`
+        `<smtpad ${commonAttrs.join(" ")} radius="${mmStr5(smtPad.radius ?? 0)}" shape="circle" />`
       );
     } else if (smtPad.shape === "rect") {
+      if (smtPad.rect_border_radius !== void 0) {
+        commonAttrs.push(
+          `rectBorderRadius="${mmStr5(smtPad.rect_border_radius)}"`
+        );
+      }
+      if (smtPad.corner_radius !== void 0) {
+        commonAttrs.push(`cornerRadius="${mmStr5(smtPad.corner_radius)}"`);
+      }
+      if (smtPad.soldermask_margin_left !== void 0) {
+        commonAttrs.push(
+          `solderMaskMarginLeft="${mmStr5(smtPad.soldermask_margin_left)}"`
+        );
+      }
+      if (smtPad.soldermask_margin_top !== void 0) {
+        commonAttrs.push(
+          `solderMaskMarginTop="${mmStr5(smtPad.soldermask_margin_top)}"`
+        );
+      }
+      if (smtPad.soldermask_margin_right !== void 0) {
+        commonAttrs.push(
+          `solderMaskMarginRight="${mmStr5(smtPad.soldermask_margin_right)}"`
+        );
+      }
+      if (smtPad.soldermask_margin_bottom !== void 0) {
+        commonAttrs.push(
+          `solderMaskMarginBottom="${mmStr5(smtPad.soldermask_margin_bottom)}"`
+        );
+      }
       elementStrings.push(
-        `<smtpad portHints={${JSON.stringify(smtPad.port_hints)}} pcbX="${mmStr5(smtPad.x)}" pcbY="${mmStr5(smtPad.y)}" width="${mmStr5(smtPad.width)}" height="${mmStr5(smtPad.height)}" shape="rect" />`
+        `<smtpad ${commonAttrs.join(" ")} width="${mmStr5(smtPad.width ?? 0)}" height="${mmStr5(smtPad.height ?? 0)}" shape="rect" />`
       );
     } else if (smtPad.shape === "pill") {
       elementStrings.push(
-        `<smtpad portHints={${JSON.stringify(smtPad.port_hints)}} pcbX="${mmStr5(smtPad.x)}" pcbY="${mmStr5(smtPad.y)}" width="${mmStr5(smtPad.width)}" height="${mmStr5(smtPad.height)}" radius="${mmStr5(smtPad.radius)}" shape="pill" />`
+        `<smtpad ${commonAttrs.join(" ")} width="${mmStr5(smtPad.width ?? 0)}" height="${mmStr5(smtPad.height ?? 0)}" radius="${mmStr5(smtPad.radius ?? 0)}" shape="pill" />`
       );
     } else if (smtPad.shape === "polygon") {
       elementStrings.push(
-        `<smtpad portHints={${JSON.stringify(smtPad.port_hints)}} shape="polygon" points={${JSON.stringify(smtPad.points)}} />`
+        `<smtpad ${commonAttrs.join(" ")} shape="polygon" points={${JSON.stringify(smtPad.points)}} />`
       );
     } else if (smtPad.shape === "rotated_rect") {
       const cornerRadius = smtPad.corner_radius ?? smtPad.rect_border_radius ?? void 0;
+      if (cornerRadius !== void 0) {
+        commonAttrs.push(`cornerRadius="${mmStr5(cornerRadius)}"`);
+      }
+      if (smtPad.soldermask_margin_left !== void 0) {
+        commonAttrs.push(
+          `solderMaskMarginLeft="${mmStr5(smtPad.soldermask_margin_left)}"`
+        );
+      }
+      if (smtPad.soldermask_margin_top !== void 0) {
+        commonAttrs.push(
+          `solderMaskMarginTop="${mmStr5(smtPad.soldermask_margin_top)}"`
+        );
+      }
+      if (smtPad.soldermask_margin_right !== void 0) {
+        commonAttrs.push(
+          `solderMaskMarginRight="${mmStr5(smtPad.soldermask_margin_right)}"`
+        );
+      }
+      if (smtPad.soldermask_margin_bottom !== void 0) {
+        commonAttrs.push(
+          `solderMaskMarginBottom="${mmStr5(smtPad.soldermask_margin_bottom)}"`
+        );
+      }
       elementStrings.push(
-        `<smtpad portHints={${JSON.stringify(smtPad.port_hints)}} pcbX="${mmStr5(smtPad.x)}" pcbY="${mmStr5(smtPad.y)}" width="${mmStr5(smtPad.width)}" height="${mmStr5(smtPad.height)}"${formatPcbRotationAttr(smtPad.ccw_rotation)}${cornerRadius !== void 0 ? ` cornerRadius={${cornerRadius}}` : ""} shape="rotated_rect" />`
+        `<smtpad ${commonAttrs.join(" ")} width="${mmStr5(smtPad.width ?? 0)}" height="${mmStr5(smtPad.height ?? 0)}"${formatPcbRotationAttr(smtPad.ccw_rotation)} shape="rotated_rect" />`
       );
     }
   }

package/dist/cli/main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-PIWUZ3WB.js";
+} from "../chunk-7VZ63UWJ.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.35",
+  version: "0.0.36",
   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-PIWUZ3WB.js";
+} from "../chunk-7VZ63UWJ.js";
 export {
   convertCircuitJsonToTscircuit
 };

package/lib/generate-footprint-tsx/convert-smt-pads.ts

@@ -8,27 +8,102 @@ export const convertSmtPads: FootprintElementConverter = (circuitJson) => {
   const elementStrings: string[] = []
 
   for (const smtPad of smtPads) {
+    const commonAttrs: string[] = []
+
+    if (smtPad.port_hints !== undefined) {
+      commonAttrs.push(`portHints={${JSON.stringify(smtPad.port_hints)}}`)
+    }
+    if ("x" in smtPad && smtPad.x !== undefined) {
+      commonAttrs.push(`pcbX="${mmStr(smtPad.x)}"`)
+    }
+    if ("y" in smtPad && smtPad.y !== undefined) {
+      commonAttrs.push(`pcbY="${mmStr(smtPad.y)}"`)
+    }
+    if (smtPad.layer !== undefined) {
+      commonAttrs.push(`layer="${smtPad.layer}"`)
+    }
+    if (smtPad.is_covered_with_solder_mask !== undefined) {
+      commonAttrs.push(
+        `coveredWithSolderMask={${smtPad.is_covered_with_solder_mask}}`,
+      )
+    }
+    if (smtPad.soldermask_margin !== undefined) {
+      commonAttrs.push(`solderMaskMargin="${mmStr(smtPad.soldermask_margin)}"`)
+    }
+
     if (smtPad.shape === "circle") {
       elementStrings.push(
-        `<smtpad portHints={${JSON.stringify(smtPad.port_hints)}} pcbX="${mmStr(smtPad.x)}" pcbY="${mmStr(smtPad.y)}" radius="${mmStr(smtPad.radius)}" shape="circle" />`,
+        `<smtpad ${commonAttrs.join(" ")} radius="${mmStr(smtPad.radius ?? 0)}" shape="circle" />`,
       )
     } else if (smtPad.shape === "rect") {
+      if (smtPad.rect_border_radius !== undefined) {
+        commonAttrs.push(
+          `rectBorderRadius="${mmStr(smtPad.rect_border_radius)}"`,
+        )
+      }
+      if (smtPad.corner_radius !== undefined) {
+        commonAttrs.push(`cornerRadius="${mmStr(smtPad.corner_radius)}"`)
+      }
+      if (smtPad.soldermask_margin_left !== undefined) {
+        commonAttrs.push(
+          `solderMaskMarginLeft="${mmStr(smtPad.soldermask_margin_left)}"`,
+        )
+      }
+      if (smtPad.soldermask_margin_top !== undefined) {
+        commonAttrs.push(
+          `solderMaskMarginTop="${mmStr(smtPad.soldermask_margin_top)}"`,
+        )
+      }
+      if (smtPad.soldermask_margin_right !== undefined) {
+        commonAttrs.push(
+          `solderMaskMarginRight="${mmStr(smtPad.soldermask_margin_right)}"`,
+        )
+      }
+      if (smtPad.soldermask_margin_bottom !== undefined) {
+        commonAttrs.push(
+          `solderMaskMarginBottom="${mmStr(smtPad.soldermask_margin_bottom)}"`,
+        )
+      }
       elementStrings.push(
-        `<smtpad portHints={${JSON.stringify(smtPad.port_hints)}} pcbX="${mmStr(smtPad.x)}" pcbY="${mmStr(smtPad.y)}" width="${mmStr(smtPad.width)}" height="${mmStr(smtPad.height)}" shape="rect" />`,
+        `<smtpad ${commonAttrs.join(" ")} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}" shape="rect" />`,
       )
     } else if (smtPad.shape === "pill") {
       elementStrings.push(
-        `<smtpad portHints={${JSON.stringify(smtPad.port_hints)}} pcbX="${mmStr(smtPad.x)}" pcbY="${mmStr(smtPad.y)}" width="${mmStr(smtPad.width)}" height="${mmStr(smtPad.height)}" radius="${mmStr(smtPad.radius)}" shape="pill" />`,
+        `<smtpad ${commonAttrs.join(" ")} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}" radius="${mmStr(smtPad.radius ?? 0)}" shape="pill" />`,
       )
     } else if (smtPad.shape === "polygon") {
       elementStrings.push(
-        `<smtpad portHints={${JSON.stringify(smtPad.port_hints)}} shape="polygon" points={${JSON.stringify(smtPad.points)}} />`,
+        `<smtpad ${commonAttrs.join(" ")} shape="polygon" points={${JSON.stringify(smtPad.points)}} />`,
       )
     } else if (smtPad.shape === "rotated_rect") {
       const cornerRadius =
         smtPad.corner_radius ?? smtPad.rect_border_radius ?? undefined
+
+      if (cornerRadius !== undefined) {
+        commonAttrs.push(`cornerRadius="${mmStr(cornerRadius)}"`)
+      }
+      if (smtPad.soldermask_margin_left !== undefined) {
+        commonAttrs.push(
+          `solderMaskMarginLeft="${mmStr(smtPad.soldermask_margin_left)}"`,
+        )
+      }
+      if (smtPad.soldermask_margin_top !== undefined) {
+        commonAttrs.push(
+          `solderMaskMarginTop="${mmStr(smtPad.soldermask_margin_top)}"`,
+        )
+      }
+      if (smtPad.soldermask_margin_right !== undefined) {
+        commonAttrs.push(
+          `solderMaskMarginRight="${mmStr(smtPad.soldermask_margin_right)}"`,
+        )
+      }
+      if (smtPad.soldermask_margin_bottom !== undefined) {
+        commonAttrs.push(
+          `solderMaskMarginBottom="${mmStr(smtPad.soldermask_margin_bottom)}"`,
+        )
+      }
       elementStrings.push(
-        `<smtpad portHints={${JSON.stringify(smtPad.port_hints)}} pcbX="${mmStr(smtPad.x)}" pcbY="${mmStr(smtPad.y)}" width="${mmStr(smtPad.width)}" height="${mmStr(smtPad.height)}"${formatPcbRotationAttr(smtPad.ccw_rotation)}${cornerRadius !== undefined ? ` cornerRadius={${cornerRadius}}` : ""} shape="rotated_rect" />`,
+        `<smtpad ${commonAttrs.join(" ")} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}"${formatPcbRotationAttr(smtPad.ccw_rotation)} shape="rotated_rect" />`,
       )
     }
   }

package/package.json

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

package/tests/__snapshots__/test16-support-pcb-smtpad-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.1322"><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"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="406.8181818181818" y="234.54545454545453" width="40.90909090909091" height="21.81818181818182" rx="10.90909090909091" ry="10.90909090909091" data-type="pcb_smtpad" data-pcb-layer="top"/><polygon class="pcb-pad" fill="rgb(200, 52, 52)" points="400,300 427.27272727272725,300 413.6363636363636,272.72727272727275" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="-27.272727272727273" y="-8.181818181818182" width="54.54545454545455" height="16.363636363636363" transform="translate(372.72727272727275 354.54545454545456) rotate(-45)" data-type="pcb_smtpad" data-pcb-layer="top" rx="5.454545454545455" ry="5.454545454545455"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="406.8181818181818" y="234.54545454545453" width="40.90909090909091" height="21.81818181818182" rx="10.90909090909091" ry="10.90909090909091" data-type="pcb_smtpad" data-pcb-layer="top"/><polygon class="pcb-pad" fill="rgb(200, 52, 52)" points="400,300 427.27272727272725,300 413.6363636363636,272.72727272727275" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="-27.272727272727273" y="-8.181818181818182" width="54.54545454545455" height="16.363636363636363" transform="translate(372.72727272727275 354.54545454545456) rotate(-45)" data-type="pcb_smtpad" data-pcb-layer="top" rx="5.454545454545455" ry="5.454545454545455"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="600" data-software-used-string="@tscircuit/core@0.0.1090"><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"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="-27.272727272727273" y="-8.181818181818182" width="54.54545454545455" height="16.363636363636363" transform="translate(372.72727272727275 354.54545454545456) rotate(-45)" data-type="pcb_smtpad" data-pcb-layer="bottom" rx="4.090909090909091" ry="4.090909090909091"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="443.6363636363636" y="328.6363636363636" width="49.09090909090909" height="24.545454545454547" data-type="pcb_smtpad" data-pcb-layer="bottom" rx="5.454545454545455" ry="5.454545454545455"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="-27.272727272727273" y="-8.181818181818182" width="54.54545454545455" height="16.363636363636363" transform="translate(372.72727272727275 354.54545454545456) rotate(-45)" data-type="pcb_smtpad" data-pcb-layer="bottom" rx="4.090909090909091" ry="4.090909090909091"/><rect class="pcb-pad" fill="rgb(77, 127, 196)" x="443.6363636363636" y="328.6363636363636" width="49.09090909090909" height="24.545454545454547" data-type="pcb_smtpad" data-pcb-layer="bottom" rx="5.454545454545455" ry="5.454545454545455"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="406.8181818181818" y="234.54545454545453" width="40.90909090909091" height="21.81818181818182" rx="10.90909090909091" ry="10.90909090909091" data-type="pcb_smtpad" data-pcb-layer="top"/><polygon class="pcb-pad" fill="rgb(200, 52, 52)" points="400,300 427.27272727272725,300 413.6363636363636,272.72727272727275" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="406.8181818181818" y="234.54545454545453" width="40.90909090909091" height="21.81818181818182" rx="10.90909090909091" ry="10.90909090909091" data-type="pcb_smtpad" data-pcb-layer="top"/><polygon class="pcb-pad" fill="rgb(200, 52, 52)" points="400,300 427.27272727272725,300 413.6363636363636,272.72727272727275" data-type="pcb_smtpad" data-pcb-layer="top"/></svg>

package/tests/cli/cli-circuit-json-to-tsx.test.tsx

@@ -22,13 +22,13 @@ test("should convert sample circuit.json to TSX", async () => {
     export const Circuit = (props: ChipProps) => (
       <chip
         footprint={<footprint>
-            <smtpad portHints={["1","left"]} pcbX="-0.5mm" pcbY="0mm" width="0.6000000000000001mm" height="0.6000000000000001mm" shape="rect" />
-    <smtpad portHints={["2","right"]} pcbX="0.5mm" pcbY="0mm" width="0.6000000000000001mm" height="0.6000000000000001mm" shape="rect" />
+            <smtpad portHints={["1","left"]} pcbX="-0.5mm" pcbY="0mm" layer="top" width="0.6000000000000001mm" height="0.6000000000000001mm" shape="rect" />
+    <smtpad portHints={["2","right"]} pcbX="0.5mm" pcbY="0mm" layer="top" width="0.6000000000000001mm" height="0.6000000000000001mm" shape="rect" />
           </footprint>}
         {...props}
       />
     )"
-  `)
+    `)
 })
 
 test("should require output path", async () => {

package/tests/test1-basic-circuit.test.tsx

@@ -26,11 +26,11 @@ test("test1 basic circuit", async () => {
     export const MyResistor = (props: ChipProps) => (
       <chip
         footprint={<footprint>
-            <smtpad portHints={["1","left"]} pcbX="-0.5mm" pcbY="0mm" width="0.6000000000000001mm" height="0.6000000000000001mm" shape="rect" />
-    <smtpad portHints={["2","right"]} pcbX="0.5mm" pcbY="0mm" width="0.6000000000000001mm" height="0.6000000000000001mm" shape="rect" />
+            <smtpad portHints={["1","left"]} pcbX="-0.5mm" pcbY="0mm" layer="top" width="0.6000000000000001mm" height="0.6000000000000001mm" shape="rect" />
+    <smtpad portHints={["2","right"]} pcbX="0.5mm" pcbY="0mm" layer="top" width="0.6000000000000001mm" height="0.6000000000000001mm" shape="rect" />
           </footprint>}
         {...props}
       />
     )"
-  `)
+    `)
 })

package/tests/test16-support-pcb-smtpad-shapes.test.tsx

@@ -1,5 +1,6 @@
 import { expect, test } from "bun:test"
 import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
+import type { AnyCircuitElement, PcbSmtPad } from "circuit-json"
 import { convertCircuitJsonToTscircuit } from "lib"
 import { runTscircuitCode } from "tscircuit"
 
@@ -13,9 +14,10 @@ test("test16 support pcb smtpad shapes", async () => {
     export const Test16Component = (props: ChipProps) => (
       <chip
         footprint={<footprint>
-            <smtpad portHints={["1"]} pcbX="1mm" pcbY="2mm" width="1.5mm" height="0.8mm" radius="0.4mm" shape="pill" />
-    <smtpad portHints={["2"]} shape="polygon" points={[{"x":0,"y":0},{"x":1,"y":0},{"x":0.5,"y":1}]} />
-    <smtpad portHints={["3"]} pcbX="-1mm" pcbY="-2mm" width="2mm" height="0.6mm" pcbRotation="45deg" cornerRadius={0.2} shape="rotated_rect" />
+            <smtpad portHints={["1"]} pcbX="1mm" pcbY="2mm" layer="top" coveredWithSolderMask={true} solderMaskMargin="0.03mm" width="1.5mm" height="0.8mm" radius="0.4mm" shape="pill" />
+    <smtpad portHints={["2"]} layer="top" coveredWithSolderMask={true} solderMaskMargin="0.06mm" shape="polygon" points={[{"x":0,"y":0},{"x":1,"y":0},{"x":0.5,"y":1}]} />
+    <smtpad portHints={["3"]} pcbX="-1mm" pcbY="-2mm" layer="bottom" coveredWithSolderMask={true} solderMaskMargin="0.04mm" cornerRadius="0.15mm" solderMaskMarginLeft="0.01mm" solderMaskMarginTop="0.02mm" solderMaskMarginRight="0.03mm" solderMaskMarginBottom="0.05mm" width="2mm" height="0.6mm" pcbRotation="45deg" shape="rotated_rect" />
+    <smtpad portHints={["4"]} pcbX="2.5mm" pcbY="-1.5mm" layer="bottom" coveredWithSolderMask={true} solderMaskMargin="0.05mm" rectBorderRadius="0.25mm" cornerRadius="0.2mm" solderMaskMarginLeft="0.11mm" solderMaskMarginTop="0.12mm" solderMaskMarginRight="0.13mm" solderMaskMarginBottom="0.14mm" width="1.8mm" height="0.9mm" shape="rect" />
           </footprint>}
         {...props}
       />
@@ -39,10 +41,33 @@ circuit.add(
     <Test16Component />
   </board>,
 )
-  `)) as any[]
-  expect(
-    renderedCircuitJson.filter((element) => element.type === "pcb_smtpad"),
-  ).toHaveLength(6)
+  `)) as AnyCircuitElement[]
+
+  const renderedSmtPads = renderedCircuitJson.filter(
+    (elm): elm is PcbSmtPad => elm.type === "pcb_smtpad",
+  )
+
+  expect(renderedSmtPads).toHaveLength(8)
+  expect(renderedSmtPads).toEqual(
+    expect.arrayContaining([
+      expect.objectContaining({
+        port_hints: ["3"],
+        layer: "bottom",
+        shape: "rotated_rect",
+        corner_radius: 0.15,
+        is_covered_with_solder_mask: true,
+        soldermask_margin: 0.04,
+      }),
+      expect.objectContaining({
+        port_hints: ["4"],
+        layer: "bottom",
+        shape: "rect",
+        corner_radius: 0.2,
+        is_covered_with_solder_mask: true,
+        soldermask_margin: 0.05,
+      }),
+    ]),
+  )
 
   const pcbSvg = convertCircuitJsonToPcbSvg(renderedCircuitJson)
   await expect(pcbSvg).toMatchSvgSnapshot(import.meta.path, "pcb")
@@ -83,6 +108,8 @@ const circuitJson: any = [
     height: 0.8,
     radius: 0.4,
     layer: "top",
+    is_covered_with_solder_mask: true,
+    soldermask_margin: 0.03,
     port_hints: ["1"],
   },
   {
@@ -96,6 +123,8 @@ const circuitJson: any = [
       { x: 0.5, y: 1 },
     ],
     layer: "top",
+    is_covered_with_solder_mask: true,
+    soldermask_margin: 0.06,
     port_hints: ["2"],
   },
   {
@@ -108,8 +137,34 @@ const circuitJson: any = [
     width: 2,
     height: 0.6,
     ccw_rotation: 45,
-    corner_radius: 0.2,
-    layer: "top",
+    corner_radius: 0.15,
+    layer: "bottom",
+    is_covered_with_solder_mask: true,
+    soldermask_margin: 0.04,
+    soldermask_margin_left: 0.01,
+    soldermask_margin_top: 0.02,
+    soldermask_margin_right: 0.03,
+    soldermask_margin_bottom: 0.05,
     port_hints: ["3"],
   },
+  {
+    type: "pcb_smtpad",
+    pcb_smtpad_id: "rect_pad",
+    pcb_component_id: "pcb_generic_component_0",
+    shape: "rect",
+    x: 2.5,
+    y: -1.5,
+    width: 1.8,
+    height: 0.9,
+    rect_border_radius: 0.25,
+    corner_radius: 0.2,
+    layer: "bottom",
+    is_covered_with_solder_mask: true,
+    soldermask_margin: 0.05,
+    soldermask_margin_left: 0.11,
+    soldermask_margin_top: 0.12,
+    soldermask_margin_right: 0.13,
+    soldermask_margin_bottom: 0.14,
+    port_hints: ["4"],
+  },
 ]

package/tests/test2-get-component-template.test.tsx

@@ -37,8 +37,8 @@ test("test2 getComponentUsingTemplate", async () => {
     export const MyResistor = (props: ChipProps<typeof pinLabels>) => (
       <chip
         footprint={<footprint>
-            <smtpad portHints={["1","left"]} pcbX="-0.5mm" pcbY="0mm" width="0.6000000000000001mm" height="0.6000000000000001mm" shape="rect" />
-    <smtpad portHints={["2","right"]} pcbX="0.5mm" pcbY="0mm" width="0.6000000000000001mm" height="0.6000000000000001mm" shape="rect" />
+            <smtpad portHints={["1","left"]} pcbX="-0.5mm" pcbY="0mm" layer="top" width="0.6000000000000001mm" height="0.6000000000000001mm" shape="rect" />
+    <smtpad portHints={["2","right"]} pcbX="0.5mm" pcbY="0mm" layer="top" width="0.6000000000000001mm" height="0.6000000000000001mm" shape="rect" />
           </footprint>}
         pinLabels={pinLabels}
         cadModel={{
@@ -55,5 +55,5 @@ test("test2 getComponentUsingTemplate", async () => {
         {...props}
       />
     )"
-  `)
+    `)
 })

package/tests/test3-kicad-mod-circuit-json-example.test.tsx

@@ -38,34 +38,34 @@ test("test3 kicad mod circuit json example", async () => {
     <platedhole  portHints={["13"]} pcbX="8.89mm" pcbY="5.08mm" outerDiameter="1.27mm" holeDiameter="0.7mm" shape="circle" />
     <platedhole  portHints={["14"]} pcbX="7.62mm" pcbY="7.62mm" outerDiameter="1.5mm" holeDiameter="0.85mm" shape="circle" />
     <platedhole  portHints={["14"]} pcbX="8.89mm" pcbY="7.62mm" outerDiameter="1.27mm" holeDiameter="0.7mm" shape="circle" />
-    <smtpad portHints={["1"]} pcbX="-8.278mm" pcbY="7.62mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["1"]} pcbX="-8.278mm" pcbY="7.62mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["2"]} pcbX="-8.337mm" pcbY="5.08mm" width="1.626mm" height="1.208mm" shape="rect" />
-    <smtpad portHints={["2"]} pcbX="-8.337mm" pcbY="5.08mm" width="1.626mm" height="1.208mm" shape="rect" />
-    <smtpad portHints={["3"]} pcbX="-8.278mm" pcbY="2.54mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["3"]} pcbX="-8.278mm" pcbY="2.54mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["4"]} pcbX="-8.278mm" pcbY="0mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["4"]} pcbX="-8.278mm" pcbY="0mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["5"]} pcbX="-8.278mm" pcbY="-2.54mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["5"]} pcbX="-8.278mm" pcbY="-2.54mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["6"]} pcbX="-8.337mm" pcbY="-5.08mm" width="1.626mm" height="1.208mm" shape="rect" />
-    <smtpad portHints={["6"]} pcbX="-8.337mm" pcbY="-5.08mm" width="1.626mm" height="1.208mm" shape="rect" />
-    <smtpad portHints={["7"]} pcbX="-8.278mm" pcbY="-7.62mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["7"]} pcbX="-8.278mm" pcbY="-7.62mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["8"]} pcbX="8.278mm" pcbY="-7.62mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["8"]} pcbX="8.278mm" pcbY="-7.62mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["9"]} pcbX="8.337mm" pcbY="-5.08mm" width="1.626mm" height="1.208mm" shape="rect" />
-    <smtpad portHints={["9"]} pcbX="8.337mm" pcbY="-5.08mm" width="1.626mm" height="1.208mm" shape="rect" />
-    <smtpad portHints={["10"]} pcbX="8.278mm" pcbY="-2.54mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["10"]} pcbX="8.278mm" pcbY="-2.54mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["11"]} pcbX="8.278mm" pcbY="0mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["11"]} pcbX="8.278mm" pcbY="0mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["12"]} pcbX="8.278mm" pcbY="2.54mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["12"]} pcbX="8.278mm" pcbY="2.54mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["13"]} pcbX="8.337mm" pcbY="5.08mm" width="1.626mm" height="1.208mm" shape="rect" />
-    <smtpad portHints={["13"]} pcbX="8.337mm" pcbY="5.08mm" width="1.626mm" height="1.208mm" shape="rect" />
-    <smtpad portHints={["14"]} pcbX="8.278mm" pcbY="7.62mm" width="1.626mm" height="1.325mm" shape="rect" />
-    <smtpad portHints={["14"]} pcbX="8.278mm" pcbY="7.62mm" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["1"]} pcbX="-8.278mm" pcbY="7.62mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["1"]} pcbX="-8.278mm" pcbY="7.62mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["2"]} pcbX="-8.337mm" pcbY="5.08mm" layer="top" width="1.626mm" height="1.208mm" shape="rect" />
+    <smtpad portHints={["2"]} pcbX="-8.337mm" pcbY="5.08mm" layer="top" width="1.626mm" height="1.208mm" shape="rect" />
+    <smtpad portHints={["3"]} pcbX="-8.278mm" pcbY="2.54mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["3"]} pcbX="-8.278mm" pcbY="2.54mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["4"]} pcbX="-8.278mm" pcbY="0mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["4"]} pcbX="-8.278mm" pcbY="0mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["5"]} pcbX="-8.278mm" pcbY="-2.54mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["5"]} pcbX="-8.278mm" pcbY="-2.54mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["6"]} pcbX="-8.337mm" pcbY="-5.08mm" layer="top" width="1.626mm" height="1.208mm" shape="rect" />
+    <smtpad portHints={["6"]} pcbX="-8.337mm" pcbY="-5.08mm" layer="top" width="1.626mm" height="1.208mm" shape="rect" />
+    <smtpad portHints={["7"]} pcbX="-8.278mm" pcbY="-7.62mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["7"]} pcbX="-8.278mm" pcbY="-7.62mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["8"]} pcbX="8.278mm" pcbY="-7.62mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["8"]} pcbX="8.278mm" pcbY="-7.62mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["9"]} pcbX="8.337mm" pcbY="-5.08mm" layer="top" width="1.626mm" height="1.208mm" shape="rect" />
+    <smtpad portHints={["9"]} pcbX="8.337mm" pcbY="-5.08mm" layer="top" width="1.626mm" height="1.208mm" shape="rect" />
+    <smtpad portHints={["10"]} pcbX="8.278mm" pcbY="-2.54mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["10"]} pcbX="8.278mm" pcbY="-2.54mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["11"]} pcbX="8.278mm" pcbY="0mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["11"]} pcbX="8.278mm" pcbY="0mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["12"]} pcbX="8.278mm" pcbY="2.54mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["12"]} pcbX="8.278mm" pcbY="2.54mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["13"]} pcbX="8.337mm" pcbY="5.08mm" layer="top" width="1.626mm" height="1.208mm" shape="rect" />
+    <smtpad portHints={["13"]} pcbX="8.337mm" pcbY="5.08mm" layer="top" width="1.626mm" height="1.208mm" shape="rect" />
+    <smtpad portHints={["14"]} pcbX="8.278mm" pcbY="7.62mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
+    <smtpad portHints={["14"]} pcbX="8.278mm" pcbY="7.62mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
     <silkscreenpath route={[{"x":-8.89,"y":-8.509},{"x":-8.89,"y":8.636}]} />
     <silkscreenpath route={[{"x":-6.985,"y":-10.414},{"x":6.985,"y":-10.414}]} />
     <silkscreenpath route={[{"x":6.985,"y":10.541},{"x":-6.985,"y":10.541}]} />
@@ -80,7 +80,7 @@ test("test3 kicad mod circuit json example", async () => {
         {...props}
       />
     )"
-  `)
+    `)
 })
 const circuitJson: any = [
   {

package/tests/test4-support-silkscreen.test.tsx

@@ -14,8 +14,8 @@ test("test4 support silkscreen", async () => {
     export const Test4Component = (props: ChipProps) => (
       <chip
         footprint={<footprint>
-            <smtpad portHints={["1"]} pcbX="-0.32mm" pcbY="0mm" width="0.46mm" height="0.4mm" shape="rect" />
-    <smtpad portHints={["2"]} pcbX="0.32mm" pcbY="0mm" width="0.46mm" height="0.4mm" shape="rect" />
+            <smtpad portHints={["1"]} pcbX="-0.32mm" pcbY="0mm" layer="top" width="0.46mm" height="0.4mm" shape="rect" />
+    <smtpad portHints={["2"]} pcbX="0.32mm" pcbY="0mm" layer="top" width="0.46mm" height="0.4mm" shape="rect" />
     <fabricationnotepath route={[{"x":-0.3,"y":0.15},{"x":0.3,"y":0.15}]} strokeWidth={0.1} />
     <fabricationnotepath route={[{"x":-0.3,"y":-0.15},{"x":-0.3,"y":0.15}]} strokeWidth={0.1} />
     <fabricationnotepath route={[{"x":0.3,"y":0.15},{"x":0.3,"y":-0.15}]} strokeWidth={0.1} />

package/tests/test5-pcb-cutout.test.tsx

@@ -136,13 +136,13 @@ test("test pcb_cutout conversion - mixed with other elements", async () => {
       <chip
         footprint={<footprint>
             <hole pcbX="10mm" pcbY="10mm" diameter="0.5mm" />
-    <smtpad portHints={["1"]} pcbX="0mm" pcbY="0mm" width="1mm" height="1mm" shape="rect" />
+    <smtpad portHints={["1"]} pcbX="0mm" pcbY="0mm" layer="top" width="1mm" height="1mm" shape="rect" />
     <cutout shape="circle" pcbX="5mm" pcbY="5mm" radius="1.5mm" />
           </footprint>}
         {...props}
       />
     )"
-  `)
+    `)
 
   const result = await runTscircuitCode(tscircuit)
   expect(Array.isArray(result)).toBe(true)

package/tests/test8-support-courtyard.test.tsx

@@ -12,7 +12,7 @@ test("test8 support courtyard elements", async () => {
     export const Test8Component = (props: ChipProps) => (
       <chip
         footprint={<footprint>
-            <smtpad portHints={["1"]} pcbX="-0.5mm" pcbY="0mm" width="0.6mm" height="0.9mm" shape="rect" />
+            <smtpad portHints={["1"]} pcbX="-0.5mm" pcbY="0mm" layer="top" width="0.6mm" height="0.9mm" shape="rect" />
     <courtyardoutline outline={[{"x":-1.8,"y":-1.4},{"x":1.8,"y":-1.4},{"x":1.8,"y":1.4},{"x":-1.8,"y":1.4}]} layer="top" />
     <courtyardrect pcbX={0} pcbY={0} width={4} height={3} layer="top" />
     <courtyardrect pcbX={0.2} pcbY={0.2} width={4.6} height={3.6} layer="bottom" />