@effect-app/infra 2.78.8 → 2.80.0

package/dist/api/routing/middleware/middleware.js

@@ -3,38 +3,28 @@ import { Cause, Context, Effect, ParseResult } from "effect-app";
 import { pretty } from "effect-app/utils";
 import { logError, reportError } from "../../../errorReporter.js";
 import { InfraLogger } from "../../../logger.js";
-import { genericMiddleware, RequestCacheLayers } from "../../routing.js";
+import { RequestCacheLayers, Tag } from "../../routing.js";
 const logRequestError = logError("Request");
 const reportRequestError = reportError("Request");
 export class DevMode extends Context.Reference()("DevMode", { defaultValue: () => false }) {
 }
-// Effect Rpc Middleware: Wrap
-export class RequestCacheMiddleware extends Effect.Service()("RequestCacheMiddleware", {
-    effect: Effect.gen(function* () {
-        return genericMiddleware(Effect.fnUntraced(function* (options) {
-            return yield* options.next.pipe(Effect.provide(RequestCacheLayers));
-        }));
-    })
+export class RequestCacheMiddleware extends Tag()("RequestCacheMiddleware", { wrap: true })({
+    effect: Effect.succeed((options) => options.next.pipe(Effect.provide(RequestCacheLayers)))
 }) {
 }
-// Effect Rpc Middleware: Wrap
-export class ConfigureInterruptibility extends Effect.Service()("ConfigureInterruptibility", {
-    effect: Effect.gen(function* () {
-        return genericMiddleware(Effect.fnUntraced(function* (options) {
-            return yield* options.next.pipe(
-            // TODO: make this depend on query/command, and consider if middleware also should be affected. right now it's not.
-            Effect.uninterruptible);
-        }));
-    })
+export class ConfigureInterruptibility extends Tag()("ConfigureInterruptibility", { wrap: true })({
+    effect: Effect.succeed((options) => options.next.pipe(
+    // TODO: make this depend on query/command, and consider if middleware also should be affected. right now it's not.
+    Effect.uninterruptible))
 }) {
 }
-// Effect Rpc Middleware: Wrap
-export class MiddlewareLogger extends Effect.Service()("MiddlewareLogger", {
+export class MiddlewareLogger extends Tag()("MiddlewareLogger", { wrap: true })({
     effect: Effect.gen(function* () {
-        return genericMiddleware(Effect.fnUntraced(function* ({ headers, next, payload, rpc }) {
-            const devMode = yield* DevMode;
-            return yield* Effect
-                .annotateCurrentSpan("requestInput", typeof payload === "object" && payload !== null
+        const devMode = yield* DevMode;
+        return ({ headers, next, payload, rpc }) => Effect
+            .annotateCurrentSpan({
+            "request.name": rpc._tag,
+            "requestInput": typeof payload === "object" && payload !== null
                 ? Object.entries(payload).reduce((prev, [key, value]) => {
                     prev[key] = key === "password"
                         ? "<redacted>"
@@ -51,33 +41,33 @@ export class MiddlewareLogger extends Effect.Service()("MiddlewareLogger", {
                                         : typeof value;
                     return prev;
                 }, {})
-                : payload)
-                .pipe(
-            // can't use andThen due to some being a function and effect
-            Effect.zipRight(next), 
-            // TODO: support ParseResult if the error channel of the request allows it.. but who would want that?
-            Effect.catchAll((_) => ParseResult.isParseError(_) ? Effect.die(_) : Effect.fail(_)), Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void), Effect.tapDefect((cause) => Effect
-                .all([
-                reportRequestError(cause, {
-                    action: rpc._tag
-                }),
-                InfraLogger
-                    .logError("Finished request", cause)
-                    .pipe(Effect.annotateLogs({
-                    action: rpc._tag,
-                    req: pretty(payload),
-                    headers: pretty(headers)
-                    // resHeaders: pretty(
-                    //   Object
-                    //     .entries(headers)
-                    //     .reduce((prev, [key, value]) => {
-                    //       prev[key] = value && typeof value === "string" ? snipString(value) : value
-                    //       return prev
-                    //     }, {} as Record<string, any>)
-                    // )
-                }))
-            ])), devMode ? (_) => _ : Effect.catchAllDefect(() => Effect.die("Internal Server Error")));
-        }));
+                : payload
+        })
+            .pipe(
+        // can't use andThen due to some being a function and effect
+        Effect.zipRight(next), 
+        // TODO: support ParseResult if the error channel of the request allows it.. but who would want that?
+        Effect.catchAll((_) => ParseResult.isParseError(_) ? Effect.die(_) : Effect.fail(_)), Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void), Effect.tapDefect((cause) => Effect
+            .all([
+            reportRequestError(cause, {
+                action: rpc._tag
+            }),
+            InfraLogger
+                .logError("Finished request", cause)
+                .pipe(Effect.annotateLogs({
+                action: rpc._tag,
+                req: pretty(payload),
+                headers: pretty(headers)
+                // resHeaders: pretty(
+                //   Object
+                //     .entries(headers)
+                //     .reduce((prev, [key, value]) => {
+                //       prev[key] = value && typeof value === "string" ? snipString(value) : value
+                //       return prev
+                //     }, {} as Record<string, any>)
+                // )
+            }))
+        ])), devMode ? (_) => _ : Effect.catchAllDefect(() => Effect.die("Internal Server Error")));
     })
 }) {
 }
@@ -86,4 +76,4 @@ export const DefaultGenericMiddlewares = [
     ConfigureInterruptibility,
     MiddlewareLogger
 ];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcGkvcm91dGluZy9taWRkbGV3YXJlL21pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsdURBQXVEO0FBQ3ZELE9BQU8sRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDaEUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBQ3pDLE9BQU8sRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLE1BQU0sMkJBQTJCLENBQUE7QUFDakUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQ2hELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBRXhFLE1BQU0sZUFBZSxHQUFHLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUMzQyxNQUFNLGtCQUFrQixHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUVqRCxNQUFNLE9BQU8sT0FBUSxTQUFRLE9BQU8sQ0FBQyxTQUFTLEVBQVcsQ0FBQyxTQUFTLEVBQUUsRUFBRSxZQUFZLEVBQUUsR0FBRyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUM7Q0FBRztBQUN0Ryw4QkFBOEI7QUFDOUIsTUFBTSxPQUFPLHNCQUF1QixTQUFRLE1BQU0sQ0FBQyxPQUFPLEVBQTBCLENBQUMsd0JBQXdCLEVBQUU7SUFDN0csTUFBTSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQzFCLE9BQU8saUJBQWlCLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsRUFBQyxPQUFPO1lBQzFELE9BQU8sS0FBSyxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsQ0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcGkvcm91dGluZy9taWRkbGV3YXJlL21pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsdURBQXVEO0FBQ3ZELE9BQU8sRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDaEUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBQ3pDLE9BQU8sRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLE1BQU0sMkJBQTJCLENBQUE7QUFDakUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQ2hELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUUxRCxNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUE7QUFDM0MsTUFBTSxrQkFBa0IsR0FBRyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUE7QUFFakQsTUFBTSxPQUFPLE9BQVEsU0FBUSxPQUFPLENBQUMsU0FBUyxFQUFXLENBQUMsU0FBUyxFQUFFLEVBQUUsWUFBWSxFQUFFLEdBQUcsRUFBRSxDQUFDLEtBQUssRUFBRSxDQUFDO0NBQUc7QUFFdEcsTUFBTSxPQUFPLHNCQUF1QixTQUFRLEdBQUcsRUFBMEIsQ0FBQyx3QkFBd0IsRUFBRSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ2xILE1BQU0sRUFBRSxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQztDQUMzRixDQUFDO0NBQ0Q7QUFFRCxNQUFNLE9BQU8seUJBQ1gsU0FBUSxHQUFHLEVBQTZC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

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

@@ -3,4 +3,5 @@ export * from "./middleware/dynamic-middleware.js";
 export * from "./middleware/DynamicMiddleware.js";
 export * from "./middleware/generic-middleware.js";
 export * from "./middleware/middleware.js";
+export * as Middleware from "./middleware.js";
 //# sourceMappingURL=middleware.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/api/routing/middleware.ts"],"names":[],"mappings":"AACA,cAAc,iCAAiC,CAAA;AAC/C,cAAc,oCAAoC,CAAA;AAClD,cAAc,mCAAmC,CAAA;AACjD,cAAc,oCAAoC,CAAA;AAClD,cAAc,4BAA4B,CAAA"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/api/routing/middleware.ts"],"names":[],"mappings":"AACA,cAAc,iCAAiC,CAAA;AAC/C,cAAc,oCAAoC,CAAA;AAClD,cAAc,mCAAmC,CAAA;AACjD,cAAc,oCAAoC,CAAA;AAClD,cAAc,4BAA4B,CAAA;AAG1C,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA"}

package/dist/api/routing/middleware.js

@@ -5,4 +5,5 @@ export * from "./middleware/DynamicMiddleware.js";
 export * from "./middleware/generic-middleware.js";
 export * from "./middleware/middleware.js";
 // codegen:end
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcGkvcm91dGluZy9taWRkbGV3YXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRFQUE0RTtBQUM1RSxjQUFjLGlDQUFpQyxDQUFBO0FBQy9DLGNBQWMsb0NBQW9DLENBQUE7QUFDbEQsY0FBYyxtQ0FBbUMsQ0FBQTtBQUNqRCxjQUFjLG9DQUFvQyxDQUFBO0FBQ2xELGNBQWMsNEJBQTRCLENBQUE7QUFDMUMsY0FBYyJ9
+export * as Middleware from "./middleware.js";
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcGkvcm91dGluZy9taWRkbGV3YXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRFQUE0RTtBQUM1RSxjQUFjLGlDQUFpQyxDQUFBO0FBQy9DLGNBQWMsb0NBQW9DLENBQUE7QUFDbEQsY0FBYyxtQ0FBbUMsQ0FBQTtBQUNqRCxjQUFjLG9DQUFvQyxDQUFBO0FBQ2xELGNBQWMsNEJBQTRCLENBQUE7QUFDMUMsY0FBYztBQUVkLE9BQU8sS0FBSyxVQUFVLE1BQU0saUJBQWlCLENBQUEifQ==

package/dist/api/routing.d.ts

@@ -1,10 +1,10 @@
-import { type Array, Effect, Layer, S } from "effect-app";
+import { type Array, Effect, Layer, S, type Scope } 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 LayerUtils } from "./layerUtils.js";
-import { type Middleware } from "./routing/middleware.js";
+import { type RouterMiddleware } from "./routing/middleware.js";
 export * from "./routing/middleware.js";
 export type AnyRequestModule = S.Schema.Any & {
     _tag: string;
@@ -58,8 +58,8 @@ export interface RouterShape<Resource> {
     [RouterSymbol]: Resource;
 }
 type Match<Resource extends Record<string, any>, RequestContextMap extends Record<string, any>, RT extends RequestType, Key extends keyof Resource> = {
-    <A extends GetSuccessShape<Resource[Key], RT>, R2 = never, E = never>(f: Effect<A, E, R2>): Handler<Resource[Key], RT, Exclude<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<Exclude<R2, GetEffectContext<RequestContextMap, Resource[Key]["config"]>>, HttpRouter.HttpRouter.Provided>>;
+    <A extends GetSuccessShape<Resource[Key], RT>, R2 = never, E = never>(f: Effect<A, E, R2>): Handler<Resource[Key], RT, Exclude<Exclude<R2, GetEffectContext<RequestContextMap, Resource[Key]["config"]>>, Scope.Scope>>;
+    <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<Exclude<R2, GetEffectContext<RequestContextMap, Resource[Key]["config"]>>, Scope.Scope>>;
 };
 export type RouteMatcher<RequestContextMap extends Record<string, any>, Resource extends Record<string, any>> = {
     [Key in keyof FilterRequestModules<Resource>]: Match<Resource, RequestContextMap, RequestTypes.DECODED, Key> & {
@@ -75,7 +75,7 @@ export type RouteMatcher<RequestContextMap extends Record<string, any>, Resource
 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: <RequestContextMap extends Record<string, RPCContextMap.Any>, MakeMiddlewareE, MakeMiddlewareR, ContextProviderA>(middleware: Middleware<RequestContextMap, MakeMiddlewareE, MakeMiddlewareR, ContextProviderA>, devMode: boolean) => {
+export declare const makeRouter: <RequestContextMap extends Record<string, RPCContextMap.Any>, MakeMiddlewareE, MakeMiddlewareR, ContextProviderA>(middleware: RouterMiddleware<RequestContextMap, MakeMiddlewareE, MakeMiddlewareR, ContextProviderA>, devMode: boolean) => {
     matchAll: <T extends {
         [key: string]: {
             routes: Layer.Layer<any, any, any>;
@@ -200,7 +200,7 @@ export declare const makeRouter: <RequestContextMap extends Record<string, RPCCo
         meta: {
             moduleName: ModuleName;
         };
-    })[K_1]["config"]>>, HttpRouter.HttpRouter.Provided>>; };
+    })[K_1]["config"]>>, Scope.Scope>>; };
     Router: <const ModuleName extends string, const Resource_1 extends Record<string, any>>(rsc: Resource_1 & {
         meta: {
             moduleName: ModuleName;
@@ -218,7 +218,7 @@ export declare const makeRouter: <RequestContextMap extends Record<string, RPCCo
                 raw: any;
             } ? RequestTypes.TYPE : RequestTypes.DECODED, Exclude<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<RequestContextMap, Resource_1[K]["config"]> | ContextProviderA>, HttpRouter.HttpRouter.Provided>>; }) => Generator<YieldWrap<Effect<any, any, Make["strict"] extends false ? any : LayerUtils.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"]> | ContextProviderA>, Scope.Scope>>; }) => Generator<YieldWrap<Effect<any, any, Make["strict"] extends false ? any : LayerUtils.GetLayersSuccess<Make["dependencies"]>>>, { [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any>;
             strict?: boolean;
             /** @deprecated */
             readonly ಠ_ಠ: never;
@@ -292,7 +292,7 @@ export declare const makeRouter: <RequestContextMap extends Record<string, RPCCo
                 raw: any;
             } ? RequestTypes.TYPE : RequestTypes.DECODED, Exclude<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<RequestContextMap, Resource_1[K]["config"]> | ContextProviderA>, HttpRouter.HttpRouter.Provided>>; }) => Generator<YieldWrap<Effect<any, any, Make["strict"] extends false ? any : LayerUtils.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"]> | ContextProviderA>, Scope.Scope>>; }) => Generator<YieldWrap<Effect<any, any, Make["strict"] extends false ? any : LayerUtils.GetLayersSuccess<Make["dependencies"]>>>, { [K in keyof FilterRequestModules<Resource_1>]: AnyHandler<Resource_1[K]>; }, any>;
             strict?: boolean;
         }>(make: Make): {
             moduleName: ModuleName;
@@ -321,7 +321,7 @@ export declare const makeRouter: <RequestContextMap extends Record<string, RPCCo
             raw: any;
         } ? RequestTypes.TYPE : RequestTypes.DECODED, Exclude<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<RequestContextMap, Resource_1[K]["config"]> | ContextProviderA>, 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"]> | ContextProviderA>, Scope.Scope>>; };
     };
 };
 export type MakeDeps<Make> = Make extends {

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

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

package/dist/api/routing.js

@@ -127,7 +127,7 @@ export const makeRouter = (middleware, devMode) => {
                             : resource,
                         rpc.effect(resource, (req, headers) => handle(req, headers).pipe(Effect.withSpan("Request." + meta.moduleName + "." + resource._tag, {
                             captureStackTrace: () => handler.stack
-                        }), Effect.provideService(DevMode, devMode)), meta.moduleName),
+                        })), meta.moduleName),
                         meta.moduleName
                     ];
                     return acc;
@@ -151,7 +151,7 @@ export const makeRouter = (middleware, devMode) => {
             const routes = (layer.pipe(Layer.provide([
                 ...dependencies ?? [],
                 middleware.Default
-            ])));
+            ]), Layer.provide(Layer.succeed(DevMode, devMode))));
             // Effect.Effect<HttpRouter.HttpRouter<unknown, HttpRouter.HttpRouter.DefaultServices>, never, UserRouter>
             return {
                 moduleName: meta.moduleName,
@@ -172,4 +172,4 @@ export const makeRouter = (middleware, devMode) => {
     };
 };
 export const RequestCacheLayers = Layer.mergeAll(Layer.setRequestCache(Request.makeCache({ capacity: 500, timeToLive: Duration.hours(8) })), Layer.setRequestCaching(true), Layer.setRequestBatching(true));
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../src/api/routing.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAC5D,0DAA0D;AAC1D,4DAA4D;AAC5D,uDAAuD;AACvD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAA;AAChF,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,EAAc,QAAQ,EAAE,MAAM,EAAE,KAAK,EAA8B,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAErI,OAAO,EAAoB,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAI7D,OAAO,EAAE,OAAO,EAAmB,MAAM,yBAAyB,CAAA;AAElE,cAAc,yBAAyB,CAAA;AAEvC,uDAAuD;AACvD,MAAM,6BAA6B,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CACtD,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAM,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,gCAAgC,CAAC,CAAC,CAClG,CAAA;AA8BD,QAAQ;AACR,uCAAuC;AACvC,4CAA4C;AAC5C,IAAU,YAAY,CAKrB;AALD,WAAU,YAAY;IACP,oBAAO,GAAG,GAAY,CAAA;IAEtB,iBAAI,GAAG,KAAc,CAAA;AAEpC,CAAC,EALS,YAAY,KAAZ,YAAY,QAKrB;AAwCD,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,EAAE,CAAA;AAgEpC,MAAM,OAAO,MAAO,SAAQ,UAAU,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAU;CAAG;AAE1E,MAAM,CAAC,MAAM,UAAU,GAAG,CAMxB,UAKC,EACD,OAAgB,EAChB,EAAE;IACF,SAAS,QAAQ,CAIf,GAAoD;QA2DpD,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAA;QAGpB,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC1D,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;gBACxD,GAAG,CAAC,GAA2B,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;YAC7C,CAAC;YACD,OAAO,GAAG,CAAA;QACZ,CAAC,EAAE,EAAoB,CAAC,CAAA;QAExB,MAAM,YAAY,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC,MAAM,CACrD,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YACZ,CAAC;YAAC,IAAY,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,WAAgB,EAAE,EAAE;gBACvD,mDAAmD;gBACnD,IAAI,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,mBAAmB;oBAAE,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;gBACzG,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBAChE,OAAO,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC;oBACjC,CAAC,CAAC;wBACA,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;wBACzB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAA;wBACpB,MAAM,CAAC,IAAI,GAAG,YAAY,CAAC,OAAO,CAAA;wBAClC,MAAM,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,WAAW,CAAA;qBACnC;oBACD,CAAC,CAAC;wBACA,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;wBACzB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAA;wBACpB,MAAM,CAAC,IAAI,GAAG,YAAY,CAAC,OAAO,CAAA;wBAClC,MAAM,CAAC,OAAO,GAAG,WAAW,CAAA;qBAC7B,CAAA;YACL,CAAC,EAAE;gBACD,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO;gBACzB,UAAU,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;gBAC7C,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,OAAO;gBACzB,GAAG,EAAE,iGAAiG;gBACpG,oCAAoC;gBACpC,sHAAsH;gBACtH,CAAC,WAAgB,EAAE,EAAE;oBACnB,IAAI,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,mBAAmB;wBAAE,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;oBACzG,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;oBAChE,OAAO,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC;wBACjC,CAAC,CAAC;4BACA,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;4BACzB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAA;4BACpB,MAAM,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAA;4BAC/B,MAAM,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,WAAW,CAAA;yBACnC;wBACD,CAAC,CAAC;4BACA,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;4BACzB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAA;4BACpB,MAAM,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAA;4BAC/B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAA;yBAC7B,CAAA;gBACL,CAAC;aACJ,CAAC,CAAA;YACF,OAAO,IAAI,CAAA;QACb,CAAC,EACD,EAA+C,CAChD,CAAA;QAED,MAAM,MAAM,GAAoD;YAC9D,KAAK,EAAE,EAAE;YACT,GAAG,CAAC,CAAM;gBACR,CAAC;gBAAC,IAAI,CAAC,KAAa,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CACvC;gBAAC,IAAY,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBAClC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM;oBAAE,OAAO,IAAI,CAAC,KAAY,CAAA;gBACnG,OAAO,IAAW,CAAA;YACpB,CAAC;SACF,CAAA;QAED,MAAM,OAAO,GAmCT,CAAC,IAAuC,EAAE,EAAE,CAC9C,WAAW,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACpC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;YACnG,OAAO,GAAG,CAAA;QACZ,CAAC,EAAE,EAAS,CAAC,CAAA;QAEf,MAAM,UAAU,GAAG,CASjB,YAA8B,EAC9B,IAAuG,EACvG,EAAE;YAEF,MAAM,KAAK,GAAG,MAAM;iBACjB,GAAG,CAAC,QAAQ,CAAC;gBACZ,IAAI,GAAI,IAAY,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,mBAAmB;oBAC9D,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,IAAW,CAAC,CAAC,OAAO,CAAQ;oBAChD,CAAC,CAAC,IAAI,CAAA;gBAER,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,IAAI,CAAA;gBAC/B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,UAAU,CAAA;gBAE7B,oEAAoE;gBACpE,MAAM,MAAM,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;oBAC7D,MAAM,OAAO,GAAG,WAAW,CAAC,GAA+B,CAAC,CAAA;oBAC5D,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;oBAEzB,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAA;oBAErD,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;wBAC9B,CAAC,CAAC,CAAC,GAAoC,EAAE,OAA4B,EAAE,EAAE,CACvE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAQ,EAAE,6BAA6B,CAAC;wBACnF,CAAC,CAAC,CAAC,GAAoC,EAAE,OAA4B,EAAE,EAAE,CACvE,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAQ,CAAC,CAAA;oBAE9D,GAAG,CAAC,GAAG,CAAC,GAAG;wBACT,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI;4BAChC,CAAC,CAAC,KAAM,SAAS,QAAgB;gCAC/B,MAAM,CAAC,OAAO,GAAG,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;gCAClD,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC;oCAC7B,OAAO,IAAI,CAAC,WAAW,CAAA;gCACzB,CAAC;gCACD,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;oCAC3B,OAAO;wCACL,OAAO,EAAE,QAAQ,CAAC,OAAO;wCACzB,OAAO,EAAE,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC;qCAC3C,CAAA;gCACH,CAAC;6BACK;4BACR,CAAC,CAAC,QAAQ;wBACZ,GAAG,CAAC,MAAM,CACR,QAAQ,EACR,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CACf,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,CACvB,MAAM,CAAC,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,GAAG,GAAG,GAAG,QAAQ,CAAC,IAAI,EAAE;4BAClE,iBAAiB,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK;yBACvC,CAAC,EACF,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CACxC,EACH,IAAI,CAAC,UAAU,CAChB;wBACD,IAAI,CAAC,UAAU;qBACP,CAAA;oBACV,OAAO,GAAG,CAAA;gBACZ,CAAC,EAAE,EAAS,CAgBX,CAAA;gBAED,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CACxB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE;oBAC1C,OAAO,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;gBACxC,CAAC,CAAC,CACH,CAAA;gBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;oBAChD,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,EAAE;wBAC/D,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAAA;wBAC5B,OAAO,GAAG,CAAA;oBACZ,CAAC,EAAE,EAAyB,CAAC,CAAA;gBAC/B,CAAC,CAAC,CAOD,CAAA;gBAED,OAAO,SAAS;qBACb,KAAK,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,YAAY,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;qBAC3D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;qBAC7B,IAAI,CACH,KAAK,CAAC,YAAY,CAChB,SAAS,CAAC,iBAAiB,CACzB,EAAE,IAAI,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,UAAU,CAAiC,EAAE,SAAS,EAAE,MAAM,EAAE,CACrF,CACF,CACF,CAAA;YACL,CAAC,CAAC;iBACD,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;YAE3B,4EAA4E;YAC5E,MAAM,MAAM,GAAG,CACb,KAAK,CAAC,IAAI,CACR,KAAK,CAAC,OAAO,CAAC;gBACZ,GAAG,YAAY,IAAI,EAAE;gBACrB,UAAU,CAAC,OAAO;aACZ,CAAQ,CACjB,CASD,CAAA;YAEF,0GAA0G;YAE1G,OAAO;gBACL,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,MAAM;aACP,CAAA;QACH,CAAC,CAAA;QAED,MAAM,MAAM,GA8QV,CAAC,CAAC,IAAsD,EAAE,EAAE,CAC1D,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAQ,CAAA;QAE/E,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;IACjE,CAAC;IAED,SAAS,QAAQ,CASf,QAAW;QAEX,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAA;QAEvC,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAU,CAI7D,CAAA,CAAC,OAAO;IACX,CAAC;IAED,OAAO;QACL,QAAQ;QACR,QAAQ,EAAE,CAIR,GAAoD,EACpD,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO;QAC1B,MAAM,EAAE,QAAQ;KACjB,CAAA;AACH,CAAC,CAAA;AAyBD,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,CAAC,QAAQ,CAC9C,KAAK,CAAC,eAAe,CACnB,OAAO,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CACpE,EACD,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAC7B,KAAK,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAC/B,CAAA"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../src/api/routing.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "2.78.8",
+  "version": "2.80.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {

package/src/api/layerUtils.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { Context, Effect, type Layer, type NonEmptyReadonlyArray, Option } from "effect-app"
 import { InfraLogger } from "../logger.js"
 
@@ -21,14 +22,14 @@ export namespace LayerUtils {
     : never
 }
 
-export type ContextTagWithDefault<Id, A, LayerE, LayerR, Tag = unknown> =
-  & (Tag extends string ? Context.Tag<Id, { _tag: Tag } & A> : Context.Tag<Id, A>)
+export type ContextTagWithDefault<Id, A, LayerE, LayerR> =
+  & Context.Tag<Id, A>
   & {
     Default: Layer.Layer<Id, LayerE, LayerR>
   }
 
 export namespace ContextTagWithDefault {
-  export type Base<A> = ContextTagWithDefault<any, A, any, any, any>
+  export type Base<A> = ContextTagWithDefault<any, A, any, any>
 }
 
 export type GetContext<T> = T extends Context.Context<infer Y> ? Y : never
@@ -37,11 +38,9 @@ export const mergeContexts = Effect.fnUntraced(
   function*<T extends readonly { maker: any; handle: Effect<Context<any>> }[]>(makers: T) {
     let context = Context.empty()
     for (const mw of makers) {
-      yield* InfraLogger.logDebug("Building context for middleware", mw.maker.key ?? mw.maker)
       const moreContext = yield* mw.handle.pipe(Effect.provide(context))
       yield* InfraLogger.logDebug(
-        "Built context for middleware",
-        mw.maker.key ?? mw.maker,
+        "Built dynamic context for middleware" + (mw.maker.key ?? mw.maker),
         (moreContext as any).toJSON().services
       )
       context = Context.merge(context, moreContext)
@@ -54,11 +53,9 @@ export const mergeOptionContexts = Effect.fnUntraced(
   function*<T extends readonly { maker: any; handle: Effect<Option<Context<any>>> }[]>(makers: T) {
     let context = Context.empty()
     for (const mw of makers) {
-      yield* InfraLogger.logDebug("Building context for middleware", mw.maker.key ?? mw.maker)
       const moreContext = yield* mw.handle.pipe(Effect.provide(context))
       yield* InfraLogger.logDebug(
-        "Built context for middleware",
-        mw.maker.key ?? mw.maker,
+        "Built dynamic context for middleware" + (mw.maker.key ?? mw.maker),
         Option.map(moreContext, (c) => (c as any).toJSON().services)
       )
       if (moreContext.value) {

package/src/api/routing/middleware/ContextProvider.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { Context, Effect, Layer, type NonEmptyArray, pipe, type Scope } from "effect-app"
 
 import { type HttpRouter } from "effect-app/http"
@@ -25,12 +26,12 @@ export namespace EffectGenUtils {
     : never
 }
 
-// the context provider provides additional stuff
-export type ContextProviderShape<ContextProviderA, ContextProviderR extends HttpRouter.HttpRouter.Provided> = Effect<
-  Context.Context<ContextProviderA>,
-  never, // no errors are allowed
-  ContextProviderR
->
+// // the context provider provides additional stuff
+// export type ContextProviderShape<ContextProviderA, ContextProviderR> = Effect<
+//   Context.Context<ContextProviderA>,
+//   never, // no errors are allowed
+//   ContextProviderR
+// >
 
 export interface ContextProviderId {
   _tag: "ContextProvider"
@@ -49,6 +50,7 @@ type TDepsArr<TDeps extends ReadonlyArray<any>> = {
   // actual type in that position, I just wanna set the overall structure
   [K in keyof TDeps]: TDeps[K] extends //
   // E = never => the context provided cannot trigger errors
+  // TODO: remove HttpRouter.Provided - it's not even relevant outside of Http context, while ContextProviders are for anywhere. Only support Scope?
   //  _R extends HttpRouter.HttpRouter.Provided => the context provided can only have what HttpRouter.Provided provides as requirements
   (
     ContextTagWithDefault.Base<Effect<Context.Context<infer _1>, never, infer _R> & { _tag: infer _2 }>
@@ -117,7 +119,7 @@ export const ContextProvider = <
   ContextProviderA,
   MakeContextProviderE,
   MakeContextProviderR,
-  ContextProviderR extends HttpRouter.HttpRouter.Provided,
+  ContextProviderR extends Scope.Scope,
   Dependencies extends NonEmptyArray<Layer.Layer.Any>
 >(
   input: {