Add Terminal to NodeContext and BunContext (#282)

Effect-TS · Nov 17, 2023 · 534cb34 · 534cb34
1 parent d8e2234
commit 534cb34
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/.changeset/many-crabs-develop.md b/.changeset/many-crabs-develop.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-node": patch
+---
+
+add Terminal to NodeContext and BunContext
diff --git a/.changeset/rare-badgers-brush.md b/.changeset/rare-badgers-brush.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-node": patch
+---
+
+fix bug where keypress could still be emit after terminal was quit
diff --git a/packages/platform-bun/src/BunContext.ts b/packages/platform-bun/src/BunContext.ts
@@ -6,12 +6,17 @@ import * as Layer from "effect/Layer"
 import * as CommandExecutor from "./CommandExecutor.js"
 import * as FileSystem from "./FileSystem.js"
 import * as Path from "./Path.js"
+import * as Terminal from "./Terminal.js"
 
 /**
  * @since 1.0.0
  * @category models
  */
-export type BunContext = CommandExecutor.CommandExecutor | FileSystem.FileSystem | Path.Path
+export type BunContext =
+  | CommandExecutor.CommandExecutor
+  | FileSystem.FileSystem
+  | Path.Path
+  | Terminal.Terminal
 
 /**
  * @since 1.0.0
@@ -20,5 +25,6 @@ export type BunContext = CommandExecutor.CommandExecutor | FileSystem.FileSystem
 export const layer: Layer.Layer<never, never, BunContext> = pipe(
   FileSystem.layer,
   Layer.merge(Path.layer),
+  Layer.merge(Terminal.layer),
   Layer.merge(Layer.provideMerge(FileSystem.layer, CommandExecutor.layer))
 )
diff --git a/packages/platform-node/src/NodeContext.ts b/packages/platform-node/src/NodeContext.ts
@@ -6,12 +6,17 @@ import * as Layer from "effect/Layer"
 import * as CommandExecutor from "./CommandExecutor.js"
 import * as FileSystem from "./FileSystem.js"
 import * as Path from "./Path.js"
+import * as Terminal from "./Terminal.js"
 
 /**
  * @since 1.0.0
  * @category models
  */
-export type NodeContext = CommandExecutor.CommandExecutor | FileSystem.FileSystem | Path.Path
+export type NodeContext =
+  | CommandExecutor.CommandExecutor
+  | FileSystem.FileSystem
+  | Path.Path
+  | Terminal.Terminal
 
 /**
  * @since 1.0.0
@@ -20,5 +25,6 @@ export type NodeContext = CommandExecutor.CommandExecutor | FileSystem.FileSyste
 export const layer: Layer.Layer<never, never, NodeContext> = pipe(
   FileSystem.layer,
   Layer.merge(Path.layer),
+  Layer.merge(Terminal.layer),
   Layer.merge(Layer.provideMerge(FileSystem.layer, CommandExecutor.layer))
 )
diff --git a/packages/platform-node/src/internal/terminal.ts b/packages/platform-node/src/internal/terminal.ts
@@ -48,8 +48,9 @@ export const make = (
         }
         if (shouldQuit(userInput)) {
           resume(Effect.fail(new Terminal.QuitException()))
+        } else {
+          resume(Effect.succeed(userInput))
         }
-        resume(Effect.succeed(userInput))
       }
       input.once("keypress", handleKeypress)
       return Effect.sync(() => {
@@ -74,7 +75,8 @@ export const make = (
       )
 
     return Terminal.Terminal.of({
-      columns: output.columns,
+      // The columns property can be undefined if stdout was redirected
+      columns: output.columns || 0,
       readInput,
       display
     })