vitestで全テスト動くようになった

na-trium-144 · na-trium-144 · commit 1ae527e6d862 · 2026-03-01T01:45:39.000+09:00
diff --git a/packages/runtime/src/tests.ts b/packages/runtime/src/tests.ts
@@ -1,29 +1,44 @@
 import { expect } from "chai";
 import { RefObject } from "react";
 import { RuntimeLang } from "./languages";
-import { emptyMutex, ReplOutput, RuntimeContext, UpdatedFile } from "./interface";
+import { ReplOutput, RuntimeContext, UpdatedFile } from "./interface";
 
 export function defineTests(
   lang: RuntimeLang,
   runtimeRef: RefObject<Record<RuntimeLang, RuntimeContext>>
 ) {
   describe(`${lang} Runtime`, function () {
-    this.timeout(
-      (
-        {
-          python: 2000,
-          ruby: 5000,
-          cpp: 10000,
-          javascript: 2000,
-        } as Record<RuntimeLang, number>
-      )[lang]
-    );
+    const timeout = (
+      {
+        python: 2000,
+        ruby: 5000,
+        javascript: 2000,
+        typescript: 2000,
+        cpp: 10000,
+        rust: 10000,
+      } as Record<RuntimeLang, number>
+    )[lang];
+
+    if (typeof this !== "undefined" && "timeout" in this) {
+      (this as any).timeout(timeout);
+    }
 
     beforeEach(async function () {
-      this.timeout(60000);
-      while (!runtimeRef.current[lang].ready) {
+      if (typeof this !== "undefined" && "timeout" in this) {
+        (this as any).timeout(60000);
+      }
+      
+      while (true) {
+        const runtime = runtimeRef.current[lang];
+        if (runtime?.ready) {
+          const isLocked = runtime.mutex?.isLocked();
+          if (!isLocked) {
+            break;
+          }
+        }
         await new Promise((resolve) => setTimeout(resolve, 100));
       }
+      await new Promise((resolve) => setTimeout(resolve, 50));
     });
 
     describe("REPL", function () {
@@ -40,7 +55,10 @@ export function defineTests(
           } satisfies Record<RuntimeLang, string | null>
         )[lang];
         if (!printCode) {
-          this.skip();
+          if (typeof this !== "undefined" && "skip" in this) {
+            return (this as any).skip();
+          }
+          return;
         }
         const outputs: ReplOutput[] = [];
         await (runtimeRef.current[lang].mutex || emptyMutex).runExclusive(() =>
@@ -69,7 +87,10 @@ export function defineTests(
           } satisfies Record<RuntimeLang, string[] | null[]>
         )[lang];
         if (!setIntVarCode || !printIntVarCode) {
-          this.skip();
+          if (typeof this !== "undefined" && "skip" in this) {
+            return (this as any).skip();
+          }
+          return;
         }
         const outputs: ReplOutput[] = [];
         await (runtimeRef.current[lang].mutex || emptyMutex).runExclusive(
@@ -103,7 +124,10 @@ export function defineTests(
           } satisfies Record<RuntimeLang, string | null>
         )[lang];
         if (!errorCode) {
-          this.skip();
+          if (typeof this !== "undefined" && "skip" in this) {
+            return (this as any).skip();
+          }
+          return;
         }
         const outputs: ReplOutput[] = [];
         await (runtimeRef.current[lang].mutex || emptyMutex).runExclusive(() =>
@@ -133,7 +157,10 @@ export function defineTests(
           } satisfies Record<RuntimeLang, (string | null)[]>
         )[lang];
         if (!setIntVarCode || !infLoopCode || !printIntVarCode) {
-          this.skip();
+          if (typeof this !== "undefined" && "skip" in this) {
+            return (this as any).skip();
+          }
+          return;
         }
         const runPromise = (
           runtimeRef.current[lang].mutex || emptyMutex
@@ -146,9 +173,18 @@ export function defineTests(
         runtimeRef.current[lang].interrupt!();
         await new Promise((resolve) => setTimeout(resolve, 100));
         await runPromise;
-        while (!runtimeRef.current[lang].ready) {
+        
+        // Wait for it to become ready again
+        const start = Date.now();
+        while (true) {
+          const runtime = runtimeRef.current[lang];
+          if (runtime?.ready && !runtime.mutex?.isLocked()) {
+            break;
+          }
+          if (Date.now() - start > 30000) break;
           await new Promise((resolve) => setTimeout(resolve, 100));
         }
+
         const outputs: ReplOutput[] = [];
         await (runtimeRef.current[lang].mutex || emptyMutex).runExclusive(() =>
           runtimeRef.current[lang].runCommand!(printIntVarCode, (output) => {
@@ -173,7 +209,10 @@ export function defineTests(
           } satisfies Record<RuntimeLang, string | null>
         )[lang];
         if (!writeCode) {
-          this.skip();
+          if (typeof this !== "undefined" && "skip" in this) {
+            return (this as any).skip();
+          }
+          return;
         }
         const updatedFiles: UpdatedFile[] = [];
         await (runtimeRef.current[lang].mutex || emptyMutex).runExclusive(() =>
@@ -206,7 +245,10 @@ export function defineTests(
           } satisfies Record<RuntimeLang, [string, string] | [null, null]>
         )[lang];
         if (!filename || !code) {
-          this.skip();
+          if (typeof this !== "undefined" && "skip" in this) {
+            return (this as any).skip();
+          }
+          return;
         }
         const outputs: ReplOutput[] = [];
         await runtimeRef.current[lang].runFiles(
@@ -242,7 +284,10 @@ export function defineTests(
           } satisfies Record<RuntimeLang, [string, string] | [null, null]>
         )[lang];
         if (!filename || !code) {
-          this.skip();
+          if (typeof this !== "undefined" && "skip" in this) {
+            return (this as any).skip();
+          }
+          return;
         }
         const outputs: ReplOutput[] = [];
         await runtimeRef.current[lang].runFiles(
@@ -305,7 +350,10 @@ export function defineTests(
           >
         )[lang];
         if (!codes || !execFiles) {
-          this.skip();
+          if (typeof this !== "undefined" && "skip" in this) {
+            return (this as any).skip();
+          }
+          return;
         }
         const outputs: ReplOutput[] = [];
         await runtimeRef.current[lang].runFiles(execFiles, codes, (output) => {
@@ -335,7 +383,10 @@ export function defineTests(
           } satisfies Record<RuntimeLang, [string, string] | [null, null]>
         )[lang];
         if (!filename || !code) {
-          this.skip();
+          if (typeof this !== "undefined" && "skip" in this) {
+            return (this as any).skip();
+          }
+          return;
         }
         const updatedFiles: UpdatedFile[] = [];
         await runtimeRef.current[lang].runFiles(
diff --git a/packages/runtime/src/typescript/runtime.tsx b/packages/runtime/src/typescript/runtime.tsx
@@ -14,7 +14,7 @@ import {
 import { ReplOutput, RuntimeContext, RuntimeInfo, UpdatedFile } from "../interface";
 
 export const compilerOptions: CompilerOptions = {
-  lib: ["ESNext", "WebWorker"],
+  lib: ["ESNext", "WebWorker", "DOM"],
   target: 10 satisfies ScriptTarget.ES2023,
   strict: true,
 };
@@ -165,10 +165,11 @@ export function useTypeScript(jsEval: RuntimeContext): RuntimeContext {
   );
   return {
     init,
-    ready: tsEnv !== null,
+    ready: tsEnv !== null && jsEval.ready,
     runFiles,
     getCommandlineStr,
     runtimeInfo,
+    mutex: jsEval.mutex,
   };
 }
 
diff --git a/packages/runtime/src/worker/pyodide.worker.ts b/packages/runtime/src/worker/pyodide.worker.ts
@@ -15,7 +15,7 @@ import check_syntax_py from "./pyodide/check_syntax.py?raw";
 const HOME = `/home/pyodide/`;
 
 let pyodide: PyodideInterface;
-let currentOutputCallback: ((output: ReplOutput) => void) | null = null;
+let currentOutputCallback: ((output: ReplOutput | UpdatedFile) => void) | null = null;
 
 // Helper function to read all files from the Pyodide file system
 function readAllFiles(): Record<string, string> {
diff --git a/packages/runtime/src/worker/ruby.worker.ts b/packages/runtime/src/worker/ruby.worker.ts
@@ -10,7 +10,7 @@ import type { ReplOutput, ReplOutputType, UpdatedFile } from "../interface";
 import init_rb from "./ruby/init.rb?raw";
 
 let rubyVM: RubyVM | null = null;
-let currentOutputCallback: ((output: ReplOutput) => void) | null = null;
+let currentOutputCallback: ((output: ReplOutput | UpdatedFile) => void) | null = null;
 let stdoutBuffer = "";
 let stderrBuffer = "";
 
diff --git a/packages/runtime/src/worker/runtime.tsx b/packages/runtime/src/worker/runtime.tsx
@@ -12,7 +12,12 @@ import {
 import { wrap, Remote, proxy } from "comlink";
 import { RuntimeLang } from "../languages";
 import { Mutex, MutexInterface } from "async-mutex";
-import { ReplOutput, RuntimeContext, SyntaxStatus, UpdatedFile } from "../interface";
+import {
+  ReplOutput,
+  RuntimeContext,
+  SyntaxStatus,
+  UpdatedFile,
+} from "../interface";
 
 type WorkerLang = "python" | "ruby" | "javascript";
 export type WorkerCapabilities = {
@@ -71,13 +76,19 @@ export function WorkerProvider({
     lang satisfies RuntimeLang;
     switch (lang) {
       case "python":
-        worker = new Worker(new URL("./pyodide.worker.ts", import.meta.url), { type: 'module' });
+        worker = new Worker(new URL("./pyodide.worker.ts", import.meta.url), {
+          type: "module",
+        });
         break;
       case "ruby":
-        worker = new Worker(new URL("./ruby.worker.ts", import.meta.url), { type: 'module' });
+        worker = new Worker(new URL("./ruby.worker.ts", import.meta.url), {
+          type: "module",
+        });
         break;
       case "javascript":
-        worker = new Worker(new URL("./jsEval.worker.ts", import.meta.url), { type: 'module' });
+        worker = new Worker(new URL("./jsEval.worker.ts", import.meta.url), {
+          type: "module",
+        });
         break;
       default:
         lang satisfies never;
@@ -119,6 +130,11 @@ export function WorkerProvider({
       });
       return () => {
         void mutex.runExclusive(async () => {
+          // Reject all pending promises
+          const error = new Error("Worker terminated");
+          pendingPromises.current.forEach((reject) => reject(error));
+          pendingPromises.current.clear();
+
           workerRef.current?.terminate();
           workerRef.current = null;
           setReady(false);
@@ -167,7 +183,10 @@ export function WorkerProvider({
   }, [initializeWorker, mutex]);
 
   const runCommand = useCallback(
-    async (code: string, onOutput: (output: ReplOutput | UpdatedFile) => void): Promise<void> => {
+    async (
+      code: string,
+      onOutput: (output: ReplOutput | UpdatedFile) => void
+    ): Promise<void> => {
       if (!mutex.isLocked()) {
         throw new Error(`mutex of context must be locked for runCommand`);
       }
diff --git a/packages/runtime/tests/runtime.spec.tsx b/packages/runtime/tests/runtime.spec.tsx
