@effect-app/infra 2.70.2 → 2.72.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @effect-app/infra
 
+## 2.72.0
+
+### Minor Changes
+
+- 96c51df: replace execute with executeContextual
+
+### Patch Changes
+
+- 96c51df: add support for error
+
+## 2.71.0
+
+### Minor Changes
+
+- 8bb246b: cleanup and document router/middleware
+
+### Patch Changes
+
+- 8bb246b: better middlewares creation
+- Updated dependencies [8bb246b]
+  - effect-app@2.48.0
+
 ## 2.70.2
 
 ### Patch Changes

package/dist/Store/ContextMapContainer.d.ts

@@ -1,6 +1,6 @@
 import { Context, Effect, Layer } from "effect-app";
 import { ContextMap } from "./service.js";
-declare const ContextMapContainer_base: Context.ReferenceClass<ContextMapContainer, "ContextMapContainer", ContextMap | "root">;
+declare const ContextMapContainer_base: Context.ReferenceClass<ContextMapContainer, "ContextMapContainer", "root" | ContextMap>;
 export declare class ContextMapContainer extends ContextMapContainer_base {
     static readonly layer: Layer.Layer<ContextMapContainer, never, never>;
 }

package/dist/api/internal/middlewares.js

@@ -165,4 +165,4 @@ export const cors = (_options) => {
         return response.pipe(ServerResponse.setHeaders(dropUndefined(corsHeaders)));
     }));
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"middlewares.js","sourceRoot":"","sources":["../../../src/api/internal/middlewares.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAA;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAA;AAC7D,OAAO,KAAK,iBAAiB,MAAM,oCAAoC,CAAA;AACvE,OAAO,KAAK,cAAc,MAAM,qCAAqC,CAAA;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAG7C,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,QAAsC,MAAM,EAAE,EAAE,CACxE,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CACtB,IAAI,CACF,iBAAiB,CAAC,iBAAiB,EACnC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EACtF,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAC1B,CACF,CAAA;AAEH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,gBAAgB,GAAG,WAAW,EAAE,EAAE,CAClE,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CACtB,IAAI,CACF,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,EACtC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACtB,QAAQ,CAAC,MAAM,CACb,QAAQ,CAAC,qBAAqB,EAC9B,OAAO,CAAC,GAAG,CAAkB,gBAAgB,EAAE,IAAI,CAAC,CACrD,CACF,EACD,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAC1B,CACF,CAAA;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,qBAAqB,GAAG,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAA;IAErE,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAC7B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAA;QAE5D,KAAK,CAAC,CAAC,IAAI,CACT,MAAM,CAAC,SAAS,CAAC,qBAAqB,CAAC,EACvC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CACvC,CAAA;QAED,OAAO,KAAK,CAAC,CAAC,GAAG,CAAA;IACnB,CAAC,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAC9C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAA;IAE1D,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA;IAE3B,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QACpD,KAAK,CAAC,CAAC,WAAW,CAAC,UAAU,CAC3B,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,GAAG,iBAAiB,QAAQ,CAAC,MAAM,EAAE,CACjF,CAAA;IACH,CAAC;SAAM,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;QAClC,KAAK,CAAC,CAAC,WAAW,CAAC,QAAQ,CACzB,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,GAAG,iBAAiB,QAAQ,CAAC,MAAM,EAAE,CACjF,CAAA;IACH,CAAC;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAC,CACH,CAAA;AAED,MAAM,gBAAgB,GAAG,CAAC,GAAqB,EAAE,EAAE,CACjD,kBAAkB,CAAC,KAAK,EAAE,CAAC,IAAI,CAC7B,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC,EACjC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAC1E,CAAA;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,gBAEmC,EACnC,OAGE,EACF,EAAE,CACF,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CACtB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,eAAe,CAAA;IACzD,MAAM,YAAY,GAAG,OAAO,EAAE,SAAS,IAAI,EAAE,CAAA;IAC7C,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAA;IAE1D,IAAI,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvC,OAAO,KAAK,CAAC,CAAC,GAAG,CAAA;IACnB,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAA;IAE5D,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,gBAAgB,CACrB,IAAI,gBAAgB,CAClB,mBAAmB,UAAU,EAAE,CAChC,CACF,CAAA;IACH,CAAC;IAED,MAAM,kBAAkB,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAEhD,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpC,OAAO,gBAAgB,CACrB,IAAI,gBAAgB,CAClB,iEAAiE,CAClE,CACF,CAAA;IACH,CAAC;IAED,IAAI,kBAAkB,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,CAAC;QACtC,OAAO,gBAAgB,CACrB,IAAI,gBAAgB,CAClB,uDAAuD,kBAAkB,CAAC,CAAC,CAAC,GAAG,CAChF,CACF,CAAA;IACH,CAAC;IAED,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAE,EAAE,QAAQ,CAAC,CAAA;IACvE,MAAM,eAAe,GAAG,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IAC3D,MAAM,gBAAgB,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAEnD,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,OAAO,gBAAgB,CACrB,IAAI,gBAAgB,CAClB,qFAAqF,CACtF,CACF,CAAA;IACH,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC;QAClD,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC;QACzB,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAE;KAC/B,CAAC,CAAC,CAAA;IAEH,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC;IAED,OAAO,KAAK,CAAC,CAAC,GAAG,CAAA;AACnB,CAAC,CAAC,CACH,CAAA;AAEH,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,QAA2C,EAAE,EAAE;IAClE,MAAM,QAAQ,GAAG;QACf,cAAc,EAAE,CAAC,GAAG,CAAC;QACrB,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC;QACjE,cAAc,EAAE,EAAE;QAClB,cAAc,EAAE,EAAE;QAClB,WAAW,EAAE,KAAK;KACV,CAAA;IAEV,MAAM,OAAO,GAAG,EAAE,GAAG,QAAQ,EAAE,GAAG,QAAQ,EAAE,CAAA;IAE5C,MAAM,eAAe,GAAG,CAAC,MAAc,EAAE,EAAE;QACzC,OAAO,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IAChD,CAAC,CAAA;IAED,MAAM,WAAW,GAAG,CAAC,YAAoB,EAAE,EAAE;QAC3C,IAAI,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACzC,OAAO,EAAE,6BAA6B,EAAE,GAAG,EAAE,CAAA;QAC/C,CAAC;QAED,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxC,OAAO,EAAE,6BAA6B,EAAE,GAAG,EAAE,CAAA;QAC/C,CAAC;QAED,IAAI,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;YAClC,OAAO;gBACL,6BAA6B,EAAE,YAAY;gBAC3C,IAAI,EAAE,QAAQ;aACf,CAAA;QACH,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC,CAAA;IAED,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE;QACzB,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,OAAO;gBACL,8BAA8B,EAAE,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;aAClE,CAAA;QACH,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,gBAAgB,GAAG,CAAC,GAAG,EAAE;QAC7B,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,OAAO,EAAE,kCAAkC,EAAE,MAAM,EAAE,CAAA;QACvD,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,YAAY,GAAG,CAAC,2BAA+C,EAAE,EAAE;QACvE,IAAG,CAAC,OAAO,CAAC,cAAc;YAAE,OAAO,SAAS,CAAA;QAE5C,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,2BAA2B,EAAE,CAAC;YACvE,OAAO;gBACL,IAAI,EAAE,gCAAgC;gBACtC,8BAA8B,EAAE,2BAA2B;aAC5D,CAAA;QACH,CAAC;QAED,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;YAClC,OAAO;gBACL,8BAA8B,EAAE,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC;aACjE,CAAA;QACH,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC,CAAA;IAED,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE;QAC1B,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,OAAO;gBACL,+BAA+B,EAAE,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC;aAClE,CAAA;QACH,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE;QACnB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,EAAE,wBAAwB,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAA;QAChE,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC,CAAC,EAAE,CAAA;IAEJ,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAC7B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAA;QAE1D,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACxC,MAAM,2BAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAA;QAErF,IAAI,WAAW,GAAG;YAChB,GAAG,WAAW,CAAC,MAAM,IAAI,EAAE,CAAC;YAC5B,GAAG,gBAAgB;YACnB,GAAG,aAAa;SACjB,CAAA;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACjC,WAAW,GAAG;gBACZ,GAAG,WAAW;gBACd,GAAG,YAAY;gBACf,GAAG,YAAY,CAAC,2BAA2B,CAAC;gBAC5C,GAAG,MAAM;aACV,CAAA;YAED,OAAO,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAA;QAC1G,CAAC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA;QAE3B,OAAO,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;IAC7E,CAAC,CAAC,CACH,CAAA;AACH,CAAC,CAAA"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"middlewares.js","sourceRoot":"","sources":["../../../src/api/internal/middlewares.ts"],"names":[],"mappings":"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"}

package/dist/api/routing/DynamicMiddleware.d.ts

@@ -1,25 +1,35 @@
-import { type Array, type Context, Effect, type Layer, type Request, type S, type Scope } from "effect-app";
-import type { RPCContextMap } from "effect-app/client/req";
+import { Context, Effect, Layer, type NonEmptyArray, type Request, type S, type Scope } from "effect-app";
+import type { GetEffectContext, RPCContextMap } from "effect-app/client/req";
 import type * as EffectRequest from "effect/Request";
-export type RPCHandlerFactory<CTXMap extends Record<string, RPCContextMap.Any>> = <T extends {
-    config?: Partial<Record<keyof CTXMap, any>>;
-}, Req extends S.TaggedRequest.All, R>(schema: T & S.Schema<Req, any, never>, handler: (request: Req, headers: any) => Effect.Effect<EffectRequest.Request.Success<Req>, EffectRequest.Request.Error<Req>, R>, moduleName?: string) => (req: Req, headers: any) => Effect.Effect<Request.Request.Success<Req>, Request.Request.Error<Req>, any>;
-export type ContextProviderOut<RRet> = Effect<Context.Context<RRet>, never, Scope>;
-export type ContextProviderShape<RRet> = ContextProviderOut<RRet>;
-export interface Middleware<MiddlewareContext, CTXMap extends Record<string, RPCContextMap.Any>, R, Layers extends Array<Layer.Layer.Any>, CtxId, CtxTag extends string, RRet, RErr, RCtx> {
-    dependencies?: Layers;
-    contextMap: CTXMap;
-    context: MiddlewareContext;
-    contextProvider: Context.Tag<CtxId, CtxId & ContextProviderShape<RRet> & {
-        _tag: CtxTag;
+import { type LayersUtils } from "../routing.js";
+export declare const MiddlewareMaker: Context.Tag<"MiddlewareMaker", any>;
+export type RPCHandlerFactory<RequestContextMap extends Record<string, RPCContextMap.Any>, MiddlewareR> = <T extends {
+    config?: Partial<Record<keyof RequestContextMap, any>>;
+}, Req extends S.TaggedRequest.All, HandlerR>(schema: T & S.Schema<Req, any, never>, handler: (request: Req, headers: any) => Effect.Effect<EffectRequest.Request.Success<Req>, EffectRequest.Request.Error<Req>, HandlerR>, moduleName?: string) => (req: Req, headers: any) => Effect.Effect<Request.Request.Success<Req>, Request.Request.Error<Req> | RequestContextMapErrors<RequestContextMap>, MiddlewareR | Exclude<HandlerR, GetEffectContext<RequestContextMap, (T & S.Schema<Req, any, never>)["config"]>>>;
+export declare const makeMiddlewareLayer: <RequestContextMap extends Record<string, RPCContextMap.Any>, MiddlewareR, MakeMiddlewareR, MiddlewareDependencies extends NonEmptyArray<Layer.Layer.Any>, ContextProviderId, ContextProviderKey extends string, ContextProviderA, MakeContextProviderE, MakeContextProviderR>(middleware: Middleware<MiddlewareR, RequestContextMap, MakeMiddlewareR, MiddlewareDependencies, ContextProviderId, ContextProviderKey, ContextProviderA, MakeContextProviderE, MakeContextProviderR>) => Layer.Layer<"MiddlewareMaker", never, Exclude<MiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>>>;
+export type ContextProviderShape<ContextProviderA> = Effect<Context.Context<ContextProviderA>, never, Scope>;
+export interface Middleware<MiddlewareR, // what the middlware requires to execute
+RequestContextMap extends Record<string, RPCContextMap.Any>, // what services will the middlware provide dynamically to the handler, or raise errors.
+MakeMiddlewareR, // what the middlware requires to be constructed
+MiddlewareDependencies extends NonEmptyArray<Layer.Layer.Any>, // layers provided for the middlware to be constructed
+ContextProviderId, // it is the context provider itself
+ContextProviderKey extends string, // tag for the context provider
+ContextProviderA, // what the context provider provides
+MakeContextProviderE, // what the context provider construction can fail with
+MakeContextProviderR> {
+    dependencies?: MiddlewareDependencies;
+    contextProvider: Context.Tag<ContextProviderId, ContextProviderId & ContextProviderShape<ContextProviderA> & {
+        _tag: ContextProviderKey;
     }> & {
-        Default: Layer.Layer<CtxId, RErr, RCtx>;
+        Default: Layer.Layer<ContextProviderId, MakeContextProviderE, MakeContextProviderR>;
     };
-    execute: Effect<RPCHandlerFactory<CTXMap>, never, R>;
+    execute: (maker: (cb: RPCHandlerFactory<RequestContextMap, MiddlewareR>) => RPCHandlerFactory<RequestContextMap, MiddlewareR>) => Effect<RPCHandlerFactory<RequestContextMap, MiddlewareR>, never, MakeMiddlewareR>;
 }
-export declare const makeRpc: <Context, CTXMap extends Record<string, RPCContextMap.Any>, R, Layers extends Array<Layer.Layer.Any>, CtxId, CtxTag extends string, RRet, RErr, RCtx>(middleware: Middleware<Context, CTXMap, R, Layers, CtxId, CtxTag, RRet, RErr, RCtx>) => Effect.Effect<{
+export type RequestContextMapErrors<RequestContextMap extends Record<string, RPCContextMap.Any>> = S.Schema.Type<RequestContextMap[keyof RequestContextMap]["error"]>;
+export declare const makeMiddleware: <RequestContextMap extends Record<string, RPCContextMap.Any>, MiddlewareR>() => <M extends Middleware<MiddlewareR, RequestContextMap, any, NonEmptyArray<Layer.Layer.Any>, any, any, any, any, any>>(content: M) => M;
+export declare const makeRpc: <MiddlewareR, RequestContextMap extends Record<string, RPCContextMap.Any>, MakeMiddlewareR, MiddlewareDependencies extends NonEmptyArray<Layer.Layer.Any>, ContextProviderId, ContextProviderKey extends string, ContextProviderA, MakeContextProviderE, MakeContextProviderR>(middleware: Middleware<MiddlewareR, RequestContextMap, MakeMiddlewareR, MiddlewareDependencies, ContextProviderId, ContextProviderKey, ContextProviderA, MakeContextProviderE, MakeContextProviderR>) => Effect.Effect<{
     effect: <T extends {
-        config?: Partial<Record<keyof CTXMap, any>>;
-    }, Req extends S.TaggedRequest.All, R_1>(schema: T & S.Schema<Req, any, never>, handler: (request: Req, headers: any) => Effect.Effect<EffectRequest.Request.Success<Req>, EffectRequest.Request.Error<Req>, R_1>, moduleName?: string) => (req: Req, headers: any) => Effect.Effect<Request.Request.Success<Req>, Request.Request.Error<Req>, Exclude<any, RRet>>;
-}, never, R | CtxId>;
+        config?: Partial<Record<keyof RequestContextMap, any>>;
+    }, Req extends S.TaggedRequest.All, HandlerR>(schema: T & S.Schema<Req, any, never>, handler: (request: Req, headers: any) => Effect.Effect<Request.Request.Success<Req>, Request.Request.Error<Req>, HandlerR>, moduleName?: string) => (req: Req, headers: any) => Effect.Effect<Request.Request.Success<Req>, Request.Request.Error<Req> | S.Schema.Type<RequestContextMap[keyof RequestContextMap]["error"]>, Scope.Scope | Exclude<MiddlewareR, ContextProviderA> | Exclude<Exclude<HandlerR, GetEffectContext<RequestContextMap, (T & S.Schema<Req, any, never>)["config"]>>, ContextProviderA>>;
+}, never, "MiddlewareMaker" | ContextProviderId>;
 //# sourceMappingURL=DynamicMiddleware.d.ts.map

package/dist/api/routing/DynamicMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DynamicMiddleware.d.ts","sourceRoot":"","sources":["../../../src/api/routing/DynamicMiddleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DynamicMiddleware.d.ts","sourceRoot":"","sources":["../../../src/api/routing/DynamicMiddleware.ts"],"names":[],"mappings":"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"}

package/dist/api/routing/DynamicMiddleware.js

@@ -1,20 +1,39 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Effect } from "effect-app";
+import { Context, Effect, Layer } from "effect-app";
+export const MiddlewareMaker = Context.GenericTag("MiddlewareMaker");
+function makeRpcHandler() {
+    return (cb) => cb;
+}
+export const makeMiddlewareLayer = (middleware) => {
+    const middlewareLayer = Layer
+        .effect(MiddlewareMaker, middleware.execute(makeRpcHandler()))
+        .pipe(middleware.dependencies ? Layer.provide(middleware.dependencies) : (_) => _);
+    return middlewareLayer;
+};
+// identity factory for Middleware
+export const makeMiddleware = 
+// by setting MiddlewareR and RequestContextMap beforehand, execute contextual typing does not fuck up itself to anys
+() => (content) => content;
+// it just provides the right types without cluttering the implementation with them
+function makeRpcEffect() {
+    return (cb) => cb;
+}
 export const makeRpc = (middleware) => Effect
     .all({
-    execute: middleware.execute,
-    contextProvider: middleware.contextProvider
+    middleware: MiddlewareMaker,
+    contextProvider: middleware.contextProvider // uses the middleware.contextProvider tag to get the context provider service
 })
-    .pipe(Effect.map(({ contextProvider, execute }) => ({
-    effect: (schema, handler, moduleName) => {
-        const h = execute(schema, handler, moduleName);
-        return (req, headers) => Effect.gen(function* () {
-            const ctx = yield* contextProvider;
-            return yield* h(req, headers).pipe(Effect.provide(ctx), Effect.uninterruptible // TODO: make this depend on query/command, and consider if middleware also should be affected or not.
-            );
-        });
-    }
+    .pipe(Effect.map(({ contextProvider, middleware }) => ({
+    effect: makeRpcEffect()((schema, handler, moduleName) => {
+        const h = middleware(schema, handler, moduleName);
+        return (req, headers) => 
+        // the contextProvider is an Effect that builds the context for the request
+        contextProvider.pipe(Effect.flatMap((ctx) => h(req, headers)
+            .pipe(Effect.provide(ctx), 
+        // TODO: make this depend on query/command, and consider if middleware also should be affected or not.
+        Effect.uninterruptible)));
+    })
 })));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHluYW1pY01pZGRsZXdhcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXBpL3JvdXRpbmcvRHluYW1pY01pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsNERBQTREO0FBQzVELHdEQUF3RDtBQUN4RCx1REFBdUQ7QUFDdkQsT0FBTyxFQUE0QixNQUFNLEVBQWdELE1BQU0sWUFBWSxDQUFBO0FBc0QzRyxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsQ0FXckIsVUFBbUYsRUFDbkYsRUFBRSxDQUNGLE1BQU07S0FDSCxHQUFHLENBQUM7SUFDSCxPQUFPLEVBQUUsVUFBVSxDQUFDLE9BQU87SUFDM0IsZUFBZSxFQUFFLFVBQVUsQ0FBQyxlQUFlO0NBQzVDLENBQUM7S0FDRCxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsZUFBZSxFQUFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ2xELE1BQU0sRUFBRSxDQUNOLE1BQXFDLEVBQ3JDLE9BT0MsRUFDRCxVQUFtQixFQUNuQixFQUFFO1FBQ0YsTUFBTSxDQUFDLEdBQUcsT0FBTyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUE7UUFDOUMsT0FBTyxDQUFDLEdBQVEsRUFBRSxPQUFZLEVBQUUsRUFBRSxDQUNoQyxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztZQUNsQixNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsQ0FBQyxlQUFlLENBQUE7WUFDbEMsT0FBTyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FDaEMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFDbkIsTUFBTSxDQUFDLGVBQWUsQ0FBQyxzR0FBc0c7YUFDOUgsQ0FBQTtRQUNILENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQztDQUNGLENBQUMsQ0FBQyxDQUFDLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHluYW1pY01pZGRsZXdhcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXBpL3JvdXRpbmcvRHluYW1pY01pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsNERBQTREO0FBQzVELHdEQUF3RDtBQUN4RCx1REFBdUQ7QUFDdkQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUF3RCxNQUFNLFlBQVksQ0FBQTtBQUt6RyxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBeUIsaUJBQWlCLENBQUMsQ0FBQTtBQStCNUYsU0FBUyxjQUFjO0lBQ3JCLE9BQU8sQ0FBQyxFQUFxRCxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUE7QUFDdEUsQ0FBQztBQUVELE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLENBV2pDLFVBVUMsRUFDRCxFQUFFO0lBQ0YsTUFBTSxlQUFlLEdBQUcsS0FBSztTQUMxQixNQUFNLENBQ0wsZUFBZSxFQUNmLFVBQVUsQ0FBQyxPQUFRLENBQUMsY0FBYyxFQUFrQyxDQUFDLENBQ3RFO1NBQ0EsSUFBSSxDQUFDLFVBQVUsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLFlBQVksQ0FBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFFM0YsT0FBTyxlQUlOLENBQUE7QUFDSCxDQUFDLENBQUE7QUFzQ0Qsa0NBQWtDO0FBQ2xDLE1BQU0sQ0FBQyxNQUFNLGNBQWM7QUFDekIscUhBQXFIO0FBQ3JILEdBQTZFLEVBQUUsQ0FDL0UsQ0FDRSxPQUFVLEVBQ1AsRUFBRSxDQUFDLE9BQU8sQ0FBQTtBQUVqQixtRkFBbUY7QUFDbkYsU0FBUyxhQUFhO0lBQ3BCLE9BQU8sQ0FDTCxFQTZCQyxFQUNELEVBQUUsQ0FBQyxFQUFFLENBQUE7QUFDVCxDQUFDO0FBRUQsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLENBV3JCLFVBVUMsRUFDRCxFQUFFLENBQ0YsTUFBTTtLQUNILEdBQUcsQ0FBQztJQUNILFVBQVUsRUFBRSxlQUdYO0lBQ0QsZUFBZSxFQUFFLFVBQVUsQ0FBQyxlQUFlLENBQUMsOEVBQThFO0NBQzNILENBQUM7S0FDRCxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsZUFBZSxFQUFFLFVBQVUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3JELE1BQU0sRUFBRSxhQUFhLEVBQW9ELENBQUMsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxFQUFFO1FBQ3hHLE1BQU0sQ0FBQyxHQUFHLFVBQVUsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFBO1FBQ2pELE9BQU8sQ0FBQyxHQUFHLEVBQUUsT0FBTyxFQUFFLEVBQUU7UUFDdEIsMkVBQTJFO1FBQzNFLGVBQWUsQ0FBQyxJQUFJLENBQ2xCLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUNyQixDQUFDLENBQUMsR0FBRyxFQUFFLE9BQU8sQ0FBQzthQUNaLElBQUksQ0FDSCxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQztRQUNuQixzR0FBc0c7UUFDdEcsTUFBTSxDQUFDLGVBQWUsQ0FDdkIsQ0FDSixDQUNGLENBQUE7SUFDTCxDQUFDLENBQUM7Q0FDSCxDQUFDLENBQUMsQ0FBQyxDQUFBIn0=

package/dist/api/routing/utils.d.ts

@@ -9,4 +9,11 @@ export declare const determineMethod: (actionName: string, schema: Schema<any, a
     readonly _tag: "command";
     readonly method: "PATCH";
 };
+export declare const isCommand: (method: ReturnType<typeof determineMethod>) => method is {
+    readonly _tag: "command";
+    readonly method: "POST" | "DELETE";
+} | {
+    readonly _tag: "command";
+    readonly method: "PATCH";
+};
 //# sourceMappingURL=utils.d.ts.map

package/dist/api/routing/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/api/routing/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAO,MAAM,EAAE,MAAM,mBAAmB,CAAA;AA6BpD,eAAO,MAAM,eAAe,GAAI,YAAY,MAAM,EAAE,QAAQ,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;;;;;;;;;CAShF,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/api/routing/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAO,MAAM,EAAE,MAAM,mBAAmB,CAAA;AA6BpD,eAAO,MAAM,eAAe,GAAI,YAAY,MAAM,EAAE,QAAQ,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;;;;;;;;;CAShF,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,QAAQ,UAAU,CAAC,OAAO,eAAe,CAAC;;;;;;CAA8B,CAAA"}

package/dist/api/routing/utils.js

@@ -36,4 +36,5 @@ export const determineMethod = (actionName, schema) => {
         return { _tag: "command", method: "PATCH" };
     return { _tag: "command", method: "POST" };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXBpL3JvdXRpbmcvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUc5QixNQUFNLEdBQUcsR0FBRyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLENBQUE7QUFDN0QsTUFBTSxHQUFHLEdBQUcsQ0FBQyxRQUFRLEVBQUUsUUFBUSxFQUFFLFNBQVMsQ0FBQyxDQUFBO0FBQzNDLE1BQU0sS0FBSyxHQUFHLENBQUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQTtBQUV6QyxNQUFNLHFCQUFxQixHQUFHLENBQUMsR0FBWSxFQUFXLEVBQUU7SUFDdEQsSUFBSSxHQUFHLENBQUMsSUFBSSxLQUFLLGVBQWU7UUFBRSxPQUFPLElBQUksQ0FBQTtJQUM3QyxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssT0FBTyxJQUFJLEdBQUcsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLHFCQUFxQixDQUFDLEVBQUUsQ0FBQztRQUNuRSxPQUFPLElBQUksQ0FBQTtJQUNiLENBQUM7SUFDRCxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssWUFBWSxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssZ0JBQWdCLEVBQUUsQ0FBQztRQUMvRCxPQUFPLHFCQUFxQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUN4QyxDQUFDO0lBRUQsT0FBTyxLQUFLLENBQUE7QUFDZCxDQUFDLENBQUE7QUFFRCxNQUFNLGNBQWMsR0FBRyxDQUFDLEdBQVksRUFBVyxFQUFFO0lBQy9DLElBQUksR0FBRyxDQUFDLElBQUksS0FBSyxPQUFPO1FBQUUsT0FBTyxHQUFHLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsQ0FBQTtJQUNoRSxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssYUFBYTtRQUFFLE9BQU8sS0FBSyxDQUFBO0lBQzVDLE9BQU8sR0FBRyxDQUFDLGtCQUFrQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMscUJBQXFCLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7QUFDM0UsQ0FBQyxDQUFBO0FBRUQsTUFBTSxXQUFXLEdBQUcsQ0FBQyxNQUE4RCxFQUFXLEVBQUU7SUFDOUYsSUFBSSxRQUFRLElBQUksTUFBTSxJQUFJLE1BQU0sQ0FBQyxNQUFNO1FBQUUsT0FBTyxjQUFjLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUEsQ0FBQyxtQkFBbUI7SUFDL0csT0FBTyxjQUFjLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQ25DLENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBRyxDQUFDLFVBQWtCLEVBQUUsTUFBNkIsRUFBRSxFQUFFO0lBQ25GLElBQUksR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDOUMsT0FBTyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBYyxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQVcsQ0FBQTtJQUMxRixDQUFDO0lBQ0QsSUFBSSxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUM5QyxPQUFPLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLE1BQU0sRUFBVyxDQUFBO0lBQ3RGLENBQUM7SUFDRCxJQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFXLENBQUE7SUFDckcsT0FBTyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBVyxDQUFBO0FBQ3JELENBQUMsQ0FBQSJ9
+export const isCommand = (method) => method._tag === "command";
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXBpL3JvdXRpbmcvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUc5QixNQUFNLEdBQUcsR0FBRyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsUUFBUSxDQUFDLENBQUE7QUFDN0QsTUFBTSxHQUFHLEdBQUcsQ0FBQyxRQUFRLEVBQUUsUUFBUSxFQUFFLFNBQVMsQ0FBQyxDQUFBO0FBQzNDLE1BQU0sS0FBSyxHQUFHLENBQUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQTtBQUV6QyxNQUFNLHFCQUFxQixHQUFHLENBQUMsR0FBWSxFQUFXLEVBQUU7SUFDdEQsSUFBSSxHQUFHLENBQUMsSUFBSSxLQUFLLGVBQWU7UUFBRSxPQUFPLElBQUksQ0FBQTtJQUM3QyxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssT0FBTyxJQUFJLEdBQUcsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLHFCQUFxQixDQUFDLEVBQUUsQ0FBQztRQUNuRSxPQUFPLElBQUksQ0FBQTtJQUNiLENBQUM7SUFDRCxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssWUFBWSxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssZ0JBQWdCLEVBQUUsQ0FBQztRQUMvRCxPQUFPLHFCQUFxQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUN4QyxDQUFDO0lBRUQsT0FBTyxLQUFLLENBQUE7QUFDZCxDQUFDLENBQUE7QUFFRCxNQUFNLGNBQWMsR0FBRyxDQUFDLEdBQVksRUFBVyxFQUFFO0lBQy9DLElBQUksR0FBRyxDQUFDLElBQUksS0FBSyxPQUFPO1FBQUUsT0FBTyxHQUFHLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsQ0FBQTtJQUNoRSxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssYUFBYTtRQUFFLE9BQU8sS0FBSyxDQUFBO0lBQzVDLE9BQU8sR0FBRyxDQUFDLGtCQUFrQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMscUJBQXFCLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7QUFDM0UsQ0FBQyxDQUFBO0FBRUQsTUFBTSxXQUFXLEdBQUcsQ0FBQyxNQUE4RCxFQUFXLEVBQUU7SUFDOUYsSUFBSSxRQUFRLElBQUksTUFBTSxJQUFJLE1BQU0sQ0FBQyxNQUFNO1FBQUUsT0FBTyxjQUFjLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUEsQ0FBQyxtQkFBbUI7SUFDL0csT0FBTyxjQUFjLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQ25DLENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBRyxDQUFDLFVBQWtCLEVBQUUsTUFBNkIsRUFBRSxFQUFFO0lBQ25GLElBQUksR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDOUMsT0FBTyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBYyxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQVcsQ0FBQTtJQUMxRixDQUFDO0lBQ0QsSUFBSSxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUM5QyxPQUFPLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLE1BQU0sRUFBVyxDQUFBO0lBQ3RGLENBQUM7SUFDRCxJQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFXLENBQUE7SUFDckcsT0FBTyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBVyxDQUFBO0FBQ3JELENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRyxDQUFDLE1BQTBDLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEtBQUssU0FBUyxDQUFBIn0=

package/dist/api/routing.d.ts

@@ -1,10 +1,11 @@
-import { Array, Context, Effect, Layer, type NonEmptyReadonlyArray, ParseResult, S } from "effect-app";
+import { Array, Context, Effect, Layer, type NonEmptyArray, type NonEmptyReadonlyArray, ParseResult, S } from "effect-app";
 import type { GetEffectContext, RPCContextMap } from "effect-app/client/req";
 import { type HttpHeaders, HttpRouter } from "effect-app/http";
 import type { Contravariant } from "effect/Types";
 import { type YieldWrap } from "effect/Utils";
 import { type Middleware } from "./routing/DynamicMiddleware.js";
-declare namespace LayersUtils {
+export * from "./routing/DynamicMiddleware.js";
+export declare namespace LayersUtils {
     type GetLayersSuccess<Layers extends ReadonlyArray<Layer.Layer.Any>> = Layers extends NonEmptyReadonlyArray<Layer.Layer.Any> ? {
         [k in keyof Layers]: Layer.Layer.Success<Layers[k]>;
     }[number] : never;
@@ -66,26 +67,25 @@ export declare const RouterSymbol: unique symbol;
 export interface RouterShape<Resource> {
     [RouterSymbol]: Resource;
 }
-type Match<Resource extends Record<string, any>, CTXMap extends Record<string, any>, RT extends RequestType, Key extends keyof Resource, MiddlewareContext> = {
-    <A extends GetSuccessShape<Resource[Key], RT>, R2 = never, E = never>(f: Effect<A, E, R2>): Handler<Resource[Key], RT, Exclude<MiddlewareContext | Exclude<R2, GetEffectContext<CTXMap, Resource[Key]["config"]>>, HttpRouter.HttpRouter.Provided>>;
-    <A extends GetSuccessShape<Resource[Key], RT>, R2 = never, E = never>(f: (req: S.Schema.Type<Resource[Key]>) => Effect<A, E, R2>): Handler<Resource[Key], RT, Exclude<MiddlewareContext | Exclude<R2, GetEffectContext<CTXMap, Resource[Key]["config"]>>, HttpRouter.HttpRouter.Provided>>;
+type Match<Resource extends Record<string, any>, RequestContextMap extends Record<string, any>, RT extends RequestType, Key extends keyof Resource, MiddlewareR> = {
+    <A extends GetSuccessShape<Resource[Key], RT>, R2 = never, E = never>(f: Effect<A, E, R2>): Handler<Resource[Key], RT, Exclude<MiddlewareR | Exclude<R2, GetEffectContext<RequestContextMap, Resource[Key]["config"]>>, HttpRouter.HttpRouter.Provided>>;
+    <A extends GetSuccessShape<Resource[Key], RT>, R2 = never, E = never>(f: (req: S.Schema.Type<Resource[Key]>) => Effect<A, E, R2>): Handler<Resource[Key], RT, Exclude<MiddlewareR | Exclude<R2, GetEffectContext<RequestContextMap, Resource[Key]["config"]>>, HttpRouter.HttpRouter.Provided>>;
 };
-export type RouteMatcher<CTXMap extends Record<string, any>, Resource extends Record<string, any>, MiddlewareContext> = {
-    [Key in keyof FilterRequestModules<Resource>]: Match<Resource, CTXMap, RequestTypes.DECODED, Key, MiddlewareContext> & {
+export type RouteMatcher<RequestContextMap extends Record<string, any>, Resource extends Record<string, any>, MiddlewareR> = {
+    [Key in keyof FilterRequestModules<Resource>]: Match<Resource, RequestContextMap, RequestTypes.DECODED, Key, MiddlewareR> & {
         success: Resource[Key]["success"];
         successRaw: S.SchemaClass<S.Schema.Encoded<Resource[Key]["success"]>>;
         failure: Resource[Key]["failure"];
         /**
          * Requires the Encoded shape (e.g directly undecoded from DB, so that we don't do multiple Decode/Encode)
          */
-        raw: Match<Resource, CTXMap, RequestTypes.TYPE, Key, MiddlewareContext>;
+        raw: Match<Resource, RequestContextMap, RequestTypes.TYPE, Key, MiddlewareR>;
     };
 };
-export declare const makeMiddleware: <MiddlewareContext, CTXMap extends Record<string, RPCContextMap.Any>, MiddlewareR, Layers extends NonEmptyReadonlyArray<Layer.Layer.Any> | never[], CtxId, CtxTag extends string, RRet, RErr, RCtx>(content: Middleware<MiddlewareContext, CTXMap, MiddlewareR, Layers, CtxId, CtxTag, RRet, RErr, RCtx>) => Middleware<MiddlewareContext, CTXMap, MiddlewareR, Layers, CtxId, CtxTag, RRet, RErr, RCtx>;
 declare const Router_base: HttpRouter.HttpRouter.TagClass<Router, "@effect-app/Rpc", unknown, HttpRouter.HttpRouter.DefaultServices>;
 export declare class Router extends Router_base {
 }
-export declare const makeRouter: <MiddlewareContext, CTXMap extends Record<string, RPCContextMap.Any>, MiddlewareR, Layers extends NonEmptyReadonlyArray<Layer.Layer.Any> | never[], CtxId, CtxTag extends string, RRet, RErr, RCtx>(middleware: Middleware<MiddlewareContext, CTXMap, MiddlewareR, Layers, CtxId, CtxTag, RRet, RErr, RCtx>, devMode: boolean) => {
+export declare const makeRouter: <MiddlewareR, RequestContextMap extends Record<string, RPCContextMap.Any>, MakeMiddlewareR, MiddlewareDependencies extends NonEmptyArray<Layer.Layer.Any>, ContextProviderId, ContextProviderKey extends string, ContextProviderA, MakeContextProviderE, MakeContextProviderR>(middleware: Middleware<MiddlewareR, RequestContextMap, MakeMiddlewareR, MiddlewareDependencies, ContextProviderId, ContextProviderKey, ContextProviderA, MakeContextProviderE, MakeContextProviderR>, devMode: boolean) => {
     matchAll: <T extends {
         [key: string]: {
             routes: Layer.Layer<any, any, any>;
@@ -109,7 +109,7 @@ export declare const makeRouter: <MiddlewareContext, CTXMap extends Record<strin
             meta: {
                 moduleName: ModuleName;
             };
-        })[K]>>, RRet | GetEffectContext<CTXMap, (Resource & {
+        })[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, (Resource & {
             meta: {
                 moduleName: ModuleName;
             };
@@ -131,7 +131,7 @@ export declare const makeRouter: <MiddlewareContext, CTXMap extends Record<strin
             meta: {
                 moduleName: ModuleName;
             };
-        })[K]>>, RRet | GetEffectContext<CTXMap, (Resource & {
+        })[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, (Resource & {
             meta: {
                 moduleName: ModuleName;
             };
@@ -145,7 +145,7 @@ export declare const makeRouter: <MiddlewareContext, CTXMap extends Record<strin
             meta: {
                 moduleName: ModuleName;
             };
-        })[K]>>, RRet | GetEffectContext<CTXMap, (Resource & {
+        })[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, (Resource & {
             meta: {
                 moduleName: ModuleName;
             };
@@ -158,7 +158,7 @@ export declare const makeRouter: <MiddlewareContext, CTXMap extends Record<strin
         meta: {
             moduleName: ModuleName;
         };
-    })[K]>>, RRet | GetEffectContext<CTXMap, (Resource & {
+    })[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, (Resource & {
         meta: {
             moduleName: ModuleName;
         };
@@ -178,7 +178,7 @@ export declare const makeRouter: <MiddlewareContext, CTXMap extends Record<strin
         meta: {
             moduleName: ModuleName;
         };
-    })[K]>>, RRet | GetEffectContext<CTXMap, (Resource & {
+    })[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, (Resource & {
         meta: {
             moduleName: ModuleName;
         };
@@ -190,7 +190,7 @@ export declare const makeRouter: <MiddlewareContext, CTXMap extends Record<strin
         meta: {
             moduleName: ModuleName;
         };
-    })[K]>>, RRet | GetEffectContext<CTXMap, (Resource & {
+    })[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, (Resource & {
         meta: {
             moduleName: ModuleName;
         };
@@ -204,9 +204,9 @@ export declare const makeRouter: <MiddlewareContext, CTXMap extends Record<strin
         };
     }>[K_1], Impl[K_1] extends {
         raw: any;
-    } ? "raw" : "d", Exclude<MiddlewareContext, HttpRouter.HttpRouter.Provided> | Exclude<Exclude<Impl[K_1] extends {
+    } ? "raw" : "d", Exclude<MiddlewareR, HttpRouter.HttpRouter.Provided> | Exclude<Exclude<Impl[K_1] extends {
         raw: any;
-    } ? Impl[K_1]["raw"] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K_1]["raw"] extends Effect<any, any, infer R_1> ? R_1 : Impl[K_1]["raw"] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R_2>>, any, any> ? R_2 : never : Impl[K_1] extends (...args: any[]) => Effect<any, any, infer R_3> ? R_3 : Impl[K_1] extends Effect<any, any, infer R_4> ? R_4 : Impl[K_1] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R_5>>, any, any> ? R_5 : never, GetEffectContext<CTXMap, (Resource & {
+    } ? Impl[K_1]["raw"] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K_1]["raw"] extends Effect<any, any, infer R_1> ? R_1 : Impl[K_1]["raw"] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R_2>>, any, any> ? R_2 : never : Impl[K_1] extends (...args: any[]) => Effect<any, any, infer R_3> ? R_3 : Impl[K_1] extends Effect<any, any, infer R_4> ? R_4 : Impl[K_1] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R_5>>, any, any> ? R_5 : never, GetEffectContext<RequestContextMap, (Resource & {
         meta: {
             moduleName: ModuleName;
         };
@@ -219,22 +219,22 @@ export declare const makeRouter: <MiddlewareContext, CTXMap extends Record<strin
         <const Make extends {
             dependencies: Array<Layer.Layer.Any>;
             effect: (match: <const Impl extends { [K in keyof FilterRequestModules<Resource_1>]: ({
-                raw: (req: S.Schema.Type<Resource_1[K]>) => Generator<YieldWrap<Effect<any, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>>, S.Schema.Encoded<GetSuccess<Resource_1[K]>>, never>;
+                raw: (req: S.Schema.Type<Resource_1[K]>) => Generator<YieldWrap<Effect<any, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>>, S.Schema.Encoded<GetSuccess<Resource_1[K]>>, never>;
             } | {
-                raw: (req: S.Schema.Type<Resource_1[K]>) => Effect<S.Schema.Encoded<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>;
+                raw: (req: S.Schema.Type<Resource_1[K]>) => Effect<S.Schema.Encoded<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>;
             } | {
-                raw: Effect<S.Schema.Encoded<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>;
-            }) | (((req: S.Schema.Type<Resource_1[K]>) => Generator<YieldWrap<Effect<any, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>>, S.Schema.Type<GetSuccess<Resource_1[K]>>, never>) | ((req: S.Schema.Type<Resource_1[K]>) => Effect<S.Schema.Type<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>) | Effect<S.Schema.Type<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>); }>(impl: Impl) => { [K in keyof Impl & keyof FilterRequestModules<Resource_1>]: Handler<FilterRequestModules<Resource_1>[K], Impl[K] extends {
+                raw: Effect<S.Schema.Encoded<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>;
+            }) | (((req: S.Schema.Type<Resource_1[K]>) => Generator<YieldWrap<Effect<any, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>>, S.Schema.Type<GetSuccess<Resource_1[K]>>, never>) | ((req: S.Schema.Type<Resource_1[K]>) => Effect<S.Schema.Type<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>) | Effect<S.Schema.Type<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>); }>(impl: Impl) => { [K in keyof Impl & keyof FilterRequestModules<Resource_1>]: Handler<FilterRequestModules<Resource_1>[K], Impl[K] extends {
                 raw: any;
-            } ? RequestTypes.TYPE : RequestTypes.DECODED, Exclude<MiddlewareContext | Exclude<Impl[K] extends {
+            } ? RequestTypes.TYPE : RequestTypes.DECODED, Exclude<MiddlewareR | Exclude<Impl[K] extends {
                 raw: any;
-            } ? Impl[K]["raw"] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K]["raw"] extends Effect<any, any, infer R> ? R : Impl[K]["raw"] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never : Impl[K] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K] extends Effect<any, any, infer R> ? R : Impl[K] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never, GetEffectContext<CTXMap, Resource_1[K]["config"]>>, HttpRouter.HttpRouter.Provided>>; }) => Generator<YieldWrap<Effect<any, any, Make["strict"] extends false ? any : LayersUtils.GetLayersSuccess<Make["dependencies"]>>>, { [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any>;
+            } ? Impl[K]["raw"] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K]["raw"] extends Effect<any, any, infer R> ? R : Impl[K]["raw"] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never : Impl[K] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K] extends Effect<any, any, infer R> ? R : Impl[K] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never, GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>, HttpRouter.HttpRouter.Provided>>; }) => Generator<YieldWrap<Effect<any, any, Make["strict"] extends false ? any : LayersUtils.GetLayersSuccess<Make["dependencies"]>>>, { [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any>;
             strict?: boolean;
             /** @deprecated */
             readonly ಠ_ಠ: never;
         }>(make: Make): {
             moduleName: ModuleName;
-            routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayersUtils.GetLayersError<Make["dependencies"]>, LayersUtils.GetLayersContext<Make["dependencies"]> | Exclude<MakeContext<Make> | MiddlewareR | RCtx, LayersUtils.GetLayersSuccess<Make["dependencies"]> | LayersUtils.GetLayersSuccess<Layers>>>;
+            routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayersUtils.GetLayersError<Make["dependencies"]> | LayersUtils.GetLayersError<MiddlewareDependencies> | MakeContextProviderE, LayersUtils.GetLayersContext<Make["dependencies"]> | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>> | LayersUtils.GetLayersContext<MiddlewareDependencies> | MakeContextProviderR | Exclude<MakeContext<Make>, LayersUtils.GetLayersSuccess<Make["dependencies"]>>>;
             make: Make;
         };
         <const Make extends {
@@ -245,7 +245,7 @@ export declare const makeRouter: <MiddlewareContext, CTXMap extends Record<strin
             readonly ಠ_ಠ: never;
         }>(make: Make): {
             moduleName: ModuleName;
-            routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayersUtils.GetLayersError<Make["dependencies"]>, LayersUtils.GetLayersContext<Make["dependencies"]> | Exclude<MakeContext<Make> | MiddlewareR | RCtx, LayersUtils.GetLayersSuccess<Make["dependencies"]> | LayersUtils.GetLayersSuccess<Layers>>>;
+            routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayersUtils.GetLayersError<Make["dependencies"]> | LayersUtils.GetLayersError<MiddlewareDependencies> | MakeContextProviderE, LayersUtils.GetLayersContext<Make["dependencies"]> | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>> | LayersUtils.GetLayersContext<MiddlewareDependencies> | MakeContextProviderR | Exclude<MakeContext<Make>, LayersUtils.GetLayersSuccess<Make["dependencies"]>>>;
             make: Make;
         };
         <const Make extends {
@@ -256,7 +256,7 @@ export declare const makeRouter: <MiddlewareContext, CTXMap extends Record<strin
             readonly ಠ_ಠ: never;
         }>(make: Make): {
             moduleName: ModuleName;
-            routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayersUtils.GetLayersError<Make["dependencies"]>, LayersUtils.GetLayersContext<Make["dependencies"]> | Exclude<MakeContext<Make> | MiddlewareR | RCtx, LayersUtils.GetLayersSuccess<Make["dependencies"]> | LayersUtils.GetLayersSuccess<Layers>>>;
+            routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayersUtils.GetLayersError<Make["dependencies"]> | LayersUtils.GetLayersError<MiddlewareDependencies> | MakeContextProviderE, LayersUtils.GetLayersContext<Make["dependencies"]> | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>> | LayersUtils.GetLayersContext<MiddlewareDependencies> | MakeContextProviderR | Exclude<MakeContext<Make>, LayersUtils.GetLayersSuccess<Make["dependencies"]>>>;
             make: Make;
         };
         <const Make extends {
@@ -267,7 +267,7 @@ export declare const makeRouter: <MiddlewareContext, CTXMap extends Record<strin
             readonly ಠ_ಠ: never;
         }>(make: Make): {
             moduleName: ModuleName;
-            routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayersUtils.GetLayersError<Make["dependencies"]>, LayersUtils.GetLayersContext<Make["dependencies"]> | Exclude<MakeContext<Make> | MiddlewareR | RCtx, LayersUtils.GetLayersSuccess<Make["dependencies"]> | LayersUtils.GetLayersSuccess<Layers>>>;
+            routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayersUtils.GetLayersError<Make["dependencies"]> | LayersUtils.GetLayersError<MiddlewareDependencies> | MakeContextProviderE, LayersUtils.GetLayersContext<Make["dependencies"]> | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>> | LayersUtils.GetLayersContext<MiddlewareDependencies> | MakeContextProviderR | Exclude<MakeContext<Make>, LayersUtils.GetLayersSuccess<Make["dependencies"]>>>;
             make: Make;
         };
         <const Make extends {
@@ -278,7 +278,7 @@ export declare const makeRouter: <MiddlewareContext, CTXMap extends Record<strin
             readonly ಠ_ಠ: never;
         }>(make: Make): {
             moduleName: ModuleName;
-            routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayersUtils.GetLayersError<Make["dependencies"]>, LayersUtils.GetLayersContext<Make["dependencies"]> | Exclude<MakeContext<Make> | MiddlewareR | RCtx, LayersUtils.GetLayersSuccess<Make["dependencies"]> | LayersUtils.GetLayersSuccess<Layers>>>;
+            routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayersUtils.GetLayersError<Make["dependencies"]> | LayersUtils.GetLayersError<MiddlewareDependencies> | MakeContextProviderE, LayersUtils.GetLayersContext<Make["dependencies"]> | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>> | LayersUtils.GetLayersContext<MiddlewareDependencies> | MakeContextProviderR | Exclude<MakeContext<Make>, LayersUtils.GetLayersSuccess<Make["dependencies"]>>>;
             make: Make;
         };
         <const Make extends {
@@ -287,26 +287,26 @@ export declare const makeRouter: <MiddlewareContext, CTXMap extends Record<strin
             strict?: boolean;
         }>(make: Make): {
             moduleName: ModuleName;
-            routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayersUtils.GetLayersError<Make["dependencies"]>, LayersUtils.GetLayersContext<Make["dependencies"]> | Exclude<MakeContext<Make> | MiddlewareR | RCtx, LayersUtils.GetLayersSuccess<Make["dependencies"]> | LayersUtils.GetLayersSuccess<Layers>>>;
+            routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayersUtils.GetLayersError<Make["dependencies"]> | LayersUtils.GetLayersError<MiddlewareDependencies> | MakeContextProviderE, LayersUtils.GetLayersContext<Make["dependencies"]> | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>> | LayersUtils.GetLayersContext<MiddlewareDependencies> | MakeContextProviderR | Exclude<MakeContext<Make>, LayersUtils.GetLayersSuccess<Make["dependencies"]>>>;
             make: Make;
         };
         <const Make extends {
             dependencies: Array<Layer.Layer.Any>;
             effect: (match: <const Impl extends { [K in keyof FilterRequestModules<Resource_1>]: ({
-                raw: (req: S.Schema.Type<Resource_1[K]>) => Generator<YieldWrap<Effect<any, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>>, S.Schema.Encoded<GetSuccess<Resource_1[K]>>, never>;
+                raw: (req: S.Schema.Type<Resource_1[K]>) => Generator<YieldWrap<Effect<any, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>>, S.Schema.Encoded<GetSuccess<Resource_1[K]>>, never>;
             } | {
-                raw: (req: S.Schema.Type<Resource_1[K]>) => Effect<S.Schema.Encoded<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>;
+                raw: (req: S.Schema.Type<Resource_1[K]>) => Effect<S.Schema.Encoded<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>;
             } | {
-                raw: Effect<S.Schema.Encoded<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>;
-            }) | (((req: S.Schema.Type<Resource_1[K]>) => Generator<YieldWrap<Effect<any, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>>, S.Schema.Type<GetSuccess<Resource_1[K]>>, never>) | ((req: S.Schema.Type<Resource_1[K]>) => Effect<S.Schema.Type<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>) | Effect<S.Schema.Type<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>); }>(impl: Impl) => { [K in keyof Impl & keyof FilterRequestModules<Resource_1>]: Handler<FilterRequestModules<Resource_1>[K], Impl[K] extends {
+                raw: Effect<S.Schema.Encoded<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>;
+            }) | (((req: S.Schema.Type<Resource_1[K]>) => Generator<YieldWrap<Effect<any, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>>, S.Schema.Type<GetSuccess<Resource_1[K]>>, never>) | ((req: S.Schema.Type<Resource_1[K]>) => Effect<S.Schema.Type<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>) | Effect<S.Schema.Type<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>); }>(impl: Impl) => { [K in keyof Impl & keyof FilterRequestModules<Resource_1>]: Handler<FilterRequestModules<Resource_1>[K], Impl[K] extends {
                 raw: any;
-            } ? RequestTypes.TYPE : RequestTypes.DECODED, Exclude<MiddlewareContext | Exclude<Impl[K] extends {
+            } ? RequestTypes.TYPE : RequestTypes.DECODED, Exclude<MiddlewareR | Exclude<Impl[K] extends {
                 raw: any;
-            } ? Impl[K]["raw"] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K]["raw"] extends Effect<any, any, infer R> ? R : Impl[K]["raw"] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never : Impl[K] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K] extends Effect<any, any, infer R> ? R : Impl[K] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never, GetEffectContext<CTXMap, Resource_1[K]["config"]>>, HttpRouter.HttpRouter.Provided>>; }) => Generator<YieldWrap<Effect<any, any, Make["strict"] extends false ? any : LayersUtils.GetLayersSuccess<Make["dependencies"]>>>, { [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any>;
+            } ? Impl[K]["raw"] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K]["raw"] extends Effect<any, any, infer R> ? R : Impl[K]["raw"] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never : Impl[K] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K] extends Effect<any, any, infer R> ? R : Impl[K] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never, GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>, HttpRouter.HttpRouter.Provided>>; }) => Generator<YieldWrap<Effect<any, any, Make["strict"] extends false ? any : LayersUtils.GetLayersSuccess<Make["dependencies"]>>>, { [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any>;
             strict?: boolean;
         }>(make: Make): {
             moduleName: ModuleName;
-            routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayersUtils.GetLayersError<Make["dependencies"]>, LayersUtils.GetLayersContext<Make["dependencies"]> | Exclude<MakeContext<Make> | MiddlewareR | RCtx, LayersUtils.GetLayersSuccess<Make["dependencies"]> | LayersUtils.GetLayersSuccess<Layers>>>;
+            routes: Layer.Layer<RouterShape<Resource_1>, MakeErrors<Make> | LayersUtils.GetLayersError<Make["dependencies"]> | LayersUtils.GetLayersError<MiddlewareDependencies> | MakeContextProviderE, LayersUtils.GetLayersContext<Make["dependencies"]> | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>> | LayersUtils.GetLayersContext<MiddlewareDependencies> | MakeContextProviderR | Exclude<MakeContext<Make>, LayersUtils.GetLayersSuccess<Make["dependencies"]>>>;
             make: Make;
         };
         <const Make extends {
@@ -315,23 +315,23 @@ export declare const makeRouter: <MiddlewareContext, CTXMap extends Record<strin
             strict?: boolean;
         }>(make: Make): {
             moduleName: ModuleName;
-            Router: HttpRouter.HttpRouter.TagClass<RouterShape<Resource_1>, `${ModuleName}Router`, never, Exclude<MiddlewareContext, HttpRouter.HttpRouter.Provided>>;
+            Router: HttpRouter.HttpRouter.TagClass<RouterShape<Resource_1>, `${ModuleName}Router`, never, Exclude<MiddlewareR, HttpRouter.HttpRouter.Provided>>;
             routes: any;
             make: Make;
         };
-    } & RouteMatcher<CTXMap, Resource_1, MiddlewareContext> & {
+    } & RouteMatcher<RequestContextMap, Resource_1, MiddlewareR> & {
         router: AddAction<FilterRequestModules<Resource_1>[keyof FilterRequestModules<Resource_1>], {}>;
         router3: <const Impl extends { [K in keyof FilterRequestModules<Resource_1>]: ({
-            raw: (req: S.Schema.Type<Resource_1[K]>) => Generator<YieldWrap<Effect<any, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>>, S.Schema.Encoded<GetSuccess<Resource_1[K]>>, never>;
+            raw: (req: S.Schema.Type<Resource_1[K]>) => Generator<YieldWrap<Effect<any, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>>, S.Schema.Encoded<GetSuccess<Resource_1[K]>>, never>;
         } | {
-            raw: (req: S.Schema.Type<Resource_1[K]>) => Effect<S.Schema.Encoded<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>;
+            raw: (req: S.Schema.Type<Resource_1[K]>) => Effect<S.Schema.Encoded<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>;
         } | {
-            raw: Effect<S.Schema.Encoded<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>;
-        }) | (((req: S.Schema.Type<Resource_1[K]>) => Generator<YieldWrap<Effect<any, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>>, S.Schema.Type<GetSuccess<Resource_1[K]>>, never>) | ((req: S.Schema.Type<Resource_1[K]>) => Effect<S.Schema.Type<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>) | Effect<S.Schema.Type<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, RRet | GetEffectContext<CTXMap, Resource_1[K]["config"]>>); }>(impl: Impl) => { [K in keyof Impl & keyof FilterRequestModules<Resource_1>]: Handler<FilterRequestModules<Resource_1>[K], Impl[K] extends {
+            raw: Effect<S.Schema.Encoded<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>;
+        }) | (((req: S.Schema.Type<Resource_1[K]>) => Generator<YieldWrap<Effect<any, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>>, S.Schema.Type<GetSuccess<Resource_1[K]>>, never>) | ((req: S.Schema.Type<Resource_1[K]>) => Effect<S.Schema.Type<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>) | Effect<S.Schema.Type<GetSuccess<Resource_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Resource_1[K]>>, ContextProviderA | GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>); }>(impl: Impl) => { [K in keyof Impl & keyof FilterRequestModules<Resource_1>]: Handler<FilterRequestModules<Resource_1>[K], Impl[K] extends {
             raw: any;
-        } ? RequestTypes.TYPE : RequestTypes.DECODED, Exclude<MiddlewareContext | Exclude<Impl[K] extends {
+        } ? RequestTypes.TYPE : RequestTypes.DECODED, Exclude<MiddlewareR | Exclude<Impl[K] extends {
             raw: any;
-        } ? Impl[K]["raw"] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K]["raw"] extends Effect<any, any, infer R> ? R : Impl[K]["raw"] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never : Impl[K] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K] extends Effect<any, any, infer R> ? R : Impl[K] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never, GetEffectContext<CTXMap, Resource_1[K]["config"]>>, HttpRouter.HttpRouter.Provided>>; };
+        } ? Impl[K]["raw"] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K]["raw"] extends Effect<any, any, infer R> ? R : Impl[K]["raw"] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never : Impl[K] extends (...args: any[]) => Effect<any, any, infer R> ? R : Impl[K] extends Effect<any, any, infer R> ? R : Impl[K] extends (...args: any[]) => Generator<YieldWrap<Effect<any, any, infer R>>, any, any> ? R : never, GetEffectContext<RequestContextMap, Resource_1[K]["config"]>>, HttpRouter.HttpRouter.Provided>>; };
     };
 };
 export type MakeDeps<Make> = Make extends {
@@ -373,10 +373,9 @@ export declare const contextMaker: <TDeps extends Array.NonEmptyReadonlyArray<(C
     dependencies: { [K in keyof TDeps]: TDeps[K]["Default"]; };
     effect: Effect.Effect<Effect.Effect<Context.Context<GetContext<Effect.Success<InstanceType<TDeps[number]>>>>, Effect.Error<InstanceType<TDeps[number]>>, Effect.Context<InstanceType<TDeps[number]>>>, never, InstanceType<TDeps[number]>>;
 };
-declare const DefaultContextMaker_base: Effect.Service.Class<DefaultContextMaker, "DefaultContextMaker", {
+declare const EmptyContextMaker_base: Effect.Service.Class<EmptyContextMaker, "EmptyContextMaker", {
     readonly succeed: Effect.Effect<Context.Context<never>, never, never>;
 }>;
-export declare class DefaultContextMaker extends DefaultContextMaker_base {
+export declare class EmptyContextMaker extends EmptyContextMaker_base {
 }
-export {};
 //# sourceMappingURL=routing.d.ts.map