From 3ac12bfe3eefe831bcc65d7963def7d037c1d856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Tue, 9 Jul 2024 01:03:45 +0200 Subject: [PATCH] Fix --- packages/server/src/index.ts | 18 +++++++++--------- ...{RPCPlayground.ts => RPCPlaygroundRoute.ts} | 2 +- .../rpc/{RPCServer.ts => RPCServerRoute.ts} | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) rename packages/server/src/rpc/{RPCPlayground.ts => RPCPlaygroundRoute.ts} (95%) rename packages/server/src/rpc/{RPCServer.ts => RPCServerRoute.ts} (95%) diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index deb3228..f49a8c5 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -1,22 +1,22 @@ import { BunRuntime } from "@effect/platform-bun" -import { Todo } from "@todo-tests/common/data" +import { Todo, type IdentifiedTodo } from "@todo-tests/common/data" import { Identifiable } from "@todo-tests/common/traits" -import { Array, Effect, Layer, Option, Stream } from "effect" +import { Chunk, Effect, Layer, Stream } from "effect" import { ServicesLive } from "./Services" import { TodoRepository, createDefaultTodos } from "./TodoRepository" import { ExpressApp } from "./express/ExpressApp" import { ExpressHTTPServer } from "./express/ExpressHTTPServer" -import { RPCPlayground } from "./rpc/RPCPlayground" +import { RPCPlaygroundRoute } from "./rpc/RPCPlaygroundRoute" import { RPCRouter } from "./rpc/RPCRouter" -import { RPCServer } from "./rpc/RPCServer" +import { RPCServerRoute } from "./rpc/RPCServerRoute" import { RPCProcedureBuilder } from "./rpc/procedures/RPCProcedureBuilder" import { TRPCBuilder } from "./trpc/TRPCBuilder" import { TRPCContextCreator } from "./trpc/TRPCContextCreator" const ServerDev = ExpressHTTPServer.Live.pipe( - Layer.provide(RPCServer.Live), - Layer.provide(RPCPlayground.Dev), + Layer.provide(RPCServerRoute.Live), + Layer.provide(RPCPlaygroundRoute.Dev), Layer.provide(RPCRouter.Live), Layer.provide(RPCProcedureBuilder.Live), Layer.provide(TRPCBuilder.Live), @@ -30,11 +30,11 @@ const watchTodoChanges = Effect.gen(function*() { // yield* Stream.runForEach(todos.todos.changes, todos => Console.log(`Todos changed: ${ todos }`)) yield* todos.todos.changes.pipe( Stream.runFold( - Array.empty }>(), + Chunk.empty(), (prev, curr) => { - console.log(`Added todos: ${ Array.differenceWith(Identifiable.equals)(curr, prev) }`) - console.log(`Removed todos: ${ Array.differenceWith(Identifiable.equals)(prev, curr) }`) + console.log(`Added todos: ${ Chunk.differenceWith(Identifiable.equals)(curr, prev) }`) + console.log(`Removed todos: ${ Chunk.differenceWith(Identifiable.equals)(prev, curr) }`) return curr }, diff --git a/packages/server/src/rpc/RPCPlayground.ts b/packages/server/src/rpc/RPCPlaygroundRoute.ts similarity index 95% rename from packages/server/src/rpc/RPCPlayground.ts rename to packages/server/src/rpc/RPCPlaygroundRoute.ts index 0ef2bce..a3e7ca8 100644 --- a/packages/server/src/rpc/RPCPlayground.ts +++ b/packages/server/src/rpc/RPCPlaygroundRoute.ts @@ -5,7 +5,7 @@ import { RPCRouter } from "./RPCRouter" import { rpcPlaygroundRoot, rpcRoot } from "./config" -export module RPCPlayground { +export module RPCPlaygroundRoute { export const Live = Layer.empty export const Dev = Layer.effectDiscard(Effect.gen(function*() { diff --git a/packages/server/src/rpc/RPCServer.ts b/packages/server/src/rpc/RPCServerRoute.ts similarity index 95% rename from packages/server/src/rpc/RPCServer.ts rename to packages/server/src/rpc/RPCServerRoute.ts index f53ee69..f015200 100644 --- a/packages/server/src/rpc/RPCServer.ts +++ b/packages/server/src/rpc/RPCServerRoute.ts @@ -6,7 +6,7 @@ import { RPCRouter } from "./RPCRouter" import { rpcRoot } from "./config" -export module RPCServer { +export module RPCServerRoute { export const Live = Layer.effectDiscard(Effect.gen(function*() { const app = yield* ExpressApp