packages/common/src/webrpc/WebRpc.ts

@@ -1,4 +0,0 @@
-import * as WebRpcTest from "./WebRpcTest"
-
-
-export class WebRpc extends WebRpcTest.WebRpcTest {}

packages/common/src/webrpc/WebRpcSerialization.ts

@@ -1,5 +0,0 @@
-import { RpcSerialization } from "@effect/rpc"
-
-
-export const WebRpcSerializationDevelopment = RpcSerialization.layerJson
-export const WebRpcSerializationProduction = RpcSerialization.layerNdjson

packages/common/src/webrpc/index.ts

@@ -1,3 +1,10 @@
-export * as WebRpc from "./WebRpc"
-export * as WebRpcSerialization from "./WebRpcSerialization"
+import { RpcSerialization } from "@effect/rpc"
+import * as WebRpcTest from "./WebRpcTest"
+
+
+export class WebRpc extends WebRpcTest.WebRpcTest {}
+
+export const WebRpcSerializationDevelopment = RpcSerialization.layerJson
+export const WebRpcSerializationProduction = RpcSerialization.layerNdjson
+
 export * as WebRpcTest from "./WebRpcTest"

packages/server/src/http.ts

@@ -1,7 +1,7 @@
 import { FileSystem, HttpMiddleware, HttpRouter, HttpServer, HttpServerRequest, HttpServerResponse, Path } from "@effect/platform"
 import { RpcServer } from "@effect/rpc"
 import { CommonConfig } from "@website/common/config"
-import { WebRpc, WebRpcSerialization } from "@website/common/webrpc"
+import { WebRpc, WebRpcSerializationDevelopment, WebRpcSerializationProduction } from "@website/common/webrpc"
 import { Duration, Effect, flow, Layer } from "effect"
 import { WebRpcLive } from "./webrpc"
 
@@ -10,10 +10,10 @@ const router = HttpRouter.empty
 
 const makeWebRpcRoute = Effect.all([
     CommonConfig.webRpcHttpPath,
-    RpcServer.toHttpApp(WebRpc.WebRpc),
+    RpcServer.toHttpApp(WebRpc),
 ]).pipe(
     Effect.map(([path, app]) => HttpRouter.mountApp(path, app)),
-    Effect.provide(WebRpcLive.WebRpcLive),
+    Effect.provide(WebRpcLive),
 )
 
 const makeProductionWebappMiddleware = Effect.gen(function*() {
@@ -38,7 +38,7 @@ const makeProductionWebappMiddleware = Effect.gen(function*() {
 })
 
 
-export const HttpAppDevelopment = Effect.provide(makeWebRpcRoute, WebRpcSerialization.WebRpcSerializationDevelopment).pipe(
+export const HttpAppDevelopment = Effect.provide(makeWebRpcRoute, WebRpcSerializationDevelopment).pipe(
     Effect.map(serveWebRpc => router.pipe(
         serveWebRpc,
         HttpServer.serve(flow(
@@ -52,7 +52,7 @@ export const HttpAppDevelopment = Effect.provide(makeWebRpcRoute, WebRpcSerializ
 )
 
 export const HttpAppProduction = Effect.all([
-    Effect.provide(makeWebRpcRoute, WebRpcSerialization.WebRpcSerializationProduction),
+    Effect.provide(makeWebRpcRoute, WebRpcSerializationProduction),
     makeProductionWebappMiddleware,
 ]).pipe(
     Effect.map(([serveWebRpc, serveProductionWebapp]) => router.pipe(

packages/server/src/webrpc/WebRpcLive.ts

@@ -1,8 +0,0 @@
-import { Layer } from "effect"
-import * as WebRpcTestLive from "./WebRpcTestLive"
-import type { WebRpc } from "@website/common/webrpc"
-
-
-export const WebRpcLive = Layer.mergeAll(
-    WebRpcTestLive.WebRpcTestLive,
-) satisfies ReturnType<typeof WebRpc.WebRpc.toLayer>

packages/server/src/webrpc/index.ts

@@ -1,2 +1,10 @@
-export * as WebRpcLive from "./WebRpcLive"
+import type { WebRpc } from "@website/common/webrpc"
+import { Layer } from "effect"
+import * as WebRpcTestLive from "./WebRpcTestLive"
+
+
+export const WebRpcLive = Layer.mergeAll(
+    WebRpcTestLive.WebRpcTestLive,
+) satisfies ReturnType<typeof WebRpc.toLayer>
+
 export * as WebRpcTestLive from "./WebRpcTestLive"