@effect-app/infra 0.85.0-next.4 → 0.85.1

package/_cjs/services/simpledb/simpledb.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"simpledb.cjs","names":["_shared","require","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","InvalidStateError","constructor","message","details","_tag","exports","makeLiveRecordCache","m","Map","type","tsplus_module_1","Effect","sync","ex","nm","makeMap","RecordCache","tsplus_module_2","Tag","LiveRecordCache","tsplus_module_3","effect","getM","eff","gen","$","tsplus_module_4","flatMap","find","tryRead","decode","getCache","read","id","tsplus_module_5","mapOption","tapOption","flatMapOption","data","version","mapBoth","onFailure","err","onSuccess","c","orElse","existing","storeDirectly","save","record","map","tap","x","cv","store","lock","_","tsplus_module_7","match","onNone","tsplus_module_6","Option","none","onSome","confirmVersionAndSave","scoped","zipRight","fail","succeed","OptimisticLockException","unit","some"],"sources":["../../../_src/services/simpledb/simpledb.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"simpledb.cjs","names":["_shared","require","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","InvalidStateError","constructor","message","details","_tag","exports","makeLiveRecordCache","m","Map","type","tsplus_module_1","sync","ex","nm","makeMap","RecordCache","tsplus_module_2","Tag","LiveRecordCache","tsplus_module_3","effect","getM","eff","gen","$","flatMap","find","tryRead","decode","getCache","read","id","tsplus_module_4","mapOption","tapOption","flatMapOption","data","version","mapBoth","onFailure","err","onSuccess","c","orElse","existing","storeDirectly","save","record","map","tap","x","cv","store","lock","_","tsplus_module_6","match","onNone","tsplus_module_5","none","onSome","confirmVersionAndSave","scoped","zipRight","fail","succeed","OptimisticLockException","unit","some"],"sources":["../../../_src/services/simpledb/simpledb.ts"],"sourcesContent":[null],"mappings":"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"}

package/_src/api/authorization.jwt.ts

@@ -42,7 +42,7 @@ export const scopes = Ex.classic(demandScopes)
   )
   return (
     cfg.AUTH_DISABLED
-      ? Effect.sync(() => null)
+      ? Effect(null)
       : // eslint-disable-next-line @typescript-eslint/no-empty-function
         handleJwt(req, res, () => scopes(req, res, () => {}))
   ).zipRight(

package/_src/api/defaultErrorHandler.ts

@@ -7,7 +7,7 @@ export function defaultBasicErrorHandler<R>(
   res: express.Response,
   r2: Effect<R, ValidationError, void>
 ) {
-  const sendError = (code: number) => (body: unknown) => Effect.sync(() => res.status(code).send(body))
+  const sendError = (code: number) => (body: unknown) => Effect(res.status(code).send(body))
   return r2
     .tapErrorCause((cause) => cause.isFailure() ? logRequestError(cause) : Effect.unit)
     .catchTag("ValidationError", (err) => sendError(400)(err.errors))
@@ -33,7 +33,7 @@ export function defaultErrorHandler<R>(
   const r3 = req.method === "PATCH"
     ? r2.retry(optimisticConcurrencySchedule)
     : r2
-  const sendError = (code: number) => (body: unknown) => Effect.sync(() => res.status(code).send(body))
+  const sendError = (code: number) => (body: unknown) => Effect(res.status(code).send(body))
   return r3
     .tapErrorCause((cause) => cause.isFailure() ? logRequestError(cause) : Effect.unit)
     .catchTags({

package/_src/api/express/routing.ts.bak

@@ -76,7 +76,7 @@ export function match<
       h
     )
   ).zipRight(
-    Effect.sync(() => makeRouteDescriptor(r.Request.path, r.Request.method, r))
+    Effect(makeRouteDescriptor(r.Request.path, r.Request.method, r))
   )
 }
 
@@ -180,14 +180,14 @@ export function handleRequest<
         }))
       // final catch all; expecting never so that unhandled known errors will show up
       .catchAll((err: never) =>
-        Effect.sync(() => 
+        Effect(
           console.error(
             "Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect",
             err
           )
         ).flatMap(Effect.die)
       )
-  // .tapCause(() => Effect.sync(() => res.status(500).send()))
+  // .tapCause(() => Effect(res.status(500).send()))
 }
 
 // Additional convenience helpers
@@ -242,7 +242,7 @@ export function get<
       r,
       h
     )
-  ).zipRight(Effect.sync(() => makeRouteDescriptor(path, "GET", r)))
+  ).zipRight(Effect(makeRouteDescriptor(path, "GET", r)))
 }
 
 export function post<
@@ -295,7 +295,7 @@ export function post<
       r,
       h
     )
-  ).zipRight(Effect.sync(() => makeRouteDescriptor(path, "POST", r)))
+  ).zipRight(Effect(makeRouteDescriptor(path, "POST", r)))
 }
 
 export function put<
@@ -348,7 +348,7 @@ export function put<
       r,
       h
     )
-  ).zipRight(Effect.sync(() => makeRouteDescriptor(path, "PUT", r)))
+  ).zipRight(Effect(makeRouteDescriptor(path, "PUT", r)))
 }
 
 export function patch<
@@ -401,7 +401,7 @@ export function patch<
       r,
       h
     )
-  ).zipRight(Effect.sync(() => makeRouteDescriptor(path, "PATCH", r)))
+  ).zipRight(Effect(makeRouteDescriptor(path, "PATCH", r)))
 }
 
 function del<
@@ -454,7 +454,7 @@ function del<
       r,
       h
     )
-  ).zipRight(Effect.sync(() => makeRouteDescriptor(path, "DELETE", r)))
+  ).zipRight(Effect(makeRouteDescriptor(path, "DELETE", r)))
 }
 
 export { del as delete }

package/_src/api/express/schema/routing.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import * as MO from "@effect-app/schema"
 import type { Methods } from "@effect-app/schema"
@@ -5,7 +6,37 @@ import type { Methods } from "@effect-app/schema"
 import type { JSONSchema, ParameterLocation, SubSchema } from "@effect-app/infra-adapters/Openapi/atlas-plutus"
 import { isObjectSchema } from "@effect-app/infra-adapters/Openapi/atlas-plutus"
 import * as OpenApi from "@effect-app/infra-adapters/Openapi/index"
-import type { RequestHandler, RequestHandlerOptRes } from "./requestHandler.js"
+
+export type Request<
+  PathA,
+  CookieA,
+  QueryA,
+  BodyA,
+  HeaderA,
+  ReqA extends PathA & QueryA & BodyA
+> = MO.ReqResSchemed<unknown, ReqA> & {
+  method: Methods
+  path: string
+  Cookie?: MO.ReqRes<Record<string, string>, CookieA>
+  Path?: MO.ReqRes<Record<string, string>, PathA>
+  Body?: MO.ReqRes<unknown, BodyA>
+  Query?: MO.ReqRes<Record<string, string>, QueryA>
+  Headers?: MO.ReqRes<Record<string, string>, HeaderA>
+}
+
+export interface RouteRequestHandler<
+  PathA,
+  CookieA,
+  QueryA,
+  BodyA,
+  HeaderA,
+  ReqA extends PathA & QueryA & BodyA,
+  ResA
+> {
+  Request: Request<PathA, CookieA, QueryA, BodyA, HeaderA, ReqA>
+  Response?: MO.ReqRes<unknown, ResA> | MO.ReqResSchemed<unknown, ResA>
+  ResponseOpenApi?: any
+}
 
 export function asRouteDescriptionAny<R extends RouteDescriptorAny>(i: R) {
   return i as RouteDescriptorAny
@@ -18,7 +49,6 @@ export function arrAsRouteDescriptionAny<R extends RouteDescriptorAny>(
 }
 
 export interface RouteDescriptor<
-  R,
   PathA,
   CookieA,
   QueryA,
@@ -26,12 +56,12 @@ export interface RouteDescriptor<
   HeaderA,
   ReqA extends PathA & QueryA & BodyA,
   ResA,
-  Errors,
   METHOD extends Methods = Methods
 > {
+  _tag: "Schema"
   path: string
   method: METHOD
-  handler: RequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, Errors>
+  handler: RouteRequestHandler<PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA>
   info?: {
     tags: ReadonlyArray<string>
   }
@@ -44,13 +74,10 @@ export type RouteDescriptorAny = RouteDescriptor<
   any,
   any,
   any,
-  any,
-  any,
   any
 >
 
 export function makeRouteDescriptor<
-  R,
   PathA,
   CookieA,
   QueryA,
@@ -58,39 +85,34 @@ export function makeRouteDescriptor<
   HeaderA,
   ReqA extends PathA & QueryA & BodyA,
   ResA = void,
-  Errors = any,
   METHOD extends Methods = Methods
 >(
   path: string,
   method: METHOD,
-  handler: RequestHandlerOptRes<
-    R,
+  handler: RouteRequestHandler<
     PathA,
     CookieA,
     QueryA,
     BodyA,
     HeaderA,
     ReqA,
-    ResA,
-    Errors
-  >
-) {
-  return { path, method, handler, _tag: "Schema" } as RouteDescriptor<
-    R,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ReqA,
-    ResA,
-    Errors,
-    METHOD
+    ResA
   >
+): RouteDescriptor<
+  PathA,
+  CookieA,
+  QueryA,
+  BodyA,
+  HeaderA,
+  ReqA,
+  ResA,
+  METHOD
+> {
+  return { path, handler, method, _tag: "Schema" }
 }
 
 export function makeFromSchema<ResA>(
-  e: RouteDescriptor<any, any, any, any, any, any, ResA, any, any>
+  e: RouteDescriptor<any, any, any, any, any, ResA, any>
 ) {
   const jsonSchema_ = OpenApi.for
   const jsonSchema = <E, A>(r: MO.ReqRes<E, A>) => jsonSchema_(r)
@@ -99,33 +121,33 @@ export function makeFromSchema<ResA>(
   const Res = r ? MO.extractSchema(r) : MO.Void
   // TODO EffectOption.fromNullable(Req.Headers).flatMapOpt(jsonSchema)
   // TODO: use the path vs body etc serialisation also in the Client.
-  const makeReqQuerySchema = Effect.sync(() => Option.fromNullable(Req.Query)).flatMap((_) =>
+  const makeReqQuerySchema = Effect(Option.fromNullable(Req.Query)).flatMap((_) =>
     _.match({
-      onNone: () => Effect.sync(() => Option.none()),
+      onNone: () => Effect(Option.none),
       onSome: (_) => jsonSchema(_).map(Option.some)
     })
   )
-  const makeReqHeadersSchema = Effect.sync(() => Option.fromNullable(Req.Headers)).flatMap((_) =>
+  const makeReqHeadersSchema = Effect(Option.fromNullable(Req.Headers)).flatMap((_) =>
     _.match({
-      onNone: () => Effect.sync(() => Option.none()),
+      onNone: () => Effect(Option.none),
       onSome: (_) => jsonSchema(_).map(Option.some)
     })
   )
-  const makeReqCookieSchema = Effect.sync(() => Option.fromNullable(Req.Cookie)).flatMap((_) =>
+  const makeReqCookieSchema = Effect(Option.fromNullable(Req.Cookie)).flatMap((_) =>
     _.match({
-      onNone: () => Effect.sync(() => Option.none()),
+      onNone: () => Effect(Option.none),
       onSome: (_) => jsonSchema(_).map(Option.some)
     })
   )
-  const makeReqPathSchema = Effect.sync(() => Option.fromNullable(Req.Path)).flatMap((_) =>
+  const makeReqPathSchema = Effect(Option.fromNullable(Req.Path)).flatMap((_) =>
     _.match({
-      onNone: () => Effect.sync(() => Option.none()),
+      onNone: () => Effect(Option.none),
       onSome: (_) => jsonSchema(_).map(Option.some)
     })
   )
-  const makeReqBodySchema = Effect.sync(() => Option.fromNullable(Req.Body)).flatMap((_) =>
+  const makeReqBodySchema = Effect(Option.fromNullable(Req.Body)).flatMap((_) =>
     _.match({
-      onNone: () => Effect.sync(() => Option.none()),
+      onNone: () => Effect(Option.none),
       onSome: (_) => jsonSchema(_).map(Option.some)
     })
   )
@@ -136,7 +158,7 @@ export function makeFromSchema<ResA>(
   function makeParameters(inn: ParameterLocation) {
     return (a: Option<JSONSchema | SubSchema>) => {
       return a
-        .flatMap((o) => (isObjectSchema(o) ? Option.some(o) : Option.none()))
+        .flatMap((o) => (isObjectSchema(o) ? Option(o) : Option.none))
         .map((x) => {
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           return Object.keys(x.properties!).map((p) => {

package/_src/api/setupRequest.ts

@@ -1,16 +1,15 @@
 import { RequestId } from "@effect-app/prelude/ids"
 import { RequestContext } from "../RequestContext.js"
-import { RequestContextContainer, RequestContextContainerImpl } from "../services/RequestContextContainer.js"
+import { RequestContextContainer } from "../services/RequestContextContainer.js"
 
 /**
  * @tsplus fluent effect/io/Effect setupRequestFromWith
  */
 export function setupReq3<R, E, A>(self: Effect<R, E, A>, name: string) {
-  return makeInternalRequestContext(name).flatMap((rc) =>
-    self
+  return makeInternalRequestContext(name)
+    .flatMap((rc) => RequestContextContainer.flatMap((_) => _.start(rc)))
+    > self
       .withRequestSpan
-      .provideService(RequestContextContainer, new RequestContextContainerImpl(rc))
-  )
 }
 
 function makeInternalRequestContext(name: string) {
@@ -27,8 +26,10 @@ function makeInternalRequestContext(name: string) {
 
 /** @tsplus getter effect/io/Effect withRequestSpan */
 export const withRequestSpan = <R, E, A>(f: Effect<R, E, A>) =>
-  RequestContextContainer.flatMap((c) => c.requestContext).flatMap((ctx) =>
-    f
-      .withSpan(`request[${ctx.name}]#${ctx.id}`)
-      .withLogSpan("request")
-  )
+  RequestContextContainer
+    .get
+    .flatMap((ctx) =>
+      f
+        .withSpan(`request[${ctx.name}]#${ctx.id}`)
+        .withLogSpan("request")
+    )

package/_src/errorReporter.ts

@@ -73,5 +73,5 @@ export function reportMessage(message: string) {
 }
 
 export function reportMessageM(message: string) {
-  return Effect.sync(() => reportMessage(message))
+  return Effect(reportMessage(message))
 }

package/_src/services/Emailer/Sendgrid.ts

@@ -32,7 +32,7 @@ const makeLiveSendgrid = ({ apiKey, defaultFrom, defaultReplyTo, realMail, subje
                 void sgMail.send(renderedMsg, false, (err, result) =>
                   err
                     ? cb(Effect.fail(err))
-                    : cb(Effect.sync(() => result)))
+                    : cb(Effect(result)))
             )
           )
 

package/_src/services/Operations/live.ts

@@ -8,7 +8,7 @@ const reportAppError = reportError((cause) => new RequestException(cause))
 
 const make = Effect.sync((): Operations => {
   const ops = new Map<OperationId, Operation>()
-  const makeOp = Effect.sync(() => OperationId.make())
+  const makeOp = Effect(OperationId.make())
 
   const cleanup = Effect.sync(() => {
     const before = new Date().subHours(1)
@@ -29,7 +29,7 @@ const make = Effect.sync((): Operations => {
     })
   }
   function findOp(id: OperationId) {
-    return Effect.sync(() => Option.fromNullable(ops.get(id)))
+    return Effect(Option.fromNullable(ops.get(id)))
   }
   function finishOp(id: OperationId, exit: Exit<unknown, unknown>) {
     return findOp(id).flatMap((_) =>
@@ -52,8 +52,8 @@ const make = Effect.sync((): Operations => {
                   .failureOption
                   .flatMap((_) =>
                     typeof _ === "object" && _ !== null && "message" in _ && LongString.Guard(_.message)
-                      ? Option.some(_.message)
-                      : Option.none()
+                      ? Option(_.message)
+                      : Option.none
                   )
                   .value ?? null
             })
@@ -75,7 +75,7 @@ const make = Effect.sync((): Operations => {
     cleanup,
     register: makeOp
       .tap((id) =>
-        EffectX.annotateLogscoped("operationId", id)
+        Effect.annotateLogscoped("operationId", id)
           > addOp(id).acquireRelease(
             (_, exit) => finishOp(id, exit)
           )

package/_src/services/QueueMaker/errors.ts

@@ -42,7 +42,7 @@ export function reportNonInterruptedFailure(context?: Record<string, unknown>) {
       .exit
       .flatMap((result) =>
         result.match(
-          { onFailure: (cause) => report(cause).map(() => result), onSuccess: () => Effect.sync(() => result) }
+          { onFailure: (cause) => report(cause).map(() => result), onSuccess: () => Effect(result) }
         )
       )
 }

package/_src/services/QueueMaker/memQueue.ts

@@ -43,7 +43,7 @@ export function makeMemQueue<
             messages
               .forEachEffect((m) =>
                 // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
-                Effect.sync(() => 
+                Effect(
                   JSON.stringify(
                     encoder({ body: m, meta: requestContext })
                   )
@@ -60,7 +60,7 @@ export function makeMemQueue<
         const silenceAndReportError = reportNonInterruptedFailure({ 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))
+          Effect(JSON.parse(msg))
             .flatMap(parseDrain)
             .orDie
             .flatMap(({ body, meta }) =>

package/_src/services/QueueMaker/sbqueue.ts

@@ -81,7 +81,7 @@ export function makeServiceBusQueue<
         return yield* $(
           subscribe({
             processMessage: (x) => processMessage(x.body).uninterruptible,
-            processError: (err) => Effect.sync(() => captureException(err.error))
+            processError: (err) => Effect(captureException(err.error))
           })
             .provide(receiverLayer)
         )

package/_src/services/Repository.ts

@@ -7,9 +7,8 @@ import type { InvalidStateError, OptimisticConcurrencyException } from "../error
 import { NotFoundError } from "../errors.js"
 import { ContextMap } from "../services/Store.js"
 import type { Filter } from "../services/Store.js"
-import type { RequestContextContainer } from "./RequestContextContainer.js"
 
-export type RequestCTX = ContextMap | RequestContextContainer
+export type RequestCTX = ContextMap
 /**
  * @tsplus type Repository
  */
@@ -155,7 +154,7 @@ export function project<
   self: Repository<T, PM, Evt, ItemType>,
   map: { filter?: Filter<PM>; collect?: (t: PM) => Option<S>; limit?: number; skip?: number }
 ) {
-  return self.projectEffect(Effect.sync(() => map))
+  return self.projectEffect(Effect(map))
 }
 
 /**
@@ -235,7 +234,7 @@ export function query<
   // TODO: think about collectPM, collectE, and collect(Parsed)
   map: { filter?: Filter<PM>; collect?: (t: T) => Option<S>; limit?: number; skip?: number }
 ) {
-  return self.queryEffect(Effect.sync(() => map))
+  return self.queryEffect(Effect(map))
 }
 
 /**
@@ -252,7 +251,7 @@ export function queryOne<
   // TODO: think about collectPM, collectE, and collect(Parsed)
   map: { filter?: Filter<PM>; collect?: (t: T) => Option<S> }
 ) {
-  return self.queryOneEffect(Effect.sync(() => map))
+  return self.queryOneEffect(Effect(map))
 }
 
 /**
@@ -290,7 +289,7 @@ export function queryAndSavePure<
   // TODO: think about collectPM, collectE, and collect(Parsed)
   map: { filter: Filter<PM>; collect?: (t: T) => Option<S>; limit?: number; skip?: number }
 ) {
-  return self.queryAndSavePureEffect(Effect.sync(() => map))
+  return self.queryAndSavePureEffect(Effect(map))
 }
 
 /**
@@ -443,7 +442,7 @@ export function queryAndSavePureBatched<
   map: { filter: Filter<PM>; collect?: (t: T) => Option<S>; limit?: number; skip?: number },
   batchSize = 100
 ) {
-  return self.queryAndSavePureEffectBatched(Effect.sync(() => map), batchSize)
+  return self.queryAndSavePureEffectBatched(Effect(map), batchSize)
 }
 
 /**
@@ -536,7 +535,7 @@ export interface OneDSLExt<T, Evt> {
  * @tsplus fluent DSLExt updateWith
  */
 export function updateWithOne<T, Evt, S1 extends T, S2 extends T>(self: OneDSL<T, Evt>, upd: (item: S1) => S2) {
-  return self.update((_: S1) => Effect.sync(() => upd(_)))
+  return self.update((_: S1) => Effect(upd(_)))
 }
 
 /**
@@ -546,7 +545,7 @@ export function updateWith<T, Evt, S1 extends T, S2 extends T>(
   self: AllDSL<T, Evt>,
   upd: (item: S1[]) => S2[]
 ) {
-  return self.update((_: S1[]) => Effect.sync(() => upd(_)))
+  return self.update((_: S1[]) => Effect(upd(_)))
 }
 
 export function makeOneDSL<T, Evt>(): OneDSL<T, Evt> {
@@ -603,14 +602,14 @@ export function makeDSL<S1, S2, Evt>() {
 export interface DSLExt<S1, S2, Evt> extends ReturnType<typeof makeDSL<S1, S2, Evt>> {}
 
 export function ifAny<T, R, E, A>(fn: (items: NonEmptyReadonlyArray<T>) => Effect<R, E, A>) {
-  return (items: Iterable<T>) => Effect.sync(() => items.toNonEmptyArray).flatMapOpt(fn)
+  return (items: Iterable<T>) => Effect(items.toNonEmptyArray).flatMapOpt(fn)
 }
 
 /**
  * @tsplus fluent Iterable ifAny
  */
 export function ifAny_<T, R, E, A>(items: Iterable<T>, fn: (items: NonEmptyReadonlyArray<T>) => Effect<R, E, A>) {
-  return Effect.sync(() => items.toNonEmptyArray).flatMapOpt(fn)
+  return Effect(items.toNonEmptyArray).flatMapOpt(fn)
 }
 
 /**

package/_src/services/RepositoryBase.ts

@@ -1,13 +1,13 @@
 import type { ParserEnv } from "@effect-app/schema/custom/Parser"
 import type { Repository, RequestCTX } from "./Repository.js"
-import type { RequestContextContainer } from "./RequestContextContainer.js"
 import { ContextMap, StoreMaker } from "./Store.js"
 import type { Filter, StoreConfig, Where } from "./Store.js"
 import type {} from "effect/Equal"
 import type {} from "effect/Hash"
+import type { Opt } from "@effect-app/core/Option"
 import { makeCodec } from "@effect-app/infra/api/codec"
 import { makeFilters } from "@effect-app/infra/filter"
-import type { Option, Schema } from "@effect-app/prelude"
+import type { Schema } from "@effect-app/prelude"
 import { EParserFor } from "@effect-app/prelude/schema"
 import type { InvalidStateError, OptimisticConcurrencyException } from "../errors.js"
 
@@ -20,12 +20,12 @@ export const RepositoryBase = <Service>() => {
   ) => {
     abstract class RepositoryBaseC implements Repository<T, PM, Evt, ItemType> {
       itemType: ItemType = itemType
-      abstract find: (id: T["id"]) => Effect<ContextMap | RequestContextContainer, never, Option<T>>
+      abstract find: (id: T["id"]) => Effect<RequestCTX, never, Opt<T>>
       abstract all: Effect<ContextMap, never, T[]>
       abstract saveAndPublish: (
         items: Iterable<T>,
         events?: Iterable<Evt>
-      ) => Effect<ContextMap | RequestContextContainer, InvalidStateError | OptimisticConcurrencyException, void>
+      ) => Effect<RequestCTX, InvalidStateError | OptimisticConcurrencyException, void>
       abstract utils: {
         mapReverse: (
           pm: PM,
@@ -38,7 +38,7 @@ export const RepositoryBase = <Service>() => {
       abstract removeAndPublish: (
         items: Iterable<T>,
         events?: Iterable<Evt>
-      ) => Effect<ContextMap | RequestContextContainer, never, void>
+      ) => Effect<RequestCTX, never, void>
       static where = makeWhere<PM>()
       static flatMap<R1, E1, B>(f: (a: Service) => Effect<R1, E1, B>): Effect<Service | R1, E1, B> {
         return Effect.flatMap(this as unknown as Tag<Service, Service>, f)
@@ -129,8 +129,7 @@ export function makeRepo<
         }
 
         const saveAllE = (a: Iterable<E>) =>
-          Effect
-            .sync(() => a.toNonEmptyArray)
+          Effect(a.toNonEmptyArray)
             .flatMapOpt((a) =>
               Do(($) => {
                 const { get, set } = $(ContextMap)
@@ -145,8 +144,7 @@ export function makeRepo<
 
         const saveAndPublish = (items: Iterable<T>, events: Iterable<Evt> = []) =>
           saveAll(items)
-            > Effect
-              .sync(() => events.toNonEmptyArray)
+            > Effect(events.toNonEmptyArray)
               // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
               .flatMapOpt(publishEvents)
 
@@ -160,8 +158,7 @@ export function makeRepo<
               set(e.id, undefined)
             }
             yield* $(
-              Effect
-                .sync(() => events.toNonEmptyArray)
+              Effect(events.toNonEmptyArray)
                 // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
                 .flatMapOpt(publishEvents)
             )

package/_src/services/RequestContextContainer.ts

@@ -1,3 +1,4 @@
+import { RequestId } from "@effect-app/prelude/ids"
 import { RequestContext } from "../RequestContext.js"
 
 /**
@@ -5,7 +6,8 @@ import { RequestContext } from "../RequestContext.js"
  */
 export abstract class RequestContextContainer extends TagClass<RequestContextContainer>() {
   abstract readonly requestContext: Effect<never, never, RequestContext>
-  abstract readonly update: (f: (rc: RequestContext) => RequestContext) => Effect<never, never, void>
+  abstract readonly update: (f: (rc: RequestContext) => RequestContext) => Effect<never, never, RequestContext>
+  abstract readonly start: (f: RequestContext) => Effect<never, never, void>
   static get get(): Effect<RequestContextContainer, never, RequestContext> {
     return RequestContextContainer.flatMap((_) => _.requestContext)
   }
@@ -15,16 +17,18 @@ export abstract class RequestContextContainer extends TagClass<RequestContextCon
       .flatMap((requestContext) =>
         requestContext.isSome()
           ? requestContext.value.requestContext.map(Option.some)
-          : Effect.sync(() => Option.none())
+          : Effect(Option.none)
       )
   }
 }
 
 export class RequestContextContainerImpl extends RequestContextContainer {
-  #ref: Ref<RequestContext>
-  constructor(inp: RequestContext.ConstructorInput) {
+  #ref: FiberRef<RequestContext>
+  constructor() {
     super()
-    this.#ref = Ref.unsafeMake<RequestContext>(new RequestContext(inp))
+    this.#ref = FiberRef.unsafeMake<RequestContext>(
+      new RequestContext({ name: ReasonableString("root"), rootId: RequestId("root"), locale: "en" })
+    )
   }
 
   override get requestContext() {
@@ -32,13 +36,14 @@ export class RequestContextContainerImpl extends RequestContextContainer {
   }
 
   override update = (f: (a: RequestContext) => RequestContext) => this.#ref.getAndUpdate(f)
+  override start = (a: RequestContext) => this.#ref.set(a)
 }
 
 /**
  * @tsplus static RequestContextContainer.Ops live
  */
-export function live(inp: RequestContext.ConstructorInput) {
-  return new RequestContextContainerImpl(inp)
+export function live() {
+  return new RequestContextContainerImpl()
 }
 
 /** @tsplus static RequestContext.Ops Tag */