Merge branch 'main' into feat/help/skip-version-checks-if-it-will-cau…

…se-permission-prompts
c4spar · Feb 7, 2024 · 855e144 · 855e144
2 parents f54d4d7 + bcc7552
commit 855e144
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/ansi/cursor_position.ts b/ansi/cursor_position.ts
@@ -10,8 +10,8 @@ export interface Cursor {
 export interface CursorPositionOptions {
   writer?: Deno.WriterSync;
   reader?: Deno.ReaderSync & {
-    readonly rid: number;
     setRaw(mode: boolean, options?: Deno.SetRawOptions): void;
+    isTerminal(): boolean;
   };
 }
 

diff --git a/ansi/tty.ts b/ansi/tty.ts
@@ -6,8 +6,8 @@ import { Cursor, getCursorPosition } from "./cursor_position.ts";
 export interface TtyOptions {
   writer?: Deno.WriterSync;
   reader?: Deno.ReaderSync & {
-    readonly rid: number;
     setRaw(mode: boolean, options?: Deno.SetRawOptions): void;
+    isTerminal(): boolean;
   };
 }
 

diff --git a/prompt/_generic_prompt.ts b/prompt/_generic_prompt.ts
@@ -71,8 +71,8 @@ export interface GenericPromptOptions<TValue, TRawValue> {
   prefix?: string;
   /** Change the prompt input stream. */
   reader?: Deno.Reader & {
-    readonly rid: number;
     setRaw(mode: boolean, options?: Deno.SetRawOptions): void;
+    isTerminal(): boolean;
   };
   /** Change the prompt output stream. */
   writer?: Deno.WriterSync;
@@ -87,8 +87,8 @@ export interface GenericPromptSettings<TValue, TRawValue>
   cbreak: boolean;
   tty: Tty;
   reader: Deno.Reader & {
-    readonly rid: number;
     setRaw(mode: boolean, options?: Deno.SetRawOptions): void;
+    isTerminal(): boolean;
   };
   writer: Deno.WriterSync;
 }
@@ -356,7 +356,7 @@ export abstract class GenericPrompt<
   /** Read user input from stdin. */
   #readChar = async (): Promise<Uint8Array> => {
     const buffer = new Uint8Array(8);
-    const isTty = Deno.isatty(this.settings.reader.rid);
+    const isTty = this.settings.reader.isTerminal();
 
     if (isTty) {
       this.settings.reader.setRaw(