Handle indeterminate ID types correctly

Refs #1834, #2209
PREreview · Jan 28, 2025 · 6d3f912 · 6d3f912
1 parent 41f822a
commit 6d3f912
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 47 deletions.
diff --git a/src/crossref.ts b/src/crossref.ts
@@ -4,7 +4,6 @@ import * as E from 'fp-ts/lib/Either.js'
 import * as O from 'fp-ts/lib/Option.js'
 import * as RTE from 'fp-ts/lib/ReaderTaskEither.js'
 import * as RA from 'fp-ts/lib/ReadonlyArray.js'
-import type { Refinement } from 'fp-ts/lib/Refinement.js'
 import { flow, pipe } from 'fp-ts/lib/function.js'
 import { isString } from 'fp-ts/lib/string.js'
 import { Status } from 'hyper-ts'
@@ -27,9 +26,11 @@ import type {
   EcoevorxivPreprintId,
   EdarxivPreprintId,
   EngrxivPreprintId,
+  IndeterminatePreprintId,
   MedrxivPreprintId,
   MetaarxivPreprintId,
   OsfPreprintsPreprintId,
+  PreprintId,
   PreprintsorgPreprintId,
   PsyarxivPreprintId,
   ResearchSquarePreprintId,
@@ -40,30 +41,7 @@ import type {
   VerixivPreprintId,
 } from './types/preprint-id.js'
 
-export type CrossrefPreprintId =
-  | AdvancePreprintId
-  | AfricarxivOsfPreprintId
-  | AuthoreaPreprintId
-  | BiorxivPreprintId
-  | ChemrxivPreprintId
-  | CurvenotePreprintId
-  | EartharxivPreprintId
-  | EcoevorxivPreprintId
-  | EdarxivPreprintId
-  | EngrxivPreprintId
-  | MedrxivPreprintId
-  | MetaarxivPreprintId
-  | OsfPreprintsPreprintId
-  | PreprintsorgPreprintId
-  | PsyarxivPreprintId
-  | ResearchSquarePreprintId
-  | ScieloPreprintId
-  | ScienceOpenPreprintId
-  | SocarxivPreprintId
-  | TechrxivPreprintId
-  | VerixivPreprintId
-
-export const isCrossrefPreprintDoi: Refinement<Doi, CrossrefPreprintId['value']> = hasRegistrant(
+const crossrefDoiPrefixes = [
   '1101',
   '1590',
   '12688',
@@ -84,10 +62,18 @@ export const isCrossrefPreprintDoi: Refinement<Doi, CrossrefPreprintId['value']>
   '35542',
   '36227',
   '62329',
-)
+] as const
+
+type CrossrefDoiPrefix = (typeof crossrefDoiPrefixes)[number]
+
+export type CrossrefPreprintId = Extract<PreprintId, { value: Doi<CrossrefDoiPrefix> }>
+
+export type IndeterminateCrossrefPreprintId = Extract<IndeterminatePreprintId, { value: Doi<CrossrefDoiPrefix> }>
+
+export const isCrossrefPreprintDoi = hasRegistrant(...crossrefDoiPrefixes)
 
 export const getPreprintFromCrossref = flow(
-  (id: CrossrefPreprintId) => getWork(id.value),
+  (id: IndeterminateCrossrefPreprintId) => getWork(id.value),
   RTE.local(revalidateIfStale()),
   RTE.local(useStaleCache()),
   RTE.local(timeoutRequest(2000)),

diff --git a/src/datacite.ts b/src/datacite.ts
@@ -5,7 +5,6 @@ import * as E from 'fp-ts/lib/Either.js'
 import * as O from 'fp-ts/lib/Option.js'
 import * as RTE from 'fp-ts/lib/ReaderTaskEither.js'
 import * as RA from 'fp-ts/lib/ReadonlyArray.js'
-import type { Refinement } from 'fp-ts/lib/Refinement.js'
 import { flow, identity, pipe } from 'fp-ts/lib/function.js'
 import { Status } from 'hyper-ts'
 import * as D from 'io-ts/lib/Decoder.js'
@@ -22,33 +21,25 @@ import type {
   AfricarxivZenodoPreprintId,
   ArcadiaSciencePreprintId,
   ArxivPreprintId,
+  IndeterminatePreprintId,
   OsfPreprintId,
+  PreprintId,
   PsychArchivesPreprintId,
   ZenodoPreprintId,
 } from './types/preprint-id.js'
 
-export type DatacitePreprintId =
-  | AfricarxivFigsharePreprintId
-  | AfricarxivUbuntunetPreprintId
-  | AfricarxivZenodoPreprintId
-  | ArcadiaSciencePreprintId
-  | ArxivPreprintId
-  | OsfPreprintId
-  | PsychArchivesPreprintId
-  | ZenodoPreprintId
+const dataciteDoiPrefixes = ['5281', '6084', '17605', '23668', '48550', '57844', '60763'] as const
 
-export const isDatacitePreprintDoi: Refinement<Doi, DatacitePreprintId['value']> = hasRegistrant(
-  '5281',
-  '6084',
-  '17605',
-  '23668',
-  '48550',
-  '57844',
-  '60763',
-)
+type DataciteDoiPrefix = (typeof dataciteDoiPrefixes)[number]
+
+export type DatacitePreprintId = Extract<PreprintId, { value: Doi<DataciteDoiPrefix> }>
+
+export type IndeterminateDatacitePreprintId = Extract<IndeterminatePreprintId, { value: Doi<DataciteDoiPrefix> }>
+
+export const isDatacitePreprintDoi = hasRegistrant(...dataciteDoiPrefixes)
 
 export const getPreprintFromDatacite = flow(
-  (id: DatacitePreprintId) => getWork(id.value),
+  (id: IndeterminateDatacitePreprintId) => getWork(id.value),
   RTE.local(revalidateIfStale()),
   RTE.local(useStaleCache()),
   RTE.local(timeoutRequest(2000)),