cleanup

patroza · patroza · commit 41efb17cbf2f · 2024-11-02T06:59:23.000+01:00
diff --git a/api/src/Accounts/Api.ts b/api/src/Accounts/Api.ts
@@ -1,6 +1,6 @@
-import { User, UserId } from "api/Domain/User.js"
-import { S } from "api/lib.js"
+import { User, UserId } from "Domain/User.js"
 import { NotFoundError } from "effect-app/client"
+import { S } from "lib/resources.js"
 import { UserView } from "./UserView.js"
 
 export class GetMe extends S.Req<GetMe>()("GetMe", {}, { success: User, failure: NotFoundError }) {}
diff --git a/api/src/Accounts/UserRepo.ts b/api/src/Accounts/UserRepo.ts
@@ -2,8 +2,8 @@ import { Model } from "@effect-app/infra"
 import { NotFoundError, NotLoggedInError } from "@effect-app/infra/errors"
 import { generate } from "@effect-app/infra/test"
 import { RepoConfig } from "api/config.js"
-import type { UserId } from "api/Domain/User.js"
-import { User } from "api/Domain/User.js"
+import type { UserId } from "Domain/User.js"
+import { User } from "Domain/User.js"
 import { RepoDefault } from "api/lib/layers.js"
 import { Q, UserProfile } from "api/services.js"
 import { Array, Effect, Exit, Layer, Option, pipe, Request, RequestResolver, S } from "effect-app"
diff --git a/api/src/Accounts/UserResolver.ts b/api/src/Accounts/UserResolver.ts
@@ -1,10 +1,10 @@
-import { UserId } from "api/Domain/User.js"
-import { clientFor } from "api/lib.js"
+import { UserId } from "Domain/User.js"
 import { Effect, Exit, Request, RequestResolver } from "effect"
 import { Array, Option, pipe, S } from "effect-app"
 import { ApiConfig, NotFoundError } from "effect-app/client"
 import { HttpClient } from "effect-app/http"
 import { type Schema } from "effect-app/Schema"
+import { clientFor } from "lib/resources.js"
 import { Index } from "./Api.js"
 import { UserView } from "./UserView.js"
 
diff --git a/api/src/Accounts/UserView.ts b/api/src/Accounts/UserView.ts
@@ -1,5 +1,5 @@
-import { User } from "api/Domain/User.js"
-import { S } from "api/lib.js"
+import { User } from "Domain/User.js"
+import { S } from "lib/resources.js"
 
 export class UserView extends S.ExtendedClass<UserView, UserView.Encoded>()({
   ...User.pick("id", "role"),
diff --git a/api/src/Blog/Api.ts b/api/src/Blog/Api.ts
@@ -1,5 +1,5 @@
-import { BlogPost, BlogPostId } from "api/Domain/Blog.js"
-import { S } from "api/lib.js"
+import { BlogPost, BlogPostId } from "Domain/Blog.js"
+import { S } from "lib/resources.js"
 import { InvalidStateError, NotFoundError, OptimisticConcurrencyException } from "effect-app/client"
 import { OperationId } from "effect-app/Operations"
 import { BlogPostView } from "./PostView.js"
diff --git a/api/src/Blog/BlogPostRepo.ts b/api/src/Blog/BlogPostRepo.ts
@@ -1,7 +1,7 @@
 import { Model } from "@effect-app/infra"
 import { UserRepo } from "api/Accounts/UserRepo.js"
-import { BlogPost } from "api/Domain/Blog.js"
-import { UserFromIdResolver } from "api/Domain/User.js"
+import { BlogPost } from "Domain/Blog.js"
+import { UserFromIdResolver } from "Domain/User.js"
 import { RepoDefault } from "api/lib/layers.js"
 import { Effect } from "effect"
 import { Context } from "effect-app"
diff --git a/api/src/Blog/PostView.ts b/api/src/Blog/PostView.ts
@@ -1,6 +1,6 @@
 import { UserViewFromId } from "api/Accounts/UserResolver.js"
-import { BlogPost } from "api/Domain/Blog.js"
-import { S } from "api/lib.js"
+import { BlogPost } from "Domain/Blog.js"
+import { S } from "lib/resources.js"
 
 export class BlogPostView extends S.ExtendedClass<BlogPostView, BlogPostView.Encoded>()({
   ...BlogPost.omit("author"),
diff --git a/api/src/Domain/Events.ts b/api/src/Domain/Events.ts
@@ -1,4 +1,4 @@
-import { S } from "api/lib.js"
+import { S } from "lib/resources.js"
 import type { Schema } from "effect-app/Schema"
 
 export class BogusEvent extends S.ExtendedTaggedClass<BogusEvent, BogusEvent.Encoded>()("BogusEvent", {
diff --git a/api/src/HelloWorld/Api.ts b/api/src/HelloWorld/Api.ts
@@ -1,6 +1,6 @@
 import { RequestContext } from "@effect-app/infra/RequestContext"
 import { UserView } from "api/Accounts/UserView.js"
-import { S } from "api/lib.js"
+import { S } from "lib/resources.js"
 
 class Response extends S.Class<Response>()({
   now: S.Date.withDefault,
diff --git a/api/src/Operations/Api.ts b/api/src/Operations/Api.ts
@@ -1,4 +1,4 @@
-import { clientFor, S } from "api/lib.js"
+import { clientFor, S } from "lib/resources.js"
 import { Duration, Effect } from "effect-app"
 import { NotFoundError } from "effect-app/client"
 import { Operation, OperationFailure, OperationId } from "effect-app/Operations"
diff --git a/api/src/lib.ts b/api/src/lib.ts
@@ -3,8 +3,6 @@ export * from "./lib/basicRuntime.js"
 export * from "./lib/layers.js"
 export * from "./lib/middleware.js"
 export * from "./lib/observability.js"
-export * from "./lib/req.js"
+export * from "./lib/resources.js"
 export * from "./lib/routing.js"
 // codegen:end
-
-export * as S from "./lib/schema.js"
diff --git a/api/src/lib/middleware/events.ts b/api/src/lib/middleware/events.ts
@@ -1,5 +1,5 @@
 import { makeSSE } from "@effect-app/infra/api/middlewares"
-import { ClientEvents } from "api/Domain/Events.js"
+import { ClientEvents } from "Domain/Events.js"
 import { Events } from "api/services.js"
 import { Effect } from "effect-app"
 
diff --git a/api/src/lib/resources.ts b/api/src/lib/resources.ts
@@ -0,0 +1,2 @@
+export * from "./resources/req.js"
+export * as S from "./resources/schema.js"
diff --git a/api/src/lib/resources/req.ts b/api/src/lib/resources/req.ts
@@ -1,9 +1,9 @@
 import { NotLoggedInError, UnauthorizedError } from "@effect-app/infra/errors"
-import type { Role } from "api/Domain/User.js"
+import type { Role } from "Domain/User.js"
+import { Duration, Layer, Request } from "effect-app"
 import type { RPCContextMap } from "effect-app/client"
 import { makeRpcClient } from "effect-app/client"
 import { makeClientFor } from "effect-app/client/clientFor"
-import { RequestCacheLayers } from "./routing.js"
 
 type CTXMap = {
   // we put `never`, because we can't access this service here in the client, and we also don't need to
@@ -25,4 +25,12 @@ export const { TaggedRequest: Req } = makeRpcClient<RequestConfig, CTXMap>({
   requireRoles: UnauthorizedError
 })
 
+export const RequestCacheLayers = Layer.mergeAll(
+  Layer.setRequestCache(
+    Request.makeCache({ capacity: 500, timeToLive: Duration.hours(8) })
+  ),
+  Layer.setRequestCaching(true),
+  Layer.setRequestBatching(true)
+)
+
 export const clientFor = makeClientFor(RequestCacheLayers)
diff --git a/api/src/lib/resources/schema.ts b/api/src/lib/resources/schema.ts
diff --git a/api/src/lib/routing.ts b/api/src/lib/routing.ts
@@ -6,8 +6,8 @@ import { NotLoggedInError, UnauthorizedError } from "@effect-app/infra/errors"
 import type { RequestContext } from "@effect-app/infra/RequestContext"
 import { Rpc } from "@effect/rpc"
 import { BaseConfig } from "api/config.js"
-import type { S } from "effect-app"
-import { Config, Context, Duration, Effect, Exit, FiberRef, Layer, Option, Request, Schedule } from "effect-app"
+import type { Request, S } from "effect-app"
+import { Config, Context, Effect, Exit, FiberRef, Layer, Option, Schedule } from "effect-app"
 import type { GetEffectContext, RPCContextMap } from "effect-app/client"
 import { HttpHeaders, HttpServerRequest } from "effect-app/http"
 import type * as EffectRequest from "effect/Request"
@@ -17,6 +17,7 @@ import {
   UserProfile
 } from "../services/UserProfile.js"
 import { basicRuntime } from "./basicRuntime.js"
+import { RequestCacheLayers } from "./resources/req.js"
 
 const optimisticConcurrencySchedule = Schedule.once
   && Schedule.recurWhile<any>((a) => a?._tag === "OptimisticConcurrencyException")
@@ -31,14 +32,6 @@ export type CTXMap = {
   requireRoles: RPCContextMap.Custom<"", never, typeof UnauthorizedError, Array<string>>
 }
 
-export const RequestCacheLayers = Layer.mergeAll(
-  Layer.setRequestCache(
-    Request.makeCache({ capacity: 500, timeToLive: Duration.hours(8) })
-  ),
-  Layer.setRequestCaching(true),
-  Layer.setRequestBatching(true)
-)
-
 export const Auth0Config = Config.all({
   audience: Config.string("audience").pipe(Config.nested("auth0"), Config.withDefault("http://localhost:3610")),
   issuer: Config.string("issuer").pipe(
diff --git a/api/src/services/Events.ts b/api/src/services/Events.ts
@@ -1,5 +1,5 @@
 import { storeId } from "@effect-app/infra/Store/Memory"
-import type { ClientEvents } from "api/Domain/Events.js"
+import type { ClientEvents } from "Domain/Events.js"
 import { Effect, FiberRef, PubSub, Stream } from "effect-app"
 import type { NonEmptyReadonlyArray } from "effect/Array"
 
diff --git a/api/src/services/UserProfile.ts b/api/src/services/UserProfile.ts
@@ -1,5 +1,5 @@
 import { parseJwt } from "@effect-app/infra/api/routing/schema/jwt"
-import { Role } from "api/Domain/User.js"
+import { Role } from "Domain/User.js"
 import { Context, S } from "effect-app"
 import { UserProfileId } from "effect-app/ids"
 
diff --git a/api/tsconfig.json b/api/tsconfig.json
@@ -1,20 +1,17 @@
 {
   "compilerOptions": {
     "paths": {
-      "core/*": [
-        "./src/core/*"
+      "lib/resources.js": [
+        "./src/lib/resources.js"
       ],
       "resources.js": [
         "./src/resources.js"
       ],
-      "models.js": [
-        "./src/models.js"
+      "Domain.js": [
+        "./src/Domain.js"
       ],
-      "resources/*": [
-        "./src/resources/*"
-      ],
-      "models/*": [
-        "./src/models/*"
+      "Domain/*": [
+        "./src/Domain/*"
       ],
       "api/*": [
         "./src/*"
diff --git a/api/tsconfig.src.json b/api/tsconfig.src.json
@@ -11,20 +11,17 @@
     // keep in here, cause madge can't detect it from extended tsconfig
     "moduleResolution": "Node16",
     "paths": {
-      "core/*": [
-        "./src/core/*"
+      "lib/resources.js": [
+        "./src/lib/resources.js"
       ],
       "resources.js": [
         "./src/resources.js"
       ],
-      "models.js": [
-        "./src/models.js"
+      "Domain.js": [
+        "./src/Domain.js"
       ],
-      "resources/*": [
-        "./src/resources/*"
-      ],
-      "models/*": [
-        "./src/models/*"
+      "Domain/*": [
+        "./src/Domain/*"
       ],
       "api/*": [
         "./src/*"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { S } from "api/lib.js"`
	`1`	`+import { S } from "lib/resources.js"`
`2`	`2`	`import type { Schema } from "effect-app/Schema"`
`3`	`3`
`4`	`4`	`export class BogusEvent extends S.ExtendedTaggedClass<BogusEvent, BogusEvent.Encoded>()("BogusEvent", {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { clientFor, S } from "api/lib.js"`
	`1`	`+import { clientFor, S } from "lib/resources.js"`
`2`	`2`	`import { Duration, Effect } from "effect-app"`
`3`	`3`	`import { NotFoundError } from "effect-app/client"`
`4`	`4`	`import { Operation, OperationFailure, OperationId } from "effect-app/Operations"`