Merge remote-tracking branch 'origin/main' into runtime-workspace

Author: na-trium-144

app/terminal/exec.tsx

@@ -33,7 +33,7 @@ export function ExecFile(props: ExecProps) {
       }
     },
   });
-  const { files, clearExecResult, addExecOutput } = useEmbedContext();
+  const { files, clearExecResult, addExecOutput, writeFile } = useEmbedContext();
 
   const { ready, runFiles, getCommandlineStr, runtimeInfo, interrupt } =
     useRuntime(props.language);
@@ -53,6 +53,10 @@ export function ExecFile(props: ExecProps) {
         clearExecResult(filenameKey);
         let isFirstOutput = true;
         await runFiles(props.filenames, files, (output) => {
+          if (output.type === "file") {
+            writeFile({ [output.filename]: output.content });
+            return;
+          }
           addExecOutput(filenameKey, output);
           if (isFirstOutput) {
             // Clear "実行中です..." message only on first output
@@ -78,6 +82,7 @@ export function ExecFile(props: ExecProps) {
     runFiles,
     clearExecResult,
     addExecOutput,
+    writeFile,
     terminalInstanceRef,
     props.language,
     files,

app/terminal/page.tsx

@@ -221,10 +221,6 @@ function MochaTest() {
   const [mochaState, setMochaState] = useState<"idle" | "running" | "finished">(
     "idle"
   );
-  const { files } = useEmbedContext();
-  const filesRef = useRef(files);
-  filesRef.current = files;
-
   const runTest = async () => {
     if (typeof window !== "undefined") {
       setMochaState("running");
@@ -235,7 +231,7 @@ function MochaTest() {
 
       for (const lang of Object.keys(runtimeRef.current) as RuntimeLang[]) {
         runtimeRef.current[lang].init?.();
-        defineTests(lang, runtimeRef, filesRef);
+        defineTests(lang, runtimeRef);
       }
 
       const runner = mocha.run();

app/terminal/repl.tsx

@@ -67,7 +67,7 @@ export function ReplTerminal({
   language,
   initContent,
 }: ReplComponentProps) {
-  const { addReplCommand, addReplOutput } = useEmbedContext();
+  const { addReplCommand, addReplOutput, writeFile } = useEmbedContext();
 
   const [Prism, setPrism] = useState<typeof import("prismjs") | null>(null);
   useEffect(() => {
@@ -214,6 +214,10 @@ export function ReplTerminal({
               let executionDone = false;
               await runtimeMutex.runExclusive(async () => {
                 await runCommand(command, (output) => {
+                  if (output.type === "file") {
+                    writeFile({ [output.filename]: output.content });
+                    return;
+                  }
                   if (executionDone) {
                     // すでに完了していて次のコマンドのプロンプトが出ている場合、その前に挿入
                     updateBuffer(null, () => {
@@ -270,6 +274,7 @@ export function ReplTerminal({
       runtimeMutex,
       runCommand,
       handleOutput,
+      writeFile,
       tabSize,
       addReplCommand,
       addReplOutput,
@@ -331,6 +336,10 @@ export function ReplTerminal({
             for (const cmd of initCommand!) {
               const outputs: ReplOutput[] = [];
               await runCommand(cmd.command, (output) => {
+                if (output.type === "file") {
+                  writeFile({ [output.filename]: output.content });
+                  return;
+                }
                 outputs.push(output);
               });
               initCommandResult.push({
@@ -365,6 +374,7 @@ export function ReplTerminal({
     runtimeMutex,
     updateBuffer,
     handleOutput,
+    writeFile,
     termReady,
     terminalInstanceRef,
     Prism,