@tscircuit/eval 0.0.338 → 0.0.340

package/lib/getPlatformConfig.ts

@@ -1,6 +1,6 @@
 import type { PlatformConfig } from "@tscircuit/props"
 import { jlcPartsEngine } from "@tscircuit/parts-engine"
-
+import { parseKicadModToCircuitJson } from "kicad-component-converter"
 const KICAD_FOOTPRINT_CACHE_URL = "https://kicad-mod-cache.tscircuit.com"
 
 export const getPlatformConfig = (): PlatformConfig => ({
@@ -25,4 +25,18 @@ export const getPlatformConfig = (): PlatformConfig => ({
       }
     },
   },
+  footprintFileParserMap: {
+    kicad_mod: {
+      loadFromUrl: async (url: string) => {
+        const kicadJson = await parseKicadModToCircuitJson(
+          atob(url.replace("data:text/plain;base64,", "")),
+        )
+        return {
+          footprintCircuitJson: Array.isArray(kicadJson)
+            ? kicadJson
+            : [kicadJson],
+        }
+      },
+    },
+  },
 })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/eval",
   "main": "dist/lib/index.js",
-  "version": "0.0.338",
+  "version": "0.0.340",
   "type": "module",
   "scripts": {
     "build": "bun run build:lib && bun run build:webworker && bun run build:blob-url && bun run build:runner && bun run build:worker-wrapper",
@@ -66,12 +66,11 @@
     "@tscircuit/math-utils": "^0.0.21",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/parts-engine": "^0.0.11",
-    "@tscircuit/props": "0.0.335",
+    "@tscircuit/props": "^0.0.337",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.38",
     "@tscircuit/simple-3d-svg": "^0.0.41",
-    "sucrase": "^3.35.0",
     "@types/bun": "^1.2.16",
     "@types/debug": "^4.1.12",
     "@types/react": "^19.1.8",
@@ -93,6 +92,7 @@
     "flatbush": "^4.5.0",
     "graphics-debug": "^0.0.60",
     "howfat": "^0.3.8",
+    "kicad-component-converter": "^0.1.19",
     "live-server": "^1.2.2",
     "looks-same": "^9.0.1",
     "minicssgrid": "^0.0.9",
@@ -100,6 +100,7 @@
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "schematic-symbols": "^0.0.202",
+    "sucrase": "^3.35.0",
     "ts-expect": "^1.3.0",
     "tsup": "^8.2.4"
   },

package/tests/examples/__snapshots__/example20-kicad-import.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.747"><style></style><rect class="boundary" x="0" y="0" fill="#000" width="800" height="600"/><rect class="pcb-boundary" fill="none" stroke="#fff" stroke-width="0.3" x="150" y="50" width="500" height="500"/><path class="pcb-board" d="M 150 550 L 650 550 L 650 50 L 150 50 Z" fill="none" stroke="rgba(255, 255, 255, 0.5)" stroke-width="5"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="361" y="284" width="27" height="32" data-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="412" y="284" width="27" height="32" data-layer="top"/><path class="pcb-silkscreen pcb-silkscreen-top" d="M 392.31795 281 L 407.68205 281" fill="none" stroke="#f2eda1" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" data-pcb-component-id="pcb_component_0" data-pcb-silkscreen-path-id="pcb_silkscreen_path_0"/><path class="pcb-silkscreen pcb-silkscreen-top" d="M 392.31795 319 L 407.68205 319" fill="none" stroke="#f2eda1" stroke-width="6" stroke-linecap="round" stroke-linejoin="round" data-pcb-component-id="pcb_component_0" data-pcb-silkscreen-path-id="pcb_silkscreen_path_1"/><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="73.5" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,400,241.5)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_component_0" stroke="none">U1</text><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="73.5" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,400,358.5)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_component_0" stroke="none">U1</text></svg>

package/tests/examples/example20-kicad-import.test.tsx

@@ -0,0 +1,191 @@
+import { CircuitRunner } from "lib/index"
+import { test } from "bun:test"
+import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
+import { expect } from "bun:test"
+
+test(
+  "example20-kicad-direct-import",
+  async () => {
+    const runner = new CircuitRunner()
+
+    await runner.executeWithFsMap({
+      entrypoint: "index.tsx",
+      fsMap: {
+        "index.tsx": `
+			import kicadMod from "./poly.kicad_mod"
+
+			circuit.add(
+			  <board width="10mm" height="10mm">
+				<chip
+				  name="U1"
+				  footprint={kicadMod}
+				/>
+			  </board>
+			)
+			`,
+        "poly.kicad_mod": `(footprint "R_0402_1005Metric"
+		(version 20241229)
+		(generator "kicad-footprint-generator")
+		(layer "F.Cu")
+		(descr "Resistor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator")
+		(tags "resistor")
+		(property "Reference" "REF**"
+			(at 0 -1.17 0)
+			(layer "F.SilkS")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
+		)
+		(property "Value" "R_0402_1005Metric"
+			(at 0 1.17 0)
+			(layer "F.Fab")
+			(effects
+				(font
+					(size 1 1)
+					(thickness 0.15)
+				)
+			)
+		)
+		(attr smd)
+		(fp_line
+			(start -0.153641 -0.38)
+			(end 0.153641 -0.38)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+		)
+		(fp_line
+			(start -0.153641 0.38)
+			(end 0.153641 0.38)
+			(stroke
+				(width 0.12)
+				(type solid)
+			)
+			(layer "F.SilkS")
+		)
+		(fp_line
+			(start -0.93 -0.47)
+			(end 0.93 -0.47)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+		)
+		(fp_line
+			(start -0.93 0.47)
+			(end -0.93 -0.47)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+		)
+		(fp_line
+			(start 0.93 -0.47)
+			(end 0.93 0.47)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+		)
+		(fp_line
+			(start 0.93 0.47)
+			(end -0.93 0.47)
+			(stroke
+				(width 0.05)
+				(type solid)
+			)
+			(layer "F.CrtYd")
+		)
+		(fp_line
+			(start -0.525 -0.27)
+			(end 0.525 -0.27)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+		)
+		(fp_line
+			(start -0.525 0.27)
+			(end -0.525 -0.27)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+		)
+		(fp_line
+			(start 0.525 -0.27)
+			(end 0.525 0.27)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+		)
+		(fp_line
+			(start 0.525 0.27)
+			(end -0.525 0.27)
+			(stroke
+				(width 0.1)
+				(type solid)
+			)
+			(layer "F.Fab")
+		)
+		(fp_text user "\${REFERENCE}"
+			(at 0 0 0)
+			(layer "F.Fab")
+			(effects
+				(font
+					(size 0.26 0.26)
+					(thickness 0.04)
+				)
+			)
+		)
+		(pad "1" smd roundrect
+			(at -0.51 0)
+			(size 0.54 0.64)
+			(layers "F.Cu" "F.Mask" "F.Paste")
+			(roundrect_rratio 0.25)
+		)
+		(pad "2" smd roundrect
+			(at 0.51 0)
+			(size 0.54 0.64)
+			(layers "F.Cu" "F.Mask" "F.Paste")
+			(roundrect_rratio 0.25)
+		)
+		(embedded_fonts no)
+		(model "\${KICAD9_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0402_1005Metric.step"
+			(offset
+				(xyz 0 0 0)
+			)
+			(scale
+				(xyz 1 1 1)
+			)
+			(rotate
+				(xyz 0 0 0)
+			)
+		)
+	)
+	`,
+      },
+    })
+
+    await runner.renderUntilSettled()
+
+    const circuitJson = await runner.getCircuitJson()
+    expect(convertCircuitJsonToPcbSvg(circuitJson)).toMatchSvgSnapshot(
+      import.meta.path,
+    )
+    await runner.kill()
+  },
+  20 * 1000,
+)

package/webworker/import-local-file.ts

@@ -40,11 +40,35 @@ export const importLocalFile = async (
     }
   } else if (isStaticAssetPath(fsPath)) {
     const platformConfig = ctx.circuit.platform
-    // Use projectBaseUrl for static file imports
-    const staticUrl = `${platformConfig?.projectBaseUrl ?? ""}/${fsPath.startsWith("./") ? fsPath.slice(2) : fsPath}`
-    preSuppliedImports[fsPath] = {
-      __esModule: true,
-      default: staticUrl,
+    const fileExtension = fsPath.split(".").pop()
+    const footprintParser =
+      platformConfig?.footprintFileParserMap?.[fileExtension!]
+    if (
+      fileExtension == "kicad_mod" &&
+      footprintParser &&
+      footprintParser.loadFromUrl
+    ) {
+      try {
+        const contentUrl = `data:text/plain;base64,${btoa(fileContent)}`
+        const result = await footprintParser.loadFromUrl(contentUrl)
+        preSuppliedImports[fsPath] = {
+          __esModule: true,
+          default: result.footprintCircuitJson,
+        }
+      } catch (error) {
+        console.log("here", error)
+        const staticUrl = `${platformConfig?.projectBaseUrl ?? ""}/${fsPath.startsWith("./") ? fsPath.slice(2) : fsPath}`
+        preSuppliedImports[fsPath] = {
+          __esModule: true,
+          default: staticUrl,
+        }
+      }
+    } else {
+      const staticUrl = `${platformConfig?.projectBaseUrl ?? ""}/${fsPath.startsWith("./") ? fsPath.slice(2) : fsPath}`
+      preSuppliedImports[fsPath] = {
+        __esModule: true,
+        default: staticUrl,
+      }
     }
   } else if (fsPath.endsWith(".tsx") || fsPath.endsWith(".ts")) {
     const importNames = getImportsFromCode(fileContent)