Bump the effect group across 1 directory with 4 updates

package.json

@@ -7,12 +7,11 @@
   "type": "module",
   "dependencies": {
     "@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
-    "@effect/platform": "0.58.20",
-    "@effect/platform-node": "^0.53.19",
-    "@effect/schema": "^0.68.17",
+    "@effect/platform": "0.75.1",
+    "@effect/platform-node": "^0.71.1",
     "@js-temporal/polyfill": "^0.4.4",
     "bullmq": "^5.34.8",
-    "effect": "3.4.7",
+    "effect": "3.12.7",
     "html-entities": "^2.5.2",
     "http-status-codes": "^2.3.0",
     "ioredis": "^5.4.1",

src/CoarNotify.ts

@@ -1,4 +1,4 @@
-import { Schema } from '@effect/schema'
+import { Schema } from 'effect'
 import * as Doi from './Doi.js'
 import * as Url from './Url.js'
 
@@ -28,6 +28,6 @@ export const RequestReviewSchema = Schema.Struct({
   actor: Schema.Struct({
     id: Url.UrlFromStringSchema,
     type: Schema.Literal('Application', 'Group', 'Organization', 'Person', 'Service'),
-    name: Schema.String.pipe(Schema.trimmed(), Schema.nonEmpty()),
+    name: Schema.NonEmptyTrimmedString,
   }),
 })

src/Crossref.ts

@@ -1,6 +1,5 @@
 import { HttpClient, type HttpClientError, HttpClientRequest, HttpClientResponse } from '@effect/platform'
-import { type ParseResult, Schema } from '@effect/schema'
-import { Context, Data, Effect, Equal, Layer, Match, Tuple } from 'effect'
+import { Context, Data, Effect, Equal, Layer, Match, type ParseResult, Schema, Tuple } from 'effect'
 import { StatusCodes } from 'http-status-codes'
 import * as Doi from './Doi.js'
 import * as Temporal from './Temporal.js'
@@ -31,7 +30,7 @@ export const CrossrefApiLive = Layer.effect(
       Effect.gen(function* (_) {
         const response = yield* _(
           HttpClientRequest.get(`works/${encodeURIComponent(doi)}`),
-          okClient,
+          okClient.execute,
           Effect.flatMap(HttpClientResponse.schemaBodyJson(MessageSchema(WorkSchema))),
         )
 

src/CrossrefPreprint.ts

@@ -1,5 +1,4 @@
-import { Schema } from '@effect/schema'
-import { Array, Data, Effect, Either, Match, String, pipe } from 'effect'
+import { Array, Data, Effect, Either, Match, Schema, String, pipe } from 'effect'
 import * as Crossref from './Crossref.js'
 import * as Doi from './Doi.js'
 import * as Temporal from './Temporal.js'

src/Datacite.ts

@@ -1,6 +1,5 @@
 import { HttpClient, type HttpClientError, HttpClientRequest, HttpClientResponse } from '@effect/platform'
-import { type ParseResult, Schema } from '@effect/schema'
-import { Context, Data, Effect, Equal, Layer, Match } from 'effect'
+import { Context, Data, Effect, Equal, Layer, Match, type ParseResult, Schema } from 'effect'
 import { StatusCodes } from 'http-status-codes'
 import * as Doi from './Doi.js'
 import * as Temporal from './Temporal.js'
@@ -31,7 +30,7 @@ export const DataciteApiLive = Layer.effect(
       Effect.gen(function* (_) {
         const response = yield* _(
           HttpClientRequest.get(`dois/${encodeURIComponent(doi)}`),
-          okClient,
+          okClient.execute,
           Effect.flatMap(HttpClientResponse.schemaBodyJson(DataSchema('dois', WorkSchema))),
         )
 

src/DatacitePreprint.ts

@@ -1,5 +1,4 @@
-import { Schema } from '@effect/schema'
-import { Array, Data, Effect, Either, Match, Predicate, String, pipe } from 'effect'
+import { Array, Data, Effect, Either, Match, Predicate, Schema, String, pipe } from 'effect'
 import * as Datacite from './Datacite.js'
 import * as Doi from './Doi.js'
 import * as Temporal from './Temporal.js'

src/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'>
 

src/LanguageCode.ts

@@ -1,5 +1,4 @@
-import { Schema } from '@effect/schema'
-import type { Predicate } from 'effect'
+import { type Predicate, Schema } from 'effect'
 import iso6391, { type LanguageCode } from 'iso-639-1'
 
 export { type LanguageCode } from 'iso-639-1'

src/Logger.ts

@@ -1,29 +1,40 @@
 import { Headers, HttpClient, UrlParams } from '@effect/platform'
-import { Effect } from 'effect'
+import { Effect, flow } from 'effect'
 
-export const LoggingHttpClient = HttpClient.makeDefault(request =>
-  Effect.Do.pipe(
-    Effect.tap(() =>
+export const LoggingHttpClient = Effect.andThen(
+  HttpClient.HttpClient,
+  flow(
+    HttpClient.tapRequest(request =>
       Effect.logDebug('Sending HTTP Request').pipe(
-        Effect.annotateLogs({ headers: Headers.redact(request.headers, 'authorization') }),
+        Effect.annotateLogs({
+          headers: Headers.redact(request.headers, 'authorization'),
+          url: request.url,
+          urlParams: UrlParams.toString(request.urlParams),
+          method: request.method,
+        }),
       ),
     ),
-    Effect.zipRight(HttpClient.fetch(request)),
-    Effect.tap(response =>
+    HttpClient.tap(response =>
       Effect.logDebug('Received HTTP response').pipe(
-        Effect.annotateLogs({ status: response.status, headers: response.headers }),
+        Effect.annotateLogs({
+          status: response.status,
+          headers: response.headers,
+          url: response.request.url,
+          urlParams: UrlParams.toString(response.request.urlParams),
+          method: response.request.method,
+        }),
       ),
     ),
-    Effect.tapErrorTag('RequestError', error =>
+    HttpClient.tapError(error =>
       Effect.logError('Error sending HTTP request').pipe(
-        Effect.annotateLogs({ reason: error.reason, error: error.error }),
+        Effect.annotateLogs({
+          reason: error.reason,
+          error: error.cause,
+          url: error.request.url,
+          urlParams: UrlParams.toString(error.request.urlParams),
+          method: error.request.method,
+        }),
       ),
     ),
-    Effect.annotateLogs({
-      url: request.url,
-      urlParams: UrlParams.toString(request.urlParams),
-      method: request.method,
-    }),
-    Effect.withLogSpan('fetch'),
   ),
 )

src/OpenAi.ts

@@ -1,5 +1,5 @@
 import 'openai/shims/web'
-import { HttpClient } from '@effect/platform'
+import { FetchHttpClient } from '@effect/platform'
 import { Config, Context, Data, Effect, Layer, Option, Redacted, identity } from 'effect'
 import * as OAI from 'openai'
 
@@ -16,7 +16,7 @@ interface OpenAiService {
 
 const make = (params: { readonly apiKey: Redacted.Redacted }) =>
   Effect.gen(function* (_) {
-    const fetchService = yield* _(Effect.serviceOption(HttpClient.Fetch))
+    const fetchService = yield* _(Effect.serviceOption(FetchHttpClient.Fetch))
     const fetch = Option.match(fetchService, { onNone: () => globalThis.fetch, onSome: identity })
 
     const client = new OAI.OpenAI({

src/OpenAlex/OpenAlexApi.ts

@@ -5,8 +5,7 @@ import {
   HttpClientResponse,
   type UrlParams,
 } from '@effect/platform'
-import { ParseResult, Schema } from '@effect/schema'
-import { Brand, Context, Data, Effect, Either, Equal, Layer, RateLimiter, pipe } from 'effect'
+import { Brand, Context, Data, Effect, Either, Equal, Layer, ParseResult, RateLimiter, Schema, pipe } from 'effect'
 import { StatusCodes } from 'http-status-codes'
 import * as Doi from '../Doi.js'
 import * as LanguageCode from '../LanguageCode.js'
@@ -56,7 +55,7 @@ export const OpenAlexApiLive = Layer.scoped(
       pipe(
         HttpClientRequest.get(`https://api.openalex.org/works/${encodeURIComponent(Doi.toUrl(id).href)}`),
         HttpClientRequest.acceptJson,
-        HttpClient.filterStatus(httpClient, status => Equal.equals(status, StatusCodes.OK)),
+        HttpClient.filterStatus(httpClient, status => Equal.equals(status, StatusCodes.OK)).execute,
         Effect.flatMap(HttpClientResponse.schemaBodyJson(WorkSchema)),
         Effect.scoped,
         Effect.catchAll(GetWorkError.fromError),
@@ -68,7 +67,7 @@ export const OpenAlexApiLive = Layer.scoped(
         HttpClientRequest.get('https://api.openalex.org/works'),
         HttpClientRequest.setUrlParams(params),
         HttpClientRequest.acceptJson,
-        HttpClient.filterStatus(httpClient, status => Equal.equals(status, StatusCodes.OK)),
+        HttpClient.filterStatus(httpClient, status => Equal.equals(status, StatusCodes.OK)).execute,
         Effect.flatMap(HttpClientResponse.schemaBodyJson(ListOfWorksSchema)),
         Effect.scoped,
         Effect.catchAll(ListWorksError.fromError),
@@ -153,7 +152,7 @@ export const WorkSchema = Schema.Struct({
   doi: Doi.DoiFromUrlSchema,
   language: LanguageCode.LanguageCodeSchema,
   primary_location: Schema.Struct({
-    source: Schema.optional(Schema.Struct({ id: Schema.compose(Url.UrlFromStringSchema, SourceIdFromUrlSchema) }), {
+    source: Schema.optionalWith(Schema.Struct({ id: Schema.compose(Url.UrlFromStringSchema, SourceIdFromUrlSchema) }), {
       nullable: true,
     }),
   }),

src/Preprint.ts

@@ -1,5 +1,4 @@
-import { Schema } from '@effect/schema'
-import { Data, Effect, Match, flow } from 'effect'
+import { Data, Effect, Match, Schema, flow } from 'effect'
 import type * as Crossref from './Crossref.js'
 import * as CrossrefPreprint from './CrossrefPreprint.js'
 import type * as Datacite from './Datacite.js'

src/Prereview.ts

@@ -12,13 +12,13 @@ export function writeAPrereviewUrl(doi: Doi.Doi) {
   )
 }
 
-export const preprintIsReady = (doi: Doi.Doi): Effect.Effect<boolean, never, HttpClient.HttpClient.Default> =>
+export const preprintIsReady = (doi: Doi.Doi): Effect.Effect<boolean, never, HttpClient.HttpClient> =>
   Effect.gen(function* (_) {
     const httpClient = yield* _(HttpClient.HttpClient)
 
     const request = HttpClientRequest.head(writeAPrereviewUrl(doi))
 
-    const response = yield* _(httpClient(request))
+    const response = yield* _(httpClient.execute(request))
 
     return Equal.equals(response.status, StatusCodes.OK)
   }).pipe(

src/ReviewRequest.ts

@@ -1,6 +1,5 @@
 import clip from '@arendjr/text-clipper'
-import { Schema } from '@effect/schema'
-import { Array, Context, Data, Effect, Exit, Match, String, pipe } from 'effect'
+import { Array, Context, Data, Effect, Exit, Match, Schema, String, pipe } from 'effect'
 import { decode } from 'html-entities'
 import mjml from 'mjml'
 import slackifyMarkdown from 'slackify-markdown'
@@ -29,8 +28,8 @@ const ThreadSchema = Schema.Struct({
   posts: Schema.NonEmptyArray(
     Schema.Struct({
       text: Schema.String,
-      fields: Schema.optional(Schema.Array(Schema.String), { default: Array.empty }),
-      actions: Schema.optional(Schema.Array(Schema.Literal('write-prereview')), { default: Array.empty }),
+      fields: Schema.optionalWith(Schema.Array(Schema.String), { default: Array.empty }),
+      actions: Schema.optionalWith(Schema.Array(Schema.Literal('write-prereview')), { default: Array.empty }),
     }),
   ),
 })

src/Router.ts

@@ -1,6 +1,5 @@
 import { HttpMiddleware, HttpRouter, HttpServerRequest, HttpServerResponse } from '@effect/platform'
-import { Schema, TreeFormatter } from '@effect/schema'
-import { Array, Config, Context, Data, Effect, Exit, Match, Option } from 'effect'
+import { Array, Config, Context, Data, Effect, Exit, Match, Option, ParseResult, Schema } from 'effect'
 import { StatusCodes } from 'http-status-codes'
 import { createHash } from 'node:crypto'
 import slackifyMarkdown from 'slackify-markdown'
@@ -27,7 +26,7 @@ class RedisTimeout extends Data.TaggedError('RedisTimeout') {
 const NewPrereviewSchema = Schema.Struct({
   url: Url.UrlFromStringSchema,
   author: Schema.Struct({
-    name: Schema.String.pipe(Schema.trimmed(), Schema.nonEmpty()),
+    name: Schema.NonEmptyTrimmedString,
   }),
 })
 
@@ -196,7 +195,7 @@ export const Router = HttpRouter.empty.pipe(
           Effect.gen(function* (_) {
             yield* _(
               Effect.logInfo('Invalid request').pipe(
-                Effect.annotateLogs({ message: TreeFormatter.formatErrorSync(error) }),
+                Effect.annotateLogs({ message: ParseResult.TreeFormatter.formatErrorSync(error) }),
               ),
             )
 

src/Slack.ts

@@ -1,6 +1,5 @@
 import { HttpClient, type HttpClientError, HttpClientRequest, HttpClientResponse } from '@effect/platform'
-import { Schema } from '@effect/schema'
-import { Brand, Context, Data, Effect } from 'effect'
+import { Brand, Context, Data, Effect, Schema } from 'effect'
 import * as Url from './Url.js'
 
 export interface SlackApiConfig {
@@ -23,12 +22,12 @@ const TimestampSchema = Schema.fromBrand(SlackTimestamp)(Schema.String)
 
 const PlainTextObjectSchema = Schema.Struct({
   type: Schema.Literal('plain_text'),
-  text: Schema.String.pipe(Schema.nonEmpty()),
+  text: Schema.NonEmptyString,
 })
 
 const MrkdwnTextObjectSchema = Schema.Struct({
   type: Schema.Literal('mrkdwn'),
-  text: Schema.String.pipe(Schema.nonEmpty()),
+  text: Schema.NonEmptyString,
 })
 
 const TextObjectSchema = Schema.Union(PlainTextObjectSchema, MrkdwnTextObjectSchema)
@@ -109,19 +108,19 @@ export const chatPostMessage = (
 ): Effect.Effect<
   { readonly channel: SlackChannelId; readonly timestamp: SlackTimestamp },
   SlackError,
-  HttpClient.HttpClient.Default | SlackApiConfig
+  HttpClient.HttpClient | SlackApiConfig
 > =>
   Effect.gen(function* (_) {
     const client = yield* _(slackClient)
 
     const request = yield* _(
       HttpClientRequest.post('chat.postMessage', { headers: {} }),
       HttpClientRequest.setHeader('Content-Type', 'application/json'),
-      HttpClientRequest.schemaBody(ChatPostMessageSchema)(message),
+      HttpClientRequest.schemaBodyJson(ChatPostMessageSchema)(message),
     )
 
     const response = yield* _(
-      client(request),
+      client.execute(request),
       Effect.flatMap(HttpClientResponse.schemaBodyJson(ChatPostMessageResponseSchema)),
       Effect.scoped,
     )
@@ -142,18 +141,18 @@ export const chatPostMessage = (
 
 export const chatDelete = (
   message: Schema.Schema.Type<typeof ChatDeleteSchema>,
-): Effect.Effect<void, SlackError, HttpClient.HttpClient.Default | SlackApiConfig> =>
+): Effect.Effect<void, SlackError, HttpClient.HttpClient | SlackApiConfig> =>
   Effect.gen(function* (_) {
     const client = yield* _(slackClient)
 
     const request = yield* _(
       HttpClientRequest.post('chat.delete'),
       HttpClientRequest.setHeader('Content-Type', 'application/json'),
-      HttpClientRequest.schemaBody(ChatDeleteSchema)(message),
+      HttpClientRequest.schemaBodyJson(ChatDeleteSchema)(message),
     )
 
     const response = yield* _(
-      client(request),
+      client.execute(request),
       Effect.flatMap(HttpClientResponse.schemaBodyJson(ChatDeleteResponseSchema)),
       Effect.scoped,
     )
@@ -174,7 +173,7 @@ export const chatDelete = (
 
 export const chatGetPermalink = (
   message: Schema.Schema.Type<typeof ChatGetPermalinkSchema>,
-): Effect.Effect<URL, SlackError, HttpClient.HttpClient.Default | SlackApiConfig> =>
+): Effect.Effect<URL, SlackError, HttpClient.HttpClient | SlackApiConfig> =>
   Effect.gen(function* (_) {
     const client = yield* _(slackClient)
 
@@ -183,7 +182,7 @@ export const chatGetPermalink = (
     const request = HttpClientRequest.get('chat.getPermalink', { urlParams })
 
     const response = yield* _(
-      client(request),
+      client.execute(request),
       Effect.flatMap(HttpClientResponse.schemaBodyJson(ChatGetPermalinkResponseSchema)),
       Effect.scoped,
     )
@@ -217,5 +216,5 @@ const toSlackError = (error: unknown): SlackError => {
 }
 
 const httpToSlackError = (error: HttpClientError.HttpClientError): SlackError => {
-  return new SlackError({ cause: error.error instanceof Error ? error.error : undefined, message: error.reason })
+  return new SlackError({ cause: error.cause instanceof Error ? error.cause : undefined, message: error.reason })
 }

src/Temporal.ts

@@ -1,6 +1,5 @@
-import { ParseResult, Schema } from '@effect/schema'
 import { Temporal } from '@js-temporal/polyfill'
-import { Clock, Effect, Tuple } from 'effect'
+import { Clock, Effect, ParseResult, Schema, Tuple } from 'effect'
 
 export const { Instant, PlainDate, PlainYearMonth } = Temporal
 

src/Url.ts

@@ -1,4 +1,4 @@
-import { ParseResult, Schema } from '@effect/schema'
+import { ParseResult, Schema } from 'effect'
 
 export const UrlFromSelfSchema: Schema.Schema<URL> = Schema.instanceOf(URL)