Match changes

PREreview · Jan 7, 2025 · f96c2f0 · f96c2f0
1 parent 3d93774
commit f96c2f0
Show file tree

Hide file tree

Showing 20 changed files with 79 additions and 105 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,7 +4,6 @@
   "dependencies": {
     "@effect/platform": "^0.69.20",
     "@effect/platform-node": "^0.64.22",
-    "@effect/schema": "^0.75.5",
     "@geo-maps/countries-land-10km": "^0.6.0",
     "@js-temporal/polyfill": "^0.4.4",
     "@observablehq/framework": "^1.10.1",

diff --git a/src/data/clubs.json.ts b/src/data/clubs.json.ts
@@ -1,7 +1,6 @@
 import { HttpClient, HttpClientRequest, HttpClientResponse, Terminal } from '@effect/platform'
-import { NodeTerminal } from '@effect/platform-node'
-import { Schema } from '@effect/schema'
-import { Config, Effect, Record, Redacted } from 'effect'
+import { NodeHttpClient, NodeTerminal } from '@effect/platform-node'
+import { Config, Effect, Record, Redacted, Schema } from 'effect'
 
 const Clubs = Schema.Array(
   Schema.Struct({
@@ -13,6 +12,7 @@ const Clubs = Schema.Array(
 const Output = Schema.Record({ key: Schema.String, value: Schema.String })
 
 const program = Effect.gen(function* () {
+  const client = yield* HttpClient.HttpClient
   const terminal = yield* Terminal.Terminal
   const sandbox = yield* Config.withDefault(Config.boolean('SANDBOX'), false)
 
@@ -27,10 +27,9 @@ const program = Effect.gen(function* () {
     Redacted.value(token),
   )
 
-  const data = yield* HttpClient.fetchOk(request).pipe(
-    Effect.andThen(HttpClientResponse.schemaBodyJson(Clubs)),
-    Effect.scoped,
-  )
+  const data = yield* client
+    .execute(request)
+    .pipe(Effect.andThen(HttpClientResponse.schemaBodyJson(Clubs)), Effect.scoped)
 
   const transformedData = Record.fromIterableWith(data, club => [club.id, club.name])
 
@@ -39,4 +38,4 @@ const program = Effect.gen(function* () {
   yield* terminal.display(encoded)
 })
 
-await Effect.runPromise(program.pipe(Effect.provide(NodeTerminal.layer)))
+await Effect.runPromise(program.pipe(Effect.provide(NodeHttpClient.layer), Effect.provide(NodeTerminal.layer)))
diff --git a/src/data/openalex-domains.json.ts b/src/data/openalex-domains.json.ts
@@ -1,7 +1,6 @@
 import { HttpClient, HttpClientRequest, HttpClientResponse, Terminal } from '@effect/platform'
-import { NodeTerminal } from '@effect/platform-node'
-import { Schema } from '@effect/schema'
-import { Effect, Record } from 'effect'
+import { NodeHttpClient, NodeTerminal } from '@effect/platform-node'
+import { Effect, Record, Schema } from 'effect'
 import { DomainIdFromUrlSchema, DomainIdSchema } from '../lib/OpenAlex.js'
 import { UrlFromStringSchema } from '../lib/Url.js'
 
@@ -17,14 +16,14 @@ const Domains = Schema.Struct({
 const DomainNames = Schema.Record({ key: DomainIdSchema, value: Schema.String })
 
 const program = Effect.gen(function* () {
+  const client = yield* HttpClient.HttpClient
   const terminal = yield* Terminal.Terminal
 
   const request = HttpClientRequest.get('https://api.openalex.org/domains?per-page=200')
 
-  const data = yield* HttpClient.fetchOk(request).pipe(
-    Effect.andThen(HttpClientResponse.schemaBodyJson(Domains)),
-    Effect.scoped,
-  )
+  const data = yield* client
+    .execute(request)
+    .pipe(Effect.andThen(HttpClientResponse.schemaBodyJson(Domains)), Effect.scoped)
 
   const transformedData = Record.fromIterableWith(data.results, domain => [domain.id, domain.display_name])
 
@@ -33,4 +32,4 @@ const program = Effect.gen(function* () {
   yield* terminal.display(encoded)
 })
 
-await Effect.runPromise(program.pipe(Effect.provide(NodeTerminal.layer)))
+await Effect.runPromise(program.pipe(Effect.provide(NodeHttpClient.layer), Effect.provide(NodeTerminal.layer)))
diff --git a/src/data/openalex-fields.json.ts b/src/data/openalex-fields.json.ts
@@ -1,7 +1,6 @@
 import { HttpClient, HttpClientRequest, HttpClientResponse, Terminal } from '@effect/platform'
-import { NodeTerminal } from '@effect/platform-node'
-import { Schema } from '@effect/schema'
-import { Effect, Record } from 'effect'
+import { NodeHttpClient, NodeTerminal } from '@effect/platform-node'
+import { Effect, Record, Schema } from 'effect'
 import { DomainIdFromUrlSchema, DomainIdSchema, FieldIdFromUrlSchema, FieldIdSchema } from '../lib/OpenAlex.js'
 import { UrlFromStringSchema } from '../lib/Url.js'
 
@@ -23,14 +22,14 @@ const FieldNames = Schema.Record({
 })
 
 const program = Effect.gen(function* () {
+  const client = yield* HttpClient.HttpClient
   const terminal = yield* Terminal.Terminal
 
   const request = HttpClientRequest.get('https://api.openalex.org/fields?per-page=200')
 
-  const data = yield* HttpClient.fetchOk(request).pipe(
-    Effect.andThen(HttpClientResponse.schemaBodyJson(Fields)),
-    Effect.scoped,
-  )
+  const data = yield* client
+    .execute(request)
+    .pipe(Effect.andThen(HttpClientResponse.schemaBodyJson(Fields)), Effect.scoped)
 
   const transformedData = Record.fromIterableWith(data.results, field => [
     field.id,
@@ -42,4 +41,4 @@ const program = Effect.gen(function* () {
   yield* terminal.display(encoded)
 })
 
-await Effect.runPromise(program.pipe(Effect.provide(NodeTerminal.layer)))
+await Effect.runPromise(program.pipe(Effect.provide(NodeHttpClient.layer), Effect.provide(NodeTerminal.layer)))
diff --git a/src/data/openalex-subfields.json.ts b/src/data/openalex-subfields.json.ts
@@ -1,7 +1,6 @@
 import { HttpClient, HttpClientRequest, HttpClientResponse, Terminal } from '@effect/platform'
-import { NodeTerminal } from '@effect/platform-node'
-import { Schema } from '@effect/schema'
-import { Effect, Record } from 'effect'
+import { NodeHttpClient, NodeTerminal } from '@effect/platform-node'
+import { Effect, Record, Schema } from 'effect'
 import { FieldIdFromUrlSchema, FieldIdSchema, SubfieldIdFromUrlSchema, SubfieldIdSchema } from '../lib/OpenAlex.js'
 import { UrlFromStringSchema } from '../lib/Url.js'
 
@@ -23,21 +22,20 @@ const SubfieldNames = Schema.Record({
 })
 
 const program = Effect.gen(function* () {
+  const client = yield* HttpClient.HttpClient
   const terminal = yield* Terminal.Terminal
 
   const request1 = HttpClientRequest.get('https://api.openalex.org/subfields?per-page=200')
 
-  const data = yield* HttpClient.fetchOk(request1).pipe(
-    Effect.andThen(HttpClientResponse.schemaBodyJson(Subfields)),
-    Effect.scoped,
-  )
+  const data = yield* client
+    .execute(request1)
+    .pipe(Effect.andThen(HttpClientResponse.schemaBodyJson(Subfields)), Effect.scoped)
 
   const request2 = HttpClientRequest.get('https://api.openalex.org/subfields?per-page=200&page=2')
 
-  const data2 = yield* HttpClient.fetchOk(request2).pipe(
-    Effect.andThen(HttpClientResponse.schemaBodyJson(Subfields)),
-    Effect.scoped,
-  )
+  const data2 = yield* client
+    .execute(request2)
+    .pipe(Effect.andThen(HttpClientResponse.schemaBodyJson(Subfields)), Effect.scoped)
 
   const transformedData = Record.fromIterableWith([...data.results, ...data2.results], subfield => [
     subfield.id,
@@ -49,4 +47,4 @@ const program = Effect.gen(function* () {
   yield* terminal.display(encoded)
 })
 
-await Effect.runPromise(program.pipe(Effect.provide(NodeTerminal.layer)))
+await Effect.runPromise(program.pipe(Effect.provide(NodeHttpClient.layer), Effect.provide(NodeTerminal.layer)))
diff --git a/src/data/preprint-servers.json.ts b/src/data/preprint-servers.json.ts
@@ -1,7 +1,6 @@
 import { Terminal } from '@effect/platform'
 import { NodeTerminal } from '@effect/platform-node'
-import { Schema } from '@effect/schema'
-import { Effect } from 'effect'
+import { Effect, Schema } from 'effect'
 import * as PreprintServer from '../lib/PreprintServer.js'
 
 const Output = Schema.Record({ key: Schema.String, value: Schema.String })

diff --git a/src/data/requests.json.ts b/src/data/requests.json.ts
@@ -1,7 +1,6 @@
 import { HttpClient, HttpClientRequest, HttpClientResponse, Terminal } from '@effect/platform'
-import { NodeTerminal } from '@effect/platform-node'
-import { Schema } from '@effect/schema'
-import { Effect } from 'effect'
+import { NodeHttpClient, NodeTerminal } from '@effect/platform-node'
+import { Effect, Schema } from 'effect'
 import * as Doi from '../lib/Doi.js'
 import * as LanguageCode from '../lib/LanguageCode.js'
 import { DomainIdSchema, FieldIdSchema, SubfieldIdSchema } from '../lib/OpenAlex.js'
@@ -21,18 +20,18 @@ const Requests = Schema.Array(
 )
 
 const program = Effect.gen(function* () {
+  const client = yield* HttpClient.HttpClient
   const terminal = yield* Terminal.Terminal
 
   const request = HttpClientRequest.get('https://coar-notify.prereview.org/requests')
 
-  const data = yield* HttpClient.fetchOk(request).pipe(
-    Effect.andThen(HttpClientResponse.schemaBodyJson(Requests)),
-    Effect.scoped,
-  )
+  const data = yield* client
+    .execute(request)
+    .pipe(Effect.andThen(HttpClientResponse.schemaBodyJson(Requests)), Effect.scoped)
 
   const encoded = yield* Schema.encode(Schema.parseJson(Requests))(data)
 
   yield* terminal.display(encoded)
 })
 
-await Effect.runPromise(program.pipe(Effect.provide(NodeTerminal.layer)))
+await Effect.runPromise(program.pipe(Effect.provide(NodeHttpClient.layer), Effect.provide(NodeTerminal.layer)))
diff --git a/src/data/reviews.json.ts b/src/data/reviews.json.ts
@@ -1,7 +1,6 @@
 import { FileSystem, HttpClient, HttpClientRequest, HttpClientResponse, Terminal } from '@effect/platform'
-import { NodeFileSystem, NodeTerminal } from '@effect/platform-node'
-import { Schema } from '@effect/schema'
-import { Array, Config, Effect, Option, Redacted } from 'effect'
+import { NodeFileSystem, NodeHttpClient, NodeTerminal } from '@effect/platform-node'
+import { Array, Config, Effect, Option, Redacted, Schema } from 'effect'
 import * as Doi from '../lib/Doi.js'
 import * as LanguageCode from '../lib/LanguageCode.js'
 import * as OrcidId from '../lib/OrcidId.js'
@@ -132,6 +131,7 @@ const getLegacyReviews = Effect.gen(function* () {
 })
 
 const getReviews = Effect.gen(function* () {
+  const client = yield* HttpClient.HttpClient
   const sandbox = yield* Config.withDefault(Config.boolean('SANDBOX'), false)
 
   if (sandbox) {
@@ -145,10 +145,7 @@ const getReviews = Effect.gen(function* () {
     Redacted.value(token),
   )
 
-  return yield* HttpClient.fetchOk(request).pipe(
-    Effect.andThen(HttpClientResponse.schemaBodyJson(Reviews)),
-    Effect.scoped,
-  )
+  return yield* client.execute(request).pipe(Effect.andThen(HttpClientResponse.schemaBodyJson(Reviews)), Effect.scoped)
 })
 
 const program = Effect.gen(function* () {
@@ -161,4 +158,10 @@ const program = Effect.gen(function* () {
   yield* terminal.display(encoded)
 })
 
-await Effect.runPromise(program.pipe(Effect.provide(NodeTerminal.layer), Effect.provide(NodeFileSystem.layer)))
+await Effect.runPromise(
+  program.pipe(
+    Effect.provide(NodeHttpClient.layer),
+    Effect.provide(NodeTerminal.layer),
+    Effect.provide(NodeFileSystem.layer),
+  ),
+)
diff --git a/src/data/users.json.ts b/src/data/users.json.ts
@@ -1,7 +1,6 @@
 import { HttpClient, HttpClientRequest, HttpClientResponse, Terminal } from '@effect/platform'
-import { NodeTerminal } from '@effect/platform-node'
-import { Schema } from '@effect/schema'
-import { Array, Config, Effect, Option, Redacted } from 'effect'
+import { NodeHttpClient, NodeTerminal } from '@effect/platform-node'
+import { Array, Config, Effect, Option, Redacted, Schema } from 'effect'
 import * as Iso3166 from '../lib/Iso3166.js'
 import * as OrcidId from '../lib/OrcidId.js'
 import * as Temporal from '../lib/Temporal.js'
@@ -26,6 +25,7 @@ const Output = Schema.Array(
 )
 
 const program = Effect.gen(function* () {
+  const client = yield* HttpClient.HttpClient
   const terminal = yield* Terminal.Terminal
   const sandbox = yield* Config.withDefault(Config.boolean('SANDBOX'), false)
 
@@ -40,10 +40,9 @@ const program = Effect.gen(function* () {
     Redacted.value(token),
   )
 
-  const data = yield* HttpClient.fetchOk(request).pipe(
-    Effect.andThen(HttpClientResponse.schemaBodyJson(Users)),
-    Effect.scoped,
-  )
+  const data = yield* client
+    .execute(request)
+    .pipe(Effect.andThen(HttpClientResponse.schemaBodyJson(Users)), Effect.scoped)
 
   const transformedData = Array.map(data, user => ({
     ...user,
@@ -55,4 +54,4 @@ const program = Effect.gen(function* () {
   yield* terminal.display(encoded)
 })
 
-await Effect.runPromise(program.pipe(Effect.provide(NodeTerminal.layer)))
+await Effect.runPromise(program.pipe(Effect.provide(NodeHttpClient.layer), Effect.provide(NodeTerminal.layer)))
diff --git a/src/data/visitors-by-country.json.ts b/src/data/visitors-by-country.json.ts
@@ -1,7 +1,6 @@
 import { HttpClient, HttpClientRequest, HttpClientResponse, Terminal } from '@effect/platform'
-import { NodeTerminal } from '@effect/platform-node'
-import { Schema } from '@effect/schema'
-import { Array, Config, Effect, Option, Redacted } from 'effect'
+import { NodeHttpClient, NodeTerminal } from '@effect/platform-node'
+import { Array, Config, Effect, Option, Redacted, Schema } from 'effect'
 import * as Iso3166 from '../lib/Iso3166.js'
 import * as Temporal from '../lib/Temporal.js'
 
@@ -22,6 +21,7 @@ const Output = Schema.Array(
 )
 
 const program = Effect.gen(function* () {
+  const client = yield* HttpClient.HttpClient
   const terminal = yield* Terminal.Terminal
   const sandbox = yield* Config.withDefault(Config.boolean('SANDBOX'), false)
 
@@ -44,10 +44,9 @@ const program = Effect.gen(function* () {
     Redacted.value(token),
   )
 
-  const data = yield* HttpClient.fetchOk(request).pipe(
-    Effect.andThen(HttpClientResponse.schemaBodyJson(Visitors)),
-    Effect.scoped,
-  )
+  const data = yield* client
+    .execute(request)
+    .pipe(Effect.andThen(HttpClientResponse.schemaBodyJson(Visitors)), Effect.scoped)
 
   const transformedData = Array.map(data, visitors => ({
     number: visitors.visits,
@@ -60,4 +59,4 @@ const program = Effect.gen(function* () {
   yield* terminal.display(encoded)
 })
 
-await Effect.runPromise(program.pipe(Effect.provide(NodeTerminal.layer)))
+await Effect.runPromise(program.pipe(Effect.provide(NodeHttpClient.layer), Effect.provide(NodeTerminal.layer)))
diff --git a/src/data/visitors-by-referrer.json.ts b/src/data/visitors-by-referrer.json.ts
@@ -1,7 +1,6 @@
 import { HttpClient, HttpClientRequest, HttpClientResponse, Terminal } from '@effect/platform'
-import { NodeTerminal } from '@effect/platform-node'
-import { Schema } from '@effect/schema'
-import { Array, Config, Effect, Redacted } from 'effect'
+import { NodeHttpClient, NodeTerminal } from '@effect/platform-node'
+import { Array, Config, Effect, Redacted, Schema } from 'effect'
 import * as Temporal from '../lib/Temporal.js'
 import * as Url from '../lib/Url.js'
 
@@ -22,6 +21,7 @@ const Output = Schema.Array(
 )
 
 const program = Effect.gen(function* () {
+  const client = yield* HttpClient.HttpClient
   const terminal = yield* Terminal.Terminal
   const sandbox = yield* Config.withDefault(Config.boolean('SANDBOX'), false)
 
@@ -44,10 +44,9 @@ const program = Effect.gen(function* () {
     Redacted.value(token),
   )
 
-  const data = yield* HttpClient.fetchOk(request).pipe(
-    Effect.andThen(HttpClientResponse.schemaBodyJson(Visitors)),
-    Effect.scoped,
-  )
+  const data = yield* client
+    .execute(request)
+    .pipe(Effect.andThen(HttpClientResponse.schemaBodyJson(Visitors)), Effect.scoped)
 
   const transformedData = Array.map(
     Array.filter(data, visitors => visitors.visits > 0),
@@ -63,4 +62,4 @@ const program = Effect.gen(function* () {
   yield* terminal.display(encoded)
 })
 
-await Effect.runPromise(program.pipe(Effect.provide(NodeTerminal.layer)))
+await Effect.runPromise(program.pipe(Effect.provide(NodeHttpClient.layer), Effect.provide(NodeTerminal.layer)))
diff --git a/src/lib/Doi.ts b/src/lib/Doi.ts
@@ -1,5 +1,4 @@
-import { ParseResult, Schema } from '@effect/schema'
-import { Brand, Either, Option, type Predicate, String, flow } from 'effect'
+import { Brand, Either, Option, ParseResult, type Predicate, Schema, String, flow } from 'effect'
 
 export type Doi = Brand.Branded<string, 'Doi'>