builtin completion

Author: daviidy

app/EchoCommand.js

@@ -11,13 +11,11 @@ class EchoCommand extends Command {
         // Only write to stdout, never to stderr
         if (!this.outputHandler.isStderr) {
             this.outputHandler.write(output, true);
-        } else {
+        } else if (this.outputHandler.isStderr && args.length > 0) {
             // If stderr and redirection file and there is an error, write to ouput file
-            if(args.length > 0) {
-                process.stdout.write(output + '\n');
-            } else {
-                this.outputHandler.writeError(output, true);
-            }
+            process.stdout.write(output + '\n');
+        } else {
+            this.outputHandler.writeError(output, true);
         }
         return { shouldContinue: true };
     }

app/OutputHandler.js

@@ -2,10 +2,11 @@ const fs = require('fs');
 const path = require('path');
 
 class OutputHandler {
-    constructor(outputFile = null, isStderr = false, append = false) {
+    constructor(outputFile = null, isStderr = false, append = false, writeToFile = false) {
         this.outputFile = outputFile;
         this.isStderr = isStderr;
         this.append = append;
+        this.writeToFile = writeToFile;
         this.fileInitialized = false;
     }
 
@@ -35,20 +36,18 @@ class OutputHandler {
     }
 
     write(message, newLine = true) {
-        if (this.outputFile && this.append) {
-            try {
-                // Ensure file is initialized first
-                this._initializeFile();
-                
-                // Only write if initialization succeeded
-                if (this.fileInitialized) {
-                    const content = newLine ? message + '\n' : message;
-                    fs.appendFileSync(this.outputFile, content);
-                } else {
-                    // Fall back to console
-                    process.stdout.write(newLine ? message + '\n' : message);
-                }
-            } catch (error) {
+        if (this.outputFile) {
+            // Ensure file is initialized first
+            this._initializeFile();
+            
+            // Only write if initialization succeeded
+            if (this.fileInitialized && this.append) {
+                const content = newLine ? message + '\n' : message;
+                fs.appendFileSync(this.outputFile, content);
+            } else if (this.fileInitialized && this.writeToFile) {
+                // If not appending, clear the file
+                fs.writeFileSync(this.outputFile, message + '\n');
+            } else {
                 // Fall back to console
                 process.stdout.write(newLine ? message + '\n' : message);
             }
@@ -72,14 +71,16 @@ class OutputHandler {
             this._initializeFile();
 
             // Only write if initialization succeeded
-            if (this.fileInitialized) {
+            if (this.fileInitialized && this.append) {
                 const content = newLine ? message + '\n' : message;
                 fs.appendFileSync(this.outputFile, content);
+            } else if (this.fileInitialized && this.writeToFile) {
+                // If not appending, clear the file
+                fs.writeFileSync(this.outputFile, message + '\n');
             } else {
                 // Fall back to stderr console
                 process.stderr.write(newLine ? message + '\n' : message);
             }
-
         } else {
             if(this.outputFile) {
                 this._initializeFile();

app/main.js

@@ -145,44 +145,26 @@ class Shell {
 
   async parseCommand(input) {
     const { commandName, args, redirection } = this.getCommandNameAndArgs(input);
-    
-    // if (redirection) {
-    //   // Handle redirections to /tmp directories
-    //   if (redirection.file.startsWith('/tmp/') && redirection.operator === '>>') {
-    //     const dirPath = path.dirname(redirection.file);
-    //     const fs = require('fs');
-        
-    //     // Create parent directories and touch the file
-    //     try {
-    //       fs.mkdirSync(dirPath, { recursive: true });
-          
-    //       // Create empty file if it doesn't exist (like 'touch')
-    //       if (!fs.existsSync(redirection.file)) {
-    //         fs.writeFileSync(redirection.file, '');
-    //       }
-    //     } catch (err) {
-    //       // Silently continue if we can't create the file
-    //     }
-    //   }
-    // }
 
     // Check if it's a builtin command
     const command = this.commandRegistry.getCommand(commandName);
     if (command) {
       if (redirection) {
         const append = redirection?.operator === '2>>' || redirection?.operator === '1>>' || redirection?.operator === '>>';
+        const writeToFile = redirection?.operator === '1>' || redirection?.operator === '2>';
         const isStderr = redirection?.operator.startsWith('2');
         const outputHandler = redirection
-          ? new OutputHandler(redirection.file, isStderr, append)
+          ? new OutputHandler(redirection.file, isStderr, append, writeToFile)
           : this.outputHandler;
         command.outputHandler = outputHandler; // Assign the output handler to the command
       }
       return { command, args };
     } else if (this.commandRegistry.getCommandType(commandName) === CommandRegistry.COMMAND_TYPE.EXTERNAL) {
       const append = redirection?.operator === '2>>' || redirection?.operator === '1>>' || redirection?.operator === '>>';
+      const writeToFile = redirection?.operator === '1>' || redirection?.operator === '2>';
       const isStderr = redirection?.operator.startsWith('2');
       const outputHandler = redirection
-        ? new OutputHandler(redirection.file, isStderr, append)
+        ? new OutputHandler(redirection.file, isStderr, append, writeToFile)
         : this.outputHandler;
 
       const externalCommand = this.commandRegistry.createExternalCommand(

foo.md

@@ -1,6 +1 @@
-
-davefelkf
-cat: nonexistent: No such file or directory
-ls: nonexistent: No such file or directory
-fkdjf
-ls: nonexistent: No such file or directory
+jdfl