@effect-app/infra 1.45.0 → 1.46.0

package/src/api/setupRequest.ts

@@ -1,91 +1,57 @@
 import { NonEmptyString255 } from "@effect-app/schema"
-import { Effect, Layer, pipe } from "effect-app"
-import { RequestId } from "effect-app/ids"
-import { RequestContext, spanAttributes } from "../RequestContext.js"
-import { RequestContextContainer } from "../services/RequestContextContainer.js"
+import { Effect, FiberRef, Layer } from "effect-app"
+import { LocaleRef, RequestContext, spanAttributes } from "../RequestContext.js"
 import { ContextMapContainer } from "../services/Store/ContextMapContainer.js"
+import { storeId } from "../services/Store/Memory.js"
 
-function makeInternalRequestContext(name: string) {
-  return Effect.sync(() => {
-    const id = RequestId.make()
-    return new RequestContext({
-      id,
-      rootId: id,
-      locale: "en",
-      name: NonEmptyString255(name)
-    })
+export const getRequestContext = Effect
+  .all({
+    span: Effect.currentSpan.pipe(Effect.orDie),
+    locale: FiberRef.get(LocaleRef),
+    namespace: FiberRef.get(storeId)
   })
-}
-
-const withRequestSpan = <R, E, A>(f: Effect<A, E, R>) =>
-  Effect.andThen(
-    RequestContextContainer
-      .get,
-    (ctx) =>
-      f.pipe(
-        Effect.withSpan("request " + ctx.name, { attributes: spanAttributes(ctx), captureStackTrace: false }),
-        // request context info is picked up directly in the logger for annotations.
-        Effect.withLogSpan("request")
-      )
+  .pipe(
+    Effect.map(({ locale, namespace, span }) =>
+      new RequestContext({
+        span,
+        locale,
+        namespace,
+        // TODO: get through span context, or don't care at all.
+        name: NonEmptyString255("_root_")
+      })
+    )
   )
 
-const withExistingRequestSpan = <R, E, A>(f: Effect<A, E, R>) =>
+const withRequestSpan = (name = "request") => <R, E, A>(f: Effect<A, E, R>) =>
   Effect.andThen(
-    RequestContextContainer.get,
+    getRequestContext,
     (ctx) =>
-      Effect.annotateCurrentSpan(spanAttributes(ctx)).pipe(
-        Effect.andThen(f),
+      f.pipe(
+        Effect.withSpan(name, { attributes: spanAttributes(ctx), captureStackTrace: false }),
+        // TODO: false
         // request context info is picked up directly in the logger for annotations.
-        Effect.withLogSpan("request")
+        Effect.withLogSpan(name)
       )
   )
 
 const setupContextMap = Effect.andThen(ContextMapContainer, (_) => _.start).pipe(Layer.effectDiscard)
 
-// const RequestContextLiveFromRequestContext = (requestContext: RequestContext) =>
-//   RequestContext.Tag.makeLayer(requestContext)
-// memoization problem
-// const RequestContextLive = RequestContextContainer.get.toLayer(RequestContext.Tag)
-const RequestContextStartLiveFromRequestContext = (requestContext: RequestContext) =>
-  Layer.provideMerge(
-    setupContextMap,
-    // .provideMerge(RequestContextLiveFromRequestContext(requestContext))
-    Effect
-      .andThen(RequestContextContainer, (_) => _.start(requestContext))
-      .pipe(Layer.effectDiscard)
-  )
-
-const RequestContextStartLive = (requestContext: RequestContext | string) =>
-  typeof requestContext === "string"
-    ? pipe(
-      makeInternalRequestContext(requestContext),
-      Effect.andThen(RequestContextStartLiveFromRequestContext),
-      Layer.unwrapEffect
-    )
-    : RequestContextStartLiveFromRequestContext(requestContext)
-
-export function setupRequestContext<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext | string) {
-  return self
-    .pipe(
-      withRequestSpan,
-      Effect.provide(RequestContextStartLive(requestContext))
-    )
-}
-
-export function setupExistingRequestContext<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext | string) {
-  return self
+export const setupRequestContextFromCurrent = (name = "request") => <R, E, A>(self: Effect<A, E, R>) =>
+  self
     .pipe(
-      withExistingRequestSpan,
-      Effect.provide(RequestContextStartLive(requestContext))
+      withRequestSpan(name),
+      Effect.provide(setupContextMap)
     )
-}
 
-const UpdateRequestContextLive = (f: (rc: RequestContext) => RequestContext) =>
-  Effect.andThen(RequestContextContainer, (rcc) => rcc.update(f)).pipe(Layer.effectDiscard)
+export function setupRequestContext<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext) {
+  return Effect.gen(function*() {
+    yield* FiberRef.set(LocaleRef, requestContext.locale)
+    yield* FiberRef.set(storeId, requestContext.namespace)
 
-/**
- * @tsplus fluent effect/io/Effect updateRequestContext
- */
-export function updateRequestContext<R, E, A>(self: Effect<A, E, R>, f: (rc: RequestContext) => RequestContext) {
-  return Effect.provide(self, UpdateRequestContextLive(f))
+    return yield* self
+      .pipe(
+        withRequestSpan(requestContext.name),
+        Effect.provide(setupContextMap)
+      )
+  })
 }

package/src/errorReporter.ts

@@ -1,9 +1,9 @@
 import { dropUndefined } from "@effect-app/core/utils"
 import * as Sentry from "@sentry/node"
-import { Cause, Effect, Option } from "effect-app"
+import { Cause, Effect } from "effect-app"
+import { getRequestContext } from "./api/setupRequest.js"
 import { CauseException, ErrorReported, tryToJson } from "./errors.js"
 import { InfraLogger } from "./logger.js"
-import { RequestContextContainer } from "./services/RequestContextContainer.js"
 
 export function reportError(
   name: string
@@ -38,8 +38,7 @@ function reportSentry(
   error: CauseException<unknown>,
   extras: Record<string, unknown> | undefined
 ) {
-  return RequestContextContainer.getOption.pipe(Effect.map((ctx) => {
-    const context = Option.getOrUndefined(ctx)
+  return getRequestContext.pipe(Effect.map((context) => {
     const scope = new Sentry.Scope()
     if (context) scope.setContext("context", context as unknown as Record<string, unknown>)
     if (extras) scope.setContext("extras", extras)
@@ -78,8 +77,7 @@ export function captureException(error: unknown) {
 }
 
 export function reportMessage(message: string, extras?: Record<string, unknown>) {
-  return RequestContextContainer.getOption.pipe(Effect.map((ctx) => {
-    const context = Option.getOrUndefined(ctx)
+  return getRequestContext.pipe(Effect.map((context) => {
     const scope = new Sentry.Scope()
     if (context) scope.setContext("context", context as unknown as Record<string, unknown>)
     if (extras) scope.setContext("extras", extras)

package/src/logger/jsonLogger.ts

@@ -1,4 +1,4 @@
-import { Cause, FiberId, HashMap, List, Logger, Option } from "effect-app"
+import { Cause, FiberId, HashMap, List, Logger } from "effect-app"
 import { getRequestContext } from "./shared.js"
 
 export const jsonLogger = Logger.make<unknown, void>(
@@ -6,14 +6,14 @@ export const jsonLogger = Logger.make<unknown, void>(
     const now = new Date()
     const nowMillis = now.getTime()
 
-    const c = getRequestContext(context)
+    const request = getRequestContext(context)
 
     const data = {
       timestamp: now,
       level: logLevel.label,
       fiber: FiberId.threadName(fiberId),
       message,
-      request: Option.getOrUndefined(c),
+      request,
       cause: cause !== null && cause !== Cause.empty ? Cause.pretty(cause, { renderErrorCause: true }) : undefined,
       spans: List.map(spans, (_) => ({ label: _.label, timing: nowMillis - _.startTime })).pipe(List.toArray),
       annotations: HashMap.size(annotations) > 0

package/src/logger/logFmtLogger.ts

@@ -1,12 +1,11 @@
-import { HashMap, Logger, Option } from "effect-app"
+import { HashMap, Logger } from "effect-app"
 import { spanAttributes } from "../RequestContext.js"
 import { getRequestContext } from "./shared.js"
 
 export const logfmtLogger = Logger.make<unknown, void>(
   (_) => {
     let { annotations } = _
-    const c = getRequestContext(_.context)
-    const requestContext = Option.getOrUndefined(c)
+    const requestContext = getRequestContext(_.context)
     if (requestContext && requestContext.name !== "_root_") {
       annotations = HashMap.make(...[
         ...annotations,

package/src/logger/shared.ts

@@ -1,15 +1,21 @@
-import { RuntimeFlags } from "effect"
-import { Context, FiberRef, Option, Runtime } from "effect-app"
+import { NonEmptyString255 } from "@effect-app/schema"
+import { Context, FiberRef, Option, Tracer } from "effect-app"
 import * as FiberRefs from "effect/FiberRefs"
-import { RequestContextContainer } from "../services/RequestContextContainer.js"
+import { LocaleRef, RequestContext } from "../RequestContext.js"
+import { storeId } from "../services/Store/Memory.js"
 
 export function getRequestContext(fiberRefs: FiberRefs.FiberRefs) {
   const context = FiberRefs.getOrDefault(fiberRefs, FiberRef.currentContext)
-  const a = Context.getOption(context, RequestContextContainer)
-  const c = Option.map(a, (_) => {
-    // TODO: perhaps a litle expensive?
-    const rt = Runtime.make({ context, fiberRefs, runtimeFlags: RuntimeFlags.none })
-    return Runtime.runSync(rt)(_.requestContext)
+  const span = Context.getOption(context, Tracer.ParentSpan)
+  const locale = FiberRefs.getOrDefault(fiberRefs, LocaleRef)
+  const namespace = FiberRefs.getOrDefault(fiberRefs, storeId)
+  return new RequestContext({
+    span: Option.getOrElse(
+      span,
+      () => ({ spanId: "bogus", sampled: true, traceId: "bogus" })
+    ),
+    name: NonEmptyString255("_"),
+    locale,
+    namespace
   })
-  return c
 }

package/src/services/QueueMaker/SQLQueue.ts

@@ -1,16 +1,13 @@
 import { Model } from "@effect-app/infra-adapters/SQL"
-import { setupRequestContext } from "@effect-app/infra/api/setupRequest"
-import { RequestContext } from "@effect-app/infra/RequestContext"
+import { getRequestContext, setupRequestContext } from "@effect-app/infra/api/setupRequest"
 import { reportNonInterruptedFailure } from "@effect-app/infra/services/QueueMaker/errors"
 import type { QueueBase } from "@effect-app/infra/services/QueueMaker/service"
 import { QueueMeta } from "@effect-app/infra/services/QueueMaker/service"
-import { RequestContextContainer } from "@effect-app/infra/services/RequestContextContainer"
 import { SqlClient } from "@effect/sql"
 import { randomUUID } from "crypto"
 import { subMinutes } from "date-fns"
 import { Effect, Fiber, Option, S, Tracer } from "effect-app"
-import { RequestId } from "effect-app/ids"
-import { NonEmptyString255 } from "effect-app/schema"
+import type { NonEmptyString255 } from "effect-app/schema"
 import { pretty } from "effect-app/utils"
 import { InfraLogger } from "../../logger.js"
 
@@ -112,22 +109,15 @@ export function makeSQLQueue<
       finish: ({ createdAt, updatedAt, ...q }: Drain) =>
         drainRepo.updateVoid(Drain.update.make({ ...q, finishedAt: Option.some(new Date()) })) // auto in lib , etag: randomUUID()
     }
-    const rcc = yield* RequestContextContainer
-
     return {
       publish: (...messages) =>
         Effect
           .gen(function*() {
-            const requestContext = yield* rcc.requestContext
-            const span = yield* Effect.serviceOption(Tracer.ParentSpan)
+            const requestContext = yield* getRequestContext
             return yield* Effect
               .forEach(
                 messages,
-                (m) =>
-                  q.offer(m, {
-                    requestContext: new RequestContext(requestContext), // workaround Schema expecting exact class
-                    span: Option.getOrUndefined(span)
-                  }),
+                (m) => q.offer(m, requestContext),
                 {
                   discard: true
                 }
@@ -160,11 +150,7 @@ export function makeSQLQueue<
                       (_) =>
                         setupRequestContext(
                           _,
-                          RequestContext.inherit(meta.requestContext, {
-                            id: RequestId(body.id),
-                            locale: "en" as const,
-                            name: NonEmptyString255(`${queueDrainName}.${body._tag}`)
-                          })
+                          meta
                         ),
                       Effect
                         .withSpan(`queue.drain: ${queueDrainName}.${body._tag}`, {

package/src/services/QueueMaker/memQueue.ts

@@ -1,13 +1,9 @@
 import { MemQueue } from "@effect-app/infra-adapters/memQueue"
-import { RequestContext } from "@effect-app/infra/RequestContext"
-import { NonEmptyString255 } from "@effect-app/schema"
 import { Tracer } from "effect"
-import { Effect, Fiber, flow, Option, S } from "effect-app"
-import { RequestId } from "effect-app/ids"
+import { Effect, Fiber, flow, S } from "effect-app"
 import { pretty } from "effect-app/utils"
-import { setupRequestContext } from "../../api/setupRequest.js"
+import { getRequestContext, setupRequestContext } from "../../api/setupRequest.js"
 import { InfraLogger } from "../../logger.js"
-import { RequestContextContainer } from "../RequestContextContainer.js"
 import { reportNonInterruptedFailure } from "./errors.js"
 import { type QueueBase, QueueMeta } from "./service.js"
 
@@ -29,7 +25,6 @@ export function makeMemQueue<
     const mem = yield* MemQueue
     const q = yield* mem.getOrCreateQueue(queueName)
     const qDrain = yield* mem.getOrCreateQueue(queueDrainName)
-    const rcc = yield* RequestContextContainer
 
     const wireSchema = S.Struct({ body: schema, meta: QueueMeta })
     const drainW = S.Struct({ body: drainSchema, meta: QueueMeta })
@@ -39,12 +34,11 @@ export function makeMemQueue<
       publish: (...messages) =>
         Effect
           .gen(function*() {
-            const requestContext = yield* rcc.requestContext
-            const span = yield* Effect.serviceOption(Tracer.ParentSpan)
+            const requestContext = yield* getRequestContext
             return yield* 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.encode(wireSchema)({ body: m, meta: { requestContext, span: Option.getOrUndefined(span) } }).pipe(
+                S.encode(wireSchema)({ body: m, meta: requestContext }).pipe(
                   Effect.orDie,
                   Effect
                     .andThen(JSON.stringify),
@@ -83,11 +77,7 @@ export function makeMemQueue<
                         (_) =>
                           setupRequestContext(
                             _,
-                            RequestContext.inherit(meta.requestContext, {
-                              id: RequestId(body.id),
-                              locale: "en" as const,
-                              name: NonEmptyString255(`${queueDrainName}.${body._tag}`)
-                            })
+                            meta
                           ),
                         Effect
                           .withSpan(`queue.drain: ${queueDrainName}.${body._tag}`, {

package/src/services/QueueMaker/sbqueue.ts

@@ -6,16 +6,12 @@ import {
   ServiceBusReceiverFactory,
   subscribe
 } from "@effect-app/infra-adapters/ServiceBus"
-import { RequestContext } from "@effect-app/infra/RequestContext"
 import { Tracer } from "effect"
-import { Cause, Effect, flow, Layer, Option, S } from "effect-app"
-import { RequestId } from "effect-app/ids"
+import { Cause, Effect, flow, Layer, S } from "effect-app"
 import type { StringId } from "effect-app/schema"
-import { NonEmptyString255 } from "effect-app/schema"
 import { pretty } from "effect-app/utils"
-import { setupRequestContext } from "../../api/setupRequest.js"
+import { getRequestContext, setupRequestContext } from "../../api/setupRequest.js"
 import { InfraLogger } from "../../logger.js"
-import { RequestContextContainer } from "../RequestContextContainer.js"
 import { reportNonInterruptedFailure, reportNonInterruptedFailureCause, reportQueueError } from "./errors.js"
 import { type QueueBase, QueueMeta } from "./service.js"
 
@@ -45,7 +41,6 @@ export function makeServiceBusQueue<
     const receiver = yield* ServiceBusReceiverFactory
     const silenceAndReportError = reportNonInterruptedFailure({ name: "ServiceBusQueue.drain." + queueDrainName })
     const reportError = reportNonInterruptedFailureCause({ name: "ServiceBusQueue.drain." + queueDrainName })
-    const rcc = yield* RequestContextContainer
 
     // TODO: or do async?
     // This will make sure that the host receives the error (MainFiberSet.join), who will then interrupt everything and commence a shutdown and restart of app
@@ -83,11 +78,7 @@ export function makeServiceBusQueue<
                           (_) =>
                             setupRequestContext(
                               _,
-                              RequestContext.inherit(meta.requestContext, {
-                                id: RequestId(body.id),
-                                locale: "en" as const,
-                                name: NonEmptyString255(`${queueDrainName}.${body._tag}`)
-                              })
+                              meta
                             ),
                           Effect
                             .withSpan(
@@ -133,8 +124,7 @@ export function makeServiceBusQueue<
       publish: (...messages) =>
         Effect
           .gen(function*() {
-            const requestContext = yield* rcc.requestContext
-            const span = yield* Effect.serviceOption(Tracer.ParentSpan)
+            const requestContext = yield* getRequestContext
             return yield* Effect
               .promise((abortSignal) =>
                 s.sendMessages(
@@ -142,7 +132,7 @@ export function makeServiceBusQueue<
                     body: JSON.stringify(
                       S.encodeSync(wireSchema)({
                         body: m,
-                        meta: { requestContext, span: Option.getOrUndefined(span) }
+                        meta: requestContext
                       })
                     ),
                     messageId: m.id, /* correllationid: requestId */

package/src/services/QueueMaker/service.ts

@@ -1,14 +1,12 @@
-import { S } from "effect-app"
 import type { Effect, NonEmptyReadonlyArray, Scope } from "effect-app"
 import { RequestContext } from "../../RequestContext.js"
-import type { RequestContextContainer } from "../RequestContextContainer.js"
 import type { ContextMapContainer } from "../Store/ContextMapContainer.js"
 
 export interface QueueBase<Evt, DrainEvt> {
   drain: <DrainE, DrainR>(
     makeHandleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>,
     sessionId?: string
-  ) => Effect<never, never, Scope | RequestContextContainer | ContextMapContainer | DrainR>
+  ) => Effect<never, never, Scope | ContextMapContainer | DrainR>
   publish: (
     ...messages: NonEmptyReadonlyArray<Evt>
   ) => Effect<void>
@@ -20,11 +18,4 @@ export interface QueueBase<Evt, DrainEvt> {
 export interface QueueMakerOps {}
 export const QueueMaker: QueueMakerOps = {}
 
-export const QueueMeta = S.Struct({
-  requestContext: RequestContext,
-  span: S.optional(S.Struct({
-    spanId: S.String,
-    traceId: S.String,
-    sampled: S.Boolean
-  }))
-})
+export const QueueMeta = RequestContext

package/src/services/RepositoryBase.ts

@@ -450,12 +450,11 @@ export function makeRepo<
                 })
             )
           }
-          // TODO: deal with idKey <-> "id" in encoded
           function findE(id: T[IdKey]) {
             return pipe(
               encodeId({ [idKey]: id } as any),
               Effect.orDie,
-              Effect.map((_) => (_ as any).id),
+              Effect.map((_) => (_ as any)[idKey]), // we will have idKey because the transform is undone again by the encode schema mumbo jumbo above
               Effect.flatMap(findEId)
             )
           }

package/src/services/Store/Memory.ts

@@ -1,10 +1,10 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
+import { NonEmptyString255 } from "@effect-app/schema"
 import { Array, Effect, FiberRef, flow, Option, Order, pipe, Ref, Struct } from "effect-app"
 import type { NonEmptyReadonlyArray } from "effect-app"
 import { get } from "effect-app/utils"
 import { InfraLogger } from "../../logger.js"
-import type { RequestContext } from "../../RequestContext.js"
 import type { FilterArgs, PersistenceModelType, Store, StoreConfig } from "./service.js"
 import { StoreMaker } from "./service.js"
 import { codeFilter, makeUpdateETag } from "./utils.js"
@@ -55,12 +55,8 @@ export function memFilter<T extends { id: string }, U extends keyof T = never>(f
   })
 }
 
-export const storeId = FiberRef.unsafeMake("primary")
-
-/**
- * @tsplus getter RequestContext restoreStoreId
- */
-export const restoreFromRequestContext = (ctx: RequestContext) => FiberRef.set(storeId, ctx.namespace ?? "primary")
+const defaultNs = NonEmptyString255("primary")
+export const storeId = FiberRef.unsafeMake<NonEmptyString255>(defaultNs)
 
 function logQuery(f: FilterArgs<any, any>, defaultValues?: any) {
   return InfraLogger

package/_cjs/services/RequestContextContainer.cjs

@@ -1,36 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.RequestContextContainer = exports.RCTag = void 0;
-var _schema = require("@effect-app/schema");
-var _effectApp = require("effect-app");
-var _ids = require("effect-app/ids");
-var _RequestContext = require("../RequestContext.cjs");
-var _Memory = require("./Store/Memory.cjs");
-/**
- * @tsplus type RequestContextContainer
- * @tsplus companion RequestContextContainer.Ops
- */
-class RequestContextContainer extends _effectApp.Context.TagId("effect-app/RequestContextContainer")() {
-  static get get() {
-    return _effectApp.Effect.flatMap(RequestContextContainer, _ => _.requestContext);
-  }
-  static get getOption() {
-    return _effectApp.Effect.flatMap(_effectApp.Effect.contextWith(_ => _effectApp.Context.getOption(_, RequestContextContainer)), requestContext => _effectApp.Option.isSome(requestContext) ? _effectApp.Effect.map(requestContext.value.requestContext, _effectApp.Option.some) : _effectApp.Effect.sync(() => _effectApp.Option.none()));
-  }
-  static live = _effectApp.Effect.andThen(_effectApp.Effect.sync(() => new _RequestContext.RequestContext({
-    name: (0, _schema.NonEmptyString255)("_root_"),
-    rootId: (0, _ids.RequestId)("_root_"),
-    locale: "en"
-  })), _effectApp.FiberRef.make).pipe(_effectApp.Effect.map(ref => RequestContextContainer.of({
-    requestContext: _effectApp.FiberRef.get(ref),
-    update: f => _effectApp.Effect.tap(_effectApp.FiberRef.updateAndGet(ref, f), rc => _effectApp.Effect.annotateCurrentSpan((0, _RequestContext.spanAttributes)(rc))),
-    start: a => _effectApp.Effect.zipRight(_effectApp.FiberRef.set(ref, a), (0, _Memory.restoreFromRequestContext)(a))
-  })), _effectApp.Layer.scoped(this));
-}
-/** @tsplus static RequestContext.Ops Tag */
-exports.RequestContextContainer = RequestContextContainer;
-const RCTag = exports.RCTag = _effectApp.Context.GenericTag("@services/RCTag");
-//# sourceMappingURL=RequestContextContainer.cjs.map

package/_cjs/services/RequestContextContainer.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"RequestContextContainer.cjs","names":["_schema","require","_effectApp","_ids","_RequestContext","_Memory","RequestContextContainer","Context","TagId","get","Effect","flatMap","_","requestContext","getOption","contextWith","Option","isSome","map","value","some","sync","none","live","andThen","RequestContext","name","NonEmptyString255","rootId","RequestId","locale","FiberRef","make","pipe","ref","of","update","f","tap","updateAndGet","rc","annotateCurrentSpan","spanAttributes","start","a","zipRight","set","restoreFromRequestContext","Layer","scoped","exports","RCTag","GenericTag"],"sources":["../../src/services/RequestContextContainer.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AACA,IAAAI,OAAA,GAAAJ,OAAA;AAEA;;;;AAIM,MAAgBK,uBACpB,SAAQC,kBAAO,CAACC,KAAK,CAAC,oCAAoC,CAAC,EAIvD;EAEJ,WAAWC,GAAGA,CAAA;IACZ,OAAOC,iBAAM,CAACC,OAAO,CAACL,uBAAuB,EAAGM,CAAC,IAAKA,CAAC,CAACC,cAAc,CAAC;EACzE;EACA,WAAWC,SAASA,CAAA;IAClB,OAAOJ,iBAAM,CAACC,OAAO,CACnBD,iBAAM,CACHK,WAAW,CAAEH,CAAiB,IAAKL,kBAAO,CAACO,SAAS,CAACF,CAAC,EAAEN,uBAAuB,CAAC,CAAC,EACnFO,cAAc,IACbG,iBAAM,CAACC,MAAM,CAACJ,cAAc,CAAC,GACzBH,iBAAM,CAACQ,GAAG,CAACL,cAAc,CAACM,KAAK,CAACN,cAAc,EAAEG,iBAAM,CAACI,IAAI,CAAC,GAC5DV,iBAAM,CAACW,IAAI,CAAC,MAAML,iBAAM,CAACM,IAAI,EAAE,CAAC,CACvC;EACH;EACA,OAAgBC,IAAI,GAAGb,iBAAM,CAC1Bc,OAAO,CACNd,iBAAM,CACHW,IAAI,CAAC,MACJ,IAAII,8BAAc,CAAC;IAAEC,IAAI,EAAE,IAAAC,yBAAiB,EAAC,QAAQ,CAAC;IAAEC,MAAM,EAAE,IAAAC,cAAS,EAAC,QAAQ,CAAC;IAAEC,MAAM,EAAE;EAAI,CAAE,CAAC,CACrG,EACHC,mBAAQ,CAACC,IAAoB,CAC9B,CACAC,IAAI,CACHvB,iBAAM,CAACQ,GAAG,CAAEgB,GAAG,IACb5B,uBAAuB,CAAC6B,EAAE,CAAC;IACzBtB,cAAc,EAAEkB,mBAAQ,CAACtB,GAAG,CAACyB,GAAG,CAAC;IACjCE,MAAM,EAAGC,CAAwC,IAC/C3B,iBAAM,CAAC4B,GAAG,CAACP,mBAAQ,CAACQ,YAAY,CAACL,GAAG,EAAEG,CAAC,CAAC,EAAGG,EAAE,IAAK9B,iBAAM,CAAC+B,mBAAmB,CAAC,IAAAC,8BAAc,EAACF,EAAE,CAAC,CAAC,CAAC;IACnGG,KAAK,EAAGC,CAAiB,IAAKlC,iBAAM,CAACmC,QAAQ,CAACd,mBAAQ,CAACe,GAAG,CAACZ,GAAG,EAAEU,CAAC,CAAC,EAAE,IAAAG,iCAAyB,EAACH,CAAC,CAAC;GACjG,CAAC,CACH,EACDI,gBAAK,CAACC,MAAM,CAAC,IAAI,CAAC,CACnB;;AAGL;AAAAC,OAAA,CAAA5C,uBAAA,GAAAA,uBAAA;AACO,MAAM6C,KAAK,GAAAD,OAAA,CAAAC,KAAA,GAAG5C,kBAAO,CAAC6C,UAAU,CAAiB,iBAAiB,CAAC","ignoreList":[]}

package/dist/services/RequestContextContainer.d.ts

@@ -1,42 +0,0 @@
-import { Context, Effect, Layer, Option } from "effect-app";
-import { RequestContext } from "../RequestContext.js";
-declare const RequestContextContainer_base: (abstract new (service: {
-    requestContext: Effect<RequestContext>;
-    update: (f: (rc: RequestContext) => RequestContext) => Effect<RequestContext>;
-    start: (f: RequestContext) => Effect<void>;
-}) => Readonly<{
-    requestContext: Effect<RequestContext>;
-    update: (f: (rc: RequestContext) => RequestContext) => Effect<RequestContext>;
-    start: (f: RequestContext) => Effect<void>;
-}> & Context.TagClassShape<"effect-app/RequestContextContainer", {
-    requestContext: Effect<RequestContext>;
-    update: (f: (rc: RequestContext) => RequestContext) => Effect<RequestContext>;
-    start: (f: RequestContext) => Effect<void>;
-}>) & {
-    toLayer: <E, R>(eff: Effect<Omit<RequestContextContainer, keyof Context.TagClassShape<any, any>>, E, R>) => Layer<RequestContextContainer, E, R>;
-    toLayerScoped: <E, R_1>(eff: Effect<Omit<RequestContextContainer, keyof Context.TagClassShape<any, any>>, E, R_1>) => Layer<RequestContextContainer, E, Exclude<R_1, import("effect/Scope").Scope>>;
-    of: (service: Omit<RequestContextContainer, keyof Context.TagClassShape<any, any>>) => RequestContextContainer;
-} & Context.Tag<RequestContextContainer, RequestContextContainer> & {
-    requestContext: Effect<RequestContext, never, RequestContextContainer>;
-    update: (f: (rc: RequestContext) => RequestContext) => Effect<RequestContext, never, RequestContextContainer>;
-    start: (f: RequestContext) => Effect<void, never, RequestContextContainer>;
-} & {
-    use: <X>(body: (_: {
-        requestContext: Effect<RequestContext>;
-        update: (f: (rc: RequestContext) => RequestContext) => Effect<RequestContext>;
-        start: (f: RequestContext) => Effect<void>;
-    }) => X) => X extends Effect<infer A_1, infer E_1, infer R_3> ? Effect<A_1, E_1, R_3 | RequestContextContainer> : Effect<X, never, RequestContextContainer>;
-};
-/**
- * @tsplus type RequestContextContainer
- * @tsplus companion RequestContextContainer.Ops
- */
-export declare abstract class RequestContextContainer extends RequestContextContainer_base {
-    static get get(): Effect<RequestContext, never, RequestContextContainer>;
-    static get getOption(): Effect.Effect<Option.Option<RequestContext>, never, never>;
-    static readonly live: Layer.Layer<RequestContextContainer, never, never>;
-}
-/** @tsplus static RequestContext.Ops Tag */
-export declare const RCTag: Context.Tag<RequestContext, RequestContext>;
-export {};
-//# sourceMappingURL=RequestContextContainer.d.ts.map

package/dist/services/RequestContextContainer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RequestContextContainer.d.ts","sourceRoot":"","sources":["../../src/services/RequestContextContainer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAY,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAErE,OAAO,EAAE,cAAc,EAAkB,MAAM,sBAAsB,CAAA;;oBASjD,MAAM,CAAC,cAAc,CAAC;YAC9B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,MAAM,CAAC,cAAc,CAAC;WACtE,CAAC,CAAC,EAAE,cAAc,KAAK,MAAM,CAAC,IAAI,CAAC;;oBAF1B,MAAM,CAAC,cAAc,CAAC;YAC9B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,MAAM,CAAC,cAAc,CAAC;WACtE,CAAC,CAAC,EAAE,cAAc,KAAK,MAAM,CAAC,IAAI,CAAC;;oBAF1B,MAAM,CAAC,cAAc,CAAC;YAC9B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,MAAM,CAAC,cAAc,CAAC;WACtE,CAAC,CAAC,EAAE,cAAc,KAAK,MAAM,CAAC,IAAI,CAAC;;;;;;;qBADzB,cAAc,KAAK,cAAc;;;;wBADlC,MAAM,CAAC,cAAc,CAAC;gBAC9B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,MAAM,CAAC,cAAc,CAAC;eACtE,CAAC,CAAC,EAAE,cAAc,KAAK,MAAM,CAAC,IAAI,CAAC;;;AAR9C;;;GAGG;AACH,8BAAsB,uBACpB,SAAQ,4BAIJ;IAEJ,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,cAAc,EAAE,KAAK,EAAE,uBAAuB,CAAC,CAEvE;IACD,MAAM,KAAK,SAAS,+DASnB;IACD,MAAM,CAAC,QAAQ,CAAC,IAAI,qDAkBjB;CACJ;AAED,4CAA4C;AAC5C,eAAO,MAAM,KAAK,6CAAwD,CAAA"}

package/dist/services/RequestContextContainer.js

@@ -1,31 +0,0 @@
-import { NonEmptyString255 } from "@effect-app/schema";
-import { Context, Effect, FiberRef, Layer, Option } from "effect-app";
-import { RequestId } from "effect-app/ids";
-import { RequestContext, spanAttributes } from "../RequestContext.js";
-import { restoreFromRequestContext } from "./Store/Memory.js";
-/**
- * @tsplus type RequestContextContainer
- * @tsplus companion RequestContextContainer.Ops
- */
-export class RequestContextContainer extends Context.TagId("effect-app/RequestContextContainer")() {
-    static get get() {
-        return Effect.flatMap(RequestContextContainer, (_) => _.requestContext);
-    }
-    static get getOption() {
-        return Effect.flatMap(Effect
-            .contextWith((_) => Context.getOption(_, RequestContextContainer)), (requestContext) => Option.isSome(requestContext)
-            ? Effect.map(requestContext.value.requestContext, Option.some)
-            : Effect.sync(() => Option.none()));
-    }
-    static live = Effect
-        .andThen(Effect
-        .sync(() => new RequestContext({ name: NonEmptyString255("_root_"), rootId: RequestId("_root_"), locale: "en" })), (FiberRef.make))
-        .pipe(Effect.map((ref) => RequestContextContainer.of({
-        requestContext: FiberRef.get(ref),
-        update: (f) => Effect.tap(FiberRef.updateAndGet(ref, f), (rc) => Effect.annotateCurrentSpan(spanAttributes(rc))),
-        start: (a) => Effect.zipRight(FiberRef.set(ref, a), restoreFromRequestContext(a))
-    })), Layer.scoped(this));
-}
-/** @tsplus static RequestContext.Ops Tag */
-export const RCTag = Context.GenericTag("@services/RCTag");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZXMvUmVxdWVzdENvbnRleHRDb250YWluZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDdEQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQzFDLE9BQU8sRUFBRSxjQUFjLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDckUsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFFN0Q7OztHQUdHO0FBQ0gsTUFBTSxPQUFnQix1QkFDcEIsU0FBUSxPQUFPLENBQUMsS0FBSyxDQUFDLG9DQUFvQyxDQUFDLEVBSXZEO0lBRUosTUFBTSxLQUFLLEdBQUc7UUFDWixPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQUMsdUJBQXVCLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUMsQ0FBQTtJQUN6RSxDQUFDO0lBQ0QsTUFBTSxLQUFLLFNBQVM7UUFDbEIsT0FBTyxNQUFNLENBQUMsT0FBTyxDQUNuQixNQUFNO2FBQ0gsV0FBVyxDQUFDLENBQUMsQ0FBaUIsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsdUJBQXVCLENBQUMsQ0FBQyxFQUNwRixDQUFDLGNBQWMsRUFBRSxFQUFFLENBQ2pCLE1BQU0sQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDO1lBQzNCLENBQUMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsY0FBYyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUM7WUFDOUQsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDLENBQ3ZDLENBQUE7SUFDSCxDQUFDO0lBQ0QsTUFBTSxDQUFVLElBQUksR0FBRyxNQUFNO1NBQzFCLE9BQU8sQ0FDTixNQUFNO1NBQ0gsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUNULElBQUksY0FBYyxDQUFDLEVBQUUsSUFBSSxFQUFFLGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxTQUFTLENBQUMsUUFBUSxDQUFDLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQ3JHLEVBQ0gsQ0FBQSxRQUFRLENBQUMsSUFBb0IsQ0FBQSxDQUM5QjtTQUNBLElBQUksQ0FDSCxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FDakIsdUJBQXVCLENBQUMsRUFBRSxDQUFDO1FBQ3pCLGNBQWMsRUFBRSxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQztRQUNqQyxNQUFNLEVBQUUsQ0FBQyxDQUF3QyxFQUFFLEVBQUUsQ0FDbkQsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLG1CQUFtQixDQUFDLGNBQWMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ25HLEtBQUssRUFBRSxDQUFDLENBQWlCLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLEVBQUUseUJBQXlCLENBQUMsQ0FBQyxDQUFDLENBQUM7S0FDbEcsQ0FBQyxDQUNILEVBQ0QsS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FDbkIsQ0FBQTs7QUFHTCw0Q0FBNEM7QUFDNUMsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQWlCLGlCQUFpQixDQUFDLENBQUEifQ==