@effect-app/infra 2.72.0 → 2.73.0

package/src/api/routing.ts

@@ -6,13 +6,13 @@ import { determineMethod, isCommand } from "@effect-app/infra/api/routing/utils"
 import { logError, reportError } from "@effect-app/infra/errorReporter"
 import { InfraLogger } from "@effect-app/infra/logger"
 import { Rpc, RpcGroup, RpcServer } from "@effect/rpc"
-import { Array, Cause, Context, Duration, Effect, Layer, type NonEmptyArray, type NonEmptyReadonlyArray, ParseResult, Predicate, Request, S, Schedule, Schema } from "effect-app"
+import { Array, Cause, Duration, Effect, Layer, type NonEmptyArray, type NonEmptyReadonlyArray, ParseResult, Predicate, Request, S, Schedule, Schema } from "effect-app"
 import type { GetEffectContext, GetEffectError, RPCContextMap } from "effect-app/client/req"
 import { type HttpHeaders, HttpRouter } from "effect-app/http"
 import { pretty, typedKeysOf, typedValuesOf } from "effect-app/utils"
 import type { Contravariant } from "effect/Types"
 import { type YieldWrap } from "effect/Utils"
-import { type ContextProviderShape, makeMiddlewareLayer, makeRpc, type Middleware } from "./routing/DynamicMiddleware.js"
+import { type Middleware } from "./routing/DynamicMiddleware.js"
 
 export * from "./routing/DynamicMiddleware.js"
 
@@ -191,28 +191,19 @@ export class Router extends HttpRouter.Tag("@effect-app/Rpc")<Router>() {}
 export const makeRouter = <
   MiddlewareR,
   RequestContextMap extends Record<string, RPCContextMap.Any>,
+  MakeMiddlewareE,
   MakeMiddlewareR,
-  MiddlewareDependencies extends NonEmptyArray<Layer.Layer.Any>,
-  ContextProviderId,
-  ContextProviderKey extends string,
-  ContextProviderA,
-  MakeContextProviderE,
-  MakeContextProviderR
+  ContextProviderA
 >(
   middleware: Middleware<
     MiddlewareR,
     RequestContextMap,
+    MakeMiddlewareE,
     MakeMiddlewareR,
-    MiddlewareDependencies,
-    ContextProviderId,
-    ContextProviderKey,
-    ContextProviderA,
-    MakeContextProviderE,
-    MakeContextProviderR
+    ContextProviderA
   >,
   devMode: boolean
 ) => {
-  const middlewareLayer = makeMiddlewareLayer(middleware)
   function matchFor<
     const ModuleName extends string,
     const Resource extends Record<string, any>
@@ -375,7 +366,8 @@ export const makeRouter = <
                 any
               > ? R
               : never,
-            GetEffectContext<RequestContextMap, Resource[K]["config"]>
+            | GetEffectContext<RequestContextMap, Resource[K]["config"]>
+            | ContextProviderA
           >,
           HttpRouter.HttpRouter.Provided
         >
@@ -406,7 +398,7 @@ export const makeRouter = <
             : make
 
           const controllers = yield* make
-          const rpc = yield* makeRpc(middleware)
+          const rpc = yield* middleware
 
           // return make.pipe(Effect.map((c) => controllers(c, dependencies)))
           const mapped = typedKeysOf(requestModules).reduce((acc, cur) => {
@@ -507,7 +499,7 @@ export const makeRouter = <
                 Effect.Success<ReturnType<THandlers[K]["handler"]>>,
                 | Effect.Error<ReturnType<THandlers[K]["handler"]>>
                 | GetEffectError<RequestContextMap, Resource[K]["config"]>,
-                | MiddlewareR
+                | Exclude<MiddlewareR, ContextProviderA>
                 | Exclude<
                   Effect.Context<ReturnType<THandlers[K]["handler"]>>,
                   ContextProviderA | GetEffectContext<RequestContextMap, Resource[K]["config"]>
@@ -528,13 +520,10 @@ export const makeRouter = <
             }, {} as Record<string, any>)
           })) as unknown as Layer<
             { [K in keyof RequestModules]: Rpc.Handler<K> },
-            | MakeContextProviderE
-            | LayersUtils.GetLayersError<MiddlewareDependencies>
+            | Layer.Error<typeof middleware.Default>
             | LayersUtils.GetLayersError<MakeDependencies>,
             | RPCRouteR<typeof mapped[keyof typeof mapped]>
-            | MakeContextProviderR
-            | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>>
-            | LayersUtils.GetLayersSuccess<MiddlewareDependencies>
+            | Layer.Context<typeof middleware.Default>
             | LayersUtils.GetLayersContext<MakeDependencies>
           >
 
@@ -556,20 +545,16 @@ export const makeRouter = <
         layer.pipe(
           Layer.provide([
             ...dependencies ?? [],
-            middleware.contextProvider.Default,
-            middlewareLayer
+            middleware.Default
           ] as any) as any
         )
       ) as (Layer.Layer<
         Router,
         | LayersUtils.GetLayersError<MakeDependencies>
         | MakeE
-        | MakeContextProviderE
-        | LayersUtils.GetLayersError<MiddlewareDependencies>,
+        | Layer.Error<typeof middleware.Default>,
         | LayersUtils.GetLayersContext<MakeDependencies>
-        | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>>
-        | LayersUtils.GetLayersContext<MiddlewareDependencies>
-        | MakeContextProviderR
+        | Layer.Context<typeof middleware.Default>
         | Exclude<MakeR, LayersUtils.GetLayersSuccess<MakeDependencies>>
       >)
 
@@ -607,12 +592,9 @@ export const makeRouter = <
           RouterShape<Resource>,
           | MakeErrors<Make>
           | LayersUtils.GetLayersError<Make["dependencies"]>
-          | LayersUtils.GetLayersError<MiddlewareDependencies>
-          | MakeContextProviderE,
+          | Layer.Error<typeof middleware.Default>,
           | LayersUtils.GetLayersContext<Make["dependencies"]>
-          | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>>
-          | LayersUtils.GetLayersContext<MiddlewareDependencies>
-          | MakeContextProviderR
+          | Layer.Context<typeof middleware.Default>
           | Exclude<
             MakeContext<Make>,
             LayersUtils.GetLayersSuccess<Make["dependencies"]>
@@ -643,12 +625,9 @@ export const makeRouter = <
           RouterShape<Resource>,
           | MakeErrors<Make>
           | LayersUtils.GetLayersError<Make["dependencies"]>
-          | LayersUtils.GetLayersError<MiddlewareDependencies>
-          | MakeContextProviderE,
+          | Layer.Error<typeof middleware.Default>,
           | LayersUtils.GetLayersContext<Make["dependencies"]>
-          | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>>
-          | LayersUtils.GetLayersContext<MiddlewareDependencies>
-          | MakeContextProviderR
+          | Layer.Context<typeof middleware.Default>
           | Exclude<
             MakeContext<Make>,
             LayersUtils.GetLayersSuccess<Make["dependencies"]>
@@ -679,12 +658,9 @@ export const makeRouter = <
           RouterShape<Resource>,
           | MakeErrors<Make>
           | LayersUtils.GetLayersError<Make["dependencies"]>
-          | LayersUtils.GetLayersError<MiddlewareDependencies>
-          | MakeContextProviderE,
+          | Layer.Error<typeof middleware.Default>,
           | LayersUtils.GetLayersContext<Make["dependencies"]>
-          | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>>
-          | LayersUtils.GetLayersContext<MiddlewareDependencies>
-          | MakeContextProviderR
+          | Layer.Context<typeof middleware.Default>
           | Exclude<
             MakeContext<Make>,
             LayersUtils.GetLayersSuccess<Make["dependencies"]>
@@ -715,12 +691,9 @@ export const makeRouter = <
           RouterShape<Resource>,
           | MakeErrors<Make>
           | LayersUtils.GetLayersError<Make["dependencies"]>
-          | LayersUtils.GetLayersError<MiddlewareDependencies>
-          | MakeContextProviderE,
+          | Layer.Error<typeof middleware.Default>,
           | LayersUtils.GetLayersContext<Make["dependencies"]>
-          | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>>
-          | LayersUtils.GetLayersContext<MiddlewareDependencies>
-          | MakeContextProviderR
+          | Layer.Context<typeof middleware.Default>
           | Exclude<
             MakeContext<Make>,
             LayersUtils.GetLayersSuccess<Make["dependencies"]>
@@ -751,12 +724,9 @@ export const makeRouter = <
           RouterShape<Resource>,
           | MakeErrors<Make>
           | LayersUtils.GetLayersError<Make["dependencies"]>
-          | LayersUtils.GetLayersError<MiddlewareDependencies>
-          | MakeContextProviderE,
+          | Layer.Error<typeof middleware.Default>,
           | LayersUtils.GetLayersContext<Make["dependencies"]>
-          | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>>
-          | LayersUtils.GetLayersContext<MiddlewareDependencies>
-          | MakeContextProviderR
+          | Layer.Context<typeof middleware.Default>
           | Exclude<
             MakeContext<Make>,
             LayersUtils.GetLayersSuccess<Make["dependencies"]>
@@ -785,12 +755,9 @@ export const makeRouter = <
           RouterShape<Resource>,
           | MakeErrors<Make>
           | LayersUtils.GetLayersError<Make["dependencies"]>
-          | LayersUtils.GetLayersError<MiddlewareDependencies>
-          | MakeContextProviderE,
+          | Layer.Error<typeof middleware.Default>,
           | LayersUtils.GetLayersContext<Make["dependencies"]>
-          | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>>
-          | LayersUtils.GetLayersContext<MiddlewareDependencies>
-          | MakeContextProviderR
+          | Layer.Context<typeof middleware.Default>
           | Exclude<
             MakeContext<Make>,
             LayersUtils.GetLayersSuccess<Make["dependencies"]>
@@ -822,12 +789,9 @@ export const makeRouter = <
           RouterShape<Resource>,
           | MakeErrors<Make>
           | LayersUtils.GetLayersError<Make["dependencies"]>
-          | LayersUtils.GetLayersError<MiddlewareDependencies>
-          | MakeContextProviderE,
+          | Layer.Error<typeof middleware.Default>,
           | LayersUtils.GetLayersContext<Make["dependencies"]>
-          | Exclude<MakeMiddlewareR, LayersUtils.GetLayersSuccess<MiddlewareDependencies>>
-          | LayersUtils.GetLayersContext<MiddlewareDependencies>
-          | MakeContextProviderR
+          | Layer.Context<typeof middleware.Default>
           | Exclude<
             MakeContext<Make>,
             LayersUtils.GetLayersSuccess<Make["dependencies"]>
@@ -940,44 +904,3 @@ export const RequestCacheLayers = Layer.mergeAll(
   Layer.setRequestCaching(true),
   Layer.setRequestBatching(true)
 )
-
-type GetContext<T> = T extends Context.Context<infer Y> ? Y : never
-
-export const contextMaker = <
-  // TDeps is an array of services whit Default implementation
-  // each service is an effect which builds some context for each request
-  TDeps extends Array.NonEmptyReadonlyArray<
-    & (
-      | Context.Tag<any, Effect<Context.Context<any>, any, any> & { _tag: any }>
-      | Context.Tag<any, Effect<Context.Context<any>, never, never> & { _tag: any }>
-    )
-    & {
-      new(...args: any[]): any
-      Default: Layer.Layer<Effect<Context.Context<any>> & { _tag: any }, any, any>
-    }
-  >
->(...deps: TDeps): {
-  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]>
-  >
-} => ({
-  dependencies: deps.map((_) => _.Default) as any,
-  effect: Effect.gen(function*() {
-    const services = yield* Effect.all(deps)
-    // services are effects which return some Context.Context<...>
-    return Effect.all(services as any[]).pipe(
-      Effect.map((_) => Context.mergeAll(..._ as any))
-    )
-  }) as any
-})
-
-export class EmptyContextMaker extends Effect.Service<EmptyContextMaker>()("EmptyContextMaker", {
-  succeed: Effect.succeed(Context.empty()) satisfies ContextProviderShape<never>
-}) {}

package/test/controller.test.ts

@@ -7,7 +7,7 @@ import { Console, Context, Effect, Layer, S } from "effect-app"
 import { type GetEffectContext, InvalidStateError, makeRpcClient, type RPCContextMap, UnauthorizedError } from "effect-app/client"
 import { HttpServerRequest } from "effect-app/http"
 import { Class, TaggedError } from "effect-app/Schema"
-import { makeMiddleware } from "../src/api/routing/DynamicMiddleware.js"
+import { ContextProvider, makeMiddleware, mergeContextProviders } from "../src/api/routing/DynamicMiddleware.js"
 import { SomeService } from "./query.test.js"
 
 class UserProfile extends Context.assignTag<UserProfile, UserProfile>("UserProfile")(
@@ -28,13 +28,32 @@ export interface CTX {
 export class Some extends Context.TagMakeId("Some", Effect.succeed({ a: 1 }))<Some>() {}
 
 // @effect-diagnostics-next-line missingEffectServiceDependency:off
-export class ContextMaker extends Effect.Service<ContextMaker>()("ContextMaker", {
+const contextProvider = ContextProvider({
   effect: Effect.gen(function*() {
     yield* SomeService
-    return Effect.sync(() => Context.make(Some, new Some({ a: 1 })))
+    return Effect.gen(function*() {
+      yield* HttpServerRequest.HttpServerRequest
+      // yield* Str2 // not allowed
+      return Context.make(Some, new Some({ a: 1 }))
+    })
+  })
+})
+
+// @effect-diagnostics-next-line missingEffectServiceDependency:off
+class MyContextProvider extends Effect.Service<MyContextProvider>()("MyContextProvider", {
+  effect: Effect.gen(function*() {
+    yield* SomeService
+    return Effect.gen(function*() {
+      yield* HttpServerRequest.HttpServerRequest
+      // yield* Str2 // not allowed
+      return Context.make(Some, new Some({ a: 1 }))
+    })
   })
 }) {}
 
+const merged = mergeContextProviders(MyContextProvider)
+export const contextProvider2 = ContextProvider(merged)
+
 export type RequestContextMap = {
   allowAnonymous: RPCContextMap.Inverted<"userProfile", UserProfile, typeof NotLoggedInError>
   // TODO: not boolean but `string[]`
@@ -46,7 +65,7 @@ const Str2 = Context.GenericTag<"str2", "str">("str2")
 
 const middleware = makeMiddleware<RequestContextMap, HttpServerRequest.HttpServerRequest>()({
   dependencies: [Layer.effect(Str2, Str)],
-  contextProvider: ContextMaker,
+  contextProvider,
   execute: (maker) =>
     Effect.gen(function*() {
       return maker((_schema, handler, moduleName) => (req, headers) => {

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

@@ -1 +1 @@
-{"version":3,"file":"controller.test.d.ts","sourceRoot":"","sources":["../controller.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,UAAU,EAAc,MAAM,+BAA+B,CAAA;AAC7F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAEtE,OAAO,EAAW,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAC/D,OAAO,EAAE,KAAK,gBAAgB,EAAoC,KAAK,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAClI,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAGnD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;;;;;;;;AAE7C,cAAM,WAAY,SAAQ,gBAIzB;CACA;;;;;;AAED,cAAM,gBAAiB,SAAQ,qBAE7B;CAAG;AAEL,MAAM,WAAW,GAAG;IAClB,OAAO,EAAE,cAAc,CAAA;CACxB;;;;;;;;;;;;;;;;;;;;;;;;;AAED,qBAAa,IAAK,SAAQ,SAA2D;CAAG;;;;AAGxF,qBAAa,YAAa,SAAQ,iBAKhC;CAAG;AAEL,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,aAAa,CAAC,QAAQ,CAAC,aAAa,EAAE,WAAW,EAAE,OAAO,gBAAgB,CAAC,CAAA;IAE3F,YAAY,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;CACvF,CAAA;AA+CD,MAAM,MAAM,aAAa,GAAG;IAC1B,yCAAyC;IACzC,cAAc,CAAC,EAAE,IAAI,CAAA;IACrB,iEAAiE;IACjE,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAC/B,CAAA;AACD,eAAO,MAAuB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAG/B,CAAA;;;;;;;;;;AAEF,qBAAa,GAAI,SAAQ,QAA0C;CAAG;;;;;;;;;;AACtE,qBAAa,GAAI,SAAQ,QAA0C;CAAG;;;;;;;;;;;;AAEtE,qBAAa,WAAY,SAAQ,gBAEV;CAAG;;;;;;;;;;;;AAgB1B,qBAAa,YAAa,SAAQ,iBAET;CAAG;;;;;;;;;;;;AAE5B,qBAAa,aAAc,SAAQ,kBAEA;CAAG;;;;;AAItC,qBAAa,gBAAiB,SAAQ,qBAKpC;CAAG;;;;;AASL,qBAAa,aAAc,SAAQ,kBAOjC;CAAG;;;;;AAEL,qBAAa,iBAAkB,SAAQ,sBAKrC;CAAG;AAEL,eAAO,MAAQ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAE,QAAQ;;;;;2HAAE,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qFAAiC,CAAA"}
+{"version":3,"file":"controller.test.d.ts","sourceRoot":"","sources":["../controller.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,UAAU,EAAc,MAAM,+BAA+B,CAAA;AAC7F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAEtE,OAAO,EAAW,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAC/D,OAAO,EAAE,KAAK,gBAAgB,EAAoC,KAAK,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAClI,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAGnD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;;;;;;;;AAE7C,cAAM,WAAY,SAAQ,gBAIzB;CACA;;;;;;AAED,cAAM,gBAAiB,SAAQ,qBAE7B;CAAG;AAEL,MAAM,WAAW,GAAG;IAClB,OAAO,EAAE,cAAc,CAAA;CACxB;;;;;;;;;;;;;;;;;;;;;;;;;AAED,qBAAa,IAAK,SAAQ,SAA2D;CAAG;AA2BxF,eAAO,MAAM,gBAAgB;;CAA0B,CAAA;AAEvD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,aAAa,CAAC,QAAQ,CAAC,aAAa,EAAE,WAAW,EAAE,OAAO,gBAAgB,CAAC,CAAA;IAE3F,YAAY,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;CACvF,CAAA;AA+CD,MAAM,MAAM,aAAa,GAAG;IAC1B,yCAAyC;IACzC,cAAc,CAAC,EAAE,IAAI,CAAA;IACrB,iEAAiE;IACjE,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAC/B,CAAA;AACD,eAAO,MAAuB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAG/B,CAAA;;;;;;;;;;AAEF,qBAAa,GAAI,SAAQ,QAA0C;CAAG;;;;;;;;;;AACtE,qBAAa,GAAI,SAAQ,QAA0C;CAAG;;;;;;;;;;;;AAEtE,qBAAa,WAAY,SAAQ,gBAEV;CAAG;;;;;;;;;;;;AAgB1B,qBAAa,YAAa,SAAQ,iBAET;CAAG;;;;;;;;;;;;AAE5B,qBAAa,aAAc,SAAQ,kBAEA;CAAG;;;;;AAItC,qBAAa,gBAAiB,SAAQ,qBAKpC;CAAG;;;;;AASL,qBAAa,aAAc,SAAQ,kBAOjC;CAAG;;;;;AAEL,qBAAa,iBAAkB,SAAQ,sBAKrC;CAAG;AAEL,eAAO,MAAQ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAE,QAAQ;;;;;2HAAE,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qFAAiC,CAAA"}