テストでwriteFile後のtimeoutは不要、filesにReadonly追加、typeエラー修正など

Author: na-trium-144

app/terminal/embedContext.tsx

@@ -24,21 +24,21 @@ type Filename = string;
 type TerminalId = string;
 
 interface IEmbedContext {
-  files: Record<Filename, string>;
+  files: Readonly<Record<Filename, string>>;
   // ファイルを書き込む。更新後のページ内の全ファイル内容を返す
   // 返り値を使うことで再レンダリングを待たずに最新の内容を取得できる
   writeFile: (
-    updatedFiles: Record<Filename, string>
-  ) => Promise<Record<Filename, string>>;
+    updatedFiles: Readonly<Record<Filename, string>>
+  ) => Promise<Readonly<Record<Filename, string>>>;
 
-  replOutputs: Record<TerminalId, ReplCommand[]>;
+  replOutputs: Readonly<Record<TerminalId, ReplCommand[]>>;
   addReplOutput: (
     terminalId: TerminalId,
     command: string,
     output: ReplOutput[]
   ) => void;
 
-  execResults: Record<Filename, ReplOutput[]>;
+  execResults: Readonly<Record<Filename, ReplOutput[]>>;
   setExecResult: (filename: Filename, output: ReplOutput[]) => void;
 }
 const EmbedContext = createContext<IEmbedContext>(null!);

app/terminal/exec.tsx

@@ -52,6 +52,7 @@ export function ExecFile(props: ExecProps) {
           outputs,
           false,
           undefined,
+          null, // ファイル実行で"return"メッセージが返ってくることはないはずなので、Prismを渡す必要はない
           props.language
         );
         // TODO: 1つのファイル名しか受け付けないところに無理やりコンマ区切りで全部のファイル名を突っ込んでいる

app/terminal/page.tsx

@@ -147,7 +147,9 @@ function MochaTest() {
   const [mochaState, setMochaState] = useState<"idle" | "running" | "finished">(
     "idle"
   );
-  const { writeFile } = useEmbedContext();
+  const { files } = useEmbedContext();
+  const filesRef = useRef(files);
+  filesRef.current = files;
 
   const runTest = async () => {
     if(typeof window !== "undefined") {
@@ -158,7 +160,7 @@ function MochaTest() {
       mocha.setup("bdd");
 
       for (const lang of Object.keys(runtimeRef.current) as RuntimeLang[]) {
-        defineTests(lang, runtimeRef, writeFile);
+        defineTests(lang, runtimeRef, filesRef);
       }
 
       const runner = mocha.run();

app/terminal/repl.tsx

@@ -30,6 +30,7 @@ export function writeOutput(
   outputs: ReplOutput[],
   endNewLine: boolean,
   returnPrefix: string | undefined,
+  Prism: typeof import("prismjs") | null,
   language: RuntimeLang
 ) {
   for (let i = 0; i < outputs.length; i++) {
@@ -53,7 +54,12 @@ export function writeOutput(
         if (returnPrefix) {
           term.write(returnPrefix);
         }
-        term.write(highlightCodeToAnsi(message, language));
+        if (Prism) {
+          term.write(highlightCodeToAnsi(Prism, message, language));
+        } else {
+          console.warn("Prism is not loaded, cannot highlight return value");
+          term.write(message);
+        }
         break;
       default:
         term.write(message);
@@ -79,7 +85,7 @@ export function ReplTerminal({
 
   const [Prism, setPrism] = useState<typeof import("prismjs") | null>(null);
   useEffect(() => {
-    if(Prism === null){
+    if (Prism === null) {
       importPrism().then((prism) => setPrism(prism));
     }
   }, [Prism]);
@@ -180,6 +186,7 @@ export function ReplTerminal({
           outputs,
           true,
           returnPrefix,
+          Prism,
           language
         );
         // 出力が終わったらプロンプトを表示

app/terminal/runtime.tsx

@@ -24,7 +24,7 @@ export interface RuntimeContext {
   checkSyntax?: (code: string) => Promise<SyntaxStatus>;
   splitReplExamples?: (content: string) => ReplCommand[];
   // file
-  runFiles: (filenames: string[], files: Record<string, string>) => Promise<ReplOutput[]>;
+  runFiles: (filenames: string[], files: Readonly<Record<string, string>>) => Promise<ReplOutput[]>;
   getCommandlineStr?: (filenames: string[]) => string;
 }
 export interface LangConstants {

app/terminal/tests.ts

@@ -5,7 +5,7 @@ import { emptyMutex, RuntimeContext, RuntimeLang } from "./runtime";
 export function defineTests(
   lang: RuntimeLang,
   runtimeRef: RefObject<Record<RuntimeLang, RuntimeContext>>,
-  writeFile: (name: string, content: string) => void
+  filesRef: RefObject<Readonly<Record<string, string>>>,
 ) {
   describe(`${lang} Runtime`, function () {
     this.timeout(
@@ -136,7 +136,6 @@ export function defineTests(
         while (!runtimeRef.current[lang].ready) {
           await new Promise((resolve) => setTimeout(resolve, 100));
         }
-        await new Promise((resolve) => setTimeout(resolve, 100));
         const result = await (
           runtimeRef.current[lang].mutex || emptyMutex
         ).runExclusive(() =>
@@ -169,10 +168,7 @@ export function defineTests(
         if (!filename || !code) {
           this.skip();
         }
-        writeFile(filename, code);
-        // use setTimeout to wait for writeFile to propagate.
-        await new Promise((resolve) => setTimeout(resolve, 100));
-        const result = await runtimeRef.current[lang].runFiles([filename]);
+        const result = await runtimeRef.current[lang].runFiles([filename], {[filename]: code});
         console.log(`${lang} single file stdout test: `, result);
         expect(result).to.be.deep.equal([
           {
@@ -198,9 +194,7 @@ export function defineTests(
         if (!filename || !code) {
           this.skip();
         }
-        writeFile(filename, code);
-        await new Promise((resolve) => setTimeout(resolve, 100));
-        const result = await runtimeRef.current[lang].runFiles([filename]);
+        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
@@ -245,11 +239,7 @@ export function defineTests(
         if (!codes || !execFiles) {
           this.skip();
         }
-        for (const [filename, code] of Object.entries(codes)) {
-          writeFile(filename, code);
-        }
-        await new Promise((resolve) => setTimeout(resolve, 100));
-        const result = await runtimeRef.current[lang].runFiles(execFiles);
+        const result = await runtimeRef.current[lang].runFiles(execFiles, codes);
         console.log(`${lang} multifile stdout test: `, result);
         expect(result).to.be.deep.equal([
           {

app/terminal/typescript/runtime.tsx

@@ -80,7 +80,7 @@ export function useTypeScript(jsEval: RuntimeContext): RuntimeContext {
 
   const { writeFile } = useEmbedContext();
   const runFiles = useCallback(
-    async (filenames: string[], files: Record<string, string>) => {
+    async (filenames: string[], files: Readonly<Record<string, string>>) => {
       if (tsEnv === null || typeof window === "undefined") {
         return [
           { type: "error" as const, message: "TypeScript is not ready yet." },

app/terminal/wandbox/runtime.tsx

@@ -24,7 +24,7 @@ interface IWandboxContext {
     lang: WandboxLang
   ) => (
     filenames: string[],
-    files: Record<string, string>
+    files: Readonly<Record<string, string>>
   ) => Promise<ReplOutput[]>;
 }
 
@@ -70,7 +70,7 @@ export function WandboxProvider({ children }: { children: ReactNode }) {
   // Curried function for language-specific file execution
   const runFilesWithLang = useCallback(
     (lang: WandboxLang) =>
-      async (filenames: string[], files: Record<string, string>) => {
+      async (filenames: string[], files: Readonly<Record<string, string>>) => {
         if (!selectedCompiler) {
           return [
             { type: "error" as const, message: "Wandbox is not ready yet." },

app/terminal/worker/runtime.tsx

@@ -237,7 +237,10 @@ export function WorkerProvider({
   );
 
   const runFiles = useCallback(
-    async (filenames: string[], files: Record<string, string>): Promise<ReplOutput[]> => {
+    async (
+      filenames: string[],
+      files: Readonly<Record<string, string>>
+    ): Promise<ReplOutput[]> => {
       if (filenames.length !== 1) {
         return [
           {