make-fetch 2.2.1 → 2.3.2

package/README.md

@@ -35,4 +35,4 @@ console.log(await response.text())
 ## Gotchas
 
 - The `response.body` is an Async Iterable of Buffer objects rather than a WHATWG ReadableStream
-- Eventually ReadableStream will become asyn citerable so you'll be able to iterate either normally
+- Eventually ReadableStream will become async iterable so you'll be able to iterate either normally

package/index.d.ts

@@ -0,0 +1,74 @@
+declare module 'make-fetch' {
+  export interface NormalizedRequest {
+    url: string
+    headers: RawHeaders
+    method: string
+    body: AsyncIterableIterator<Uint8Array>
+    referrer?: string
+
+    // Hard to add types for. 😂
+    signal?: any
+  }
+
+  export interface HandlerResponse {
+    statusCode?: number
+    statusText?: string
+    headers?: RawHeaders
+    data?: AsyncIterableIterator<Uint8Array | string>
+  }
+
+  export interface RawHeaders {
+    [name: string]: string | undefined
+  }
+
+  // TODO: Support actual fetch Headers
+  export interface Headers {
+    append(name: string, value: string) : void
+    delete(name: string) : void
+    entries() : IterableIterator<[string, string]>
+    get(name: string): string | undefined
+    has(name: string) : boolean
+    keys() : IterableIterator<string>
+    set(name: string, value: string) : void
+    values() : IterableIterator<string>
+  }
+
+  export interface Request {
+    // This is kind of a pain to document
+    session?: any
+    signal?: any
+
+    url?: string
+    headers?: Headers | RawHeaders
+    method?: string,
+    body?: string | Uint8Array | AsyncIterableIterator<Uint8Array|string>,
+    referrer?: string,
+  }
+
+  export interface Body {
+   // TODO: Fill this in
+  }
+
+  export interface Response {
+    url: string
+    headers: Headers
+    status: number
+    statusText: string
+    ok: boolean
+    useFinalURL: true
+    body: Body
+    arrayBuffer() : Promise<ArrayBuffer>
+    text(): Promise<string>
+    json(): Promise<any>
+  }
+
+  export interface Fetch {
+    (request: string | Request, info? : Request): Promise<Response>
+  }
+
+  export interface FetchHandler {
+    (request: NormalizedRequest): Promise<HandlerResponse>
+  }
+
+  export default function makeFetch(handler: FetchHandler) : Fetch
+}

package/index.js

@@ -14,6 +14,7 @@ module.exports = function makeFetch (handler) {
     }
 
     const {
+      session,
       url,
       headers: rawHeaders,
       method: rawMethod,
@@ -24,7 +25,7 @@ module.exports = function makeFetch (handler) {
 
     const headers = rawHeaders ? headersToObject(rawHeaders) : {}
     const method = (rawMethod || 'GET').toUpperCase()
-    const body = rawBody ? bodyToIterator(rawBody) : null
+    const body = rawBody ? bodyToIterator(rawBody, session) : null
 
     const {
       statusCode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "make-fetch",
-  "version": "2.2.1",
+  "version": "2.3.2",
   "description": "Implement your own `fetch()` with node.js streams",
   "main": "index.js",
   "scripts": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "concat-stream": "^2.0.0",
     "fetch-headers": "^2.0.0",
-    "fetch-request-body-to-async-iterator": "^1.0.2",
+    "fetch-request-body-to-async-iterator": "^1.0.3",
     "statuses": "^2.0.0",
     "web-streams-polyfill": "^3.0.0"
   },

package/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "target": "es2018",
+    "moduleResolution": "node",
+    "module": "commonjs",
+    "lib": [      
+      "dom",
+      "es2018"
+    ]
+  }
+}