TypeScriptのテストを追加

Author: na-trium-144

app/terminal/editor.tsx

@@ -14,6 +14,7 @@ const AceEditor = dynamic(
     await import("ace-builds/src-min-noconflict/mode-ruby");
     await import("ace-builds/src-min-noconflict/mode-c_cpp");
     await import("ace-builds/src-min-noconflict/mode-javascript");
+    await import("ace-builds/src-min-noconflict/mode-typescript");
     await import("ace-builds/src-min-noconflict/mode-json");
     await import("ace-builds/src-min-noconflict/mode-csv");
     await import("ace-builds/src-min-noconflict/mode-text");
@@ -30,7 +31,15 @@ import { langConstants } from "./runtime";
 // snippetを有効化するにはsnippetもimportする必要がある: import "ace-builds/src-min-noconflict/snippets/python";
 
 // mode-xxxx.js のファイル名と、AceEditorの mode プロパティの値が対応する
-export type AceLang = "python" | "ruby" | "c_cpp" | "javascript" | "json" | "csv" | "text";
+export type AceLang =
+  | "python"
+  | "ruby"
+  | "c_cpp"
+  | "javascript"
+  | "typescript"
+  | "json"
+  | "csv"
+  | "text";
 export function getAceLang(lang: string | undefined): AceLang {
   // Markdownで指定される可能性のある言語名からAceLangを取得
   switch (lang) {
@@ -46,6 +55,9 @@ export function getAceLang(lang: string | undefined): AceLang {
     case "javascript":
     case "js":
       return "javascript";
+    case "typescript":
+    case "ts":
+      return "typescript";
     case "json":
       return "json";
     case "csv":

app/terminal/highlight.ts

@@ -25,6 +25,7 @@ function getPrismLanguage(language: RuntimeLang): PrismLang {
     case "javascript":
       return "javascript";
     case "cpp":
+    case "typescript":
       throw new Error(
         `highlight for ${language} is disabled because it should not support REPL`
       );

app/terminal/page.tsx

@@ -12,6 +12,7 @@ import { useJSEval } from "./worker/jsEval";
 import { ReplTerminal } from "./repl";
 import { EditorComponent, getAceLang } from "./editor";
 import { ExecFile } from "./exec";
+import { useTypeScript } from "./typescript/runtime";
 
 export default function RuntimeTestPage() {
   return (
@@ -130,13 +131,15 @@ function RuntimeSample({
 function MochaTest() {
   const pyodide = usePyodide();
   const ruby = useRuby();
-  const javascript = useJSEval();
+  const jsEval = useJSEval();
+  const typescript = useTypeScript(jsEval);
   const wandboxCpp = useWandbox("cpp");
   const runtimeRef = useRef<Record<RuntimeLang, RuntimeContext>>(null!);
   runtimeRef.current = {
     python: pyodide,
     ruby: ruby,
-    javascript: javascript,
+    javascript: jsEval,
+    typescript: typescript,
     cpp: wandboxCpp,
   };
 

app/terminal/runtime.tsx

@@ -120,6 +120,7 @@ export function langConstants(lang: RuntimeLang | AceLang): LangConstants {
         returnPrefix: "=> ",
       };
     case "javascript":
+    case "typescript":
       return {
         tabSize: 2,
         prompt: "> ",

app/terminal/tests.ts

@@ -5,7 +5,7 @@ import { emptyMutex, RuntimeContext, RuntimeLang } from "./runtime";
 export function defineTests(
   lang: RuntimeLang,
   runtimeRef: RefObject<Record<RuntimeLang, RuntimeContext>>,
-  filesRef: RefObject<Readonly<Record<string, string>>>,
+  filesRef: RefObject<Readonly<Record<string, string>>>
 ) {
   describe(`${lang} Runtime`, function () {
     this.timeout(
@@ -35,6 +35,7 @@ export function defineTests(
             ruby: `puts "${msg}"`,
             cpp: null,
             javascript: `console.log("${msg}")`,
+            typescript: null,
           } satisfies Record<RuntimeLang, string | null>
         )[lang];
         if (!printCode) {
@@ -64,6 +65,7 @@ export function defineTests(
               `var ${varName} = ${value}`,
               `console.log(${varName})`,
             ],
+            typescript: [null, null],
           } satisfies Record<RuntimeLang, string[] | null[]>
         )[lang];
         if (!setIntVarCode || !printIntVarCode) {
@@ -92,6 +94,7 @@ export function defineTests(
             ruby: `raise "${errorMsg}"`,
             cpp: null,
             javascript: `throw new Error("${errorMsg}")`,
+            typescript: null,
           } satisfies Record<RuntimeLang, string | null>
         )[lang];
         if (!errorCode) {
@@ -117,6 +120,7 @@ export function defineTests(
               `while(true) {}`,
               `console.log(testVar)`,
             ],
+            typescript: [null, null, null],
           } satisfies Record<RuntimeLang, (string | null)[]>
         )[lang];
         if (!setIntVarCode || !infLoopCode || !printIntVarCode) {
@@ -163,12 +167,15 @@ export function defineTests(
               `#include <iostream>\nint main() {\n  std::cout << "${msg}" << std::endl;\n  return 0;\n}\n`,
             ],
             javascript: ["test.js", `console.log("${msg}")`],
+            typescript: ["test.ts", `console.log("${msg}")`],
           } satisfies Record<RuntimeLang, [string, string] | [null, null]>
         )[lang];
         if (!filename || !code) {
           this.skip();
         }
-        const result = await runtimeRef.current[lang].runFiles([filename], {[filename]: code});
+        const result = await runtimeRef.current[lang].runFiles([filename], {
+          [filename]: code,
+        });
         console.log(`${lang} single file stdout test: `, result);
         expect(result).to.be.deep.equal([
           {
@@ -189,12 +196,16 @@ export function defineTests(
               `#include <stdexcept>\nint main() {\n  throw std::runtime_error("${errorMsg}");\n  return 0;\n}\n`,
             ],
             javascript: ["test_error.js", `throw new Error("${errorMsg}");\n`],
+            // TODO: tscが出す型エラーのテストはできていない
+            typescript: ["test_error.ts", `throw new Error("${errorMsg}");\n`],
           } satisfies Record<RuntimeLang, [string, string] | [null, null]>
         )[lang];
         if (!filename || !code) {
           this.skip();
         }
-        const result = await runtimeRef.current[lang].runFiles([filename], {[filename]: code});
+        const result = await runtimeRef.current[lang].runFiles([filename], {
+          [filename]: code,
+        });
         console.log(`${lang} single file error capture test: `, result);
         // eslint-disable-next-line @typescript-eslint/no-unused-expressions
         expect(result.filter((r) => r.message.includes(errorMsg))).to.not.be
@@ -231,6 +242,7 @@ export function defineTests(
               ["test_multi_main.cpp", "test_multi_sub.cpp"],
             ],
             javascript: [null, null],
+            typescript: [null, null],
           } satisfies Record<
             RuntimeLang,
             [Record<string, string>, string[]] | [null, null]
@@ -239,7 +251,10 @@ export function defineTests(
         if (!codes || !execFiles) {
           this.skip();
         }
-        const result = await runtimeRef.current[lang].runFiles(execFiles, codes);
+        const result = await runtimeRef.current[lang].runFiles(
+          execFiles,
+          codes
+        );
         console.log(`${lang} multifile stdout test: `, result);
         expect(result).to.be.deep.equal([
           {