update

dsherret · Sep 9, 2024 · adbcdd9 · adbcdd9
2 parents 4c699ac + fe63963
commit adbcdd9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,8 @@ jobs:
 
       - name: Install deno
         uses: denoland/setup-deno@v1
-        version: canary
+        with:
+          deno-version: canary
 
       - uses: dprint/[email protected]
         if: runner.os == 'Linux'

diff --git a/src/command.ts b/src/command.ts
@@ -57,7 +57,7 @@ class Deferred<T> {
 
 interface ShellPipeWriterKindWithOptions {
   kind: ShellPipeWriterKind;
-  options?: PipeOptions;
+  options?: StreamPipeOptions;
 }
 
 interface CommandBuilderStateCommand {
@@ -348,8 +348,8 @@ export class CommandBuilder implements PromiseLike<CommandResult> {
 
   /** Set the stdout kind. */
   stdout(kind: ShellPipeWriterKind): CommandBuilder;
-  stdout(kind: WritableStream<Uint8Array>, options?: PipeOptions): CommandBuilder;
-  stdout(kind: ShellPipeWriterKind, options?: PipeOptions): CommandBuilder {
+  stdout(kind: WritableStream<Uint8Array>, options?: StreamPipeOptions): CommandBuilder;
+  stdout(kind: ShellPipeWriterKind, options?: StreamPipeOptions): CommandBuilder {
     return this.#newWithState((state) => {
       if (state.combinedStdoutStderr && kind !== "piped" && kind !== "inheritPiped") {
         throw new Error(
@@ -369,8 +369,8 @@ export class CommandBuilder implements PromiseLike<CommandResult> {
 
   /** Set the stderr kind. */
   stderr(kind: ShellPipeWriterKind): CommandBuilder;
-  stderr(kind: WritableStream<Uint8Array>, options?: PipeOptions): CommandBuilder;
-  stderr(kind: ShellPipeWriterKind, options?: PipeOptions): CommandBuilder {
+  stderr(kind: WritableStream<Uint8Array>, options?: StreamPipeOptions): CommandBuilder;
+  stderr(kind: ShellPipeWriterKind, options?: StreamPipeOptions): CommandBuilder {
     return this.#newWithState((state) => {
       if (state.combinedStdoutStderr && kind !== "piped" && kind !== "inheritPiped") {
         throw new Error(

diff --git a/src/console/utils.ts b/src/console/utils.ts
@@ -79,11 +79,9 @@ function isTerminal(pipe: { isTerminal?(): boolean; rid?: number }) {
     return pipe.isTerminal();
   } else if (
     pipe.rid != null &&
-    // deno-lint-ignore no-deprecated-deno-api
-    typeof Deno.isatty === "function"
+    typeof (Deno as any).isatty === "function"
   ) {
-    // deno-lint-ignore no-deprecated-deno-api
-    return Deno.isatty(pipe.rid);
+    return (Deno as any).isatty(pipe.rid);
   } else {
     throw new Error("Unsupported pipe.");
   }

diff --git a/src/request.test.ts b/src/request.test.ts
@@ -298,7 +298,7 @@ Deno.test("$.request", (t) => {
       let caughtErr: TimeoutError | undefined;
       try {
         await response.text();
-      } catch (err) {
+      } catch (err: any) {
         caughtErr = err;
       }
       if (isNode) {

diff --git a/src/request.ts b/src/request.ts
@@ -329,7 +329,7 @@ export class RequestBuilder implements PromiseLike<RequestResponse> {
   }
 
   /** Pipes the response body to the provided writable stream. */
-  async pipeTo(dest: WritableStream<Uint8Array>, options?: PipeOptions): Promise<void> {
+  async pipeTo(dest: WritableStream<Uint8Array>, options?: StreamPipeOptions): Promise<void> {
     const response = await this.fetch();
     return await response.pipeTo(dest, options);
   }
@@ -582,7 +582,7 @@ export class RequestResponse {
   }
 
   /** Pipes the response body to the provided writable stream. */
-  pipeTo(dest: WritableStream<Uint8Array>, options?: PipeOptions): Promise<void> {
+  pipeTo(dest: WritableStream<Uint8Array>, options?: StreamPipeOptions): Promise<void> {
     return this.#withReturnHandling(() => this.readable.pipeTo(dest, options));
   }