cleanup

Author: patroza

api/src/Accounts.ts

@@ -1,11 +1,11 @@
 import { matchFor } from "api/lib/routing.js"
 import { Array, Effect, Order } from "effect-app"
-import { accountsApi } from "resources.js"
+import { AccountsApi } from "resources.js"
 import { UserRepo } from "./Accounts/UserRepo.js"
 import type { UserView } from "./Accounts/UserView.js"
 import { Q } from "./services.js"
 
-export default matchFor(accountsApi)([
+export default matchFor(AccountsApi)([
   UserRepo.Default
 ], ({ GetMe, Index }) =>
   Effect.gen(function*() {

api/src/Accounts/UserResolver.ts

@@ -14,11 +14,11 @@ interface GetUserViewById extends Request.Request<UserView, NotFoundError<"User"
 }
 const GetUserViewById = Request.tagged<GetUserViewById>("GetUserViewById")
 
-const userClient = clientFor({ Index })
+const usersApi = clientFor({ Index })
 
 const getUserViewByIdResolver = RequestResolver
   .makeBatched((requests: GetUserViewById[]) =>
-    userClient
+    usersApi
       .Index
       .handler({ filterByIds: pipe(requests.map((_) => _.id), Array.toNonEmptyArray, Option.getOrUndefined)! })
       .pipe(

api/src/Blog.ts

@@ -4,13 +4,13 @@ import { Events, Operations } from "api/services.js"
 import { Duration, Effect, Schedule } from "effect"
 import { Option } from "effect-app"
 import { NonEmptyString2k, NonNegativeInt } from "effect-app/Schema"
-import { blogApi } from "resources.js"
+import { BlogApi } from "resources.js"
 import { UserRepo } from "./Accounts/UserRepo.js"
 import { BlogPostRepo } from "./Blog/BlogPostRepo.js"
 import { BlogPost } from "./Domain/Blog.js"
 import { BogusEvent } from "./Domain/Events.js"
 
-export default matchFor(blogApi)([
+export default matchFor(BlogApi)([
   BlogPostRepo.Default,
   UserRepo.Default,
   OperationsDefault,

api/src/HelloWorld.ts

@@ -2,11 +2,11 @@ import { getRequestContext } from "@effect-app/infra/api/setupRequest"
 import { generate } from "@effect-app/infra/test"
 import { matchFor } from "api/lib/routing.js"
 import { Effect, S } from "effect-app"
-import { helloWorldApi } from "resources.js"
+import { HelloWorldApi } from "resources.js"
 import { UserRepo } from "./Accounts/UserRepo.js"
 import { User } from "./Domain/User.js"
 
-export default matchFor(helloWorldApi)([
+export default matchFor(HelloWorldApi)([
   UserRepo.Default
 ], ({ GetHelloWorld }) =>
   Effect.gen(function*() {

api/src/Operations.ts

@@ -2,9 +2,9 @@ import { OperationsDefault } from "api/lib.js"
 import { matchFor } from "api/lib/routing.js"
 import { Operations } from "api/services.js"
 import { Effect } from "effect-app"
-import { operationsApi } from "resources.js"
+import { OperationsApi } from "resources.js"
 
-export default matchFor(operationsApi)([
+export default matchFor(OperationsApi)([
   OperationsDefault
 ], ({ FindOperation }) =>
   Effect.gen(function*() {

api/src/Operations/Api.ts

@@ -12,7 +12,7 @@ export const meta = { moduleName: "Operations" } as const
 // codegen:end
 
 // Extensions
-const opsClient = clientFor({ FindOperation, meta })
+const operationsApi = clientFor({ FindOperation, meta })
 
 export function refreshAndWaitAForOperation<R2, E2, A2>(
   refresh: Effect<A2, E2, R2>,
@@ -72,13 +72,13 @@ const isFailure = S.is(OperationFailure)
 function _waitForOperation(id: OperationId, cb?: (op: Operation) => void) {
   return Effect
     .gen(function*() {
-      let r = yield* opsClient.FindOperation.handler({ id })
+      let r = yield* operationsApi.FindOperation.handler({ id })
       while (r) {
         if (cb) cb(r)
         const result = r.result
         if (result) return isFailure(result) ? yield* Effect.fail(result) : yield* Effect.succeed(result)
         yield* Effect.sleep(Duration.seconds(2))
-        r = yield* opsClient.FindOperation.handler({ id })
+        r = yield* operationsApi.FindOperation.handler({ id })
       }
       return yield* new NotFoundError({ type: "Operation", id })
     })

api/src/resources.ts

@@ -1,10 +1,10 @@
 import type {} from "@effect/platform/HttpClient"
 
-// codegen:start {preset: barrel, include: './[A-Z]*/Api.ts', import: star}
-import * as accountsApi from "./Accounts/Api.js"
-import * as blogApi from "./Blog/Api.js"
-import * as helloWorldApi from "./HelloWorld/Api.js"
-import * as operationsApi from "./Operations/Api.js"
+//// codegen:start {preset: barrel, include: './[A-Z]*/Api.ts', import: star}
+import * as AccountsApi from "./Accounts/Api.js"
+import * as BlogApi from "./Blog/Api.js"
+import * as HelloWorldApi from "./HelloWorld/Api.js"
+import * as OperationsApi from "./Operations/Api.js"
 
-export { accountsApi, blogApi, helloWorldApi, operationsApi }
+export { AccountsApi, BlogApi, HelloWorldApi, OperationsApi }
 // codegen:end

frontend/layouts/default.vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import { MeRsc } from "resources"
+import { AccountsApi } from "resources"
 import { onMounted } from "vue"
 import { useRouter } from "vue-router"
 import { VueQueryDevtools } from "@tanstack/vue-query-devtools"
 import { Result } from "~/composables/client"
 
-const meClient = clientFor(MeRsc)
-const [userResult, currentUser, getCurrentUser] = useSafeQuery(meClient.GetMe)
+const accountsApi = clientFor(AccountsApi)
+const [userResult, currentUser, getCurrentUser] = useSafeQuery(accountsApi.GetMe)
 
 const appConfig = {
   title: "@effect-app/boilerplate",

frontend/nuxt.config.ts

@@ -22,7 +22,7 @@ export default defineNuxtConfig({
 
   alias: {
     resources: fileURLToPath(new URL("../api/src/resources", import.meta.url)),
-    models: fileURLToPath(new URL("../api/src/models", import.meta.url)),
+    Domain: fileURLToPath(new URL("../api/src/Domain", import.meta.url)),
     ...(localLibs
       ? {
           "effect-app": fileURLToPath(

frontend/pages/blog/[id].vue

@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import { BlogRsc, OperationsRsc } from "resources"
+import { BlogsApi, OperationsApi } from "resources"
 import type { ClientEvents } from "resources"
 import { BlogPostId } from "models/Blog"
 
 const { id } = useRouteParams({ id: BlogPostId })
 
-const blogClient = clientFor(BlogRsc)
-const [r, , reloadPost] = useSafeQuery(blogClient.FindPost, {
+const blogsApi = clientFor(BlogsApi)
+const [r, , reloadPost] = useSafeQuery(blogsApi.FindPost, {
   id,
 })
 
@@ -26,8 +26,8 @@ const progress = ref("")
 
 const [publishing, publish] = useAndHandleMutation(
   mapHandler(
-    blogClient.PublishPost,
-    OperationsRsc.refreshAndWaitForOperation(reloadPost(), op => {
+    blogsApi.PublishPost,
+    OperationsApi.refreshAndWaitForOperation(reloadPost(), op => {
       progress.value = `${op.progress?.completed}/${op.progress?.total}`
     }),
   ),