Refactoring

packages/server/src/index.ts

@@ -6,15 +6,15 @@ import { ServicesLive } from "./Services"
 import { TodoRepository, createDefaultTodos } from "./TodoRepository"
 import { ExpressApp } from "./express/ExpressApp"
 import { ExpressHTTPServer } from "./express/ExpressHTTPServer"
-import { RPCProcedure } from "./rpc/RPCProcedure"
 import { RPCServer } from "./rpc/RPCServer"
+import { RPCProcedureBuilder } from "./rpc/procedures/RPCProcedureBuilder"
 import { CreateTRPCContext } from "./trpc/CreateTRPCContext"
 import { TRPCBuilder } from "./trpc/TRPCBuilder"
 
 
 const ServerLive = ExpressHTTPServer.Live.pipe(
     Layer.provide(RPCServer.Live),
-    Layer.provide(RPCProcedure.Live),
+    Layer.provide(RPCProcedureBuilder.Live),
     Layer.provide(TRPCBuilder.Live),
     Layer.provide(CreateTRPCContext.Live),
     Layer.provide(ExpressApp.Live),
@@ -70,9 +70,5 @@ const main = Effect.gen(function*() {
 })
 
 BunRuntime.runMain(main.pipe(
-    Effect.provide(
-        Layer.mergeAll(
-            ServicesLive
-        )
-    )
+    Effect.provide(ServicesLive)
 ))