fix(fetchache): respect additional parameters passed to fetch

ardatan · Sep 9, 2022 · f1db96f · f1db96f
1 parent 8606f54
commit f1db96f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.changeset/wicked-pumas-roll.md b/.changeset/wicked-pumas-roll.md
@@ -0,0 +1,5 @@
+---
+'fetchache': patch
+---
+
+Respect additional parameters to fetch
diff --git a/packages/fetchache/src/index.ts b/packages/fetchache/src/index.ts
@@ -5,7 +5,7 @@ export interface FetchacheCacheEntry {
   body: string;
 }
 
-type FetchFn = WindowOrWorkerGlobalScope['fetch'];
+type FetchFn = (input: URL | RequestInfo, init: RequestInit, ...rest: any[]) => Promise<Response>;
 
 export interface FetchacheOptions {
   fetch: FetchFn;
@@ -15,7 +15,7 @@ export interface FetchacheOptions {
 }
 
 export function fetchFactory({ fetch, Response, cache }: FetchacheOptions): FetchFn {
-  return async (input, init) => {
+  return async (input: URL | RequestInfo, init: RequestInit, ...rest: any[]) => {
     let url: string;
     let method = 'GET';
     let headers: HeadersInit = {};
@@ -34,7 +34,7 @@ export function fetchFactory({ fetch, Response, cache }: FetchacheOptions): Fetc
     const entry = await cache.get(cacheKey);
     const policyRequest = policyRequestFrom(url, method, headers);
     if (!entry) {
-      const response = await fetch(input, init);
+      const response = await fetch(input, init, ...rest);
 
       const policy = new CachePolicy(policyRequest, policyResponseFrom(response));
 
@@ -65,7 +65,7 @@ export function fetchFactory({ fetch, Response, cache }: FetchacheOptions): Fetc
           ...headers,
           ...(revalidationHeaders as HeadersInit),
         },
-      });
+      }, ...rest);
 
       const revalidationPolicyRequest = policyRequestFrom(url, method, revalidationHeaders as HeadersInit);