diff --git a/api/src/Blog/controllers.ts b/api/src/Blog/controllers.ts index ea310bc4..22e1975b 100644 --- a/api/src/Blog/controllers.ts +++ b/api/src/Blog/controllers.ts @@ -1,7 +1,6 @@ import { UserRepo } from "#api/Accounts/UserRepo" import { Events } from "#api/Events" import { matchFor, Router } from "#api/lib/routing" -import { BlogRsc } from "#resources" import { BogusEvent } from "#resources/Events" import { Operations } from "@effect-app/infra/Operations" import { Duration, Effect, Schedule } from "effect" @@ -10,6 +9,7 @@ import { NonEmptyString2k, NonNegativeInt } from "effect-app/Schema" import { OperationsDefault } from "../lib/layers.js" import { BlogPostRepo } from "./BlogPostRepo.js" import { BlogPost } from "./models.js" +import { BlogRsc } from "./resources.js" export default Router(BlogRsc)({ dependencies: [ diff --git a/api/src/Events.ts b/api/src/Events.ts index b647887f..8703d4af 100644 --- a/api/src/Events.ts +++ b/api/src/Events.ts @@ -1,7 +1,7 @@ -import type { ClientEvents } from "#resources" import { storeId } from "@effect-app/infra/Store/Memory" import { Effect, FiberRef, PubSub, Stream } from "effect-app" import type { NonEmptyReadonlyArray } from "effect/Array" +import type { ClientEvents } from "./resources/Events.js" export class Events extends Effect.Service()("Events", { accessors: true, diff --git a/api/src/Operations/controllers.ts b/api/src/Operations/controllers.ts index 669ba1d0..0419d2dd 100644 --- a/api/src/Operations/controllers.ts +++ b/api/src/Operations/controllers.ts @@ -1,8 +1,8 @@ import { OperationsDefault } from "#api/lib/layers" import { matchFor, Router } from "#api/lib/routing" -import { OperationsRsc } from "#resources" import { Operations } from "@effect-app/infra/Operations" import { Effect } from "effect-app" +import { OperationsRsc } from "./resources.js" export default Router(OperationsRsc)({ dependencies: [OperationsDefault], diff --git a/api/src/lib/middleware/events.ts b/api/src/lib/middleware/events.ts index 39709902..ae5b5c86 100644 --- a/api/src/lib/middleware/events.ts +++ b/api/src/lib/middleware/events.ts @@ -1,5 +1,5 @@ import { Events } from "#api/Events" -import { ClientEvents } from "#resources" +import { ClientEvents } from "#api/resources/Events" import { makeSSE } from "@effect-app/infra/api/middlewares" import { Effect } from "effect-app" diff --git a/api/src/resources.ts b/api/src/resources.ts deleted file mode 100644 index dc7b365b..00000000 --- a/api/src/resources.ts +++ /dev/null @@ -1,11 +0,0 @@ -import type {} from "@effect/platform/HttpClient" - -export { ClientEvents } from "./resources/Events.js" - -// TODO -//// codegen:start {preset: barrel, include: ./*/resources.ts, export: { as: 'PascalCase', postfix: 'Rsc' }} -export { AccountsRsc } from "./Accounts/resources.js" -export { BlogRsc } from "./Blog/resources.js" -export { HelloWorldRsc } from "./HelloWorld/resources.js" -export { OperationsRsc } from "./Operations/resources.js" -//// codegen:end diff --git a/api/test/some.test.ts b/api/test/some.test.ts index 340f27ce..e681d422 100644 --- a/api/test/some.test.ts +++ b/api/test/some.test.ts @@ -1,4 +1,4 @@ -import { HelloWorldRsc } from "#resources" +import { HelloWorldRsc } from "#HelloWorld/resources" it("works", () => { console.log(HelloWorldRsc) diff --git a/frontend/composables/bus.ts b/frontend/composables/bus.ts index c8a481b2..a592d071 100644 --- a/frontend/composables/bus.ts +++ b/frontend/composables/bus.ts @@ -1,5 +1,4 @@ -import type { ClientEvents } from "#resources" - +import type { ClientEvents } from "#resources/Events" import mitt from "mitt" type Events = { diff --git a/frontend/composables/eventsource.ts b/frontend/composables/eventsource.ts index 82860a4a..027517ff 100644 --- a/frontend/composables/eventsource.ts +++ b/frontend/composables/eventsource.ts @@ -1,8 +1,8 @@ -import { ClientEvents } from "#resources" import ReconnectingEventSource from "reconnecting-eventsource" import { bus } from "./bus" import { onMountedWithCleanup } from "./onMountedWithCleanup" import { S } from "effect-app" +import { ClientEvents } from "#resources/Events" const parseEvent = S.decodeUnknownSync(ClientEvents) diff --git a/frontend/layouts/default.vue b/frontend/layouts/default.vue index d31c7fbf..ceab2e63 100644 --- a/frontend/layouts/default.vue +++ b/frontend/layouts/default.vue @@ -1,7 +1,7 @@