From 2fcf80931110c9f37d4dc6d519522c74d3d2bdec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 12 Jul 2024 03:08:03 +0200 Subject: [PATCH] Cleanup --- packages/server/src/Services.ts | 2 +- packages/server/src/index.ts | 49 +------------------ packages/server/src/rpc/routers/todos.ts | 2 +- .../server/src/{ => todo}/TodoRepository.ts | 0 4 files changed, 4 insertions(+), 49 deletions(-) rename packages/server/src/{ => todo}/TodoRepository.ts (100%) diff --git a/packages/server/src/Services.ts b/packages/server/src/Services.ts index ce13af2..7e72e46 100644 --- a/packages/server/src/Services.ts +++ b/packages/server/src/Services.ts @@ -1,5 +1,5 @@ import { Layer } from "effect" -import { TodoRepository } from "./TodoRepository" +import { TodoRepository } from "./todo/TodoRepository" type TServices = diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index a4717b0..897ada0 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -1,9 +1,7 @@ import { BunRuntime } from "@effect/platform-bun" -import { Todo, type IdentifiedTodo } from "@todo-tests/common/data" -import { Identifiable } from "@todo-tests/common/traits" -import { Chunk, Effect, Layer, Stream } from "effect" +import { Effect, Layer } from "effect" import { Services } from "./Services" -import { TodoRepository, createDefaultTodos } from "./TodoRepository" +import { createDefaultTodos } from "./todo/TodoRepository" import { ExpressApp } from "./http/ExpressApp" import { ExpressHTTPServer } from "./http/ExpressHTTPServer" import { WebSocketServer } from "./http/WebSocketServer" @@ -32,51 +30,8 @@ const ServerDev = Layer.empty.pipe( ) -const watchTodoChanges = Effect.gen(function*() { - const todos = yield* TodoRepository - // yield* Stream.runForEach(todos.todos.changes, todos => Console.log(`Todos changed: ${ todos }`)) - yield* todos.todos.changes.pipe( - Stream.runFold( - Chunk.empty(), - - (prev, curr) => { - console.log(`Added todos: ${ Chunk.differenceWith(Identifiable.equals)(curr, prev) }`) - console.log(`Removed todos: ${ Chunk.differenceWith(Identifiable.equals)(prev, curr) }`) - - return curr - }, - ) - ) -}) - const main = Effect.gen(function*() { - // const watcher = yield* Effect.fork(watchTodoChanges) yield* createDefaultTodos - - // const todos = yield* TodoRepository - - // const secondTodo = yield* yield* todos.todos.get.pipe( - // Effect.map(Array.get(1)) - // ) - // const secondTodoModified = new Todo({ - // ...secondTodo, - // completed: true, - // }) - // yield* todos.update(secondTodoModified) - - // yield* todos.add(new Todo({ - // id: Option.none(), - // title: "Put the dishes in the dishwasher", - // content: "Lorem ipsum", - // due: Option.none(), - // completed: false, - // createdAt: new Date(), - // updatedAt: new Date(), - // })).pipe( - // Effect.delay(Duration.seconds(1)) - // ) - - // yield* Fiber.join(watcher) yield* Layer.launch(ServerDev) }) diff --git a/packages/server/src/rpc/routers/todos.ts b/packages/server/src/rpc/routers/todos.ts index 4048ac4..20637c2 100644 --- a/packages/server/src/rpc/routers/todos.ts +++ b/packages/server/src/rpc/routers/todos.ts @@ -2,7 +2,7 @@ import { Schema as S } from "@effect/schema" import { JsonifiableTodo } from "@todo-tests/common/data" import { observable } from "@trpc/server/observable" import { Effect, Fiber, Runtime, Stream, flow } from "effect" -import { TodoRepository } from "../../TodoRepository" +import { TodoRepository } from "../../todo/TodoRepository" import { TRPCBuilder } from "../../trpc/TRPCBuilder" import { RPCProcedureBuilder } from "../procedures/RPCProcedureBuilder" diff --git a/packages/server/src/TodoRepository.ts b/packages/server/src/todo/TodoRepository.ts similarity index 100% rename from packages/server/src/TodoRepository.ts rename to packages/server/src/todo/TodoRepository.ts