@effect-app/infra 4.0.0-beta.250 → 4.0.0-beta.252

package/dist/logger/shared.d.ts

@@ -1,4 +1,4 @@
 import { RequestContext } from "effect-app/RequestContext";
 import type * as Fiber from "effect/Fiber";
 export declare function getRequestContextFromFiber(fiber: Fiber.Fiber<unknown, unknown>): RequestContext;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9nZ2VyL3NoYXJlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWEsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUE7QUFFckUsT0FBTyxLQUFLLEtBQUssS0FBSyxNQUFNLGNBQWMsQ0FBQTtBQUcxQyx3QkFBZ0IsMEJBQTBCLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxrQkFZOUUifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbG9nZ2VyL3NoYXJlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWEsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUE7QUFHckUsT0FBTyxLQUFLLEtBQUssS0FBSyxNQUFNLGNBQWMsQ0FBQTtBQUUxQyx3QkFBZ0IsMEJBQTBCLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxrQkFZOUUifQ==

package/dist/logger/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/logger/shared.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAErE,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAG1C,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,kBAY9E"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/logger/shared.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAGrE,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAE1C,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,kBAY9E"}

package/dist/logger/shared.js

@@ -1,7 +1,7 @@
 import * as Option from "effect-app/Option";
 import { LocaleRef, RequestContext } from "effect-app/RequestContext";
 import { NonEmptyString255 } from "effect-app/Schema";
-import { storeId } from "../Store/Memory.js";
+import { storeId } from "effect-app/Store";
 export function getRequestContextFromFiber(fiber) {
     const span = Option.fromNullishOr(fiber.currentSpan);
     const locale = fiber.getRef(LocaleRef);
@@ -13,4 +13,4 @@ export function getRequestContextFromFiber(fiber) {
         namespace
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ2dlci9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE1BQU0sTUFBTSxtQkFBbUIsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsU0FBUyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFBO0FBQ3JFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBRXJELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUU1QyxNQUFNLFVBQVUsMEJBQTBCLENBQUMsS0FBb0M7SUFDN0UsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUE7SUFDcEQsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUN0QyxNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ3ZDLE9BQU8sY0FBYyxDQUFDLElBQUksQ0FBQztRQUN6QixJQUFJLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQ2hHLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUMvRTtRQUNELElBQUksRUFBRSxpQkFBaUIsQ0FBQyxHQUFHLENBQUM7UUFDNUIsTUFBTTtRQUNOLFNBQVM7S0FDVixDQUFDLENBQUE7QUFDSixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ2dlci9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE1BQU0sTUFBTSxtQkFBbUIsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsU0FBUyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFBO0FBQ3JFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBQ3JELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUcxQyxNQUFNLFVBQVUsMEJBQTBCLENBQUMsS0FBb0M7SUFDN0UsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUE7SUFDcEQsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQTtJQUN0QyxNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ3ZDLE9BQU8sY0FBYyxDQUFDLElBQUksQ0FBQztRQUN6QixJQUFJLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQ2hHLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUMvRTtRQUNELElBQUksRUFBRSxpQkFBaUIsQ0FBQyxHQUFHLENBQUM7UUFDNUIsTUFBTTtRQUNOLFNBQVM7S0FDVixDQUFDLENBQUE7QUFDSixDQUFDIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "4.0.0-beta.250",
+  "version": "4.0.0-beta.252",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -13,7 +13,7 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "8.4.0",
     "query-string": "^9.3.1",
-    "effect-app": "4.0.0-beta.250"
+    "effect-app": "4.0.0-beta.252"
   },
   "devDependencies": {
     "@azure/cosmos": "^4.9.3",
@@ -252,10 +252,6 @@
       "types": "./dist/routing/utils.d.ts",
       "default": "./dist/routing/utils.js"
     },
-    "./setupRequest": {
-      "types": "./dist/setupRequest.d.ts",
-      "default": "./dist/setupRequest.js"
-    },
     "./test": {
       "types": "./dist/test.d.ts",
       "default": "./dist/test.js"

package/src/QueueMaker/SQLQueue.ts

@@ -1,5 +1,4 @@
 import { reportNonInterruptedFailure } from "@effect-app/infra/QueueMaker/errors"
-import { getRequestContext, setupRequestContextWithCustomSpan } from "@effect-app/infra/setupRequest"
 import { subMinutes } from "date-fns"
 import type { NonEmptyReadonlyArray } from "effect-app/Array"
 import * as Effect from "effect-app/Effect"
@@ -7,6 +6,7 @@ import * as Option from "effect-app/Option"
 import { type QueueBase, QueueMeta } from "effect-app/QueueMaker"
 import * as S from "effect-app/Schema"
 import { type NonEmptyString255 } from "effect-app/Schema"
+import { getRequestContext, setupRequestContextWithCustomSpan } from "effect-app/setupRequest"
 import { pretty } from "effect-app/utils"
 import * as Fiber from "effect/Fiber"
 import * as Tracer from "effect/Tracer"

package/src/QueueMaker/memQueue.ts

@@ -2,6 +2,7 @@ import type { NonEmptyReadonlyArray } from "effect-app/Array"
 import * as Effect from "effect-app/Effect"
 import { QueueMeta } from "effect-app/QueueMaker"
 import * as S from "effect-app/Schema"
+import { getRequestContext, setupRequestContextWithCustomSpan } from "effect-app/setupRequest"
 import { pretty } from "effect-app/utils"
 import * as Cause from "effect/Cause"
 import * as Fiber from "effect/Fiber"
@@ -11,7 +12,6 @@ import * as Tracer from "effect/Tracer"
 import { InfraLogger } from "../logger.js"
 import { MemQueue } from "../memQueue.js"
 import { messagingSpanArgs } from "../otel.js"
-import { getRequestContext, setupRequestContextWithCustomSpan } from "../setupRequest.js"
 import { reportNonInterruptedFailure, reportNonInterruptedFailureCause } from "./errors.js"
 
 export const makeMemQueue = Effect.fnUntraced(function*<

package/src/QueueMaker/sbqueue.ts

@@ -3,6 +3,7 @@ import * as Effect from "effect-app/Effect"
 import { QueueMeta } from "effect-app/QueueMaker"
 import * as S from "effect-app/Schema"
 import type { StringId } from "effect-app/Schema"
+import { getRequestContext, setupRequestContextWithCustomSpan } from "effect-app/setupRequest"
 import { pretty } from "effect-app/utils"
 import * as Cause from "effect/Cause"
 import { flow } from "effect/Function"
@@ -10,7 +11,6 @@ import * as Tracer from "effect/Tracer"
 import { InfraLogger } from "../logger.js"
 import { messagingSpanArgs } from "../otel.js"
 import { Receiver, Sender } from "../ServiceBus.js"
-import { getRequestContext, setupRequestContextWithCustomSpan } from "../setupRequest.js"
 import { reportNonInterruptedFailure, reportNonInterruptedFailureCause, reportQueueError } from "./errors.js"
 
 export function makeServiceBusQueue<

package/src/Store/Cosmos.ts

@@ -8,7 +8,7 @@ import * as Layer from "effect-app/Layer"
 import type { FieldValues } from "effect-app/Model/filter/types"
 import { type ComputedProjectionIrExpression, type RawQuery } from "effect-app/Model/query"
 import * as Option from "effect-app/Option"
-import { type FilterArgs, type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, StoreMaker } from "effect-app/Store"
+import { type FilterArgs, type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, storeId, StoreMaker } from "effect-app/Store"
 import { dropUndefinedT, mutable } from "effect-app/utils"
 import * as Duration from "effect/Duration"
 import { pipe } from "effect/Function"
@@ -19,7 +19,6 @@ import { OptimisticConcurrencyException } from "../errors.js"
 import { InfraLogger } from "../logger.js"
 import { annotateCosmosResponse, annotateDb } from "../otel.js"
 import { buildWhereCosmosQuery3, logQuery } from "./Cosmos/query.js"
-import { storeId } from "./Memory.js"
 
 const makeMapId =
   <IdKey extends keyof Encoded, Encoded extends FieldValues>(idKey: IdKey) => ({ [idKey]: id, ...e }: Encoded) => ({

package/src/Store/Disk.ts

@@ -5,12 +5,12 @@ import fs from "fs"
 
 import * as Effect from "effect-app/Effect"
 import type { FieldValues } from "effect-app/Model/filter/types"
-import { type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, StoreMaker } from "effect-app/Store"
+import { type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, storeId, StoreMaker } from "effect-app/Store"
 import * as Console from "effect/Console"
 import { flow } from "effect/Function"
 import * as Semaphore from "effect/Semaphore"
 import { annotateDb } from "../otel.js"
-import { makeMemoryStoreInt, storeId } from "./Memory.js"
+import { makeMemoryStoreInt } from "./Memory.js"
 
 function makeDiskStoreInt<IdKey extends keyof Encoded, Encoded extends FieldValues, R, E>(
   prefix: string,

package/src/Store/Memory.ts

@@ -2,14 +2,12 @@
 
 import * as Array from "effect-app/Array"
 import type { NonEmptyReadonlyArray } from "effect-app/Array"
-import * as Context from "effect-app/Context"
 import * as Effect from "effect-app/Effect"
 import type { FilterResult } from "effect-app/Model/filter/filterApi"
 import type { FieldValues } from "effect-app/Model/filter/types"
 import type { AggregateIrExpression, ComputedProjectionIrExpression, ComputedProjectionMathIrExpression } from "effect-app/Model/query"
 import * as Option from "effect-app/Option"
-import { NonEmptyString255 } from "effect-app/Schema"
-import { type FilterArgs, type PersistenceModelType, type Store, type StoreConfig, StoreMaker } from "effect-app/Store"
+import { type FilterArgs, type PersistenceModelType, type Store, type StoreConfig, storeId, StoreMaker } from "effect-app/Store"
 import { assertUnreachable } from "effect-app/utils"
 import { flow, pipe } from "effect/Function"
 import * as Order from "effect/Order"
@@ -315,9 +313,6 @@ export function memFilter<T extends FieldValues, U extends keyof T = never>(f: F
   })
 }
 
-const defaultNs: NonEmptyString255 = NonEmptyString255("primary")
-export class storeId extends Context.Reference("StoreId", { defaultValue: (): NonEmptyString255 => defaultNs }) {}
-
 function logQuery(f: FilterArgs<any, any>, defaultValues?: any) {
   return InfraLogger
     .logDebug("mem query")

package/src/Store/SQL/Pg.ts

@@ -6,13 +6,12 @@ import * as Effect from "effect-app/Effect"
 import type { FieldValues } from "effect-app/Model/filter/types"
 import type { ComputedProjectionIrExpression } from "effect-app/Model/query"
 import * as Option from "effect-app/Option"
-import { type FilterArgs, type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, StoreMaker } from "effect-app/Store"
+import { type FilterArgs, type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, storeId, StoreMaker } from "effect-app/Store"
 import * as Struct from "effect/Struct"
 import { SqlClient } from "effect/unstable/sql"
 import { OptimisticConcurrencyException } from "../../errors.js"
 import { InfraLogger } from "../../logger.js"
 import { annotateDb } from "../../otel.js"
-import { storeId } from "../Memory.js"
 import { makeETag } from "../utils.js"
 import { buildWhereSQLQuery, logQuery, pgDialect } from "./query.js"
 

package/src/Store/SQL.ts

@@ -6,7 +6,7 @@ import * as Effect from "effect-app/Effect"
 import type { FieldValues } from "effect-app/Model/filter/types"
 import type { ComputedProjectionIrExpression } from "effect-app/Model/query"
 import * as Option from "effect-app/Option"
-import { type FilterArgs, type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, StoreMaker } from "effect-app/Store"
+import { type FilterArgs, type PersistenceModelType, type StorageConfig, type Store, type StoreConfig, storeId, StoreMaker } from "effect-app/Store"
 import * as Context from "effect/Context"
 import * as Layer from "effect/Layer"
 import * as LayerMap from "effect/LayerMap"
@@ -15,7 +15,6 @@ import { SqlClient } from "effect/unstable/sql"
 import { OptimisticConcurrencyException } from "../errors.js"
 import { InfraLogger } from "../logger.js"
 import { annotateDb, type DbSystem } from "../otel.js"
-import { storeId } from "./Memory.js"
 import { buildWhereSQLQuery, logQuery, type SQLDialect, sqliteDialect } from "./SQL/query.js"
 import { makeETag } from "./utils.js"
 

package/src/errorReporter.ts

@@ -1,11 +1,11 @@
 import * as Sentry from "@sentry/node"
 import * as Effect from "effect-app/Effect"
+import { getRC } from "effect-app/setupRequest"
 import { dropUndefined, LogLevelToSentry } from "effect-app/utils"
 import * as Cause from "effect/Cause"
 import type * as LogLevel from "effect/LogLevel"
 import { CauseException, tryToJson, tryToReport } from "./errors.js"
 import { InfraLogger } from "./logger.js"
-import { getRC } from "./setupRequest.js"
 
 const tryCauseException = <E>(cause: Cause.Cause<E>, name: string): CauseException<E> => {
   try {

package/src/internal/RequestContextMiddleware.ts

@@ -3,9 +3,8 @@ import { HttpMiddleware, HttpServerRequest, HttpServerResponse } from "effect-ap
 import * as Layer from "effect-app/Layer"
 import { Locale, LocaleRef, RequestContext, spanAttributes } from "effect-app/RequestContext"
 import { NonEmptyString255 } from "effect-app/Schema"
-import { ContextMapContainer } from "effect-app/Store"
-import { provideOnRequestScope } from "../setupRequest.js"
-import { storeId } from "../Store/Memory.js"
+import { provideOnRequestScope } from "effect-app/setupRequest"
+import { ContextMapContainer, storeId } from "effect-app/Store"
 
 export const RequestContextMiddleware = (defaultLocale: Locale = "en") =>
   HttpMiddleware.make((app) =>

package/src/internal/events.ts

@@ -1,13 +1,13 @@
 import * as Effect from "effect-app/Effect"
 import { HttpHeaders, HttpServerResponse } from "effect-app/http"
 import * as S from "effect-app/Schema"
+import { setupStreamingRequestContextFromCurrent } from "effect-app/setupRequest"
+import { storeId } from "effect-app/Store"
 import * as Duration from "effect/Duration"
 import { pipe } from "effect/Function"
 import * as Schedule from "effect/Schedule"
 import * as Stream from "effect/Stream"
 import { reportError } from "../errorReporter.js"
-import { setupStreamingRequestContextFromCurrent } from "../setupRequest.js"
-import { storeId } from "../Store/Memory.js"
 
 // Tell the client to retry every 10 seconds if connectivity is lost
 const setRetry = Stream.succeed("retry: 10000")

package/src/logger/shared.ts

@@ -1,8 +1,8 @@
 import * as Option from "effect-app/Option"
 import { LocaleRef, RequestContext } from "effect-app/RequestContext"
 import { NonEmptyString255 } from "effect-app/Schema"
+import { storeId } from "effect-app/Store"
 import type * as Fiber from "effect/Fiber"
-import { storeId } from "../Store/Memory.js"
 
 export function getRequestContextFromFiber(fiber: Fiber.Fiber<unknown, unknown>) {
   const span = Option.fromNullishOr(fiber.currentSpan)

package/test/dist/rawQuery.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rawQuery.test.d.ts","sourceRoot":"","sources":["../rawQuery.test.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AAUvD,eAAO,MAAM,EAAE,6CAWb,CAAA"}
+{"version":3,"file":"rawQuery.test.d.ts","sourceRoot":"","sources":["../rawQuery.test.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AASvD,eAAO,MAAM,EAAE,6CAWb,CAAA"}

package/test/query.test.ts

@@ -9,12 +9,12 @@ import { makeRepo } from "effect-app/Model/Repository"
 import { RepositoryRegistryLive } from "effect-app/Model/Repository/Registry"
 import * as Option from "effect-app/Option"
 import * as S from "effect-app/Schema"
+import { setupRequestContextFromCurrent } from "effect-app/setupRequest"
 import { flow, pipe } from "effect/Function"
 import * as SchemaTransformation from "effect/SchemaTransformation"
 import * as Struct from "effect/Struct"
 import { inspect } from "util"
 import { expect, expectTypeOf, it } from "vitest"
-import { setupRequestContextFromCurrent } from "../src/setupRequest.js"
 import { memFilter, MemoryStoreLive } from "../src/Store/Memory.js"
 import { SomeService } from "./fixtures.js"
 

package/test/rawQuery.test.ts

@@ -9,6 +9,7 @@ import { and, computed, or, project, projectComputed, relation, where, whereEver
 import { makeRepo } from "effect-app/Model/Repository/makeRepo"
 import { RepositoryRegistryLive } from "effect-app/Model/Repository/Registry"
 import * as S from "effect-app/Schema"
+import { setupRequestContextFromCurrent } from "effect-app/setupRequest"
 import { LogLevels } from "effect-app/utils"
 import { flow } from "effect/Function"
 import * as ManagedRuntime from "effect/ManagedRuntime"
@@ -16,7 +17,6 @@ import * as Redacted from "effect/Redacted"
 import * as References from "effect/References"
 import * as Result from "effect/Result"
 import * as Struct from "effect/Struct"
-import { setupRequestContextFromCurrent } from "../src/setupRequest.js"
 import { CosmosStoreLayer } from "../src/Store/Cosmos.js"
 import { MemoryStoreLive } from "../src/Store/Memory.js"
 import { SQLiteStoreLayer } from "../src/Store/SQL.js"

package/test/repository-ext.test.ts

@@ -4,7 +4,7 @@ import * as Layer from "effect-app/Layer"
 import { makeRepo } from "effect-app/Model/Repository"
 import { RepositoryRegistryLive } from "effect-app/Model/Repository/Registry"
 import * as S from "effect-app/Schema"
-import { setupRequestContextFromCurrent } from "../src/setupRequest.js"
+import { setupRequestContextFromCurrent } from "effect-app/setupRequest"
 import { MemoryStoreLive } from "../src/Store/Memory.js"
 
 class BatchItem extends S.Class<BatchItem>("BatchItem")({

package/test/validateSample.test.ts

@@ -3,8 +3,8 @@ import * as Layer from "effect-app/Layer"
 import { makeRepo, ValidationError, ValidationResult } from "effect-app/Model/Repository"
 import { RepositoryRegistryLive } from "effect-app/Model/Repository/Registry"
 import * as S from "effect-app/Schema"
+import { setupRequestContextFromCurrent } from "effect-app/setupRequest"
 import { describe, expect, it } from "vitest"
-import { setupRequestContextFromCurrent } from "../src/setupRequest.js"
 import { MemoryStoreLive } from "../src/Store/Memory.js"
 
 const TestStoreLive = Layer.merge(MemoryStoreLive, RepositoryRegistryLive)

package/dist/setupRequest.d.ts

@@ -1,19 +0,0 @@
-import * as Effect from "effect-app/Effect";
-import * as Layer from "effect-app/Layer";
-import { RequestContext } from "effect-app/RequestContext";
-import { NonEmptyString255 } from "effect-app/Schema";
-import * as Tracer from "effect/Tracer";
-export declare const getRequestContext: Effect.Effect<RequestContext, never, never>;
-export declare const getRC: Effect.Effect<{
-    locale: "de" | "en";
-    namespace: NonEmptyString255;
-}, never, never>;
-export interface SetupRequestOptions {
-    readonly withTransaction?: boolean;
-}
-export declare const provideOnRequestScope: <ROut, E2, RIn>(layer: Layer.Layer<ROut, E2, RIn>) => <A, E, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<A, E | E2, RIn | import("effect/Scope").Scope | Exclude<R, ROut>>;
-export declare const setupRequestContextFromCurrent: (name?: string, options?: Tracer.SpanOptions & SetupRequestOptions) => <R, E, A>(self: Effect.Effect<A, E, R>) => Effect.Effect<A, E, Exclude<Exclude<R, Tracer.ParentSpan>, never>>;
-export declare const setupStreamingRequestContextFromCurrent: (name?: string, options?: Tracer.SpanOptions & SetupRequestOptions) => <R, E, A>(self: Effect.Effect<A, E, R>) => Effect.Effect<A, E, import("effect/Scope").Scope | Exclude<Exclude<R, Tracer.ParentSpan>, never>>;
-export declare function setupRequestContext<R, E, A>(self: Effect.Effect<A, E, R>, requestContext: RequestContext, options?: SetupRequestOptions): Effect.Effect<A, E, Exclude<Exclude<R, Tracer.ParentSpan>, never>>;
-export declare function setupRequestContextWithCustomSpan<R, E, A>(self: Effect.Effect<A, E, R>, requestContext: RequestContext, name: string, options?: Tracer.SpanOptions & SetupRequestOptions): Effect.Effect<A, E, Exclude<Exclude<R, Tracer.ParentSpan>, never>>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxNQUFNLE1BQU0sbUJBQW1CLENBQUE7QUFDM0MsT0FBTyxLQUFLLEtBQUssTUFBTSxrQkFBa0IsQ0FBQTtBQUV6QyxPQUFPLEVBQWEsY0FBYyxFQUFrQixNQUFNLDJCQUEyQixDQUFBO0FBQ3JGLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBRXJELE9BQU8sS0FBSyxNQUFNLE1BQU0sZUFBZSxDQUFBO0FBWXZDLGVBQU8sTUFBTSxpQkFBaUIsNkNBZTNCLENBQUE7QUFFSCxlQUFPLE1BQU0sS0FBSzs7O2dCQUdoQixDQUFBO0FBbUJGLE1BQU0sV0FBVyxtQkFBbUI7SUFDbEMsUUFBUSxDQUFDLGVBQWUsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtDQUNuQztBQU1ELGVBQU8sTUFBTSxxQkFBcUIsR0FDL0IsSUFBSSxFQUFFLEVBQUUsRUFBRSxHQUFHLFNBQVMsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsRUFBRSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxRQUFRLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsb0ZBU3hGLENBQUE7QUFFTixlQUFPLE1BQU0sOEJBQThCLDRCQUNaLE1BQU0sQ0FBQyxXQUFXLEdBQUcsbUJBQW1CLE1BQU0sQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLFFBQVEsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyx1RUFNM0csQ0FBQTtBQU1QLGVBQU8sTUFBTSx1Q0FBdUMsNEJBQ3JCLE1BQU0sQ0FBQyxXQUFXLEdBQUcsbUJBQW1CLE1BQU0sQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLFFBQVEsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxzR0FLN0csQ0FBQTtBQUdMLHdCQUFnQixtQkFBbUIsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFDekMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsRUFDNUIsY0FBYyxFQUFFLGNBQWMsRUFDOUIsT0FBTyxDQUFDLEVBQUUsbUJBQW1CLHNFQWE5QjtBQUVELHdCQUFnQixpQ0FBaUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFDdkQsSUFBSSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsRUFDNUIsY0FBYyxFQUFFLGNBQWMsRUFDOUIsSUFBSSxFQUFFLE1BQU0sRUFDWixPQUFPLENBQUMsRUFBRSxNQUFNLENBQUMsV0FBVyxHQUFHLG1CQUFtQixzRUFhbkQifQ==

package/dist/setupRequest.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../src/setupRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAEzC,OAAO,EAAa,cAAc,EAAkB,MAAM,2BAA2B,CAAA;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAErD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAYvC,eAAO,MAAM,iBAAiB,6CAe3B,CAAA;AAEH,eAAO,MAAM,KAAK;;;gBAGhB,CAAA;AAmBF,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CACnC;AAMD,eAAO,MAAM,qBAAqB,GAC/B,IAAI,EAAE,EAAE,EAAE,GAAG,SAAS,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,oFASxF,CAAA;AAEN,eAAO,MAAM,8BAA8B,4BACZ,MAAM,CAAC,WAAW,GAAG,mBAAmB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,uEAM3G,CAAA;AAMP,eAAO,MAAM,uCAAuC,4BACrB,MAAM,CAAC,WAAW,GAAG,mBAAmB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,sGAK7G,CAAA;AAGL,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EACzC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC5B,cAAc,EAAE,cAAc,EAC9B,OAAO,CAAC,EAAE,mBAAmB,sEAa9B;AAED,wBAAgB,iCAAiC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EACvD,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC5B,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,MAAM,CAAC,WAAW,GAAG,mBAAmB,sEAanD"}

package/dist/setupRequest.js

@@ -1,70 +0,0 @@
-import * as Effect from "effect-app/Effect";
-import * as Layer from "effect-app/Layer";
-import * as Option from "effect-app/Option";
-import { LocaleRef, RequestContext, spanAttributes } from "effect-app/RequestContext";
-import { NonEmptyString255 } from "effect-app/Schema";
-import { ContextMapContainer } from "effect-app/Store";
-import * as Tracer from "effect/Tracer";
-import { SqlClient } from "effect/unstable/sql";
-import { storeId } from "./Store/Memory.js";
-const withSqlTransaction = (self) => Effect.serviceOption(SqlClient.SqlClient).pipe(Effect.flatMap(Option.match({
-    onNone: () => self,
-    onSome: (sql) => sql.withTransaction(self).pipe(Effect.orDie)
-})));
-export const getRequestContext = Effect
-    .all({
-    span: Effect.currentSpan.pipe(Effect.orDie),
-    locale: LocaleRef,
-    namespace: storeId
-})
-    .pipe(Effect.map(({ locale, namespace, span }) => RequestContext.make({
-    span: Tracer.externalSpan(span),
-    locale,
-    namespace,
-    name: NonEmptyString255(span.name)
-})));
-export const getRC = Effect.all({
-    locale: LocaleRef,
-    namespace: storeId
-});
-const withRequestSpan = (name = "request", options) => (f) => Effect.andThen(getRC, (ctx) => f.pipe(Effect.withSpan(name, {
-    ...options,
-    attributes: { ...spanAttributes({ ...ctx, name: NonEmptyString255(name) }), ...options?.attributes }
-}, {
-    captureStackTrace: options?.captureStackTrace ?? false
-}), 
-// TODO: false
-// request context info is picked up directly in the logger for annotations.
-Effect.withLogSpan(name)));
-// Build `layer` against the ambient (request) scope rather than a sub-scope of the
-// returned Effect. Required when the returned value is a streaming HttpServerResponse:
-// the response body keeps producing chunks (and using layer-provided state) after the
-// Effect returns, so a sub-scope would close too early and run finalizers mid-stream.
-export const provideOnRequestScope = (layer) => (self) => Effect.gen(function* () {
-    const requestScope = yield* Effect.scope;
-    // Fresh MemoMap per request: `Layer.buildWithScope` would otherwise reuse
-    // the ambient MemoMap living on the HTTP server fiber, sharing the built
-    // value (e.g. ContextMap) across every request handled by that server.
-    const memoMap = yield* Layer.makeMemoMap;
-    const ctx = yield* Layer.buildWithMemoMap(layer, memoMap, requestScope);
-    return yield* Effect.provide(self, ctx);
-});
-export const setupRequestContextFromCurrent = (name = "request", options) => (self) => self
-    .pipe(options?.withTransaction === true ? withSqlTransaction : (_) => _, withRequestSpan(name, options), Effect.provide(ContextMapContainer.layer, { local: true }));
-// Streaming variant: binds ContextMapContainer to the ambient (request) scope so its
-// finalizer (clear()) runs only after the response body is fully drained, not when the
-// outer Effect returns its HttpServerResponse value. Use for handlers that return a
-// streaming HttpServerResponse (e.g. SSE) — see RequestContextMiddleware for context.
-export const setupStreamingRequestContextFromCurrent = (name = "request", options) => (self) => self.pipe(options?.withTransaction === true ? withSqlTransaction : (_) => _, withRequestSpan(name, options), provideOnRequestScope(ContextMapContainer.layer));
-// TODO: consider integrating Effect.withParentSpan
-export function setupRequestContext(self, requestContext, options) {
-    const layer = Layer.mergeAll(ContextMapContainer.layer, Layer.succeed(LocaleRef, requestContext.locale), Layer.succeed(storeId, requestContext.namespace));
-    return self
-        .pipe(options?.withTransaction === true ? withSqlTransaction : (_) => _, withRequestSpan(requestContext.name), Effect.provide(layer, { local: true }));
-}
-export function setupRequestContextWithCustomSpan(self, requestContext, name, options) {
-    const layer = Layer.mergeAll(ContextMapContainer.layer, Layer.succeed(LocaleRef, requestContext.locale), Layer.succeed(storeId, requestContext.namespace));
-    return self
-        .pipe(options?.withTransaction === true ? withSqlTransaction : (_) => _, withRequestSpan(name, options), Effect.provide(layer, { local: true }));
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NldHVwUmVxdWVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssTUFBTSxNQUFNLG1CQUFtQixDQUFBO0FBQzNDLE9BQU8sS0FBSyxLQUFLLE1BQU0sa0JBQWtCLENBQUE7QUFDekMsT0FBTyxLQUFLLE1BQU0sTUFBTSxtQkFBbUIsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsU0FBUyxFQUFFLGNBQWMsRUFBRSxjQUFjLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUNyRixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUNyRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN0RCxPQUFPLEtBQUssTUFBTSxNQUFNLGVBQWUsQ0FBQTtBQUN2QyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFDL0MsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLG1CQUFtQixDQUFBO0FBRTNDLE1BQU0sa0JBQWtCLEdBQUcsQ0FBVSxJQUE0QixFQUEwQixFQUFFLENBQzNGLE1BQU0sQ0FBQyxhQUFhLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDLElBQUksQ0FDNUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDO0lBQzFCLE1BQU0sRUFBRSxHQUFHLEVBQUUsQ0FBQyxJQUFJO0lBQ2xCLE1BQU0sRUFBRSxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQztDQUM5RCxDQUFDLENBQUMsQ0FDSixDQUFBO0FBRUgsTUFBTSxDQUFDLE1BQU0saUJBQWlCLEdBQUcsTUFBTTtLQUNwQyxHQUFHLENBQUM7SUFDSCxJQUFJLEVBQUUsTUFBTSxDQUFDLFdBQVcs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

package/src/setupRequest.ts

@@ -1,135 +0,0 @@
-import * as Effect from "effect-app/Effect"
-import * as Layer from "effect-app/Layer"
-import * as Option from "effect-app/Option"
-import { LocaleRef, RequestContext, spanAttributes } from "effect-app/RequestContext"
-import { NonEmptyString255 } from "effect-app/Schema"
-import { ContextMapContainer } from "effect-app/Store"
-import * as Tracer from "effect/Tracer"
-import { SqlClient } from "effect/unstable/sql"
-import { storeId } from "./Store/Memory.js"
-
-const withSqlTransaction = <R, E, A>(self: Effect.Effect<A, E, R>): Effect.Effect<A, E, R> =>
-  Effect.serviceOption(SqlClient.SqlClient).pipe(
-    Effect.flatMap(Option.match({
-      onNone: () => self,
-      onSome: (sql) => sql.withTransaction(self).pipe(Effect.orDie)
-    }))
-  )
-
-export const getRequestContext = Effect
-  .all({
-    span: Effect.currentSpan.pipe(Effect.orDie),
-    locale: LocaleRef,
-    namespace: storeId
-  })
-  .pipe(
-    Effect.map(({ locale, namespace, span }) =>
-      RequestContext.make({
-        span: Tracer.externalSpan(span),
-        locale,
-        namespace,
-        name: NonEmptyString255(span.name)
-      })
-    )
-  )
-
-export const getRC = Effect.all({
-  locale: LocaleRef,
-  namespace: storeId
-})
-
-const withRequestSpan = (name = "request", options?: Tracer.SpanOptions) => <R, E, A>(f: Effect.Effect<A, E, R>) =>
-  Effect.andThen(
-    getRC,
-    (ctx) =>
-      f.pipe(
-        Effect.withSpan(name, {
-          ...options,
-          attributes: { ...spanAttributes({ ...ctx, name: NonEmptyString255(name) }), ...options?.attributes }
-        }, {
-          captureStackTrace: options?.captureStackTrace ?? false
-        }),
-        // TODO: false
-        // request context info is picked up directly in the logger for annotations.
-        Effect.withLogSpan(name)
-      )
-  )
-
-export interface SetupRequestOptions {
-  readonly withTransaction?: boolean
-}
-
-// Build `layer` against the ambient (request) scope rather than a sub-scope of the
-// returned Effect. Required when the returned value is a streaming HttpServerResponse:
-// the response body keeps producing chunks (and using layer-provided state) after the
-// Effect returns, so a sub-scope would close too early and run finalizers mid-stream.
-export const provideOnRequestScope =
-  <ROut, E2, RIn>(layer: Layer.Layer<ROut, E2, RIn>) => <A, E, R>(self: Effect.Effect<A, E, R>) =>
-    Effect.gen(function*() {
-      const requestScope = yield* Effect.scope
-      // Fresh MemoMap per request: `Layer.buildWithScope` would otherwise reuse
-      // the ambient MemoMap living on the HTTP server fiber, sharing the built
-      // value (e.g. ContextMap) across every request handled by that server.
-      const memoMap = yield* Layer.makeMemoMap
-      const ctx = yield* Layer.buildWithMemoMap(layer, memoMap, requestScope)
-      return yield* Effect.provide(self, ctx)
-    })
-
-export const setupRequestContextFromCurrent =
-  (name = "request", options?: Tracer.SpanOptions & SetupRequestOptions) => <R, E, A>(self: Effect.Effect<A, E, R>) =>
-    self
-      .pipe(
-        options?.withTransaction === true ? withSqlTransaction : (_) => _,
-        withRequestSpan(name, options),
-        Effect.provide(ContextMapContainer.layer, { local: true })
-      )
-
-// Streaming variant: binds ContextMapContainer to the ambient (request) scope so its
-// finalizer (clear()) runs only after the response body is fully drained, not when the
-// outer Effect returns its HttpServerResponse value. Use for handlers that return a
-// streaming HttpServerResponse (e.g. SSE) — see RequestContextMiddleware for context.
-export const setupStreamingRequestContextFromCurrent =
-  (name = "request", options?: Tracer.SpanOptions & SetupRequestOptions) => <R, E, A>(self: Effect.Effect<A, E, R>) =>
-    self.pipe(
-      options?.withTransaction === true ? withSqlTransaction : (_) => _,
-      withRequestSpan(name, options),
-      provideOnRequestScope(ContextMapContainer.layer)
-    )
-
-// TODO: consider integrating Effect.withParentSpan
-export function setupRequestContext<R, E, A>(
-  self: Effect.Effect<A, E, R>,
-  requestContext: RequestContext,
-  options?: SetupRequestOptions
-) {
-  const layer = Layer.mergeAll(
-    ContextMapContainer.layer,
-    Layer.succeed(LocaleRef, requestContext.locale),
-    Layer.succeed(storeId, requestContext.namespace)
-  )
-  return self
-    .pipe(
-      options?.withTransaction === true ? withSqlTransaction : (_) => _,
-      withRequestSpan(requestContext.name),
-      Effect.provide(layer, { local: true })
-    )
-}
-
-export function setupRequestContextWithCustomSpan<R, E, A>(
-  self: Effect.Effect<A, E, R>,
-  requestContext: RequestContext,
-  name: string,
-  options?: Tracer.SpanOptions & SetupRequestOptions
-) {
-  const layer = Layer.mergeAll(
-    ContextMapContainer.layer,
-    Layer.succeed(LocaleRef, requestContext.locale),
-    Layer.succeed(storeId, requestContext.namespace)
-  )
-  return self
-    .pipe(
-      options?.withTransaction === true ? withSqlTransaction : (_) => _,
-      withRequestSpan(name, options),
-      Effect.provide(layer, { local: true })
-    )
-}