circuit-json-to-tscircuit 0.0.47 → 0.0.49

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

@@ -445,9 +445,14 @@ var convertSilkscreen = (circuitJson) => {
   const silkscreenCircles = su9(circuitJson).pcb_silkscreen_circle.list();
   const elementStrings = [];
   for (const silkscreenPath of silkscreenPaths) {
-    elementStrings.push(
-      `<silkscreenpath route={${JSON.stringify(silkscreenPath.route)}} />`
-    );
+    const attrs = [`route={${JSON.stringify(silkscreenPath.route)}}`];
+    if (silkscreenPath.stroke_width !== void 0) {
+      attrs.push(`strokeWidth={${silkscreenPath.stroke_width}}`);
+    }
+    if (silkscreenPath.layer === "bottom") {
+      attrs.push(`layer="bottom"`);
+    }
+    elementStrings.push(`<silkscreenpath ${attrs.join(" ")} />`);
   }
   for (const silkscreenRect of silkscreenRects) {
     const center = silkscreenRect.center ?? { x: 0, y: 0 };

package/dist/cli/main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   convertCircuitJsonToTscircuit
-} from "../chunk-E24YLRWU.js";
+} from "../chunk-YHGRHULT.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.46",
+  version: "0.0.48",
   repository: {
     type: "git",
     url: "https://github.com/tscircuit/circuit-json-to-tscircuit.git"
@@ -42,6 +42,7 @@ var package_default = {
     commander: "^13.1.0",
     prettier: "^3.9.5",
     shiki: "^4.3.1",
+    "stack-svgs": "^0.0.1",
     tscircuit: "^0.0.1873",
     tsup: "^8.3.5"
   },

package/dist/lib/index.js

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

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

@@ -9,9 +9,16 @@ export const convertSilkscreen: FootprintElementConverter = (circuitJson) => {
   const elementStrings: string[] = []
 
   for (const silkscreenPath of silkscreenPaths) {
-    elementStrings.push(
-      `<silkscreenpath route={${JSON.stringify(silkscreenPath.route)}} />`,
-    )
+    const attrs = [`route={${JSON.stringify(silkscreenPath.route)}}`]
+
+    if (silkscreenPath.stroke_width !== undefined) {
+      attrs.push(`strokeWidth={${silkscreenPath.stroke_width}}`)
+    }
+    if (silkscreenPath.layer === "bottom") {
+      attrs.push(`layer="bottom"`)
+    }
+
+    elementStrings.push(`<silkscreenpath ${attrs.join(" ")} />`)
   }
 
   for (const silkscreenRect of silkscreenRects) {

package/package.json

@@ -6,7 +6,7 @@
     "./cli": "./dist/cli/main.js"
   },
   "type": "module",
-  "version": "0.0.47",
+  "version": "0.0.49",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/circuit-json-to-tscircuit.git"
@@ -32,6 +32,7 @@
     "commander": "^13.1.0",
     "prettier": "^3.9.5",
     "shiki": "^4.3.1",
+    "stack-svgs": "^0.0.1",
     "tscircuit": "^0.0.1873",
     "tsup": "^8.3.5"
   },

package/tests/cli/cli-circuit-json-to-tsx.test.tsx

@@ -24,8 +24,8 @@ test("should convert sample circuit.json to TSX", async () => {
         footprint={<footprint>
             <smtpad portHints={["pin2"]} pcbX="0.753364mm" pcbY="0mm" layer="top" coveredWithSolderMask={false} width="0.8064754mm" height="0.8640064mm" shape="rect" />
     <smtpad portHints={["pin1"]} pcbX="-0.753364mm" pcbY="0mm" layer="top" coveredWithSolderMask={false} width="0.8064754mm" height="0.8640064mm" shape="rect" />
-    <silkscreenpath route={[{"x":0.42621199999996406,"y":-0.6606031999999686},{"x":1.3850873999999749,"y":-0.6606031999999686},{"x":1.3850873999999749,"y":0.6606031999999686},{"x":0.42621199999996406,"y":0.6606031999999686}]} />
-    <silkscreenpath route={[{"x":-0.42621200000007775,"y":-0.6606031999999686},{"x":-1.3850874000000886,"y":-0.6606031999999686},{"x":-1.3850874000000886,"y":0.6606031999999686},{"x":-0.42621200000007775,"y":0.6606031999999686}]} />
+    <silkscreenpath route={[{"x":0.42621199999996406,"y":-0.6606031999999686},{"x":1.3850873999999749,"y":-0.6606031999999686},{"x":1.3850873999999749,"y":0.6606031999999686},{"x":0.42621199999996406,"y":0.6606031999999686}]} strokeWidth={0.1} />
+    <silkscreenpath route={[{"x":-0.42621200000007775,"y":-0.6606031999999686},{"x":-1.3850874000000886,"y":-0.6606031999999686},{"x":-1.3850874000000886,"y":0.6606031999999686},{"x":-0.42621200000007775,"y":0.6606031999999686}]} strokeWidth={0.1} />
     <silkscreentext pcbX={-0.0127} pcbY={1.6604} anchorAlignment="center" fontSize={1} font="tscircuit2024" pcbRotation="0deg" layer="top" text="unnamed_chip1" />
     <courtyardoutline outline={[{"x":-1.647000000000162,"y":0.9103999999999814},{"x":1.6216000000000577,"y":0.9103999999999814},{"x":1.6216000000000577,"y":-0.9103999999998678},{"x":-1.647000000000162,"y":-0.9103999999998678},{"x":-1.647000000000162,"y":0.9103999999999814}]} layer="top" />
           </footprint>}

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

@@ -0,0 +1,86 @@
+import { readFile } from "node:fs/promises"
+import { join } from "node:path"
+import { gunzipSync } from "node:zlib"
+import type { CircuitJson } from "circuit-json"
+import {
+  convertCircuitJsonToPcbSvg,
+  convertCircuitJsonToSchematicSvg,
+} from "circuit-to-svg"
+import { convertCircuitJsonToTscircuit } from "lib"
+import { stackSvgsHorizontally } from "stack-svgs"
+import { runTscircuitCode } from "tscircuit"
+
+interface TiEvmRoundtripResult {
+  generatedTscircuit: string
+  pcbComparisonSvg: string
+  schematicComparisonSvg: string
+}
+
+export async function createTiEvmRoundtrip({
+  componentName,
+  fixtureName,
+}: {
+  componentName: string
+  fixtureName: string
+}): Promise<TiEvmRoundtripResult> {
+  const compressedFixture = await readFile(
+    join(import.meta.dir, "ti-evms", `${fixtureName}.circuit.json.gz`),
+  )
+  const sourceCircuitJson = JSON.parse(
+    gunzipSync(compressedFixture).toString("utf8"),
+  ) as CircuitJson
+  const generatedTscircuit = convertCircuitJsonToTscircuit(sourceCircuitJson, {
+    componentName,
+  })
+  const renderedCircuitJson = (await runTscircuitCode(
+    generatedTscircuit,
+  )) as CircuitJson
+
+  const sourcePcbSvg = convertCircuitJsonToPcbSvg(sourceCircuitJson, {
+    matchBoardAspectRatio: true,
+  })
+  const renderedPcbSvg = convertCircuitJsonToPcbSvg(renderedCircuitJson, {
+    matchBoardAspectRatio: true,
+  })
+  const sourceSchematicSvg = convertCircuitJsonToSchematicSvg(sourceCircuitJson)
+  const renderedSchematicSvg =
+    convertCircuitJsonToSchematicSvg(renderedCircuitJson)
+
+  return {
+    generatedTscircuit,
+    pcbComparisonSvg: createComparisonSvg({
+      fixtureName,
+      kind: "PCB",
+      renderedSvg: renderedPcbSvg,
+      sourceSvg: sourcePcbSvg,
+    }),
+    schematicComparisonSvg: createComparisonSvg({
+      fixtureName,
+      kind: "schematic",
+      renderedSvg: renderedSchematicSvg,
+      sourceSvg: sourceSchematicSvg,
+    }),
+  }
+}
+
+function createComparisonSvg({
+  fixtureName,
+  kind,
+  renderedSvg,
+  sourceSvg,
+}: {
+  fixtureName: string
+  kind: "PCB" | "schematic"
+  renderedSvg: string
+  sourceSvg: string
+}): string {
+  return stackSvgsHorizontally([sourceSvg, renderedSvg], {
+    gap: 24,
+    normalizeSize: true,
+    targetSize: 800,
+    rootAttributes: {
+      "aria-label": `${fixtureName} ${kind}: source Circuit JSON on left, generated tscircuit render on right`,
+      role: "img",
+    },
+  })
+}

package/tests/fixtures/ti-evms/README.md

@@ -0,0 +1,10 @@
+# TI EVM Circuit JSON fixtures
+
+These fixtures contain the PCB and primary electrical schematic converted from
+Texas Instruments' published Altium design files. They were generated with
+`tscircuit/altium-to-circuit-json` at commit
+`9a578b5762e1dcca06e6d3f84f1d2950d0acc301`.
+
+The upstream files and checksums are maintained in that repository's
+`scripts/references/reference-manifest.ts`. The gzip files only avoid committing
+several megabytes of repetitive JSON; tests expand them before conversion.

package/tests/test1-basic-circuit.test.tsx

@@ -1,7 +1,7 @@
-import { test, expect } from "bun:test"
-import { convertCircuitJsonToTscircuit } from "lib/index"
+import { expect, test } from "bun:test"
 import { readFile } from "node:fs/promises"
 import { join } from "node:path"
+import { convertCircuitJsonToTscircuit } from "lib/index"
 
 declare module "bun:test" {
   interface Matchers<T = unknown> {
@@ -30,8 +30,8 @@ test("test1 basic circuit", async () => {
         footprint={<footprint>
             <smtpad portHints={["pin2"]} pcbX="0.753364mm" pcbY="0mm" layer="top" coveredWithSolderMask={false} width="0.8064754mm" height="0.8640064mm" shape="rect" />
     <smtpad portHints={["pin1"]} pcbX="-0.753364mm" pcbY="0mm" layer="top" coveredWithSolderMask={false} width="0.8064754mm" height="0.8640064mm" shape="rect" />
-    <silkscreenpath route={[{"x":0.42621199999996406,"y":-0.6606031999999686},{"x":1.3850873999999749,"y":-0.6606031999999686},{"x":1.3850873999999749,"y":0.6606031999999686},{"x":0.42621199999996406,"y":0.6606031999999686}]} />
-    <silkscreenpath route={[{"x":-0.42621200000007775,"y":-0.6606031999999686},{"x":-1.3850874000000886,"y":-0.6606031999999686},{"x":-1.3850874000000886,"y":0.6606031999999686},{"x":-0.42621200000007775,"y":0.6606031999999686}]} />
+    <silkscreenpath route={[{"x":0.42621199999996406,"y":-0.6606031999999686},{"x":1.3850873999999749,"y":-0.6606031999999686},{"x":1.3850873999999749,"y":0.6606031999999686},{"x":0.42621199999996406,"y":0.6606031999999686}]} strokeWidth={0.1} />
+    <silkscreenpath route={[{"x":-0.42621200000007775,"y":-0.6606031999999686},{"x":-1.3850874000000886,"y":-0.6606031999999686},{"x":-1.3850874000000886,"y":0.6606031999999686},{"x":-0.42621200000007775,"y":0.6606031999999686}]} strokeWidth={0.1} />
     <silkscreentext pcbX={-0.0127} pcbY={1.6604} anchorAlignment="center" fontSize={1} font="tscircuit2024" pcbRotation="0deg" layer="top" text="unnamed_chip1" />
     <courtyardoutline outline={[{"x":-1.647000000000162,"y":0.9103999999999814},{"x":1.6216000000000577,"y":0.9103999999999814},{"x":1.6216000000000577,"y":-0.9103999999998678},{"x":-1.647000000000162,"y":-0.9103999999998678},{"x":-1.647000000000162,"y":0.9103999999999814}]} layer="top" />
           </footprint>}

package/tests/test2-get-component-template.test.tsx

@@ -1,4 +1,4 @@
-import { test, expect } from "bun:test"
+import { expect, test } from "bun:test"
 import { readFile } from "node:fs/promises"
 import { join } from "node:path"
 import { getComponentUsingTemplate } from "lib/get-component-using-template"
@@ -38,8 +38,8 @@ test("test2 getComponentUsingTemplate", async () => {
         footprint={<footprint>
             <smtpad portHints={["pin2"]} pcbX="0.753364mm" pcbY="0mm" layer="top" coveredWithSolderMask={false} width="0.8064754mm" height="0.8640064mm" shape="rect" />
     <smtpad portHints={["pin1"]} pcbX="-0.753364mm" pcbY="0mm" layer="top" coveredWithSolderMask={false} width="0.8064754mm" height="0.8640064mm" shape="rect" />
-    <silkscreenpath route={[{"x":0.42621199999996406,"y":-0.6606031999999686},{"x":1.3850873999999749,"y":-0.6606031999999686},{"x":1.3850873999999749,"y":0.6606031999999686},{"x":0.42621199999996406,"y":0.6606031999999686}]} />
-    <silkscreenpath route={[{"x":-0.42621200000007775,"y":-0.6606031999999686},{"x":-1.3850874000000886,"y":-0.6606031999999686},{"x":-1.3850874000000886,"y":0.6606031999999686},{"x":-0.42621200000007775,"y":0.6606031999999686}]} />
+    <silkscreenpath route={[{"x":0.42621199999996406,"y":-0.6606031999999686},{"x":1.3850873999999749,"y":-0.6606031999999686},{"x":1.3850873999999749,"y":0.6606031999999686},{"x":0.42621199999996406,"y":0.6606031999999686}]} strokeWidth={0.1} />
+    <silkscreenpath route={[{"x":-0.42621200000007775,"y":-0.6606031999999686},{"x":-1.3850874000000886,"y":-0.6606031999999686},{"x":-1.3850874000000886,"y":0.6606031999999686},{"x":-0.42621200000007775,"y":0.6606031999999686}]} strokeWidth={0.1} />
     <silkscreentext pcbX={-0.0127} pcbY={1.6604} anchorAlignment="center" fontSize={1} font="tscircuit2024" pcbRotation="0deg" layer="top" text="unnamed_chip1" />
     <courtyardoutline outline={[{"x":-1.647000000000162,"y":0.9103999999999814},{"x":1.6216000000000577,"y":0.9103999999999814},{"x":1.6216000000000577,"y":-0.9103999999998678},{"x":-1.647000000000162,"y":-0.9103999999998678},{"x":-1.647000000000162,"y":0.9103999999999814}]} layer="top" />
           </footprint>}

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

@@ -1,7 +1,7 @@
 import { expect, test } from "bun:test"
 import { convertCircuitJsonToTscircuit } from "lib"
 
-test.failing("test21 silkscreen path props tsx", async () => {
+test("test21 silkscreen path props tsx", async () => {
   const tscircuit = convertCircuitJsonToTscircuit(circuitJson, {
     componentName: "Test21Component",
   })

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

@@ -3,14 +3,12 @@ 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",
-    })
+test("test22 silkscreen path props roundtrip", async () => {
+  const tscircuit = convertCircuitJsonToTscircuit(circuitJson, {
+    componentName: "Test22Component",
+  })
 
-    const renderedCircuitJson = (await runTscircuitCode(`
+  const renderedCircuitJson = (await runTscircuitCode(`
 ${tscircuit}
 
 circuit.add(
@@ -20,16 +18,14 @@ circuit.add(
 )
   `)) as AnyCircuitElement[]
 
-    const silkscreenPath = renderedCircuitJson.find(
-      (el) => el.type === "pcb_silkscreen_path",
-    ) as any
+  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,
-)
+  expect(silkscreenPath).toBeDefined()
+  expect(silkscreenPath.layer).toBe("bottom")
+  expect(silkscreenPath.stroke_width).toBe(0.2)
+}, 15000)
 
 const circuitJson: any = [
   {

package/tests/test3-kicad-mod-circuit-json-example.test.tsx

@@ -1,4 +1,4 @@
-import { test, expect } from "bun:test"
+import { expect, test } from "bun:test"
 import { convertCircuitJsonToTscircuit } from "lib"
 
 test("test3 kicad mod circuit json example", async () => {
@@ -66,14 +66,14 @@ test("test3 kicad mod circuit json example", async () => {
     <smtpad portHints={["13"]} pcbX="8.337mm" pcbY="5.08mm" layer="top" width="1.626mm" height="1.208mm" shape="rect" />
     <smtpad portHints={["14"]} pcbX="8.278mm" pcbY="7.62mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
     <smtpad portHints={["14"]} pcbX="8.278mm" pcbY="7.62mm" layer="top" width="1.626mm" height="1.325mm" shape="rect" />
-    <silkscreenpath route={[{"x":-8.89,"y":-8.509},{"x":-8.89,"y":8.636}]} />
-    <silkscreenpath route={[{"x":-6.985,"y":-10.414},{"x":6.985,"y":-10.414}]} />
-    <silkscreenpath route={[{"x":6.985,"y":10.541},{"x":-6.985,"y":10.541}]} />
-    <silkscreenpath route={[{"x":8.89,"y":-8.509},{"x":8.89,"y":8.636}]} />
-    <silkscreenpath route={[{"x":-8.89,"y":8.636},{"x":-8.634777964987212,"y":9.588499698293818},{"x":-7.937499698293819,"y":10.285777964987211},{"x":-6.985,"y":10.541}]} />
-    <silkscreenpath route={[{"x":-6.985,"y":-10.414},{"x":-7.937499698293818,"y":-10.158777964987209},{"x":-8.63477796498721,"y":-9.461499698293817},{"x":-8.89,"y":-8.509}]} />
-    <silkscreenpath route={[{"x":6.985,"y":10.541},{"x":7.937499698293818,"y":10.285777964987211},{"x":8.63477796498721,"y":9.588499698293818},{"x":8.889999999999999,"y":8.636}]} />
-    <silkscreenpath route={[{"x":8.89,"y":-8.509},{"x":8.63477796498721,"y":-9.461499698293817},{"x":7.937499698293818,"y":-10.158777964987209},{"x":6.985,"y":-10.413999999999998}]} />
+    <silkscreenpath route={[{"x":-8.89,"y":-8.509},{"x":-8.89,"y":8.636}]} strokeWidth={0.1} />
+    <silkscreenpath route={[{"x":-6.985,"y":-10.414},{"x":6.985,"y":-10.414}]} strokeWidth={0.1} />
+    <silkscreenpath route={[{"x":6.985,"y":10.541},{"x":-6.985,"y":10.541}]} strokeWidth={0.1} />
+    <silkscreenpath route={[{"x":8.89,"y":-8.509},{"x":8.89,"y":8.636}]} strokeWidth={0.1} />
+    <silkscreenpath route={[{"x":-8.89,"y":8.636},{"x":-8.634777964987212,"y":9.588499698293818},{"x":-7.937499698293819,"y":10.285777964987211},{"x":-6.985,"y":10.541}]} strokeWidth={0.1} />
+    <silkscreenpath route={[{"x":-6.985,"y":-10.414},{"x":-7.937499698293818,"y":-10.158777964987209},{"x":-8.63477796498721,"y":-9.461499698293817},{"x":-8.89,"y":-8.509}]} strokeWidth={0.1} />
+    <silkscreenpath route={[{"x":6.985,"y":10.541},{"x":7.937499698293818,"y":10.285777964987211},{"x":8.63477796498721,"y":9.588499698293818},{"x":8.889999999999999,"y":8.636}]} strokeWidth={0.1} />
+    <silkscreenpath route={[{"x":8.89,"y":-8.509},{"x":8.63477796498721,"y":-9.461499698293817},{"x":7.937499698293818,"y":-10.158777964987209},{"x":6.985,"y":-10.413999999999998}]} strokeWidth={0.1} />
     <fabricationnotetext pcbX={-8} pcbY={11.5} anchorAlignment="center" text="REF**" font="tscircuit2024" fontSize={1.27} />
     <fabricationnotetext pcbX={0} pcbY={0} anchorAlignment="center" text="XIAO-Add-On" font="tscircuit2024" fontSize={1.27} />
           </footprint>}