refactor: add RunnerEvalContext

hi-ogawa · Apr 14, 2024 · 3e13bae · 3e13bae
1 parent e6853ff
commit 3e13bae
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/examples/workerd-cli/src/cli.ts b/examples/workerd-cli/src/cli.ts
@@ -56,8 +56,8 @@ async function main() {
     const entry = "virtual:repl/" + encodeURI(entrySource);
     await devEnv.api.eval(
       entry,
-      async function (this: any, mod: any) {
-        const result = await mod.default({ env: this.env });
+      async function (ctx: any, mod: any) {
+        const result = await mod.default(ctx);
         if (typeof result !== "undefined") {
           console.log(result);
         }

diff --git a/packages/workerd/src/plugin.ts b/packages/workerd/src/plugin.ts
@@ -14,6 +14,7 @@ import {
   setRunnerFetchOptions,
   type RunnerEvalOptions,
   RUNNER_EVAL_PATH,
+  type RunnerEvalContext,
 } from "./shared";
 import {
   DevEnvironment,
@@ -192,8 +193,8 @@ export async function createWorkerdDevEnvironment(
     // (de)serialization can be customized (currently JSON.stringify/parse)
     async eval<T>(
       entry: string,
-      fn: (mod: unknown, ...args: unknown[]) => T,
-      ...args: unknown[]
+      fn: (ctx: RunnerEvalContext, mod: any, ...args: any[]) => T,
+      ...args: any[]
     ): Promise<Awaited<T>> {
       const res = await runnerObject.fetch(ANY_URL + RUNNER_EVAL_PATH, {
         method: "POST",
@@ -210,7 +211,7 @@ export async function createWorkerdDevEnvironment(
     // not-so-magical proxy
     // - proxy only shallow exports using above `eval`
     // - all async call
-    async importProxy(entry: string): Promise<unknown> {
+    async importProxy(entry: string): Promise<any> {
       return new Proxy(
         {},
         {

diff --git a/packages/workerd/src/shared.ts b/packages/workerd/src/shared.ts
@@ -1,4 +1,5 @@
 import { tinyassert } from "@hiogawa/utils";
+import type { ModuleRunner } from "vite/module-runner";
 
 export const RUNNER_INIT_PATH = "/__viteInit";
 export const RUNNER_EVAL_PATH = "/__viteEval";
@@ -39,3 +40,8 @@ export type RunnerEvalOptions = {
   fnString: string;
   args: unknown[];
 };
+
+export type RunnerEvalContext = {
+  env: any;
+  runner: ModuleRunner;
+};
diff --git a/packages/workerd/src/worker.ts b/packages/workerd/src/worker.ts
@@ -6,6 +6,7 @@ import {
   type RunnerEnv,
   RUNNER_EVAL_PATH,
   type RunnerEvalOptions,
+  type RunnerEvalContext,
 } from "./shared";
 import { ModuleRunner } from "vite/module-runner";
 
@@ -46,7 +47,8 @@ export class RunnerObject implements DurableObject {
       const options = await request.json<RunnerEvalOptions>();
       const fn = this.#env.__viteUnsafeEval.eval(`() => ${options.fnString}`)();
       const mod = await this.#runner.import(options.entry);
-      const result = await fn.apply({ env: this.#env }, [mod, ...options.args]);
+      const ctx: RunnerEvalContext = { env: this.#env, runner: this.#runner };
+      const result = await fn(ctx, mod, ...options.args);
       return new Response(JSON.stringify(result ?? null));
     }