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

package/dist/api/express/makeOpenApiSpecs.js

@@ -1,14 +1,12 @@
 import * as tsplus_module_1 from "effect/Ref";
-import * as tsplus_module_2 from "effect/impl/Effect";
-import * as tsplus_module_3 from "effect/impl/Ref";
-import * as tsplus_module_4 from "effect/Effect";
+import * as tsplus_module_2 from "effect/Effect";
 import { References } from "@effect-app/infra-adapters/Openapi/atlas-plutus/Schema/index";
 import { makeJsonSchema } from "./makeJsonSchema.js";
 export function makeOpenApiSpecs(rdescs, info) {
-    return tsplus_module_4.Effect.gen(function* ($) {
-        const ref = yield* $(tsplus_module_1.Ref.make(new Map()));
+    return tsplus_module_2.gen(function* ($) {
+        const ref = yield* $(tsplus_module_1.make(new Map()));
         const paths = yield* $(tsplus_module_2.provideService(makeJsonSchema(rdescs), References, { ref }));
-        const refs = yield* $(tsplus_module_3.get(ref));
+        const refs = yield* $(tsplus_module_1.get(ref));
         const parameterRefs = {}; // todos
         const schemas = {};
         const securitySchemes = {
@@ -51,4 +49,4 @@ export function makeOpenApiSpecs(rdescs, info) {
         };
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZU9wZW5BcGlTcGVjcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvYXBpL2V4cHJlc3MvbWFrZU9wZW5BcGlTcGVjcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBR0EsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDhEQUE4RCxDQUFBO0FBQ3pGLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQTtBQUdwRCxNQUFNLFVBQVUsZ0JBQWdCLENBQzlCLE1BQW9DLEVBQ3BDLElBQWlCO0lBRWpCLE9BQU8sZ0JBQUEsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQzNCLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxnQkFBQSxHQUFHLENBQUMsSUFBSSxDQUFzQyxJQUFJLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUM5RSxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsK0JBQUEsY0FBYyxDQUFDLE1BQU0sQ0FBQyxFQUFnQixVQUFVLEVBQUUsRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDbEYsTUFBTSxJQUFJLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxxQkFBQyxHQUFHLEVBQUssQ0FBQTtRQUM5QixNQUFNLGFBQWEsR0FBd0IsRUFBRSxDQUFBLENBQUMsUUFBUTtRQUN0RCxNQUFNLE9BQU8sR0FBd0IsRUFBRSxDQUFBO1FBQ3ZDLE1BQU0sZUFBZSxHQUFHO1lBQ3RCLFVBQVUsRUFBRTtnQkFDVixJQUFJLEVBQUUsTUFBTTtnQkFDWixNQUFNLEVBQUUsUUFBUTtnQkFDaEIsWUFBWSxFQUFFLEtBQUs7YUFDcEI7U0FDRixDQUFBLENBQUMsbURBQW1EO1FBQ3JELE1BQU0sVUFBVSxHQUFHLEVBQUUsZUFBZSxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsYUFBYSxFQUFFLENBQUE7UUFFMUUsS0FBSyxNQUFNLEtBQUssSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQztZQUNuQyxnREFBZ0Q7WUFDaEQsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUM5QixDQUFDO1FBRUQsT0FBTztZQUNMLE9BQU8sRUFBRSxPQUFPO1lBQ2hCLElBQUksRUFBRTtnQkFDSixLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUs7Z0JBQ2pCLFdBQVcsRUFBRSxJQUFJLENBQUMsV0FBVztnQkFDN0IsY0FBYyxFQUFFLElBQUksQ0FBQyxHQUFHO2dCQUN4QixPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU87b0JBQ25CLENBQUMsQ0FBQzt3QkFDQSxJQUFJLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJO3dCQUN2QixLQUFLLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLO3dCQUN6QixHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHO3FCQUN0QjtvQkFDRCxDQUFDLENBQUMsU0FBUztnQkFDYixPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU87b0JBQ25CLENBQUMsQ0FBQzt3QkFDQSxJQUFJLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJO3dCQUN2QixHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHO3FCQUN0QjtvQkFDRCxDQUFDLENBQUMsU0FBUztnQkFDYixPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU87YUFDdEI7WUFDRCxJQUFJLEVBQUUsRUFBRTtZQUNSLEtBQUs7WUFDTCxVQUFVO1lBQ1YsUUFBUTtTQUNULENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFrZU9wZW5BcGlTcGVjcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvYXBpL2V4cHJlc3MvbWFrZU9wZW5BcGlTcGVjcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUdBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSw4REFBOEQsQ0FBQTtBQUN6RixPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFHcEQsTUFBTSxVQUFVLGdCQUFnQixDQUM5QixNQUFvQyxFQUNwQyxJQUFpQjtJQUVqQixPQUFPLG9CQUFXLFFBQVEsQ0FBQyxFQUFDLENBQUM7UUFDM0IsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLHFCQUE4QyxJQUFJLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUM5RSxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsK0JBQUEsY0FBYyxDQUFDLE1BQU0sQ0FBQyxFQUFnQixVQUFVLEVBQUUsRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDbEYsTUFBTSxJQUFJLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxxQkFBQyxHQUFHLEVBQUssQ0FBQTtRQUM5QixNQUFNLGFBQWEsR0FBd0IsRUFBRSxDQUFBLENBQUMsUUFBUTtRQUN0RCxNQUFNLE9BQU8sR0FBd0IsRUFBRSxDQUFBO1FBQ3ZDLE1BQU0sZUFBZSxHQUFHO1lBQ3RCLFVBQVUsRUFBRTtnQkFDVixJQUFJLEVBQUUsTUFBTTtnQkFDWixNQUFNLEVBQUUsUUFBUTtnQkFDaEIsWUFBWSxFQUFFLEtBQUs7YUFDcEI7U0FDRixDQUFBLENBQUMsbURBQW1EO1FBQ3JELE1BQU0sVUFBVSxHQUFHLEVBQUUsZUFBZSxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsYUFBYSxFQUFFLENBQUE7UUFFMUUsS0FBSyxNQUFNLEtBQUssSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQztZQUNuQyxnREFBZ0Q7WUFDaEQsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUM5QixDQUFDO1FBRUQsT0FBTztZQUNMLE9BQU8sRUFBRSxPQUFPO1lBQ2hCLElBQUksRUFBRTtnQkFDSixLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUs7Z0JBQ2pCLFdBQVcsRUFBRSxJQUFJLENBQUMsV0FBVztnQkFDN0IsY0FBYyxFQUFFLElBQUksQ0FBQyxHQUFHO2dCQUN4QixPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU87b0JBQ25CLENBQUMsQ0FBQzt3QkFDQSxJQUFJLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJO3dCQUN2QixLQUFLLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLO3dCQUN6QixHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHO3FCQUN0QjtvQkFDRCxDQUFDLENBQUMsU0FBUztnQkFDYixPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU87b0JBQ25CLENBQUMsQ0FBQzt3QkFDQSxJQUFJLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJO3dCQUN2QixHQUFHLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHO3FCQUN0QjtvQkFDRCxDQUFDLENBQUMsU0FBUztnQkFDYixPQUFPLEVBQUUsSUFBSSxDQUFDLE9BQU87YUFDdEI7WUFDRCxJQUFJLEVBQUUsRUFBRTtZQUNSLEtBQUs7WUFDTCxVQUFVO1lBQ1YsUUFBUTtTQUNULENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUMifQ==

package/dist/api/express/schema/routing.d.ts

@@ -1,20 +1,35 @@
-import { Option } from "effect/Option";
+import { Option } from "@effect-app/core/Option";
+import * as MO from "@effect-app/schema";
 import type { Methods } from "@effect-app/schema";
 import type { JSONSchema, ParameterLocation, SubSchema } from "@effect-app/infra-adapters/Openapi/atlas-plutus";
-import type { RequestHandler, RequestHandlerOptRes } from "./requestHandler.js";
+export type Request<PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA> = MO.ReqResSchemed<unknown, ReqA> & {
+    method: Methods;
+    path: string;
+    Cookie?: MO.ReqRes<Record<string, string>, CookieA>;
+    Path?: MO.ReqRes<Record<string, string>, PathA>;
+    Body?: MO.ReqRes<unknown, BodyA>;
+    Query?: MO.ReqRes<Record<string, string>, QueryA>;
+    Headers?: MO.ReqRes<Record<string, string>, HeaderA>;
+};
+export interface RouteRequestHandler<PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA> {
+    Request: Request<PathA, CookieA, QueryA, BodyA, HeaderA, ReqA>;
+    Response?: MO.ReqRes<unknown, ResA> | MO.ReqResSchemed<unknown, ResA>;
+    ResponseOpenApi?: any;
+}
 export declare function asRouteDescriptionAny<R extends RouteDescriptorAny>(i: R): RouteDescriptorAny;
 export declare function arrAsRouteDescriptionAny<R extends RouteDescriptorAny>(arr: ReadonlyArray<R>): RouteDescriptorAny[];
-export interface RouteDescriptor<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA, Errors, METHOD extends Methods = Methods> {
+export interface RouteDescriptor<PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA, METHOD extends Methods = Methods> {
+    _tag: "Schema";
     path: string;
     method: METHOD;
-    handler: RequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, Errors>;
+    handler: RouteRequestHandler<PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA>;
     info?: {
         tags: ReadonlyArray<string>;
     };
 }
-export type RouteDescriptorAny = RouteDescriptor<any, any, any, any, any, any, any, any, any>;
-export declare function makeRouteDescriptor<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA = void, Errors = any, METHOD extends Methods = Methods>(path: string, method: METHOD, handler: RequestHandlerOptRes<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, Errors>): RouteDescriptor<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, Errors, METHOD>;
-export declare function makeFromSchema<ResA>(e: RouteDescriptor<any, any, any, any, any, any, ResA, any, any>): import("effect").Effect<never, never, {
+export type RouteDescriptorAny = RouteDescriptor<any, any, any, any, any, any, any>;
+export declare function makeRouteDescriptor<PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA = void, METHOD extends Methods = Methods>(path: string, method: METHOD, handler: RouteRequestHandler<PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA>): RouteDescriptor<PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, METHOD>;
+export declare function makeFromSchema<ResA>(e: RouteDescriptor<any, any, any, any, any, ResA, any>): import("effect/Effect").Effect<never, never, {
     path: string;
     method: string;
     tags: readonly string[] | undefined;

package/dist/api/express/schema/routing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../../../_src/api/express/schema/routing.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAEjD,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,iDAAiD,CAAA;AAG/G,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAE/E,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,kBAAkB,EAAE,CAAC,EAAE,CAAC,sBAEvE;AAED,wBAAgB,wBAAwB,CAAC,CAAC,SAAS,kBAAkB,EACnE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,wBAGtB;AAED,MAAM,WAAW,eAAe,CAC9B,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,EACJ,MAAM,EACN,MAAM,SAAS,OAAO,GAAG,OAAO;IAEhC,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACtF,IAAI,CAAC,EAAE;QACL,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;KAC5B,CAAA;CACF;AAED,MAAM,MAAM,kBAAkB,GAAG,eAAe,CAC9C,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,CACJ,CAAA;AAED,wBAAgB,mBAAmB,CACjC,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,GAAG,IAAI,EACX,MAAM,GAAG,GAAG,EACZ,MAAM,SAAS,OAAO,GAAG,OAAO,EAEhC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,oBAAoB,CAC3B,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,MAAM,CACP,0FAcF;AAED,wBAAgB,cAAc,CAAC,IAAI,EACjC,CAAC,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;GA4GjE;AAED,cAAM,QAAQ;aAEM,UAAU,EAAE,MAAM;aAClB,IAAI,EAAE,GAAG;gBADT,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,GAAG;CAE5B"}
+{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../../../_src/api/express/schema/routing.ts"],"names":[],"mappings":"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"}

package/dist/api/express/schema/routing.js

@@ -1,8 +1,7 @@
-import * as tsplus_module_1 from "effect/Option";
+import * as tsplus_module_1 from "@effect-app/core/Option";
 import * as tsplus_module_2 from "effect/Effect";
-import * as tsplus_module_3 from "effect/impl/Effect";
-import * as tsplus_module_4 from "effect/impl/Option";
-import * as tsplus_module_5 from "@effect-app/core/OptionX";
+import * as tsplus_module_3 from "effect/Option";
+/* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import * as MO from "@effect-app/schema";
 import { isObjectSchema } from "@effect-app/infra-adapters/Openapi/atlas-plutus";
@@ -14,7 +13,7 @@ export function arrAsRouteDescriptionAny(arr) {
     return arr.map(asRouteDescriptionAny);
 }
 export function makeRouteDescriptor(path, method, handler) {
-    return { path, method, handler, _tag: "Schema" };
+    return { path, handler, method, _tag: "Schema" };
 }
 export function makeFromSchema(e) {
     const jsonSchema_ = OpenApi.for;
@@ -24,31 +23,31 @@ export function makeFromSchema(e) {
     const Res = r ? MO.extractSchema(r) : MO.Void;
     // TODO EffectOption.fromNullable(Req.Headers).flatMapOpt(jsonSchema)
     // TODO: use the path vs body etc serialisation also in the Client.
-    const makeReqQuerySchema = tsplus_module_3.flatMap(tsplus_module_2.Effect.sync(() => tsplus_module_1.Option.fromNullable(Req.Query)), (_) => tsplus_module_4.match(_, {
-        onNone: () => tsplus_module_2.Effect.sync(() => tsplus_module_1.Option.none()),
-        onSome: (_) => tsplus_module_3.map(jsonSchema(_), tsplus_module_1.Option.some)
+    const makeReqQuerySchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Query)), (_) => tsplus_module_3.match(_, {
+        onNone: () => tsplus_module_2.sync(() => tsplus_module_1.none),
+        onSome: (_) => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some)
     }));
-    const makeReqHeadersSchema = tsplus_module_3.flatMap(tsplus_module_2.Effect.sync(() => tsplus_module_1.Option.fromNullable(Req.Headers)), (_) => tsplus_module_4.match(_, {
-        onNone: () => tsplus_module_2.Effect.sync(() => tsplus_module_1.Option.none()),
-        onSome: (_) => tsplus_module_3.map(jsonSchema(_), tsplus_module_1.Option.some)
+    const makeReqHeadersSchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Headers)), (_) => tsplus_module_3.match(_, {
+        onNone: () => tsplus_module_2.sync(() => tsplus_module_1.none),
+        onSome: (_) => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some)
     }));
-    const makeReqCookieSchema = tsplus_module_3.flatMap(tsplus_module_2.Effect.sync(() => tsplus_module_1.Option.fromNullable(Req.Cookie)), (_) => tsplus_module_4.match(_, {
-        onNone: () => tsplus_module_2.Effect.sync(() => tsplus_module_1.Option.none()),
-        onSome: (_) => tsplus_module_3.map(jsonSchema(_), tsplus_module_1.Option.some)
+    const makeReqCookieSchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Cookie)), (_) => tsplus_module_3.match(_, {
+        onNone: () => tsplus_module_2.sync(() => tsplus_module_1.none),
+        onSome: (_) => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some)
     }));
-    const makeReqPathSchema = tsplus_module_3.flatMap(tsplus_module_2.Effect.sync(() => tsplus_module_1.Option.fromNullable(Req.Path)), (_) => tsplus_module_4.match(_, {
-        onNone: () => tsplus_module_2.Effect.sync(() => tsplus_module_1.Option.none()),
-        onSome: (_) => tsplus_module_3.map(jsonSchema(_), tsplus_module_1.Option.some)
+    const makeReqPathSchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Path)), (_) => tsplus_module_3.match(_, {
+        onNone: () => tsplus_module_2.sync(() => tsplus_module_1.none),
+        onSome: (_) => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some)
     }));
-    const makeReqBodySchema = tsplus_module_3.flatMap(tsplus_module_2.Effect.sync(() => tsplus_module_1.Option.fromNullable(Req.Body)), (_) => tsplus_module_4.match(_, {
-        onNone: () => tsplus_module_2.Effect.sync(() => tsplus_module_1.Option.none()),
-        onSome: (_) => tsplus_module_3.map(jsonSchema(_), tsplus_module_1.Option.some)
+    const makeReqBodySchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Body)), (_) => tsplus_module_3.match(_, {
+        onNone: () => tsplus_module_2.sync(() => tsplus_module_1.none),
+        onSome: (_) => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some)
     }));
     // const makeReqSchema = schema(Req)
     const makeResSchema = jsonSchema_(Res);
     function makeParameters(inn) {
         return (a) => {
-            return tsplus_module_4.getOrElse(tsplus_module_4.map(tsplus_module_4.flatMap(a, (o) => (isObjectSchema(o) ? tsplus_module_1.Option.some(o) : tsplus_module_1.Option.none())), (x) => {
+            return tsplus_module_3.getOrElse(tsplus_module_3.map(tsplus_module_3.flatMap(a, (o) => (isObjectSchema(o) ? tsplus_module_3.some(o) : tsplus_module_1.none)), (x) => {
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 return Object.keys(x.properties).map((p) => {
                     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -59,7 +58,7 @@ export function makeFromSchema(e) {
             }), () => []);
         };
     }
-    return tsplus_module_3.map(tsplus_module_2.Effect.all({
+    return tsplus_module_2.map(tsplus_module_2.all({
         req: jsonSchema(Req.Model),
         reqQuery: makeReqQuerySchema,
         reqHeaders: makeReqHeadersSchema,
@@ -83,7 +82,7 @@ export function makeFromSchema(e) {
                 ...makeParameters("header")(_.reqHeaders),
                 ...makeParameters("cookie")(_.reqCookie)
             ],
-            requestBody: tsplus_module_5.getOrUndefined(tsplus_module_4.map(_
+            requestBody: tsplus_module_1.getOrUndefined(tsplus_module_3.map(_
                 .reqBody, (schema) => ({
                 content: { "application/json": { schema } }
             }))),
@@ -109,4 +108,4 @@ class Response {
         this.type = type;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL19zcmMvYXBpL2V4cHJlc3Mvc2NoZW1hL3JvdXRpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSx1REFBdUQ7QUFDdkQsT0FBTyxLQUFLLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUl4QyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0saURBQWlELENBQUE7QUFDaEYsT0FBTyxLQUFLLE9BQU8sTUFBTSwwQ0FBMEMsQ0FBQTtBQUduRSxNQUFNLFVBQVUscUJBQXFCLENBQStCLENBQUk7SUFDdEUsT0FBTyxDQUF1QixDQUFBO0FBQ2hDLENBQUM7QUFFRCxNQUFNLFVBQVUsd0JBQXdCLENBQ3RDLEdBQXFCO0lBRXJCLE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFBO0FBQ3ZDLENBQUM7QUFrQ0QsTUFBTSxVQUFVLG1CQUFtQixDQVlqQyxJQUFZLEVBQ1osTUFBYyxFQUNkLE9BVUM7SUFFRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFXN0MsQ0FBQTtBQUNILENBQUM7QUFFRCxNQUFNLFVBQVUsY0FBYyxDQUM1QixDQUFnRTtJQUVoRSxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFBO0lBQy9CLE1BQU0sVUFBVSxHQUFHLENBQU8sQ0FBa0IsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQy9ELE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsZUFBZSxFQUFFLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQTtJQUNuRSxNQUFNLENBQUMsR0FBRyxlQUFlLElBQUksSUFBSSxDQUFBO0lBQ2pDLE1BQU0sR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL19zcmMvYXBpL2V4cHJlc3Mvc2NoZW1hL3JvdXRpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsaURBQWlEO0FBQ2pELHVEQUF1RDtBQUN2RCxPQUFPLEtBQUssRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBSXhDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxpREFBaUQsQ0FBQTtBQUNoRixPQUFPLEtBQUssT0FBTyxNQUFNLDBDQUEwQyxDQUFBO0FBaUNuRSxNQUFNLFVBQVUscUJBQXFCLENBQStCLENBQUk7SUFDdEUsT0FBTyxDQUF1QixDQUFBO0FBQ2hDLENBQUM7QUFFRCxNQUFNLFVBQVUsd0JBQXdCLENBQ3RDLEdBQXFCO0lBRXJCLE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFBO0FBQ3ZDLENBQUM7QUErQkQsTUFBTSxVQUFVLG1CQUFtQixDQVVqQyxJQUFZLEVBQ1osTUFBYyxFQUNkLE9BUUM7SUFXRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxDQUFBO0FBQ2xELENBQUM7QUFFRCxNQUFNLFVBQVUsY0FBYyxDQUM1QixDQUFzRDtJQUV0RCxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFBO0lBQy9CLE1BQU0sVUFBVSxHQUFHLENBQU8sQ0FBa0IsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQy9ELE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsZUFBZSxFQUFFLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQTtJQUNuRSxNQUFNLENBQUMsR0FBRyxlQUFlLElBQUksSUFBSSxDQUFBO0lBQ2pDLE1BQU0sR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxD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

package/dist/api/reportError.d.ts

@@ -7,9 +7,9 @@ export declare class RequestException<E> extends CauseException<E> {
 export declare class FatalMainException<E> extends CauseException<E> {
     constructor(cause: Cause<E>);
 }
-export declare const reportMainError: <E>(cause: Cause<E>, extras?: Record<string, unknown> | undefined) => import("effect").Effect<never, never, void>;
-export declare const reportRequestError: <E>(cause: Cause<E>, extras?: Record<string, unknown> | undefined) => import("effect").Effect<never, never, void>;
-export declare const logRequestError: <E>(cause: Cause<E>, extras?: Record<string, unknown> | undefined) => import("effect").Effect<never, never, void>;
+export declare const reportMainError: <E>(cause: Cause<E>, extras?: Record<string, unknown> | undefined) => import("effect/Effect").Effect<never, never, void>;
+export declare const reportRequestError: <E>(cause: Cause<E>, extras?: Record<string, unknown> | undefined) => import("effect/Effect").Effect<never, never, void>;
+export declare const logRequestError: <E>(cause: Cause<E>, extras?: Record<string, unknown> | undefined) => import("effect/Effect").Effect<never, never, void>;
 /**
  * Forks the effect into a new fiber attached to the global scope. Because the
  * new fiber is attached to the global scope, when the fiber executing the
@@ -19,7 +19,7 @@ export declare const logRequestError: <E>(cause: Cause<E>, extras?: Record<strin
  * @tsplus getter effect/io/Effect forkDaemonReportRequest
  * @tsplus location "@effect-app/infra/api/reportError"
  */
-export declare function forkDaemonReportRequest<R, E, A>(self: Effect<R, E, A>): import("effect").Effect<R, never, import("effect/Fiber").RuntimeFiber<E, A>>;
+export declare function forkDaemonReportRequest<R, E, A>(self: Effect<R, E, A>): import("effect/Effect").Effect<R, never, import("effect/Fiber").RuntimeFiber<E, A>>;
 /**
  * Forks the effect into a new fiber attached to the global scope. Because the
  * new fiber is attached to the global scope, when the fiber executing the
@@ -29,5 +29,5 @@ export declare function forkDaemonReportRequest<R, E, A>(self: Effect<R, E, A>):
  * @tsplus getter effect/io/Effect forkDaemonReportRequestUnexpected
  * @tsplus location "@effect-app/infra/api/reportError"
  */
-export declare function forkDaemonReportRequestUnexpected<R, E, A>(self: Effect<R, E, A>): import("effect").Effect<R, never, import("effect/Fiber").RuntimeFiber<E, A>>;
+export declare function forkDaemonReportRequestUnexpected<R, E, A>(self: Effect<R, E, A>): import("effect/Effect").Effect<R, never, import("effect/Fiber").RuntimeFiber<E, A>>;
 //# sourceMappingURL=reportError.d.ts.map

package/dist/api/reportError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reportError.d.ts","sourceRoot":"","sources":["../../_src/api/reportError.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,qBAAa,gBAAgB,CAAC,CAAC,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;gBAC5C,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;CAG5B;AACD,qBAAa,kBAAkB,CAAC,CAAC,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;gBAC9C,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;CAG5B;AAID,eAAO,MAAM,eAAe,aAAc,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,gDAC/D,CAAA;AAIjC,eAAO,MAAM,kBAAkB,aAAc,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,gDAC/D,CAAA;AAIpC,eAAO,MAAM,eAAe,aAAc,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,gDAC/D,CAAA;;;;;;;;;;AAWjC,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,gFAKrE;;;;;;;;;;AAWD,wBAAgB,iCAAiC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,gFAS/E"}
+{"version":3,"file":"reportError.d.ts","sourceRoot":"","sources":["../../_src/api/reportError.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,qBAAa,gBAAgB,CAAC,CAAC,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;gBAC5C,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;CAG5B;AACD,qBAAa,kBAAkB,CAAC,CAAC,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;gBAC9C,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;CAG5B;AAID,eAAO,MAAM,eAAe,aAAc,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,uDAC/D,CAAA;AAIjC,eAAO,MAAM,kBAAkB,aAAc,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,uDAC/D,CAAA;AAIpC,eAAO,MAAM,eAAe,aAAc,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,uDAC/D,CAAA;;;;;;;;;;AAWjC,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,uFAKrE;;;;;;;;;;AAWD,wBAAgB,iCAAiC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,uFAS/E"}

package/dist/api/reportError.js

@@ -1,5 +1,5 @@
-import * as tsplus_module_1 from "effect/impl/Effect";
-import * as tsplus_module_2 from "effect/impl/Cause";
+import * as tsplus_module_1 from "effect/Effect";
+import * as tsplus_module_2 from "effect/Cause";
 import { logError, reportError } from "../errorReporter.js";
 import { CauseException } from "../errors.js";
 export class RequestException extends CauseException {

package/dist/api/setupRequest.d.ts

@@ -4,10 +4,10 @@ import { RequestContextContainer } from "../services/RequestContextContainer.js"
  * @tsplus fluent effect/io/Effect setupRequestFromWith
  * @tsplus location "@effect-app/infra/api/setupRequest"
  */
-export declare function setupReq3<R, E, A>(self: Effect<R, E, A>, name: string): import("effect").Effect<Exclude<Exclude<R, import("effect/Tracer").ParentSpan>, RequestContextContainer>, E, A>;
+export declare function setupReq3<R, E, A>(self: Effect<R, E, A>, name: string): import("effect/Effect").Effect<RequestContextContainer | Exclude<R, import("effect/Tracer").ParentSpan>, E, A>;
 /**
  * @tsplus getter effect/io/Effect withRequestSpan
  * @tsplus location "@effect-app/infra/api/setupRequest"
  */
-export declare const withRequestSpan: <R, E, A>(f: Effect<R, E, A>) => import("effect").Effect<RequestContextContainer | Exclude<R, import("effect/Tracer").ParentSpan>, E, A>;
+export declare const withRequestSpan: <R, E, A>(f: Effect<R, E, A>) => import("effect/Effect").Effect<RequestContextContainer | Exclude<R, import("effect/Tracer").ParentSpan>, E, A>;
 //# sourceMappingURL=setupRequest.d.ts.map

package/dist/api/setupRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,uBAAuB,EAA+B,MAAM,wCAAwC,CAAA;;;;;AAK7G,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,mHAMrE;;;;;AAeD,eAAO,MAAM,eAAe,eAAgB,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,4GAKxD,CAAA"}
+{"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAA;;;;;AAKhF,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,kHAKrE;;;;;AAeD,eAAO,MAAM,eAAe,eAAgB,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,mHAOtD,CAAA"}

package/dist/api/setupRequest.js

@@ -1,17 +1,16 @@
-import * as tsplus_module_1 from "effect/impl/Effect";
+import * as tsplus_module_1 from "effect/Effect";
 import * as tsplus_module_2 from "@effect-app/prelude/schema";
-import * as tsplus_module_3 from "effect/Effect";
 import { RequestId } from "@effect-app/prelude/ids";
 import { RequestContext } from "../RequestContext.js";
-import { RequestContextContainer, RequestContextContainerImpl } from "../services/RequestContextContainer.js";
+import { RequestContextContainer } from "../services/RequestContextContainer.js";
 /**
  * @tsplus fluent effect/io/Effect setupRequestFromWith
  */
 export function setupReq3(self, name) {
-    return tsplus_module_1.flatMap(makeInternalRequestContext(name), (rc) => tsplus_module_1.provideService(withRequestSpan_1(self), RequestContextContainer, new RequestContextContainerImpl(rc)));
+    return tsplus_module_1.zipRight(withRequestSpan_1(self))(tsplus_module_1.flatMap(makeInternalRequestContext(name), (rc) => RequestContextContainer.flatMap((_) => _.start(rc))));
 }
 function makeInternalRequestContext(name) {
-    return tsplus_module_3.Effect.sync(() => {
+    return tsplus_module_1.sync(() => {
         const id = RequestId.make();
         return new RequestContext({
             id,
@@ -22,6 +21,7 @@ function makeInternalRequestContext(name) {
     });
 }
 /** @tsplus getter effect/io/Effect withRequestSpan */
-const withRequestSpan_1 = (f) => tsplus_module_1.flatMap(RequestContextContainer.flatMap((c) => c.requestContext), (ctx) => tsplus_module_1.withLogSpan(tsplus_module_1.withSpan(f, `request[${ctx.name}]#${ctx.id}`), "request"));
+const withRequestSpan_1 = (f) => tsplus_module_1.flatMap(RequestContextContainer
+    .get, (ctx) => tsplus_module_1.withLogSpan(tsplus_module_1.withSpan(f, `request[${ctx.name}]#${ctx.id}`), "request"));
 export const withRequestSpan = withRequestSpan_1;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDckQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLDJCQUEyQixFQUFFLE1BQU0sd0NBQXdDLENBQUE7QUFFN0c7O0dBRUc7QUFDSCxNQUFNLFVBQVUsU0FBUyxDQUFVLElBQXFCLEVBQUUsSUFBWTtJQUNwRSxPQUFPLHdCQUFBLDBCQUEwQixDQUFDLElBQUksQ0FBQyxFQUFTLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FDckQsaURBQUEsSUFBSSxHQUVjLHVCQUF1QixFQUFFLElBQUksMkJBQTJCLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FDaEYsQ0FBQTtBQUNILENBQUM7QUFFRCxTQUFTLDBCQUEwQixDQUFDLElBQVk7SUFDOUMsT0FBTyxnQkFBQSxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRTtRQUN0QixNQUFNLEVBQUUsR0FBRyxTQUFTLENBQUMsSUFBSSxFQUFFLENBQUE7UUFDM0IsT0FBTyxJQUFJLGNBQWMsQ0FBQztZQUN4QixFQUFFO1lBQ0YsTUFBTSxFQUFFLEVBQUU7WUFDVixNQUFNLEVBQUUsSUFBSTtZQUNaLElBQUksRUFBRSxnQkFBQSxnQkFBZ0IsQ0FBQyxJQUFJLENBQUM7U0FDN0IsQ0FBQyxDQUFBO0lBQ0osQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDO0FBRUQsc0RBQXNEO0FBQy9DLE1BQU0sb0JBQWtCLENBQVUsQ0FBa0IsRUFBRSxFQUFFLENBQzdELHdCQUFBLHVCQUF1QixDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxFQUFTLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FDdkUsNEJBQUEseUJBQUEsQ0FBQyxFQUNXLFdBQVcsR0FBRyxDQUFDLElBQUksS0FBSyxHQUFHLENBQUMsRUFBRSxFQUFFLENBQUMsRUFDOUIsU0FBUyxDQUFDLENBQzFCLENBQUE7YUFMVSxlQUFlIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQ25ELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUNyRCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQTtBQUVoRjs7R0FFRztBQUNILE1BQU0sVUFBVSxTQUFTLENBQVUsSUFBcUIsRUFBRSxJQUFZO0lBQ3BFLGtEQUVJLElBQUksR0FGRCx3QkFBQSwwQkFBMEIsQ0FBQyxJQUFJLENBQUMsRUFDNUIsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLHVCQUF1QixDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBRW5EO0FBQ3RCLENBQUM7QUFFRCxTQUFTLDBCQUEwQixDQUFDLElBQVk7SUFDOUMsT0FBTyxxQkFBWSxHQUFHLEVBQUU7UUFDdEIsTUFBTSxFQUFFLEdBQUcsU0FBUyxDQUFDLElBQUksRUFBRSxDQUFBO1FBQzNCLE9BQU8sSUFBSSxjQUFjLENBQUM7WUFDeEIsRUFBRTtZQUNGLE1BQU0sRUFBRSxFQUFFO1lBQ1YsTUFBTSxFQUFFLElBQUk7WUFDWixJQUFJLEVBQUUsZ0JBQUEsZ0JBQWdCLENBQUMsSUFBSSxDQUFDO1NBQzdCLENBQUMsQ0FBQTtJQUNKLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQztBQUVELHNEQUFzRDtBQUMvQyxNQUFNLG9CQUFrQixDQUFVLENBQWtCLEVBQUUsRUFBRSxDQUM3RCx3QkFBQSx1QkFBdUI7S0FDcEIsR0FBRyxFQUNLLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FDZiw0QkFBQSx5QkFBQSxDQUFDLEVBQ1csV0FBVyxHQUFHLENBQUMsSUFBSSxLQUFLLEdBQUcsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxFQUM5QixTQUFTLENBQUMsQ0FDMUIsQ0FBQTthQVBRLGVBQWUifQ==

package/dist/api/writeDocs.d.ts

@@ -1,3 +1,3 @@
 import type { RouteDescriptorAny } from "./express/schema/routing.js";
-export declare function writeOpenapiDocs(rdescs: Record<string, Record<string, RouteDescriptorAny>>): import("effect").Effect<never, import("../errors.js").InvalidStateError, void>;
+export declare function writeOpenapiDocs(rdescs: Record<string, Record<string, RouteDescriptorAny>>): import("effect/Effect").Effect<never, import("../errors.js").InvalidStateError, void>;
 //# sourceMappingURL=writeDocs.d.ts.map

package/dist/api/writeDocs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"writeDocs.d.ts","sourceRoot":"","sources":["../../_src/api/writeDocs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAErE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,kFAmB1F"}
+{"version":3,"file":"writeDocs.d.ts","sourceRoot":"","sources":["../../_src/api/writeDocs.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAErE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,yFAmB1F"}

package/dist/api/writeDocs.js

@@ -1,14 +1,12 @@
 import * as tsplus_module_1 from "effect/Effect";
-import * as tsplus_module_2 from "effect/impl/Effect";
-import * as tsplus_module_3 from "effect/Order";
-import * as tsplus_module_4 from "effect/impl/Order";
-import * as tsplus_module_5 from "effect/impl/ReadonlyArray";
+import * as tsplus_module_2 from "effect/Order";
+import * as tsplus_module_3 from "effect/ReadonlyArray";
 import { typedValuesOf } from "@effect-app/core/utils";
 import { writeTextFile } from "@effect-app/infra-adapters/fileUtil";
 import * as Plutus from "@effect-app/infra-adapters/Openapi/atlas-plutus";
 import { makeOpenApiSpecs } from "./express/makeOpenApiSpecs.js";
 export function writeOpenapiDocs(rdescs) {
-    return tsplus_module_2.flatMap(tsplus_module_2.flatMap(tsplus_module_2.map(makeOpenApiSpecs(tsplus_module_5.sortBy(tsplus_module_4.mapInput(tsplus_module_3.Order.string, (a) => a.path))(typedValuesOf(rdescs)
+    return tsplus_module_1.flatMap(tsplus_module_1.flatMap(tsplus_module_1.map(makeOpenApiSpecs(tsplus_module_3.sortBy(tsplus_module_2.mapInput(tsplus_module_2.string, (a) => a.path))(typedValuesOf(rdescs)
         .reduce((prev, cur) => prev.concat(typedValuesOf(cur)), [])), Plutus.info({
         title: "api",
         version: "X",
@@ -18,6 +16,6 @@ export function writeOpenapiDocs(rdescs) {
         tags: [
         // add the tags here
         ]
-    })), (_) => tsplus_module_2.orDie(writeTextFile("./openapi.json", JSON.stringify(_, undefined, 2)))), () => tsplus_module_1.Effect.logInfo("OpenAPI spec written to './openapi.json'"));
+    })), (_) => tsplus_module_1.orDie(writeTextFile("./openapi.json", JSON.stringify(_, undefined, 2)))), () => tsplus_module_1.logInfo("OpenAPI spec written to './openapi.json'"));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3JpdGVEb2NzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvd3JpdGVEb2NzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHdCQUF3QixDQUFBO0FBQ3RELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQTtBQUNuRSxPQUFPLEtBQUssTUFBTSxNQUFNLGlEQUFpRCxDQUFBO0FBQ3pFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLCtCQUErQixDQUFBO0FBR2hFLE1BQU0sVUFBVSxnQkFBZ0IsQ0FBQyxNQUEwRDtJQUN6RixPQUFPLHdCQUFBLHdCQUFBLG9CQUFBLGdCQUFnQixDQUNyQix1QkFFVSx5QkFBQSxnQkFBQSxLQUFLLENBQUMsTUFBTSxFQUFVLENBQUMsQ0FBcUIsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUZsRSxhQUFhLENBQUMsTUFBTSxDQUFDO1NBQ2xCLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBbUMsQ0FBQyxDQUMzQixFQUNuRSxNQUFNLENBQUMsSUFBSSxDQUFDO1FBQ1YsS0FBSyxFQUFFLEtBQUs7UUFDWixPQUFPLEVBQUUsR0FBRztRQUNaLFNBQVMsRUFBRSxLQUFLO0tBQ2pCLENBQUMsQ0FDSCxFQUNNLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ1gsR0FBRyxDQUFDO1FBQ0osSUFBSSxFQUFFO1FBQ0osb0JBQW9CO1NBQ3JCO0tBQ0YsQ0FBQyxDQUFDLEVBQ00sQ0FBQyxDQUFDLEVBQUUsRUFBRSx1QkFBQyxhQUFhLENBQUMsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQU0sQ0FBQyxFQUM5RSxHQUFHLEVBQUUsQ0FBQyxnQkFBQSxNQUFNLENBQUMsT0FBTyxDQUFDLDBDQUEwQyxDQUFDLENBQUMsQ0FBQTtBQUM5RSxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid3JpdGVEb2NzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvd3JpdGVEb2NzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQTtBQUN0RCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0scUNBQXFDLENBQUE7QUFDbkUsT0FBTyxLQUFLLE1BQU0sTUFBTSxpREFBaUQsQ0FBQTtBQUN6RSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQTtBQUdoRSxNQUFNLFVBQVUsZ0JBQWdCLENBQUMsTUFBMEQ7SUFDekYsT0FBTyx3QkFBQSx3QkFBQSxvQkFBQSxnQkFBZ0IsQ0FDckIsdUJBRVUsaURBQXNCLENBQUMsQ0FBcUIsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUZsRSxhQUFhLENBQUMsTUFBTSxDQUFDO1NBQ2xCLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBbUMsQ0FBQyxDQUMzQixFQUNuRSxNQUFNLENBQUMsSUFBSSxDQUFDO1FBQ1YsS0FBSyxFQUFFLEtBQUs7UUFDWixPQUFPLEVBQUUsR0FBRztRQUNaLFNBQVMsRUFBRSxLQUFLO0tBQ2pCLENBQUMsQ0FDSCxFQUNNLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ1gsR0FBRyxDQUFDO1FBQ0osSUFBSSxFQUFFO1FBQ0osb0JBQW9CO1NBQ3JCO0tBQ0YsQ0FBQyxDQUFDLEVBQ00sQ0FBQyxDQUFDLEVBQUUsRUFBRSx1QkFBQyxhQUFhLENBQUMsZ0JBQWdCLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQU0sQ0FBQyxFQUM5RSxHQUFHLEVBQUUsQ0FBQyx3QkFBZSwwQ0FBMEMsQ0FBQyxDQUFDLENBQUE7QUFDOUUsQ0FBQyJ9

package/dist/errorReporter.d.ts

@@ -1,8 +1,8 @@
 import { Cause } from "effect/Cause";
 import type { CauseException } from "./errors.js";
-export declare function reportError<E, E2 extends CauseException<unknown>>(makeError: (cause: Cause<E>) => E2): (cause: Cause<E>, extras?: Record<string, unknown>) => import("effect").Effect<never, never, void>;
-export declare function logError<E, E2 extends CauseException<unknown>>(makeError: (cause: Cause<E>) => E2): (cause: Cause<E>, extras?: Record<string, unknown>) => import("effect").Effect<never, never, void>;
+export declare function reportError<E, E2 extends CauseException<unknown>>(makeError: (cause: Cause<E>) => E2): (cause: Cause<E>, extras?: Record<string, unknown>) => import("effect/Effect").Effect<never, never, void>;
+export declare function logError<E, E2 extends CauseException<unknown>>(makeError: (cause: Cause<E>) => E2): (cause: Cause<E>, extras?: Record<string, unknown>) => import("effect/Effect").Effect<never, never, void>;
 export declare function captureException(error: unknown): void;
 export declare function reportMessage(message: string): void;
-export declare function reportMessageM(message: string): import("effect").Effect<never, never, void>;
+export declare function reportMessageM(message: string): import("effect/Effect").Effect<never, never, void>;
 //# sourceMappingURL=errorReporter.d.ts.map

package/dist/errorReporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errorReporter.d.ts","sourceRoot":"","sources":["../_src/errorReporter.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAGjD,wBAAgB,WAAW,CAAC,CAAC,EAAE,EAAE,SAAS,cAAc,CAAC,OAAO,CAAC,EAC/D,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,WAEnB,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,iDAkB1D;AAgBD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,EAAE,SAAS,cAAc,CAAC,OAAO,CAAC,EAC5D,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,WAEnB,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,iDAiB1D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,QAG9C;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,QAI5C;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,+CAE7C"}
+{"version":3,"file":"errorReporter.d.ts","sourceRoot":"","sources":["../_src/errorReporter.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAGjD,wBAAgB,WAAW,CAAC,CAAC,EAAE,EAAE,SAAS,cAAc,CAAC,OAAO,CAAC,EAC/D,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,WAEnB,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,wDAkB1D;AAgBD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,EAAE,SAAS,cAAc,CAAC,OAAO,CAAC,EAC5D,SAAS,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,WAEnB,MAAM,CAAC,CAAC,WAAW,OAAO,MAAM,EAAE,OAAO,CAAC,wDAiB1D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,QAG9C;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,QAI5C;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,sDAE7C"}

package/dist/errorReporter.js

@@ -1,18 +1,17 @@
-import * as tsplus_module_1 from "effect/impl/Cause";
+import * as tsplus_module_1 from "effect/Cause";
 import * as tsplus_module_2 from "effect/Effect";
-import * as tsplus_module_3 from "effect/impl/Effect";
-import * as tsplus_module_4 from "@effect-app/core/OptionX";
+import * as tsplus_module_3 from "@effect-app/core/Option";
 import * as Sentry from "@sentry/node";
 import { RequestContextContainer } from "./services/RequestContextContainer.js";
 export function reportError(makeError) {
-    return (cause, extras) => tsplus_module_2.Effect.gen(function* ($) {
+    return (cause, extras) => tsplus_module_2.gen(function* ($) {
         if (tsplus_module_1.isInterrupted(cause)) {
-            yield* $(tsplus_module_3.annotateLogs(tsplus_module_2.Effect.logDebug("Interrupted"), "extras", JSON.stringify(extras ?? {})));
+            yield* $(tsplus_module_2.annotateLogs(tsplus_module_2.logDebug("Interrupted"), "extras", JSON.stringify(extras ?? {})));
             return;
         }
         const error = makeError(cause);
         yield* $(reportSentry(error, extras));
-        yield* $(tsplus_module_3.annotateLogs(tsplus_module_3.logError(cause), {
+        yield* $(tsplus_module_2.annotateLogs(tsplus_module_2.logError(cause), {
             extras,
             __cause__: error.toJSON(),
             __error__: { _tag: error._tag, message: error.message }
@@ -20,8 +19,8 @@ export function reportError(makeError) {
     });
 }
 function reportSentry(error, extras) {
-    return tsplus_module_3.map(RequestContextContainer.getOption, (ctx) => {
-        const context = tsplus_module_4.getOrUndefined(ctx);
+    return tsplus_module_2.map(RequestContextContainer.getOption, (ctx) => {
+        const context = tsplus_module_3.getOrUndefined(ctx);
         const scope = new Sentry.Scope();
         if (context)
             scope.setContext("context", context);
@@ -32,13 +31,13 @@ function reportSentry(error, extras) {
     });
 }
 export function logError(makeError) {
-    return (cause, extras) => tsplus_module_2.Effect.gen(function* ($) {
+    return (cause, extras) => tsplus_module_2.gen(function* ($) {
         if (tsplus_module_1.isInterrupted(cause)) {
-            yield* $(tsplus_module_3.annotateLogs(tsplus_module_2.Effect.logDebug("Interrupted"), "extras", JSON.stringify(extras ?? {})));
+            yield* $(tsplus_module_2.annotateLogs(tsplus_module_2.logDebug("Interrupted"), "extras", JSON.stringify(extras ?? {})));
             return;
         }
         const error = makeError(cause);
-        yield* $(tsplus_module_3.annotateLogs(tsplus_module_3.logWarning(cause), {
+        yield* $(tsplus_module_2.annotateLogs(tsplus_module_2.logWarning(cause), {
             extras,
             __cause__: error.toJSON(),
             __error__: { _tag: error._tag, message: error.message }
@@ -54,6 +53,6 @@ export function reportMessage(message) {
     console.warn(message);
 }
 export function reportMessageM(message) {
-    return tsplus_module_2.Effect.sync(() => reportMessage(message));
+    return tsplus_module_2.sync(() => reportMessage(message));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JSZXBvcnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZXJyb3JSZXBvcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsT0FBTyxLQUFLLE1BQU0sTUFBTSxjQUFjLENBQUE7QUFFdEMsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sdUNBQXVDLENBQUE7QUFFL0UsTUFBTSxVQUFVLFdBQVcsQ0FDekIsU0FBa0M7SUFFbEMsT0FBTyxDQUFDLEtBQWUsRUFBRSxNQUFnQyxFQUFFLEVBQUUsQ0FDM0QsZ0JBQUEsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQ3BCLElBQUksOEJBQUEsS0FBSyxDQUFnQixFQUFFLENBQUM7WUFDMUIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLDZCQUFBLGdCQUFBLE1BQU0sQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLEVBQWMsUUFBUSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUM3RixPQUFNO1FBQ1IsQ0FBQztRQUNELE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM5QixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFBO1FBQ3JDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FDTixzREFBQSxLQUFLLEdBRVc7WUFDWixNQUFNO1lBQ04sU0FBUyxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUU7WUFDekIsU0FBUyxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBQyxPQUFPLEVBQUU7U0FDeEQsQ0FBQyxDQUNMLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUM7QUFFRCxTQUFTLFlBQVksQ0FDbkIsS0FBUyxFQUNULE1BQTJDO0lBRTNDLE9BQU8sb0JBQUEsdUJBQXVCLENBQUMsU0FBUyxFQUFLLENBQUMsR0FBRyxFQUFFLEVBQUU7UUFDbkQsTUFBTSxPQUFPLEdBQUcsK0JBQUEsR0FBRyxDQUFPLENBQUE7UUFDMUIsTUFBTSxLQUFLLEdBQUcsSUFBSSxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDaEMsSUFBSSxPQUFPO1lBQUUsS0FBSyxDQUFDLFVBQVUsQ0FBQyxTQUFTLEVBQUUsT0FBNkMsQ0FBQyxDQUFBO1FBQ3ZGLElBQUksTUFBTTtZQUFFLEtBQUssQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFBO1FBQzlDLEtBQUssQ0FBQyxVQUFVLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFBO1FBQ3pDLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUE7SUFDdkMsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDO0FBRUQsTUFBTSxVQUFVLFFBQVEsQ0FDdEIsU0FBa0M7SUFFbEMsT0FBTyxDQUFDLEtBQWUsRUFBRSxNQUFnQyxFQUFFLEVBQUUsQ0FDM0QsZ0JBQUEsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQ3BCLElBQUksOEJBQUEsS0FBSyxDQUFnQixFQUFFLENBQUM7WUFDMUIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLDZCQUFBLGdCQUFBLE1BQU0sQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLEVBQWMsUUFBUSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUM3RixPQUFNO1FBQ1IsQ0FBQztRQUNELE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM5QixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQ04sd0RBQUEsS0FBSyxHQUVXO1lBQ1osTUFBTTtZQUNOLFNBQVMsRUFBRSxLQUFLLENBQUMsTUFBTSxFQUFFO1lBQ3pCLFNBQVMsRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSxLQUFLLENBQUMsT0FBTyxFQUFFO1NBQ3hELENBQUMsQ0FDTCxDQUFBO0lBQ0gsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDO0FBRUQsTUFBTSxVQUFVLGdCQUFnQixDQUFDLEtBQWM7SUFDN0MsTUFBTSxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzlCLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUE7QUFDdEIsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhLENBQUMsT0FBZTtJQUMzQyxNQUFNLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBRTlCLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7QUFDdkIsQ0FBQztBQUVELE1BQU0sVUFBVSxjQUFjLENBQUMsT0FBZTtJQUM1QyxPQUFPLGdCQUFBLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUE7QUFDbEQsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JSZXBvcnRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZXJyb3JSZXBvcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxPQUFPLEtBQUssTUFBTSxNQUFNLGNBQWMsQ0FBQTtBQUV0QyxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQTtBQUUvRSxNQUFNLFVBQVUsV0FBVyxDQUN6QixTQUFrQztJQUVsQyxPQUFPLENBQUMsS0FBZSxFQUFFLE1BQWdDLEVBQUUsRUFBRSxDQUMzRCxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQ3BCLElBQUksOEJBQUEsS0FBSyxDQUFnQixFQUFFLENBQUM7WUFDMUIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLDZCQUFBLHlCQUFnQixhQUFhLENBQUMsRUFBYyxRQUFRLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQzdGLE9BQU07UUFDUixDQUFDO1FBQ0QsTUFBTSxLQUFLLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQzlCLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUE7UUFDckMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUNOLHNEQUFBLEtBQUssR0FFVztZQUNaLE1BQU07WUFDTixTQUFTLEVBQUUsS0FBSyxDQUFDLE1BQU0sRUFBRTtZQUN6QixTQUFTLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFDLE9BQU8sRUFBRTtTQUN4RCxDQUFDLENBQ0wsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQztBQUVELFNBQVMsWUFBWSxDQUNuQixLQUFTLEVBQ1QsTUFBMkM7SUFFM0MsT0FBTyxvQkFBQSx1QkFBdUIsQ0FBQyxTQUFTLEVBQUssQ0FBQyxHQUFHLEVBQUUsRUFBRTtRQUNuRCxNQUFNLE9BQU8sR0FBRywrQkFBQSxHQUFHLENBQU8sQ0FBQTtRQUMxQixNQUFNLEtBQUssR0FBRyxJQUFJLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUNoQyxJQUFJLE9BQU87WUFBRSxLQUFLLENBQUMsVUFBVSxDQUFDLFNBQVMsRUFBRSxPQUE2QyxDQUFDLENBQUE7UUFDdkYsSUFBSSxNQUFNO1lBQUUsS0FBSyxDQUFDLFVBQVUsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUE7UUFDOUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUE7UUFDekMsTUFBTSxDQUFDLGdCQUFnQixDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQTtJQUN2QyxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFFRCxNQUFNLFVBQVUsUUFBUSxDQUN0QixTQUFrQztJQUVsQyxPQUFPLENBQUMsS0FBZSxFQUFFLE1BQWdDLEVBQUUsRUFBRSxDQUMzRCxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQ3BCLElBQUksOEJBQUEsS0FBSyxDQUFnQixFQUFFLENBQUM7WUFDMUIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLDZCQUFBLHlCQUFnQixhQUFhLENBQUMsRUFBYyxRQUFRLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQzdGLE9BQU07UUFDUixDQUFDO1FBQ0QsTUFBTSxLQUFLLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQzlCLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FDTix3REFBQSxLQUFLLEdBRVc7WUFDWixNQUFNO1lBQ04sU0FBUyxFQUFFLEtBQUssQ0FBQyxNQUFNLEVBQUU7WUFDekIsU0FBUyxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBQyxPQUFPLEVBQUU7U0FDeEQsQ0FBQyxDQUNMLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUM7QUFFRCxNQUFNLFVBQVUsZ0JBQWdCLENBQUMsS0FBYztJQUM3QyxNQUFNLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDOUIsT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQTtBQUN0QixDQUFDO0FBRUQsTUFBTSxVQUFVLGFBQWEsQ0FBQyxPQUFlO0lBQzNDLE1BQU0sQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLENBQUE7SUFFOUIsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQTtBQUN2QixDQUFDO0FBRUQsTUFBTSxVQUFVLGNBQWMsQ0FBQyxPQUFlO0lBQzVDLE9BQU8sMkJBQU8sYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUE7QUFDdkMsQ0FBQyJ9

package/dist/errors.d.ts

@@ -1,6 +1,6 @@
 import { Data } from "effect/Data";
 import { Cause } from "effect/Cause";
-declare const NotFoundError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect").Equal ? never : P]: A[P]; }) => import("effect/Data").YieldableError & {
+declare const NotFoundError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect/Equal").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect/Equal").Equal ? never : P]: A[P]; }) => import("effect/Data").YieldableError & {
     readonly _tag: "NotFoundError";
 } & Readonly<A>;
 export declare class NotFoundError<T extends string = string> extends NotFoundError_base<{
@@ -13,24 +13,24 @@ export declare class NotFoundError<T extends string = string> extends NotFoundEr
         readonly id: string;
     });
 }
-declare const ValidationError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect").Equal ? never : P]: A[P]; }) => import("effect/Data").YieldableError & {
+declare const ValidationError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect/Equal").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect/Equal").Equal ? never : P]: A[P]; }) => import("effect/Data").YieldableError & {
     readonly _tag: "ValidationError";
 } & Readonly<A>;
 export declare class ValidationError extends ValidationError_base<{
     errors: ReadonlyArray<unknown>;
 }> {
 }
-declare const NotLoggedInError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect").Equal ? never : P]: A[P]; }) => import("effect/Data").YieldableError & {
+declare const NotLoggedInError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect/Equal").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect/Equal").Equal ? never : P]: A[P]; }) => import("effect/Data").YieldableError & {
     readonly _tag: "NotLoggedInError";
 } & Readonly<A>;
 export declare class NotLoggedInError extends NotLoggedInError_base<{}> {
 }
-declare const UnauthorizedError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect").Equal ? never : P]: A[P]; }) => import("effect/Data").YieldableError & {
+declare const UnauthorizedError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect/Equal").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect/Equal").Equal ? never : P]: A[P]; }) => import("effect/Data").YieldableError & {
     readonly _tag: "UnauthorizedError";
 } & Readonly<A>;
 export declare class UnauthorizedError extends UnauthorizedError_base<{}> {
 }
-declare const LoginError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect").Equal ? never : P]: A[P]; }) => import("effect/Data").YieldableError & {
+declare const LoginError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect/Equal").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect/Equal").Equal ? never : P]: A[P]; }) => import("effect/Data").YieldableError & {
     readonly _tag: "NotLoggeInError";
 } & Readonly<A>;
 /**
@@ -41,7 +41,7 @@ export declare class LoginError extends LoginError_base<{
 }> {
     constructor(message: string);
 }
-declare const InvalidStateError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect").Equal ? never : P]: A[P]; }) => import("effect/Data").YieldableError & {
+declare const InvalidStateError_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect/Equal").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect/Equal").Equal ? never : P]: A[P]; }) => import("effect/Data").YieldableError & {
     readonly _tag: "InvalidStateError";
 } & Readonly<A>;
 export declare class InvalidStateError extends InvalidStateError_base<{
@@ -62,7 +62,7 @@ export declare class CauseException<E> extends Error {
     };
     toString(): string;
 }
-declare const OptimisticConcurrencyException_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect").Equal ? never : P]: A[P]; }) => import("effect/Data").YieldableError & {
+declare const OptimisticConcurrencyException_base: new <A extends Record<string, any>>(args: import("effect/Types").Equals<Omit<A, keyof import("effect/Equal").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect/Equal").Equal ? never : P]: A[P]; }) => import("effect/Data").YieldableError & {
     readonly _tag: "OptimisticConcurrencyException";
 } & Readonly<A>;
 export declare class OptimisticConcurrencyException extends OptimisticConcurrencyException_base<{

package/dist/errors.js

@@ -2,26 +2,26 @@ import * as tsplus_module_1 from "effect/Data";
 import * as tsplus_module_2 from "effect/Cause";
 /* eslint-disable @typescript-eslint/ban-types */
 import { makeFiberFailure } from "effect/Runtime";
-export class NotFoundError extends tsplus_module_1.Data.TaggedError("NotFoundError") {
+export class NotFoundError extends tsplus_module_1.TaggedError("NotFoundError") {
     constructor(args) {
         super({ ...args, message: `Didn't find ${args.type}#${args.id}` });
     }
 }
-export class ValidationError extends tsplus_module_1.Data.TaggedError("ValidationError") {
+export class ValidationError extends tsplus_module_1.TaggedError("ValidationError") {
 }
-export class NotLoggedInError extends tsplus_module_1.Data.TaggedError("NotLoggedInError") {
+export class NotLoggedInError extends tsplus_module_1.TaggedError("NotLoggedInError") {
 }
-export class UnauthorizedError extends tsplus_module_1.Data.TaggedError("UnauthorizedError") {
+export class UnauthorizedError extends tsplus_module_1.TaggedError("UnauthorizedError") {
 }
 /**
  * The user carries a valid Userprofile, but there is a problem with the login none the less.
  */
-export class LoginError extends tsplus_module_1.Data.TaggedError("NotLoggeInError") {
+export class LoginError extends tsplus_module_1.TaggedError("NotLoggeInError") {
     constructor(message) {
         super({ message });
     }
 }
-export class InvalidStateError extends tsplus_module_1.Data.TaggedError("InvalidStateError") {
+export class InvalidStateError extends tsplus_module_1.TaggedError("InvalidStateError") {
     constructor(message) {
         super({ message });
     }
@@ -52,12 +52,12 @@ export class CauseException extends Error {
         return this.toJSON();
     }
     toString() {
-        return `[${this._tag}] ` + tsplus_module_2.Cause.pretty(this.originalCause);
+        return `[${this._tag}] ` + tsplus_module_2.pretty(this.originalCause);
     }
 }
-export class OptimisticConcurrencyException extends tsplus_module_1.Data.TaggedError("OptimisticConcurrencyException") {
+export class OptimisticConcurrencyException extends tsplus_module_1.TaggedError("OptimisticConcurrencyException") {
     constructor(args) {
         super({ ...args, message: `Existing ${args.type} ${args.id} record changed` });
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vX3NyYy9lcnJvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxpREFBaUQ7QUFDakQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFFakQsTUFBTSxPQUFPLGFBQ1gsU0FBUSxnQkFBQSxJQUFJLENBQUMsV0FBVyxDQUFDLGVBQWUsQ0FBMkM7SUFFbkYsWUFBWSxJQUErQztRQUN6RCxLQUFLLENBQUMsRUFBRSxHQUFHLElBQUksRUFBRSxPQUFPLEVBQUUsZUFBZSxJQUFJLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUE7SUFDcEUsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLGVBQWdCLFNBQVEsZ0JBQUEsSUFBSSxDQUFDLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBcUM7Q0FBRztBQUUvRyxNQUFNLE9BQU8sZ0JBQWlCLFNBQVEsZ0JBQUEsSUFBSSxDQUFDLFdBQVcsQ0FBQyxrQkFBa0IsQ0FBSztDQUFHO0FBRWpGLE1BQU0sT0FBTyxpQkFBa0IsU0FBUSxnQkFBQSxJQUFJLENBQUMsV0FBVyxDQUFDLG1CQUFtQixDQUFLO0NBQUc7QUFDbkY7O0dBRUc7QUFDSCxNQUFNLE9BQU8sVUFBVyxTQUFRLGdCQUFBLElBQUksQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQXNCO0lBQ3RGLFlBQVksT0FBZTtRQUN6QixLQUFLLENBQUMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFBO0lBQ3BCLENBQUM7Q0FDRjtBQUVELE1BQU0sT0FBTyxpQkFBa0IsU0FBUSxnQkFBQSxJQUFJLENBQUMsV0FBVyxDQUFDLG1CQUFtQixDQUFzQjtJQUMvRixZQUFZLE9BQWU7UUFDekIsS0FBSyxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQTtJQUNwQixDQUFDO0NBQ0Y7QUFFRCxNQUFNLE9BQU8sY0FBa0IsU0FBUSxLQUFLO0lBQzFDLFlBQXFCLGFBQXVCLEVBQVcsSUFBWTtRQUNqRSxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFBO1FBQ25DLEtBQUssQ0FBQyxlQUFlLEdBQUcsQ0FBQyxDQUFBO1FBQ3pCLEtBQUssRUFBRSxDQUFBO1FBSFksa0JBQWEsR0FBYixhQUFhLENBQVU7UUFBVyxTQUFJLEdBQUosSUFBSSxDQUFRO1FBSWpFLEtBQUssQ0FBQyxlQUFlLEdBQUcsS0FBSyxDQUFBO1FBQzdCLE1BQU0sRUFBRSxHQUFHLGdCQUFnQixDQUFDLGFBQWEsQ0FBQyxDQUFBO1FBQzFDLElBQUksQ0FBQyxJQUFJLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQTtRQUNuQixJQUFJLENBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUE7UUFDekIsSUFBSSxDQUFDLEtBQUssR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFBO0lBQ3ZCLENBQUM7SUFDRCxNQUFNO1FBQ0osT0FBTztZQUNMLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSTtZQUNmLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSTtZQUNmLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztZQUNyQixNQUFNLEVBQUUsSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUN2QixLQUFLLEVBQUUsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLEVBQUU7U0FDbkMsQ0FBQTtJQUNILENBQUM7SUFFRCxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsNEJBQTRCLENBQUMsQ0FBQztRQUN4QyxPQUFPLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQTtJQUN0QixDQUFDO0lBQ1EsUUFBUTtRQUNmLE9BQU8sSUFBSSxJQUFJLENBQUMsSUFBSSxJQUFJLEdBQUcsZ0JBQUEsS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUE7SUFDN0QsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLDhCQUErQixTQUFRLGdCQUFBLElBQUksQ0FBQyxXQUFXLENBQUMsZ0NBQWdDLENBRXBHO0lBQ0MsWUFDRSxJQUF3RztRQUV4RyxLQUFLLENBQUMsRUFBRSxHQUFHLElBQUksRUFBRSxPQUFPLEVBQUUsWUFBWSxJQUFJLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQyxFQUFFLGlCQUFpQixFQUFFLENBQUMsQ0FBQTtJQUNoRixDQUFDO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vX3NyYy9lcnJvcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxpREFBaUQ7QUFDakQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFFakQsTUFBTSxPQUFPLGFBQ1gsU0FBUSw0QkFBaUIsZUFBZSxDQUEyQztJQUVuRixZQUFZLElBQStDO1FBQ3pELEtBQUssQ0FBQyxFQUFFLEdBQUcsSUFBSSxFQUFFLE9BQU8sRUFBRSxlQUFlLElBQUksQ0FBQyxJQUFJLElBQUksSUFBSSxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQTtJQUNwRSxDQUFDO0NBQ0Y7QUFFRCxNQUFNLE9BQU8sZUFBZ0IsU0FBUSw0QkFBaUIsaUJBQWlCLENBQXFDO0NBQUc7QUFFL0csTUFBTSxPQUFPLGdCQUFpQixTQUFRLDRCQUFpQixrQkFBa0IsQ0FBSztDQUFHO0FBRWpGLE1BQU0sT0FBTyxpQkFBa0IsU0FBUSw0QkFBaUIsbUJBQW1CLENBQUs7Q0FBRztBQUNuRjs7R0FFRztBQUNILE1BQU0sT0FBTyxVQUFXLFNBQVEsNEJBQWlCLGlCQUFpQixDQUFzQjtJQUN0RixZQUFZLE9BQWU7UUFDekIsS0FBSyxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQTtJQUNwQixDQUFDO0NBQ0Y7QUFFRCxNQUFNLE9BQU8saUJBQWtCLFNBQVEsNEJBQWlCLG1CQUFtQixDQUFzQjtJQUMvRixZQUFZLE9BQWU7UUFDekIsS0FBSyxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQTtJQUNwQixDQUFDO0NBQ0Y7QUFFRCxNQUFNLE9BQU8sY0FBa0IsU0FBUSxLQUFLO0lBQzFDLFlBQXFCLGFBQXVCLEVBQVcsSUFBWTtRQUNqRSxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFBO1FBQ25DLEtBQUssQ0FBQyxlQUFlLEdBQUcsQ0FBQyxDQUFBO1FBQ3pCLEtBQUssRUFBRSxDQUFBO1FBSFksa0JBQWEsR0FBYixhQUFhLENBQVU7UUFBVyxTQUFJLEdBQUosSUFBSSxDQUFRO1FBSWpFLEtBQUssQ0FBQyxlQUFlLEdBQUcsS0FBSyxDQUFBO1FBQzdCLE1BQU0sRUFBRSxHQUFHLGdCQUFnQixDQUFDLGFBQWEsQ0FBQyxDQUFBO1FBQzFDLElBQUksQ0FBQyxJQUFJLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQTtRQUNuQixJQUFJLENBQUMsT0FBTyxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUE7UUFDekIsSUFBSSxDQUFDLEtBQUssR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFBO0lBQ3ZCLENBQUM7SUFDRCxNQUFNO1FBQ0osT0FBTztZQUNMLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSTtZQUNmLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSTtZQUNmLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztZQUNyQixNQUFNLEVBQUUsSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUN2QixLQUFLLEVBQUUsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLEVBQUU7U0FDbkMsQ0FBQTtJQUNILENBQUM7SUFFRCxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsNEJBQTRCLENBQUMsQ0FBQztRQUN4QyxPQUFPLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQTtJQUN0QixDQUFDO0lBQ1EsUUFBUTtRQUNmLE9BQU8sSUFBSSxJQUFJLENBQUMsSUFBSSxJQUFJLEdBQUcsdUJBQWEsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFBO0lBQzdELENBQUM7Q0FDRjtBQUVELE1BQU0sT0FBTyw4QkFBK0IsU0FBUSw0QkFBaUIsZ0NBQWdDLENBRXBHO0lBQ0MsWUFDRSxJQUF3RztRQUV4RyxLQUFLLENBQUMsRUFBRSxHQUFHLElBQUksRUFBRSxPQUFPLEVBQUUsWUFBWSxJQUFJLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQyxFQUFFLGlCQUFpQixFQUFFLENBQUMsQ0FBQTtJQUNoRixDQUFDO0NBQ0YifQ==

package/dist/instrument.d.ts

@@ -3,5 +3,5 @@ import { Effect } from "effect/Effect";
  * @tsplus fluent effect/io/Effect instrument
  * @tsplus location "@effect-app/infra/instrument"
  */
-export declare function instr<R, E, A>(self: Effect<R, E, A>, name: string, properties?: Record<string, string>): import("effect").Effect<Exclude<R, import("effect/Tracer").ParentSpan>, E, A>;
+export declare function instr<R, E, A>(self: Effect<R, E, A>, name: string, properties?: Record<string, string>): import("effect/Effect").Effect<Exclude<R, import("effect/Tracer").ParentSpan>, E, A>;
 //# sourceMappingURL=instrument.d.ts.map

package/dist/instrument.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instrument.d.ts","sourceRoot":"","sources":["../_src/instrument.ts"],"names":[],"mappings":";;;;;AAGA,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,iFAOtG"}
+{"version":3,"file":"instrument.d.ts","sourceRoot":"","sources":["../_src/instrument.ts"],"names":[],"mappings":";;;;;AAGA,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,wFAOtG"}