Export constructor options from node/browser files

serviejs · May 19, 2019 · cfc17c8 · cfc17c8
1 parent 4a3617c
commit cfc17c8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/browser.ts b/src/browser.ts
@@ -5,14 +5,16 @@ import {
   CommonBody,
   useRawBody,
   EmptyBody,
-  RequestOptions,
-  ResponseOptions,
+  CommonRequestOptions,
+  CommonResponseOptions,
   CommonResponse,
   CommonRequest
 } from "./common";
 
 export type RawBody = ReadableStream | ArrayBuffer | string;
 export type CreateBody = RawBody | EmptyBody;
+export type RequestOptions = CommonRequestOptions<CreateBody>;
+export type ResponseOptions = CommonResponseOptions;
 
 export * from "./headers";
 export * from "./signal";
@@ -188,7 +190,7 @@ export class Request extends Body implements CommonRequest<RawBody> {
   signal: Signal;
   trailer: Promise<Headers>;
 
-  constructor(input: string | Request, init: RequestOptions<CreateBody> = {}) {
+  constructor(input: string | Request, init: RequestOptions = {}) {
     // Clone request or use passed options object.
     const opts = typeof input === "string" ? init : input.clone();
     const headers = new Headers(init.headers || opts.headers);

diff --git a/src/common.ts b/src/common.ts
@@ -19,7 +19,7 @@ export type EmptyBody = null | undefined;
 /**
  * Body constructor shape.
  */
-export type BodyConstructor<T, U extends T> = {
+export type CommonBodyConstructor<T, U extends T> = {
   new (body: T | EmptyBody, headers: Headers): CommonBody<U>;
 };
 
@@ -40,7 +40,7 @@ export interface CommonBody<T> {
 /**
  * Request configuration.
  */
-export interface RequestOptions<T> {
+export interface CommonRequestOptions<T> {
   method?: string;
   body?: T;
   signal?: Signal;
@@ -61,7 +61,7 @@ export interface CommonRequest<T> extends CommonBody<T> {
 /**
  * Response configuration.
  */
-export interface ResponseOptions {
+export interface CommonResponseOptions {
   status?: number;
   statusText?: string;
   headers?: HeadersInit;

diff --git a/src/node.ts b/src/node.ts
@@ -6,13 +6,15 @@ import {
   CommonBody,
   useRawBody,
   EmptyBody,
-  RequestOptions,
-  ResponseOptions,
+  CommonRequestOptions,
+  CommonResponseOptions,
   CommonRequest
 } from "./common";
 
 export type RawBody = Readable | Buffer | string;
 export type CreateBody = RawBody | ArrayBuffer | EmptyBody;
+export type RequestOptions = CommonRequestOptions<CreateBody>;
+export type ResponseOptions = CommonResponseOptions;
 
 export * from "./headers";
 export * from "./signal";
@@ -182,7 +184,7 @@ export class Request extends Body implements CommonRequest<RawBody> {
   signal: Signal;
   trailer: Promise<Headers>;
 
-  constructor(input: string | Request, init: RequestOptions<CreateBody> = {}) {
+  constructor(input: string | Request, init: RequestOptions = {}) {
     // Clone request or use passed options object.
     const opts = typeof input === "string" ? init : input.clone();
     const headers = new Headers(init.headers || opts.headers);