make-fetch 3.1.1 → 3.1.3

package/index.js

@@ -7,7 +7,8 @@ export function makeFetch (handler, {
   Response = globalThis.Response
 } = {}) {
   return async function fetch (...requestOptions) {
-    const request = new Request(...requestOptions)
+    const isAlreadyRequest = requestOptions[0] instanceof Request
+    const request = isAlreadyRequest ? requestOptions[0] : new Request(...requestOptions)
 
     const { body = null, ...responseOptions } = await handler(request)
 
@@ -150,6 +151,8 @@ function matches (request, route, property) {
     return areEqual(route.hostname, new URL(request.url).hostname)
   } else if (property === 'protocol') {
     return areEqual(route.protocol, new URL(request.url).protocol)
+  } else if (property === 'method') {
+    return areEqual(route.method, request.method.toUpperCase())
   } else {
     const routeProperty = route[property]
     const requestProperty = request[property]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "make-fetch",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "Implement your own `fetch()` with node.js streams",
   "main": "index.js",
   "type": "module",

package/test.js

@@ -31,6 +31,36 @@ test('Basic makeFetch test', async (t) => {
   t.end()
 })
 
+test.only('Basic makeFetch test with Request object', async (t) => {
+  const fetch = makeFetch(({ url }) => {
+    return {
+      status: 200,
+      statusText: 'OK',
+      headers: {
+        url
+      },
+      body: intoAsyncIterable(url)
+    }
+  })
+
+  const toFetch = new Request('example://hostname/pathname')
+
+  const response = await fetch(toFetch)
+
+  t.ok(response.ok, 'response was OK')
+
+  const body = await response.text()
+
+  t.equal(body, toFetch.url, 'got expected response body')
+
+  t.equal(response.headers.get('url'), toFetch.url, 'got expected response headers')
+
+  t.equal(response.statusText, 'OK', 'got expected status text')
+
+  t.end()
+})
+
+
 test('Basic router tests', async (t) => {
   const { fetch, router } = makeRoutedFetch()