@tscircuit/eval 0.0.288 → 0.0.290

package/tests/features/execute-component-worker.test.tsx

@@ -0,0 +1,25 @@
+import { expect, test } from "bun:test"
+import * as React from "react"
+import { createCircuitWebWorker } from "lib"
+import { repoFileUrl } from "tests/fixtures/resourcePaths"
+
+test("CircuitWebWorker.executeComponent with factory function", async () => {
+  const worker = await createCircuitWebWorker({
+    webWorkerUrl: repoFileUrl("dist/webworker/entrypoint.js").href,
+  })
+
+  await worker.executeComponent(
+    <board>
+      <resistor name="R1" resistance="1k" />
+    </board>,
+  )
+
+  await worker.renderUntilSettled()
+  const circuitJson = await worker.getCircuitJson()
+  const R1 = circuitJson.find(
+    (el: any) => el.type === "source_component" && el.name === "R1",
+  )
+  expect(R1).toBeDefined()
+
+  await worker.kill()
+})

package/tests/{fetch-override.test.ts → features/fetch-proxy/fetch-override.test.ts}

@@ -1,5 +1,6 @@
 import { describe, it, expect } from "bun:test"
-import { createCircuitWebWorker } from "../lib"
+import { createCircuitWebWorker } from "lib"
+import { repoFileUrl } from "tests/fixtures/resourcePaths"
 
 describe("fetch override", () => {
   it("allows worker to fetch via parent and propagates errors", async () => {
@@ -15,8 +16,7 @@ describe("fetch override", () => {
     globalThis.fetch = fakeFetch as any
 
     const worker = await createCircuitWebWorker({
-      webWorkerUrl: new URL("../dist/webworker/entrypoint.js", import.meta.url)
-        .href,
+      webWorkerUrl: repoFileUrl("dist/webworker/entrypoint.js").href,
       enableFetchProxy: true,
     })
 

package/tests/{fetch-proxy-validation.test.ts → features/fetch-proxy/fetch-proxy-validation.test.ts}

@@ -1,11 +1,11 @@
 import { describe, it, expect } from "bun:test"
-import { createCircuitWebWorker } from "../lib"
+import { createCircuitWebWorker } from "lib"
+import { repoFileUrl } from "tests/fixtures/resourcePaths"
 
 describe("fetch proxy validation", () => {
   it("should NOT proxy fetch requests when enableFetchProxy is false (default)", async () => {
     const worker = await createCircuitWebWorker({
-      webWorkerUrl: new URL("../dist/webworker/entrypoint.js", import.meta.url)
-        .href,
+      webWorkerUrl: repoFileUrl("dist/webworker/entrypoint.js").href,
       // enableFetchProxy not set, should default to false
     })
 
@@ -31,8 +31,7 @@ fetch("https://example.com/test")
 
   it("should proxy fetch requests when enableFetchProxy is true", async () => {
     const worker = await createCircuitWebWorker({
-      webWorkerUrl: new URL("../dist/webworker/entrypoint.js", import.meta.url)
-        .href,
+      webWorkerUrl: repoFileUrl("dist/webworker/entrypoint.js").href,
       enableFetchProxy: true,
     })
 
@@ -67,8 +66,7 @@ fetch("https://example.com/test")
     globalThis.fetch = fakeFetch as any
 
     const worker = await createCircuitWebWorker({
-      webWorkerUrl: new URL("../dist/webworker/entrypoint.js", import.meta.url)
-        .href,
+      webWorkerUrl: repoFileUrl("dist/webworker/entrypoint.js").href,
       enableFetchProxy: true,
     })
 

package/tests/{kill.test.ts → features/kill.test.ts}

@@ -1,11 +1,13 @@
 import { describe, it, expect } from "bun:test"
-import { createCircuitWebWorker } from "../lib"
+import { createCircuitWebWorker } from "lib"
 
 describe("kill method", () => {
   it("should immediately terminate the worker", async () => {
     const worker = await createCircuitWebWorker({
-      webWorkerUrl: new URL("../dist/webworker/entrypoint.js", import.meta.url)
-        .href,
+      webWorkerUrl: new URL(
+        "../../dist/webworker/entrypoint.js",
+        import.meta.url,
+      ).href,
     })
 
     // Ensure worker is running

package/tests/{manual-edits.test.tsx → features/manual-edits.test.tsx}

@@ -59,7 +59,7 @@ const example2 = {
 
 test("example1: Manual edits in entrypoint.tsx file", async () => {
   const circuitWebWorker = await createCircuitWebWorker({
-    webWorkerUrl: new URL("../webworker/index.ts", import.meta.url),
+    webWorkerUrl: new URL("../../webworker/index.ts", import.meta.url),
   })
 
   await circuitWebWorker.executeWithFsMap({
@@ -89,7 +89,7 @@ test("example1: Manual edits in entrypoint.tsx file", async () => {
 
 test("example2: Manual edits in manual-edits.json file", async () => {
   const circuitWebWorker = await createCircuitWebWorker({
-    webWorkerUrl: new URL("../webworker/index.ts", import.meta.url),
+    webWorkerUrl: new URL("../../webworker/index.ts", import.meta.url),
   })
 
   await circuitWebWorker.executeWithFsMap({

package/tests/fixtures/resourcePaths.ts

@@ -0,0 +1,3 @@
+export const repoFileUrl = (pathFromRoot: string) => {
+  return new URL(`../../${pathFromRoot}`, import.meta.url)
+}

package/webworker/entrypoint.ts

@@ -11,7 +11,7 @@ import {
   type ExecutionContext,
 } from "./execution-context"
 import { importEvalPath } from "./import-eval-path"
-import { normalizeFsMap } from "../lib/runner/normalizeFsMap"
+import { normalizeFsMap } from "lib/runner/normalizeFsMap"
 import type { RootCircuit } from "@tscircuit/core"
 import { setupDefaultEntrypointIfNeeded } from "lib/runner/setupDefaultEntrypointIfNeeded"
 import { setupFetchProxy } from "./fetchProxy"
@@ -30,6 +30,40 @@ const circuitRunnerConfiguration: WebWorkerConfiguration = {
 
 const eventListeners: Record<string, ((...args: any[]) => void)[]> = {}
 
+// Helper to deserialize React elements from cross-worker communication
+function deserializeReactElement(serialized: any): any {
+  if (!serialized || typeof serialized !== "object") {
+    return serialized
+  }
+
+  if (serialized.__isSerializedReactElement) {
+    const props = deserializeProps(serialized.props)
+    return React.createElement(serialized.type, props)
+  }
+
+  return serialized
+}
+
+function deserializeProps(props: any): any {
+  if (!props || typeof props !== "object") {
+    return props
+  }
+
+  const deserialized: any = {}
+  for (const [key, value] of Object.entries(props)) {
+    if (key === "children") {
+      if (Array.isArray(value)) {
+        deserialized.children = value.map(deserializeReactElement)
+      } else {
+        deserialized.children = deserializeReactElement(value)
+      }
+    } else {
+      deserialized[key] = value
+    }
+  }
+  return deserialized
+}
+
 function bindEventListeners(circuit: RootCircuit) {
   for (const event in eventListeners) {
     for (const listener of eventListeners[event]) {
@@ -100,6 +134,28 @@ const webWorkerApi = {
     await importEvalPath("./entrypoint.tsx", executionContext)
   },
 
+  async executeComponent(component: any, opts: { name?: string } = {}) {
+    if (circuitRunnerConfiguration.verbose) {
+      console.log("[Worker] executeComponent called")
+    }
+    executionContext = createExecutionContext(circuitRunnerConfiguration, {
+      ...opts,
+      platform: circuitRunnerConfiguration.platform,
+    })
+    bindEventListeners(executionContext.circuit)
+    ;(globalThis as any).__tscircuit_circuit = executionContext.circuit
+
+    let element: any
+    if (typeof component === "function") {
+      element = component()
+    } else if (component && component.__isSerializedReactElement) {
+      element = deserializeReactElement(component)
+    } else {
+      element = component
+    }
+    executionContext.circuit.add(element as any)
+  },
+
   on: (event: string, callback: (...args: any[]) => void) => {
     eventListeners[event] ??= []
     eventListeners[event].push(callback)
@@ -131,7 +187,7 @@ const webWorkerApi = {
               listener: (...args: any[]) => void,
             ) => void
           }
-          if (typeof circuit.removeListener === "function") {
+          if (circuit.removeListener) {
             circuit.removeListener(event, listener)
           }
         }