From 4d8e65ead6303d40d87b0c5cc3ac29573e4d7bf8 Mon Sep 17 00:00:00 2001
From: Blake Embrey <hello@blakeembrey.com>
Date: Wed, 22 May 2019 00:08:48 -0700
Subject: [PATCH] Add default body type to `Common` interfaces

---
 src/common.ts | 9 ++++-----
 src/node.ts   | 5 +++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common.ts b/src/common.ts
index 53b2e36..1344391 100644
--- a/src/common.ts
+++ b/src/common.ts
@@ -26,7 +26,7 @@ export type CommonBodyConstructor<T, U extends T> = {
 /**
  * Abstract body shared between node.js and browsers.
  */
-export interface CommonBody<T> {
+export interface CommonBody<T = unknown> {
   $rawBody: T | null | undefined; // Use `undefined` as a mark of "used".
   headers: Headers;
   readonly bodyUsed: boolean;
@@ -51,10 +51,10 @@ export interface CommonRequestOptions<T> {
 /**
  * Request implementation standard.
  */
-export interface CommonRequest<T> extends CommonBody<T> {
+export interface CommonRequest<T = unknown> extends CommonBody<T> {
+  url: string
   method: string
   signal: Signal
-  headers: Headers
   trailer: Promise<Headers>
 }
 
@@ -71,9 +71,8 @@ export interface CommonResponseOptions {
 /**
  * Response implementation standard.
  */
-export interface CommonResponse<T> extends CommonBody<T> {
+export interface CommonResponse<T = unknown> extends CommonBody<T> {
   status: number
   statusText: string
-  headers: Headers
   trailer: Promise<Headers>
 }
diff --git a/src/node.ts b/src/node.ts
index 91d084c..56f9e28 100644
--- a/src/node.ts
+++ b/src/node.ts
@@ -8,7 +8,8 @@ import {
   EmptyBody,
   CommonRequestOptions,
   CommonResponseOptions,
-  CommonRequest
+  CommonRequest,
+  CommonResponse
 } from "./common";
 
 export type RawBody = Readable | Buffer | string;
@@ -217,7 +218,7 @@ export class Request extends Body implements CommonRequest<RawBody> {
 /**
  * Node.js `Response` implementation.
  */
-export class Response extends Body {
+export class Response extends Body implements CommonResponse<RawBody> {
   status: number;
   statusText: string;
   trailer: Promise<Headers>;