Avoid having to overload the fetch decorators

The timeoutRequest decorator didn't need overloading as the position of the generic saw TypeScript infer the type correctly. This change wraps the other decorators in a function so they can take advantage of this technique. Refs #536, f76f852, gcanti/fp-ts#1761
PREreview · Dec 20, 2022 · b409a43 · b409a43
1 parent 38cb931
commit b409a43
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 20 deletions.
diff --git a/src/app.ts b/src/app.ts
@@ -179,7 +179,7 @@ const getPreprint = (doi: PreprintId['doi']) =>
 
 const getPreprintTitle = flow(
   getPreprint,
-  RTE.local(useStaleCache),
+  RTE.local(useStaleCache()),
   RTE.map(preprint => ({ language: preprint.title.language, title: preprint.title.text })),
 )
 

diff --git a/src/crossref.ts b/src/crossref.ts
@@ -60,8 +60,8 @@ export const isCrossrefPreprintDoi: Refinement<Doi, CrossrefPreprintId['doi']> =
 
 export const getPreprintFromCrossref = flow(
   (doi: CrossrefPreprintId['doi']) => getWork(doi),
-  RTE.local(revalidateIfStale),
-  RTE.local(useStaleCache),
+  RTE.local(revalidateIfStale()),
+  RTE.local(useStaleCache()),
   RTE.local(timeoutRequest(2000)),
   RTE.chainEitherKW(workToPreprint),
   RTE.mapLeft(error =>

diff --git a/src/datacite.ts b/src/datacite.ts
@@ -23,8 +23,8 @@ export const isDatacitePreprintDoi: R.Refinement<Doi, DatacitePreprintId['doi']>
 
 export const getPreprintFromDatacite = flow(
   (doi: DatacitePreprintId['doi']) => getWork(doi),
-  RTE.local(revalidateIfStale),
-  RTE.local(useStaleCache),
+  RTE.local(revalidateIfStale()),
+  RTE.local(useStaleCache()),
   RTE.local(timeoutRequest(2000)),
   RTE.chainEitherKW(dataciteWorkToPreprint),
   RTE.mapLeft(error =>

diff --git a/src/fetch.ts b/src/fetch.ts
@@ -1,18 +1,13 @@
 import * as F from 'fetch-fp-ts'
 import { constVoid } from 'fp-ts/function'
 import * as L from 'logger-fp-ts'
-import { ZenodoEnv } from 'zenodo-ts'
 
-export function useStaleCache(env: ZenodoEnv): ZenodoEnv
-export function useStaleCache(env: F.FetchEnv): F.FetchEnv
-export function useStaleCache<E extends F.FetchEnv>(env: E): E {
-  return { ...env, fetch: (url, init) => env.fetch(url, { cache: 'force-cache', ...init }) }
+export function useStaleCache<E extends F.FetchEnv>(): (env: E) => E {
+  return env => ({ ...env, fetch: (url, init) => env.fetch(url, { cache: 'force-cache', ...init }) })
 }
 
-export function revalidateIfStale(env: ZenodoEnv): ZenodoEnv
-export function revalidateIfStale(env: F.FetchEnv): F.FetchEnv
-export function revalidateIfStale<E extends F.FetchEnv>(env: E): E {
-  return {
+export function revalidateIfStale<E extends F.FetchEnv>(): (env: E) => E {
+  return env => ({
     ...env,
     fetch: async (url, init) => {
       const response = await env.fetch(url, init)
@@ -26,7 +21,7 @@ export function revalidateIfStale<E extends F.FetchEnv>(env: E): E {
 
       return response
     },
-  }
+  })
 }
 
 export function timeoutRequest<E extends F.FetchEnv>(timeout: number): (env: E) => E {

diff --git a/src/zenodo.ts b/src/zenodo.ts
@@ -40,8 +40,8 @@ interface GetPreprintTitleEnv {
 
 export const getPrereviewFromZenodo = flow(
   getRecord,
-  RTE.local(revalidateIfStale),
-  RTE.local(useStaleCache),
+  RTE.local(revalidateIfStale()),
+  RTE.local(useStaleCache()),
   RTE.local(timeoutRequest(2000)),
   RTE.filterOrElseW(pipe(isInCommunity, and(isPeerReview)), () => new NotFound()),
   RTE.chain(recordToPrereview),
@@ -57,8 +57,8 @@ export const getPrereviewsFromZenodo = flow(
       subtype: 'peerreview',
     }),
   getRecords,
-  RTE.local(revalidateIfStale),
-  RTE.local(useStaleCache),
+  RTE.local(revalidateIfStale()),
+  RTE.local(useStaleCache()),
   RTE.local(timeoutRequest(2000)),
   RTE.bimap(
     () => 'unavailable' as const,
@@ -167,7 +167,7 @@ const getReviewUrl = flow(
 const getReviewText = flow(
   F.Request('GET'),
   F.send,
-  RTE.local(useStaleCache),
+  RTE.local(useStaleCache()),
   RTE.filterOrElseW(F.hasStatus(Status.OK), () => 'no text'),
   RTE.chainTaskEitherK(F.getText(identity)),
   RTE.map(sanitizeHtml),