@effect-app/infra 0.130.1 → 0.132.0

package/_src/services/Store/service.ts

@@ -102,12 +102,13 @@ export interface Store<PM extends PersistenceModelType<Id>, Id extends string> {
  * @tsplus type StoreMaker
  * @tsplus companion StoreMaker.Ops
  */
-export abstract class StoreMaker extends TagClass<StoreMaker>() {
-  abstract make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(
+export class StoreMaker extends TagClass<StoreMaker, {
+  make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(
     name: string,
     seed?: Effect<R, E, Iterable<PM>>,
     config?: StoreConfig<PM>
   ) => Effect<R, E, Store<PM, Id>>
+}>() {
 }
 
 export const makeContextMap = (): ContextMap => {
@@ -184,10 +185,11 @@ export const makeMap = Effect.sync(() => makeContextMap())
  * @tsplus type ContextMap
  * @tsplus companion ContextMap.Ops
  */
-export abstract class ContextMap extends TagClass<ContextMap>() {
-  abstract get: (id: string) => string | undefined
-  abstract set: (id: string, eTag: string | undefined) => void
-  abstract parserEnv: ParserEnv
+export class ContextMap extends TagClass<ContextMap, {
+  get: (id: string) => string | undefined
+  set: (id: string, eTag: string | undefined) => void
+  parserEnv: ParserEnv
+}>() {
 }
 
 export interface PersistenceModelType<Id extends string> {

package/dist/services/Emailer/service.d.ts

@@ -6,13 +6,16 @@ import { NonEmptyReadonlyArray } from "effect/ReadonlyArray";
 import type { MailContent, MailData } from "@sendgrid/helpers/classes/mail.js";
 import type { ResponseError } from "@sendgrid/mail";
 import type sgMail from "@sendgrid/mail";
-declare const Emailer_base: (abstract new () => {}) & import("effect/Context").Tag<Emailer, Emailer>;
+declare const Emailer_base: (new (service: {
+    sendMail: (msg: EmailMsgOptionalFrom) => Effect<never, Error | ResponseError, void>;
+}) => Readonly<{
+    sendMail: (msg: EmailMsgOptionalFrom) => Effect<never, Error | ResponseError, void>;
+}>) & import("effect/Context").Tag<Emailer, Emailer>;
 /**
  * @tsplus type Emailer
  * @tsplus companion Emailer.Ops
  */
-export declare abstract class Emailer extends Emailer_base {
-    abstract sendMail: (msg: EmailMsgOptionalFrom) => Effect<never, Error | ResponseError, void>;
+export declare class Emailer extends Emailer_base {
 }
 export interface SendgridConfig {
     defaultReplyTo?: Email | {

package/dist/services/Emailer/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../_src/services/Emailer/service.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAA;AAC9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAA;;AAExC;;;GAGG;AACH,8BAAsB,OAAQ,SAAQ,YAAmB;IACvD,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,oBAAoB,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,GAAG,aAAa,EAAE,IAAI,CAAC,CAAA;CAC7F;AAED,MAAM,WAAW,cAAc;IAC7B,cAAc,CAAC,EAAE,KAAK,GAAG;QAAE,IAAI,CAAC,EAAE,iBAAiB,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAA;IACnE,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,KAAK,GAAG;QAAE,IAAI,CAAC,EAAE,iBAAiB,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAA;IAC/D,MAAM,EAAE,MAAM,CAAA;CACf;AACD,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAA;AAC9C,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAA;AAEhE,MAAM,MAAM,oBAAoB,GAC5B,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,GACtB,CACA;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,qBAAqB,CAAC,WAAW,CAAC,CAAA;CAAE,CAC/G,GACC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../_src/services/Emailer/service.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAA;AAC9E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAA;;oBAOtB,oBAAoB,KAAK,OAAO,KAAK,EAAE,KAAK,GAAG,aAAa,EAAE,IAAI,CAAC;;oBAAnE,oBAAoB,KAAK,OAAO,KAAK,EAAE,KAAK,GAAG,aAAa,EAAE,IAAI,CAAC;;AALrF;;;GAGG;AACH,qBAAa,OAAQ,SAAQ,YAEzB;CAAG;AAEP,MAAM,WAAW,cAAc;IAC7B,cAAc,CAAC,EAAE,KAAK,GAAG;QAAE,IAAI,CAAC,EAAE,iBAAiB,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAA;IACnE,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,EAAE,KAAK,GAAG;QAAE,IAAI,CAAC,EAAE,iBAAiB,CAAC;QAAC,KAAK,EAAE,KAAK,CAAA;KAAE,CAAA;IAC/D,MAAM,EAAE,MAAM,CAAA;CACf;AACD,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAA;AAC9C,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAA;AAEhE,MAAM,MAAM,oBAAoB,GAC5B,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,GACtB,CACA;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,qBAAqB,CAAC,WAAW,CAAC,CAAA;CAAE,CAC/G,GACC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA"}

package/dist/services/Emailer/service.js

@@ -5,4 +5,4 @@ import * as tsplus_module_1 from "@effect-app/prelude/service";
  */
 export class Emailer extends tsplus_module_1.TagClass() {
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvRW1haWxlci9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFJQTs7O0dBR0c7QUFDSCxNQUFNLE9BQWdCLE9BQVEsU0FBUSxnQkFBQSxRQUFRLEVBQVc7Q0FFeEQifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvRW1haWxlci9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFJQTs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sT0FBUSxTQUFRLGdCQUFBLFFBQVEsRUFFakM7Q0FBRyJ9

package/dist/services/Operations/live.d.ts

@@ -1,7 +1,8 @@
 import { Exit } from "effect/Exit";
+import { Operations } from "./service.js";
 /**
  * @tsplus static Operations.Ops Live
  * @tsplus location "@effect-app/infra/services/Operations/live"
  */
-export declare const Live: import("effect/Layer").Layer<never, never, import("./service.js").OperationsId>;
+export declare const Live: import("effect/Layer").Layer<never, never, Operations.Id>;
 //# sourceMappingURL=live.d.ts.map

package/dist/services/Operations/live.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../../../_src/services/Operations/live.ts"],"names":[],"mappings":";;;;;AAyGA,eAAO,MAAM,IAAI,iFAEwB,CAAA"}
+{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../../../_src/services/Operations/live.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;;;;;AAsGzC,eAAO,MAAM,IAAI,2DAEwB,CAAA"}

package/dist/services/Operations/service.d.ts

@@ -3,39 +3,47 @@ import { Effect } from "effect/Effect";
 import { Option } from "@effect-app/core/Option";
 import type { Operation, OperationId, OperationProgress } from "@effect-app/prelude/Operations";
 import * as Scope from "effect/Scope";
-export interface OperationsId {
-    readonly _: unique symbol;
-}
-declare const Operations_base: (abstract new () => {}) & import("effect/Context").Tag<OperationsId, Operations>;
+declare const Operations_base: (new (service: {
+    register: Effect<Scope.Scope, never, OperationId>;
+    update: (id: OperationId, progress: OperationProgress) => Effect<never, never, void>;
+    find: (id: OperationId) => Effect<never, never, Option<Operation>>;
+    cleanup: Effect<never, never, void>;
+}) => Readonly<{
+    register: Effect<Scope.Scope, never, OperationId>;
+    update: (id: OperationId, progress: OperationProgress) => Effect<never, never, void>;
+    find: (id: OperationId) => Effect<never, never, Option<Operation>>;
+    cleanup: Effect<never, never, void>;
+}>) & import("effect/Context").Tag<Operations.Id, Operations>;
 /**
  * @tsplus type Operations
  * @tsplus companion Operations.Ops
  */
-export declare abstract class Operations extends Operations_base {
-    abstract register: Effect<Scope.Scope, never, OperationId>;
-    abstract update: (id: OperationId, progress: OperationProgress) => Effect<never, never, void>;
-    abstract find: (id: OperationId) => Effect<never, never, Option<Operation>>;
-    abstract cleanup: Effect<never, never, void>;
+export declare class Operations extends Operations_base {
+}
+export declare namespace Operations {
+    interface Id {
+        readonly _: unique symbol;
+    }
 }
 /**
  * @tsplus getter effect/io/Effect forkOperation
  * @tsplus location "@effect-app/infra/services/Operations/service"
  */
-export declare function forkOperation<R, E, A>(self: Effect<R, E, A>): import("effect/Effect").Effect<OperationsId | Exclude<R, Scope.Scope>, never, import("@effect-app/prelude/schema").StringId>;
+export declare function forkOperation<R, E, A>(self: Effect<R, E, A>): import("effect/Effect").Effect<Operations.Id | Exclude<R, Scope.Scope>, never, import("@effect-app/prelude/schema").StringId>;
 /**
  * @tsplus getter function forkOperation
  * @tsplus location "@effect-app/infra/services/Operations/service"
  */
-export declare function forkOperationFunction<R, E, A, Inp>(fnc: (inp: Inp) => Effect<R, E, A>): (inp: Inp) => import("effect/Effect").Effect<OperationsId | Exclude<R, Scope.Scope>, never, import("@effect-app/prelude/schema").StringId>;
+export declare function forkOperationFunction<R, E, A, Inp>(fnc: (inp: Inp) => Effect<R, E, A>): (inp: Inp) => import("effect/Effect").Effect<Operations.Id | Exclude<R, Scope.Scope>, never, import("@effect-app/prelude/schema").StringId>;
 /**
  * @tsplus static effect/io/Effect.Ops forkOperation
  * @tsplus location "@effect-app/infra/services/Operations/service"
  */
-export declare function forkOperation2<R, E, A>(self: (opId: OperationId) => Effect<R, E, A>): import("effect/Effect").Effect<OperationsId | Exclude<R, Scope.Scope>, never, import("@effect-app/prelude/schema").StringId>;
+export declare function forkOperation2<R, E, A>(self: (opId: OperationId) => Effect<R, E, A>): import("effect/Effect").Effect<Operations.Id | Exclude<R, Scope.Scope>, never, import("@effect-app/prelude/schema").StringId>;
 /**
  * @tsplus static effect/io/Effect.Ops forkOperationWithEffect
  * @tsplus location "@effect-app/infra/services/Operations/service"
  */
-export declare function forkOperationWithEffect<R, R2, E, E2, A, A2>(self: (id: OperationId) => Effect<R, E, A>, fnc: (id: OperationId) => Effect<R2, E2, A2>): import("effect/Effect").Effect<OperationsId | Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>, never, import("@effect-app/prelude/schema").StringId>;
+export declare function forkOperationWithEffect<R, R2, E, E2, A, A2>(self: (id: OperationId) => Effect<R, E, A>, fnc: (id: OperationId) => Effect<R2, E2, A2>): import("effect/Effect").Effect<Operations.Id | Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>, never, import("@effect-app/prelude/schema").StringId>;
 export {};
 //# sourceMappingURL=service.d.ts.map

package/dist/services/Operations/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../_src/services/Operations/service.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAC/F,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;;AAED;;;GAGG;AACH,8BAAsB,UAAW,SAAQ,eAAoC;IAC3E,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,CAAC,CAAA;IAC1D,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,iBAAiB,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC7F,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;IAC3E,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CAC7C;;;;;AAKD,wBAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,gIAY3D;;;;;AAKD,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,SACvE,GAAG,kIACjB;;;;;AAKD,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,gIAYnF;;;;;AAKD,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EACzD,IAAI,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC1C,GAAG,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,2JAc7C"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../_src/services/Operations/service.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAC/F,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;;cAOzB,OAAO,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC;iBACpC,WAAW,YAAY,iBAAiB,KAAK,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC;eACzE,WAAW,KAAK,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,SAAS,CAAC,CAAC;aACzD,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC;;cAHzB,OAAO,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC;iBACpC,WAAW,YAAY,iBAAiB,KAAK,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC;eACzE,WAAW,KAAK,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,SAAS,CAAC,CAAC;aACzD,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC;;AARrC;;;GAGG;AACH,qBAAa,UAAW,SAAQ,eAKhB;CAAG;AACnB,yBAAiB,UAAU,CAAC;IAC1B,UAAiB,EAAE;QACjB,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;KAC1B;CACF;;;;;AAKD,wBAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,iIAY3D;;;;;AAKD,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,SACvE,GAAG,mIACjB;;;;;AAKD,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,iIAYnF;;;;;AAKD,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EACzD,IAAI,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC1C,GAAG,EAAE,CAAC,EAAE,EAAE,WAAW,KAAK,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,4JAc7C"}

package/dist/services/Operations/service.js

@@ -39,4 +39,4 @@ export function forkOperationWithEffect(self, fnc) {
         .make(), (scope) => tsplus_module_3.tap(tsplus_module_3.tap(Scope.extend(Operations
         .register, scope), (opId) => tsplus_module_2.forkDaemonReportRequestUnexpected(Scope.use(self(opId), scope))), (opId) => Scope.extend(tsplus_module_3.forkScoped(tsplus_module_3.interruptible(fnc(opId))), scope))));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvT3BlcmF0aW9ucy9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OzthQXFCZ0IsYUFBYTtBQXBCN0IsT0FBTyxLQUFLLEtBQUssTUFBTSxjQUFjLENBQUE7QUFNckM7OztHQUdHO0FBQ0gsTUFBTSxPQUFnQixVQUFXLFNBQVEsZ0JBQUEsUUFBUSxFQUE0QjtDQUs1RTtBQUVEOztHQUVHO0FBQ0gseUJBQXVDLElBQXFCO0lBQzFELE9BQU8sd0JBQUEsVUFBVSxFQUNmLENBQUMsVUFBVSxFQUFFLEVBQUUsQ0FDYix3QkFBQSxLQUFLO1NBQ0YsSUFBSSxFQUFFLEVBQ0UsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUNqQixvQkFBQSxBQTFCRSxLQUFLLFFBMEJQLFVBQVU7U0FDUCxRQUFRLEVBQ0QsS0FBSyxDQUFDLEVBQ1QsR0FBRyxFQUFFLG1EQUFDLEFBN0JYLEtBQUssS0E2Qk0sSUFBSSxFQUFLLEtBQUssQ0FBQyxDQUFrQyxDQUFDLENBQ2hFLENBQ04sQ0FBQTtBQUNILENBQUM7QUFFRDs7R0FFRztBQUNILE1BQU0sVUFBVSxxQkFBcUIsQ0FBZSxHQUFrQztJQUNwRixPQUFPLENBQUMsR0FBUSxFQUFFLEVBQUUsaUJBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFjLENBQUE7QUFDN0MsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGNBQWMsQ0FBVSxJQUE0QztJQUNsRixPQUFPLHdCQUFBLFVBQVUsRUFDZixDQUFDLFVBQVUsRUFBRSxFQUFFLENBQ2Isd0JBQUEsS0FBSztTQUNGLElBQUksRUFBRSxFQUNFLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FDakIsb0JBQUEsQUFsREUsS0FBSyxRQWtEUCxVQUFVO1NBQ1AsUUFBUSxFQUNELEtBQUssQ0FBQyxFQUNULENBQUMsRUFBRSxFQUFFLEVBQUUsbURBQUMsQUFyRGIsS0FBSyxLQXFEUSxJQUFJLENBQUMsRUFBRSxDQUFDLEVBQUssS0FBSyxDQUFDLENBQWtDLENBQUMsQ0FDdEUsQ0FDTixDQUFBO0FBQ0gsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLHVCQUF1QixDQUNyQyxJQUEwQyxFQUMxQyxHQUE0QztJQUU1QyxPQUFPLHdCQUFBLFVBQVUsRUFDZixDQUFDLFVBQVUsRUFBRSxFQUFFLENBQ2Isd0JBQUEsS0FBSztTQUNGLElBQUksRUFBRSxFQUNFLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FDakIsb0JBQUEsb0JBQUEsQUF0RUUsS0FBSyxRQXNFUCxVQUFVO1NBQ1AsUUFBUSxFQUNELEtBQUssQ0FBQyxFQUNULENBQUMsSUFBSSxFQUFFLEVBQUUsbURBQUMsQUF6RWYsS0FBSyxLQXlFVSxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUssS0FBSyxDQUFDLENBQWtDLENBQUMsRUFDbEUsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLEFBMUVmLEtBQUssaUVBMEVVLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBaUMsS0FBSyxDQUFDLENBQUMsQ0FDbkUsQ0FDTixDQUFBO0FBQ0gsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvT3BlcmF0aW9ucy9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OzthQXNCZ0IsYUFBYTtBQXJCN0IsT0FBTyxLQUFLLEtBQUssTUFBTSxjQUFjLENBQUE7QUFFckM7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFVBQVcsU0FBUSxnQkFBQSxRQUFRLEVBS3hCO0NBQUc7QUFPbkI7O0dBRUc7QUFDSCx5QkFBdUMsSUFBcUI7SUFDMUQsT0FBTyx3QkFBQSxVQUFVLEVBQ2YsQ0FBQyxVQUFVLEVBQUUsRUFBRSxDQUNiLHdCQUFBLEtBQUs7U0FDRixJQUFJLEVBQUUsRUFDRSxDQUFDLEtBQUssRUFBRSxFQUFFLENBQ2pCLG9CQUFBLEFBM0JFLEtBQUssUUEyQlAsVUFBVTtTQUNQLFFBQVEsRUFDRCxLQUFLLENBQUMsRUFDVCxHQUFHLEVBQUUsbURBQUMsQUE5QlgsS0FBSyxLQThCTSxJQUFJLEVBQUssS0FBSyxDQUFDLENBQWtDLENBQUMsQ0FDaEUsQ0FDTixDQUFBO0FBQ0gsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLHFCQUFxQixDQUFlLEdBQWtDO0lBQ3BGLE9BQU8sQ0FBQyxHQUFRLEVBQUUsRUFBRSxpQkFBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQWMsQ0FBQTtBQUM3QyxDQUFDO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsY0FBYyxDQUFVLElBQTRDO0lBQ2xGLE9BQU8sd0JBQUEsVUFBVSxFQUNmLENBQUMsVUFBVSxFQUFFLEVBQUUsQ0FDYix3QkFBQSxLQUFLO1NBQ0YsSUFBSSxFQUFFLEVBQ0UsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUNqQixvQkFBQSxBQW5ERSxLQUFLLFFBbURQLFVBQVU7U0FDUCxRQUFRLEVBQ0QsS0FBSyxDQUFDLEVBQ1QsQ0FBQyxFQUFFLEVBQUUsRUFBRSxtREFBQyxBQXREYixLQUFLLEtBc0RRLElBQUksQ0FBQyxFQUFFLENBQUMsRUFBSyxLQUFLLENBQUMsQ0FBa0MsQ0FBQyxDQUN0RSxDQUNOLENBQUE7QUFDSCxDQUFDO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsdUJBQXVCLENBQ3JDLElBQTBDLEVBQzFDLEdBQTRDO0lBRTVDLE9BQU8sd0JBQUEsVUFBVSxFQUNmLENBQUMsVUFBVSxFQUFFLEVBQUUsQ0FDYix3QkFBQSxLQUFLO1NBQ0YsSUFBSSxFQUFFLEVBQ0UsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUNqQixvQkFBQSxvQkFBQSxBQXZFRSxLQUFLLFFBdUVQLFVBQVU7U0FDUCxRQUFRLEVBQ0QsS0FBSyxDQUFDLEVBQ1QsQ0FBQyxJQUFJLEVBQUUsRUFBRSxtREFBQyxBQTFFZixLQUFLLEtBMEVVLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBSyxLQUFLLENBQUMsQ0FBa0MsQ0FBQyxFQUNsRSxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQUEzRWYsS0FBSyxpRUEyRVUsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFpQyxLQUFLLENBQUMsQ0FBQyxDQUNuRSxDQUNOLENBQUE7QUFDSCxDQUFDIn0=

package/dist/services/QueueMaker/memQueue.js

@@ -1,13 +1,11 @@
 import * as tsplus_module_1 from "@effect-app/prelude/schema";
 import * as tsplus_module_2 from "@effect-app/schema/ext2";
 import * as tsplus_module_3 from "effect/Effect";
-import * as tsplus_module_4 from "effect/Option";
-import * as tsplus_module_5 from "@effect-app/core/Option";
-import * as tsplus_module_6 from "@effect-app/core/_ext/Iterable";
-import * as tsplus_module_7 from "@effect-app/infra/services/QueueMaker/errors";
-import * as tsplus_module_8 from "@effect-app/prelude/utils";
-import * as tsplus_module_9 from "@effect-app/infra/api/setupRequest";
-import * as tsplus_module_10 from "effect/Fiber";
+import * as tsplus_module_4 from "@effect-app/core/_ext/Iterable";
+import * as tsplus_module_5 from "@effect-app/infra/services/QueueMaker/errors";
+import * as tsplus_module_6 from "@effect-app/prelude/utils";
+import * as tsplus_module_7 from "@effect-app/infra/api/setupRequest";
+import * as tsplus_module_8 from "effect/Fiber";
 import { MemQueue } from "@effect-app/infra-adapters/memQueue";
 import { RequestContext } from "@effect-app/infra/RequestContext";
 import { RequestId } from "@effect-app/prelude/ids";
@@ -30,9 +28,9 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
         return {
             publish: (...messages) => tsplus_module_3.gen(function* ($) {
                 const requestContext = yield* $(rcc.requestContext);
-                const currentSpan = yield* $(tsplus_module_3.currentSpan);
-                const span = tsplus_module_5.getOrUndefined(tsplus_module_4.map(currentSpan, Tracer.externalSpan));
-                return yield* $(tsplus_module_7.forkDaemonReportQueue(tsplus_module_6.ext_forEach(messages, (m) => tsplus_module_3.asUnit(
+                const currentSpan = yield* $(tsplus_module_3.orDie(tsplus_module_3.currentSpan));
+                const span = Tracer.externalSpan(currentSpan);
+                return yield* $(tsplus_module_5.forkDaemonReportQueue(tsplus_module_4.ext_forEach(messages, (m) => tsplus_module_3.asUnit(
                 // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
                 tsplus_module_3.flatMap(tsplus_module_3.sync(() => JSON.stringify(wireSchema.encodeSync({ body: m, meta: { requestContext, span } })))
                 // .tap((msg) => info("Publishing Mem Message: " + utils.inspect(msg)))
@@ -42,8 +40,8 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
                 const silenceAndReportError = reportNonInterruptedFailure({ name: "MemQueue.drain." + queueDrainName });
                 const processMessage = (msg) => 
                 // we JSON parse, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
-                tsplus_module_3.flatMap(tsplus_module_3.orDie(tsplus_module_3.flatMap(tsplus_module_3.sync(() => JSON.parse(msg)), parseDrain)), ({ body, meta }) => tsplus_module_3.withSpan(tsplus_module_9.setupRequestContext(tsplus_module_3.zipRight(tsplus_module_3.logDebug(`$$ [${queueDrainName}] Processing incoming message`)
-                    .pipe(tsplus_module_3.annotateLogs({ body: tsplus_module_8.RecordPretty(tsplus_module_8.object$(body)), meta: tsplus_module_8.RecordPretty(tsplus_module_8.object$(meta)) })), handleEvent(body))
+                tsplus_module_3.flatMap(tsplus_module_3.orDie(tsplus_module_3.flatMap(tsplus_module_3.sync(() => JSON.parse(msg)), parseDrain)), ({ body, meta }) => tsplus_module_3.withSpan(tsplus_module_7.setupRequestContext(tsplus_module_3.zipRight(tsplus_module_3.logDebug(`$$ [${queueDrainName}] Processing incoming message`)
+                    .pipe(tsplus_module_3.annotateLogs({ body: tsplus_module_6.RecordPretty(tsplus_module_6.object$(body)), meta: tsplus_module_6.RecordPretty(tsplus_module_6.object$(meta)) })), handleEvent(body))
                     .pipe(silenceAndReportError), RequestContext.inherit(meta.requestContext, {
                     id: RequestId(body.id),
                     locale: "en",
@@ -55,7 +53,7 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
                         : undefined
                 }));
                 return yield* $(tsplus_module_3.forkScoped(tsplus_module_3.forever(tsplus_module_3.flatMap(qDrain
-                    .take, (x) => tsplus_module_3.flatMap(tsplus_module_3.fork(tsplus_module_3.uninterruptible(processMessage(x))), (_) => tsplus_module_10.join(_)))
+                    .take, (x) => tsplus_module_3.flatMap(tsplus_module_3.fork(tsplus_module_3.uninterruptible(processMessage(x))), (_) => tsplus_module_8.join(_)))
                     // TODO: normally a failed item would be returned to the queue and retried up to X times.
                     // .flatMap(_ => _._tag === "Failure" && !isInterrupted ? qDrain.offer(x) : Effect.unit) // TODO: retry count tracking and max retries.
                     .pipe(silenceAndReportError))));
@@ -63,4 +61,4 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
         };
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL3NlcnZpY2VzL1F1ZXVlTWFrZXIvbWVtUXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQTtBQUM5RCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQ25ELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFDL0IsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ3pELE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FLMUIsU0FBaUIsRUFDakIsY0FBc0IsRUFDdEIsTUFBbUQsRUFDbkQsV0FBNEQ7SUFFNUQsT0FBTyxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQzNCLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUM5QixNQUFNLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUE7UUFDbkQsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFBO1FBQzdELE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFBO1FBRTdDLE1BQU0sVUFBVSxHQUFHLGdCQUFBLE1BQU0sQ0FBQyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUE7UUFDNUQsTUFBTSxNQUFNLEdBQUcsZ0JBQUEsTUFBTSxDQUFDLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQTtRQUM3RCxNQUFNLFVBQVUsbUNBQUcsTUFBTSxDQUFnQixDQUFBO1FBRXpDLE9BQU87WUFDTCxPQUFPLEVBQUUsQ0FBQyxHQUFHLFFBQVEsRUFBRSxFQUFFLENBQ3ZCLG9CQUFXLFFBQVEsQ0FBQyxFQUFDLENBQUM7Z0JBQ3BCLE1BQU0sY0FBYyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUE7Z0JBQ25ELE1BQU0sV0FBVyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsNkJBQW9CLENBQUE7Z0JBQ2hELE1BQU0sSUFBSSxrQ0FBRyxvQkFBQSxXQUFXLEVBQUssTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFNLENBQUE7Z0JBQ3ZELE9BQU8sS0FBSyxDQUFDLENBQUMsQ0FBQyx1Q0FDYiw0QkFBQSxRQUFRLEVBQ1MsQ0FBQyxDQUFDLEVBQUUsRUFBRTtnQkFDbkIsdUhBQXVIO2dCQUN2SCx3QkFBQSwyQkFDRSxJQUFJLENBQUMsU0FBUyxDQUNaLFVBQVUsQ0FBQyxVQUFVLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFLElBQUksRUFBRSxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQ25FLENBQ0Y7Z0JBQ0MsdUVBQXVFO2tCQUM5RCxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUNwQixDQUNWLEVBRUosQ0FBQTtZQUNILENBQUMsQ0FBQztZQUNKLFNBQVMsRUFBRSxDQUNULFdBQTJELEVBQzNELEVBQUUsQ0FDRixvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO2dCQUNwQixNQUFNLHFCQUFxQixHQUFHLDJCQUEyQixDQUFDLEVBQUUsSUFBSSxFQUFFLGlCQUFpQixHQUFHLGNBQWMsRUFBRSxDQUFDLENBQUE7Z0JBQ3ZHLE1BQU0sY0FBYyxHQUFHLENBQUMsR0FBVyxFQUFFLEVBQUU7Z0JBQ3JDLHNIQUFzSDtnQkFDdEgsOENBQUEsd0JBQUEsMkJBQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUNaLFVBQVUsQ0FBQyxHQUVYLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUMxQix5QkFBQSxvQ0FBQSx5QkFBQSx5QkFDWSxPQUFPLGNBQWMsK0JBQStCLENBQUM7cUJBQzlELElBQUksQ0FBQyw2QkFBb0IsRUFBRSxJQUFJLHVEQUFFLElBQUksRUFBVSxFQUFFLElBQUksdURBQUUsSUFBSSxFQUFVLEVBQUUsQ0FBQyxDQUFDLEVBQ2hFLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQztxQkFDM0IsSUFBSSxDQUFDLHFCQUFxQixDQUFDLEVBQ1AsY0FBYyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsY0FBYyxFQUFFO29CQUMvRCxFQUFFLEVBQUUsU0FBUyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7b0JBQ3RCLE1BQU0sRUFBRSxJQUFhO29CQUNyQixJQUFJLEVBQUUsZ0JBQUEsaUJBQWlCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztpQkFDbkMsQ0FBQyxDQUFDLEVBQ08sYUFBYSxFQUFFO29CQUN2QixVQUFVLEVBQUUsRUFBRSxZQUFZLEVBQUUsY0FBYyxFQUFFO29CQUM1QyxNQUFNLEVBQUUsSUFBSSxDQUFDLElBQUk7d0JBQ2YsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQzt3QkFDaEMsQ0FBQyxDQUFDLFNBQVM7aUJBQ2QsQ0FBQyxDQUNMLENBQUE7Z0JBQ0wsT0FBTyxLQUFLLENBQUMsQ0FBQyxDQUFDLG9EQUNiLHdCQUFBLE1BQU07cUJBQ0gsSUFBSSxFQUNJLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyw2RUFBQSxjQUFjLENBQUMsQ0FBQyxDQUFDLElBQThCLENBQUMsQ0FBQyxFQUFFLEVBQUUsdUJBQUMsQ0FBQyxDQUFLLENBQUMsQ0FBQztvQkFDOUUseUZBQXlGO29CQUN6Rix1SUFBdUk7cUJBQ3RJLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxHQUcvQixDQUFBO1lBQ0gsQ0FBQyxDQUFDO1NBQzhCLENBQUE7SUFDdEMsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL3NlcnZpY2VzL1F1ZXVlTWFrZXIvbWVtUXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0scUNBQXFDLENBQUE7QUFDOUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pFLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBQy9CLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLCtCQUErQixDQUFBO0FBQ3ZFLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUN6RCxPQUFPLEVBQWtCLFNBQVMsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUV4RDs7R0FFRztBQUNILE1BQU0sVUFBVSxZQUFZLENBSzFCLFNBQWlCLEVBQ2pCLGNBQXNCLEVBQ3RCLE1BQW1ELEVBQ25ELFdBQTREO0lBRTVELE9BQU8sb0JBQVcsUUFBUSxDQUFDLEVBQUMsQ0FBQztRQUMzQixNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDOUIsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFBO1FBQ25ELE1BQU0sTUFBTSxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQTtRQUM3RCxNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsdUJBQXVCLENBQUMsQ0FBQTtRQUU3QyxNQUFNLFVBQVUsR0FBRyxnQkFBQSxNQUFNLENBQUMsRUFBRSxJ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

package/dist/services/QueueMaker/sbqueue.js

@@ -4,10 +4,8 @@ import * as tsplus_module_3 from "@effect-app/prelude/schema";
 import * as tsplus_module_4 from "@effect-app/prelude/utils";
 import * as tsplus_module_5 from "effect/Effect";
 import * as tsplus_module_6 from "@effect-app/infra/api/setupRequest";
-import * as tsplus_module_7 from "effect/Option";
-import * as tsplus_module_8 from "@effect-app/core/Option";
-import * as tsplus_module_9 from "@effect-app/infra/services/QueueMaker/errors";
-import * as tsplus_module_10 from "effect/Layer";
+import * as tsplus_module_7 from "@effect-app/infra/services/QueueMaker/errors";
+import * as tsplus_module_8 from "effect/Layer";
 import { LiveReceiver, LiveSender, LiveServiceBusClient, Receiver, Sender, subscribe } from "@effect-app/infra-adapters/ServiceBus";
 import { captureException } from "@effect-app/infra/errorReporter";
 import { RequestContext } from "@effect-app/infra/RequestContext";
@@ -59,9 +57,9 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
             }),
             publish: (...messages) => tsplus_module_5.gen(function* ($) {
                 const requestContext = yield* $(rcc.requestContext);
-                const currentSpan = yield* $(tsplus_module_5.currentSpan);
-                const span = tsplus_module_8.getOrUndefined(tsplus_module_7.map(currentSpan, Tracer.externalSpan));
-                return yield* $(tsplus_module_9.forkDaemonReportQueue(tsplus_module_5.promise(() => s.sendMessages(messages.map((m) => ({
+                const currentSpan = yield* $(tsplus_module_5.orDie(tsplus_module_5.currentSpan));
+                const span = Tracer.externalSpan(currentSpan);
+                return yield* $(tsplus_module_7.forkDaemonReportQueue(tsplus_module_5.promise(() => s.sendMessages(messages.map((m) => ({
                     body: JSON.stringify(wireSchema.encodeSync({ body: m, meta: { requestContext, span } })),
                     messageId: m.id, /* correllationid: requestId */
                     contentType: "application/json"
@@ -74,6 +72,6 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
  * @tsplus static QueueMaker.Ops makeServiceBusLayers
  */
 export function makeServiceBusLayers(url, queueName, queueDrainName) {
-    return tsplus_module_10.provide(LiveServiceBusClient(url))((tsplus_module_10.merge(LiveSender(queueName))(LiveReceiver(queueDrainName))));
+    return tsplus_module_8.provide(LiveServiceBusClient(url))((tsplus_module_8.merge(LiveSender(queueName))(LiveReceiver(queueDrainName))));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zYnF1ZXVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQ0wsWUFBWSxFQUNaLFVBQVUsRUFDVixvQkFBb0IsRUFDcEIsUUFBUSxFQUNSLE1BQU0sRUFDTixTQUFTLEVBQ1YsTUFBTSx1Q0FBdUMsQ0FBQTtBQUU5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQTtBQUNsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQ25ELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBQy9CLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLCtCQUErQixDQUFBO0FBQ3ZFLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxnQ0FBZ0MsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUMzRixPQUFPLEVBQWtCLFNBQVMsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUV4RDs7R0FFRztBQUNILE1BQU0sVUFBVSxtQkFBbUIsQ0FLakMsVUFBa0IsRUFDbEIsY0FBc0IsRUFDdEIsTUFBbUQsRUFDbkQsV0FBNEQ7SUFFNUQsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDO1FBQ3hCLElBQUksRUFBRSxNQUFNO1FBQ1osSUFBSSxFQUFFLFNBQVM7S0FDaEIsQ0FBQyxDQUFBO0lBQ0YsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQTtJQUM3RCxNQUFNLFVBQVUsbUNBQUcsTUFBTSxDQUFnQixDQUFBO0lBRXpDLE9BQU8sb0JB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zYnF1ZXVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBQUEsT0FBTyxFQUNMLFlBQVksRUFDWixVQUFVLEVBQ1Ysb0JBQW9CLEVBQ3BCLFFBQVEsRUFDUixNQUFNLEVBQ04sU0FBUyxFQUNWLE1BQU0sdUNBQXVDLENBQUE7QUFFOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUE7QUFDbEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pFLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDM0MsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUMvQixPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQTtBQUN2RSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDM0YsT0FBTyxFQUFrQixTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFeEQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsbUJBQW1CLENBS2pDLFVBQWtCLEVBQ2xCLGNBQXNCLEVBQ3RCLE1BQW1ELEVBQ25ELFdBQTREO0lBRTVELE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQztRQUN4QixJQUFJLEVBQUUsTUFBTTtRQUNaLElBQUksRUFBRSxTQUFTO0tBQ2hCLENBQUMsQ0FBQTtJQUNGLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUE7SUFDN0QsTUFBTSxVQUFVLG1DQUFHLE1BQU0sQ0FBZ0IsQ0FBQTtJQUV6QyxPQUFPLG9CQUFX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

package/dist/services/RequestContextContainer.d.ts

@@ -2,33 +2,29 @@ import { TagClass } from "@effect-app/prelude/service";
 import { Effect } from "effect/Effect";
 import { Context } from "effect/Context";
 import { Option } from "@effect-app/core/Option";
-import { FiberRef } from "effect/FiberRef";
-import { NonEmptyString255 } from "@effect-app/prelude/schema";
 import { RequestContext } from "../RequestContext.js";
-declare const RequestContextContainer_base: (abstract new () => {}) & import("effect/Context").Tag<RequestContextContainer, RequestContextContainer>;
+declare const RequestContextContainer_base: (new (service: {
+    requestContext: Effect<never, never, RequestContext>;
+    update: (f: (rc: RequestContext) => RequestContext) => Effect<never, never, RequestContext>;
+    start: (f: RequestContext) => Effect<never, never, void>;
+}) => Readonly<{
+    requestContext: Effect<never, never, RequestContext>;
+    update: (f: (rc: RequestContext) => RequestContext) => Effect<never, never, RequestContext>;
+    start: (f: RequestContext) => Effect<never, never, void>;
+}>) & import("effect/Context").Tag<RequestContextContainer, RequestContextContainer>;
 /**
  * @tsplus type RequestContextContainer
  * @tsplus companion RequestContextContainer.Ops
  */
-export declare abstract class RequestContextContainer extends RequestContextContainer_base {
-    abstract readonly requestContext: Effect<never, never, RequestContext>;
-    abstract readonly update: (f: (rc: RequestContext) => RequestContext) => Effect<never, never, RequestContext>;
-    abstract readonly start: (f: RequestContext) => Effect<never, never, void>;
+export declare class RequestContextContainer extends RequestContextContainer_base {
     static get get(): Effect<RequestContextContainer, never, RequestContext>;
     static get getOption(): import("effect/Effect").Effect<never, never, import("effect/Option").Option<RequestContext>>;
 }
-export declare class RequestContextContainerImpl extends RequestContextContainer {
-    #private;
-    constructor();
-    get requestContext(): import("effect/Effect").Effect<never, never, RequestContext>;
-    update: (f: (a: RequestContext) => RequestContext) => import("effect/Effect").Effect<never, never, RequestContext>;
-    start: (a: RequestContext) => import("effect/Effect").Effect<never, never, void>;
-}
 /**
  * @tsplus static RequestContextContainer.Ops live
  * @tsplus location "@effect-app/infra/services/RequestContextContainer"
  */
-export declare const live: import("effect/Layer").Layer<never, never, RequestContextContainer>;
+export declare const live: import("effect/Layer").Layer<import("effect/Scope").Scope, never, RequestContextContainer>;
 /**
  * @tsplus static RequestContext.Ops Tag
  * @tsplus location "@effect-app/infra/services/RequestContextContainer"

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

@@ -1 +1 @@
-{"version":3,"file":"RequestContextContainer.d.ts","sourceRoot":"","sources":["../../_src/services/RequestContextContainer.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;;AAErD;;;GAGG;AACH,8BAAsB,uBAAwB,SAAQ,4BAAmC;IACvF,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;IACtE,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,cAAc,KAAK,cAAc,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;IAC7G,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC1E,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,uBAAuB,EAAE,KAAK,EAAE,cAAc,CAAC,CAEvE;IACD,MAAM,KAAK,SAAS,iGAQnB;CACF;AAED,qBAAa,2BAA4B,SAAQ,uBAAuB;;;IAStE,IAAa,cAAc,iEAE1B;IAEQ,MAAM,UAAW,cAAc,KAAK,cAAc,kEAC2B;IAC7E,KAAK,MAAO,cAAc,wDAAwC;CAC5E;;;;;AAKD,eAAO,MAAM,IAAI,qEAAwF,CAAA;;;;;AAGzG,eAAO,MAAM,KAAK,8DAAwB,CAAA;;;;;AAK1C,eAAO,MAAM,cAAc,QAAS,cAAc;;;;;;;CAgBhD,CAAA"}
+{"version":3,"file":"RequestContextContainer.d.ts","sourceRoot":"","sources":["../../_src/services/RequestContextContainer.ts"],"names":[],"mappings":";;;;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;;oBAOnC,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC;qBACnC,cAAc,KAAK,cAAc,KAAK,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC;eAChF,cAAc,KAAK,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC;;oBAFxC,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC;qBACnC,cAAc,KAAK,cAAc,KAAK,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC;eAChF,cAAc,KAAK,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC;;AAP1D;;;GAGG;AACH,qBAAa,uBAAwB,SAAQ,4BAIzC;IACF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,uBAAuB,EAAE,KAAK,EAAE,cAAc,CAAC,CAEvE;IACD,MAAM,KAAK,SAAS,iGAQnB;CACF;;;;;AAKD,eAAO,MAAM,IAAI,4FASkB,CAAA;;;;;AAGnC,eAAO,MAAM,KAAK,8DAAwB,CAAA;;;;;AAK1C,eAAO,MAAM,cAAc,QAAS,cAAc;;;;;;;CAgBhD,CAAA"}

package/dist/services/RequestContextContainer.js

@@ -1,23 +1,11 @@
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _RequestContextContainerImpl_ref;
 import * as tsplus_module_1 from "@effect-app/prelude/service";
 import * as tsplus_module_2 from "effect/Effect";
 import * as tsplus_module_3 from "effect/Option";
 import * as tsplus_module_4 from "@effect-app/core/Option";
 import * as tsplus_module_5 from "effect/Context";
-import * as tsplus_module_6 from "@effect-app/prelude/schema";
-import * as tsplus_module_7 from "effect/FiberRef";
-import * as tsplus_module_8 from "@effect-app/infra/services/Store/Memory";
+import * as tsplus_module_6 from "effect/FiberRef";
+import * as tsplus_module_7 from "@effect-app/infra/services/Store/Memory";
+import * as tsplus_module_8 from "@effect-app/prelude/schema";
 import * as tsplus_module_9 from "effect/Layer";
 import { RequestId } from "@effect-app/prelude/ids";
 import { RequestContext } from "../RequestContext.js";
@@ -35,23 +23,14 @@ export class RequestContextContainer extends tsplus_module_1.TagClass() {
             : tsplus_module_2.sync(() => tsplus_module_4.none));
     }
 }
-export class RequestContextContainerImpl extends RequestContextContainer {
-    constructor() {
-        super();
-        _RequestContextContainerImpl_ref.set(this, void 0);
-        this.update = (f) => tsplus_module_2.tap(tsplus_module_7.getAndUpdate(__classPrivateFieldGet(this, _RequestContextContainerImpl_ref, "f"), f), (rc) => tsplus_module_2.annotateCurrentSpan(spanAttributes_1(rc)));
-        this.start = (a) => tsplus_module_2.zipRight(tsplus_module_8.restoreFromRequestContext(a))(tsplus_module_7.set(__classPrivateFieldGet(this, _RequestContextContainerImpl_ref, "f"), a));
-        __classPrivateFieldSet(this, _RequestContextContainerImpl_ref, tsplus_module_7.unsafeMake(new RequestContext({ name: tsplus_module_6.NonEmptyString255("_root_"), rootId: RequestId("_root_"), locale: "en" })), "f");
-    }
-    get requestContext() {
-        return tsplus_module_7.get(__classPrivateFieldGet(this, _RequestContextContainerImpl_ref, "f"));
-    }
-}
-_RequestContextContainerImpl_ref = new WeakMap();
 /**
  * @tsplus static RequestContextContainer.Ops live
  */
-export const live = tsplus_module_9.effect(RequestContextContainer)(tsplus_module_2.sync(() => new RequestContextContainerImpl()));
+export const live = tsplus_module_9.effect(RequestContextContainer)(tsplus_module_2.map(tsplus_module_2.andThen(tsplus_module_2.sync(() => new RequestContext({ name: tsplus_module_8.NonEmptyString255("_root_"), rootId: RequestId("_root_"), locale: "en" })), (tsplus_module_6.make)), (ref) => ({
+    requestContext: tsplus_module_6.get(ref),
+    update: (f) => tsplus_module_2.tap(tsplus_module_6.getAndUpdate(ref, f), (rc) => tsplus_module_2.annotateCurrentSpan(spanAttributes_1(rc))),
+    start: (a) => tsplus_module_2.zipRight(tsplus_module_7.restoreFromRequestContext(a))(tsplus_module_6.set(ref, a))
+})));
 /** @tsplus static RequestContext.Ops Tag */
 export const RCTag = tsplus_module_5.Tag();
 /**
@@ -75,4 +54,4 @@ const spanAttributes_1 = (ctx) => ({
         : {}
 });
 export const spanAttributes = spanAttributes_1;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL3NlcnZpY2VzL1JlcXVlc3RDb250ZXh0Q29udGFpbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFFckQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFnQix1QkFBd0IsU0FBUSxnQkFBQSxRQUFRLEVBQTJCO0lBSXZGLE1BQU0sS0FBSyxHQUFHO1FBQ1osT0FBTyx3QkFBQSx1QkFBdUIsRUFBUyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFBO0lBQ2pFLENBQUM7SUFDRCxNQUFNLEtBQUssU0FBUztRQUNsQixPQUFPLHdCQUFBLDRCQUNRLENBQUMsQ0FBaUIsRUFBRSxFQUFFLENBQUMsMEJBQWtCLENBQUMsRUFBRSx1QkFBdUIsQ0FBQyxDQUFDLEVBQ3pFLENBQUMsY0FBYyxFQUFFLEVBQUUsQ0FDMUIsdUJBQUEsY0FBYyxDQUFTO1lBQ3JCLENBQUMsQ0FBQyxvQkFBQSxjQUFjLENBQUMsS0FBSyxDQUFDLGNBQWMsdUJBQWlCO1lBQ3RELENBQUMsQ0FBQyxnREFBbUIsQ0FDeEIsQ0FBQTtJQUNMLENBQUM7Q0FDRjtBQUVELE1BQU0sT0FBTywyQkFBNEIsU0FBUSx1QkFBdUI7SUFFdEU7UUFDRSxLQUFLLEVBQUUsQ0FBQTtRQUZULG1EQUE4QjtRQVlyQixXQUFNLEdBQUcsQ0FBQyxDQUF3QyxFQUFFLEVBQUUsQ0FDN0Qsb0JBQUEsNkJBQUEsdUJBQUEsSUFBSSx3Q0FBSyxFQUFjLENBQUMsQ0FBQyxFQUFLLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxxREFBMkIsRUFBRSxFQUFnQixDQUFDLENBQUE7UUFDN0UsVUFBSyxHQUFHLENBQUMsQ0FBaUIsRUFBRSxFQUFFLG9FQUFvQixDQUFDLEdBQXBCLG9CQUFBLHVCQUFBLElBQUksd0NBQUssRUFBSyxDQUFDLENBQUMsQ0FBbUIsQ0FBQTtRQVh6RSx1QkFBQSxJQUFJLG9DQUFRLDJCQUNWLElBQUksY0FBYyxDQUFDLEVBQUUsSUFBSSxFQUFFLGdCQUFBLGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxTQUFTLENBQUMsUUFBUSxDQUFDLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQ3JHLE1BQUEsQ0FBQTtJQUNILENBQUM7SUFFRCxJQUFhLGNBQWM7UUFDekIsMkJBQU8sdUJBQUEsSUFBSSx3Q0FBSyxFQUFJO0lBQ3RCLENBQUM7Q0FLRjs7QUFFRDs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLElBQUksR0FBRyx1QkFBNkQsdUJBQXVCLEVBQXBGLHFCQUFZLEdBQUcsRUFBRSxDQUFDLElBQUksMkJBQTJCLEVBQUUsQ0FBQyxDQUFpQyxDQUFBO0FBRXpHLDRDQUE0QztBQUM1QyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsZ0JBQUEsR0FBRyxFQUFrQixDQUFBO0FBRTFDOztHQUVHO0FBQ0ksTUFBTSxtQkFBaUIsQ0FBQyxHQUFtQixFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3RELFlBQVksRUFBRSxHQUFHLENBQUMsRUFBRTtJQUNwQixjQUFjLEVBQUUsR0FBRyxDQUFDLElBQUk7SUFDeEIsZ0JBQWdCLEVBQUUsR0FBRyxDQUFDLE1BQU07SUFDNUIsbUJBQW1CLEVBQUUsR0FBRyxDQUFDLFNBQVM7SUFDbEMsR0FBRyxHQUFHLENBQUMsV0FBVyxFQUFFLEdBQUc7UUFDckIsQ0FBQyxDQUFDO1lBQ0Esa0JBQWtCLEVBQUUsR0FBRztpQkFDcEIsV0FBVztpQkFDWCxHQUFHO1lBQ04sb0JBQW9CLEVBQUUsT0FBTyxJQUFJLEdBQUc7aUJBQy9CLFdBQVc7Z0JBQ2QsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsS0FBSztnQkFDdkIsQ0FBQyxDQUFDLFNBQVM7U0FDZDtRQUNELENBQUMsQ0FBQyxFQUFFO0NBQ1AsQ0FBQyxDQUFBO2FBaEJXLGNBQWMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL3NlcnZpY2VzL1JlcXVlc3RDb250ZXh0Q29udGFpbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFFckQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLHVCQUF3QixTQUFRLGdCQUFBLFFBQVEsRUFJakQ7SUFDRixNQUFNLEtBQUssR0FBRztRQUNaLE9BQU8sd0JBQUEsdUJBQXVCLEVBQVMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUMsQ0FBQTtJQUNqRSxDQUFDO0lBQ0QsTUFBTSxLQUFLLFNBQVM7UUFDbEIsT0FBTyx3QkFBQSw0QkFDUSxDQUFDLENBQWlCLEVBQUUsRUFBRSxDQUFDLDBCQUFrQixDQUFDLEVBQUUsdUJBQXVCLENBQUMsQ0FBQyxFQUN6RSxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQzFCLHVCQUFBLGNBQWMsQ0FBUztZQUNyQixDQUFDLENBQUMsb0JBQUEsY0FBYyxDQUFDLEtBQUssQ0FBQyxjQUFjLHVCQUFpQjtZQUN0RCxDQUFDLENBQUMsZ0RBQW1CLENBQ3hCLENBQUE7SUFDTCxDQUFDO0NBQ0Y7QUFFRDs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLElBQUksR0FBRyx1QkFTVCx1QkFBdUIsRUFUZCxvQkFBQSx3QkFBQSxxQkFDWixHQUFHLEVBQUUsQ0FBQyxJQUFJLGNBQWMsQ0FBQyxFQUFFLElBQUksRUFBRSxnQkFBQSxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsU0FBUyxDQUFDLFFBQVEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLEVBQ3hHLENBQUEsb0JBQTZCLENBQUEsQ0FBQyxFQUNsQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNiLGNBQWMsc0JBQUUsR0FBRyxDQUFJO0lBQ3ZCLE1BQU0sRUFBRSxDQUFDLENBQXdDLEVBQUUsRUFBRSxDQUNuRCxvQkFBQSw2QkFBQSxHQUFHLEVBQWMsQ0FBQyxDQUFDLEVBQUssQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLHFEQUEyQixFQUFFLEVBQWdCLENBQUM7SUFDaEYsS0FBSyxFQUFFLENBQUMsQ0FBaUIsRUFBRSxFQUFFLG9FQUFjLENBQUMsR0FBZCxvQkFBQSxHQUFHLEVBQUssQ0FBQyxDQUFDLENBQW1CO0NBQzVELENBQUMsQ0FBQyxDQUM4QixDQUFBO0FBRW5DLDRDQUE0QztBQUM1QyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsZ0JBQUEsR0FBRyxFQUFrQixDQUFBO0FBRTFDOztHQUVHO0FBQ0ksTUFBTSxtQkFBaUIsQ0FBQyxHQUFtQixFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3RELFlBQVksRUFBRSxHQUFHLENBQUMsRUFBRTtJQUNwQixjQUFjLEVBQUUsR0FBRyxDQUFDLElBQUk7SUFDeEIsZ0JBQWdCLEVBQUUsR0FBRyxDQUFDLE1BQU07SUFDNUIsbUJBQW1CLEVBQUUsR0FBRyxDQUFDLFNBQVM7SUFDbEMsR0FBRyxHQUFHLENBQUMsV0FBVyxFQUFFLEdBQUc7UUFDckIsQ0FBQyxDQUFDO1lBQ0Esa0JBQWtCLEVBQUUsR0FBRztpQkFDcEIsV0FBVztpQkFDWCxHQUFHO1lBQ04sb0JBQW9CLEVBQUUsT0FBTyxJQUFJLEdBQUc7aUJBQy9CLFdBQVc7Z0JBQ2QsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsS0FBSztnQkFDdkIsQ0FBQyxDQUFDLFNBQVM7U0FDZDtRQUNELENBQUMsQ0FBQyxFQUFFO0NBQ1AsQ0FBQyxDQUFBO2FBaEJXLGNBQWMifQ==

package/dist/services/Store/ContextMapContainer.d.ts

@@ -2,29 +2,26 @@ import { TagClass } from "@effect-app/prelude/service";
 import { Effect } from "effect/Effect";
 import { Context } from "effect/Context";
 import { Option } from "@effect-app/core/Option";
-import { FiberRef } from "effect/FiberRef";
 import { ContextMap } from "./service.js";
-declare const ContextMapContainer_base: (abstract new () => {}) & import("effect/Context").Tag<ContextMapContainer, ContextMapContainer>;
+declare const ContextMapContainer_base: (new (service: {
+    get: Effect<never, never, ContextMap>;
+    start: Effect<never, never, void>;
+}) => Readonly<{
+    get: Effect<never, never, ContextMap>;
+    start: Effect<never, never, void>;
+}>) & import("effect/Context").Tag<ContextMapContainer, ContextMapContainer>;
 /**
  * @tsplus companion ContextMapContainer.Ops
  */
-export declare abstract class ContextMapContainer extends ContextMapContainer_base {
-    abstract readonly get: Effect<never, never, ContextMap>;
-    abstract readonly start: Effect<never, never, void>;
+export declare class ContextMapContainer extends ContextMapContainer_base {
     static get get(): Effect<ContextMapContainer, never, ContextMap>;
     static get getOption(): import("effect/Effect").Effect<never, never, import("effect/Option").Option<ContextMap>>;
 }
-export declare class ContextMapContainerImpl extends ContextMapContainer {
-    #private;
-    constructor();
-    get get(): import("effect/Effect").Effect<never, never, ContextMap>;
-    start: import("effect/Effect").Effect<never, never, void>;
-}
 /**
  * @tsplus static ContextMapContainer.Ops live
  * @tsplus location "@effect-app/infra/services/Store/ContextMapContainer"
  */
-export declare const live: import("effect/Layer").Layer<never, never, ContextMapContainer>;
+export declare const live: import("effect/Layer").Layer<import("effect/Scope").Scope, never, ContextMapContainer>;
 /**
  * @tsplus static ContextMap.Ops Tag
  * @tsplus location "@effect-app/infra/services/Store/ContextMapContainer"

package/dist/services/Store/ContextMapContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContextMapContainer.d.ts","sourceRoot":"","sources":["../../../_src/services/Store/ContextMapContainer.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAAE,UAAU,EAAkB,MAAM,cAAc,CAAA;;AAQzD;;GAEG;AACH,8BAAsB,mBAAoB,SAAQ,wBAA+B;IAC/E,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAA;IACvD,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACnD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,mBAAmB,EAAE,KAAK,EAAE,UAAU,CAAC,CAE/D;IACD,MAAM,KAAK,SAAS,6FAQnB;CACF;AAED,qBAAa,uBAAwB,SAAQ,mBAAmB;;;IAO9D,IAAa,GAAG,6DAEf;IAEQ,KAAK,qDAAmD;CAClE;;;;;AAKD,eAAO,MAAM,IAAI,iEAAgF,CAAA;;;;;AAGjG,eAAO,MAAM,KAAK,sDAAoB,CAAA"}
+{"version":3,"file":"ContextMapContainer.d.ts","sourceRoot":"","sources":["../../../_src/services/Store/ContextMapContainer.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,UAAU,EAAkB,MAAM,cAAc,CAAA;;SAYlD,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC;WAC9B,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC;;SAD5B,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC;WAC9B,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC;;AALnC;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,wBAGrC;IACF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,mBAAmB,EAAE,KAAK,EAAE,UAAU,CAAC,CAE/D;IACD,MAAM,KAAK,SAAS,6FAQnB;CACF;;;;;AAKD,eAAO,MAAM,IAAI,wFAIc,CAAA;;;;;AAG/B,eAAO,MAAM,KAAK,sDAAoB,CAAA"}

package/dist/services/Store/ContextMapContainer.js

@@ -1,15 +1,3 @@
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _ContextMapContainerImpl_ref;
 import * as tsplus_module_1 from "@effect-app/prelude/service";
 import * as tsplus_module_2 from "effect/Effect";
 import * as tsplus_module_3 from "effect/Option";
@@ -37,22 +25,10 @@ export class ContextMapContainer extends tsplus_module_1.TagClass() {
             : tsplus_module_2.sync(() => tsplus_module_4.none));
     }
 }
-export class ContextMapContainerImpl extends ContextMapContainer {
-    constructor() {
-        super();
-        _ContextMapContainerImpl_ref.set(this, void 0);
-        this.start = tsplus_module_2.flatMap(tsplus_module_7.makeMap, (_) => tsplus_module_6.set(__classPrivateFieldGet(this, _ContextMapContainerImpl_ref, "f"), _));
-        __classPrivateFieldSet(this, _ContextMapContainerImpl_ref, tsplus_module_6.unsafeMake(makeContextMap()), "f");
-    }
-    get get() {
-        return tsplus_module_6.get(__classPrivateFieldGet(this, _ContextMapContainerImpl_ref, "f"));
-    }
-}
-_ContextMapContainerImpl_ref = new WeakMap();
 /**
  * @tsplus static ContextMapContainer.Ops live
  */
-export const live = tsplus_module_8.effect(ContextMapContainer)(tsplus_module_2.sync(() => new ContextMapContainerImpl()));
+export const live = tsplus_module_8.effect(ContextMapContainer)(tsplus_module_2.map(tsplus_module_2.andThen(tsplus_module_2.sync(() => makeContextMap()), (tsplus_module_6.make)), (ref) => new ContextMapContainer({ get: tsplus_module_6.get(ref), start: tsplus_module_2.flatMap(tsplus_module_7.makeMap, (_) => tsplus_module_6.set(ref, _)) })));
 /** @tsplus static ContextMap.Ops Tag */
 export const RCTag = tsplus_module_5.Tag();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udGV4dE1hcENvbnRhaW5lci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvU3RvcmUvQ29udGV4dE1hcENvbnRhaW5lci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBYyxjQUFjLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFekQsNkRBQTZEO0FBQzdELDBDQUEwQztBQUMxQyx5RUFBeUU7QUFDekUsNEdBQTRHO0FBQzVHLHlGQUF5RjtBQUV6Rjs7R0FFRztBQUNILE1BQU0sT0FBZ0IsbUJBQW9CLFNBQVEsZ0JBQUEsUUFBUSxFQUF1QjtJQUcvRSxNQUFNLEtBQUssR0FBRztRQUNaLE9BQU8sd0JBQUEsbUJBQW1CLEVBQVMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUNsRCxDQUFDO0lBQ0QsTUFBTSxLQUFLLFNBQVM7UUFDbEIsT0FBTyx3QkFBQSw0QkFDUSxDQUFDLENBQWlCLEVBQUUsRUFBRSxDQUFDLDBCQUFrQixDQUFDLEVBQUUsbUJBQW1CLENBQUMsQ0FBQyxFQUNyRSxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQ2YsdUJBQUEsR0FBRyxDQUFTO1lBQ1YsQ0FBQyxDQUFDLG9CQUFBLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyx1QkFBaUI7WUFDaEMsQ0FBQyxDQUFDLGdEQUFtQixDQUN4QixDQUFBO0lBQ0wsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLHVCQUF3QixTQUFRLG1CQUFtQjtJQUU5RDtRQUNFLEtBQUssRUFBRSxDQUFBO1FBRlQsK0NBQTBCO1FBVWpCLFVBQUssR0FBRyxpREFBd0IsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLG9CQUFBLHVCQUFBLElBQUksb0NBQUssRUFBSyxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBUC9ELHVCQUFBLElBQUksZ0NBQVEsMkJBQWdDLGNBQWMsRUFBRSxDQUFDLE1BQUEsQ0FBQTtJQUMvRCxDQUFDO0lBRUQsSUFBYSxHQUFHO1FBQ2QsMkJBQU8sdUJBQUEsSUFBSSxvQ0FBSyxFQUFJO0lBQ3RCLENBQUM7Q0FHRjs7QUFFRDs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLElBQUksR0FBRyx1QkFBeUQsbUJBQW1CLEVBQTVFLHFCQUFZLEdBQUcsRUFBRSxDQUFDLElBQUksdUJBQXVCLEVBQUUsQ0FBQyxDQUE2QixDQUFBO0FBRWpHLHdDQUF3QztBQUN4QyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsZ0JBQUEsR0FBRyxFQUFjLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udGV4dE1hcENvbnRhaW5lci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvU3RvcmUvQ29udGV4dE1hcENvbnRhaW5lci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7OztBQUFBLE9BQU8sRUFBYyxjQUFjLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFekQsNkRBQTZEO0FBQzdELDBDQUEwQztBQUMxQyx5RUFBeUU7QUFDekUsNEdBQTRHO0FBQzVHLHlGQUF5RjtBQUV6Rjs7R0FFRztBQUNILE1BQU0sT0FBTyxtQkFBb0IsU0FBUSxnQkFBQSxRQUFRLEVBRzdDO0lBQ0YsTUFBTSxLQUFLLEdBQUc7UUFDWixPQUFPLHdCQUFBLG1CQUFtQixFQUFTLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDbEQsQ0FBQztJQUNELE1BQU0sS0FBSyxTQUFTO1FBQ2xCLE9BQU8sd0JBQUEsNEJBQ1EsQ0FBQyxDQUFpQixFQUFFLEVBQUUsQ0FBQywwQkFBa0IsQ0FBQyxFQUFFLG1CQUFtQixDQUFDLENBQUMsRUFDckUsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUNmLHVCQUFBLEdBQUcsQ0FBUztZQUNWLENBQUMsQ0FBQyxvQkFBQSxHQUFHLENBQUMsS0FBSyxDQUFDLEdBQUcsdUJBQWlCO1lBQ2hDLENBQUMsQ0FBQyxnREFBbUIsQ0FDeEIsQ0FBQTtJQUNMLENBQUM7Q0FDRjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sSUFBSSxHQUFHLHVCQUlULG1CQUFtQixFQUpWLG9CQUFBLHdCQUFBLHFCQUNaLEdBQUcsRUFBRSxDQUFDLGNBQWMsRUFBRSxDQUFDLEVBQ3BCLENBQUEsb0JBQXlCLENBQUEsQ0FBQyxFQUM5QixDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsSUFBSSxtQkFBbUIsQ0FBQyxFQUFFLEdBQUcsc0JBQUUsR0FBRyxDQUFJLEVBQUUsS0FBSyxFQUFFLGlEQUF3QixDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsb0JBQUEsR0FBRyxFQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQzlFLENBQUE7QUFFL0Isd0NBQXdDO0FBQ3hDLE1BQU0sQ0FBQyxNQUFNLEtBQUssR0FBRyxnQkFBQSxHQUFHLEVBQWMsQ0FBQSJ9

package/dist/services/Store/service.d.ts

@@ -95,13 +95,16 @@ export interface Store<PM extends PersistenceModelType<Id>, Id extends string> {
      */
     remove: (e: PM) => Effect<never, never, void>;
 }
-declare const StoreMaker_base: (abstract new () => {}) & import("effect/Context").Tag<StoreMaker, StoreMaker>;
+declare const StoreMaker_base: (new (service: {
+    make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<R, E, Iterable<PM>>, config?: StoreConfig<PM>) => Effect<R, E, Store<PM, Id>>;
+}) => Readonly<{
+    make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<R, E, Iterable<PM>>, config?: StoreConfig<PM>) => Effect<R, E, Store<PM, Id>>;
+}>) & import("effect/Context").Tag<StoreMaker, StoreMaker>;
 /**
  * @tsplus type StoreMaker
  * @tsplus companion StoreMaker.Ops
  */
-export declare abstract class StoreMaker extends StoreMaker_base {
-    abstract make: <PM extends PersistenceModelType<Id>, Id extends string, R = never, E = never>(name: string, seed?: Effect<R, E, Iterable<PM>>, config?: StoreConfig<PM>) => Effect<R, E, Store<PM, Id>>;
+export declare class StoreMaker extends StoreMaker_base {
 }
 export declare const makeContextMap: () => ContextMap;
 /**
@@ -109,15 +112,20 @@ export declare const makeContextMap: () => ContextMap;
  * @tsplus location "@effect-app/infra/services/Store/service"
  */
 export declare const makeMap: import("effect/Effect").Effect<never, never, ContextMap>;
-declare const ContextMap_base: (abstract new () => {}) & import("effect/Context").Tag<ContextMap, ContextMap>;
+declare const ContextMap_base: (new (service: {
+    get: (id: string) => string | undefined;
+    set: (id: string, eTag: string | undefined) => void;
+    parserEnv: ParserEnv;
+}) => Readonly<{
+    get: (id: string) => string | undefined;
+    set: (id: string, eTag: string | undefined) => void;
+    parserEnv: ParserEnv;
+}>) & import("effect/Context").Tag<ContextMap, ContextMap>;
 /**
  * @tsplus type ContextMap
  * @tsplus companion ContextMap.Ops
  */
-export declare abstract class ContextMap extends ContextMap_base {
-    abstract get: (id: string) => string | undefined;
-    abstract set: (id: string, eTag: string | undefined) => void;
-    abstract parserEnv: ParserEnv;
+export declare class ContextMap extends ContextMap_base {
 }
 export interface PersistenceModelType<Id extends string> {
     id: Id;