cleanup

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: [

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>()("Events", {
   accessors: true,

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],

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"
 

api/test/some.test.ts

@@ -1,4 +1,4 @@
-import { HelloWorldRsc } from "#resources"
+import { HelloWorldRsc } from "#HelloWorld/resources"
 
 it("works", () => {
   console.log(HelloWorldRsc)

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 = {

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)
 

frontend/layouts/default.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { AccountsRsc } from "#resources"
 import { useRouter } from "vue-router"
 import { VueQueryDevtools } from "@tanstack/vue-query-devtools"
+import { AccountsRsc } from "#Accounts/resources"
 
 const accountsClient = clientFor(AccountsRsc)
 const [userResult] = useSafeQuery(accountsClient.GetMe)

frontend/pages/blog/[id].vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { BlogPostId } from "#Blog/models"
-import { BlogRsc } from "#resources"
-import type { ClientEvents } from "#resources"
+import { BlogRsc } from "#Blog/resources"
+import type { ClientEvents } from "#resources/Events"
 
 const { id } = useRouteParams({ id: BlogPostId })
 

frontend/pages/blog/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { BlogRsc } from "#resources"
+import { BlogRsc } from "#Blog/resources"
 import { S } from "effect-app"
 
 const blogClient = clientFor(BlogRsc)

frontend/pages/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { HelloWorldRsc } from "#resources"
+import { HelloWorldRsc } from "#HelloWorld/resources"
 import { buildFormFromSchema } from "@effect-app/vue/form"
 import { S } from "effect-app"