chore: flat contextmaker again

Author: patroza

.changeset/evil-kiwis-switch.md

@@ -0,0 +1,5 @@
+---
+"@effect-app/infra": minor
+---
+
+flat ContextMaker again

packages/infra/src/api/routing.ts

@@ -907,5 +907,5 @@ export const RequestCacheLayers = Layer.mergeAll(
 
 export class DefaultContextMaker extends Effect.Service<DefaultContextMaker>()("DefaultContextMaker", {
   strict: false,
-  succeed: { makeRequestContext: Effect.succeed(Context.empty()) } satisfies ContextProviderShape<never>
+  succeed: Effect.succeed(Context.empty()) satisfies ContextProviderShape<never>
 }) {}

packages/infra/src/api/routing/DynamicMiddleware.ts

@@ -29,7 +29,7 @@ export type RPCHandlerFactory<CTXMap extends Record<string, RPCContextMap.Any>>
 >
 
 export type ContextProviderOut<RRet> = Effect<Context.Context<RRet>, never, Scope>
-export type ContextProviderShape<RRet> = { makeRequestContext: ContextProviderOut<RRet> }
+export type ContextProviderShape<RRet> = ContextProviderOut<RRet>
 
 export interface Middleware<
   MiddlewareContext,
@@ -89,7 +89,7 @@ export const makeRpc = <
         const h = execute(schema, handler, moduleName)
         return (req: Req, headers: any) =>
           Effect.gen(function*() {
-            const ctx = yield* contextProvider.makeRequestContext
+            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.

packages/infra/test/controller.test.ts

@@ -32,10 +32,7 @@ export class ContextMaker extends Effect.Service<ContextMaker>()("ContextMaker",
   effect: Effect.gen(function*() {
     yield* SomeService
     const SomeContext = Layer.sync(Some, () => new Some({ a: 1 }))
-    return {
-      mooo: "moo",
-      makeRequestContext: Layer.build(SomeContext)
-    }
+    return Layer.build(SomeContext)
   })
 }) {}