circuit-json-to-tscircuit 0.0.61 → 0.0.63

package/dist/{chunk-S5BLPDEH.js → chunk-MVPNWU4R.js}

@@ -571,16 +571,22 @@ import { su as su2 } from "@tscircuit/soup-util";
 import {
   schematic_text as schematic_text3
 } from "circuit-json";
+var DEFAULT_BOX_BODY_STROKE_WIDTH = 0.02;
+var DEFAULT_BOX_BODY_STROKE_COLOR = "#840000";
+var DEFAULT_BOX_BODY_FILL_COLOR = "#ffffc2";
 var convertBoxComponent = ({
   circuitJson,
   schematicComponent
 }) => {
   const primitives = [
-    formatElement("schematicrect", {
-      schX: schematicComponent.center.x,
-      schY: schematicComponent.center.y,
+    convertRect({
+      center: schematicComponent.center,
       width: schematicComponent.size.width,
-      height: schematicComponent.size.height
+      height: schematicComponent.size.height,
+      strokeWidth: DEFAULT_BOX_BODY_STROKE_WIDTH,
+      color: DEFAULT_BOX_BODY_STROKE_COLOR,
+      fillColor: DEFAULT_BOX_BODY_FILL_COLOR,
+      isFilled: true
     })
   ];
   for (const schematicPort of su2(circuitJson).schematic_port.list({
@@ -1062,6 +1068,40 @@ var convertCutouts = (circuitJson) => {
 
 // lib/generate-footprint-tsx/convert-fabrication.ts
 import { su as su10 } from "@tscircuit/soup-util";
+
+// lib/generate-footprint-tsx/convert-fabrication-note-dimension.ts
+var convertFabricationNoteDimension = (dimension) => {
+  const from = dimension.from ?? { x: 0, y: 0 };
+  const to = dimension.to ?? { x: 0, y: 0 };
+  const offsetDistance = dimension.offset_distance ?? dimension.offset;
+  const attrs = [
+    `from={{ x: ${from.x}, y: ${from.y} }}`,
+    `to={{ x: ${to.x}, y: ${to.y} }}`
+  ];
+  if (dimension.text !== void 0) {
+    attrs.push(`text="${escapeJsxText2(dimension.text)}"`);
+  }
+  if (dimension.font !== void 0) attrs.push(`font="${dimension.font}"`);
+  if (dimension.font_size !== void 0) {
+    attrs.push(`fontSize={${dimension.font_size}}`);
+  }
+  if (dimension.color !== void 0) attrs.push(`color="${dimension.color}"`);
+  if (dimension.arrow_size !== void 0) {
+    attrs.push(`arrowSize={${dimension.arrow_size}}`);
+  }
+  if (offsetDistance !== void 0) {
+    attrs.push(`offset={${offsetDistance}}`);
+  }
+  if (dimension.offset_direction !== void 0) {
+    attrs.push(
+      `offsetDirection={${JSON.stringify(dimension.offset_direction)}}`
+    );
+  }
+  if (dimension.layer === "bottom") attrs.push(`layer="bottom"`);
+  return [`<fabricationnotedimension ${attrs.join(" ")} />`];
+};
+
+// lib/generate-footprint-tsx/convert-fabrication.ts
 var convertFabrication = (circuitJson) => {
   const fabricationNotePaths = su10(circuitJson).pcb_fabrication_note_path.list();
   const fabricationNoteTexts = su10(circuitJson).pcb_fabrication_note_text.list();
@@ -1137,36 +1177,7 @@ var convertFabrication = (circuitJson) => {
     elementStrings.push(`<fabricationnoterect ${attrs.join(" ")} />`);
   }
   for (const fabDimension of fabricationNoteDimensions) {
-    const fromPoint = fabDimension.from ?? { x: 0, y: 0 };
-    const toPoint2 = fabDimension.to ?? { x: 0, y: 0 };
-    const attrs = [
-      `from={{ x: ${fromPoint.x}, y: ${fromPoint.y} }}`,
-      `to={{ x: ${toPoint2.x}, y: ${toPoint2.y} }}`
-    ];
-    if (fabDimension.text !== void 0) {
-      attrs.push(`text="${escapeJsxText2(fabDimension.text)}"`);
-    }
-    if (fabDimension.font !== void 0) {
-      attrs.push(`font="${fabDimension.font}"`);
-    }
-    if (fabDimension.font_size !== void 0) {
-      attrs.push(`fontSize={${fabDimension.font_size}}`);
-    }
-    if (fabDimension.color !== void 0) {
-      attrs.push(`color="${fabDimension.color}"`);
-    }
-    if (fabDimension.arrow_size !== void 0) {
-      attrs.push(`arrowSize={${fabDimension.arrow_size}}`);
-    }
-    if (fabDimension.offset !== void 0) {
-      attrs.push(`offset={${fabDimension.offset}}`);
-    } else if ("offset_distance" in fabDimension && fabDimension.offset_distance !== void 0) {
-      attrs.push(`offset={${fabDimension.offset_distance}}`);
-    }
-    if (fabDimension.layer === "bottom") {
-      attrs.push(`layer="bottom"`);
-    }
-    elementStrings.push(`<fabricationnotedimension ${attrs.join(" ")} />`);
+    elementStrings.push(...convertFabricationNoteDimension(fabDimension));
   }
   return elementStrings;
 };

package/dist/cli/main.js

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

package/lib/generate-board-schematic-tsx/convert-box-components.ts

@@ -4,8 +4,15 @@ import {
   type AnyCircuitElement,
   type SchematicComponent,
 } from "circuit-json"
+import { convertRect } from "./convert-rect"
 import { formatElement } from "./format-attributes"
 
+// Circuit JSON does not encode box body styling. These values mirror the
+// circuit-to-svg defaults so reconstructed boxes keep the compiled view.
+const DEFAULT_BOX_BODY_STROKE_WIDTH = 0.02
+const DEFAULT_BOX_BODY_STROKE_COLOR = "#840000"
+const DEFAULT_BOX_BODY_FILL_COLOR = "#ffffc2"
+
 export const convertBoxComponent = ({
   circuitJson,
   schematicComponent,
@@ -14,11 +21,14 @@ export const convertBoxComponent = ({
   schematicComponent: SchematicComponent
 }): string[] => {
   const primitives = [
-    formatElement("schematicrect", {
-      schX: schematicComponent.center.x,
-      schY: schematicComponent.center.y,
+    convertRect({
+      center: schematicComponent.center,
       width: schematicComponent.size.width,
       height: schematicComponent.size.height,
+      strokeWidth: DEFAULT_BOX_BODY_STROKE_WIDTH,
+      color: DEFAULT_BOX_BODY_STROKE_COLOR,
+      fillColor: DEFAULT_BOX_BODY_FILL_COLOR,
+      isFilled: true,
     }),
   ]
   for (const schematicPort of su(circuitJson).schematic_port.list({

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

@@ -0,0 +1,37 @@
+import type { PcbFabricationNoteDimension } from "circuit-json"
+import { escapeJsxText } from "./footprint-tsx-attribute-formatters/escape-jsx-text"
+
+export const convertFabricationNoteDimension = (
+  dimension: PcbFabricationNoteDimension,
+): string[] => {
+  const from = dimension.from ?? { x: 0, y: 0 }
+  const to = dimension.to ?? { x: 0, y: 0 }
+  const offsetDistance = dimension.offset_distance ?? dimension.offset
+  const attrs = [
+    `from={{ x: ${from.x}, y: ${from.y} }}`,
+    `to={{ x: ${to.x}, y: ${to.y} }}`,
+  ]
+
+  if (dimension.text !== undefined) {
+    attrs.push(`text="${escapeJsxText(dimension.text)}"`)
+  }
+  if (dimension.font !== undefined) attrs.push(`font="${dimension.font}"`)
+  if (dimension.font_size !== undefined) {
+    attrs.push(`fontSize={${dimension.font_size}}`)
+  }
+  if (dimension.color !== undefined) attrs.push(`color="${dimension.color}"`)
+  if (dimension.arrow_size !== undefined) {
+    attrs.push(`arrowSize={${dimension.arrow_size}}`)
+  }
+  if (offsetDistance !== undefined) {
+    attrs.push(`offset={${offsetDistance}}`)
+  }
+  if (dimension.offset_direction !== undefined) {
+    attrs.push(
+      `offsetDirection={${JSON.stringify(dimension.offset_direction)}}`,
+    )
+  }
+  if (dimension.layer === "bottom") attrs.push(`layer="bottom"`)
+
+  return [`<fabricationnotedimension ${attrs.join(" ")} />`]
+}

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

@@ -2,6 +2,7 @@ import { su } from "@tscircuit/soup-util"
 import { formatPcbRotationAttr } from "./footprint-tsx-attribute-formatters/format-pcb-rotation-attr"
 import type { FootprintElementConverter } from "./converter-types"
 import { escapeJsxText } from "./footprint-tsx-attribute-formatters/escape-jsx-text"
+import { convertFabricationNoteDimension } from "./convert-fabrication-note-dimension"
 
 export const convertFabrication: FootprintElementConverter = (circuitJson) => {
   const fabricationNotePaths = su(circuitJson).pcb_fabrication_note_path.list()
@@ -89,41 +90,7 @@ export const convertFabrication: FootprintElementConverter = (circuitJson) => {
   }
 
   for (const fabDimension of fabricationNoteDimensions) {
-    const fromPoint = fabDimension.from ?? { x: 0, y: 0 }
-    const toPoint = fabDimension.to ?? { x: 0, y: 0 }
-    const attrs = [
-      `from={{ x: ${fromPoint.x}, y: ${fromPoint.y} }}`,
-      `to={{ x: ${toPoint.x}, y: ${toPoint.y} }}`,
-    ]
-
-    if (fabDimension.text !== undefined) {
-      attrs.push(`text="${escapeJsxText(fabDimension.text)}"`)
-    }
-    if (fabDimension.font !== undefined) {
-      attrs.push(`font="${fabDimension.font}"`)
-    }
-    if (fabDimension.font_size !== undefined) {
-      attrs.push(`fontSize={${fabDimension.font_size}}`)
-    }
-    if (fabDimension.color !== undefined) {
-      attrs.push(`color="${fabDimension.color}"`)
-    }
-    if (fabDimension.arrow_size !== undefined) {
-      attrs.push(`arrowSize={${fabDimension.arrow_size}}`)
-    }
-    if (fabDimension.offset !== undefined) {
-      attrs.push(`offset={${fabDimension.offset}}`)
-    } else if (
-      "offset_distance" in fabDimension &&
-      fabDimension.offset_distance !== undefined
-    ) {
-      attrs.push(`offset={${fabDimension.offset_distance}}`)
-    }
-    if (fabDimension.layer === "bottom") {
-      attrs.push(`layer="bottom"`)
-    }
-
-    elementStrings.push(`<fabricationnotedimension ${attrs.join(" ")} />`)
+    elementStrings.push(...convertFabricationNoteDimension(fabDimension))
   }
 
   return elementStrings

package/package.json

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

package/tests/__snapshots__/fabrication-dimension-offset-comparison.snap.svg

@@ -0,0 +1,8 @@
+<svg width="1624" height="600" viewBox="0 0 1624 600" xmlns="http://www.w3.org/2000/svg" aria-label="fabrication dimension source on left, generated tscircuit render on right" role="img">
+  <g transform="translate(0, 0)">
+    <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="100" y="50" width="600" height="500" data-type="pcb_boundary" data-pcb-layer="global"/><path class="pcb-board" d="M 100 550 L 700 550 L 700 50 L 100 50 Z" fill="none" stroke="rgba(255, 255, 255, 0.5)" stroke-width="5" data-type="pcb_board" data-pcb-layer="board"/><g class="pcb-fabrication-note-dimension" data-type="pcb_fabrication_note_dimension" data-pcb-fabrication-note-dimension-id="pcb_fabrication_note_dimension_0" data-pcb-layer="top" data-pcb-component-id="pcb_component_0"><path d="M 250 300 L 276.5165042944955 326.5165042944955" stroke="#ec4899" fill="none" stroke-width="5" stroke-linecap="round" class="pcb-fabrication-note-dimension-extension"/><path d="M 550 300 L 576.5165042944955 326.5165042944955" stroke="#ec4899" fill="none" stroke-width="5" stroke-linecap="round" class="pcb-fabrication-note-dimension-extension"/><path d="M 283.83883476483186 308.83883476483186 L 533.8388347648319 308.83883476483186" stroke="#ec4899" fill="none" stroke-width="5" stroke-linecap="round" class="pcb-fabrication-note-dimension-line"/><path d="M 258.83883476483186 308.83883476483186 L 283.83883476483186 296.33883476483186 L 283.83883476483186 321.33883476483186 Z" fill="#ec4899" class="pcb-fabrication-note-dimension-arrow"/><path d="M 558.8388347648319 308.83883476483186 L 533.8388347648319 296.33883476483186 L 533.8388347648319 321.33883476483186 Z" fill="#ec4899" class="pcb-fabrication-note-dimension-arrow"/><text x="408.83883476483186" y="271.33883476483186" fill="#ec4899" font-size="40" font-family="Arial, sans-serif" text-anchor="middle" dominant-baseline="central" class="pcb-fabrication-note-dimension-text" transform="rotate(0 408.83883476483186 271.33883476483186)">6 mm</text></g>
+  </g>
+  <g transform="translate(824, 0)">
+    <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="100" y="50" width="600" height="500" data-type="pcb_boundary" data-pcb-layer="global"/><path class="pcb-board" d="M 100 550 L 700 550 L 700 50 L 100 50 Z" fill="none" stroke="rgba(255, 255, 255, 0.5)" stroke-width="5" data-type="pcb_board" data-pcb-layer="board"/><g class="pcb-fabrication-note-dimension" data-type="pcb_fabrication_note_dimension" data-pcb-fabrication-note-dimension-id="pcb_fabrication_note_dimension_0__stack1" data-pcb-layer="top" data-pcb-component-id="pcb_component_0__stack1"><path d="M 250 300 L 276.5165042944955 326.5165042944955" stroke="#ec4899" fill="none" stroke-width="5" stroke-linecap="round" class="pcb-fabrication-note-dimension-extension"/><path d="M 550 300 L 576.5165042944955 326.5165042944955" stroke="#ec4899" fill="none" stroke-width="5" stroke-linecap="round" class="pcb-fabrication-note-dimension-extension"/><path d="M 283.83883476483186 308.83883476483186 L 533.8388347648319 308.83883476483186" stroke="#ec4899" fill="none" stroke-width="5" stroke-linecap="round" class="pcb-fabrication-note-dimension-line"/><path d="M 258.83883476483186 308.83883476483186 L 283.83883476483186 296.33883476483186 L 283.83883476483186 321.33883476483186 Z" fill="#ec4899" class="pcb-fabrication-note-dimension-arrow"/><path d="M 558.8388347648319 308.83883476483186 L 533.8388347648319 296.33883476483186 L 533.8388347648319 321.33883476483186 Z" fill="#ec4899" class="pcb-fabrication-note-dimension-arrow"/><text x="408.83883476483186" y="271.33883476483186" fill="#ec4899" font-size="40" font-family="Arial, sans-serif" text-anchor="middle" dominant-baseline="central" class="pcb-fabrication-note-dimension-text" transform="rotate(0 408.83883476483186 271.33883476483186)">6 mm</text></g>
+  </g>
+</svg>

package/tests/__snapshots__/test22-preserve-board-schematic-schematic.snap.svg

@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1200" height="600" style="background-color: rgb(245, 241, 237)" data-real-to-screen-transform="matrix(64.5869731593,0,0,-64.5869731593,568.0294482861,502.4736705294)" data-software-used-string="@tscircuit/core@0.0.2025"><style>
+<svg xmlns="http://www.w3.org/2000/svg" width="1200" height="600" style="background-color: rgb(245, 241, 237)" data-real-to-screen-transform="matrix(64.5869731593,0,0,-64.5869731593,567.7065134203,502.4736705294)" data-software-used-string="@tscircuit/core@0.0.2038"><style>
               .boundary { fill: rgb(245, 241, 237); }
               .schematic-boundary { fill: none; stroke: #fff; }
               .component { fill: none; stroke: rgb(132, 0, 0); }
@@ -22,4 +22,4 @@
               .pin-number { fill: rgb(169, 0, 0); }
               .port-label { fill: rgb(0, 100, 100); }
               .component-name { fill: rgb(0, 100, 100); }
-            </style><rect class="boundary" x="0" y="0" width="1200" height="600"/><circle cx="568.0294482861" cy="373.29972421080004" r="1.937609194779" fill="#008800" stroke="#008800" stroke-width="7.750436779116" data-schematic-circle-id="schematic_circle_0"/><rect x="632.6164214454" y="211.83229131254998" width="129.1739463186" height="193.76091947790002" fill="none" stroke="rgba(132, 0, 0)" stroke-width="7.750436779116" data-schematic-rect-id="schematic_rect_0"/><path d="M 438.8555019675 373.29972421080004 L 568.0294482861 373.29972421080004" stroke="rgb(132, 0, 0)" stroke-width="1.291739463186" fill="none" stroke-linecap="round" stroke-linejoin="round"/><path d="M 568.0294482861 373.29972421080004 L 568.0294482861 567.0606436887" stroke="rgb(132, 0, 0)" stroke-width="1.291739463186" fill="none" stroke-linecap="round" stroke-linejoin="round"/><text x="632.6164214454" y="179.53880473290002" fill="#000000" text-anchor="start" dominant-baseline="ideographic" font-family="sans-serif" font-size="12.91739463186px" transform="rotate(90, 632.6164214454, 179.53880473290002)">U1 "controller" {flyback}</text></svg>
+            </style><rect class="boundary" x="0" y="0" width="1200" height="600"/><circle cx="567.7065134203" cy="373.29972421080004" r="1.937609194779" fill="#008800" stroke="#008800" stroke-width="7.750436779116" data-schematic-circle-id="schematic_circle_0"/><path d="M 632.2934865796 405.59321079045003 L 761.4674328982001 405.59321079045003 L 761.4674328982001 211.83229131255 L 632.2934865796 211.83229131255 L 632.2934865796 405.59321079045003" stroke="#840000" stroke-width="1.291739463186" fill="#ffffc2" stroke-linecap="round" stroke-linejoin="round"/><path d="M 438.5325671017 373.29972421080004 L 567.7065134203 373.29972421080004" stroke="rgb(132, 0, 0)" stroke-width="1.291739463186" fill="none" stroke-linecap="round" stroke-linejoin="round"/><path d="M 567.7065134203 373.29972421080004 L 567.7065134203 567.0606436887" stroke="rgb(132, 0, 0)" stroke-width="1.291739463186" fill="none" stroke-linecap="round" stroke-linejoin="round"/><text x="632.2934865796" y="179.53880473290002" fill="#000000" text-anchor="start" dominant-baseline="ideographic" font-family="sans-serif" font-size="12.91739463186px" transform="rotate(90, 632.2934865796, 179.53880473290002)">U1 "controller" {flyback}</text></svg>

package/tests/fabrication-dimension-offset.test.tsx

@@ -0,0 +1,74 @@
+import { expect, test } from "bun:test"
+import type { CircuitJson } from "circuit-json"
+import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { stackSvgsHorizontally } from "stack-svgs"
+import { runTscircuitCode } from "tscircuit"
+
+test("preserves fabrication dimension offset direction", async () => {
+  const generatedTscircuit = convertCircuitJsonToTscircuit(sourceCircuitJson, {
+    componentName: "FabricationDimensionBoard",
+  })
+  const renderedCircuitJson = (await runTscircuitCode(
+    generatedTscircuit,
+  )) as CircuitJson
+  const renderedDimension = renderedCircuitJson.find(
+    (element) => element.type === "pcb_fabrication_note_dimension",
+  )
+  expect(renderedDimension).toMatchObject({
+    from: { x: -3, y: 0 },
+    to: { x: 3, y: 0 },
+    offset_distance: 0.25,
+    offset_direction: { x: 1, y: -1 },
+  })
+  expect(
+    renderedCircuitJson.filter(
+      (element) => element.type === "pcb_fabrication_note_path",
+    ),
+  ).toHaveLength(0)
+
+  const comparisonSvg = stackSvgsHorizontally(
+    [
+      convertCircuitJsonToPcbSvg(sourceCircuitJson),
+      convertCircuitJsonToPcbSvg(renderedCircuitJson),
+    ],
+    {
+      gap: 24,
+      targetSize: 800,
+      rootAttributes: {
+        "aria-label":
+          "fabrication dimension source on left, generated tscircuit render on right",
+        role: "img",
+      },
+    },
+  )
+  await expect(comparisonSvg).toMatchSvgSnapshot(import.meta.path, "comparison")
+})
+
+const sourceCircuitJson: CircuitJson = [
+  {
+    type: "pcb_board",
+    pcb_board_id: "pcb_board_0",
+    center: { x: 0, y: 0 },
+    width: 12,
+    height: 10,
+    thickness: 1.6,
+    num_layers: 2,
+    material: "fr4",
+  },
+  {
+    type: "pcb_fabrication_note_dimension",
+    pcb_fabrication_note_dimension_id: "pcb_fabrication_note_dimension_0",
+    pcb_component_id: "pcb_component_0",
+    layer: "top",
+    from: { x: -3, y: 0 },
+    to: { x: 3, y: 0 },
+    text: "6 mm",
+    font: "tscircuit2024",
+    font_size: 0.8,
+    color: "#ec4899",
+    arrow_size: 0.5,
+    offset_distance: 0.25,
+    offset_direction: { x: 1, y: -1 },
+  },
+]