fetchbasequery 0.1.0 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fetchbasequery",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Library for easily make HTTP queries without mass of boilerplate code.",
   "type": "module",
   "main": "src/fetchBaseQuery.js",

package/src/baseQuery.js

@@ -1,5 +1,6 @@
 import responseFromError from './helpers/responseFromError.js'
 import purge from './helpers/purge.js'
+import mergeHeaders from './helpers/mergeHeaders.js'
 
 const moduleName = 'fetchBaseQuery/baseQuery'
 
@@ -44,6 +45,8 @@ export default async ({ url: endpoint, request: subject, ...options } = {}) => {
                 )
             }
             subject = url
+        } else if (fetchOptions.headers) {
+            fetchOptions.headers = mergeHeaders(subject.headers, fetchOptions.headers)
         }
         request = new Request(subject, fetchOptions)
         if (debug?.baseQuery) {

package/src/helpers/mergeHeaders.js

@@ -0,0 +1,9 @@
+export default (a, b) => {
+    const result = new Headers(a)
+    b = (b instanceof Headers ? b : new Headers(b))
+    for (let pair of b.entries())
+        result.delete(pair[0])
+    for (let pair of b.entries())
+        result.append(pair[0], pair[1])
+    return result
+}

package/src/helpers/purge.js

@@ -1,4 +1,16 @@
-export default object => Object.fromEntries(
+const purgeObject = object => Object.fromEntries(
     Object.entries(object)
         .filter(entry => entry[1] !== undefined)
 )
+
+const purgeHeaders = headers => {
+    headers.entities().forEach(([ name, value ]) => {
+        if (value === '')
+            headers.delete(name)
+    })
+    return headers
+}
+
+export default object => object instanceof Headers
+    ? purgeHeaders(object)
+    : purgeObject(object)

package/src/middlewares/accessToken.js

@@ -1,5 +1,6 @@
 import responseFromError from '../helpers/responseFromError.js'
 import purge from '../helpers/purge.js'
+import mergeHeaders from '../helpers/mergeHeaders.js'
 
 const moduleName = 'fetchBaseQuery/middlewares/accessToken'
 
@@ -28,10 +29,10 @@ export default (settings = {}) => query => async ({ payload, headers, ...options
     try {
         response = await query({
             ...options,
-            headers: purge({
-                ...(getAuthorizationHeaders(getAccessToken(payload))),
-                ...(headers || {})
-            })
+            headers: mergeHeaders(
+                purge(getAuthorizationHeaders(getAccessToken(payload))),
+                headers || {}
+            )
         })
     } catch (error) {
         if (options.logErrors) {

package/src/middlewares/encodeBody.js

@@ -1,6 +1,7 @@
 import purge from '../helpers/purge.js'
 import encodeJson from '../helpers/encodeJson.js'
 import responseFromError from '../helpers/responseFromError.js'
+import mergeHeaders from '../helpers/mergeHeaders.js'
 
 const moduleName = 'fetchBaseQuery/middlewares/accessToken'
 
@@ -61,12 +62,14 @@ export default (settings = {}) => (query) => async ({ body, headers, ...options
     try {
         response = await query({
             ...options,
-            headers: purge({
-                'Content-Type': contentType instanceof Function
-                    ? contentType({ body })
-                    : contentType,
-                ...(headers || {})
-            }),
+            headers: mergeHeaders(
+                purge({
+                    'Content-Type': contentType instanceof Function
+                        ? contentType({ body })
+                        : contentType
+                }),
+                headers || {}
+            ),
             body: encodeBody(body)
         })
     } catch (error) {

package/types/index.d.ts

@@ -11,7 +11,7 @@ export type FetchOptions = {
     url: URL | string | undefined,
     request: Request | undefined,
     method: string | undefined,
-    headers: object | undefined,
+    headers: Headers | object | undefined,
     body: string
         | object
         | FormData