@tscircuit/cli 0.1.1590 → 0.1.1592

package/dist/cli/main.js

@@ -93628,7 +93628,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.1588";
+var version = "0.1.1590";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -93672,7 +93672,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.36",
-    "circuit-json-to-tscircuit": "^0.0.35",
+    "circuit-json-to-tscircuit": "^0.0.40",
     "circuit-json-trace-length-analysis": "github:tscircuit/circuit-json-trace-length-analysis#2b44792a40df0ca83b6bfb6ac95ed5e35e7168b8",
     commander: "^14.0.0",
     conf: "^13.1.0",
@@ -258547,9 +258547,6 @@ import fs46 from "node:fs/promises";
 import path49 from "node:path";
 import { KicadFootprintToCircuitJsonConverter } from "kicad-to-circuit-json";
 
-// node_modules/circuit-json-to-tscircuit/dist/chunk-WC7XDXUV.js
-import { su as su6 } from "@tscircuit/soup-util";
-
 // node_modules/@tscircuit/mm/dist/index.js
 var unitToMm2 = {
   in: 25.4,
@@ -258575,7 +258572,9 @@ var mmStr = (n3) => {
   return `${mm3(n3)}mm`;
 };
 
-// node_modules/circuit-json-to-tscircuit/dist/chunk-WC7XDXUV.js
+// node_modules/circuit-json-to-tscircuit/dist/chunk-UHPKLBYL.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";
 import { su as su33 } from "@tscircuit/soup-util";
 import { su as su42 } from "@tscircuit/soup-util";
@@ -258586,7 +258585,7 @@ import { su as su8 } from "@tscircuit/soup-util";
 import { su as su9 } from "@tscircuit/soup-util";
 import { su as su10 } from "@tscircuit/soup-util";
 import { su as su11 } from "@tscircuit/soup-util";
-import { su as su12 } 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) => {
@@ -259016,16 +259015,69 @@ var convertSmtPads = (circuitJson) => {
   const smtPads = su11(circuitJson).pcb_smtpad.list();
   const elementStrings = [];
   for (const smtPad of smtPads) {
+    const commonAttrs = [];
+    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" />`);
+      elementStrings.push(`<smtpad ${commonAttrs.join(" ")} radius="${mmStr(smtPad.radius ?? 0)}" shape="circle" />`);
     } else if (smtPad.shape === "rect") {
-      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" />`);
+      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" />`);
     } 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" />`);
+      elementStrings.push(`<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)}} />`);
+      elementStrings.push(`<smtpad ${commonAttrs.join(" ")} shape="polygon" points={${JSON.stringify(smtPad.points)}} />`);
     } else if (smtPad.shape === "rotated_rect") {
-      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)}" ccwRotation={${smtPad.ccw_rotation}} 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" />`);
     }
   }
   return elementStrings;
@@ -259055,17 +259107,65 @@ var generateFootprintTsx = (circuitJson) => {
       </footprint>
   `.trim();
 };
+var getBoardUsingTemplate = ({ circuitJson }) => {
+  const pcbBoard = su12(circuitJson).pcb_board.list()[0];
+  const boardProps2 = [];
+  if (pcbBoard) {
+    if (pcbBoard.width !== undefined) {
+      boardProps2.push(`width="${mmStr(pcbBoard.width)}"`);
+    }
+    if (pcbBoard.height !== undefined) {
+      boardProps2.push(`height="${mmStr(pcbBoard.height)}"`);
+    }
+    if (pcbBoard.outline && pcbBoard.outline.length > 0) {
+      const points = pcbBoard.outline.map((p3) => `{ x: ${p3.x}, y: ${p3.y} }`).join(", ");
+      boardProps2.push(`outline={[${points}]}`);
+    }
+    if (pcbBoard.thickness !== undefined) {
+      boardProps2.push(`thickness="${mmStr(pcbBoard.thickness)}"`);
+    }
+    if (pcbBoard.num_layers !== undefined) {
+      boardProps2.push(`layers={${pcbBoard.num_layers}}`);
+    }
+    if (pcbBoard.material !== undefined) {
+      boardProps2.push(`material="${pcbBoard.material}"`);
+    }
+    if (pcbBoard.solder_mask_color !== undefined) {
+      boardProps2.push(`solderMaskColor="${pcbBoard.solder_mask_color}"`);
+    }
+    if (pcbBoard.silkscreen_color !== undefined) {
+      boardProps2.push(`silkscreenColor="${pcbBoard.silkscreen_color}"`);
+    }
+    if (pcbBoard.anchor_position !== undefined) {
+      boardProps2.push(`boardAnchorPosition={{ x: ${pcbBoard.anchor_position.x}, y: ${pcbBoard.anchor_position.y} }}`);
+    }
+    if (pcbBoard.anchor_alignment !== undefined) {
+      boardProps2.push(`boardAnchorAlignment="${pcbBoard.anchor_alignment}"`);
+    }
+  }
+  const boardPropsStr = boardProps2.join(" ");
+  const footprintTsx = generateFootprintTsx(circuitJson);
+  const children = footprintTsx ? `<chip footprint={${footprintTsx}} />` : "";
+  return `
+export default () => (
+  <board${boardPropsStr ? ` ${boardPropsStr}` : ""}>
+    ${children}
+  </board>
+)
+`.replace(/\n\s*\n/g, `
+`).trim();
+};
 var escapeJsxText2 = (text) => text.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
 var generateSymbolTsx = (circuitJson) => {
-  const schematicArcs = su12(circuitJson).schematic_arc.list();
-  const schematicLines = su12(circuitJson).schematic_line.list();
-  const schematicPaths = su12(circuitJson).schematic_path.list();
-  const schematicTexts = su12(circuitJson).schematic_text.list();
-  const schematicCircles = su12(circuitJson).schematic_circle.list();
-  const schematicBoxes = su12(circuitJson).schematic_box.list();
-  const schematicRects = su12(circuitJson).schematic_rect.list();
-  const schematicTables = su12(circuitJson).schematic_table.list();
-  const schematicTableCells = su12(circuitJson).schematic_table_cell.list();
+  const schematicArcs = su13(circuitJson).schematic_arc.list();
+  const schematicLines = su13(circuitJson).schematic_line.list();
+  const schematicPaths = su13(circuitJson).schematic_path.list();
+  const schematicTexts = su13(circuitJson).schematic_text.list();
+  const schematicCircles = su13(circuitJson).schematic_circle.list();
+  const schematicBoxes = su13(circuitJson).schematic_box.list();
+  const schematicRects = su13(circuitJson).schematic_rect.list();
+  const schematicTables = su13(circuitJson).schematic_table.list();
+  const schematicTableCells = su13(circuitJson).schematic_table_cell.list();
   const elementStrings = [];
   for (const arc2 of schematicArcs) {
     const center2 = arc2.center ?? { x: 0, y: 0 };
@@ -259287,6 +259387,10 @@ ${pinLabels ? `const pinLabels = ${JSON.stringify(pinLabels, null, "  ")} as con
 `).trim();
 };
 var convertCircuitJsonToTscircuit = (circuitJson, opts) => {
+  const hasBoard = circuitJson.some((el3) => el3.type === "pcb_board");
+  if (hasBoard) {
+    return getBoardUsingTemplate({ circuitJson });
+  }
   return getComponentUsingTemplate({
     circuitJson,
     ...opts
@@ -264160,7 +264264,7 @@ import {
 } from "circuit-to-svg";
 
 // node_modules/dsn-converter/dist/index.js
-import { su as su13 } from "@tscircuit/soup-util";
+import { su as su14 } from "@tscircuit/soup-util";
 import { getBoundsFromPoints as getBoundsFromPoints3 } from "@tscircuit/math-utils";
 import { applyToPoint as applyToPoint26, scale as scale7 } from "transformation-matrix";
 import { su as su24 } from "@tscircuit/soup-util";
@@ -264569,8 +264673,8 @@ function processComponentsAndPads(componentGroups, circuitElements, pcb) {
     const { pcb_component_id, pcb_smtpads } = group;
     if (pcb_smtpads.length === 0)
       continue;
-    const pcbComponent = su13(circuitElements).pcb_component.list().find((e4) => e4.pcb_component_id === pcb_component_id);
-    const sourceComponent = su13(circuitElements).source_component.list().find((e4) => e4.source_component_id === pcbComponent?.source_component_id);
+    const pcbComponent = su14(circuitElements).pcb_component.list().find((e4) => e4.pcb_component_id === pcb_component_id);
+    const sourceComponent = su14(circuitElements).source_component.list().find((e4) => e4.source_component_id === pcbComponent?.source_component_id);
     const footprintName = getFootprintName(sourceComponent, pcbComponent);
     const componentName = sourceComponent?.name || "Unknown";
     const circuitSpaceCoordinates = applyToPoint26(transformMmToUm, pcbComponent.center);
@@ -264605,8 +264709,8 @@ function processComponentsAndPads(componentGroups, circuitElements, pcb) {
       outlines: [],
       pins: componentGroup.pcb_smtpads.map((pad2) => {
         const pcbComponent = circuitElements.find((e4) => e4.type === "pcb_component" && e4.source_component_id === firstComponent.sourceComponent?.source_component_id);
-        const pcbPort = su13(circuitElements).pcb_port.list().find((e4) => e4.pcb_port_id === pad2.pcb_port_id);
-        const sourcePort = su13(circuitElements).source_port.list().find((e4) => e4.source_port_id === pcbPort?.source_port_id);
+        const pcbPort = su14(circuitElements).pcb_port.list().find((e4) => e4.pcb_port_id === pad2.pcb_port_id);
+        const sourcePort = su14(circuitElements).source_port.list().find((e4) => e4.source_port_id === pcbPort?.source_port_id);
         return createPinForImage({
           pad: pad2,
           pcbComponent,
@@ -267655,14 +267759,14 @@ var convertBomRowsToCsv = (bom_rows) => {
 // node_modules/circuit-json-to-pnp-csv/dist/index.js
 var import_papaparse2 = __toESM2(require_papaparse(), 1);
 import"circuit-json";
-import { su as su15 } from "@tscircuit/soup-util";
+import { su as su16 } from "@tscircuit/soup-util";
 var fixedDecimals = 3;
 var convertCircuitJsonToPickAndPlaceRows = (circuitJson, opts = {}) => {
   opts.flip_y_axis ??= false;
   const rows = [];
   for (const element of circuitJson) {
     if (element.type === "pcb_component") {
-      const source_component = su15(circuitJson).source_component.get(element.source_component_id);
+      const source_component = su16(circuitJson).source_component.get(element.source_component_id);
       rows.push({
         designator: source_component?.name ?? element.pcb_component_id,
         mid_x: element.center.x,
@@ -275872,7 +275976,7 @@ var cju8 = (circuitJsonInput, options = {}) => {
   return su25;
 };
 cju8.unparsed = cju8;
-var su16 = cju8;
+var su17 = cju8;
 function createIdKey2(element) {
   const type = element.type;
   return `${type}:${element[`${type}_id`]}`;
@@ -278296,13 +278400,13 @@ var mapPortHints = (portHints2, portHintsMap) => {
   return portHints2.flatMap((hint) => portHintsMap[hint] ?? [hint]);
 };
 var generateFootprintTsx2 = (circuitJson, options = {}) => {
-  const holes = su16(circuitJson).pcb_hole.list();
-  const platedHoles = su16(circuitJson).pcb_plated_hole.list();
-  const smtPads = su16(circuitJson).pcb_smtpad.list();
-  const vias = su16(circuitJson).pcb_via.list();
-  const silkscreenPaths = su16(circuitJson).pcb_silkscreen_path.list();
-  const silkscreenTexts = su16(circuitJson).pcb_silkscreen_text.list();
-  const courtyardOutlines = su16(circuitJson).pcb_courtyard_outline.list();
+  const holes = su17(circuitJson).pcb_hole.list();
+  const platedHoles = su17(circuitJson).pcb_plated_hole.list();
+  const smtPads = su17(circuitJson).pcb_smtpad.list();
+  const vias = su17(circuitJson).pcb_via.list();
+  const silkscreenPaths = su17(circuitJson).pcb_silkscreen_path.list();
+  const silkscreenTexts = su17(circuitJson).pcb_silkscreen_text.list();
+  const courtyardOutlines = su17(circuitJson).pcb_courtyard_outline.list();
   const elementStrings = [];
   for (const hole of holes) {
     if (hole.hole_shape === "circle") {
@@ -278547,14 +278651,14 @@ var convertBetterEasyToTsx = async ({
     cadModelBounds: cadPlacement?.bounds,
     showDesignator: true
   });
-  const [cadComponent] = su16(circuitJson).cad_component.list();
+  const [cadComponent] = su17(circuitJson).cad_component.list();
   if (cadComponent) {
     cadComponent.position.x = 0;
     cadComponent.position.y = 0;
   }
   const rawPn = betterEasy.dataStr.head.c_para["Manufacturer Part"];
   const pn3 = rawPn ? normalizeManufacturerPartNumber(rawPn) : "unknown";
-  const sourcePorts = su16(circuitJson).source_port.list();
+  const sourcePorts = su17(circuitJson).source_port.list();
   const pinLabels = {};
   const sortedPorts = sourcePorts.sort((a3, b3) => {
     const aNum = Number.parseInt(a3.name.replace("pin", ""));

package/dist/lib/index.js

@@ -65811,7 +65811,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.1588";
+var version = "0.1.1590";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -65855,7 +65855,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.36",
-    "circuit-json-to-tscircuit": "^0.0.35",
+    "circuit-json-to-tscircuit": "^0.0.40",
     "circuit-json-trace-length-analysis": "github:tscircuit/circuit-json-trace-length-analysis#2b44792a40df0ca83b6bfb6ac95ed5e35e7168b8",
     commander: "^14.0.0",
     conf: "^13.1.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1590",
+  "version": "0.1.1592",
   "main": "dist/cli/main.js",
   "exports": {
     ".": "./dist/cli/main.js",
@@ -41,7 +41,7 @@
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.40",
     "circuit-json-to-step": "^0.0.36",
-    "circuit-json-to-tscircuit": "^0.0.35",
+    "circuit-json-to-tscircuit": "^0.0.40",
     "circuit-json-trace-length-analysis": "github:tscircuit/circuit-json-trace-length-analysis#2b44792a40df0ca83b6bfb6ac95ed5e35e7168b8",
     "commander": "^14.0.0",
     "conf": "^13.1.0",