circuit-json-to-tscircuit 0.0.45 → 0.0.47

package/dist/{chunk-UXTI3RT6.js → chunk-E24YLRWU.js}

@@ -565,7 +565,7 @@ var convertSmtPads = (circuitJson) => {
     } else if (smtPad.shape === "rotated_rect") {
       const cornerRadius = smtPad.corner_radius ?? smtPad.rect_border_radius ?? void 0;
       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="${mmStr6(smtPad.width ?? 0)}" height="${mmStr6(smtPad.height ?? 0)}"${formatPcbRotationAttr(smtPad.ccw_rotation)} shape="rotated_rect" />`
+        `<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="${mmStr6(smtPad.width ?? 0)}" height="${mmStr6(smtPad.height ?? 0)}" ccwRotation={${smtPad.ccw_rotation ?? 0}} shape="rotated_rect" />`
       );
     }
   }

package/dist/cli/main.js

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

package/lib/generate-footprint-tsx/convert-smt-pads.ts

@@ -51,7 +51,7 @@ export const convertSmtPads: FootprintElementConverter = (circuitJson) => {
         smtPad.corner_radius ?? smtPad.rect_border_radius ?? undefined
 
       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" />`,
+        `<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)}" ccwRotation={${smtPad.ccw_rotation ?? 0}} shape="rotated_rect" />`,
       )
     }
   }

package/package.json

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

package/tests/test16-support-pcb-smtpad-shapes.test.tsx

@@ -16,7 +16,7 @@ test("test16 support pcb smtpad shapes", async () => {
         footprint={<footprint>
             <smtpad portHints={["1"]} pcbX="1mm" pcbY="2mm" layer="top" coveredWithSolderMask={true} solderMaskMargin="0.03mm" width="1.5mm" height="0.8mm" radius="0.4mm" shape="pill" />
     <smtpad portHints={["2"]} layer="top" coveredWithSolderMask={true} solderMaskMargin="0.06mm" shape="polygon" points={[{"x":0,"y":0},{"x":1,"y":0},{"x":0.5,"y":1}]} />
-    <smtpad portHints={["3"]} pcbX="-1mm" pcbY="-2mm" layer="bottom" coveredWithSolderMask={true} solderMaskMargin="0.04mm" cornerRadius="0.15mm" solderMaskMarginLeft="0.01mm" solderMaskMarginTop="0.02mm" solderMaskMarginRight="0.03mm" solderMaskMarginBottom="0.05mm" width="2mm" height="0.6mm" pcbRotation="45deg" shape="rotated_rect" />
+    <smtpad portHints={["3"]} pcbX="-1mm" pcbY="-2mm" layer="bottom" coveredWithSolderMask={true} solderMaskMargin="0.04mm" cornerRadius="0.15mm" solderMaskMarginLeft="0.01mm" solderMaskMarginTop="0.02mm" solderMaskMarginRight="0.03mm" solderMaskMarginBottom="0.05mm" width="2mm" height="0.6mm" ccwRotation={45} shape="rotated_rect" />
     <smtpad portHints={["4"]} pcbX="2.5mm" pcbY="-1.5mm" layer="bottom" coveredWithSolderMask={true} solderMaskMargin="0.05mm" rectBorderRadius="0.25mm" cornerRadius="0.2mm" solderMaskMarginLeft="0.11mm" solderMaskMarginTop="0.12mm" solderMaskMarginRight="0.13mm" solderMaskMarginBottom="0.14mm" width="1.8mm" height="0.9mm" shape="rect" />
     <smtpad portHints={["5"]} pcbX="-2.4mm" pcbY="1.6mm" layer="top" coveredWithSolderMask={true} solderMaskMargin="0.07mm" width="2.2mm" height="0.9mm" radius="0.45mm" pcbRotation="30deg" shape="pill" />
           </footprint>}
@@ -24,19 +24,12 @@ test("test16 support pcb smtpad shapes", async () => {
       />
     )"
   `)
-  expect(tscircuit).toContain(`pcbRotation="45deg"`)
+  expect(tscircuit).toContain(`ccwRotation={45}`)
   expect(tscircuit).toContain(`shape="rotated_rect"`)
   expect(tscircuit).toContain(`pcbRotation="30deg"`)
 
-  // The generator emits pcbRotation for consistency, but the current smtpad
-  // runtime still expects ccwRotation for rotated_rect pads.
-  const executableTscircuit = tscircuit.replace(
-    /pcbRotation="(-?\d+(?:\.\d+)?)deg"(?=[^>]*shape="rotated_rect")/g,
-    (_, rotation: string) => `ccwRotation={${rotation}}`,
-  )
-
   const renderedCircuitJson = (await runTscircuitCode(`
-${executableTscircuit}
+${tscircuit}
 
 circuit.add(
   <board width="20mm" height="20mm">
@@ -56,6 +49,7 @@ circuit.add(
         port_hints: ["3"],
         layer: "bottom",
         shape: "rotated_rect",
+        ccw_rotation: 45,
         corner_radius: 0.15,
         is_covered_with_solder_mask: true,
         soldermask_margin: 0.04,

package/tests/test21-silkscreen-path-props-tsx.test.tsx

@@ -0,0 +1,57 @@
+import { expect, test } from "bun:test"
+import { convertCircuitJsonToTscircuit } from "lib"
+
+test.failing("test21 silkscreen path props tsx", async () => {
+  const tscircuit = convertCircuitJsonToTscircuit(circuitJson, {
+    componentName: "Test21Component",
+  })
+
+  expect(tscircuit).toContain('layer="bottom"')
+  expect(tscircuit).toContain("strokeWidth={0.2}")
+})
+
+const circuitJson: any = [
+  {
+    type: "source_component",
+    source_component_id: "generic_0",
+    supplier_part_numbers: {},
+  },
+  {
+    type: "schematic_component",
+    schematic_component_id: "schematic_generic_component_0",
+    source_component_id: "generic_0",
+    center: {
+      x: 0,
+      y: 0,
+    },
+    rotation: 0,
+    size: {
+      width: 0,
+      height: 0,
+    },
+  },
+  {
+    type: "pcb_component",
+    source_component_id: "generic_0",
+    pcb_component_id: "pcb_generic_component_0",
+    layer: "top",
+    center: {
+      x: 0,
+      y: 0,
+    },
+    rotation: 0,
+    width: 2,
+    height: 1,
+  },
+  {
+    type: "pcb_silkscreen_path",
+    pcb_silkscreen_path_id: "pcb_silkscreen_path_0",
+    pcb_component_id: "pcb_generic_component_0",
+    layer: "bottom",
+    route: [
+      { x: -1, y: 1.8 },
+      { x: 1, y: 1.8 },
+    ],
+    stroke_width: 0.2,
+  },
+]

package/tests/test22-silkscreen-path-props-roundtrip.test.tsx

@@ -0,0 +1,78 @@
+import { expect, test } from "bun:test"
+import type { AnyCircuitElement } from "circuit-json"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { runTscircuitCode } from "tscircuit"
+
+test.failing(
+  "test22 silkscreen path props roundtrip",
+  async () => {
+    const tscircuit = convertCircuitJsonToTscircuit(circuitJson, {
+      componentName: "Test22Component",
+    })
+
+    const renderedCircuitJson = (await runTscircuitCode(`
+${tscircuit}
+
+circuit.add(
+  <board width="20mm" height="20mm">
+    <Test22Component />
+  </board>,
+)
+  `)) as AnyCircuitElement[]
+
+    const silkscreenPath = renderedCircuitJson.find(
+      (el) => el.type === "pcb_silkscreen_path",
+    ) as any
+
+    expect(silkscreenPath).toBeDefined()
+    expect(silkscreenPath.layer).toBe("bottom")
+    expect(silkscreenPath.stroke_width).toBe(0.2)
+  },
+  15000,
+)
+
+const circuitJson: any = [
+  {
+    type: "source_component",
+    source_component_id: "generic_0",
+    supplier_part_numbers: {},
+  },
+  {
+    type: "schematic_component",
+    schematic_component_id: "schematic_generic_component_0",
+    source_component_id: "generic_0",
+    center: {
+      x: 0,
+      y: 0,
+    },
+    rotation: 0,
+    size: {
+      width: 0,
+      height: 0,
+    },
+  },
+  {
+    type: "pcb_component",
+    source_component_id: "generic_0",
+    pcb_component_id: "pcb_generic_component_0",
+    layer: "top",
+    center: {
+      x: 0,
+      y: 0,
+    },
+    rotation: 0,
+    width: 2,
+    height: 1,
+  },
+  {
+    type: "pcb_silkscreen_path",
+    pcb_silkscreen_path_id: "pcb_silkscreen_path_0",
+    pcb_component_id: "pcb_generic_component_0",
+    layer: "bottom",
+    route: [
+      { x: -1, y: 1.8 },
+      { x: 1, y: 1.8 },
+    ],
+    stroke_width: 0.2,
+  },
+]