@tscircuit/eval 0.0.310 → 0.0.312

package/lib/index.ts

@@ -1,4 +1,3 @@
 export * from "./runner"
 export * from "./worker"
 export * from "./getPossibleEntrypointComponentPaths"
-export * from "./getPlatformConfig"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/eval",
   "main": "dist/lib/index.js",
-  "version": "0.0.310",
+  "version": "0.0.312",
   "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",

package/tests/features/npm-import.test.tsx

@@ -0,0 +1,42 @@
+import { test, expect } from "bun:test"
+import { runTscircuitCode } from "lib/runner"
+
+test(
+  "should support importing various npm packages",
+  async () => {
+    const circuitJson = await runTscircuitCode(
+      `
+    import _ from "lodash"
+    import { v4 as uuidv4 } from "uuid"
+    import dayjs from "dayjs"
+
+    export default () => {
+      // Test lodash
+      if (!_.isEqual({ a: 1 }, { a: 1 })) {
+        throw new Error("_.isEqual failed")
+      }
+
+      // Test uuid
+      const uuid = uuidv4()
+      if (typeof uuid !== "string" || uuid.length < 36) {
+        throw new Error("uuid.v4 failed to generate a valid uuid")
+      }
+
+      // Test dayjs
+      if (!dayjs().isValid()) {
+        throw new Error("dayjs().isValid() failed")
+      }
+      
+      return <resistor name="R1" resistance="1k" />
+    }
+    `,
+    )
+
+    const resistor = circuitJson.find(
+      (element) => element.type === "source_component" && element.name === "R1",
+    )
+
+    expect(resistor).toBeDefined()
+  },
+  { timeout: 15000 },
+)

package/webworker/import-eval-path.ts

@@ -6,6 +6,7 @@ import { importSnippet } from "./import-snippet"
 import { resolveFilePath } from "lib/runner/resolveFilePath"
 import { resolveNodeModule } from "lib/utils/resolve-node-module"
 import { importNodeModule } from "./import-node-module"
+import { importNpmPackage } from "./import-npm-package"
 import Debug from "debug"
 
 const debug = Debug("tsci:eval:import-eval-path")
@@ -59,6 +60,10 @@ export async function importEvalPath(
     return importSnippet(importName, ctx, depth)
   }
 
+  if (!importName.startsWith(".") && !importName.startsWith("/")) {
+    return importNpmPackage(importName, ctx)
+  }
+
   throw new Error(
     `Unresolved import "${importName}" ${opts.cwd ? `from directory "${opts.cwd}"` : ""}`,
   )

package/webworker/import-npm-package.ts

@@ -0,0 +1,69 @@
+import { evalCompiledJs } from "./eval-compiled-js"
+import type { ExecutionContext } from "./execution-context"
+import * as Babel from "@babel/standalone"
+import { dirname } from "lib/utils/dirname"
+import Debug from "debug"
+
+const debug = Debug("tsci:eval:import-npm-package")
+
+function extractPackagePathFromJSDelivr(url: string) {
+  const prefix = "https://cdn.jsdelivr.net/npm/"
+  if (url.startsWith(prefix)) {
+    return url.substring(prefix.length).replace(/\/\+esm$/, "")
+  }
+  return url
+}
+
+export async function importNpmPackage(
+  importName: string,
+  ctx: ExecutionContext,
+) {
+  debug(`importing npm package: ${importName}`)
+  const { preSuppliedImports } = ctx
+
+  if (preSuppliedImports[importName]) return
+
+  const npmCdnUrl = `https://cdn.jsdelivr.net/npm/${importName}/+esm`
+
+  let finalUrl: string | undefined
+  const { content, error } = await globalThis
+    .fetch(npmCdnUrl)
+    .then(async (res) => {
+      finalUrl = res.url
+      if (!res.ok)
+        throw new Error(
+          `Could not fetch "${importName}" from jsdelivr: ${res.statusText}`,
+        )
+      return { content: await res.text(), error: null }
+    })
+    .catch((e) => ({ error: e, content: null }))
+
+  if (error) {
+    console.error("Error fetching npm import", importName, error)
+    throw error
+  }
+
+  const transpiled = Babel.transform(content!, {
+    presets: ["react", "env"],
+    plugins: ["transform-modules-commonjs"],
+    filename: importName,
+  })
+
+  if (!transpiled.code) {
+    throw new Error(`Babel transpilation failed for ${importName}`)
+  }
+  try {
+    const finalImportName = extractPackagePathFromJSDelivr(finalUrl!)
+    const cwd = dirname(finalImportName)
+    const exports = evalCompiledJs(
+      transpiled.code!,
+      preSuppliedImports,
+      cwd,
+    ).exports
+    preSuppliedImports[importName] = exports
+    preSuppliedImports[finalImportName] = exports
+    preSuppliedImports[finalUrl!] = exports
+  } catch (e: any) {
+    throw new Error(`Eval npm package error for "${importName}": ${e.message}`)
+  }
+}

package/tests/examples/__snapshots__/example19-service-like-circuit-runner.snap.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="800" height="600" data-software-used-string="@tscircuit/core@0.0.706"><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="69.204152249135" y="139.44636678200698" width="661.5916955017301" height="321.10726643598616"/><path class="pcb-board" d="M 69.204152249135 460.55363321799314 L 730.795847750865 460.55363321799314 L 730.795847750865 139.44636678200698 L 69.204152249135 139.44636678200698 Z" fill="none" stroke="rgba(255, 255, 255, 0.5)" stroke-width="6.920415224913495"/><path class="pcb-trace" stroke="rgb(200, 52, 52)" fill="none" d="M 503.11418685121106 300.00000000000006 L 296.88581314878894 300.00000000000006" stroke-width="10.380622837370241" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-layer="top"/><path class="pcb-trace" stroke="rgb(200, 52, 52)" fill="none" d="M 296.88581314878894 300.00000000000006 L 296.88581314878894 300.00000000000006" stroke-width="10.380622837370241" stroke-linecap="round" stroke-linejoin="round" shape-rendering="crispEdges" data-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="484.42906574394465" y="277.8546712802769" width="37.37024221453287" height="44.29065743944637" data-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="555.0173010380622" y="277.8546712802769" width="37.37024221453287" height="44.29065743944637" data-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="207.61245674740485" y="277.8546712802769" width="37.37024221453287" height="44.29065743944637" data-layer="top"/><rect class="pcb-pad" fill="rgb(200, 52, 52)" x="278.20069204152253" y="277.8546712802769" width="37.37024221453287" height="44.29065743944637" data-layer="top"/><path class="pcb-silkscreen pcb-silkscreen-top" d="M 573.7024221453287 250.17301038062288 L 470.5882352941177 250.17301038062288 L 470.5882352941177 349.82698961937723 L 573.7024221453287 349.82698961937723" fill="none" stroke="#f2eda1" stroke-width="6.920415224913495" stroke-linecap="round" stroke-linejoin="round" data-pcb-component-id="pcb_component_1" data-pcb-silkscreen-path-id="pcb_silkscreen_path_0"/><path class="pcb-silkscreen pcb-silkscreen-top" d="M 250.95910034602076 273.7024221453288 L 272.22429065743944 273.7024221453288" fill="none" stroke="#f2eda1" stroke-width="8.304498269896193" stroke-linecap="round" stroke-linejoin="round" data-pcb-component-id="pcb_component_0" data-pcb-silkscreen-path-id="pcb_silkscreen_path_1"/><path class="pcb-silkscreen pcb-silkscreen-top" d="M 250.95910034602076 326.2975778546713 L 272.22429065743944 326.2975778546713" fill="none" stroke="#f2eda1" stroke-width="8.304498269896193" stroke-linecap="round" stroke-linejoin="round" data-pcb-component-id="pcb_component_0" data-pcb-silkscreen-path-id="pcb_silkscreen_path_2"/><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="27.68166089965398" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,538.4083044982699,215.5709342560554)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_component_1" stroke="none">C1</text><text x="0" y="0" dx="0" dy="0" fill="#f2eda1" font-family="Arial, sans-serif" font-size="101.73010380622837" text-anchor="middle" dominant-baseline="central" transform="matrix(1,0,0,1,261.5916955017301,219.03114186851218)" class="pcb-silkscreen-text pcb-silkscreen-top" data-pcb-silkscreen-text-id="pcb_component_0" stroke="none">R1</text></svg>

package/tests/examples/example19-service-like-circuit-runner.test.tsx

@@ -1,75 +0,0 @@
-import { CircuitRunner } from "lib/runner/CircuitRunner"
-import { getPlatformConfig } from "lib/getPlatformConfig"
-import { expect, test } from "bun:test"
-import { convertCircuitJsonToPcbSvg } from "circuit-to-svg"
-
-test("example19-service-like-browser-preview", async () => {
-  // Simulate the service code pattern with platform config
-  const worker = new CircuitRunner({
-    platform: getPlatformConfig(), // This is the key - pass platform config
-  })
-
-  // Simulate user code that uses kicad footprints
-  const userCode = `
-    export default () => (
-      <board>
-        <resistor name="R1" resistance="1k" footprint="kicad:Resistor_SMD.pretty/R_0402_1005Metric" pcbX={-2} />
-        <capacitor name="C1" capacitance="100uF" footprint="0402" pcbX={2} />
-        <trace from=".R1 > .pin2" to=".C1 > .pin1" />
-      </board>
-    )
-  `
-
-  // Execute with fsMap similar to service code
-  await worker.executeWithFsMap({
-    fsMap: {
-      "entrypoint.tsx": `
-        import UserComponents from "./UserCode.tsx";
-        
-        const hasBoard = ${userCode.includes("<board").toString()};
-
-        circuit.add(
-          hasBoard ? (
-            <UserComponents />
-          ) : (
-            <board>
-              <UserComponents name="U1" />
-            </board>
-          )
-        );
-      `,
-      "UserCode.tsx": userCode,
-    },
-    entrypoint: "entrypoint.tsx",
-  })
-
-  await worker.renderUntilSettled()
-
-  const circuitJson = await worker.getCircuitJson()
-
-  // Verify the circuit was created successfully
-  expect(circuitJson).toBeDefined()
-  expect(Array.isArray(circuitJson)).toBe(true)
-  expect(circuitJson.length).toBeGreaterThan(0)
-
-  // Check that we have the expected elements
-  const pcb_trace = circuitJson.filter((el: any) => el.type === "pcb_trace")
-  expect(pcb_trace).toBeDefined()
-  expect(pcb_trace.length).toBe(1)
-
-  // Check that kicad footprint was processed (should have footprint elements)
-  const footprintElements = circuitJson.filter(
-    (el: any) =>
-      el.type === "pcb_silkscreen_text" ||
-      el.type === "pcb_pad" ||
-      el.type === "pcb_silkscreen_line",
-  )
-  expect(footprintElements.length).toBeGreaterThan(0)
-
-  // Generate SVG to verify visual output
-  expect(convertCircuitJsonToPcbSvg(circuitJson)).toMatchSvgSnapshot(
-    import.meta.path,
-  )
-
-  await worker.kill()
-})