circuit-json-to-tscircuit 0.0.55 → 0.0.57

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

@@ -1,6 +1,6 @@
 // lib/get-board-using-template.ts
 import { mmStr as mmStr8 } from "@tscircuit/mm";
-import { su as su13 } from "@tscircuit/soup-util";
+import { su as su14 } from "@tscircuit/soup-util";
 
 // lib/generate-footprint-tsx/convert-copper-text.ts
 import { su } from "@tscircuit/soup-util";
@@ -385,8 +385,12 @@ var convertNotes = (circuitJson) => {
   return elementStrings;
 };
 
-// lib/generate-footprint-tsx/convert-plated-holes.ts
+// lib/generate-footprint-tsx/convert-pcb-traces.ts
 import { su as su8 } from "@tscircuit/soup-util";
+var convertPcbTraces = (circuitJson) => su8(circuitJson).pcb_trace.list().map((trace) => `<pcbtrace route={${JSON.stringify(trace.route)}} />`);
+
+// lib/generate-footprint-tsx/convert-plated-holes.ts
+import { su as su9 } from "@tscircuit/soup-util";
 import { mmStr as mmStr4 } from "@tscircuit/mm";
 
 // lib/generate-footprint-tsx/footprint-tsx-attribute-formatters/format-optional-mm-attr.ts
@@ -407,7 +411,7 @@ var formatSolderMaskAttrs = (platedHole) => {
 
 // lib/generate-footprint-tsx/convert-plated-holes.ts
 var convertPlatedHoles = (circuitJson) => {
-  const platedHoles = su8(circuitJson).pcb_plated_hole.list();
+  const platedHoles = su9(circuitJson).pcb_plated_hole.list();
   const elementStrings = [];
   for (const platedHole of platedHoles) {
     if (platedHole.shape === "oval" || platedHole.shape === "pill") {
@@ -439,12 +443,12 @@ var convertPlatedHoles = (circuitJson) => {
 };
 
 // lib/generate-footprint-tsx/convert-silkscreen.ts
-import { su as su9 } from "@tscircuit/soup-util";
+import { su as su10 } from "@tscircuit/soup-util";
 var convertSilkscreen = (circuitJson) => {
-  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 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 elementStrings = [];
   for (const silkscreenPath of silkscreenPaths) {
     const attrs = [`route={${JSON.stringify(silkscreenPath.route)}}`];
@@ -465,7 +469,9 @@ var convertSilkscreen = (circuitJson) => {
       `height={${silkscreenRect.height ?? 0}}`,
       `layer="${silkscreenRect.layer}"`
     ];
-    if (silkscreenRect.stroke_width !== void 0) {
+    if (silkscreenRect.has_stroke === false) {
+      attrs.push("strokeWidth={0}");
+    } else if (silkscreenRect.stroke_width !== void 0) {
       attrs.push(`strokeWidth={${silkscreenRect.stroke_width}}`);
     }
     if (silkscreenRect.is_filled !== void 0) {
@@ -474,7 +480,9 @@ var convertSilkscreen = (circuitJson) => {
     if (silkscreenRect.corner_radius !== void 0) {
       attrs.push(`cornerRadius={${silkscreenRect.corner_radius}}`);
     }
-    elementStrings.push(`<silkscreenrect ${attrs.join(" ")} />`);
+    elementStrings.push(
+      `<silkscreenrect ${attrs.join(" ")}${formatPcbRotationAttr(silkscreenRect.ccw_rotation)} />`
+    );
   }
   for (const silkscreenCircle of silkscreenCircles) {
     const center = silkscreenCircle.center ?? { x: 0, y: 0 };
@@ -511,10 +519,10 @@ var convertSilkscreen = (circuitJson) => {
 };
 
 // lib/generate-footprint-tsx/convert-silkscreen-text.ts
-import { su as su10 } from "@tscircuit/soup-util";
+import { su as su11 } from "@tscircuit/soup-util";
 import { mmStr as mmStr5 } from "@tscircuit/mm";
 var convertSilkscreenText = (circuitJson) => {
-  const silkscreenTexts = su10(circuitJson).pcb_silkscreen_text.list();
+  const silkscreenTexts = su11(circuitJson).pcb_silkscreen_text.list();
   const elementStrings = [];
   for (const silkscreenText of silkscreenTexts) {
     const pcbX = silkscreenText.anchor_position?.x ?? 0;
@@ -529,10 +537,10 @@ var convertSilkscreenText = (circuitJson) => {
 };
 
 // lib/generate-footprint-tsx/convert-smt-pads.ts
-import { su as su11 } from "@tscircuit/soup-util";
+import { su as su12 } from "@tscircuit/soup-util";
 import { mmStr as mmStr6 } from "@tscircuit/mm";
 var convertSmtPads = (circuitJson) => {
-  const smtPads = su11(circuitJson).pcb_smtpad.list();
+  const smtPads = su12(circuitJson).pcb_smtpad.list();
   const elementStrings = [];
   for (const smtPad of smtPads) {
     const commonAttrs = [];
@@ -581,9 +589,9 @@ var convertSmtPads = (circuitJson) => {
 
 // lib/generate-footprint-tsx/convert-vias.ts
 import { mmStr as mmStr7 } from "@tscircuit/mm";
-import { su as su12 } from "@tscircuit/soup-util";
+import { su as su13 } from "@tscircuit/soup-util";
 var convertVias = (circuitJson) => {
-  return su12(circuitJson).pcb_via.list().map((via) => {
+  return su13(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) {
@@ -605,6 +613,7 @@ var generateFootprintTsx = (circuitJson) => {
     convertPlatedHoles,
     convertVias,
     convertSmtPads,
+    convertPcbTraces,
     convertSilkscreen,
     convertFabrication,
     convertSilkscreenText,
@@ -630,7 +639,7 @@ var getBoardUsingTemplate = ({
   circuitJson,
   componentName
 }) => {
-  const pcbBoard = su13(circuitJson).pcb_board.list()[0];
+  const pcbBoard = su14(circuitJson).pcb_board.list()[0];
   const boardProps = [];
   if (pcbBoard) {
     if (pcbBoard.width !== void 0) {
@@ -682,18 +691,18 @@ ${componentName ? `export default ${componentName}` : ""}
 };
 
 // lib/generate-symbol-tsx.ts
-import { su as su14 } from "@tscircuit/soup-util";
+import { su as su15 } from "@tscircuit/soup-util";
 var escapeJsxText2 = (text) => text.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 var generateSymbolTsx = (circuitJson) => {
-  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 schematicArcs = su15(circuitJson).schematic_arc.list();
+  const schematicLines = su15(circuitJson).schematic_line.list();
+  const schematicPaths = su15(circuitJson).schematic_path.list();
+  const schematicTexts = su15(circuitJson).schematic_text.list();
+  const schematicCircles = su15(circuitJson).schematic_circle.list();
+  const schematicBoxes = su15(circuitJson).schematic_box.list();
+  const schematicRects = su15(circuitJson).schematic_rect.list();
+  const schematicTables = su15(circuitJson).schematic_table.list();
+  const schematicTableCells = su15(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-NOSIW5HF.js";
+} from "../chunk-U24G34W6.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.54",
+  version: "0.0.56",
   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-NOSIW5HF.js";
+} from "../chunk-U24G34W6.js";
 export {
   convertCircuitJsonToTscircuit
 };

package/lib/generate-footprint-tsx/convert-pcb-traces.ts

@@ -0,0 +1,7 @@
+import { su } from "@tscircuit/soup-util"
+import type { FootprintElementConverter } from "./converter-types"
+
+export const convertPcbTraces: FootprintElementConverter = (circuitJson) =>
+  su(circuitJson)
+    .pcb_trace.list()
+    .map((trace) => `<pcbtrace route={${JSON.stringify(trace.route)}} />`)

package/lib/generate-footprint-tsx/convert-silkscreen.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 convertSilkscreen: FootprintElementConverter = (circuitJson) => {
   const silkscreenLines = su(circuitJson).pcb_silkscreen_line.list()
@@ -31,7 +32,9 @@ export const convertSilkscreen: FootprintElementConverter = (circuitJson) => {
       `layer="${silkscreenRect.layer}"`,
     ]
 
-    if (silkscreenRect.stroke_width !== undefined) {
+    if (silkscreenRect.has_stroke === false) {
+      attrs.push("strokeWidth={0}")
+    } else if (silkscreenRect.stroke_width !== undefined) {
       attrs.push(`strokeWidth={${silkscreenRect.stroke_width}}`)
     }
     if (silkscreenRect.is_filled !== undefined) {
@@ -41,7 +44,9 @@ export const convertSilkscreen: FootprintElementConverter = (circuitJson) => {
       attrs.push(`cornerRadius={${silkscreenRect.corner_radius}}`)
     }
 
-    elementStrings.push(`<silkscreenrect ${attrs.join(" ")} />`)
+    elementStrings.push(
+      `<silkscreenrect ${attrs.join(" ")}${formatPcbRotationAttr(silkscreenRect.ccw_rotation)} />`,
+    )
   }
 
   for (const silkscreenCircle of silkscreenCircles) {

package/lib/generate-footprint-tsx.tsx

@@ -1,5 +1,4 @@
 import type { AnyCircuitElement } from "circuit-json"
-import type { FootprintElementConverter } from "./generate-footprint-tsx/converter-types"
 import { convertCopperText } from "./generate-footprint-tsx/convert-copper-text"
 import { convertCourtyard } from "./generate-footprint-tsx/convert-courtyard"
 import { convertCutouts } from "./generate-footprint-tsx/convert-cutouts"
@@ -7,11 +6,13 @@ import { convertFabrication } from "./generate-footprint-tsx/convert-fabrication
 import { convertHoles } from "./generate-footprint-tsx/convert-holes"
 import { convertKeepouts } from "./generate-footprint-tsx/convert-keepouts"
 import { convertNotes } from "./generate-footprint-tsx/convert-notes"
+import { convertPcbTraces } from "./generate-footprint-tsx/convert-pcb-traces"
 import { convertPlatedHoles } from "./generate-footprint-tsx/convert-plated-holes"
 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"
+import type { FootprintElementConverter } from "./generate-footprint-tsx/converter-types"
 
 export const generateFootprintTsx = (
   circuitJson: AnyCircuitElement[],
@@ -21,6 +22,7 @@ export const generateFootprintTsx = (
     convertPlatedHoles,
     convertVias,
     convertSmtPads,
+    convertPcbTraces,
     convertSilkscreen,
     convertFabrication,
     convertSilkscreenText,

package/package.json

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

package/tests/silkscreen-rect-rotation.test.tsx

@@ -0,0 +1,39 @@
+import { expect, test } from "bun:test"
+import type { CircuitJson } from "circuit-json"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { runTscircuitCode } from "tscircuit"
+
+for (const ccwRotationDegrees of [0, 90, 180, 270]) {
+  test(`preserves silkscreen rectangle orientation at ${ccwRotationDegrees} degrees`, async () => {
+    const circuitJson: CircuitJson = [
+      {
+        type: "pcb_silkscreen_rect",
+        pcb_silkscreen_rect_id: "polarity_bar",
+        pcb_component_id: "diode",
+        center: { x: 0, y: 0 },
+        width: 0.5,
+        height: 3,
+        layer: "top",
+        is_filled: true,
+        stroke_width: 0.1,
+        has_stroke: false,
+        ccw_rotation: ccwRotationDegrees,
+      },
+    ]
+    const generatedTscircuit = convertCircuitJsonToTscircuit(circuitJson, {
+      componentName: "PolarityBar",
+    })
+    const renderedCircuitJson = (await runTscircuitCode(`
+${generatedTscircuit}
+circuit.add(<board width="10mm" height="10mm"><PolarityBar /></board>)
+`)) as CircuitJson
+    const rectangle = renderedCircuitJson.find(
+      (element) => element.type === "pcb_silkscreen_rect",
+    )
+    const isQuarterTurn = ccwRotationDegrees % 180 === 90
+    expect(rectangle?.width).toBe(isQuarterTurn ? 3 : 0.5)
+    expect(rectangle?.height).toBe(isQuarterTurn ? 0.5 : 3)
+    expect(rectangle?.is_filled).toBe(true)
+    expect(rectangle?.stroke_width).toBe(0)
+  })
+}

package/tests/test24-support-pcb-traces.test.tsx

@@ -0,0 +1,38 @@
+import { expect, test } from "bun:test"
+import type { CircuitJson, PcbTrace } from "circuit-json"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { runTscircuitCode } from "tscircuit"
+
+test("preserves routed PCB trace geometry", async () => {
+  const route: PcbTrace["route"] = [
+    { route_type: "wire", x: -4, y: 1, width: 0.3, layer: "top" },
+    { route_type: "wire", x: 4, y: 1, width: 0.3, layer: "top" },
+  ]
+  const circuitJson: CircuitJson = [
+    {
+      type: "pcb_board",
+      pcb_board_id: "pcb_board_0",
+      center: { x: 0, y: 0 },
+      width: 10,
+      height: 10,
+      thickness: 1.6,
+      num_layers: 2,
+      material: "fr4",
+    },
+    {
+      type: "pcb_trace",
+      pcb_trace_id: "pcb_trace_0",
+      route,
+    },
+  ]
+
+  const generatedTscircuit = convertCircuitJsonToTscircuit(circuitJson, {
+    componentName: "TraceBoard",
+  })
+  const renderedCircuitJson = await runTscircuitCode(generatedTscircuit)
+  const trace = renderedCircuitJson.find(
+    (element) => element.type === "pcb_trace",
+  )
+
+  expect(trace).toMatchObject({ route })
+})