@tscircuit/cli 0.1.1654 → 0.1.1656

package/dist/cli/main.js

@@ -118345,7 +118345,7 @@ var import_perfect_cli = __toESM2(require_dist2(), 1);
 // lib/getVersion.ts
 import { createRequire as createRequire2 } from "node:module";
 // package.json
-var version = "0.1.1653";
+var version = "0.1.1655";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -118391,7 +118391,7 @@ var package_default = {
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.40",
     "circuit-json-to-step": "^0.0.38",
-    "circuit-json-to-tscircuit": "^0.0.40",
+    "circuit-json-to-tscircuit": "^0.0.42",
     "circuit-json-trace-length-analysis": "github:tscircuit/circuit-json-trace-length-analysis#2b44792a40df0ca83b6bfb6ac95ed5e35e7168b8",
     "circuit-to-canvas": "^0.0.111",
     "circuit-to-svg": "^0.0.378",
@@ -284938,7 +284938,7 @@ var mmStr = (n3) => {
   return `${mm3(n3)}mm`;
 };
 
-// node_modules/circuit-json-to-tscircuit/dist/chunk-UHPKLBYL.js
+// node_modules/circuit-json-to-tscircuit/dist/chunk-UXTI3RT6.js
 import { su as su12 } from "@tscircuit/soup-util";
 import { su as su6 } from "@tscircuit/soup-util";
 import { su as su23 } from "@tscircuit/soup-util";
@@ -284953,19 +284953,6 @@ import { su as su10 } from "@tscircuit/soup-util";
 import { su as su11 } from "@tscircuit/soup-util";
 import { su as su13 } from "@tscircuit/soup-util";
 var escapeJsxText = (value) => String(value ?? "").replace(/"/g, "\\\"");
-var formatMm = (value) => mmStr(value ?? 0);
-var formatOptionalMmAttr = (attrName, value) => {
-  if (value === undefined)
-    return "";
-  return ` ${attrName}="${mmStr(value)}"`;
-};
-var formatSolderMaskAttrs = (platedHole) => `${platedHole.is_covered_with_solder_mask === undefined ? "" : ` coveredWithSolderMask={${platedHole.is_covered_with_solder_mask}}`}${formatOptionalMmAttr("solderMaskMargin", platedHole.soldermask_margin)}`;
-var formatPcbRotationAttr = (rotation11, attrName = "pcbRotation") => {
-  if (rotation11 === undefined)
-    return "";
-  const formatted = typeof rotation11 === "number" ? `${rotation11}deg` : rotation11;
-  return ` ${attrName}="${formatted}"`;
-};
 var convertCopperText = (circuitJson) => {
   const copperTexts = su6(circuitJson).pcb_copper_text.list();
   const elementStrings = [];
@@ -284999,6 +284986,12 @@ var convertCopperText = (circuitJson) => {
   }
   return elementStrings;
 };
+var formatPcbRotationAttr = (rotation11, attrName = "pcbRotation") => {
+  if (rotation11 === undefined)
+    return "";
+  const formatted = typeof rotation11 === "number" ? `${rotation11}deg` : rotation11;
+  return ` ${attrName}="${formatted}"`;
+};
 var convertCourtyard = (circuitJson) => {
   const courtyardOutlines = su23(circuitJson).pcb_courtyard_outline.list();
   const courtyardRects = su23(circuitJson).pcb_courtyard_rect.list();
@@ -285023,6 +285016,9 @@ var convertCourtyard = (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(" ")} />`);
   }
   for (const courtyardCircle of courtyardCircles) {
@@ -285038,6 +285034,7 @@ var convertCourtyard = (circuitJson) => {
   }
   return elementStrings;
 };
+var formatMm = (value) => mmStr(value ?? 0);
 var convertCutouts = (circuitJson) => {
   const pcbCutouts = su33(circuitJson).pcb_cutout.list();
   const elementStrings = [];
@@ -285282,6 +285279,18 @@ var convertNotes = (circuitJson) => {
   }
   return elementStrings;
 };
+var formatOptionalMmAttr = (attrName, value) => {
+  if (value === undefined)
+    return "";
+  return ` ${attrName}="${mmStr(value)}"`;
+};
+var formatSolderMaskAttrs = (platedHole) => {
+  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)}`;
+};
 var convertPlatedHoles2 = (circuitJson) => {
   const platedHoles = su8(circuitJson).pcb_plated_hole.list();
   const elementStrings = [];
@@ -285382,6 +285391,7 @@ var convertSmtPads = (circuitJson) => {
   const elementStrings = [];
   for (const smtPad of smtPads) {
     const commonAttrs = [];
+    const solderMaskAttrs = formatSolderMaskAttrs(smtPad);
     if (smtPad.port_hints !== undefined) {
       commonAttrs.push(`portHints={${JSON.stringify(smtPad.port_hints)}}`);
     }
@@ -285394,56 +285404,19 @@ var convertSmtPads = (circuitJson) => {
     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 ${commonAttrs.join(" ")} radius="${mmStr(smtPad.radius ?? 0)}" shape="circle" />`);
+      elementStrings.push(`<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs} 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 ${commonAttrs.join(" ")} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}" shape="rect" />`);
+      elementStrings.push(`<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs}${formatOptionalMmAttr("rectBorderRadius", smtPad.rect_border_radius)}${formatOptionalMmAttr("cornerRadius", smtPad.corner_radius)}${formatOptionalMmAttr("solderMaskMarginLeft", smtPad.soldermask_margin_left)}${formatOptionalMmAttr("solderMaskMarginTop", smtPad.soldermask_margin_top)}${formatOptionalMmAttr("solderMaskMarginRight", smtPad.soldermask_margin_right)}${formatOptionalMmAttr("solderMaskMarginBottom", smtPad.soldermask_margin_bottom)} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}" shape="rect" />`);
     } else if (smtPad.shape === "pill") {
-      elementStrings.push(`<smtpad ${commonAttrs.join(" ")} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}" radius="${mmStr(smtPad.radius ?? 0)}" shape="pill" />`);
+      elementStrings.push(`<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}" radius="${mmStr(smtPad.radius ?? 0)}" shape="pill" />`);
+    } else if (smtPad.shape === "rotated_pill") {
+      elementStrings.push(`<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}" radius="${mmStr(smtPad.radius ?? 0)}"${formatPcbRotationAttr(smtPad.ccw_rotation)} shape="pill" />`);
     } else if (smtPad.shape === "polygon") {
-      elementStrings.push(`<smtpad ${commonAttrs.join(" ")} shape="polygon" points={${JSON.stringify(smtPad.points)}} />`);
+      elementStrings.push(`<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs} 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 ${commonAttrs.join(" ")} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}"${formatPcbRotationAttr(smtPad.ccw_rotation)} shape="rotated_rect" />`);
+      elementStrings.push(`<smtpad ${commonAttrs.join(" ")}${solderMaskAttrs}${formatOptionalMmAttr("cornerRadius", cornerRadius)}${formatOptionalMmAttr("solderMaskMarginLeft", smtPad.soldermask_margin_left)}${formatOptionalMmAttr("solderMaskMarginTop", smtPad.soldermask_margin_top)}${formatOptionalMmAttr("solderMaskMarginRight", smtPad.soldermask_margin_right)}${formatOptionalMmAttr("solderMaskMarginBottom", smtPad.soldermask_margin_bottom)} width="${mmStr(smtPad.width ?? 0)}" height="${mmStr(smtPad.height ?? 0)}"${formatPcbRotationAttr(smtPad.ccw_rotation)} shape="rotated_rect" />`);
     }
   }
   return elementStrings;

package/dist/lib/index.js

@@ -65811,7 +65811,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1653";
+var version = "0.1.1655";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -65857,7 +65857,7 @@ var package_default = {
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.40",
     "circuit-json-to-step": "^0.0.38",
-    "circuit-json-to-tscircuit": "^0.0.40",
+    "circuit-json-to-tscircuit": "^0.0.42",
     "circuit-json-trace-length-analysis": "github:tscircuit/circuit-json-trace-length-analysis#2b44792a40df0ca83b6bfb6ac95ed5e35e7168b8",
     "circuit-to-canvas": "^0.0.111",
     "circuit-to-svg": "^0.0.378",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1654",
+  "version": "0.1.1656",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -43,7 +43,7 @@
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.40",
     "circuit-json-to-step": "^0.0.38",
-    "circuit-json-to-tscircuit": "^0.0.40",
+    "circuit-json-to-tscircuit": "^0.0.42",
     "circuit-json-trace-length-analysis": "github:tscircuit/circuit-json-trace-length-analysis#2b44792a40df0ca83b6bfb6ac95ed5e35e7168b8",
     "circuit-to-canvas": "^0.0.111",
     "circuit-to-svg": "^0.0.378",