Match changes

PREreview · Apr 16, 2024 · 709fe6d · 709fe6d
1 parent 50a0f1c
commit 709fe6d
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 78 deletions.
diff --git a/src/Doi.ts b/src/Doi.ts
@@ -9,7 +9,7 @@ export const isDoi: Predicate.Refinement<unknown, Doi> = (u): u is Doi =>
 
 export const Doi = Brand.refined<Doi>(isDoi, s => Brand.error(`Expected ${s} to be a DOI`))
 
-export const DoiSchema = Schema.string.pipe(Schema.fromBrand(Doi))
+export const DoiSchema = Schema.String.pipe(Schema.fromBrand(Doi))
 
 export const toUrl: (doi: Doi) => URL = doi => {
   const url = new URL('https://doi.org')

diff --git a/src/Orcid.ts b/src/Orcid.ts
@@ -80,28 +80,28 @@ export const deletePeerReview = ({
     yield* _(HttpClient.request.del(`${orcid}/peer-review/${id}`), client, Effect.scoped)
   })
 
-const PrereviewGroupSchema = Schema.struct({
-  'external-ids': Schema.struct({
-    'external-id': Schema.tuple(
-      Schema.struct({
-        'external-id-type': Schema.literal('peer-review'),
-        'external-id-value': Schema.literal('orcid-generated:prereview'),
+const PrereviewGroupSchema = Schema.Struct({
+  'external-ids': Schema.Struct({
+    'external-id': Schema.Tuple(
+      Schema.Struct({
+        'external-id-type': Schema.Literal('peer-review'),
+        'external-id-value': Schema.Literal('orcid-generated:prereview'),
       }),
     ),
   }),
-  'peer-review-group': Schema.array(
-    Schema.struct({
-      'external-ids': Schema.struct({
-        'external-id': Schema.tuple(
-          Schema.struct({
-            'external-id-type': Schema.literal('doi'),
+  'peer-review-group': Schema.Array(
+    Schema.Struct({
+      'external-ids': Schema.Struct({
+        'external-id': Schema.Tuple(
+          Schema.Struct({
+            'external-id-type': Schema.Literal('doi'),
             'external-id-value': DoiSchema,
           }),
         ),
       }),
-      'peer-review-summary': Schema.tuple(
-        Schema.struct({
-          'put-code': Schema.number,
+      'peer-review-summary': Schema.Tuple(
+        Schema.Struct({
+          'put-code': Schema.Number,
         }),
       ),
     }),
@@ -110,56 +110,58 @@ const PrereviewGroupSchema = Schema.struct({
 
 export type PrereviewGroupSchema = Schema.Schema.Type<typeof PrereviewGroupSchema>
 
-const OtherPeerReviewGroupSchema = Schema.struct({
-  'external-ids': Schema.struct({
-    'external-id': Schema.tuple(
-      Schema.struct({
-        'external-id-value': Schema.string,
+const OtherPeerReviewGroupSchema = Schema.Struct({
+  'external-ids': Schema.Struct({
+    'external-id': Schema.Tuple(
+      Schema.Struct({
+        'external-id-value': Schema.String,
       }),
     ),
   }),
 })
 
-const PeerReviewsSchema = Schema.struct({
-  group: Schema.array(Schema.union(PrereviewGroupSchema, OtherPeerReviewGroupSchema)),
+const PeerReviewsSchema = Schema.Struct({
+  group: Schema.Array(Schema.Union(PrereviewGroupSchema, OtherPeerReviewGroupSchema)),
 })
 
-const NewPeerReviewSchema = Schema.struct({
-  'reviewer-role': Schema.literal('reviewer'),
-  'review-identifiers': Schema.struct({
-    'external-id': Schema.struct({
-      'external-id-type': Schema.literal('doi'),
+const NewPeerReviewSchema = Schema.Struct({
+  'reviewer-role': Schema.Literal('reviewer'),
+  'review-identifiers': Schema.Struct({
+    'external-id': Schema.Struct({
+      'external-id-type': Schema.Literal('doi'),
       'external-id-value': DoiSchema,
-      'external-id-relationship': Schema.literal('self'),
+      'external-id-relationship': Schema.Literal('self'),
     }),
   }),
   'review-url': Url.UrlSchema,
-  'review-type': Schema.literal('review'),
+  'review-type': Schema.Literal('review'),
   'review-completion-date': Schema.transform(
-    Schema.struct({
+    Schema.Struct({
       year: Schema.NumberFromString,
       month: Schema.NumberFromString,
       day: Schema.NumberFromString,
     }),
     Temporal.PlainDateFromSelfSchema,
-    ({ year, month, day }) => Temporal.PlainDate.from({ year, month, day }),
-    date => ({ year: date.year, month: date.month, day: date.day }),
+    {
+      decode: ({ year, month, day }) => Temporal.PlainDate.from({ year, month, day }),
+      encode: date => ({ year: date.year, month: date.month, day: date.day }),
+    },
   ),
-  'review-group-id': Schema.literal('orcid-generated:prereview'),
-  'subject-external-identifier': Schema.struct({
-    'external-id-type': Schema.literal('doi'),
+  'review-group-id': Schema.Literal('orcid-generated:prereview'),
+  'subject-external-identifier': Schema.Struct({
+    'external-id-type': Schema.Literal('doi'),
     'external-id-value': DoiSchema,
-    'external-id-relationship': Schema.literal('self'),
+    'external-id-relationship': Schema.Literal('self'),
   }),
-  'subject-container-name': Schema.optional(Schema.string),
-  'subject-type': Schema.optional(Schema.literal('preprint')),
-  'subject-name': Schema.optional(Schema.struct({ title: Schema.string })),
+  'subject-container-name': Schema.optional(Schema.String),
+  'subject-type': Schema.optional(Schema.Literal('preprint')),
+  'subject-name': Schema.optional(Schema.Struct({ title: Schema.String })),
   'subject-url': Url.UrlSchema,
-  'convening-organization': Schema.struct({
-    name: Schema.string,
-    address: Schema.struct({
-      city: Schema.string,
-      country: Schema.string,
+  'convening-organization': Schema.Struct({
+    name: Schema.String,
+    address: Schema.Struct({
+      city: Schema.String,
+      country: Schema.String,
     }),
   }),
 })

diff --git a/src/OrcidId.ts b/src/OrcidId.ts
@@ -14,4 +14,4 @@ const isOrcid: Predicate.Refinement<unknown, OrcidId> = (u): u is OrcidId => {
 
 export const OrcidId = Brand.refined<OrcidId>(isOrcid, s => Brand.error(`Expected ${s} to be an ORCID iD`))
 
-export const OrcidIdSchema = Schema.string.pipe(Schema.fromBrand(OrcidId))
+export const OrcidIdSchema = Schema.String.pipe(Schema.fromBrand(OrcidId))
diff --git a/src/Redis.ts b/src/Redis.ts
@@ -50,7 +50,7 @@ export const scanStream = (
 
       return Stream.fromAsyncIterable(redis.scanStream(options), error => new RedisError({ error }))
     }),
-  ).pipe(Stream.map(Schema.decodeSync(Schema.array(Schema.string))), Stream.map(Chunk.fromIterable))
+  ).pipe(Stream.map(Schema.decodeSync(Schema.Array(Schema.String))), Stream.map(Chunk.fromIterable))
 
 export const get = (key: IoRedis.RedisKey): Effect.Effect<Option.Option<string>, RedisError, Redis> =>
   Effect.gen(function* (_) {

diff --git a/src/Temporal.ts b/src/Temporal.ts
@@ -10,16 +10,14 @@ export const PlainDateFromSelfSchema = Schema.instanceOf(Temporal.PlainDate)
 export const PlainDateFromStringSchema = <A extends string, I, R>(
   self: Schema.Schema<A, I, R>,
 ): Schema.Schema<Temporal.PlainDate, I, R> =>
-  Schema.transformOrFail(
-    self,
-    PlainDateFromSelfSchema,
-    (s, _, ast) =>
+  Schema.transformOrFail(self, PlainDateFromSelfSchema, {
+    decode: (s, _, ast) =>
       ParseResult.try({
         try: () => Temporal.PlainDate.from(s),
         catch: () => new ParseResult.Type(ast, s),
       }),
-    plainDate => ParseResult.succeed(plainDate.toString()),
-    { strict: false },
-  )
+    encode: plainDate => ParseResult.succeed(plainDate.toString()),
+    strict: false,
+  })
 
-export const PlainDateSchema = PlainDateFromStringSchema(Schema.string)
+export const PlainDateSchema = PlainDateFromStringSchema(Schema.String)
diff --git a/src/Url.ts b/src/Url.ts
@@ -3,16 +3,14 @@ import { ParseResult, Schema } from '@effect/schema'
 export const UrlFromSelfSchema: Schema.Schema<URL> = Schema.instanceOf(URL)
 
 export const UrlFromStringSchema = <A extends string, I, R>(self: Schema.Schema<A, I, R>): Schema.Schema<URL, I, R> =>
-  Schema.transformOrFail(
-    self,
-    UrlFromSelfSchema,
-    (s, _, ast) =>
+  Schema.transformOrFail(self, UrlFromSelfSchema, {
+    decode: (s, _, ast) =>
       ParseResult.try({
         try: () => new URL(s),
         catch: () => new ParseResult.Type(ast, s),
       }),
-    url => ParseResult.succeed(url.href),
-    { strict: false },
-  )
+    encode: url => ParseResult.succeed(url.href),
+    strict: false,
+  })
 
-export const UrlSchema = UrlFromStringSchema(Schema.string)
+export const UrlSchema = UrlFromStringSchema(Schema.String)
diff --git a/src/Users.ts b/src/Users.ts
@@ -26,7 +26,7 @@ export const getUsers: Stream.Stream<
   Stream.map(User),
 )
 
-const OrcidTokenSchema = Schema.struct({ value: Schema.struct({ accessToken: Schema.string }) })
+const OrcidTokenSchema = Schema.Struct({ value: Schema.Struct({ accessToken: Schema.String }) })
 
 const getAccessToken = flow(
   (orcidId: OrcidId.OrcidId) => Effect.flatten(Redis.get(`orcid-token:${orcidId}`)),

diff --git a/src/Zenodo.ts b/src/Zenodo.ts
@@ -42,31 +42,31 @@ const getRecords = (
     return response.hits
   })
 
-const RecordsSchema = Schema.struct({
-  hits: Schema.struct({
-    hits: Schema.array(
-      Schema.struct({
+const RecordsSchema = Schema.Struct({
+  hits: Schema.Struct({
+    hits: Schema.Array(
+      Schema.Struct({
         doi: DoiSchema,
-        metadata: Schema.struct({
+        metadata: Schema.Struct({
           publication_date: Temporal.PlainDateSchema,
-          related_identifiers: Schema.array(
-            Schema.union(
-              Schema.struct({
+          related_identifiers: Schema.Array(
+            Schema.Union(
+              Schema.Struct({
                 identifier: DoiSchema,
-                relation: Schema.string,
-                scheme: Schema.literal('doi'),
+                relation: Schema.String,
+                scheme: Schema.Literal('doi'),
               }),
-              Schema.struct({
+              Schema.Struct({
                 identifier: Url.UrlSchema,
-                relation: Schema.string,
-                scheme: Schema.literal('url'),
+                relation: Schema.String,
+                scheme: Schema.Literal('url'),
               }),
             ),
           ),
         }),
       }),
     ),
-    total: Schema.nonNegative()(Schema.number),
+    total: Schema.nonNegative()(Schema.Number),
   }),
 })
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,4 @@ const isOrcid: Predicate.Refinement<unknown, OrcidId> = (u): u is OrcidId => {

		export const OrcidId = Brand.refined<OrcidId>(isOrcid, s => Brand.error(`Expected ${s} to be an ORCID iD`))

		export const OrcidIdSchema = Schema.string.pipe(Schema.fromBrand(OrcidId))
		export const OrcidIdSchema = Schema.String.pipe(Schema.fromBrand(OrcidId))