circuit-json-to-tscircuit 0.0.39 → 0.0.41

package/dist/{chunk-G5NSFWRY.js → chunk-BA4FQZIF.js}

@@ -1,76 +1,16 @@
 // lib/get-board-using-template.ts
-import { mmStr } from "@tscircuit/mm";
-import { su } from "@tscircuit/soup-util";
-var getBoardUsingTemplate = ({ circuitJson }) => {
-  const pcbBoard = su(circuitJson).pcb_board.list()[0];
-  const boardProps = [];
-  if (pcbBoard) {
-    if (pcbBoard.width !== void 0) {
-      boardProps.push(`width="${mmStr(pcbBoard.width)}"`);
-    }
-    if (pcbBoard.height !== void 0) {
-      boardProps.push(`height="${mmStr(pcbBoard.height)}"`);
-    }
-    if (pcbBoard.outline && pcbBoard.outline.length > 0) {
-      const points = pcbBoard.outline.map((p) => `{ x: ${p.x}, y: ${p.y} }`).join(", ");
-      boardProps.push(`outline={[${points}]}`);
-    }
-    if (pcbBoard.thickness !== void 0) {
-      boardProps.push(`thickness="${mmStr(pcbBoard.thickness)}"`);
-    }
-    if (pcbBoard.num_layers !== void 0) {
-      boardProps.push(`layers={${pcbBoard.num_layers}}`);
-    }
-    if (pcbBoard.material !== void 0) {
-      boardProps.push(`material="${pcbBoard.material}"`);
-    }
-    if (pcbBoard.solder_mask_color !== void 0) {
-      boardProps.push(`solderMaskColor="${pcbBoard.solder_mask_color}"`);
-    }
-    if (pcbBoard.silkscreen_color !== void 0) {
-      boardProps.push(`silkscreenColor="${pcbBoard.silkscreen_color}"`);
-    }
-    if (pcbBoard.anchor_position !== void 0) {
-      boardProps.push(
-        `boardAnchorPosition={{ x: ${pcbBoard.anchor_position.x}, y: ${pcbBoard.anchor_position.y} }}`
-      );
-    }
-    if (pcbBoard.anchor_alignment !== void 0) {
-      boardProps.push(`boardAnchorAlignment="${pcbBoard.anchor_alignment}"`);
-    }
-  }
-  const boardPropsStr = boardProps.join(" ");
-  const children = "";
-  return `
-export default () => (
-  <board${boardPropsStr ? ` ${boardPropsStr}` : ""}>
-    ${children}
-  </board>
-)
-`.replace(/\n\s*\n/g, "\n").trim();
-};
+import { mmStr as mmStr7 } from "@tscircuit/mm";
+import { su as su12 } from "@tscircuit/soup-util";
 
 // lib/generate-footprint-tsx/convert-copper-text.ts
-import { su as su2 } from "@tscircuit/soup-util";
+import { su } from "@tscircuit/soup-util";
 
-// lib/generate-footprint-tsx/helpers.ts
-import { mmStr as mmStr2 } from "@tscircuit/mm";
+// lib/generate-footprint-tsx/footprint-tsx-attribute-formatters/escape-jsx-text.ts
 var escapeJsxText = (value) => String(value ?? "").replace(/"/g, '\\"');
-var formatMm = (value) => mmStr2(value ?? 0);
-var formatOptionalMmAttr = (attrName, value) => {
-  if (value === void 0) return "";
-  return ` ${attrName}="${mmStr2(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;
-  return ` ${attrName}="${formatted}"`;
-};
 
 // lib/generate-footprint-tsx/convert-copper-text.ts
 var convertCopperText = (circuitJson) => {
-  const copperTexts = su2(circuitJson).pcb_copper_text.list();
+  const copperTexts = su(circuitJson).pcb_copper_text.list();
   const elementStrings = [];
   for (const copperText of copperTexts) {
     const anchorPosition = copperText.anchor_position ?? { x: 0, y: 0 };
@@ -104,11 +44,20 @@ var convertCopperText = (circuitJson) => {
 };
 
 // lib/generate-footprint-tsx/convert-courtyard.ts
-import { su as su3 } from "@tscircuit/soup-util";
+import { su as su2 } from "@tscircuit/soup-util";
+
+// lib/generate-footprint-tsx/footprint-tsx-attribute-formatters/format-pcb-rotation-attr.ts
+var formatPcbRotationAttr = (rotation, attrName = "pcbRotation") => {
+  if (rotation === void 0) return "";
+  const formatted = typeof rotation === "number" ? `${rotation}deg` : rotation;
+  return ` ${attrName}="${formatted}"`;
+};
+
+// lib/generate-footprint-tsx/convert-courtyard.ts
 var convertCourtyard = (circuitJson) => {
-  const courtyardOutlines = su3(circuitJson).pcb_courtyard_outline.list();
-  const courtyardRects = su3(circuitJson).pcb_courtyard_rect.list();
-  const courtyardCircles = su3(circuitJson).pcb_courtyard_circle.list();
+  const courtyardOutlines = su2(circuitJson).pcb_courtyard_outline.list();
+  const courtyardRects = su2(circuitJson).pcb_courtyard_rect.list();
+  const courtyardCircles = su2(circuitJson).pcb_courtyard_circle.list();
   const elementStrings = [];
   for (const courtyardOutline of courtyardOutlines) {
     const attrs = [
@@ -129,6 +78,9 @@ var convertCourtyard = (circuitJson) => {
     if (courtyardRect.layer !== void 0) {
       attrs.push(`layer="${courtyardRect.layer}"`);
     }
+    if (courtyardRect.ccw_rotation !== void 0) {
+      attrs.push(formatPcbRotationAttr(courtyardRect.ccw_rotation).trimStart());
+    }
     elementStrings.push(`<courtyardrect ${attrs.join(" ")} />`);
   }
   for (const courtyardCircle of courtyardCircles) {
@@ -146,9 +98,15 @@ var convertCourtyard = (circuitJson) => {
 };
 
 // lib/generate-footprint-tsx/convert-cutouts.ts
-import { su as su4 } from "@tscircuit/soup-util";
+import { su as su3 } from "@tscircuit/soup-util";
+
+// lib/generate-footprint-tsx/footprint-tsx-attribute-formatters/format-mm.ts
+import { mmStr } from "@tscircuit/mm";
+var formatMm = (value) => mmStr(value ?? 0);
+
+// lib/generate-footprint-tsx/convert-cutouts.ts
 var convertCutouts = (circuitJson) => {
-  const pcbCutouts = su4(circuitJson).pcb_cutout.list();
+  const pcbCutouts = su3(circuitJson).pcb_cutout.list();
   const elementStrings = [];
   for (const cutout of pcbCutouts) {
     if (cutout.shape === "rect") {
@@ -172,12 +130,12 @@ var convertCutouts = (circuitJson) => {
 };
 
 // lib/generate-footprint-tsx/convert-fabrication.ts
-import { su as su5 } from "@tscircuit/soup-util";
+import { su as su4 } from "@tscircuit/soup-util";
 var convertFabrication = (circuitJson) => {
-  const fabricationNotePaths = su5(circuitJson).pcb_fabrication_note_path.list();
-  const fabricationNoteTexts = su5(circuitJson).pcb_fabrication_note_text.list();
-  const fabricationNoteRects = su5(circuitJson).pcb_fabrication_note_rect.list();
-  const fabricationNoteDimensions = su5(circuitJson).pcb_fabrication_note_dimension.list();
+  const fabricationNotePaths = su4(circuitJson).pcb_fabrication_note_path.list();
+  const fabricationNoteTexts = su4(circuitJson).pcb_fabrication_note_text.list();
+  const fabricationNoteRects = su4(circuitJson).pcb_fabrication_note_rect.list();
+  const fabricationNoteDimensions = su4(circuitJson).pcb_fabrication_note_dimension.list();
   const elementStrings = [];
   for (const fabPath of fabricationNotePaths) {
     const attrs = [`route={${JSON.stringify(fabPath.route)}}`];
@@ -281,27 +239,27 @@ var convertFabrication = (circuitJson) => {
 };
 
 // lib/generate-footprint-tsx/convert-holes.ts
-import { su as su6 } from "@tscircuit/soup-util";
-import { mmStr as mmStr3 } from "@tscircuit/mm";
+import { su as su5 } from "@tscircuit/soup-util";
+import { mmStr as mmStr2 } from "@tscircuit/mm";
 var convertHoles = (circuitJson) => {
-  const holes = su6(circuitJson).pcb_hole.list();
+  const holes = su5(circuitJson).pcb_hole.list();
   const elementStrings = [];
   for (const hole of holes) {
     if (hole.hole_shape === "circle") {
       elementStrings.push(
-        `<hole pcbX="${mmStr3(hole.x)}" pcbY="${mmStr3(hole.y)}" diameter="${mmStr3(hole.hole_diameter)}" />`
+        `<hole pcbX="${mmStr2(hole.x)}" pcbY="${mmStr2(hole.y)}" diameter="${mmStr2(hole.hole_diameter)}" />`
       );
     } else if (hole.hole_shape === "rect") {
       elementStrings.push(
-        `<hole pcbX="${mmStr3(hole.x)}" pcbY="${mmStr3(hole.y)}" width="${mmStr3(hole.hole_width)}" height="${mmStr3(hole.hole_height)}" shape="rect" />`
+        `<hole pcbX="${mmStr2(hole.x)}" pcbY="${mmStr2(hole.y)}" width="${mmStr2(hole.hole_width)}" height="${mmStr2(hole.hole_height)}" shape="rect" />`
       );
     } else if (hole.hole_shape === "oval") {
       elementStrings.push(
-        `<hole pcbX="${mmStr3(hole.x)}" pcbY="${mmStr3(hole.y)}" width="${mmStr3(hole.hole_width)}" height="${mmStr3(hole.hole_height)}" shape="oval" />`
+        `<hole pcbX="${mmStr2(hole.x)}" pcbY="${mmStr2(hole.y)}" width="${mmStr2(hole.hole_width)}" height="${mmStr2(hole.hole_height)}" shape="oval" />`
       );
     } else if (hole.hole_shape === "pill" || hole.hole_shape === "rotated_pill") {
       elementStrings.push(
-        `<hole pcbX="${mmStr3(hole.x)}" pcbY="${mmStr3(hole.y)}" width="${mmStr3(hole.hole_width)}" height="${mmStr3(hole.hole_height)}" shape="pill"${formatPcbRotationAttr("ccw_rotation" in hole ? hole.ccw_rotation : void 0)} />`
+        `<hole pcbX="${mmStr2(hole.x)}" pcbY="${mmStr2(hole.y)}" width="${mmStr2(hole.hole_width)}" height="${mmStr2(hole.hole_height)}" shape="pill"${formatPcbRotationAttr("ccw_rotation" in hole ? hole.ccw_rotation : void 0)} />`
       );
     }
   }
@@ -309,9 +267,9 @@ var convertHoles = (circuitJson) => {
 };
 
 // lib/generate-footprint-tsx/convert-keepouts.ts
-import { su as su7 } from "@tscircuit/soup-util";
+import { su as su6 } from "@tscircuit/soup-util";
 var convertKeepouts = (circuitJson) => {
-  const pcbKeepouts = su7(circuitJson).pcb_keepout.list();
+  const pcbKeepouts = su6(circuitJson).pcb_keepout.list();
   const elementStrings = [];
   for (const keepout of pcbKeepouts) {
     if (keepout.shape === "rect") {
@@ -330,13 +288,13 @@ var convertKeepouts = (circuitJson) => {
 };
 
 // lib/generate-footprint-tsx/convert-notes.ts
-import { su as su8 } from "@tscircuit/soup-util";
+import { su as su7 } from "@tscircuit/soup-util";
 var convertNotes = (circuitJson) => {
-  const noteTexts = su8(circuitJson).pcb_note_text.list();
-  const noteRects = su8(circuitJson).pcb_note_rect.list();
-  const notePaths = su8(circuitJson).pcb_note_path.list();
-  const noteLines = su8(circuitJson).pcb_note_line.list();
-  const noteDimensions = su8(circuitJson).pcb_note_dimension.list();
+  const noteTexts = su7(circuitJson).pcb_note_text.list();
+  const noteRects = su7(circuitJson).pcb_note_rect.list();
+  const notePaths = su7(circuitJson).pcb_note_path.list();
+  const noteLines = su7(circuitJson).pcb_note_line.list();
+  const noteDimensions = su7(circuitJson).pcb_note_dimension.list();
   const elementStrings = [];
   for (const noteText of noteTexts) {
     const anchorPosition = noteText.anchor_position ?? { x: 0, y: 0 };
@@ -426,10 +384,28 @@ var convertNotes = (circuitJson) => {
 };
 
 // lib/generate-footprint-tsx/convert-plated-holes.ts
-import { su as su9 } from "@tscircuit/soup-util";
+import { su as su8 } from "@tscircuit/soup-util";
 import { mmStr as mmStr4 } from "@tscircuit/mm";
+
+// lib/generate-footprint-tsx/footprint-tsx-attribute-formatters/format-optional-mm-attr.ts
+import { mmStr as mmStr3 } from "@tscircuit/mm";
+var formatOptionalMmAttr = (attrName, value) => {
+  if (value === void 0) return "";
+  return ` ${attrName}="${mmStr3(value)}"`;
+};
+
+// lib/generate-footprint-tsx/footprint-tsx-attribute-formatters/format-solder-mask-attrs.ts
+var formatSolderMaskAttrs = (platedHole) => {
+  let coveredWithSolderMaskAttr = "";
+  if (platedHole.is_covered_with_solder_mask !== void 0) {
+    coveredWithSolderMaskAttr = ` coveredWithSolderMask={${platedHole.is_covered_with_solder_mask}}`;
+  }
+  return `${coveredWithSolderMaskAttr}${formatOptionalMmAttr("solderMaskMargin", platedHole.soldermask_margin)}`;
+};
+
+// lib/generate-footprint-tsx/convert-plated-holes.ts
 var convertPlatedHoles = (circuitJson) => {
-  const platedHoles = su9(circuitJson).pcb_plated_hole.list();
+  const platedHoles = su8(circuitJson).pcb_plated_hole.list();
   const elementStrings = [];
   for (const platedHole of platedHoles) {
     if (platedHole.shape === "oval" || platedHole.shape === "pill") {
@@ -461,12 +437,12 @@ var convertPlatedHoles = (circuitJson) => {
 };
 
 // lib/generate-footprint-tsx/convert-silkscreen.ts
-import { su as su10 } from "@tscircuit/soup-util";
+import { su as su9 } from "@tscircuit/soup-util";
 var convertSilkscreen = (circuitJson) => {
-  const silkscreenLines = su10(circuitJson).pcb_silkscreen_line.list();
-  const silkscreenPaths = su10(circuitJson).pcb_silkscreen_path.list();
-  const silkscreenRects = su10(circuitJson).pcb_silkscreen_rect.list();
-  const silkscreenCircles = su10(circuitJson).pcb_silkscreen_circle.list();
+  const silkscreenLines = su9(circuitJson).pcb_silkscreen_line.list();
+  const silkscreenPaths = su9(circuitJson).pcb_silkscreen_path.list();
+  const silkscreenRects = su9(circuitJson).pcb_silkscreen_rect.list();
+  const silkscreenCircles = su9(circuitJson).pcb_silkscreen_circle.list();
   const elementStrings = [];
   for (const silkscreenPath of silkscreenPaths) {
     elementStrings.push(
@@ -528,10 +504,10 @@ var convertSilkscreen = (circuitJson) => {
 };
 
 // lib/generate-footprint-tsx/convert-silkscreen-text.ts
-import { su as su11 } from "@tscircuit/soup-util";
+import { su as su10 } from "@tscircuit/soup-util";
 import { mmStr as mmStr5 } from "@tscircuit/mm";
 var convertSilkscreenText = (circuitJson) => {
-  const silkscreenTexts = su11(circuitJson).pcb_silkscreen_text.list();
+  const silkscreenTexts = su10(circuitJson).pcb_silkscreen_text.list();
   const elementStrings = [];
   for (const silkscreenText of silkscreenTexts) {
     const pcbX = silkscreenText.anchor_position?.x ?? 0;
@@ -546,10 +522,10 @@ var convertSilkscreenText = (circuitJson) => {
 };
 
 // lib/generate-footprint-tsx/convert-smt-pads.ts
-import { su as su12 } from "@tscircuit/soup-util";
+import { su as su11 } from "@tscircuit/soup-util";
 import { mmStr as mmStr6 } from "@tscircuit/mm";
 var convertSmtPads = (circuitJson) => {
-  const smtPads = su12(circuitJson).pcb_smtpad.list();
+  const smtPads = su11(circuitJson).pcb_smtpad.list();
   const elementStrings = [];
   for (const smtPad of smtPads) {
     const commonAttrs = [];
@@ -676,6 +652,57 @@ var generateFootprintTsx = (circuitJson) => {
   `.trim();
 };
 
+// lib/get-board-using-template.ts
+var getBoardUsingTemplate = ({ circuitJson }) => {
+  const pcbBoard = su12(circuitJson).pcb_board.list()[0];
+  const boardProps = [];
+  if (pcbBoard) {
+    if (pcbBoard.width !== void 0) {
+      boardProps.push(`width="${mmStr7(pcbBoard.width)}"`);
+    }
+    if (pcbBoard.height !== void 0) {
+      boardProps.push(`height="${mmStr7(pcbBoard.height)}"`);
+    }
+    if (pcbBoard.outline && pcbBoard.outline.length > 0) {
+      const points = pcbBoard.outline.map((p) => `{ x: ${p.x}, y: ${p.y} }`).join(", ");
+      boardProps.push(`outline={[${points}]}`);
+    }
+    if (pcbBoard.thickness !== void 0) {
+      boardProps.push(`thickness="${mmStr7(pcbBoard.thickness)}"`);
+    }
+    if (pcbBoard.num_layers !== void 0) {
+      boardProps.push(`layers={${pcbBoard.num_layers}}`);
+    }
+    if (pcbBoard.material !== void 0) {
+      boardProps.push(`material="${pcbBoard.material}"`);
+    }
+    if (pcbBoard.solder_mask_color !== void 0) {
+      boardProps.push(`solderMaskColor="${pcbBoard.solder_mask_color}"`);
+    }
+    if (pcbBoard.silkscreen_color !== void 0) {
+      boardProps.push(`silkscreenColor="${pcbBoard.silkscreen_color}"`);
+    }
+    if (pcbBoard.anchor_position !== void 0) {
+      boardProps.push(
+        `boardAnchorPosition={{ x: ${pcbBoard.anchor_position.x}, y: ${pcbBoard.anchor_position.y} }}`
+      );
+    }
+    if (pcbBoard.anchor_alignment !== void 0) {
+      boardProps.push(`boardAnchorAlignment="${pcbBoard.anchor_alignment}"`);
+    }
+  }
+  const boardPropsStr = boardProps.join(" ");
+  const footprintTsx = generateFootprintTsx(circuitJson);
+  const children = footprintTsx ? `<chip footprint={${footprintTsx}} />` : "";
+  return `
+export default () => (
+  <board${boardPropsStr ? ` ${boardPropsStr}` : ""}>
+    ${children}
+  </board>
+)
+`.replace(/\n\s*\n/g, "\n").trim();
+};
+
 // lib/generate-symbol-tsx.ts
 import { su as su13 } from "@tscircuit/soup-util";
 var escapeJsxText2 = (text) => text.replace(/\\/g, "\\\\").replace(/"/g, '\\"');

package/dist/cli/main.js

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

package/lib/generate-footprint-tsx/convert-copper-text.ts

@@ -1,6 +1,6 @@
 import { su } from "@tscircuit/soup-util"
 import type { FootprintElementConverter } from "./converter-types"
-import { escapeJsxText } from "./helpers"
+import { escapeJsxText } from "./footprint-tsx-attribute-formatters/escape-jsx-text"
 
 export const convertCopperText: FootprintElementConverter = (circuitJson) => {
   const copperTexts = su(circuitJson).pcb_copper_text.list()

package/lib/generate-footprint-tsx/convert-courtyard.ts

@@ -1,5 +1,6 @@
 import { su } from "@tscircuit/soup-util"
 import type { FootprintElementConverter } from "./converter-types"
+import { formatPcbRotationAttr } from "./footprint-tsx-attribute-formatters/format-pcb-rotation-attr"
 
 export const convertCourtyard: FootprintElementConverter = (circuitJson) => {
   const courtyardOutlines = su(circuitJson).pcb_courtyard_outline.list()
@@ -28,6 +29,9 @@ export const convertCourtyard: FootprintElementConverter = (circuitJson) => {
     if (courtyardRect.layer !== undefined) {
       attrs.push(`layer="${courtyardRect.layer}"`)
     }
+    if (courtyardRect.ccw_rotation !== undefined) {
+      attrs.push(formatPcbRotationAttr(courtyardRect.ccw_rotation).trimStart())
+    }
 
     elementStrings.push(`<courtyardrect ${attrs.join(" ")} />`)
   }

package/lib/generate-footprint-tsx/convert-cutouts.ts

@@ -1,6 +1,6 @@
 import { su } from "@tscircuit/soup-util"
 import type { FootprintElementConverter } from "./converter-types"
-import { formatMm } from "./helpers"
+import { formatMm } from "./footprint-tsx-attribute-formatters/format-mm"
 
 export const convertCutouts: FootprintElementConverter = (circuitJson) => {
   const pcbCutouts = su(circuitJson).pcb_cutout.list()

package/lib/generate-footprint-tsx/convert-fabrication.ts

@@ -1,6 +1,6 @@
 import { su } from "@tscircuit/soup-util"
 import type { FootprintElementConverter } from "./converter-types"
-import { escapeJsxText } from "./helpers"
+import { escapeJsxText } from "./footprint-tsx-attribute-formatters/escape-jsx-text"
 
 export const convertFabrication: FootprintElementConverter = (circuitJson) => {
   const fabricationNotePaths = su(circuitJson).pcb_fabrication_note_path.list()

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

@@ -1,7 +1,7 @@
 import { su } from "@tscircuit/soup-util"
 import { mmStr } from "@tscircuit/mm"
 import type { FootprintElementConverter } from "./converter-types"
-import { formatPcbRotationAttr } from "./helpers"
+import { formatPcbRotationAttr } from "./footprint-tsx-attribute-formatters/format-pcb-rotation-attr"
 
 export const convertHoles: FootprintElementConverter = (circuitJson) => {
   const holes = su(circuitJson).pcb_hole.list()

package/lib/generate-footprint-tsx/convert-keepouts.ts

@@ -1,6 +1,6 @@
 import { su } from "@tscircuit/soup-util"
 import type { FootprintElementConverter } from "./converter-types"
-import { formatMm } from "./helpers"
+import { formatMm } from "./footprint-tsx-attribute-formatters/format-mm"
 
 export const convertKeepouts: FootprintElementConverter = (circuitJson) => {
   const pcbKeepouts = su(circuitJson).pcb_keepout.list()

package/lib/generate-footprint-tsx/convert-notes.ts

@@ -1,6 +1,6 @@
 import { su } from "@tscircuit/soup-util"
 import type { FootprintElementConverter } from "./converter-types"
-import { escapeJsxText } from "./helpers"
+import { escapeJsxText } from "./footprint-tsx-attribute-formatters/escape-jsx-text"
 
 export const convertNotes: FootprintElementConverter = (circuitJson) => {
   const noteTexts = su(circuitJson).pcb_note_text.list()

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

@@ -1,11 +1,9 @@
 import { su } from "@tscircuit/soup-util"
 import { mmStr } from "@tscircuit/mm"
 import type { FootprintElementConverter } from "./converter-types"
-import {
-  formatOptionalMmAttr,
-  formatPcbRotationAttr,
-  formatSolderMaskAttrs,
-} from "./helpers"
+import { formatOptionalMmAttr } from "./footprint-tsx-attribute-formatters/format-optional-mm-attr"
+import { formatPcbRotationAttr } from "./footprint-tsx-attribute-formatters/format-pcb-rotation-attr"
+import { formatSolderMaskAttrs } from "./footprint-tsx-attribute-formatters/format-solder-mask-attrs"
 
 export const convertPlatedHoles: FootprintElementConverter = (circuitJson) => {
   const platedHoles = su(circuitJson).pcb_plated_hole.list()

package/lib/generate-footprint-tsx/convert-silkscreen-text.ts

@@ -1,7 +1,7 @@
 import { su } from "@tscircuit/soup-util"
 import { mmStr } from "@tscircuit/mm"
 import type { FootprintElementConverter } from "./converter-types"
-import { escapeJsxText } from "./helpers"
+import { escapeJsxText } from "./footprint-tsx-attribute-formatters/escape-jsx-text"
 
 export const convertSilkscreenText: FootprintElementConverter = (
   circuitJson,

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

@@ -1,7 +1,7 @@
 import { su } from "@tscircuit/soup-util"
 import { mmStr } from "@tscircuit/mm"
 import type { FootprintElementConverter } from "./converter-types"
-import { formatPcbRotationAttr } from "./helpers"
+import { formatPcbRotationAttr } from "./footprint-tsx-attribute-formatters/format-pcb-rotation-attr"
 
 export const convertSmtPads: FootprintElementConverter = (circuitJson) => {
   const smtPads = su(circuitJson).pcb_smtpad.list()

package/lib/generate-footprint-tsx/footprint-tsx-attribute-formatters/escape-jsx-text.ts

@@ -0,0 +1,2 @@
+export const escapeJsxText = (value: unknown): string =>
+  String(value ?? "").replace(/"/g, '\\"')

package/lib/generate-footprint-tsx/footprint-tsx-attribute-formatters/format-mm.ts

@@ -0,0 +1,3 @@
+import { mmStr } from "@tscircuit/mm"
+
+export const formatMm = (value: number | undefined): string => mmStr(value ?? 0)

package/lib/generate-footprint-tsx/footprint-tsx-attribute-formatters/format-optional-mm-attr.ts

@@ -0,0 +1,9 @@
+import { mmStr } from "@tscircuit/mm"
+
+export const formatOptionalMmAttr = (
+  attrName: string,
+  value: number | undefined,
+): string => {
+  if (value === undefined) return ""
+  return ` ${attrName}="${mmStr(value)}"`
+}

package/lib/generate-footprint-tsx/footprint-tsx-attribute-formatters/format-pcb-rotation-attr.ts

@@ -0,0 +1,8 @@
+export const formatPcbRotationAttr = (
+  rotation: string | number | undefined,
+  attrName = "pcbRotation",
+): string => {
+  if (rotation === undefined) return ""
+  const formatted = typeof rotation === "number" ? `${rotation}deg` : rotation
+  return ` ${attrName}="${formatted}"`
+}

package/lib/generate-footprint-tsx/footprint-tsx-attribute-formatters/format-solder-mask-attrs.ts

@@ -0,0 +1,14 @@
+import { formatOptionalMmAttr } from "./format-optional-mm-attr"
+
+export const formatSolderMaskAttrs = (platedHole: {
+  is_covered_with_solder_mask?: boolean
+  soldermask_margin?: number
+}): string => {
+  let coveredWithSolderMaskAttr = ""
+
+  if (platedHole.is_covered_with_solder_mask !== undefined) {
+    coveredWithSolderMaskAttr = ` coveredWithSolderMask={${platedHole.is_covered_with_solder_mask}}`
+  }
+
+  return `${coveredWithSolderMaskAttr}${formatOptionalMmAttr("solderMaskMargin", platedHole.soldermask_margin)}`
+}

package/lib/get-board-using-template.ts

@@ -1,6 +1,7 @@
 import { mmStr } from "@tscircuit/mm"
 import { su } from "@tscircuit/soup-util"
 import type { AnyCircuitElement } from "circuit-json"
+import { generateFootprintTsx } from "./generate-footprint-tsx"
 
 export interface BoardTemplateParams {
   circuitJson: AnyCircuitElement[]
@@ -50,9 +51,9 @@ export const getBoardUsingTemplate = ({ circuitJson }: BoardTemplateParams) => {
   }
 
   const boardPropsStr = boardProps.join(" ")
+  const footprintTsx = generateFootprintTsx(circuitJson)
 
-  // Children slot - components and connections are added in later stages
-  const children = ""
+  const children = footprintTsx ? `<chip footprint={${footprintTsx}} />` : ""
 
   return `
 export default () => (

package/package.json

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

package/tests/__snapshots__/test20-board-conversion-drops-children-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="57.14285714285717" y="71.42857142857147" width="685.7142857142858" height="457.1428571428572" data-type="pcb_boundary" data-pcb-layer="global"/><path class="pcb-board" d="M 57.14285714285717 528.5714285714287 L 742.8571428571429 528.5714285714287 L 742.8571428571429 71.42857142857147 L 57.14285714285717 71.42857142857147 Z" fill="none" stroke="rgba(255, 255, 255, 0.5)" stroke-width="5.714285714285715" data-type="pcb_board" data-pcb-layer="board"/></svg>
+<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="57.14285714285717" y="71.42857142857147" width="685.7142857142858" height="457.1428571428572" data-type="pcb_boundary" data-pcb-layer="global"/><path class="pcb-board" d="M 57.14285714285717 528.5714285714287 L 742.8571428571429 528.5714285714287 L 742.8571428571429 71.42857142857147 L 57.14285714285717 71.42857142857147 Z" fill="none" stroke="rgba(255, 255, 255, 0.5)" stroke-width="5.714285714285715" data-type="pcb_board" data-pcb-layer="board"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="314.28571428571433" y="277.1428571428572" width="57.142857142857146" height="45.71428571428572" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="428.57142857142867" y="277.1428571428572" width="57.142857142857146" height="45.71428571428572" data-type="pcb_smtpad" data-pcb-layer="top"/></svg>

package/tests/__snapshots__/test8-support-courtyard-courtyard-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.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(200, 52, 52)" x="378.1818181818182" y="287.72727272727275" width="16.363636363636363" height="24.545454545454547" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="378.1818181818182" y="287.72727272727275" width="16.363636363636363" height="24.545454545454547" data-type="pcb_smtpad" data-pcb-layer="top"/><path class="pcb-fabrication-note-path" stroke="rgba(255,255,255,0.5)" fill="none" d="M 350.9090909090909 338.1818181818182 L 449.0909090909091 338.1818181818182 L 449.0909090909091 261.8181818181818 L 350.9090909090909 261.8181818181818" stroke-width="2.7272727272727275" data-pcb-component-id="pcb_component_0" data-pcb-fabrication-note-path-id="projected_fnp_pcb_courtyard_outline_0" data-type="pcb_fabrication_note_path" data-pcb-layer="overlay"/><rect x="345.45454545454544" y="259.0909090909091" width="109.09090909090912" height="81.81818181818176" class="pcb-fabrication-note-rect" data-type="pcb_fabrication_note_rect" data-pcb-fabrication-note-rect-id="projected_fnr_pcb_courtyard_rect_0" data-pcb-layer="overlay" data-pcb-component-id="pcb_component_0" fill="none" stroke="rgba(255,255,255,0.5)" stroke-width="2.7272727272727275"/><path class="pcb-fabrication-note-path" stroke="rgba(255,255,255,0.5)" fill="none" d="M 350.9090909090909 338.1818181818182 L 449.0909090909091 338.1818181818182 L 449.0909090909091 261.8181818181818 L 350.9090909090909 261.8181818181818" stroke-width="2.7272727272727275" data-pcb-component-id="pcb_component_1" data-pcb-fabrication-note-path-id="projected_fnp_pcb_courtyard_outline_1" data-type="pcb_fabrication_note_path" data-pcb-layer="overlay"/><rect x="345.45454545454544" y="259.0909090909091" width="109.09090909090912" height="81.81818181818176" class="pcb-fabrication-note-rect" data-type="pcb_fabrication_note_rect" data-pcb-fabrication-note-rect-id="projected_fnr_pcb_courtyard_rect_1" data-pcb-layer="overlay" data-pcb-component-id="pcb_component_1" fill="none" stroke="rgba(255,255,255,0.5)" stroke-width="2.7272727272727275"/></svg>
+<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 x="506.3636363636364" y="245.45454545454547" width="125.45454545454545" height="98.18181818181819" class="pcb-courtyard-rect pcb-courtyard-bottom" data-pcb-courtyard-rect-id="pcb_courtyard_rect_1" data-type="pcb_courtyard_rect" data-pcb-layer="bottom" stroke-linejoin="round" fill="none" stroke="rgb(38, 233, 255)" stroke-width="1.3636363636363638"/><rect x="506.3636363636364" y="245.45454545454547" width="125.45454545454545" height="98.18181818181819" class="pcb-courtyard-rect pcb-courtyard-bottom" data-pcb-courtyard-rect-id="pcb_courtyard_rect_3" data-type="pcb_courtyard_rect" data-pcb-layer="bottom" stroke-linejoin="round" fill="none" stroke="rgb(38, 233, 255)" stroke-width="1.3636363636363638"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="378.1818181818182" y="287.72727272727275" width="16.363636363636363" height="24.545454545454547" data-type="pcb_smtpad" data-pcb-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="378.1818181818182" y="287.72727272727275" width="16.363636363636363" height="24.545454545454547" data-type="pcb_smtpad" data-pcb-layer="top"/><polygon points="187.27272727272728,338.1818181818182 285.45454545454544,338.1818181818182 285.45454545454544,261.8181818181818 187.27272727272728,261.8181818181818" class="pcb-courtyard-outline pcb-courtyard-top" data-pcb-courtyard-outline-id="pcb_courtyard_outline_0" data-type="pcb_courtyard_outline" data-pcb-layer="top" fill="none" stroke="#FF00FF" stroke-width="1.3636363636363638" stroke-linejoin="round"/><rect x="-54.54545454545455" y="-40.90909090909091" width="109.0909090909091" height="81.81818181818181" class="pcb-courtyard-rect pcb-courtyard-top" data-pcb-courtyard-rect-id="pcb_courtyard_rect_0" data-type="pcb_courtyard_rect" data-pcb-layer="top" stroke-linejoin="round" transform="translate(400 300) rotate(-45)" fill="none" stroke="#FF00FF" stroke-width="1.3636363636363638"/><circle cx="410.90909090909093" cy="152.72727272727272" r="57.27272727272727" class="pcb-courtyard-circle pcb-courtyard-top" data-pcb-courtyard-circle-id="pcb_courtyard_circle_0" data-type="pcb_courtyard_circle" data-pcb-layer="top" fill="none" stroke="#FF00FF" stroke-width="1.3636363636363638"/><polygon points="187.27272727272728,338.1818181818182 285.45454545454544,338.1818181818182 285.45454545454544,261.8181818181818 187.27272727272728,261.8181818181818" class="pcb-courtyard-outline pcb-courtyard-top" data-pcb-courtyard-outline-id="pcb_courtyard_outline_1" data-type="pcb_courtyard_outline" data-pcb-layer="top" fill="none" stroke="#FF00FF" stroke-width="1.3636363636363638" stroke-linejoin="round"/><rect x="-54.54545454545455" y="-40.90909090909091" width="109.0909090909091" height="81.81818181818181" class="pcb-courtyard-rect pcb-courtyard-top" data-pcb-courtyard-rect-id="pcb_courtyard_rect_2" data-type="pcb_courtyard_rect" data-pcb-layer="top" stroke-linejoin="round" transform="translate(400 300) rotate(-45)" fill="none" stroke="#FF00FF" stroke-width="1.3636363636363638"/><circle cx="410.90909090909093" cy="152.72727272727272" r="57.27272727272727" class="pcb-courtyard-circle pcb-courtyard-top" data-pcb-courtyard-circle-id="pcb_courtyard_circle_1" data-type="pcb_courtyard_circle" data-pcb-layer="top" fill="none" stroke="#FF00FF" stroke-width="1.3636363636363638"/></svg>

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

@@ -1,4 +1,5 @@
 import { expect, test } from "bun:test"
+import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
 import { convertCircuitJsonToTscircuit } from "lib"
 import { runTscircuitCode } from "tscircuit"
 
@@ -13,10 +14,10 @@ test("test8 support courtyard elements", async () => {
       <chip
         footprint={<footprint>
             <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" />
-    <courtyardcircle pcbX={0.4} pcbY={-0.3} radius={2.1} layer="top" />
+    <courtyardoutline outline={[{"x":-7.8,"y":-1.4},{"x":-4.2,"y":-1.4},{"x":-4.2,"y":1.4},{"x":-7.8,"y":1.4}]} layer="top" />
+    <courtyardrect pcbX={0} pcbY={0} width={4} height={3} layer="top" pcbRotation="45deg" />
+    <courtyardrect pcbX={6.2} pcbY={0.2} width={4.6} height={3.6} layer="bottom" />
+    <courtyardcircle pcbX={0.4} pcbY={5.4} radius={2.1} layer="top" />
           </footprint>}
         {...props}
       />
@@ -57,6 +58,25 @@ circuit.add(
   expect(
     courtyardElements.filter((elm) => elm.type === "pcb_courtyard_circle"),
   ).toHaveLength(2)
+  expect(
+    courtyardElements.filter(
+      (elm) =>
+        elm.type === "pcb_courtyard_rect" &&
+        elm.layer === "top" &&
+        elm.center?.x === 0 &&
+        elm.center?.y === 0 &&
+        elm.width === 4 &&
+        elm.height === 3,
+    ),
+  ).toEqual([
+    expect.objectContaining({ ccw_rotation: 45 }),
+    expect.objectContaining({ ccw_rotation: 45 }),
+  ])
+
+  const pcbSvg = convertCircuitJsonToPcbSvg(renderedCircuitJson, {
+    showCourtyards: true,
+  })
+  await expect(pcbSvg).toMatchSvgSnapshot(import.meta.path, "courtyard-pcb")
 })
 
 const circuitJson: any = [
@@ -110,10 +130,10 @@ const circuitJson: any = [
     pcb_component_id: "pcb_generic_component_0",
     layer: "top",
     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 },
+      { x: -7.8, y: -1.4 },
+      { x: -4.2, y: -1.4 },
+      { x: -4.2, y: 1.4 },
+      { x: -7.8, y: 1.4 },
     ],
   },
   {
@@ -124,12 +144,13 @@ const circuitJson: any = [
     width: 4,
     height: 3,
     layer: "top",
+    ccw_rotation: 45,
   },
   {
     type: "pcb_courtyard_rect",
     pcb_courtyard_rect_id: "pcb_courtyard_rect_1",
     pcb_component_id: "pcb_generic_component_0",
-    center: { x: 0.2, y: 0.2 },
+    center: { x: 6.2, y: 0.2 },
     width: 4.6,
     height: 3.6,
     layer: "bottom",
@@ -138,7 +159,7 @@ const circuitJson: any = [
     type: "pcb_courtyard_circle",
     pcb_courtyard_circle_id: "pcb_courtyard_circle_0",
     pcb_component_id: "pcb_generic_component_0",
-    center: { x: 0.4, y: -0.3 },
+    center: { x: 0.4, y: 5.4 },
     radius: 2.1,
     layer: "top",
   },

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

@@ -1,33 +0,0 @@
-import { mmStr } from "@tscircuit/mm"
-
-export const escapeJsxText = (value: unknown): string =>
-  String(value ?? "").replace(/"/g, '\\"')
-
-export const formatMm = (value: number | undefined): string => mmStr(value ?? 0)
-
-export const formatOptionalMmAttr = (
-  attrName: string,
-  value: number | undefined,
-): string => {
-  if (value === undefined) return ""
-  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",
-): string => {
-  if (rotation === undefined) return ""
-  const formatted = typeof rotation === "number" ? `${rotation}deg` : rotation
-  return ` ${attrName}="${formatted}"`
-}