command-stream 0.7.1 → 0.8.2

package/src/shell-parser.mjs

@@ -19,7 +19,7 @@ const TokenType = {
   REDIRECT_OUT: '>',
   REDIRECT_APPEND: '>>',
   REDIRECT_IN: '<',
-  EOF: 'eof'
+  EOF: 'eof',
 };
 
 /**
@@ -28,15 +28,17 @@ const TokenType = {
 function tokenize(command) {
   const tokens = [];
   let i = 0;
-  
+
   while (i < command.length) {
     // Skip whitespace
     while (i < command.length && /\s/.test(command[i])) {
       i++;
     }
-    
-    if (i >= command.length) break;
-    
+
+    if (i >= command.length) {
+      break;
+    }
+
     // Check for operators
     if (command[i] === '&' && command[i + 1] === '&') {
       tokens.push({ type: TokenType.AND, value: '&&' });
@@ -70,18 +72,17 @@ function tokenize(command) {
       let word = '';
       let inQuote = false;
       let quoteChar = '';
-      
+
       while (i < command.length) {
         const char = command[i];
-        
+
         if (!inQuote) {
           if (char === '"' || char === "'") {
             inQuote = true;
             quoteChar = char;
             word += char;
             i++;
-          } else if (/\s/.test(char) || 
-                     '&|;()<>'.includes(char)) {
+          } else if (/\s/.test(char) || '&|;()<>'.includes(char)) {
             break;
           } else if (char === '\\' && i + 1 < command.length) {
             // Handle escape sequences
@@ -101,8 +102,11 @@ function tokenize(command) {
             quoteChar = '';
             word += char;
             i++;
-          } else if (char === '\\' && i + 1 < command.length && 
-                     (command[i + 1] === quoteChar || command[i + 1] === '\\')) {
+          } else if (
+            char === '\\' &&
+            i + 1 < command.length &&
+            (command[i + 1] === quoteChar || command[i + 1] === '\\')
+          ) {
             // Handle escaped quotes and backslashes inside quotes
             word += char;
             i++;
@@ -116,13 +120,13 @@ function tokenize(command) {
           }
         }
       }
-      
+
       if (word) {
         tokens.push({ type: TokenType.WORD, value: word });
       }
     }
   }
-  
+
   tokens.push({ type: TokenType.EOF, value: '' });
   return tokens;
 }
@@ -135,52 +139,56 @@ class ShellParser {
     this.tokens = tokenize(command);
     this.pos = 0;
   }
-  
+
   current() {
     return this.tokens[this.pos] || { type: TokenType.EOF, value: '' };
   }
-  
+
   peek() {
     return this.tokens[this.pos + 1] || { type: TokenType.EOF, value: '' };
   }
-  
+
   consume() {
     const token = this.current();
     this.pos++;
     return token;
   }
-  
+
   /**
    * Parse the main command sequence
    */
   parse() {
     return this.parseSequence();
   }
-  
+
   /**
    * Parse a sequence of commands connected by &&, ||, ;
    */
   parseSequence() {
     const commands = [];
     const operators = [];
-    
+
     // Parse first command
     let cmd = this.parsePipeline();
     if (cmd) {
       commands.push(cmd);
     }
-    
+
     // Parse additional commands with operators
-    while (this.current().type !== TokenType.EOF && 
-           this.current().type !== TokenType.RPAREN) {
+    while (
+      this.current().type !== TokenType.EOF &&
+      this.current().type !== TokenType.RPAREN
+    ) {
       const op = this.current();
-      
-      if (op.type === TokenType.AND || 
-          op.type === TokenType.OR || 
-          op.type === TokenType.SEMICOLON) {
+
+      if (
+        op.type === TokenType.AND ||
+        op.type === TokenType.OR ||
+        op.type === TokenType.SEMICOLON
+      ) {
         operators.push(op.type);
         this.consume();
-        
+
         cmd = this.parsePipeline();
         if (cmd) {
           commands.push(cmd);
@@ -189,29 +197,29 @@ class ShellParser {
         break;
       }
     }
-    
+
     if (commands.length === 1 && operators.length === 0) {
       return commands[0];
     }
-    
+
     return {
       type: 'sequence',
       commands,
-      operators
+      operators,
     };
   }
-  
+
   /**
    * Parse a pipeline (commands connected by |)
    */
   parsePipeline() {
     const commands = [];
-    
+
     let cmd = this.parseCommand();
     if (cmd) {
       commands.push(cmd);
     }
-    
+
     while (this.current().type === TokenType.PIPE) {
       this.consume();
       cmd = this.parseCommand();
@@ -219,17 +227,17 @@ class ShellParser {
         commands.push(cmd);
       }
     }
-    
+
     if (commands.length === 1) {
       return commands[0];
     }
-    
+
     return {
       type: 'pipeline',
-      commands
+      commands,
     };
   }
-  
+
   /**
    * Parse a single command or subshell
    */
@@ -238,43 +246,45 @@ class ShellParser {
     if (this.current().type === TokenType.LPAREN) {
       this.consume(); // consume (
       const subshell = this.parseSequence();
-      
+
       if (this.current().type === TokenType.RPAREN) {
         this.consume(); // consume )
       }
-      
+
       return {
         type: 'subshell',
-        command: subshell
+        command: subshell,
       };
     }
-    
+
     // Parse simple command
     return this.parseSimpleCommand();
   }
-  
+
   /**
    * Parse a simple command (command + args + redirections)
    */
   parseSimpleCommand() {
     const words = [];
     const redirects = [];
-    
+
     while (this.current().type !== TokenType.EOF) {
       const token = this.current();
-      
+
       if (token.type === TokenType.WORD) {
         words.push(token.value);
         this.consume();
-      } else if (token.type === TokenType.REDIRECT_OUT || 
-                 token.type === TokenType.REDIRECT_APPEND ||
-                 token.type === TokenType.REDIRECT_IN) {
+      } else if (
+        token.type === TokenType.REDIRECT_OUT ||
+        token.type === TokenType.REDIRECT_APPEND ||
+        token.type === TokenType.REDIRECT_IN
+      ) {
         this.consume();
         const target = this.current();
         if (target.type === TokenType.WORD) {
           redirects.push({
             type: token.type,
-            target: target.value
+            target: target.value,
           });
           this.consume();
         }
@@ -282,38 +292,40 @@ class ShellParser {
         break;
       }
     }
-    
+
     if (words.length === 0) {
       return null;
     }
-    
+
     const cmd = words[0];
-    const args = words.slice(1).map(word => {
+    const args = words.slice(1).map((word) => {
       // Remove quotes if present
-      if ((word.startsWith('"') && word.endsWith('"')) ||
-          (word.startsWith("'") && word.endsWith("'"))) {
+      if (
+        (word.startsWith('"') && word.endsWith('"')) ||
+        (word.startsWith("'") && word.endsWith("'"))
+      ) {
         return {
           value: word.slice(1, -1),
           quoted: true,
-          quoteChar: word[0]
+          quoteChar: word[0],
         };
       }
       return {
         value: word,
-        quoted: false
+        quoted: false,
       };
     });
-    
+
     const result = {
       type: 'simple',
       cmd,
-      args
+      args,
     };
-    
+
     if (redirects.length > 0) {
       result.redirects = redirects;
     }
-    
+
     return result;
   }
 }
@@ -325,19 +337,35 @@ export function parseShellCommand(command) {
   try {
     const parser = new ShellParser(command);
     const result = parser.parse();
-    
-    trace('ShellParser', () => `Parsed command | ${JSON.stringify({
-      input: command.slice(0, 100),
-      result
-    }, null, 2)}`);
-    
+
+    trace(
+      'ShellParser',
+      () =>
+        `Parsed command | ${JSON.stringify(
+          {
+            input: command.slice(0, 100),
+            result,
+          },
+          null,
+          2
+        )}`
+    );
+
     return result;
   } catch (error) {
-    trace('ShellParser', () => `Parse error | ${JSON.stringify({
-      command: command.slice(0, 100),
-      error: error.message
-    }, null, 2)}`);
-    
+    trace(
+      'ShellParser',
+      () =>
+        `Parse error | ${JSON.stringify(
+          {
+            command: command.slice(0, 100),
+            error: error.message,
+          },
+          null,
+          2
+        )}`
+    );
+
     // Return null to fallback to sh -c
     return null;
   }
@@ -349,27 +377,27 @@ export function parseShellCommand(command) {
 export function needsRealShell(command) {
   // Check for features we don't handle yet
   const unsupported = [
-    '`',     // Command substitution
-    '$(',    // Command substitution
-    '${',    // Variable expansion
-    '~',     // Home expansion (at start of word)
-    '*',     // Glob patterns
-    '?',     // Glob patterns
-    '[',     // Glob patterns
-    '2>',    // stderr redirection
-    '&>',    // Combined redirection
-    '>&',    // File descriptor duplication
-    '<<',    // Here documents
-    '<<<',   // Here strings
+    '`', // Command substitution
+    '$(', // Command substitution
+    '${', // Variable expansion
+    '~', // Home expansion (at start of word)
+    '*', // Glob patterns
+    '?', // Glob patterns
+    '[', // Glob patterns
+    '2>', // stderr redirection
+    '&>', // Combined redirection
+    '>&', // File descriptor duplication
+    '<<', // Here documents
+    '<<<', // Here strings
   ];
-  
+
   for (const feature of unsupported) {
     if (command.includes(feature)) {
       return true;
     }
   }
-  
+
   return false;
 }
 
-export default { parseShellCommand, needsRealShell };
+export default { parseShellCommand, needsRealShell };