From 040d9da4a81f278270d0f73243815f89e4ce1b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Wi=C4=99cek?= <gitzzz14@gmail.com>
Date: Wed, 26 Jun 2024 10:31:52 +0200
Subject: [PATCH] Refactor responseHeader to responseHeaders (#3375)

---
 test/types/dispatcher.test-d.ts | 22 ++++++++++++++++++++++
 types/dispatcher.d.ts           |  6 +++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/test/types/dispatcher.test-d.ts b/test/types/dispatcher.test-d.ts
index 3185726bbb7..057cfe66d8f 100644
--- a/test/types/dispatcher.test-d.ts
+++ b/test/types/dispatcher.test-d.ts
@@ -47,6 +47,8 @@ expectAssignable<Dispatcher>(new Dispatcher())
     expectAssignable<Error | null>(err)
     expectAssignable<Dispatcher.ConnectData>(data)
   }))
+  expectAssignable<Promise<Dispatcher.ConnectData>>(dispatcher.connect({ origin: '', path: '', responseHeaders: 'raw' }))
+  expectAssignable<Promise<Dispatcher.ConnectData>>(dispatcher.connect({ origin: '', path: '', responseHeaders: null }))
 
   // request
   expectAssignable<Promise<Dispatcher.ResponseData>>(dispatcher.request({ origin: '', path: '', method: 'GET', maxRedirections: 0 }))
@@ -62,6 +64,8 @@ expectAssignable<Dispatcher>(new Dispatcher())
     expectAssignable<Error | null>(err)
     expectAssignable<Dispatcher.ResponseData>(data)
   }))
+  expectAssignable<Promise<Dispatcher.ResponseData>>(dispatcher.request({ origin: '', path: '', method: 'GET', responseHeaders: 'raw' }))
+  expectAssignable<Promise<Dispatcher.ResponseData>>(dispatcher.request({ origin: '', path: '', method: 'GET', responseHeaders: null }))
 
   // pipeline
   expectAssignable<Duplex>(dispatcher.pipeline({ origin: '', path: '', method: 'GET', maxRedirections: 0 }, data => {
@@ -72,6 +76,14 @@ expectAssignable<Dispatcher>(new Dispatcher())
     expectAssignable<Dispatcher.PipelineHandlerData>(data)
     return new Readable()
   }))
+  expectAssignable<Duplex>(dispatcher.pipeline({ origin: '', path: '', method: 'GET', responseHeaders: 'raw' }, data => {
+    expectAssignable<Dispatcher.PipelineHandlerData>(data)
+    return new Readable()
+  }))
+  expectAssignable<Duplex>(dispatcher.pipeline({ origin: '', path: '', method: 'GET', responseHeaders: null }, data => {
+    expectAssignable<Dispatcher.PipelineHandlerData>(data)
+    return new Readable()
+  }))
 
   // stream
   expectAssignable<Promise<Dispatcher.StreamData>>(dispatcher.stream({ origin: '', path: '', method: 'GET', maxRedirections: 0 }, data => {
@@ -104,6 +116,14 @@ expectAssignable<Dispatcher>(new Dispatcher())
       expectAssignable<Dispatcher.StreamData>(data)
     }
   ))
+  expectAssignable<Promise<Dispatcher.StreamData>>(dispatcher.stream({ origin: '', path: '', method: 'GET', responseHeaders: 'raw' }, data => {
+    expectAssignable<Dispatcher.StreamFactoryData>(data)
+    return new Writable()
+  }))
+  expectAssignable<Promise<Dispatcher.StreamData>>(dispatcher.stream({ origin: '', path: '', method: 'GET', responseHeaders: null }, data => {
+    expectAssignable<Dispatcher.StreamFactoryData>(data)
+    return new Writable()
+  }))
 
   // upgrade
   expectAssignable<Promise<Dispatcher.UpgradeData>>(dispatcher.upgrade({ path: '', maxRedirections: 0 }))
@@ -111,6 +131,8 @@ expectAssignable<Dispatcher>(new Dispatcher())
     expectAssignable<Error | null>(err)
     expectAssignable<Dispatcher.UpgradeData>(data)
   }))
+  expectAssignable<Promise<Dispatcher.UpgradeData>>(dispatcher.upgrade({ path: '', responseHeaders: 'raw' }))
+  expectAssignable<Promise<Dispatcher.UpgradeData>>(dispatcher.upgrade({ path: '', responseHeaders: null }))
 
   // close
   expectAssignable<Promise<void>>(dispatcher.close())
diff --git a/types/dispatcher.d.ts b/types/dispatcher.d.ts
index 0aa2aba00e3..05f0093c3fd 100644
--- a/types/dispatcher.d.ts
+++ b/types/dispatcher.d.ts
@@ -139,7 +139,7 @@ declare namespace Dispatcher {
     /** Default: false */
     redirectionLimitReached?: boolean;
     /** Default: `null` */
-    responseHeader?: 'raw' | null;
+    responseHeaders?: 'raw' | null;
   }
   export interface RequestOptions extends DispatchOptions {
     /** Default: `null` */
@@ -153,7 +153,7 @@ declare namespace Dispatcher {
     /** Default: `null` */
     onInfo?: (info: { statusCode: number, headers: Record<string, string | string[]> }) => void;
     /** Default: `null` */
-    responseHeader?: 'raw' | null;
+    responseHeaders?: 'raw' | null;
     /** Default: `64 KiB` */
     highWaterMark?: number;
   }
@@ -176,7 +176,7 @@ declare namespace Dispatcher {
     /** Default: false */
     redirectionLimitReached?: boolean;
     /** Default: `null` */
-    responseHeader?: 'raw' | null;
+    responseHeaders?: 'raw' | null;
   }
   export interface ConnectData {
     statusCode: number;