circuit-json-to-tscircuit 0.0.21 → 0.0.23

package/dist/{chunk-3AWPESWI.js → chunk-KF5NKSNK.js}

@@ -5,7 +5,9 @@ var generateFootprintTsx = (circuitJson) => {
   const holes = su(circuitJson).pcb_hole.list();
   const platedHoles = su(circuitJson).pcb_plated_hole.list();
   const smtPads = su(circuitJson).pcb_smtpad.list();
+  const silkscreenLines = su(circuitJson).pcb_silkscreen_line.list();
   const silkscreenPaths = su(circuitJson).pcb_silkscreen_path.list();
+  const silkscreenRects = su(circuitJson).pcb_silkscreen_rect.list();
   const fabricationNotePaths = su(circuitJson).pcb_fabrication_note_path.list();
   const fabricationNoteTexts = su(circuitJson).pcb_fabrication_note_text.list();
   const fabricationNoteRects = su(circuitJson).pcb_fabrication_note_rect.list();
@@ -59,6 +61,41 @@ var generateFootprintTsx = (circuitJson) => {
       `<silkscreenpath route={${JSON.stringify(silkscreenPath.route)}} />`
     );
   }
+  for (const silkscreenRect of silkscreenRects) {
+    const center = silkscreenRect.center ?? { x: 0, y: 0 };
+    const attrs = [
+      `pcbX={${center.x}}`,
+      `pcbY={${center.y}}`,
+      `width={${silkscreenRect.width ?? 0}}`,
+      `height={${silkscreenRect.height ?? 0}}`,
+      `layer="${silkscreenRect.layer}"`
+    ];
+    if (silkscreenRect.stroke_width !== void 0) {
+      attrs.push(`strokeWidth={${silkscreenRect.stroke_width}}`);
+    }
+    if (silkscreenRect.is_filled !== void 0) {
+      attrs.push(`filled={${silkscreenRect.is_filled}}`);
+    }
+    if (silkscreenRect.corner_radius !== void 0) {
+      attrs.push(`cornerRadius={${silkscreenRect.corner_radius}}`);
+    }
+    elementStrings.push(`<silkscreenrect ${attrs.join(" ")} />`);
+  }
+  for (const silkscreenLine of silkscreenLines) {
+    const attrs = [
+      `x1={${silkscreenLine.x1 ?? 0}}`,
+      `y1={${silkscreenLine.y1 ?? 0}}`,
+      `x2={${silkscreenLine.x2 ?? 0}}`,
+      `y2={${silkscreenLine.y2 ?? 0}}`
+    ];
+    if (silkscreenLine.stroke_width !== void 0) {
+      attrs.push(`strokeWidth={${silkscreenLine.stroke_width}}`);
+    }
+    if (silkscreenLine.layer === "bottom") {
+      attrs.push(`layer="bottom"`);
+    }
+    elementStrings.push(`<silkscreenline ${attrs.join(" ")} />`);
+  }
   for (const fabPath of fabricationNotePaths) {
     const attrs = [`route={${JSON.stringify(fabPath.route)}}`];
     if ("stroke_width" in fabPath && fabPath.stroke_width !== void 0) {

package/dist/cli/main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-3AWPESWI.js";
+} from "../chunk-KF5NKSNK.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.20",
+  version: "0.0.22",
   scripts: {
     build: "tsup-node lib/index.ts cli/main.ts --format esm --dts",
     test: "bun test",

package/dist/lib/index.js

@@ -1,6 +1,6 @@
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-3AWPESWI.js";
+} from "../chunk-KF5NKSNK.js";
 export {
   convertCircuitJsonToTscircuit
 };

package/lib/generate-footprint-tsx.tsx

@@ -8,7 +8,9 @@ export const generateFootprintTsx = (
   const holes = su(circuitJson).pcb_hole.list()
   const platedHoles = su(circuitJson).pcb_plated_hole.list()
   const smtPads = su(circuitJson).pcb_smtpad.list()
+  const silkscreenLines = su(circuitJson).pcb_silkscreen_line.list()
   const silkscreenPaths = su(circuitJson).pcb_silkscreen_path.list()
+  const silkscreenRects = su(circuitJson).pcb_silkscreen_rect.list()
   const fabricationNotePaths = su(circuitJson).pcb_fabrication_note_path.list()
   const fabricationNoteTexts = su(circuitJson).pcb_fabrication_note_text.list()
   const fabricationNoteRects = su(circuitJson).pcb_fabrication_note_rect.list()
@@ -72,6 +74,48 @@ export const generateFootprintTsx = (
     )
   }
 
+  for (const silkscreenRect of silkscreenRects) {
+    const center = silkscreenRect.center ?? { x: 0, y: 0 }
+    const attrs = [
+      `pcbX={${center.x}}`,
+      `pcbY={${center.y}}`,
+      `width={${silkscreenRect.width ?? 0}}`,
+      `height={${silkscreenRect.height ?? 0}}`,
+      `layer="${silkscreenRect.layer}"`,
+    ]
+
+    if (silkscreenRect.stroke_width !== undefined) {
+      attrs.push(`strokeWidth={${silkscreenRect.stroke_width}}`)
+    }
+    if (silkscreenRect.is_filled !== undefined) {
+      attrs.push(`filled={${silkscreenRect.is_filled}}`)
+    }
+    if (silkscreenRect.corner_radius !== undefined) {
+      attrs.push(`cornerRadius={${silkscreenRect.corner_radius}}`)
+    }
+
+    elementStrings.push(`<silkscreenrect ${attrs.join(" ")} />`)
+  }
+
+  for (const silkscreenLine of silkscreenLines) {
+    const attrs = [
+      `x1={${silkscreenLine.x1 ?? 0}}`,
+      `y1={${silkscreenLine.y1 ?? 0}}`,
+      `x2={${silkscreenLine.x2 ?? 0}}`,
+      `y2={${silkscreenLine.y2 ?? 0}}`,
+    ]
+
+    if (silkscreenLine.stroke_width !== undefined) {
+      attrs.push(`strokeWidth={${silkscreenLine.stroke_width}}`)
+    }
+
+    if (silkscreenLine.layer === "bottom") {
+      attrs.push(`layer="bottom"`)
+    }
+
+    elementStrings.push(`<silkscreenline ${attrs.join(" ")} />`)
+  }
+
   for (const fabPath of fabricationNotePaths) {
     const attrs = [`route={${JSON.stringify(fabPath.route)}}`]
 

package/package.json

@@ -6,7 +6,7 @@
     "./cli": "./dist/cli/main.js"
   },
   "type": "module",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "scripts": {
     "build": "tsup-node lib/index.ts cli/main.ts --format esm --dts",
     "test": "bun test",

package/tests/__snapshots__/test12-support-silkscreen-line-pcb.snap.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="600" data-software-used-string="@tscircuit/core@0.0.1090"><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="127.27272727272725" y="27.272727272727252" width="545.4545454545455" height="545.4545454545455" data-type="pcb_boundary" data-pcb-layer="global"/><path class="pcb-board" d="M 127.27272727272725 572.7272727272727 L 672.7272727272727 572.7272727272727 L 672.7272727272727 27.272727272727252 L 127.27272727272725 27.272727272727252 Z" fill="none" stroke="rgba(255, 255, 255, 0.5)" stroke-width="2.7272727272727275" data-type="pcb_board" data-pcb-layer="board"/><line x1="372.72727272727275" y1="349.0909090909091" x2="427.27272727272725" y2="349.0909090909091" stroke="#5da9e9" stroke-width="3.2727272727272725" class="pcb-silkscreen-line pcb-silkscreen-bottom" data-pcb-silkscreen-line-id="pcb_silkscreen_line_1" data-type="pcb_silkscreen_line" data-pcb-layer="bottom"/><line x1="372.72727272727275" y1="349.0909090909091" x2="427.27272727272725" y2="349.0909090909091" stroke="#5da9e9" stroke-width="3.2727272727272725" class="pcb-silkscreen-line pcb-silkscreen-bottom" data-pcb-silkscreen-line-id="pcb_silkscreen_line_3" data-type="pcb_silkscreen_line" data-pcb-layer="bottom"/><line x1="372.72727272727275" y1="250.9090909090909" x2="427.27272727272725" y2="250.9090909090909" stroke="#f2eda1" stroke-width="3.2727272727272725" class="pcb-silkscreen-line pcb-silkscreen-top" data-pcb-silkscreen-line-id="pcb_silkscreen_line_0" data-type="pcb_silkscreen_line" data-pcb-layer="top"/><line x1="372.72727272727275" y1="250.9090909090909" x2="427.27272727272725" y2="250.9090909090909" stroke="#f2eda1" stroke-width="3.2727272727272725" class="pcb-silkscreen-line pcb-silkscreen-top" data-pcb-silkscreen-line-id="pcb_silkscreen_line_2" data-type="pcb_silkscreen_line" data-pcb-layer="top"/></svg>

package/tests/__snapshots__/test13-support-silkscreen-rect-pcb.snap.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="800" height="600" data-software-used-string="@tscircuit/core@0.0.1090"><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="127.27272727272725" y="27.272727272727252" width="545.4545454545455" height="545.4545454545455" data-type="pcb_boundary" data-pcb-layer="global"/><path class="pcb-board" d="M 127.27272727272725 572.7272727272727 L 672.7272727272727 572.7272727272727 L 672.7272727272727 27.272727272727252 L 127.27272727272725 27.272727272727252 Z" fill="none" stroke="rgba(255, 255, 255, 0.5)" stroke-width="2.7272727272727275" data-type="pcb_board" data-pcb-layer="board"/><rect x="380.90909090909093" y="286.3636363636363" width="38.18181818181818" height="21.81818181818182" class="pcb-silkscreen-rect pcb-silkscreen-top" data-pcb-silkscreen-rect-id="pcb_silkscreen_rect_0" data-type="pcb_silkscreen_rect" data-pcb-layer="top" rx="2.181818181818182" ry="2.181818181818182" fill="#f2eda1" stroke="#f2eda1" stroke-width="3.2727272727272725"/><rect x="380.90909090909093" y="286.3636363636363" width="38.18181818181818" height="21.81818181818182" class="pcb-silkscreen-rect pcb-silkscreen-top" data-pcb-silkscreen-rect-id="pcb_silkscreen_rect_1" data-type="pcb_silkscreen_rect" data-pcb-layer="top" rx="2.181818181818182" ry="2.181818181818182" fill="#f2eda1" stroke="#f2eda1" stroke-width="3.2727272727272725"/></svg>

package/tests/test12-support-silkscreen-line.test.tsx

@@ -0,0 +1,94 @@
+import { expect, test } from "bun:test"
+import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
+import type { AnyCircuitElement } from "circuit-json"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { runTscircuitCode } from "tscircuit"
+
+test("test12 support silkscreen line", async () => {
+  const tscircuit = convertCircuitJsonToTscircuit(circuitJson, {
+    componentName: "Test12Component",
+  })
+
+  expect(tscircuit).toMatchInlineSnapshot(`
+    "import { type ChipProps } from "tscircuit"
+    export const Test12Component = (props: ChipProps) => (
+      <chip
+        footprint={<footprint>
+            <silkscreenline x1={-1} y1={1.8} x2={1} y2={1.8} strokeWidth={0.12} />
+    <silkscreenline x1={-1} y1={-1.8} x2={1} y2={-1.8} strokeWidth={0.12} layer="bottom" />
+          </footprint>}
+        {...props}
+      />
+    )"
+  `)
+
+  const renderedCircuitJson = (await runTscircuitCode(`
+${tscircuit}
+
+circuit.add(
+  <board width="20mm" height="20mm">
+    <Test12Component />
+  </board>,
+)
+  `)) as AnyCircuitElement[]
+
+  const pcbSvg = convertCircuitJsonToPcbSvg(renderedCircuitJson)
+  await expect(pcbSvg).toMatchSvgSnapshot(import.meta.path, "pcb")
+})
+
+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_line",
+    pcb_silkscreen_line_id: "pcb_silkscreen_line_0",
+    pcb_component_id: "pcb_generic_component_0",
+    layer: "top",
+    x1: -1,
+    y1: 1.8,
+    x2: 1,
+    y2: 1.8,
+    stroke_width: 0.12,
+  },
+  {
+    type: "pcb_silkscreen_line",
+    pcb_silkscreen_line_id: "pcb_silkscreen_line_1",
+    pcb_component_id: "pcb_generic_component_0",
+    layer: "bottom",
+    x1: -1,
+    y1: -1.8,
+    x2: 1,
+    y2: -1.8,
+    stroke_width: 0.12,
+  },
+]

package/tests/test13-support-silkscreen-rect.test.tsx

@@ -0,0 +1,85 @@
+import { expect, test } from "bun:test"
+import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { runTscircuitCode } from "tscircuit"
+
+test("test13 support silkscreen rect", async () => {
+  const tscircuit = convertCircuitJsonToTscircuit(circuitJson, {
+    componentName: "Test13Component",
+  })
+
+  expect(tscircuit).toMatchInlineSnapshot(`
+    "import { type ChipProps } from "tscircuit"
+    export const Test13Component = (props: ChipProps) => (
+      <chip
+        footprint={<footprint>
+            <silkscreenrect pcbX={0} pcbY={0.1} width={1.4} height={0.8} layer="top" strokeWidth={0.12} filled={true} cornerRadius={0.08} />
+          </footprint>}
+        {...props}
+      />
+    )"
+  `)
+
+  const renderedCircuitJson = (await runTscircuitCode(`
+${tscircuit}
+
+circuit.add(
+  <board width="20mm" height="20mm">
+    <Test13Component />
+  </board>,
+)
+  `)) as any[]
+
+  const pcbSvg = convertCircuitJsonToPcbSvg(renderedCircuitJson)
+  await expect(pcbSvg).toMatchSvgSnapshot(import.meta.path, "pcb")
+})
+
+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: 1.1,
+    height: 0.4,
+  },
+  {
+    type: "pcb_silkscreen_rect",
+    pcb_silkscreen_rect_id: "pcb_silkscreen_rect_0",
+    pcb_component_id: "pcb_generic_component_0",
+    layer: "top",
+    center: {
+      x: 0,
+      y: 0.1,
+    },
+    width: 1.4,
+    height: 0.8,
+    stroke_width: 0.12,
+    is_filled: true,
+    corner_radius: 0.08,
+  },
+]