propose cleanup

apollographql · Oct 17, 2023 · 50f387f · 50f387f
1 parent dc77590
commit 50f387f
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/src/HTTPCache.ts b/src/HTTPCache.ts
@@ -5,11 +5,7 @@ import nodeFetch, {
 } from 'node-fetch';
 import CachePolicy from 'http-cache-semantics';
 import type { Options as HttpCacheSemanticsOptions } from 'http-cache-semantics';
-import type {
-  Fetcher,
-  FetcherResponse,
-  FetcherRequestInit,
-} from '@apollo/utils.fetcher';
+import type { Fetcher, FetcherResponse } from '@apollo/utils.fetcher';
 import {
   type KeyValueCache,
   InMemoryLRUCache,
@@ -53,7 +49,7 @@ export class HTTPCache<CO extends CacheOptions = CacheOptions> {
 
   async fetch(
     url: URL,
-    requestOpts: FetcherRequestInit = {},
+    requestOpts: RequestOptions<CO> = {},
     cache?: {
       cacheKey?: string;
       cacheOptions?:
@@ -86,7 +82,7 @@ export class HTTPCache<CO extends CacheOptions = CacheOptions> {
       const response = await this.httpFetch(urlString, requestOpts);
 
       const policy = new CachePolicy(
-        policyRequestFrom<CO>(urlString, requestOpts),
+        policyRequestFrom(urlString, requestOpts),
         policyResponseFrom(response),
         cache?.httpCacheSemanticsCachePolicyOptions,
       ) as SneakyCachePolicy;
@@ -114,7 +110,7 @@ export class HTTPCache<CO extends CacheOptions = CacheOptions> {
       (ttlOverride && policy.age() < ttlOverride) ||
       (!ttlOverride &&
         policy.satisfiesWithoutRevalidation(
-          policyRequestFrom<CO>(urlString, requestOpts),
+          policyRequestFrom(urlString, requestOpts),
         ))
     ) {
       // Either the cache entry was created with an explicit TTL override (ie,
@@ -146,9 +142,9 @@ export class HTTPCache<CO extends CacheOptions = CacheOptions> {
       // still re-write to the cache, because we might need to update the TTL or
       // other aspects of the cache policy based on the headers we got back.
       const revalidationHeaders = policy.revalidationHeaders(
-        policyRequestFrom<CO>(urlString, requestOpts),
+        policyRequestFrom(urlString, requestOpts),
       );
-      const revalidationRequest: RequestOptions<CO> = {
+      const revalidationRequest = {
         ...requestOpts,
         headers: cachePolicyHeadersToFetcherHeadersInit(revalidationHeaders),
       };
@@ -158,7 +154,7 @@ export class HTTPCache<CO extends CacheOptions = CacheOptions> {
       );
 
       const { policy: revalidatedPolicy, modified } = policy.revalidatedPolicy(
-        policyRequestFrom<CO>(urlString, revalidationRequest),
+        policyRequestFrom(urlString, revalidationRequest),
         policyResponseFrom(revalidationResponse),
       ) as unknown as { policy: SneakyCachePolicy; modified: boolean };