eval webworker working, main RunFrame api implemented

tscircuit · Dec 13, 2024 · 28f8a8b · 28f8a8b
1 parent 504a580
commit 28f8a8b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/examples/runframe1-basic.fixture.tsx b/examples/runframe1-basic.fixture.tsx
@@ -1,11 +1,16 @@
 import { RunFrame } from "lib/components/RunFrame"
+import React from "react"
 
 export default () => (
   <RunFrame
     fsMap={{
       "main.tsx": `
 circuit.add(
-  <resistor resistance="1k" />
+<board width="10mm" height="10mm">
+  <resistor name="R1" resistance="1k" footprint="0402" />
+  <capacitor name="C1" capacitance="1uF" footprint="0603" pcbX={4} />
+  <trace from=".R1 .pin1" to=".C1 .pin1" />
+</board>
 )
 `,
     }}

diff --git a/lib/components/RunFrame.tsx b/lib/components/RunFrame.tsx
@@ -2,6 +2,9 @@ import { createCircuitWebWorker } from "@tscircuit/eval-webworker"
 import { CircuitJsonPreview } from "./CircuitJsonPreview"
 import { useEffect, useState } from "react"
 
+// @ts-ignore
+import evalWebWorkerBlobUrl from "@tscircuit/eval-webworker/blob-url"
+
 interface Props {
   /**
    * Map of filenames to file contents that will be available in the worker
@@ -39,17 +42,27 @@ export const RunFrame = (props: Props) => {
 
   useEffect(() => {
     async function runWorker() {
-      const worker = await createCircuitWebWorker({})
+      const worker = await createCircuitWebWorker({
+        webWorkerUrl: evalWebWorkerBlobUrl,
+        verbose: true,
+      })
       const $finished = worker.executeWithFsMap({
         entrypoint: props.entrypoint,
         fsMap: props.fsMap,
       })
-      setCircuitJson(await worker.getCircuitJson())
+      console.log("waiting for execution to finish...")
       await $finished
+      console.log("waiting for initial circuit json...")
+      setCircuitJson(await worker.getCircuitJson())
+      console.log("got initial circuit json")
+      await $finished.catch((e) => {
+        console.error(e)
+      })
       setCircuitJson(await worker.getCircuitJson())
     }
     runWorker()
   }, [props.fsMap])
 
+  console.log({ circuitJson })
   return <CircuitJsonPreview circuitJson={circuitJson} />
 }
diff --git a/package.json b/package.json
@@ -31,8 +31,8 @@
     "@radix-ui/react-icons": "^1.3.2",
     "@radix-ui/react-tabs": "^1.1.1",
     "@tscircuit/3d-viewer": "^0.0.46",
-    "@tscircuit/eval-webworker": "^0.0.8",
-    "@tscircuit/pcb-viewer": "^1.10.21",
+    "@tscircuit/eval-webworker": "^0.0.20",
+    "@tscircuit/pcb-viewer": "^1.10.22",
     "@tscircuit/schematic-viewer": "2.0.3",
     "comlink": "^4.4.2",
     "cssnano": "^7.0.6",