@effect-app/infra 4.0.0-beta.8 → 4.0.0-beta.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "4.0.0-beta.8",
+  "version": "4.0.0-beta.81",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -8,46 +8,46 @@
     "change-case": "^5.4.4",
     "cross-fetch": "^4.1.0",
     "express-oauth2-jwt-bearer": "^1.7.4",
-    "fast-check": "~4.5.3",
+    "fast-check": "~4.6.0",
     "path-parser": "^6.1.0",
     "proper-lockfile": "^4.1.2",
     "pure-rand": "7.0.1",
     "query-string": "^9.3.1",
-    "effect-app": "4.0.0-beta.7"
+    "effect-app": "4.0.0-beta.81"
   },
   "devDependencies": {
-    "@azure/cosmos": "^4.9.1",
+    "@azure/cosmos": "^4.9.2",
     "@azure/service-bus": "^7.9.5",
-    "@sentry/node": "10.40.0",
-    "@sentry/opentelemetry": "10.40.0",
+    "@sentry/node": "10.47.0",
+    "@sentry/opentelemetry": "10.47.0",
     "@types/express": "^5.0.6",
-    "@types/node": "25.3.3",
+    "@types/node": "25.5.2",
     "@types/proper-lockfile": "^4.1.4",
     "@types/redis": "^2.8.32",
     "@types/redlock": "^4.0.8",
     "express": "^5.2.1",
     "jwks-rsa": "2.1.4",
     "jwt-decode": "^4.0.0",
-    "mongodb": "7.1.0",
+    "mongodb": "7.1.1",
     "redis": "^3.1.2",
     "redlock": "^4.2.0",
     "strip-ansi": "^7.2.0",
-    "typescript": "~5.9.3",
-    "vitest": "^4.0.18",
-    "@effect-app/eslint-shared-config": "0.5.7-beta.1"
+    "typescript": "~6.0.2",
+    "vitest": "^4.1.3",
+    "@effect-app/eslint-shared-config": "0.5.7-beta.9"
   },
   "peerDependencies": {
-    "@azure/cosmos": "^4.9.1",
+    "@azure/cosmos": "^4.9.2",
     "@azure/service-bus": "^7.9.5",
-    "@effect/vitest": "^4.0.0-beta.25",
+    "@effect/vitest": "^4.0.0-beta.47",
     "@sendgrid/helpers": "^8.0.0",
     "@sendgrid/mail": "^8.1.6",
-    "@sentry/node": "10.40.0",
-    "@sentry/opentelemetry": "10.40.0",
+    "@sentry/node": "10.47.0",
+    "@sentry/opentelemetry": "10.47.0",
     "jwt-decode": "^4.0.0",
     "redis": "^3.1.2",
     "redlock": "^4.2.0",
-    "effect": "^4.0.0-beta.25",
+    "effect": "^4.0.0-beta.47",
     "express": "^5.2.1"
   },
   "typesVersions": {

package/src/CUPS.ts

@@ -1,6 +1,6 @@
 import { type FileOptions, tempFile } from "@effect-app/infra/fileUtil"
 import cp from "child_process"
-import { Config, Effect, Layer, Option, Predicate, S, ServiceMap } from "effect-app"
+import { Config, Context, Effect, Layer, Option, Predicate, S } from "effect-app"
 import { pretty } from "effect-app/utils"
 import fs from "fs"
 import os from "os"
@@ -100,7 +100,7 @@ export const CUPSConfig = Config.all({
     )
 })
 
-export class CUPS extends ServiceMap.Service<CUPS>()("effect-app/CUPS", {
+export class CUPS extends Context.Service<CUPS>()("effect-app/CUPS", {
   make: Effect.gen(function*() {
     const config = yield* CUPSConfig
     const serverUrl = Option.getOrUndefined(config.server)

package/src/Emailer/Sendgrid.ts

@@ -42,7 +42,7 @@ const makeSendgrid = ({ apiKey, defaultFrom, defaultReplyTo, realMail, subjectPr
                 (err, result) =>
                   err
                     ? resume(Effect.fail(err))
-                    : resume(Effect.sync(() => result!))
+                    : resume(Effect.sync(() => result))
               )
           )
           .pipe(Effect.mapError((raw) => new SendMailError({ raw })))

package/src/Emailer/service.ts

@@ -1,13 +1,13 @@
 import type { MailContent, MailData } from "@sendgrid/helpers/classes/mail.js"
 import type { ResponseError } from "@sendgrid/mail"
-import { Data, type Effect, type NonEmptyReadonlyArray, type Redacted, ServiceMap } from "effect-app"
+import { Context, Data, type Effect, type NonEmptyReadonlyArray, type Redacted } from "effect-app"
 import type { Email } from "effect-app/Schema"
 
 export class SendMailError extends Data.TaggedError("SendMailError")<{
   readonly raw: Error | ResponseError
 }> {}
 
-export class Emailer extends ServiceMap.Opaque<Emailer, {
+export class Emailer extends Context.Opaque<Emailer, {
   sendMail: (msg: EmailMsgOptionalFrom) => Effect.Effect<void, SendMailError>
 }>()("effect-app/Emailer") {}
 

package/src/MainFiberSet.ts

@@ -1,4 +1,4 @@
-import { Effect, Fiber, FiberSet, Layer, ServiceMap } from "effect-app"
+import { Context, Effect, Fiber, FiberSet, Layer } from "effect-app"
 import type {} from "effect/Scope"
 import { InfraLogger } from "./logger.js"
 import { reportNonInterruptedFailureCause } from "./QueueMaker/errors.js"
@@ -62,7 +62,7 @@ const make = Effect.gen(function*() {
  * you should register these long running fibers in a FiberSet, and join them at the end of your main program.
  * This way any errors will blow up the main program instead of fibers dying unknowingly.
  */
-export class MainFiberSet extends ServiceMap.Service<MainFiberSet>()("MainFiberSet", { make }) {
+export class MainFiberSet extends Context.Service<MainFiberSet>()("MainFiberSet", { make }) {
   static readonly Live = Layer.effect(this, this.make)
   static readonly JoinLive = this.asEffect().pipe(
     Effect.andThen((_) => _.join),

package/src/Model/Repository/internal/internal.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type {} from "effect/Equal"
 import type {} from "effect/Hash"
-import { Array, Chunk, Effect, Equivalence, flow, type NonEmptyReadonlyArray, Option, pipe, Pipeable, PubSub, Result, S, SchemaAST, ServiceMap, Unify } from "effect-app"
+import { Array, Chunk, Context, Effect, Equivalence, flow, type NonEmptyReadonlyArray, Option, pipe, Pipeable, PubSub, Result, S, SchemaAST, Unify } from "effect-app"
 import { toNonEmptyArray } from "effect-app/Array"
 import { NotFoundError } from "effect-app/client/errors"
 import { flatMapOption } from "effect-app/Effect"
@@ -55,14 +55,14 @@ export function makeRepoInternal<
 
     function make<RInitial = never, E = never, RPublish = never, RCtx = never>(
       args: [Evt] extends [never] ? {
-          schemaContext?: ServiceMap.ServiceMap<RCtx>
+          schemaContext?: Context.Context<RCtx>
           makeInitial?: Effect.Effect<readonly T[], E, RInitial> | undefined
           config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
             partitionValue?: (e?: Encoded) => string
           }
         }
         : {
-          schemaContext?: ServiceMap.ServiceMap<RCtx>
+          schemaContext?: Context.Context<RCtx>
           publishEvents: (evt: NonEmptyReadonlyArray<Evt>) => Effect.Effect<void, never, RPublish>
           makeInitial?: Effect.Effect<readonly T[], E, RInitial> | undefined
           config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
@@ -72,7 +72,7 @@ export function makeRepoInternal<
     ) {
       return Effect
         .gen(function*() {
-          const rctx: ServiceMap.ServiceMap<RCtx> = args.schemaContext ?? ServiceMap.empty() as any
+          const rctx: Context.Context<RCtx> = args.schemaContext ?? Context.empty() as any
           const provideRctx = Effect.provide(rctx)
           const encodeMany = flow(
             S.encodeEffect(S.Array(schema)),
@@ -113,11 +113,14 @@ export function makeRepoInternal<
               let ast = _.ast
               if (ast._tag === "Declaration") ast = ast.typeParameters[0]!
 
-              // In v4, to get the encoded (from) side of a schema, use SchemaAST.toEncoded
               const pickIdFromAst = (a: SchemaAST.AST) => {
-                const encoded = SchemaAST.toEncoded(a)
-                if (SchemaAST.isObjects(encoded)) {
-                  const field = encoded.propertySignatures.find((_) => _.name === idKey)
+                // Unwrap Declaration (e.g. TaggedClass) to get the underlying Objects AST
+                let inner = a
+                if (inner._tag === "Declaration") inner = inner.typeParameters[0]!
+                // Pick from the original AST to preserve the full encoding chain (e.g. decodeTo transformations).
+                // Using toEncoded would lose transformation info needed to encode Type -> Encoded.
+                if (SchemaAST.isObjects(inner)) {
+                  const field = inner.propertySignatures.find((_) => _.name === idKey)
                   if (field) {
                     return S.Struct({ [idKey]: S.make(field.type) }) as unknown as Codec<T, Encoded>
                   }

package/src/Model/Repository/makeRepo.ts

@@ -7,7 +7,7 @@
 // import type { ParserEnv } from "effect-app/Schema/custom/Parser"
 import type {} from "effect/Equal"
 import type {} from "effect/Hash"
-import { Effect, type NonEmptyReadonlyArray, type S, type ServiceMap } from "effect-app"
+import { type Context, Effect, type NonEmptyReadonlyArray, type S } from "effect-app"
 import type { StoreConfig, StoreMaker } from "../../Store.js"
 import type { FieldValues } from "../filter/types.js"
 import { type ExtendedRepository, extendRepo } from "./ext.js"
@@ -52,7 +52,7 @@ export interface RepositoryOptions<
    * Optional context to be provided to Schema decode/encode.
    * Useful for effectful transformations like XWithItems, where items is a transformation retrieving elements from another database table or other source.
    */
-  schemaContext?: ServiceMap.ServiceMap<RCtx>
+  schemaContext?: Context.Context<RCtx>
 
   overrides?: (
     repo: Repository<T, Encoded, Evt, ItemType, IdKey, Exclude<RSchema, RCtx>, RPublish>

package/src/Operations.ts

@@ -1,6 +1,6 @@
 import { reportError } from "@effect-app/infra/errorReporter"
 import { subHours } from "date-fns"
-import { Cause, copy, Duration, Effect, Exit, type Fiber, Layer, Option, S, Schedule, ServiceMap } from "effect-app"
+import { Cause, Context, copy, Duration, Effect, Exit, type Fiber, Layer, Option, S, Schedule } from "effect-app"
 import { annotateLogscoped } from "effect-app/Effect"
 import { dual, pipe } from "effect-app/Function"
 import { Operation, OperationFailure, OperationId, type OperationProgress, OperationSuccess } from "effect-app/Operations"
@@ -189,7 +189,7 @@ const make = Effect.gen(function*() {
   }
 })
 
-export class Operations extends ServiceMap.Opaque<Operations>()("effect-app/Operations", { make }) {
+export class Operations extends Context.Opaque<Operations>()("effect-app/Operations", { make }) {
   private static readonly CleanupLive = this
     .use((_) =>
       _.cleanup.pipe(

package/src/OperationsRepo.ts

@@ -1,8 +1,8 @@
-import { Effect, ServiceMap } from "effect-app"
+import { Context, Effect } from "effect-app"
 import { Operation } from "effect-app/Operations"
 import { makeRepo } from "./Model.js"
 
-export class OperationsRepo extends ServiceMap.Service<OperationsRepo>()(
+export class OperationsRepo extends Context.Service<OperationsRepo>()(
   "OperationRepo",
   {
     make: Effect.gen(function*() {

package/src/QueueMaker/SQLQueue.ts

@@ -1,16 +1,15 @@
 import { getRequestContext, setupRequestContextWithCustomSpan } from "@effect-app/infra/api/setupRequest"
 import { reportNonInterruptedFailure } from "@effect-app/infra/QueueMaker/errors"
 import { type QueueBase, QueueMeta } from "@effect-app/infra/QueueMaker/service"
-import { SqlClient } from "effect/unstable/sql"
 import { subMinutes } from "date-fns"
-import { Effect, Fiber, Option, S, Tracer } from "effect-app"
-import type { NonEmptyString255 } from "effect-app/Schema"
+import { Effect, Fiber, type NonEmptyReadonlyArray, Option, S, Tracer } from "effect-app"
+import { type NonEmptyString255 } from "effect-app/Schema"
 import { pretty } from "effect-app/utils"
-import type { NonEmptyReadonlyArray } from "effect-app"
+import { SqlClient } from "effect/unstable/sql"
 import { SQLModel } from "../adapters/SQL.js"
 import { InfraLogger } from "../logger.js"
 
-export const QueueId = S.Number.pipe(S.brand("QueueId"))
+export const QueueId = S.Finite.pipe(S.brand("QueueId"))
 export type QueueId = typeof QueueId.Type
 
 // TODO: let the model track and Auto Generate versionColumn on every update instead
@@ -79,14 +78,14 @@ export function makeSQLQueue<
 
     const q = {
       offer: Effect.fnUntraced(function*(body: Evt, meta: typeof QueueMeta.Type) {
-        yield* queueRepo.insertVoid({
+        yield* queueRepo.insertVoid(Queue.insert.make({
           body,
           meta,
           name: queueName,
           processingAt: Option.none(),
           finishedAt: Option.none(),
           etag: crypto.randomUUID()
-        })
+        }))
       }),
       take: Effect.gen(function*() {
         while (true) {
@@ -95,15 +94,16 @@ export function makeSQLQueue<
             const dec = yield* decodeDrain(first)
             const { createdAt, updatedAt, ...rest } = dec
             return yield* drainRepo.update(
-              { ...rest, processingAt: Option.some(new Date()) } // auto in lib , etag: crypto.randomUUID()
+              Drain.update.make({ ...rest, processingAt: Option.some(new Date()) }) // auto in lib , etag: crypto.randomUUID()
             )
           }
           if (first) return first
           yield* Effect.sleep(250)
         }
       }),
-      finish: ({ createdAt, updatedAt, ...q }: Drain) =>
-        drainRepo.updateVoid({ ...q, finishedAt: Option.some(new Date()) }) // auto in lib , etag: crypto.randomUUID()
+      finish: Effect.fn(function*({ createdAt, updatedAt, ...q }: Drain) {
+        return yield* drainRepo.updateVoid(Drain.update.make({ ...q, finishedAt: Option.some(new Date()) })) // auto in lib , etag: crypto.randomUUID()
+      })
     }
     const queue = {
       publish: (...messages: NonEmptyReadonlyArray<Evt>) =>

package/src/QueueMaker/memQueue.ts

@@ -1,12 +1,11 @@
 import { Cause, Tracer } from "effect"
-import { Effect, Fiber, flow, S } from "effect-app"
-import * as Q from "effect/Queue"
+import { Effect, Fiber, flow, type NonEmptyReadonlyArray, S } from "effect-app"
 import { pretty } from "effect-app/utils"
+import * as Q from "effect/Queue"
 import { MemQueue } from "../adapters/memQueue.js"
 import { getRequestContext, setupRequestContextWithCustomSpan } from "../api/setupRequest.js"
 import { InfraLogger } from "../logger.js"
 import { reportNonInterruptedFailure, reportNonInterruptedFailureCause } from "./errors.js"
-import type { NonEmptyReadonlyArray } from "effect-app"
 import { type QueueBase, QueueMeta } from "./service.js"
 
 export function makeMemQueue<
@@ -26,8 +25,12 @@ export function makeMemQueue<
     const qDrain = yield* mem.getOrCreateQueue(queueDrainName)
 
     const wireSchema = S.Struct({ body: schema, meta: QueueMeta })
+    const wireSchemaJson = S.fromJsonString(S.toCodecJson(wireSchema))
+    const encodePublish = S.encodeEffect(wireSchemaJson)
     const drainW = S.Struct({ body: drainSchema, meta: QueueMeta })
-    const parseDrain = flow(S.decodeUnknownEffect(drainW), Effect.orDie)
+    const drainWJson = S.fromJsonString(S.toCodecJson(drainW))
+
+    const parseDrain = flow(S.decodeUnknownEffect(drainWJson), Effect.orDie)
 
     const queue = {
       publish: (...messages: NonEmptyReadonlyArray<Evt>) =>
@@ -37,10 +40,8 @@ export function makeMemQueue<
               Effect
                 .forEach(messages, (m) =>
                   // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
-                  S.encodeEffect(wireSchema)({ body: m, meta: requestContext }).pipe(
+                  encodePublish({ body: m, meta: requestContext }).pipe(
                     Effect.orDie,
-                    Effect
-                      .map(JSON.stringify),
                     // .tap((msg) => info("Publishing Mem Message: " + utils.inspect(msg)))
                     Effect.flatMap((_) => Q.offer(q, _))
                   ), { discard: true })
@@ -58,42 +59,40 @@ export function makeMemQueue<
         const reportError = reportNonInterruptedFailureCause({ name: "MemQueue.drain." + queueDrainName })
         const processMessage = (msg: string) =>
           // we JSON parse, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
-          Effect
-            .sync(() => JSON.parse(msg))
-            .pipe(
-              Effect.flatMap(parseDrain),
-              Effect.orDie,
-              Effect
-                .flatMap(({ body, meta }) => {
-                  let effect = InfraLogger
-                    .logDebug(`[${queueDrainName}] Processing incoming message`)
-                    .pipe(
-                      Effect.annotateLogs({ body: pretty(body), meta: pretty(meta) }),
-                      Effect.andThen(handleEvent(body)),
-                      silenceAndReportError,
-                      (_) =>
-                        setupRequestContextWithCustomSpan(
-                          _,
-                          meta,
-                          `queue.drain: ${queueDrainName}.${body._tag}`,
-                          {
-                            captureStackTrace: false,
-                            kind: "consumer",
-                            attributes: {
-                              "queue.name": queueDrainName,
-                              "queue.sessionId": sessionId,
-                              "queue.input": body
-                            }
+          parseDrain(msg).pipe(
+            Effect.orDie,
+            Effect
+              .flatMap(({ body, meta }) => {
+                let effect = InfraLogger
+                  .logDebug(`[${queueDrainName}] Processing incoming message`)
+                  .pipe(
+                    Effect.annotateLogs({ body: pretty(body), meta: pretty(meta) }),
+                    Effect.andThen(handleEvent(body)),
+                    silenceAndReportError,
+                    (_) =>
+                      setupRequestContextWithCustomSpan(
+                        _,
+                        meta,
+                        `queue.drain: ${queueDrainName}.${body._tag}`,
+                        {
+                          captureStackTrace: false,
+                          kind: "consumer",
+                          attributes: {
+                            "queue.name": queueDrainName,
+                            "queue.sessionId": sessionId,
+                            "queue.input": body
                           }
-                        )
-                    )
-                  if (meta.span) {
-                    effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span))
-                  }
-                  return effect
-                })
-            )
-        return Q.take(qDrain)
+                        }
+                      )
+                  )
+                if (meta.span) {
+                  effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span))
+                }
+                return effect
+              })
+          )
+        return Q
+          .take(qDrain)
           .pipe(
             Effect
               .flatMap((x) =>

package/src/QueueMaker/sbqueue.ts

@@ -1,12 +1,11 @@
 import { Tracer } from "effect"
-import { Cause, Effect, flow, S } from "effect-app"
+import { Cause, Effect, flow, type NonEmptyReadonlyArray, S } from "effect-app"
 import type { StringId } from "effect-app/Schema"
 import { pretty } from "effect-app/utils"
 import { Receiver, Sender } from "../adapters/ServiceBus.js"
 import { getRequestContext, setupRequestContextWithCustomSpan } from "../api/setupRequest.js"
 import { InfraLogger } from "../logger.js"
 import { reportNonInterruptedFailure, reportNonInterruptedFailureCause, reportQueueError } from "./errors.js"
-import type { NonEmptyReadonlyArray } from "effect-app"
 import { type QueueBase, QueueMeta } from "./service.js"
 
 export function makeServiceBusQueue<
@@ -22,8 +21,11 @@ export function makeServiceBusQueue<
     body: schema,
     meta: QueueMeta
   })
+  const wireSchemaJson = S.fromJsonString(S.toCodecJson(wireSchema))
+  const encodePublish = S.encodeEffect(wireSchemaJson)
   const drainW = S.Struct({ body: drainSchema, meta: QueueMeta })
-  const parseDrain = flow(S.decodeUnknownEffect(drainW), Effect.orDie)
+  const drainWJson = S.fromJsonString(S.toCodecJson(drainW))
+  const parseDrain = flow(S.decodeUnknownEffect(drainWJson), Effect.orDie)
 
   return Effect.gen(function*() {
     const sender = yield* Sender
@@ -40,55 +42,51 @@ export function makeServiceBusQueue<
         handleEvent: (ks: DrainEvt) => Effect.Effect<void, DrainE, DrainR>,
         sessionId?: string
       ) => {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        function processMessage(messageBody: any) {
-          return Effect
-            .sync(() => JSON.parse(messageBody))
-            .pipe(
-              Effect.flatMap((x) => parseDrain(x)),
-              Effect.orDie,
-              Effect
-                .flatMap(({ body, meta }) => {
-                  let effect = InfraLogger
-                    .logDebug(`[${receiver.name}] Processing incoming message`)
-                    .pipe(
-                      Effect.annotateLogs({
-                        body: pretty(body),
-                        meta: pretty(meta)
-                      }),
-                      Effect.andThen(handleEvent(body)),
-                      Effect.orDie
-                    )
-                    // we silenceAndReportError here, so that the error is reported, and moves into the Exit.
-                    .pipe(
-                      silenceAndReportError,
-                      (_) =>
-                        setupRequestContextWithCustomSpan(
-                          _,
-                          meta,
-                          `queue.drain: ${receiver.name}${sessionId ? `#${sessionId}` : ""}.${body._tag}`,
-                          {
-                            captureStackTrace: false,
-                            kind: "consumer",
-                            attributes: {
-                              "queue.name": receiver.name,
-                              "queue.sessionId": sessionId,
-                              "queue.input": body
-                            }
+        function processMessage(messageBody: unknown) {
+          return parseDrain(messageBody).pipe(
+            Effect.orDie,
+            Effect
+              .flatMap(({ body, meta }) => {
+                let effect = InfraLogger
+                  .logDebug(`[${receiver.name}] Processing incoming message`)
+                  .pipe(
+                    Effect.annotateLogs({
+                      body: pretty(body),
+                      meta: pretty(meta)
+                    }),
+                    Effect.andThen(handleEvent(body)),
+                    Effect.orDie
+                  )
+                  // we silenceAndReportError here, so that the error is reported, and moves into the Exit.
+                  .pipe(
+                    silenceAndReportError,
+                    (_) =>
+                      setupRequestContextWithCustomSpan(
+                        _,
+                        meta,
+                        `queue.drain: ${receiver.name}${sessionId ? `#${sessionId}` : ""}.${body._tag}`,
+                        {
+                          captureStackTrace: false,
+                          kind: "consumer",
+                          attributes: {
+                            "queue.name": receiver.name,
+                            "queue.sessionId": sessionId,
+                            "queue.input": body
                           }
-                        )
-                    )
-                  if (meta.span) {
-                    effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span))
-                  }
-                  return effect
-                }),
-              Effect
-                // we reportError here, so that we report the error only, and keep flowing
-                .tapCause(reportError),
-              // we still need to flatten the Exit.
-              Effect.flatMap((_) => _)
-            )
+                        }
+                      )
+                  )
+                if (meta.span) {
+                  effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span))
+                }
+                return effect
+              }),
+            Effect
+              // we reportError here, so that we report the error only, and keep flowing
+              .tapCause(reportError),
+            // we still need to flatten the Exit.
+            Effect.flatMap((_) => _)
+          )
         }
 
         return receiver
@@ -111,17 +109,22 @@ export function makeServiceBusQueue<
         getRequestContext
           .pipe(
             Effect.flatMap((requestContext) =>
-              Effect.forEach(messages, (m) =>
-                S.encodeEffect(wireSchema)({
-                  body: m,
-                  meta: requestContext
-                }).pipe(Effect.orDie, Effect.map((encoded) => ({
-                  body: JSON.stringify(encoded),
-                  messageId: m.id, /* correllationid: requestId */
-                  contentType: "application/json",
-                  sessionId: "sessionId" in m ? m.sessionId as string : undefined as unknown as string // TODO: optional
-                }))))
-              .pipe(Effect.flatMap((msgs) => sender.sendMessages(msgs)))
+              Effect
+                .forEach(messages, (m) =>
+                  encodePublish({
+                    body: m,
+                    meta: requestContext
+                  })
+                    .pipe(
+                      Effect.orDie,
+                      Effect.map((body) => ({
+                        body,
+                        messageId: m.id, /* correllationid: requestId */
+                        contentType: "application/json",
+                        sessionId: "sessionId" in m ? m.sessionId as string : undefined as unknown as string // TODO: optional
+                      }))
+                    ))
+                .pipe(Effect.flatMap((msgs) => sender.sendMessages(msgs)))
             ),
             Effect.withSpan("queue.publish: " + sender.name, {
               kind: "producer",

package/src/RequestContext.ts

@@ -1,11 +1,11 @@
-import { S, ServiceMap } from "effect-app"
+import { Context, S } from "effect-app"
 import { UserProfileId } from "effect-app/ids"
 import { NonEmptyString255 } from "effect-app/Schema"
 
-export const Locale = S.Literal("en", "de")
+export const Locale = S.Literals(["en", "de"])
 export type Locale = typeof Locale.Type
 
-export class LocaleRef extends ServiceMap.Reference("Locale", { defaultValue: (): Locale => "en" }) {}
+export class LocaleRef extends Context.Reference("Locale", { defaultValue: (): Locale => "en" }) {}
 
 export class RequestContext extends S.ExtendedClass<
   RequestContext,
@@ -23,7 +23,7 @@ export class RequestContext extends S.ExtendedClass<
   /** @deprecated */
   userProfile: S.optional(S.Struct({ sub: UserProfileId })) //
 }) {
-  // static Tag = ServiceMap.Tag<RequestContext>()
+  // static Tag = Context.Tag<RequestContext>()
 
   static toMonitoring(this: void, self: RequestContext) {
     return {

package/src/RequestFiberSet.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Effect, Fiber, FiberSet, Layer, ServiceMap, type Tracer } from "effect-app"
+import { Context, Effect, Fiber, FiberSet, Layer, Option, type Tracer } from "effect-app"
 import { reportRequestError, reportUnknownRequestError } from "./api/reportError.js"
 import { InfraLogger } from "./logger.js"
 
@@ -8,8 +8,8 @@ const getRootParentSpan = Effect.gen(function*() {
     Effect.catchTag("NoSuchElementError", () => Effect.succeed(null))
   )
   if (!span) return span
-  while (span._tag === "Span" && span.parent !== undefined) {
-    span = span.parent
+  while (span._tag === "Span" && Option.isSome(span.parent)) {
+    span = span.parent.value
   }
   return span
 })
@@ -92,7 +92,7 @@ const make = Effect.gen(function*() {
  * Whenever you fork a fiber for a Request, and you want to prevent dependent services to close prematurely on interruption,
  * like the ServiceBus Sender, you should register these fibers in this FiberSet.
  */
-export class RequestFiberSet extends ServiceMap.Service<RequestFiberSet>()("RequestFiberSet", { make }) {
+export class RequestFiberSet extends Context.Service<RequestFiberSet>()("RequestFiberSet", { make }) {
   static readonly Live = Layer.effect(this, this.make)
   static readonly register = <A, E, R>(self: Effect.Effect<A, E, R>) =>
     this.asEffect().pipe(Effect.andThen((_) => _.register(self)))