Address PR feedback: use optional chaining, flush lines immediately, move flushOutput to finally

Co-authored-by: na-trium-144 <[email protected]>

Author: Copilot

app/terminal/worker/jsEval.worker.ts

@@ -17,24 +17,16 @@ const originalConsole = self.console;
 self.console = {
   ...originalConsole,
   log: (...args: unknown[]) => {
-    if (currentOutputCallback) {
-      currentOutputCallback({ type: "stdout", message: format(...args) });
-    }
+    currentOutputCallback?.({ type: "stdout", message: format(...args) });
   },
   error: (...args: unknown[]) => {
-    if (currentOutputCallback) {
-      currentOutputCallback({ type: "stderr", message: format(...args) });
-    }
+    currentOutputCallback?.({ type: "stderr", message: format(...args) });
   },
   warn: (...args: unknown[]) => {
-    if (currentOutputCallback) {
-      currentOutputCallback({ type: "stderr", message: format(...args) });
-    }
+    currentOutputCallback?.({ type: "stderr", message: format(...args) });
   },
   info: (...args: unknown[]) => {
-    if (currentOutputCallback) {
-      currentOutputCallback({ type: "stdout", message: format(...args) });
-    }
+    currentOutputCallback?.({ type: "stdout", message: format(...args) });
   },
 };
 

app/terminal/worker/ruby.worker.ts

@@ -21,11 +21,27 @@ declare global {
 self.stdout = {
   write(str: string) {
     stdoutBuffer += str;
+    // If buffer contains newlines, flush complete lines immediately
+    if (stdoutBuffer.includes("\n")) {
+      const lines = stdoutBuffer.split("\n");
+      for (let i = 0; i < lines.length - 1; i++) {
+        currentOutputCallback?.({ type: "stdout", message: lines[i] });
+      }
+      stdoutBuffer = lines[lines.length - 1];
+    }
   },
 };
 self.stderr = {
   write(str: string) {
     stderrBuffer += str;
+    // If buffer contains newlines, flush complete lines immediately
+    if (stderrBuffer.includes("\n")) {
+      const lines = stderrBuffer.split("\n");
+      for (let i = 0; i < lines.length - 1; i++) {
+        currentOutputCallback?.({ type: "stderr", message: lines[i] });
+      }
+      stderrBuffer = lines[lines.length - 1];
+    }
   },
 };
 
@@ -55,30 +71,14 @@ async function init(/*_interruptBuffer?: Uint8Array*/): Promise<{
 }
 
 function flushOutput() {
-  if (!currentOutputCallback) return;
-
-  if (stdoutBuffer) {
-    const lines = stdoutBuffer.split("\n");
-    for (let i = 0; i < lines.length - 1; i++) {
-      currentOutputCallback({ type: "stdout", message: lines[i] });
-    }
-    stdoutBuffer = lines[lines.length - 1];
-  }
-  // Final flush if there's remaining non-empty text
+  // Flush any remaining non-empty text without newlines
   if (stdoutBuffer && stdoutBuffer.trim()) {
-    currentOutputCallback({ type: "stdout", message: stdoutBuffer });
+    currentOutputCallback?.({ type: "stdout", message: stdoutBuffer });
   }
   stdoutBuffer = "";
 
-  if (stderrBuffer) {
-    const lines = stderrBuffer.split("\n");
-    for (let i = 0; i < lines.length - 1; i++) {
-      currentOutputCallback({ type: "stderr", message: lines[i] });
-    }
-    stderrBuffer = lines[lines.length - 1];
-  }
   if (stderrBuffer && stderrBuffer.trim()) {
-    currentOutputCallback({ type: "stderr", message: stderrBuffer });
+    currentOutputCallback?.({ type: "stderr", message: stderrBuffer });
   }
   stderrBuffer = "";
 }
@@ -120,9 +120,6 @@ async function runCode(
 
     const result = rubyVM.eval(code);
 
-    // Flush any buffered output
-    flushOutput();
-
     const resultStr = await result.callAsync("inspect");
 
     // Add result to output if it's not nil and not empty
@@ -132,13 +129,14 @@ async function runCode(
     });
   } catch (e) {
     console.log(e);
-    flushOutput();
 
     onOutput({
       type: "error",
       message: formatRubyError(e, false),
     });
   } finally {
+    // Flush any buffered output
+    flushOutput();
     currentOutputCallback = null;
   }
 
@@ -177,18 +175,16 @@ async function runFile(
 
     // Run the specified file
     rubyVM.eval(`load ${JSON.stringify(name)}`);
-
-    // Flush any buffered output
-    flushOutput();
   } catch (e) {
     console.log(e);
-    flushOutput();
 
     onOutput({
       type: "error",
       message: formatRubyError(e, true),
     });
   } finally {
+    // Flush any buffered output
+    flushOutput();
     currentOutputCallback = null;
   }
 

package-lock.json

@@ -48,7 +48,6 @@
     "remark-gfm": "^4.0.1",
     "remark-remove-comments": "^1.1.1",
     "swr": "^2.3.6",
-    "typescript": "^5.9.3",
     "zod": "^4.0.17"
   },
   "devDependencies": {
@@ -71,6 +70,7 @@
     "prisma": "^6.18.0",
     "tailwindcss": "^4",
     "tsx": "^4.20.6",
+    "typescript": "5.9.3",
     "wrangler": "^4.27.0"
   }
 }