fix Response type (#177)

fastify · Jan 31, 2022 · 39415b1 · 39415b1
1 parent 4b28c4b
commit 39415b1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -20,13 +20,13 @@ declare namespace LightMyRequest {
     callback: CallbackFunc
   ): void
 
-  type DispatchFunc = (req: Request, res: Response) => void
+  type DispatchFunc = (req: Request, res: ServerResponse) => void
 
   type CallbackFunc = (err: Error, response: Response) => void
 
   type InjectPayload = string | object | Buffer | NodeJS.ReadableStream
 
-  function isInjection (obj: Request | Response): boolean
+  function isInjection (obj: Request | ServerResponse): boolean
 
   interface InjectOptions {
     url?: string | {
@@ -71,7 +71,9 @@ declare namespace LightMyRequest {
     connection: object
   }
 
-  interface Response extends http.ServerResponse {
+  interface ServerResponse extends http.ServerResponse {} 
+
+  interface Response {
     raw: {
       res: http.ServerResponse,
       req: Request

diff --git a/test/index.test-d.ts b/test/index.test-d.ts
@@ -1,10 +1,10 @@
 import * as http from 'http'
-import { inject, isInjection, Request, Response, DispatchFunc, InjectOptions, Chain } from '../index'
-import { expectType, expectAssignable } from 'tsd'
+import { inject, isInjection, Request, Response, DispatchFunc, InjectOptions, Chain, ServerResponse } from '../index'
+import { expectType, expectAssignable, expectNotAssignable } from 'tsd'
 
 expectAssignable<InjectOptions>({ url: '/' })
 
-const dispatch = function (req: Request, res: Response) {
+const dispatch = function (req: Request, res: ServerResponse) {
   expectType<boolean>(isInjection(req))
   expectType<boolean>(isInjection(res))
 
@@ -17,7 +17,7 @@ const expectResponse = function (res: Response) {
   expectType<Response>(res)
   console.log(res.payload)
   expectAssignable<Function>(res.json)
-  expectAssignable<http.ServerResponse>(res.raw.res)
+  expectAssignable<ServerResponse>(res.raw.res)
   expectAssignable<Request>(res.raw.req)
   console.log(res.cookies)
 }
@@ -88,3 +88,5 @@ expectType<ParsedValue>(parsedValue)
 
 const parsedValueUsingGeneric = response.json<ParsedValue>()
 expectType<ParsedValue>(parsedValueUsingGeneric)
+
+expectNotAssignable<http.ServerResponse>(response)