circuit-json-to-tscircuit 0.0.53 → 0.0.55

package/dist/{chunk-YC65LHVL.js → chunk-NOSIW5HF.js}

@@ -1,6 +1,6 @@
 // lib/get-board-using-template.ts
-import { mmStr as mmStr7 } from "@tscircuit/mm";
-import { su as su12 } from "@tscircuit/soup-util";
+import { mmStr as mmStr8 } from "@tscircuit/mm";
+import { su as su13 } from "@tscircuit/soup-util";
 
 // lib/generate-footprint-tsx/convert-copper-text.ts
 import { su } from "@tscircuit/soup-util";
@@ -579,11 +579,31 @@ var convertSmtPads = (circuitJson) => {
   return elementStrings;
 };
 
+// lib/generate-footprint-tsx/convert-vias.ts
+import { mmStr as mmStr7 } from "@tscircuit/mm";
+import { su as su12 } from "@tscircuit/soup-util";
+var convertVias = (circuitJson) => {
+  return su12(circuitJson).pcb_via.list().map((via) => {
+    const fromLayer = via.from_layer ?? via.layers[0];
+    const toLayer = via.to_layer ?? via.layers[via.layers.length - 1];
+    if (!fromLayer || !toLayer) {
+      throw new Error(`Via ${via.pcb_via_id} has no copper layer endpoints`);
+    }
+    const legacyTented = "is_tented" in via && typeof via.is_tented === "boolean" ? via.is_tented : void 0;
+    const tentedOnTop = via.tented_on_top ?? legacyTented;
+    const tentedOnBottom = via.tented_on_bottom ?? legacyTented;
+    const tented = tentedOnTop && tentedOnBottom ? "both_sides" : tentedOnTop ? "top_tented" : tentedOnBottom ? "bottom_tented" : "exposed";
+    const tentedAttr = tentedOnTop !== void 0 || tentedOnBottom !== void 0 ? ` tented="${tented}"` : "";
+    return `<via pcbX="${mmStr7(via.x)}" pcbY="${mmStr7(via.y)}" holeDiameter="${mmStr7(via.hole_diameter)}" outerDiameter="${mmStr7(via.outer_diameter)}" fromLayer="${fromLayer}" toLayer="${toLayer}"${tentedAttr} />`;
+  });
+};
+
 // lib/generate-footprint-tsx.tsx
 var generateFootprintTsx = (circuitJson) => {
   const converters = [
     convertHoles,
     convertPlatedHoles,
+    convertVias,
     convertSmtPads,
     convertSilkscreen,
     convertFabrication,
@@ -610,21 +630,21 @@ var getBoardUsingTemplate = ({
   circuitJson,
   componentName
 }) => {
-  const pcbBoard = su12(circuitJson).pcb_board.list()[0];
+  const pcbBoard = su13(circuitJson).pcb_board.list()[0];
   const boardProps = [];
   if (pcbBoard) {
     if (pcbBoard.width !== void 0) {
-      boardProps.push(`width="${mmStr7(pcbBoard.width)}"`);
+      boardProps.push(`width="${mmStr8(pcbBoard.width)}"`);
     }
     if (pcbBoard.height !== void 0) {
-      boardProps.push(`height="${mmStr7(pcbBoard.height)}"`);
+      boardProps.push(`height="${mmStr8(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)}"`);
+      boardProps.push(`thickness="${mmStr8(pcbBoard.thickness)}"`);
     }
     if (pcbBoard.num_layers !== void 0) {
       boardProps.push(`layers={${pcbBoard.num_layers}}`);
@@ -638,9 +658,10 @@ var getBoardUsingTemplate = ({
     if (pcbBoard.silkscreen_color !== void 0) {
       boardProps.push(`silkscreenColor="${pcbBoard.silkscreen_color}"`);
     }
-    if (pcbBoard.anchor_position !== void 0) {
+    const resolvedAnchorPosition = pcbBoard.anchor_position ?? pcbBoard.center;
+    if (pcbBoard.anchor_position !== void 0 || resolvedAnchorPosition.x !== 0 || resolvedAnchorPosition.y !== 0) {
       boardProps.push(
-        `boardAnchorPosition={{ x: ${pcbBoard.anchor_position.x}, y: ${pcbBoard.anchor_position.y} }}`
+        `boardAnchorPosition={{ x: ${resolvedAnchorPosition.x}, y: ${resolvedAnchorPosition.y} }}`
       );
     }
     if (pcbBoard.anchor_alignment !== void 0) {
@@ -661,18 +682,18 @@ ${componentName ? `export default ${componentName}` : ""}
 };
 
 // lib/generate-symbol-tsx.ts
-import { su as su13 } from "@tscircuit/soup-util";
+import { su as su14 } from "@tscircuit/soup-util";
 var escapeJsxText2 = (text) => text.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 var generateSymbolTsx = (circuitJson) => {
-  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 schematicArcs = su14(circuitJson).schematic_arc.list();
+  const schematicLines = su14(circuitJson).schematic_line.list();
+  const schematicPaths = su14(circuitJson).schematic_path.list();
+  const schematicTexts = su14(circuitJson).schematic_text.list();
+  const schematicCircles = su14(circuitJson).schematic_circle.list();
+  const schematicBoxes = su14(circuitJson).schematic_box.list();
+  const schematicRects = su14(circuitJson).schematic_rect.list();
+  const schematicTables = su14(circuitJson).schematic_table.list();
+  const schematicTableCells = su14(circuitJson).schematic_table_cell.list();
   const elementStrings = [];
   for (const arc of schematicArcs) {
     const center = arc.center ?? { x: 0, y: 0 };

package/dist/cli/main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-YC65LHVL.js";
+} from "../chunk-NOSIW5HF.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.52",
+  version: "0.0.54",
   repository: {
     type: "git",
     url: "https://github.com/tscircuit/circuit-json-to-tscircuit.git"

package/dist/lib/index.js

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

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

@@ -0,0 +1,34 @@
+import { mmStr } from "@tscircuit/mm"
+import { su } from "@tscircuit/soup-util"
+import type { FootprintElementConverter } from "./converter-types"
+
+export const convertVias: FootprintElementConverter = (circuitJson) => {
+  return su(circuitJson)
+    .pcb_via.list()
+    .map((via) => {
+      const fromLayer = via.from_layer ?? via.layers[0]
+      const toLayer = via.to_layer ?? via.layers[via.layers.length - 1]
+      if (!fromLayer || !toLayer) {
+        throw new Error(`Via ${via.pcb_via_id} has no copper layer endpoints`)
+      }
+      const legacyTented =
+        "is_tented" in via && typeof via.is_tented === "boolean"
+          ? via.is_tented
+          : undefined
+      const tentedOnTop = via.tented_on_top ?? legacyTented
+      const tentedOnBottom = via.tented_on_bottom ?? legacyTented
+      const tented =
+        tentedOnTop && tentedOnBottom
+          ? "both_sides"
+          : tentedOnTop
+            ? "top_tented"
+            : tentedOnBottom
+              ? "bottom_tented"
+              : "exposed"
+      const tentedAttr =
+        tentedOnTop !== undefined || tentedOnBottom !== undefined
+          ? ` tented="${tented}"`
+          : ""
+      return `<via pcbX="${mmStr(via.x)}" pcbY="${mmStr(via.y)}" holeDiameter="${mmStr(via.hole_diameter)}" outerDiameter="${mmStr(via.outer_diameter)}" fromLayer="${fromLayer}" toLayer="${toLayer}"${tentedAttr} />`
+    })
+}

package/lib/generate-footprint-tsx.tsx

@@ -11,6 +11,7 @@ import { convertPlatedHoles } from "./generate-footprint-tsx/convert-plated-hole
 import { convertSilkscreen } from "./generate-footprint-tsx/convert-silkscreen"
 import { convertSilkscreenText } from "./generate-footprint-tsx/convert-silkscreen-text"
 import { convertSmtPads } from "./generate-footprint-tsx/convert-smt-pads"
+import { convertVias } from "./generate-footprint-tsx/convert-vias"
 
 export const generateFootprintTsx = (
   circuitJson: AnyCircuitElement[],
@@ -18,6 +19,7 @@ export const generateFootprintTsx = (
   const converters: FootprintElementConverter[] = [
     convertHoles,
     convertPlatedHoles,
+    convertVias,
     convertSmtPads,
     convertSilkscreen,
     convertFabrication,

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

@@ -44,9 +44,14 @@ export const getBoardUsingTemplate = ({
     if (pcbBoard.silkscreen_color !== undefined) {
       boardProps.push(`silkscreenColor="${pcbBoard.silkscreen_color}"`)
     }
-    if (pcbBoard.anchor_position !== undefined) {
+    const resolvedAnchorPosition = pcbBoard.anchor_position ?? pcbBoard.center
+    if (
+      pcbBoard.anchor_position !== undefined ||
+      resolvedAnchorPosition.x !== 0 ||
+      resolvedAnchorPosition.y !== 0
+    ) {
       boardProps.push(
-        `boardAnchorPosition={{ x: ${pcbBoard.anchor_position.x}, y: ${pcbBoard.anchor_position.y} }}`,
+        `boardAnchorPosition={{ x: ${resolvedAnchorPosition.x}, y: ${resolvedAnchorPosition.y} }}`,
       )
     }
     if (pcbBoard.anchor_alignment !== undefined) {

package/package.json

@@ -6,7 +6,7 @@
     "./cli": "./dist/cli/main.js"
   },
   "type": "module",
-  "version": "0.0.53",
+  "version": "0.0.55",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/circuit-json-to-tscircuit.git"

package/tests/board-center.test.tsx

@@ -0,0 +1,55 @@
+import { expect, test } from "bun:test"
+import type { CircuitJson, PcbBoard } from "circuit-json"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { runTscircuitCode } from "tscircuit"
+
+test("preserves offset board bounds without moving its footprint", async () => {
+  for (const center of [
+    { x: 60, y: 85 },
+    { x: -60, y: -85 },
+  ]) {
+    const board: PcbBoard = {
+      type: "pcb_board",
+      pcb_board_id: "board",
+      center,
+      width: 20,
+      height: 10,
+      num_layers: 2,
+      thickness: 1.6,
+      material: "fr4",
+      outline: [
+        { x: center.x - 10, y: center.y - 5 },
+        { x: center.x + 10, y: center.y - 5 },
+        { x: center.x + 10, y: center.y + 5 },
+        { x: center.x - 10, y: center.y + 5 },
+      ],
+    }
+    const circuitJson: CircuitJson = [
+      board,
+      {
+        type: "pcb_hole",
+        pcb_hole_id: "hole",
+        x: center.x + 2,
+        y: center.y - 1,
+        hole_shape: "circle",
+        hole_diameter: 1,
+      },
+    ]
+    const rendered = (await runTscircuitCode(
+      convertCircuitJsonToTscircuit(circuitJson, {
+        componentName: "OffsetBoard",
+      }),
+    )) as CircuitJson
+    expect(
+      rendered.find((element) => element.type === "pcb_board"),
+    ).toMatchObject({
+      center,
+      width: board.width,
+      height: board.height,
+      outline: board.outline,
+    })
+    expect(
+      rendered.find((element) => element.type === "pcb_hole"),
+    ).toMatchObject({ x: center.x + 2, y: center.y - 1 })
+  }
+})

package/tests/fixtures/create-ti-evm-roundtrip.ts

@@ -1,3 +1,4 @@
+import { expect } from "bun:test"
 import { readFile } from "node:fs/promises"
 import { join } from "node:path"
 import { gunzipSync } from "node:zlib"
@@ -36,6 +37,25 @@ export async function createTiEvmRoundtrip({
     generatedTscircuit,
   )) as CircuitJson
 
+  const sourceBoard = sourceCircuitJson.find(
+    (element) => element.type === "pcb_board",
+  )
+  const renderedBoard = renderedCircuitJson.find(
+    (element) => element.type === "pcb_board",
+  )
+  if (!sourceBoard || !renderedBoard) {
+    throw new Error(
+      `${fixtureName} must contain source and rendered PCB boards`,
+    )
+  }
+  expect(renderedBoard).toMatchObject({ center: sourceBoard.center })
+
+  expect(
+    renderedCircuitJson.filter((element) => element.type === "pcb_via"),
+  ).toHaveLength(
+    sourceCircuitJson.filter((element) => element.type === "pcb_via").length,
+  )
+
   const sourcePcbSvg = convertCircuitJsonToPcbSvg(sourceCircuitJson, {
     matchBoardAspectRatio: true,
   })
@@ -76,7 +96,7 @@ function createComparisonSvg({
 }): string {
   return stackSvgsHorizontally([sourceSvg, renderedSvg], {
     gap: 24,
-    normalizeSize: true,
+    normalizeSize: kind !== "PCB",
     targetSize: 800,
     rootAttributes: {
       "aria-label": `${fixtureName} ${kind}: source Circuit JSON on left, generated tscircuit render on right`,

package/tests/support-pcb-vias.test.tsx

@@ -0,0 +1,91 @@
+import { expect, test } from "bun:test"
+import type { CircuitJson, PcbVia } from "circuit-json"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { runTscircuitCode } from "tscircuit"
+import { convertVias } from "../lib/generate-footprint-tsx/convert-vias"
+
+test("preserves via geometry, copper layers and tenting", async () => {
+  const vias: (PcbVia & { is_tented?: boolean })[] = [
+    {
+      type: "pcb_via",
+      pcb_via_id: "through",
+      x: -2,
+      y: 3,
+      hole_diameter: 0.3,
+      outer_diameter: 0.6,
+      layers: ["top", "inner1", "inner2", "bottom"],
+      is_tented: true,
+    },
+    {
+      type: "pcb_via",
+      pcb_via_id: "blind",
+      x: 4,
+      y: -1,
+      hole_diameter: 0.2,
+      outer_diameter: 0.5,
+      layers: ["top", "inner1"],
+      tented_on_top: true,
+      tented_on_bottom: false,
+    },
+    {
+      type: "pcb_via",
+      pcb_via_id: "buried",
+      x: 1,
+      y: 2,
+      hole_diameter: 0.25,
+      outer_diameter: 0.55,
+      layers: ["inner1", "inner2"],
+      is_tented: false,
+    },
+  ]
+  const circuitJson: CircuitJson = [
+    {
+      type: "pcb_board",
+      pcb_board_id: "board",
+      center: { x: 0, y: 0 },
+      width: 20,
+      height: 20,
+      num_layers: 4,
+      thickness: 1.6,
+      material: "fr4",
+    },
+    ...vias,
+  ]
+  const generatedTscircuit = convertCircuitJsonToTscircuit(circuitJson, {
+    componentName: "ViaBoard",
+  })
+  const renderedCircuitJson = (await runTscircuitCode(
+    generatedTscircuit,
+  )) as CircuitJson
+  const renderedVias = renderedCircuitJson.filter(
+    (element) => element.type === "pcb_via",
+  )
+  expect(renderedVias).toHaveLength(vias.length)
+  for (const [index, via] of vias.entries()) {
+    expect(renderedVias[index]).toMatchObject({
+      x: via.x,
+      y: via.y,
+      hole_diameter: via.hole_diameter,
+      outer_diameter: via.outer_diameter,
+      layers: via.layers,
+      tented_on_top: via.tented_on_top ?? via.is_tented,
+      tented_on_bottom: via.tented_on_bottom ?? via.is_tented,
+    })
+  }
+})
+
+test("rejects vias without copper layer endpoints", () => {
+  expect(() =>
+    convertVias([
+      {
+        type: "pcb_via",
+        pcb_via_id: "missing_layers",
+        x: 0,
+        y: 0,
+        hole_diameter: 0.3,
+        outer_diameter: 0.6,
+        layers: [],
+      },
+    ]),
+  ).toThrow("Via missing_layers has no copper layer endpoints")
+})