fix: actually implement pipe sequences (#222)

dsherret · Jan 26, 2024 · a7e0b96 · a7e0b96
1 parent ed770cd
commit a7e0b96
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/mod.test.ts b/mod.test.ts
@@ -1083,6 +1083,11 @@ Deno.test("command .lines()", async () => {
 });
 
 Deno.test("piping in command", async () => {
+  await withTempDir(async (tempDir) => {
+    const result = await $`echo 1 | cat - > output.txt`.cwd(tempDir).text();
+    assertEquals(result, "");
+    assertEquals(tempDir.join("output.txt").readTextSync(), "1\n");
+  });
   {
     const result = await $`echo 1 | cat -`.text();
     assertEquals(result, "1");

diff --git a/src/shell.ts b/src/shell.ts
@@ -995,21 +995,12 @@ async function executePipeSequence(sequence: PipeSequence, context: Context): Pr
   let lastOutput = context.stdin;
   let nextInner: PipelineInner | undefined = sequence;
   while (nextInner != null) {
+    let innerCommand: Command;
     switch (nextInner.kind) {
       case "pipeSequence":
         switch (nextInner.op) {
           case "stdout": {
-            const buffer = new PipeSequencePipe();
-            const newContext = context.withInner({
-              stdout: new ShellPipeWriter("piped", buffer),
-              stdin: lastOutput,
-            });
-            const commandPromise = executeCommand(nextInner.current, newContext);
-            waitTasks.push(commandPromise);
-            commandPromise.finally(() => {
-              buffer.close();
-            });
-            lastOutput = buffer;
+            innerCommand = nextInner.current;
             break;
           }
           case "stdoutstderr": {
@@ -1025,9 +1016,22 @@ async function executePipeSequence(sequence: PipeSequence, context: Context): Pr
         nextInner = nextInner.next;
         break;
       case "command":
+        innerCommand = nextInner;
         nextInner = undefined;
         break;
     }
+
+    const buffer = new PipeSequencePipe();
+    const newContext = context.withInner({
+      stdout: new ShellPipeWriter("piped", buffer),
+      stdin: lastOutput,
+    });
+    const commandPromise = executeCommand(innerCommand, newContext);
+    waitTasks.push(commandPromise);
+    commandPromise.finally(() => {
+      buffer.close();
+    });
+    lastOutput = buffer;
   }
   waitTasks.push(
     pipeCommandPipeReaderToWriterSync(lastOutput, context.stdout, context.signal)