play with vertical slice 2#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
patroza wants to merge 4 commits into
base:main
Choose a base branch
from
Draft

play with vertical slice 2 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73b78db
initial awesome
patroza Jan 18, 2025
42367f6
cleanup
patroza Jan 18, 2025
4d31a9d
fix helloworld controllers
patroza Jan 18, 2025
db3d959
cleanup resources vs views and resolvers
patroza Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/model.code-snippets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
"ResourceCodegen": {
"prefix": "genrsc",
"body": [
"// codegen:start {preset: meta, sourcePrefix: src/resources/}"
"// codegen:start {preset: meta, sourcePrefix: src/}"
]
},
"ModelComplete": {
Expand Down
15 changes: 0 additions & 15 deletions api/src/Accounts.controllers.ts
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions api/src/services/DBContext/UserRepo.ts → api/src/Accounts/UserRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
import { RepoConfig } from "#api/config"
import { RepoDefault } from "#api/lib/layers"
import type { UserId } from "#models/User"
import { User } from "#models/User"
import { Model } from "@effect-app/infra"
import { NotFoundError, NotLoggedInError } from "@effect-app/infra/errors"
import { Q } from "@effect-app/infra/Model"
import { generate } from "@effect-app/infra/test"
import { Array, Effect, Exit, Layer, Option, pipe, Request, RequestResolver, S } from "effect-app"
import { fakerArb } from "effect-app/faker"
import { Email } from "effect-app/Schema"
import fc from "fast-check"
import { Q } from "../lib.js"
import { UserProfile } from "../UserProfile.js"
import type { UserId } from "./models.js"
import { User } from "./models.js"

export type UserSeed = "sample" | ""

Expand Down
15 changes: 8 additions & 7 deletions api/src/Users.controllers.ts → api/src/Accounts/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
import { matchFor, Router } from "#api/lib/routing"
import { Q, UserRepo } from "#api/services"
import { UsersRsc } from "#resources"
import type { UserView } from "#resources/views"
import { Array } from "effect"
import { Effect, Order } from "effect-app"
import { Q} from "@effect-app/infra/Model"
import { Array, Effect, Order } from "effect-app"
import type { UserView } from "./resources.js"
import { AccountsRsc } from "./resources.js"
import { UserRepo } from "./UserRepo.js"

export default Router(UsersRsc)({
export default Router(AccountsRsc)({
dependencies: [UserRepo.Default],
effect: Effect.gen(function*() {
const userRepo = yield* UserRepo

return matchFor(UsersRsc)({
return matchFor(AccountsRsc)({
GetMe: userRepo.getCurrentUser,
IndexUsers: (req) =>
userRepo
.query(Q.where("id", "in", req.filterByIds))
Expand Down
0 api/src/models/User.ts → api/src/Accounts/models.ts
View file
Open in desktop
File renamed without changes.
7 changes: 3 additions & 4 deletions api/src/resources/resolvers/UserResolver.ts → api/src/Accounts/resolvers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { UserId } from "#models/User"
import { clientFor } from "#resources/lib"
import { Effect, Exit, Request, RequestResolver } from "effect"
import { Array, Option, pipe, S } from "effect-app"
import { ApiClientFactory, NotFoundError } from "effect-app/client"
import { type Schema } from "effect-app/Schema"
import * as UsersRsc from "../Users.js"
import { UserView } from "../views/UserView.js"
import { UserId } from "./models.js"
import { AccountsRsc, UserView } from "./resources.js"

interface GetUserViewById extends Request.Request<UserView, NotFoundError<"User">> {
readonly _tag: "GetUserViewById"
Expand All@@ -15,7 +14,7 @@ const GetUserViewById = Request.tagged<GetUserViewById>("GetUserViewById")

const getUserViewByIdResolver = RequestResolver
.makeBatched((requests: GetUserViewById[]) =>
clientFor(UsersRsc).pipe(
clientFor(AccountsRsc).pipe(
Effect.flatMap((client) =>
client
.IndexUsers
Expand Down
37 changes: 37 additions & 0 deletions api/src/Accounts/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import { S } from "#resources/lib"
import { NotFoundError } from "effect-app/client"
import { User, UserId } from "./models.js"

export class UserView extends S.ExtendedClass<UserView, UserView.Encoded>()({
...User.pick("id", "role"),
displayName: S.NonEmptyString2k
}) {}

export class GetMe extends S.Req<GetMe>()("GetMe", {}, { success: User, failure: NotFoundError }) {}

export class IndexUsers extends S.Req<IndexUsers>()("IndexUsers", {
filterByIds: S.NonEmptyArray(UserId)
}, {
allowAnonymous: true,
allowRoles: ["user"],
success: S.Struct({
users: S.Array(UserView)
})
}) {}

// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Accounts" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace UserView {
export interface Encoded extends S.Struct.Encoded<typeof UserView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end
//

export * as AccountsRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/services/DBContext/BlogPostRepo.ts → api/src/Blog/BlogPostRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { UserFromIdResolver } from "#Accounts/models"
import { UserRepo } from "#Accounts/UserRepo"
import { RepoDefault } from "#api/lib/layers"
import { BlogPost } from "#models/Blog"
import { UserFromIdResolver } from "#models/User"
import { Model } from "@effect-app/infra"
import { Effect } from "effect"
import { Context } from "effect-app"
import { NonEmptyString255, NonEmptyString2k } from "effect-app/Schema"
import { UserRepo } from "./UserRepo.js"
import { BlogPost } from "./models.js"

export type BlogPostSeed = "sample" | ""

Expand Down
11 changes: 7 additions & 4 deletions api/src/Blog.controllers.ts → api/src/Blog/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
import { UserRepo } from "#api/Accounts/UserRepo"
import { Events } from "#api/Events"
import { matchFor, Router } from "#api/lib/routing"
import { BlogPostRepo, Events, Operations, UserRepo } from "#api/services"
import { BlogPost } from "#models/Blog"
import { BlogRsc } from "#resources"
import { BogusEvent } from "#resources/Events"
import { Operations } from "@effect-app/infra/Operations"
import { Duration, Effect, Schedule } from "effect"
import { Option } from "effect-app"
import { NonEmptyString2k, NonNegativeInt } from "effect-app/Schema"
import { OperationsDefault } from "./lib/layers.js"
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: [
Expand Down
2 changes: 1 addition & 1 deletion api/src/models/Blog.ts → api/src/Blog/models.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { UserFromId } from "#Accounts/models"
import { S } from "effect-app"
import { UserFromId } from "./User.js"

export const BlogPostId = S.prefixedStringId<BlogPostId>()("post", "BlogPostId")
export interface BlogPostIdBrand {
Expand Down
25 changes: 21 additions & 4 deletions api/src/resources/Blog.ts → api/src/Blog/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { BlogPost, BlogPostId } from "#models/Blog"
import { UserViewFromId } from "#api/Accounts/resolvers"
import { S } from "#resources/lib"
import { InvalidStateError, NotFoundError, OptimisticConcurrencyException } from "effect-app/client"
import { OperationId } from "effect-app/Operations"
import { S } from "./lib.js"
import { BlogPostView } from "./views.js"
import { BlogPost, BlogPostId } from "./models.js"

export class BlogPostView extends S.ExtendedClass<BlogPostView, BlogPostView.Encoded>()({
...BlogPost.omit("author"),
author: S.propertySignature(UserViewFromId).pipe(S.fromKey("authorId"))
}) {}

export class CreatePost extends S.Req<CreatePost>()("CreatePost", BlogPost.pick("title", "body"), {
allowRoles: ["user"],
Expand All@@ -26,6 +31,18 @@ export class PublishPost extends S.Req<PublishPost>()("PublishPost", {
id: BlogPostId
}, { allowRoles: ["user"], success: OperationId, failure: S.Union(NotFoundError) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Blog" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace BlogPostView {
export interface Encoded extends S.Struct.Encoded<typeof BlogPostView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end

export * as BlogRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/Events.ts → api/src/Events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
7 changes: 3 additions & 4 deletions api/src/HelloWorld.controllers.ts → api/src/HelloWorld/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { User } from "#api/Accounts/models"
import { UserRepo } from "#api/Accounts/UserRepo"
import { matchFor, Router } from "#api/lib/routing"
import { UserRepo } from "#api/services"
import { User } from "#models/User"
import { HelloWorldRsc } from "#resources"
import { GetHelloWorld } from "#resources/HelloWorld"
import { getRequestContext } from "@effect-app/infra/api/setupRequest"
import { generate } from "@effect-app/infra/test"
import { Effect, S } from "effect-app"
import { GetHelloWorld, HelloWorldRsc } from "./resources.js"

export default Router(HelloWorldRsc)({
dependencies: [UserRepo.Default],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/HelloWorld.ts → api/src/HelloWorld/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { UserView } from "#api/Accounts/resources"
import { S } from "#resources/lib"
import { RequestContext } from "@effect-app/infra/RequestContext"
import { S } from "./lib.js"
import { UserView } from "./views.js"

class Response extends S.Class<Response>()({
now: S.Date.withDefault,
Expand All@@ -14,6 +14,7 @@ export class GetHelloWorld extends S.Req<GetHelloWorld>()("GetHelloWorld", {
echo: S.String
}, { allowAnonymous: true, allowRoles: ["user"], success: Response }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "HelloWorld" } as const
// codegen:end
export * as HelloWorldRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/Operations.controllers.ts → api/src/Operations/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { OperationsDefault } from "#api/lib/layers"
import { matchFor, Router } from "#api/lib/routing"
import { Operations } from "#api/services"
import { OperationsRsc } from "#resources"
import { Operations } from "@effect-app/infra/Operations"
import { Effect } from "effect-app"
import { OperationsDefault } from "./lib/layers.js"
import { OperationsRsc } from "./resources.js"

export default Router(OperationsRsc)({
dependencies: [OperationsDefault],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/Operations.ts → api/src/Operations/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { clientFor, S } from "#api/resources/lib"
import { Duration, Effect } from "effect-app"
import { NotFoundError } from "effect-app/client"
import { Operation, OperationFailure, OperationId } from "effect-app/Operations"
import { clientFor } from "./lib.js"
import * as S from "./lib/schema.js"

export class FindOperation extends S.Req<FindOperation>()("FindOperation", {
id: OperationId
}, { allowAnonymous: true, allowRoles: ["user"], success: S.NullOr(Operation) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Operations" } as const
// codegen:end

Expand DownExpand Up@@ -96,3 +95,5 @@ export const OperationsClient = Effect.gen(function*() {
waitForOperation_
})
})

export * as OperationsRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/UserProfile.ts → api/src/UserProfile.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Role } from "#models/User"
import { parseJwt } from "@effect-app/infra/api/routing/schema/jwt"
import { Context, S } from "effect-app"
import { UserProfileId } from "effect-app/ids"
import { Role } from "./Accounts/models.js"

export class UserProfile extends Context.assignTag<UserProfile>()(
S.Class<UserProfile>()({
Expand Down
13 changes: 6 additions & 7 deletions api/src/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
// codegen:start {preset: barrel, include: ./*.controllers.ts, import: default}
import accountsControllers from "./Accounts.controllers.js"
import blogControllers from "./Blog.controllers.js"
import helloWorldControllers from "./HelloWorld.controllers.js"
import operationsControllers from "./Operations.controllers.js"
import usersControllers from "./Users.controllers.js"
// codegen:start {preset: barrel, include: ./*/controllers.ts, import: default}
import accountsControllers from "./Accounts/controllers.js"
import blogControllers from "./Blog/controllers.js"
import helloWorldControllers from "./HelloWorld/controllers.js"
import operationsControllers from "./Operations/controllers.js"

export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers, usersControllers }
export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers }
// codegen:end
4 changes: 2 additions & 2 deletions api/src/lib/middleware/events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { Events } from "#api/services"
import { ClientEvents } from "#resources"
import { Events } from "#api/Events"
import { ClientEvents } from "#api/resources/Events"
import { makeSSE } from "@effect-app/infra/api/middlewares"
import { Effect } from "effect-app"

Expand Down
6 changes: 1 addition & 5 deletions api/src/lib/routing.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,7 @@ import { Context, Effect, Exit, Layer, Option } from "effect-app"
import type { GetEffectContext, RPCContextMap } from "effect-app/client"
import type { HttpHeaders, HttpServerRequest } from "effect-app/http"
import type * as EffectRequest from "effect/Request"
import {
makeUserProfileFromAuthorizationHeader,
makeUserProfileFromUserHeader,
UserProfile
} from "../services/UserProfile.js"
import { makeUserProfileFromAuthorizationHeader, makeUserProfileFromUserHeader, UserProfile } from "../UserProfile.js"
import { basicRuntime } from "./basicRuntime.js"

export interface CTX {
Expand Down
11 changes: 0 additions & 11 deletions api/src/resources.ts
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions api/src/resources/Accounts.ts
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions api/src/resources/Users.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion api/src/resources/lib/req.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Role } from "#models/User"
import type { Role } from "#api/Accounts/models"
import { NotLoggedInError, UnauthorizedError } from "@effect-app/infra/errors"
import { Duration, Layer, Request as EffectRequest } from "effect-app"
import type { RPCContextMap } from "effect-app/client"
Expand Down
4 changes: 0 additions & 4 deletions api/src/resources/views.ts
View file
Open in desktop

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

play with vertical slice 2#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
patroza wants to merge 4 commits into
base:main
Choose a base branch
from
Draft

play with vertical slice 2 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73b78db
initial awesome
patroza Jan 18, 2025
42367f6
cleanup
patroza Jan 18, 2025
4d31a9d
fix helloworld controllers
patroza Jan 18, 2025
db3d959
cleanup resources vs views and resolvers
patroza Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/model.code-snippets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
"ResourceCodegen": {
"prefix": "genrsc",
"body": [
"// codegen:start {preset: meta, sourcePrefix: src/resources/}"
"// codegen:start {preset: meta, sourcePrefix: src/}"
]
},
"ModelComplete": {
Expand Down
15 changes: 0 additions & 15 deletions api/src/Accounts.controllers.ts
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions api/src/services/DBContext/UserRepo.ts → api/src/Accounts/UserRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
import { RepoConfig } from "#api/config"
import { RepoDefault } from "#api/lib/layers"
import type { UserId } from "#models/User"
import { User } from "#models/User"
import { Model } from "@effect-app/infra"
import { NotFoundError, NotLoggedInError } from "@effect-app/infra/errors"
import { Q } from "@effect-app/infra/Model"
import { generate } from "@effect-app/infra/test"
import { Array, Effect, Exit, Layer, Option, pipe, Request, RequestResolver, S } from "effect-app"
import { fakerArb } from "effect-app/faker"
import { Email } from "effect-app/Schema"
import fc from "fast-check"
import { Q } from "../lib.js"
import { UserProfile } from "../UserProfile.js"
import type { UserId } from "./models.js"
import { User } from "./models.js"

export type UserSeed = "sample" | ""

Expand Down
15 changes: 8 additions & 7 deletions api/src/Users.controllers.ts → api/src/Accounts/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
import { matchFor, Router } from "#api/lib/routing"
import { Q, UserRepo } from "#api/services"
import { UsersRsc } from "#resources"
import type { UserView } from "#resources/views"
import { Array } from "effect"
import { Effect, Order } from "effect-app"
import { Q} from "@effect-app/infra/Model"
import { Array, Effect, Order } from "effect-app"
import type { UserView } from "./resources.js"
import { AccountsRsc } from "./resources.js"
import { UserRepo } from "./UserRepo.js"

export default Router(UsersRsc)({
export default Router(AccountsRsc)({
dependencies: [UserRepo.Default],
effect: Effect.gen(function*() {
const userRepo = yield* UserRepo

return matchFor(UsersRsc)({
return matchFor(AccountsRsc)({
GetMe: userRepo.getCurrentUser,
IndexUsers: (req) =>
userRepo
.query(Q.where("id", "in", req.filterByIds))
Expand Down
0 api/src/models/User.ts → api/src/Accounts/models.ts
View file
Open in desktop
File renamed without changes.
7 changes: 3 additions & 4 deletions api/src/resources/resolvers/UserResolver.ts → api/src/Accounts/resolvers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { UserId } from "#models/User"
import { clientFor } from "#resources/lib"
import { Effect, Exit, Request, RequestResolver } from "effect"
import { Array, Option, pipe, S } from "effect-app"
import { ApiClientFactory, NotFoundError } from "effect-app/client"
import { type Schema } from "effect-app/Schema"
import * as UsersRsc from "../Users.js"
import { UserView } from "../views/UserView.js"
import { UserId } from "./models.js"
import { AccountsRsc, UserView } from "./resources.js"

interface GetUserViewById extends Request.Request<UserView, NotFoundError<"User">> {
readonly _tag: "GetUserViewById"
Expand All@@ -15,7 +14,7 @@ const GetUserViewById = Request.tagged<GetUserViewById>("GetUserViewById")

const getUserViewByIdResolver = RequestResolver
.makeBatched((requests: GetUserViewById[]) =>
clientFor(UsersRsc).pipe(
clientFor(AccountsRsc).pipe(
Effect.flatMap((client) =>
client
.IndexUsers
Expand Down
37 changes: 37 additions & 0 deletions api/src/Accounts/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import { S } from "#resources/lib"
import { NotFoundError } from "effect-app/client"
import { User, UserId } from "./models.js"

export class UserView extends S.ExtendedClass<UserView, UserView.Encoded>()({
...User.pick("id", "role"),
displayName: S.NonEmptyString2k
}) {}

export class GetMe extends S.Req<GetMe>()("GetMe", {}, { success: User, failure: NotFoundError }) {}

export class IndexUsers extends S.Req<IndexUsers>()("IndexUsers", {
filterByIds: S.NonEmptyArray(UserId)
}, {
allowAnonymous: true,
allowRoles: ["user"],
success: S.Struct({
users: S.Array(UserView)
})
}) {}

// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Accounts" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace UserView {
export interface Encoded extends S.Struct.Encoded<typeof UserView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end
//

export * as AccountsRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/services/DBContext/BlogPostRepo.ts → api/src/Blog/BlogPostRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { UserFromIdResolver } from "#Accounts/models"
import { UserRepo } from "#Accounts/UserRepo"
import { RepoDefault } from "#api/lib/layers"
import { BlogPost } from "#models/Blog"
import { UserFromIdResolver } from "#models/User"
import { Model } from "@effect-app/infra"
import { Effect } from "effect"
import { Context } from "effect-app"
import { NonEmptyString255, NonEmptyString2k } from "effect-app/Schema"
import { UserRepo } from "./UserRepo.js"
import { BlogPost } from "./models.js"

export type BlogPostSeed = "sample" | ""

Expand Down
11 changes: 7 additions & 4 deletions api/src/Blog.controllers.ts → api/src/Blog/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
import { UserRepo } from "#api/Accounts/UserRepo"
import { Events } from "#api/Events"
import { matchFor, Router } from "#api/lib/routing"
import { BlogPostRepo, Events, Operations, UserRepo } from "#api/services"
import { BlogPost } from "#models/Blog"
import { BlogRsc } from "#resources"
import { BogusEvent } from "#resources/Events"
import { Operations } from "@effect-app/infra/Operations"
import { Duration, Effect, Schedule } from "effect"
import { Option } from "effect-app"
import { NonEmptyString2k, NonNegativeInt } from "effect-app/Schema"
import { OperationsDefault } from "./lib/layers.js"
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: [
Expand Down
2 changes: 1 addition & 1 deletion api/src/models/Blog.ts → api/src/Blog/models.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { UserFromId } from "#Accounts/models"
import { S } from "effect-app"
import { UserFromId } from "./User.js"

export const BlogPostId = S.prefixedStringId<BlogPostId>()("post", "BlogPostId")
export interface BlogPostIdBrand {
Expand Down
25 changes: 21 additions & 4 deletions api/src/resources/Blog.ts → api/src/Blog/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { BlogPost, BlogPostId } from "#models/Blog"
import { UserViewFromId } from "#api/Accounts/resolvers"
import { S } from "#resources/lib"
import { InvalidStateError, NotFoundError, OptimisticConcurrencyException } from "effect-app/client"
import { OperationId } from "effect-app/Operations"
import { S } from "./lib.js"
import { BlogPostView } from "./views.js"
import { BlogPost, BlogPostId } from "./models.js"

export class BlogPostView extends S.ExtendedClass<BlogPostView, BlogPostView.Encoded>()({
...BlogPost.omit("author"),
author: S.propertySignature(UserViewFromId).pipe(S.fromKey("authorId"))
}) {}

export class CreatePost extends S.Req<CreatePost>()("CreatePost", BlogPost.pick("title", "body"), {
allowRoles: ["user"],
Expand All@@ -26,6 +31,18 @@ export class PublishPost extends S.Req<PublishPost>()("PublishPost", {
id: BlogPostId
}, { allowRoles: ["user"], success: OperationId, failure: S.Union(NotFoundError) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Blog" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace BlogPostView {
export interface Encoded extends S.Struct.Encoded<typeof BlogPostView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end

export * as BlogRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/Events.ts → api/src/Events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
7 changes: 3 additions & 4 deletions api/src/HelloWorld.controllers.ts → api/src/HelloWorld/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { User } from "#api/Accounts/models"
import { UserRepo } from "#api/Accounts/UserRepo"
import { matchFor, Router } from "#api/lib/routing"
import { UserRepo } from "#api/services"
import { User } from "#models/User"
import { HelloWorldRsc } from "#resources"
import { GetHelloWorld } from "#resources/HelloWorld"
import { getRequestContext } from "@effect-app/infra/api/setupRequest"
import { generate } from "@effect-app/infra/test"
import { Effect, S } from "effect-app"
import { GetHelloWorld, HelloWorldRsc } from "./resources.js"

export default Router(HelloWorldRsc)({
dependencies: [UserRepo.Default],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/HelloWorld.ts → api/src/HelloWorld/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { UserView } from "#api/Accounts/resources"
import { S } from "#resources/lib"
import { RequestContext } from "@effect-app/infra/RequestContext"
import { S } from "./lib.js"
import { UserView } from "./views.js"

class Response extends S.Class<Response>()({
now: S.Date.withDefault,
Expand All@@ -14,6 +14,7 @@ export class GetHelloWorld extends S.Req<GetHelloWorld>()("GetHelloWorld", {
echo: S.String
}, { allowAnonymous: true, allowRoles: ["user"], success: Response }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "HelloWorld" } as const
// codegen:end
export * as HelloWorldRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/Operations.controllers.ts → api/src/Operations/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { OperationsDefault } from "#api/lib/layers"
import { matchFor, Router } from "#api/lib/routing"
import { Operations } from "#api/services"
import { OperationsRsc } from "#resources"
import { Operations } from "@effect-app/infra/Operations"
import { Effect } from "effect-app"
import { OperationsDefault } from "./lib/layers.js"
import { OperationsRsc } from "./resources.js"

export default Router(OperationsRsc)({
dependencies: [OperationsDefault],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/Operations.ts → api/src/Operations/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { clientFor, S } from "#api/resources/lib"
import { Duration, Effect } from "effect-app"
import { NotFoundError } from "effect-app/client"
import { Operation, OperationFailure, OperationId } from "effect-app/Operations"
import { clientFor } from "./lib.js"
import * as S from "./lib/schema.js"

export class FindOperation extends S.Req<FindOperation>()("FindOperation", {
id: OperationId
}, { allowAnonymous: true, allowRoles: ["user"], success: S.NullOr(Operation) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Operations" } as const
// codegen:end

Expand DownExpand Up@@ -96,3 +95,5 @@ export const OperationsClient = Effect.gen(function*() {
waitForOperation_
})
})

export * as OperationsRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/UserProfile.ts → api/src/UserProfile.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Role } from "#models/User"
import { parseJwt } from "@effect-app/infra/api/routing/schema/jwt"
import { Context, S } from "effect-app"
import { UserProfileId } from "effect-app/ids"
import { Role } from "./Accounts/models.js"

export class UserProfile extends Context.assignTag<UserProfile>()(
S.Class<UserProfile>()({
Expand Down
13 changes: 6 additions & 7 deletions api/src/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
// codegen:start {preset: barrel, include: ./*.controllers.ts, import: default}
import accountsControllers from "./Accounts.controllers.js"
import blogControllers from "./Blog.controllers.js"
import helloWorldControllers from "./HelloWorld.controllers.js"
import operationsControllers from "./Operations.controllers.js"
import usersControllers from "./Users.controllers.js"
// codegen:start {preset: barrel, include: ./*/controllers.ts, import: default}
import accountsControllers from "./Accounts/controllers.js"
import blogControllers from "./Blog/controllers.js"
import helloWorldControllers from "./HelloWorld/controllers.js"
import operationsControllers from "./Operations/controllers.js"

export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers, usersControllers }
export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers }
// codegen:end
4 changes: 2 additions & 2 deletions api/src/lib/middleware/events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { Events } from "#api/services"
import { ClientEvents } from "#resources"
import { Events } from "#api/Events"
import { ClientEvents } from "#api/resources/Events"
import { makeSSE } from "@effect-app/infra/api/middlewares"
import { Effect } from "effect-app"

Expand Down
6 changes: 1 addition & 5 deletions api/src/lib/routing.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,7 @@ import { Context, Effect, Exit, Layer, Option } from "effect-app"
import type { GetEffectContext, RPCContextMap } from "effect-app/client"
import type { HttpHeaders, HttpServerRequest } from "effect-app/http"
import type * as EffectRequest from "effect/Request"
import {
makeUserProfileFromAuthorizationHeader,
makeUserProfileFromUserHeader,
UserProfile
} from "../services/UserProfile.js"
import { makeUserProfileFromAuthorizationHeader, makeUserProfileFromUserHeader, UserProfile } from "../UserProfile.js"
import { basicRuntime } from "./basicRuntime.js"

export interface CTX {
Expand Down
11 changes: 0 additions & 11 deletions api/src/resources.ts
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions api/src/resources/Accounts.ts
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions api/src/resources/Users.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion api/src/resources/lib/req.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Role } from "#models/User"
import type { Role } from "#api/Accounts/models"
import { NotLoggedInError, UnauthorizedError } from "@effect-app/infra/errors"
import { Duration, Layer, Request as EffectRequest } from "effect-app"
import type { RPCContextMap } from "effect-app/client"
Expand Down
4 changes: 0 additions & 4 deletions api/src/resources/views.ts
View file
Open in desktop

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

play with vertical slice 2#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
patroza wants to merge 4 commits into
base:main
Choose a base branch
from
Draft

play with vertical slice 2 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73b78db
initial awesome
patroza Jan 18, 2025
42367f6
cleanup
patroza Jan 18, 2025
4d31a9d
fix helloworld controllers
patroza Jan 18, 2025
db3d959
cleanup resources vs views and resolvers
patroza Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/model.code-snippets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
"ResourceCodegen": {
"prefix": "genrsc",
"body": [
"// codegen:start {preset: meta, sourcePrefix: src/resources/}"
"// codegen:start {preset: meta, sourcePrefix: src/}"
]
},
"ModelComplete": {
Expand Down
15 changes: 0 additions & 15 deletions api/src/Accounts.controllers.ts
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions api/src/services/DBContext/UserRepo.ts → api/src/Accounts/UserRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
import { RepoConfig } from "#api/config"
import { RepoDefault } from "#api/lib/layers"
import type { UserId } from "#models/User"
import { User } from "#models/User"
import { Model } from "@effect-app/infra"
import { NotFoundError, NotLoggedInError } from "@effect-app/infra/errors"
import { Q } from "@effect-app/infra/Model"
import { generate } from "@effect-app/infra/test"
import { Array, Effect, Exit, Layer, Option, pipe, Request, RequestResolver, S } from "effect-app"
import { fakerArb } from "effect-app/faker"
import { Email } from "effect-app/Schema"
import fc from "fast-check"
import { Q } from "../lib.js"
import { UserProfile } from "../UserProfile.js"
import type { UserId } from "./models.js"
import { User } from "./models.js"

export type UserSeed = "sample" | ""

Expand Down
15 changes: 8 additions & 7 deletions api/src/Users.controllers.ts → api/src/Accounts/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
import { matchFor, Router } from "#api/lib/routing"
import { Q, UserRepo } from "#api/services"
import { UsersRsc } from "#resources"
import type { UserView } from "#resources/views"
import { Array } from "effect"
import { Effect, Order } from "effect-app"
import { Q} from "@effect-app/infra/Model"
import { Array, Effect, Order } from "effect-app"
import type { UserView } from "./resources.js"
import { AccountsRsc } from "./resources.js"
import { UserRepo } from "./UserRepo.js"

export default Router(UsersRsc)({
export default Router(AccountsRsc)({
dependencies: [UserRepo.Default],
effect: Effect.gen(function*() {
const userRepo = yield* UserRepo

return matchFor(UsersRsc)({
return matchFor(AccountsRsc)({
GetMe: userRepo.getCurrentUser,
IndexUsers: (req) =>
userRepo
.query(Q.where("id", "in", req.filterByIds))
Expand Down
0 api/src/models/User.ts → api/src/Accounts/models.ts
View file
Open in desktop
File renamed without changes.
7 changes: 3 additions & 4 deletions api/src/resources/resolvers/UserResolver.ts → api/src/Accounts/resolvers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { UserId } from "#models/User"
import { clientFor } from "#resources/lib"
import { Effect, Exit, Request, RequestResolver } from "effect"
import { Array, Option, pipe, S } from "effect-app"
import { ApiClientFactory, NotFoundError } from "effect-app/client"
import { type Schema } from "effect-app/Schema"
import * as UsersRsc from "../Users.js"
import { UserView } from "../views/UserView.js"
import { UserId } from "./models.js"
import { AccountsRsc, UserView } from "./resources.js"

interface GetUserViewById extends Request.Request<UserView, NotFoundError<"User">> {
readonly _tag: "GetUserViewById"
Expand All@@ -15,7 +14,7 @@ const GetUserViewById = Request.tagged<GetUserViewById>("GetUserViewById")

const getUserViewByIdResolver = RequestResolver
.makeBatched((requests: GetUserViewById[]) =>
clientFor(UsersRsc).pipe(
clientFor(AccountsRsc).pipe(
Effect.flatMap((client) =>
client
.IndexUsers
Expand Down
37 changes: 37 additions & 0 deletions api/src/Accounts/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import { S } from "#resources/lib"
import { NotFoundError } from "effect-app/client"
import { User, UserId } from "./models.js"

export class UserView extends S.ExtendedClass<UserView, UserView.Encoded>()({
...User.pick("id", "role"),
displayName: S.NonEmptyString2k
}) {}

export class GetMe extends S.Req<GetMe>()("GetMe", {}, { success: User, failure: NotFoundError }) {}

export class IndexUsers extends S.Req<IndexUsers>()("IndexUsers", {
filterByIds: S.NonEmptyArray(UserId)
}, {
allowAnonymous: true,
allowRoles: ["user"],
success: S.Struct({
users: S.Array(UserView)
})
}) {}

// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Accounts" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace UserView {
export interface Encoded extends S.Struct.Encoded<typeof UserView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end
//

export * as AccountsRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/services/DBContext/BlogPostRepo.ts → api/src/Blog/BlogPostRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { UserFromIdResolver } from "#Accounts/models"
import { UserRepo } from "#Accounts/UserRepo"
import { RepoDefault } from "#api/lib/layers"
import { BlogPost } from "#models/Blog"
import { UserFromIdResolver } from "#models/User"
import { Model } from "@effect-app/infra"
import { Effect } from "effect"
import { Context } from "effect-app"
import { NonEmptyString255, NonEmptyString2k } from "effect-app/Schema"
import { UserRepo } from "./UserRepo.js"
import { BlogPost } from "./models.js"

export type BlogPostSeed = "sample" | ""

Expand Down
11 changes: 7 additions & 4 deletions api/src/Blog.controllers.ts → api/src/Blog/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
import { UserRepo } from "#api/Accounts/UserRepo"
import { Events } from "#api/Events"
import { matchFor, Router } from "#api/lib/routing"
import { BlogPostRepo, Events, Operations, UserRepo } from "#api/services"
import { BlogPost } from "#models/Blog"
import { BlogRsc } from "#resources"
import { BogusEvent } from "#resources/Events"
import { Operations } from "@effect-app/infra/Operations"
import { Duration, Effect, Schedule } from "effect"
import { Option } from "effect-app"
import { NonEmptyString2k, NonNegativeInt } from "effect-app/Schema"
import { OperationsDefault } from "./lib/layers.js"
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: [
Expand Down
2 changes: 1 addition & 1 deletion api/src/models/Blog.ts → api/src/Blog/models.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { UserFromId } from "#Accounts/models"
import { S } from "effect-app"
import { UserFromId } from "./User.js"

export const BlogPostId = S.prefixedStringId<BlogPostId>()("post", "BlogPostId")
export interface BlogPostIdBrand {
Expand Down
25 changes: 21 additions & 4 deletions api/src/resources/Blog.ts → api/src/Blog/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { BlogPost, BlogPostId } from "#models/Blog"
import { UserViewFromId } from "#api/Accounts/resolvers"
import { S } from "#resources/lib"
import { InvalidStateError, NotFoundError, OptimisticConcurrencyException } from "effect-app/client"
import { OperationId } from "effect-app/Operations"
import { S } from "./lib.js"
import { BlogPostView } from "./views.js"
import { BlogPost, BlogPostId } from "./models.js"

export class BlogPostView extends S.ExtendedClass<BlogPostView, BlogPostView.Encoded>()({
...BlogPost.omit("author"),
author: S.propertySignature(UserViewFromId).pipe(S.fromKey("authorId"))
}) {}

export class CreatePost extends S.Req<CreatePost>()("CreatePost", BlogPost.pick("title", "body"), {
allowRoles: ["user"],
Expand All@@ -26,6 +31,18 @@ export class PublishPost extends S.Req<PublishPost>()("PublishPost", {
id: BlogPostId
}, { allowRoles: ["user"], success: OperationId, failure: S.Union(NotFoundError) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Blog" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace BlogPostView {
export interface Encoded extends S.Struct.Encoded<typeof BlogPostView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end

export * as BlogRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/Events.ts → api/src/Events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
7 changes: 3 additions & 4 deletions api/src/HelloWorld.controllers.ts → api/src/HelloWorld/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { User } from "#api/Accounts/models"
import { UserRepo } from "#api/Accounts/UserRepo"
import { matchFor, Router } from "#api/lib/routing"
import { UserRepo } from "#api/services"
import { User } from "#models/User"
import { HelloWorldRsc } from "#resources"
import { GetHelloWorld } from "#resources/HelloWorld"
import { getRequestContext } from "@effect-app/infra/api/setupRequest"
import { generate } from "@effect-app/infra/test"
import { Effect, S } from "effect-app"
import { GetHelloWorld, HelloWorldRsc } from "./resources.js"

export default Router(HelloWorldRsc)({
dependencies: [UserRepo.Default],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/HelloWorld.ts → api/src/HelloWorld/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { UserView } from "#api/Accounts/resources"
import { S } from "#resources/lib"
import { RequestContext } from "@effect-app/infra/RequestContext"
import { S } from "./lib.js"
import { UserView } from "./views.js"

class Response extends S.Class<Response>()({
now: S.Date.withDefault,
Expand All@@ -14,6 +14,7 @@ export class GetHelloWorld extends S.Req<GetHelloWorld>()("GetHelloWorld", {
echo: S.String
}, { allowAnonymous: true, allowRoles: ["user"], success: Response }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "HelloWorld" } as const
// codegen:end
export * as HelloWorldRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/Operations.controllers.ts → api/src/Operations/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { OperationsDefault } from "#api/lib/layers"
import { matchFor, Router } from "#api/lib/routing"
import { Operations } from "#api/services"
import { OperationsRsc } from "#resources"
import { Operations } from "@effect-app/infra/Operations"
import { Effect } from "effect-app"
import { OperationsDefault } from "./lib/layers.js"
import { OperationsRsc } from "./resources.js"

export default Router(OperationsRsc)({
dependencies: [OperationsDefault],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/Operations.ts → api/src/Operations/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { clientFor, S } from "#api/resources/lib"
import { Duration, Effect } from "effect-app"
import { NotFoundError } from "effect-app/client"
import { Operation, OperationFailure, OperationId } from "effect-app/Operations"
import { clientFor } from "./lib.js"
import * as S from "./lib/schema.js"

export class FindOperation extends S.Req<FindOperation>()("FindOperation", {
id: OperationId
}, { allowAnonymous: true, allowRoles: ["user"], success: S.NullOr(Operation) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Operations" } as const
// codegen:end

Expand DownExpand Up@@ -96,3 +95,5 @@ export const OperationsClient = Effect.gen(function*() {
waitForOperation_
})
})

export * as OperationsRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/UserProfile.ts → api/src/UserProfile.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Role } from "#models/User"
import { parseJwt } from "@effect-app/infra/api/routing/schema/jwt"
import { Context, S } from "effect-app"
import { UserProfileId } from "effect-app/ids"
import { Role } from "./Accounts/models.js"

export class UserProfile extends Context.assignTag<UserProfile>()(
S.Class<UserProfile>()({
Expand Down
13 changes: 6 additions & 7 deletions api/src/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
// codegen:start {preset: barrel, include: ./*.controllers.ts, import: default}
import accountsControllers from "./Accounts.controllers.js"
import blogControllers from "./Blog.controllers.js"
import helloWorldControllers from "./HelloWorld.controllers.js"
import operationsControllers from "./Operations.controllers.js"
import usersControllers from "./Users.controllers.js"
// codegen:start {preset: barrel, include: ./*/controllers.ts, import: default}
import accountsControllers from "./Accounts/controllers.js"
import blogControllers from "./Blog/controllers.js"
import helloWorldControllers from "./HelloWorld/controllers.js"
import operationsControllers from "./Operations/controllers.js"

export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers, usersControllers }
export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers }
// codegen:end
4 changes: 2 additions & 2 deletions api/src/lib/middleware/events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { Events } from "#api/services"
import { ClientEvents } from "#resources"
import { Events } from "#api/Events"
import { ClientEvents } from "#api/resources/Events"
import { makeSSE } from "@effect-app/infra/api/middlewares"
import { Effect } from "effect-app"

Expand Down
6 changes: 1 addition & 5 deletions api/src/lib/routing.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,7 @@ import { Context, Effect, Exit, Layer, Option } from "effect-app"
import type { GetEffectContext, RPCContextMap } from "effect-app/client"
import type { HttpHeaders, HttpServerRequest } from "effect-app/http"
import type * as EffectRequest from "effect/Request"
import {
makeUserProfileFromAuthorizationHeader,
makeUserProfileFromUserHeader,
UserProfile
} from "../services/UserProfile.js"
import { makeUserProfileFromAuthorizationHeader, makeUserProfileFromUserHeader, UserProfile } from "../UserProfile.js"
import { basicRuntime } from "./basicRuntime.js"

export interface CTX {
Expand Down
11 changes: 0 additions & 11 deletions api/src/resources.ts
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions api/src/resources/Accounts.ts
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions api/src/resources/Users.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion api/src/resources/lib/req.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Role } from "#models/User"
import type { Role } from "#api/Accounts/models"
import { NotLoggedInError, UnauthorizedError } from "@effect-app/infra/errors"
import { Duration, Layer, Request as EffectRequest } from "effect-app"
import type { RPCContextMap } from "effect-app/client"
Expand Down
4 changes: 0 additions & 4 deletions api/src/resources/views.ts
View file
Open in desktop

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

play with vertical slice 2#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
patroza wants to merge 4 commits into
base:main
Choose a base branch
from
Draft

play with vertical slice 2 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73b78db
initial awesome
patroza Jan 18, 2025
42367f6
cleanup
patroza Jan 18, 2025
4d31a9d
fix helloworld controllers
patroza Jan 18, 2025
db3d959
cleanup resources vs views and resolvers
patroza Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/model.code-snippets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
"ResourceCodegen": {
"prefix": "genrsc",
"body": [
"// codegen:start {preset: meta, sourcePrefix: src/resources/}"
"// codegen:start {preset: meta, sourcePrefix: src/}"
]
},
"ModelComplete": {
Expand Down
15 changes: 0 additions & 15 deletions api/src/Accounts.controllers.ts
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions api/src/services/DBContext/UserRepo.ts → api/src/Accounts/UserRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
import { RepoConfig } from "#api/config"
import { RepoDefault } from "#api/lib/layers"
import type { UserId } from "#models/User"
import { User } from "#models/User"
import { Model } from "@effect-app/infra"
import { NotFoundError, NotLoggedInError } from "@effect-app/infra/errors"
import { Q } from "@effect-app/infra/Model"
import { generate } from "@effect-app/infra/test"
import { Array, Effect, Exit, Layer, Option, pipe, Request, RequestResolver, S } from "effect-app"
import { fakerArb } from "effect-app/faker"
import { Email } from "effect-app/Schema"
import fc from "fast-check"
import { Q } from "../lib.js"
import { UserProfile } from "../UserProfile.js"
import type { UserId } from "./models.js"
import { User } from "./models.js"

export type UserSeed = "sample" | ""

Expand Down
15 changes: 8 additions & 7 deletions api/src/Users.controllers.ts → api/src/Accounts/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
import { matchFor, Router } from "#api/lib/routing"
import { Q, UserRepo } from "#api/services"
import { UsersRsc } from "#resources"
import type { UserView } from "#resources/views"
import { Array } from "effect"
import { Effect, Order } from "effect-app"
import { Q} from "@effect-app/infra/Model"
import { Array, Effect, Order } from "effect-app"
import type { UserView } from "./resources.js"
import { AccountsRsc } from "./resources.js"
import { UserRepo } from "./UserRepo.js"

export default Router(UsersRsc)({
export default Router(AccountsRsc)({
dependencies: [UserRepo.Default],
effect: Effect.gen(function*() {
const userRepo = yield* UserRepo

return matchFor(UsersRsc)({
return matchFor(AccountsRsc)({
GetMe: userRepo.getCurrentUser,
IndexUsers: (req) =>
userRepo
.query(Q.where("id", "in", req.filterByIds))
Expand Down
0 api/src/models/User.ts → api/src/Accounts/models.ts
View file
Open in desktop
File renamed without changes.
7 changes: 3 additions & 4 deletions api/src/resources/resolvers/UserResolver.ts → api/src/Accounts/resolvers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { UserId } from "#models/User"
import { clientFor } from "#resources/lib"
import { Effect, Exit, Request, RequestResolver } from "effect"
import { Array, Option, pipe, S } from "effect-app"
import { ApiClientFactory, NotFoundError } from "effect-app/client"
import { type Schema } from "effect-app/Schema"
import * as UsersRsc from "../Users.js"
import { UserView } from "../views/UserView.js"
import { UserId } from "./models.js"
import { AccountsRsc, UserView } from "./resources.js"

interface GetUserViewById extends Request.Request<UserView, NotFoundError<"User">> {
readonly _tag: "GetUserViewById"
Expand All@@ -15,7 +14,7 @@ const GetUserViewById = Request.tagged<GetUserViewById>("GetUserViewById")

const getUserViewByIdResolver = RequestResolver
.makeBatched((requests: GetUserViewById[]) =>
clientFor(UsersRsc).pipe(
clientFor(AccountsRsc).pipe(
Effect.flatMap((client) =>
client
.IndexUsers
Expand Down
37 changes: 37 additions & 0 deletions api/src/Accounts/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import { S } from "#resources/lib"
import { NotFoundError } from "effect-app/client"
import { User, UserId } from "./models.js"

export class UserView extends S.ExtendedClass<UserView, UserView.Encoded>()({
...User.pick("id", "role"),
displayName: S.NonEmptyString2k
}) {}

export class GetMe extends S.Req<GetMe>()("GetMe", {}, { success: User, failure: NotFoundError }) {}

export class IndexUsers extends S.Req<IndexUsers>()("IndexUsers", {
filterByIds: S.NonEmptyArray(UserId)
}, {
allowAnonymous: true,
allowRoles: ["user"],
success: S.Struct({
users: S.Array(UserView)
})
}) {}

// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Accounts" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace UserView {
export interface Encoded extends S.Struct.Encoded<typeof UserView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end
//

export * as AccountsRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/services/DBContext/BlogPostRepo.ts → api/src/Blog/BlogPostRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { UserFromIdResolver } from "#Accounts/models"
import { UserRepo } from "#Accounts/UserRepo"
import { RepoDefault } from "#api/lib/layers"
import { BlogPost } from "#models/Blog"
import { UserFromIdResolver } from "#models/User"
import { Model } from "@effect-app/infra"
import { Effect } from "effect"
import { Context } from "effect-app"
import { NonEmptyString255, NonEmptyString2k } from "effect-app/Schema"
import { UserRepo } from "./UserRepo.js"
import { BlogPost } from "./models.js"

export type BlogPostSeed = "sample" | ""

Expand Down
11 changes: 7 additions & 4 deletions api/src/Blog.controllers.ts → api/src/Blog/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
import { UserRepo } from "#api/Accounts/UserRepo"
import { Events } from "#api/Events"
import { matchFor, Router } from "#api/lib/routing"
import { BlogPostRepo, Events, Operations, UserRepo } from "#api/services"
import { BlogPost } from "#models/Blog"
import { BlogRsc } from "#resources"
import { BogusEvent } from "#resources/Events"
import { Operations } from "@effect-app/infra/Operations"
import { Duration, Effect, Schedule } from "effect"
import { Option } from "effect-app"
import { NonEmptyString2k, NonNegativeInt } from "effect-app/Schema"
import { OperationsDefault } from "./lib/layers.js"
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: [
Expand Down
2 changes: 1 addition & 1 deletion api/src/models/Blog.ts → api/src/Blog/models.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { UserFromId } from "#Accounts/models"
import { S } from "effect-app"
import { UserFromId } from "./User.js"

export const BlogPostId = S.prefixedStringId<BlogPostId>()("post", "BlogPostId")
export interface BlogPostIdBrand {
Expand Down
25 changes: 21 additions & 4 deletions api/src/resources/Blog.ts → api/src/Blog/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { BlogPost, BlogPostId } from "#models/Blog"
import { UserViewFromId } from "#api/Accounts/resolvers"
import { S } from "#resources/lib"
import { InvalidStateError, NotFoundError, OptimisticConcurrencyException } from "effect-app/client"
import { OperationId } from "effect-app/Operations"
import { S } from "./lib.js"
import { BlogPostView } from "./views.js"
import { BlogPost, BlogPostId } from "./models.js"

export class BlogPostView extends S.ExtendedClass<BlogPostView, BlogPostView.Encoded>()({
...BlogPost.omit("author"),
author: S.propertySignature(UserViewFromId).pipe(S.fromKey("authorId"))
}) {}

export class CreatePost extends S.Req<CreatePost>()("CreatePost", BlogPost.pick("title", "body"), {
allowRoles: ["user"],
Expand All@@ -26,6 +31,18 @@ export class PublishPost extends S.Req<PublishPost>()("PublishPost", {
id: BlogPostId
}, { allowRoles: ["user"], success: OperationId, failure: S.Union(NotFoundError) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Blog" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace BlogPostView {
export interface Encoded extends S.Struct.Encoded<typeof BlogPostView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end

export * as BlogRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/Events.ts → api/src/Events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
7 changes: 3 additions & 4 deletions api/src/HelloWorld.controllers.ts → api/src/HelloWorld/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { User } from "#api/Accounts/models"
import { UserRepo } from "#api/Accounts/UserRepo"
import { matchFor, Router } from "#api/lib/routing"
import { UserRepo } from "#api/services"
import { User } from "#models/User"
import { HelloWorldRsc } from "#resources"
import { GetHelloWorld } from "#resources/HelloWorld"
import { getRequestContext } from "@effect-app/infra/api/setupRequest"
import { generate } from "@effect-app/infra/test"
import { Effect, S } from "effect-app"
import { GetHelloWorld, HelloWorldRsc } from "./resources.js"

export default Router(HelloWorldRsc)({
dependencies: [UserRepo.Default],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/HelloWorld.ts → api/src/HelloWorld/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { UserView } from "#api/Accounts/resources"
import { S } from "#resources/lib"
import { RequestContext } from "@effect-app/infra/RequestContext"
import { S } from "./lib.js"
import { UserView } from "./views.js"

class Response extends S.Class<Response>()({
now: S.Date.withDefault,
Expand All@@ -14,6 +14,7 @@ export class GetHelloWorld extends S.Req<GetHelloWorld>()("GetHelloWorld", {
echo: S.String
}, { allowAnonymous: true, allowRoles: ["user"], success: Response }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "HelloWorld" } as const
// codegen:end
export * as HelloWorldRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/Operations.controllers.ts → api/src/Operations/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { OperationsDefault } from "#api/lib/layers"
import { matchFor, Router } from "#api/lib/routing"
import { Operations } from "#api/services"
import { OperationsRsc } from "#resources"
import { Operations } from "@effect-app/infra/Operations"
import { Effect } from "effect-app"
import { OperationsDefault } from "./lib/layers.js"
import { OperationsRsc } from "./resources.js"

export default Router(OperationsRsc)({
dependencies: [OperationsDefault],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/Operations.ts → api/src/Operations/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { clientFor, S } from "#api/resources/lib"
import { Duration, Effect } from "effect-app"
import { NotFoundError } from "effect-app/client"
import { Operation, OperationFailure, OperationId } from "effect-app/Operations"
import { clientFor } from "./lib.js"
import * as S from "./lib/schema.js"

export class FindOperation extends S.Req<FindOperation>()("FindOperation", {
id: OperationId
}, { allowAnonymous: true, allowRoles: ["user"], success: S.NullOr(Operation) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Operations" } as const
// codegen:end

Expand DownExpand Up@@ -96,3 +95,5 @@ export const OperationsClient = Effect.gen(function*() {
waitForOperation_
})
})

export * as OperationsRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/UserProfile.ts → api/src/UserProfile.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Role } from "#models/User"
import { parseJwt } from "@effect-app/infra/api/routing/schema/jwt"
import { Context, S } from "effect-app"
import { UserProfileId } from "effect-app/ids"
import { Role } from "./Accounts/models.js"

export class UserProfile extends Context.assignTag<UserProfile>()(
S.Class<UserProfile>()({
Expand Down
13 changes: 6 additions & 7 deletions api/src/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
// codegen:start {preset: barrel, include: ./*.controllers.ts, import: default}
import accountsControllers from "./Accounts.controllers.js"
import blogControllers from "./Blog.controllers.js"
import helloWorldControllers from "./HelloWorld.controllers.js"
import operationsControllers from "./Operations.controllers.js"
import usersControllers from "./Users.controllers.js"
// codegen:start {preset: barrel, include: ./*/controllers.ts, import: default}
import accountsControllers from "./Accounts/controllers.js"
import blogControllers from "./Blog/controllers.js"
import helloWorldControllers from "./HelloWorld/controllers.js"
import operationsControllers from "./Operations/controllers.js"

export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers, usersControllers }
export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers }
// codegen:end
4 changes: 2 additions & 2 deletions api/src/lib/middleware/events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { Events } from "#api/services"
import { ClientEvents } from "#resources"
import { Events } from "#api/Events"
import { ClientEvents } from "#api/resources/Events"
import { makeSSE } from "@effect-app/infra/api/middlewares"
import { Effect } from "effect-app"

Expand Down
6 changes: 1 addition & 5 deletions api/src/lib/routing.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,7 @@ import { Context, Effect, Exit, Layer, Option } from "effect-app"
import type { GetEffectContext, RPCContextMap } from "effect-app/client"
import type { HttpHeaders, HttpServerRequest } from "effect-app/http"
import type * as EffectRequest from "effect/Request"
import {
makeUserProfileFromAuthorizationHeader,
makeUserProfileFromUserHeader,
UserProfile
} from "../services/UserProfile.js"
import { makeUserProfileFromAuthorizationHeader, makeUserProfileFromUserHeader, UserProfile } from "../UserProfile.js"
import { basicRuntime } from "./basicRuntime.js"

export interface CTX {
Expand Down
11 changes: 0 additions & 11 deletions api/src/resources.ts
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions api/src/resources/Accounts.ts
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions api/src/resources/Users.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion api/src/resources/lib/req.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Role } from "#models/User"
import type { Role } from "#api/Accounts/models"
import { NotLoggedInError, UnauthorizedError } from "@effect-app/infra/errors"
import { Duration, Layer, Request as EffectRequest } from "effect-app"
import type { RPCContextMap } from "effect-app/client"
Expand Down
4 changes: 0 additions & 4 deletions api/src/resources/views.ts
View file
Open in desktop

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

play with vertical slice 2#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
patroza wants to merge 4 commits into
base:main
Choose a base branch
from
Draft

play with vertical slice 2 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73b78db
initial awesome
patroza Jan 18, 2025
42367f6
cleanup
patroza Jan 18, 2025
4d31a9d
fix helloworld controllers
patroza Jan 18, 2025
db3d959
cleanup resources vs views and resolvers
patroza Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/model.code-snippets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
"ResourceCodegen": {
"prefix": "genrsc",
"body": [
"// codegen:start {preset: meta, sourcePrefix: src/resources/}"
"// codegen:start {preset: meta, sourcePrefix: src/}"
]
},
"ModelComplete": {
Expand Down
15 changes: 0 additions & 15 deletions api/src/Accounts.controllers.ts
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions api/src/services/DBContext/UserRepo.ts → api/src/Accounts/UserRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
import { RepoConfig } from "#api/config"
import { RepoDefault } from "#api/lib/layers"
import type { UserId } from "#models/User"
import { User } from "#models/User"
import { Model } from "@effect-app/infra"
import { NotFoundError, NotLoggedInError } from "@effect-app/infra/errors"
import { Q } from "@effect-app/infra/Model"
import { generate } from "@effect-app/infra/test"
import { Array, Effect, Exit, Layer, Option, pipe, Request, RequestResolver, S } from "effect-app"
import { fakerArb } from "effect-app/faker"
import { Email } from "effect-app/Schema"
import fc from "fast-check"
import { Q } from "../lib.js"
import { UserProfile } from "../UserProfile.js"
import type { UserId } from "./models.js"
import { User } from "./models.js"

export type UserSeed = "sample" | ""

Expand Down
15 changes: 8 additions & 7 deletions api/src/Users.controllers.ts → api/src/Accounts/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
import { matchFor, Router } from "#api/lib/routing"
import { Q, UserRepo } from "#api/services"
import { UsersRsc } from "#resources"
import type { UserView } from "#resources/views"
import { Array } from "effect"
import { Effect, Order } from "effect-app"
import { Q} from "@effect-app/infra/Model"
import { Array, Effect, Order } from "effect-app"
import type { UserView } from "./resources.js"
import { AccountsRsc } from "./resources.js"
import { UserRepo } from "./UserRepo.js"

export default Router(UsersRsc)({
export default Router(AccountsRsc)({
dependencies: [UserRepo.Default],
effect: Effect.gen(function*() {
const userRepo = yield* UserRepo

return matchFor(UsersRsc)({
return matchFor(AccountsRsc)({
GetMe: userRepo.getCurrentUser,
IndexUsers: (req) =>
userRepo
.query(Q.where("id", "in", req.filterByIds))
Expand Down
0 api/src/models/User.ts → api/src/Accounts/models.ts
View file
Open in desktop
File renamed without changes.
7 changes: 3 additions & 4 deletions api/src/resources/resolvers/UserResolver.ts → api/src/Accounts/resolvers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { UserId } from "#models/User"
import { clientFor } from "#resources/lib"
import { Effect, Exit, Request, RequestResolver } from "effect"
import { Array, Option, pipe, S } from "effect-app"
import { ApiClientFactory, NotFoundError } from "effect-app/client"
import { type Schema } from "effect-app/Schema"
import * as UsersRsc from "../Users.js"
import { UserView } from "../views/UserView.js"
import { UserId } from "./models.js"
import { AccountsRsc, UserView } from "./resources.js"

interface GetUserViewById extends Request.Request<UserView, NotFoundError<"User">> {
readonly _tag: "GetUserViewById"
Expand All@@ -15,7 +14,7 @@ const GetUserViewById = Request.tagged<GetUserViewById>("GetUserViewById")

const getUserViewByIdResolver = RequestResolver
.makeBatched((requests: GetUserViewById[]) =>
clientFor(UsersRsc).pipe(
clientFor(AccountsRsc).pipe(
Effect.flatMap((client) =>
client
.IndexUsers
Expand Down
37 changes: 37 additions & 0 deletions api/src/Accounts/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import { S } from "#resources/lib"
import { NotFoundError } from "effect-app/client"
import { User, UserId } from "./models.js"

export class UserView extends S.ExtendedClass<UserView, UserView.Encoded>()({
...User.pick("id", "role"),
displayName: S.NonEmptyString2k
}) {}

export class GetMe extends S.Req<GetMe>()("GetMe", {}, { success: User, failure: NotFoundError }) {}

export class IndexUsers extends S.Req<IndexUsers>()("IndexUsers", {
filterByIds: S.NonEmptyArray(UserId)
}, {
allowAnonymous: true,
allowRoles: ["user"],
success: S.Struct({
users: S.Array(UserView)
})
}) {}

// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Accounts" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace UserView {
export interface Encoded extends S.Struct.Encoded<typeof UserView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end
//

export * as AccountsRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/services/DBContext/BlogPostRepo.ts → api/src/Blog/BlogPostRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { UserFromIdResolver } from "#Accounts/models"
import { UserRepo } from "#Accounts/UserRepo"
import { RepoDefault } from "#api/lib/layers"
import { BlogPost } from "#models/Blog"
import { UserFromIdResolver } from "#models/User"
import { Model } from "@effect-app/infra"
import { Effect } from "effect"
import { Context } from "effect-app"
import { NonEmptyString255, NonEmptyString2k } from "effect-app/Schema"
import { UserRepo } from "./UserRepo.js"
import { BlogPost } from "./models.js"

export type BlogPostSeed = "sample" | ""

Expand Down
11 changes: 7 additions & 4 deletions api/src/Blog.controllers.ts → api/src/Blog/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
import { UserRepo } from "#api/Accounts/UserRepo"
import { Events } from "#api/Events"
import { matchFor, Router } from "#api/lib/routing"
import { BlogPostRepo, Events, Operations, UserRepo } from "#api/services"
import { BlogPost } from "#models/Blog"
import { BlogRsc } from "#resources"
import { BogusEvent } from "#resources/Events"
import { Operations } from "@effect-app/infra/Operations"
import { Duration, Effect, Schedule } from "effect"
import { Option } from "effect-app"
import { NonEmptyString2k, NonNegativeInt } from "effect-app/Schema"
import { OperationsDefault } from "./lib/layers.js"
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: [
Expand Down
2 changes: 1 addition & 1 deletion api/src/models/Blog.ts → api/src/Blog/models.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { UserFromId } from "#Accounts/models"
import { S } from "effect-app"
import { UserFromId } from "./User.js"

export const BlogPostId = S.prefixedStringId<BlogPostId>()("post", "BlogPostId")
export interface BlogPostIdBrand {
Expand Down
25 changes: 21 additions & 4 deletions api/src/resources/Blog.ts → api/src/Blog/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { BlogPost, BlogPostId } from "#models/Blog"
import { UserViewFromId } from "#api/Accounts/resolvers"
import { S } from "#resources/lib"
import { InvalidStateError, NotFoundError, OptimisticConcurrencyException } from "effect-app/client"
import { OperationId } from "effect-app/Operations"
import { S } from "./lib.js"
import { BlogPostView } from "./views.js"
import { BlogPost, BlogPostId } from "./models.js"

export class BlogPostView extends S.ExtendedClass<BlogPostView, BlogPostView.Encoded>()({
...BlogPost.omit("author"),
author: S.propertySignature(UserViewFromId).pipe(S.fromKey("authorId"))
}) {}

export class CreatePost extends S.Req<CreatePost>()("CreatePost", BlogPost.pick("title", "body"), {
allowRoles: ["user"],
Expand All@@ -26,6 +31,18 @@ export class PublishPost extends S.Req<PublishPost>()("PublishPost", {
id: BlogPostId
}, { allowRoles: ["user"], success: OperationId, failure: S.Union(NotFoundError) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Blog" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace BlogPostView {
export interface Encoded extends S.Struct.Encoded<typeof BlogPostView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end

export * as BlogRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/Events.ts → api/src/Events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
7 changes: 3 additions & 4 deletions api/src/HelloWorld.controllers.ts → api/src/HelloWorld/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { User } from "#api/Accounts/models"
import { UserRepo } from "#api/Accounts/UserRepo"
import { matchFor, Router } from "#api/lib/routing"
import { UserRepo } from "#api/services"
import { User } from "#models/User"
import { HelloWorldRsc } from "#resources"
import { GetHelloWorld } from "#resources/HelloWorld"
import { getRequestContext } from "@effect-app/infra/api/setupRequest"
import { generate } from "@effect-app/infra/test"
import { Effect, S } from "effect-app"
import { GetHelloWorld, HelloWorldRsc } from "./resources.js"

export default Router(HelloWorldRsc)({
dependencies: [UserRepo.Default],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/HelloWorld.ts → api/src/HelloWorld/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { UserView } from "#api/Accounts/resources"
import { S } from "#resources/lib"
import { RequestContext } from "@effect-app/infra/RequestContext"
import { S } from "./lib.js"
import { UserView } from "./views.js"

class Response extends S.Class<Response>()({
now: S.Date.withDefault,
Expand All@@ -14,6 +14,7 @@ export class GetHelloWorld extends S.Req<GetHelloWorld>()("GetHelloWorld", {
echo: S.String
}, { allowAnonymous: true, allowRoles: ["user"], success: Response }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "HelloWorld" } as const
// codegen:end
export * as HelloWorldRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/Operations.controllers.ts → api/src/Operations/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { OperationsDefault } from "#api/lib/layers"
import { matchFor, Router } from "#api/lib/routing"
import { Operations } from "#api/services"
import { OperationsRsc } from "#resources"
import { Operations } from "@effect-app/infra/Operations"
import { Effect } from "effect-app"
import { OperationsDefault } from "./lib/layers.js"
import { OperationsRsc } from "./resources.js"

export default Router(OperationsRsc)({
dependencies: [OperationsDefault],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/Operations.ts → api/src/Operations/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { clientFor, S } from "#api/resources/lib"
import { Duration, Effect } from "effect-app"
import { NotFoundError } from "effect-app/client"
import { Operation, OperationFailure, OperationId } from "effect-app/Operations"
import { clientFor } from "./lib.js"
import * as S from "./lib/schema.js"

export class FindOperation extends S.Req<FindOperation>()("FindOperation", {
id: OperationId
}, { allowAnonymous: true, allowRoles: ["user"], success: S.NullOr(Operation) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Operations" } as const
// codegen:end

Expand DownExpand Up@@ -96,3 +95,5 @@ export const OperationsClient = Effect.gen(function*() {
waitForOperation_
})
})

export * as OperationsRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/UserProfile.ts → api/src/UserProfile.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Role } from "#models/User"
import { parseJwt } from "@effect-app/infra/api/routing/schema/jwt"
import { Context, S } from "effect-app"
import { UserProfileId } from "effect-app/ids"
import { Role } from "./Accounts/models.js"

export class UserProfile extends Context.assignTag<UserProfile>()(
S.Class<UserProfile>()({
Expand Down
13 changes: 6 additions & 7 deletions api/src/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
// codegen:start {preset: barrel, include: ./*.controllers.ts, import: default}
import accountsControllers from "./Accounts.controllers.js"
import blogControllers from "./Blog.controllers.js"
import helloWorldControllers from "./HelloWorld.controllers.js"
import operationsControllers from "./Operations.controllers.js"
import usersControllers from "./Users.controllers.js"
// codegen:start {preset: barrel, include: ./*/controllers.ts, import: default}
import accountsControllers from "./Accounts/controllers.js"
import blogControllers from "./Blog/controllers.js"
import helloWorldControllers from "./HelloWorld/controllers.js"
import operationsControllers from "./Operations/controllers.js"

export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers, usersControllers }
export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers }
// codegen:end
4 changes: 2 additions & 2 deletions api/src/lib/middleware/events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { Events } from "#api/services"
import { ClientEvents } from "#resources"
import { Events } from "#api/Events"
import { ClientEvents } from "#api/resources/Events"
import { makeSSE } from "@effect-app/infra/api/middlewares"
import { Effect } from "effect-app"

Expand Down
6 changes: 1 addition & 5 deletions api/src/lib/routing.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,7 @@ import { Context, Effect, Exit, Layer, Option } from "effect-app"
import type { GetEffectContext, RPCContextMap } from "effect-app/client"
import type { HttpHeaders, HttpServerRequest } from "effect-app/http"
import type * as EffectRequest from "effect/Request"
import {
makeUserProfileFromAuthorizationHeader,
makeUserProfileFromUserHeader,
UserProfile
} from "../services/UserProfile.js"
import { makeUserProfileFromAuthorizationHeader, makeUserProfileFromUserHeader, UserProfile } from "../UserProfile.js"
import { basicRuntime } from "./basicRuntime.js"

export interface CTX {
Expand Down
11 changes: 0 additions & 11 deletions api/src/resources.ts
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions api/src/resources/Accounts.ts
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions api/src/resources/Users.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion api/src/resources/lib/req.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Role } from "#models/User"
import type { Role } from "#api/Accounts/models"
import { NotLoggedInError, UnauthorizedError } from "@effect-app/infra/errors"
import { Duration, Layer, Request as EffectRequest } from "effect-app"
import type { RPCContextMap } from "effect-app/client"
Expand Down
4 changes: 0 additions & 4 deletions api/src/resources/views.ts
View file
Open in desktop

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

play with vertical slice 2#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
patroza wants to merge 4 commits into
base:main
Choose a base branch
from
Draft

play with vertical slice 2 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73b78db
initial awesome
patroza Jan 18, 2025
42367f6
cleanup
patroza Jan 18, 2025
4d31a9d
fix helloworld controllers
patroza Jan 18, 2025
db3d959
cleanup resources vs views and resolvers
patroza Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/model.code-snippets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
"ResourceCodegen": {
"prefix": "genrsc",
"body": [
"// codegen:start {preset: meta, sourcePrefix: src/resources/}"
"// codegen:start {preset: meta, sourcePrefix: src/}"
]
},
"ModelComplete": {
Expand Down
15 changes: 0 additions & 15 deletions api/src/Accounts.controllers.ts
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions api/src/services/DBContext/UserRepo.ts → api/src/Accounts/UserRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
import { RepoConfig } from "#api/config"
import { RepoDefault } from "#api/lib/layers"
import type { UserId } from "#models/User"
import { User } from "#models/User"
import { Model } from "@effect-app/infra"
import { NotFoundError, NotLoggedInError } from "@effect-app/infra/errors"
import { Q } from "@effect-app/infra/Model"
import { generate } from "@effect-app/infra/test"
import { Array, Effect, Exit, Layer, Option, pipe, Request, RequestResolver, S } from "effect-app"
import { fakerArb } from "effect-app/faker"
import { Email } from "effect-app/Schema"
import fc from "fast-check"
import { Q } from "../lib.js"
import { UserProfile } from "../UserProfile.js"
import type { UserId } from "./models.js"
import { User } from "./models.js"

export type UserSeed = "sample" | ""

Expand Down
15 changes: 8 additions & 7 deletions api/src/Users.controllers.ts → api/src/Accounts/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
import { matchFor, Router } from "#api/lib/routing"
import { Q, UserRepo } from "#api/services"
import { UsersRsc } from "#resources"
import type { UserView } from "#resources/views"
import { Array } from "effect"
import { Effect, Order } from "effect-app"
import { Q} from "@effect-app/infra/Model"
import { Array, Effect, Order } from "effect-app"
import type { UserView } from "./resources.js"
import { AccountsRsc } from "./resources.js"
import { UserRepo } from "./UserRepo.js"

export default Router(UsersRsc)({
export default Router(AccountsRsc)({
dependencies: [UserRepo.Default],
effect: Effect.gen(function*() {
const userRepo = yield* UserRepo

return matchFor(UsersRsc)({
return matchFor(AccountsRsc)({
GetMe: userRepo.getCurrentUser,
IndexUsers: (req) =>
userRepo
.query(Q.where("id", "in", req.filterByIds))
Expand Down
0 api/src/models/User.ts → api/src/Accounts/models.ts
View file
Open in desktop
File renamed without changes.
7 changes: 3 additions & 4 deletions api/src/resources/resolvers/UserResolver.ts → api/src/Accounts/resolvers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { UserId } from "#models/User"
import { clientFor } from "#resources/lib"
import { Effect, Exit, Request, RequestResolver } from "effect"
import { Array, Option, pipe, S } from "effect-app"
import { ApiClientFactory, NotFoundError } from "effect-app/client"
import { type Schema } from "effect-app/Schema"
import * as UsersRsc from "../Users.js"
import { UserView } from "../views/UserView.js"
import { UserId } from "./models.js"
import { AccountsRsc, UserView } from "./resources.js"

interface GetUserViewById extends Request.Request<UserView, NotFoundError<"User">> {
readonly _tag: "GetUserViewById"
Expand All@@ -15,7 +14,7 @@ const GetUserViewById = Request.tagged<GetUserViewById>("GetUserViewById")

const getUserViewByIdResolver = RequestResolver
.makeBatched((requests: GetUserViewById[]) =>
clientFor(UsersRsc).pipe(
clientFor(AccountsRsc).pipe(
Effect.flatMap((client) =>
client
.IndexUsers
Expand Down
37 changes: 37 additions & 0 deletions api/src/Accounts/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import { S } from "#resources/lib"
import { NotFoundError } from "effect-app/client"
import { User, UserId } from "./models.js"

export class UserView extends S.ExtendedClass<UserView, UserView.Encoded>()({
...User.pick("id", "role"),
displayName: S.NonEmptyString2k
}) {}

export class GetMe extends S.Req<GetMe>()("GetMe", {}, { success: User, failure: NotFoundError }) {}

export class IndexUsers extends S.Req<IndexUsers>()("IndexUsers", {
filterByIds: S.NonEmptyArray(UserId)
}, {
allowAnonymous: true,
allowRoles: ["user"],
success: S.Struct({
users: S.Array(UserView)
})
}) {}

// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Accounts" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace UserView {
export interface Encoded extends S.Struct.Encoded<typeof UserView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end
//

export * as AccountsRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/services/DBContext/BlogPostRepo.ts → api/src/Blog/BlogPostRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { UserFromIdResolver } from "#Accounts/models"
import { UserRepo } from "#Accounts/UserRepo"
import { RepoDefault } from "#api/lib/layers"
import { BlogPost } from "#models/Blog"
import { UserFromIdResolver } from "#models/User"
import { Model } from "@effect-app/infra"
import { Effect } from "effect"
import { Context } from "effect-app"
import { NonEmptyString255, NonEmptyString2k } from "effect-app/Schema"
import { UserRepo } from "./UserRepo.js"
import { BlogPost } from "./models.js"

export type BlogPostSeed = "sample" | ""

Expand Down
11 changes: 7 additions & 4 deletions api/src/Blog.controllers.ts → api/src/Blog/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
import { UserRepo } from "#api/Accounts/UserRepo"
import { Events } from "#api/Events"
import { matchFor, Router } from "#api/lib/routing"
import { BlogPostRepo, Events, Operations, UserRepo } from "#api/services"
import { BlogPost } from "#models/Blog"
import { BlogRsc } from "#resources"
import { BogusEvent } from "#resources/Events"
import { Operations } from "@effect-app/infra/Operations"
import { Duration, Effect, Schedule } from "effect"
import { Option } from "effect-app"
import { NonEmptyString2k, NonNegativeInt } from "effect-app/Schema"
import { OperationsDefault } from "./lib/layers.js"
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: [
Expand Down
2 changes: 1 addition & 1 deletion api/src/models/Blog.ts → api/src/Blog/models.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { UserFromId } from "#Accounts/models"
import { S } from "effect-app"
import { UserFromId } from "./User.js"

export const BlogPostId = S.prefixedStringId<BlogPostId>()("post", "BlogPostId")
export interface BlogPostIdBrand {
Expand Down
25 changes: 21 additions & 4 deletions api/src/resources/Blog.ts → api/src/Blog/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { BlogPost, BlogPostId } from "#models/Blog"
import { UserViewFromId } from "#api/Accounts/resolvers"
import { S } from "#resources/lib"
import { InvalidStateError, NotFoundError, OptimisticConcurrencyException } from "effect-app/client"
import { OperationId } from "effect-app/Operations"
import { S } from "./lib.js"
import { BlogPostView } from "./views.js"
import { BlogPost, BlogPostId } from "./models.js"

export class BlogPostView extends S.ExtendedClass<BlogPostView, BlogPostView.Encoded>()({
...BlogPost.omit("author"),
author: S.propertySignature(UserViewFromId).pipe(S.fromKey("authorId"))
}) {}

export class CreatePost extends S.Req<CreatePost>()("CreatePost", BlogPost.pick("title", "body"), {
allowRoles: ["user"],
Expand All@@ -26,6 +31,18 @@ export class PublishPost extends S.Req<PublishPost>()("PublishPost", {
id: BlogPostId
}, { allowRoles: ["user"], success: OperationId, failure: S.Union(NotFoundError) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Blog" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace BlogPostView {
export interface Encoded extends S.Struct.Encoded<typeof BlogPostView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end

export * as BlogRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/Events.ts → api/src/Events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
7 changes: 3 additions & 4 deletions api/src/HelloWorld.controllers.ts → api/src/HelloWorld/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { User } from "#api/Accounts/models"
import { UserRepo } from "#api/Accounts/UserRepo"
import { matchFor, Router } from "#api/lib/routing"
import { UserRepo } from "#api/services"
import { User } from "#models/User"
import { HelloWorldRsc } from "#resources"
import { GetHelloWorld } from "#resources/HelloWorld"
import { getRequestContext } from "@effect-app/infra/api/setupRequest"
import { generate } from "@effect-app/infra/test"
import { Effect, S } from "effect-app"
import { GetHelloWorld, HelloWorldRsc } from "./resources.js"

export default Router(HelloWorldRsc)({
dependencies: [UserRepo.Default],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/HelloWorld.ts → api/src/HelloWorld/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { UserView } from "#api/Accounts/resources"
import { S } from "#resources/lib"
import { RequestContext } from "@effect-app/infra/RequestContext"
import { S } from "./lib.js"
import { UserView } from "./views.js"

class Response extends S.Class<Response>()({
now: S.Date.withDefault,
Expand All@@ -14,6 +14,7 @@ export class GetHelloWorld extends S.Req<GetHelloWorld>()("GetHelloWorld", {
echo: S.String
}, { allowAnonymous: true, allowRoles: ["user"], success: Response }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "HelloWorld" } as const
// codegen:end
export * as HelloWorldRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/Operations.controllers.ts → api/src/Operations/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { OperationsDefault } from "#api/lib/layers"
import { matchFor, Router } from "#api/lib/routing"
import { Operations } from "#api/services"
import { OperationsRsc } from "#resources"
import { Operations } from "@effect-app/infra/Operations"
import { Effect } from "effect-app"
import { OperationsDefault } from "./lib/layers.js"
import { OperationsRsc } from "./resources.js"

export default Router(OperationsRsc)({
dependencies: [OperationsDefault],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/Operations.ts → api/src/Operations/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { clientFor, S } from "#api/resources/lib"
import { Duration, Effect } from "effect-app"
import { NotFoundError } from "effect-app/client"
import { Operation, OperationFailure, OperationId } from "effect-app/Operations"
import { clientFor } from "./lib.js"
import * as S from "./lib/schema.js"

export class FindOperation extends S.Req<FindOperation>()("FindOperation", {
id: OperationId
}, { allowAnonymous: true, allowRoles: ["user"], success: S.NullOr(Operation) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Operations" } as const
// codegen:end

Expand DownExpand Up@@ -96,3 +95,5 @@ export const OperationsClient = Effect.gen(function*() {
waitForOperation_
})
})

export * as OperationsRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/UserProfile.ts → api/src/UserProfile.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Role } from "#models/User"
import { parseJwt } from "@effect-app/infra/api/routing/schema/jwt"
import { Context, S } from "effect-app"
import { UserProfileId } from "effect-app/ids"
import { Role } from "./Accounts/models.js"

export class UserProfile extends Context.assignTag<UserProfile>()(
S.Class<UserProfile>()({
Expand Down
13 changes: 6 additions & 7 deletions api/src/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
// codegen:start {preset: barrel, include: ./*.controllers.ts, import: default}
import accountsControllers from "./Accounts.controllers.js"
import blogControllers from "./Blog.controllers.js"
import helloWorldControllers from "./HelloWorld.controllers.js"
import operationsControllers from "./Operations.controllers.js"
import usersControllers from "./Users.controllers.js"
// codegen:start {preset: barrel, include: ./*/controllers.ts, import: default}
import accountsControllers from "./Accounts/controllers.js"
import blogControllers from "./Blog/controllers.js"
import helloWorldControllers from "./HelloWorld/controllers.js"
import operationsControllers from "./Operations/controllers.js"

export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers, usersControllers }
export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers }
// codegen:end
4 changes: 2 additions & 2 deletions api/src/lib/middleware/events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { Events } from "#api/services"
import { ClientEvents } from "#resources"
import { Events } from "#api/Events"
import { ClientEvents } from "#api/resources/Events"
import { makeSSE } from "@effect-app/infra/api/middlewares"
import { Effect } from "effect-app"

Expand Down
6 changes: 1 addition & 5 deletions api/src/lib/routing.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,7 @@ import { Context, Effect, Exit, Layer, Option } from "effect-app"
import type { GetEffectContext, RPCContextMap } from "effect-app/client"
import type { HttpHeaders, HttpServerRequest } from "effect-app/http"
import type * as EffectRequest from "effect/Request"
import {
makeUserProfileFromAuthorizationHeader,
makeUserProfileFromUserHeader,
UserProfile
} from "../services/UserProfile.js"
import { makeUserProfileFromAuthorizationHeader, makeUserProfileFromUserHeader, UserProfile } from "../UserProfile.js"
import { basicRuntime } from "./basicRuntime.js"

export interface CTX {
Expand Down
11 changes: 0 additions & 11 deletions api/src/resources.ts
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions api/src/resources/Accounts.ts
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions api/src/resources/Users.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion api/src/resources/lib/req.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Role } from "#models/User"
import type { Role } from "#api/Accounts/models"
import { NotLoggedInError, UnauthorizedError } from "@effect-app/infra/errors"
import { Duration, Layer, Request as EffectRequest } from "effect-app"
import type { RPCContextMap } from "effect-app/client"
Expand Down
4 changes: 0 additions & 4 deletions api/src/resources/views.ts
View file
Open in desktop

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

play with vertical slice 2#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
patroza wants to merge 4 commits into
base:main
Choose a base branch
from
Draft

play with vertical slice 2 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73b78db
initial awesome
patroza Jan 18, 2025
42367f6
cleanup
patroza Jan 18, 2025
4d31a9d
fix helloworld controllers
patroza Jan 18, 2025
db3d959
cleanup resources vs views and resolvers
patroza Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/model.code-snippets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
"ResourceCodegen": {
"prefix": "genrsc",
"body": [
"// codegen:start {preset: meta, sourcePrefix: src/resources/}"
"// codegen:start {preset: meta, sourcePrefix: src/}"
]
},
"ModelComplete": {
Expand Down
15 changes: 0 additions & 15 deletions api/src/Accounts.controllers.ts
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions api/src/services/DBContext/UserRepo.ts → api/src/Accounts/UserRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
import { RepoConfig } from "#api/config"
import { RepoDefault } from "#api/lib/layers"
import type { UserId } from "#models/User"
import { User } from "#models/User"
import { Model } from "@effect-app/infra"
import { NotFoundError, NotLoggedInError } from "@effect-app/infra/errors"
import { Q } from "@effect-app/infra/Model"
import { generate } from "@effect-app/infra/test"
import { Array, Effect, Exit, Layer, Option, pipe, Request, RequestResolver, S } from "effect-app"
import { fakerArb } from "effect-app/faker"
import { Email } from "effect-app/Schema"
import fc from "fast-check"
import { Q } from "../lib.js"
import { UserProfile } from "../UserProfile.js"
import type { UserId } from "./models.js"
import { User } from "./models.js"

export type UserSeed = "sample" | ""

Expand Down
15 changes: 8 additions & 7 deletions api/src/Users.controllers.ts → api/src/Accounts/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
import { matchFor, Router } from "#api/lib/routing"
import { Q, UserRepo } from "#api/services"
import { UsersRsc } from "#resources"
import type { UserView } from "#resources/views"
import { Array } from "effect"
import { Effect, Order } from "effect-app"
import { Q} from "@effect-app/infra/Model"
import { Array, Effect, Order } from "effect-app"
import type { UserView } from "./resources.js"
import { AccountsRsc } from "./resources.js"
import { UserRepo } from "./UserRepo.js"

export default Router(UsersRsc)({
export default Router(AccountsRsc)({
dependencies: [UserRepo.Default],
effect: Effect.gen(function*() {
const userRepo = yield* UserRepo

return matchFor(UsersRsc)({
return matchFor(AccountsRsc)({
GetMe: userRepo.getCurrentUser,
IndexUsers: (req) =>
userRepo
.query(Q.where("id", "in", req.filterByIds))
Expand Down
0 api/src/models/User.ts → api/src/Accounts/models.ts
View file
Open in desktop
File renamed without changes.
7 changes: 3 additions & 4 deletions api/src/resources/resolvers/UserResolver.ts → api/src/Accounts/resolvers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { UserId } from "#models/User"
import { clientFor } from "#resources/lib"
import { Effect, Exit, Request, RequestResolver } from "effect"
import { Array, Option, pipe, S } from "effect-app"
import { ApiClientFactory, NotFoundError } from "effect-app/client"
import { type Schema } from "effect-app/Schema"
import * as UsersRsc from "../Users.js"
import { UserView } from "../views/UserView.js"
import { UserId } from "./models.js"
import { AccountsRsc, UserView } from "./resources.js"

interface GetUserViewById extends Request.Request<UserView, NotFoundError<"User">> {
readonly _tag: "GetUserViewById"
Expand All@@ -15,7 +14,7 @@ const GetUserViewById = Request.tagged<GetUserViewById>("GetUserViewById")

const getUserViewByIdResolver = RequestResolver
.makeBatched((requests: GetUserViewById[]) =>
clientFor(UsersRsc).pipe(
clientFor(AccountsRsc).pipe(
Effect.flatMap((client) =>
client
.IndexUsers
Expand Down
37 changes: 37 additions & 0 deletions api/src/Accounts/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import { S } from "#resources/lib"
import { NotFoundError } from "effect-app/client"
import { User, UserId } from "./models.js"

export class UserView extends S.ExtendedClass<UserView, UserView.Encoded>()({
...User.pick("id", "role"),
displayName: S.NonEmptyString2k
}) {}

export class GetMe extends S.Req<GetMe>()("GetMe", {}, { success: User, failure: NotFoundError }) {}

export class IndexUsers extends S.Req<IndexUsers>()("IndexUsers", {
filterByIds: S.NonEmptyArray(UserId)
}, {
allowAnonymous: true,
allowRoles: ["user"],
success: S.Struct({
users: S.Array(UserView)
})
}) {}

// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Accounts" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace UserView {
export interface Encoded extends S.Struct.Encoded<typeof UserView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end
//

export * as AccountsRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/services/DBContext/BlogPostRepo.ts → api/src/Blog/BlogPostRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { UserFromIdResolver } from "#Accounts/models"
import { UserRepo } from "#Accounts/UserRepo"
import { RepoDefault } from "#api/lib/layers"
import { BlogPost } from "#models/Blog"
import { UserFromIdResolver } from "#models/User"
import { Model } from "@effect-app/infra"
import { Effect } from "effect"
import { Context } from "effect-app"
import { NonEmptyString255, NonEmptyString2k } from "effect-app/Schema"
import { UserRepo } from "./UserRepo.js"
import { BlogPost } from "./models.js"

export type BlogPostSeed = "sample" | ""

Expand Down
11 changes: 7 additions & 4 deletions api/src/Blog.controllers.ts → api/src/Blog/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
import { UserRepo } from "#api/Accounts/UserRepo"
import { Events } from "#api/Events"
import { matchFor, Router } from "#api/lib/routing"
import { BlogPostRepo, Events, Operations, UserRepo } from "#api/services"
import { BlogPost } from "#models/Blog"
import { BlogRsc } from "#resources"
import { BogusEvent } from "#resources/Events"
import { Operations } from "@effect-app/infra/Operations"
import { Duration, Effect, Schedule } from "effect"
import { Option } from "effect-app"
import { NonEmptyString2k, NonNegativeInt } from "effect-app/Schema"
import { OperationsDefault } from "./lib/layers.js"
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: [
Expand Down
2 changes: 1 addition & 1 deletion api/src/models/Blog.ts → api/src/Blog/models.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { UserFromId } from "#Accounts/models"
import { S } from "effect-app"
import { UserFromId } from "./User.js"

export const BlogPostId = S.prefixedStringId<BlogPostId>()("post", "BlogPostId")
export interface BlogPostIdBrand {
Expand Down
25 changes: 21 additions & 4 deletions api/src/resources/Blog.ts → api/src/Blog/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { BlogPost, BlogPostId } from "#models/Blog"
import { UserViewFromId } from "#api/Accounts/resolvers"
import { S } from "#resources/lib"
import { InvalidStateError, NotFoundError, OptimisticConcurrencyException } from "effect-app/client"
import { OperationId } from "effect-app/Operations"
import { S } from "./lib.js"
import { BlogPostView } from "./views.js"
import { BlogPost, BlogPostId } from "./models.js"

export class BlogPostView extends S.ExtendedClass<BlogPostView, BlogPostView.Encoded>()({
...BlogPost.omit("author"),
author: S.propertySignature(UserViewFromId).pipe(S.fromKey("authorId"))
}) {}

export class CreatePost extends S.Req<CreatePost>()("CreatePost", BlogPost.pick("title", "body"), {
allowRoles: ["user"],
Expand All@@ -26,6 +31,18 @@ export class PublishPost extends S.Req<PublishPost>()("PublishPost", {
id: BlogPostId
}, { allowRoles: ["user"], success: OperationId, failure: S.Union(NotFoundError) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Blog" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace BlogPostView {
export interface Encoded extends S.Struct.Encoded<typeof BlogPostView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end

export * as BlogRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/Events.ts → api/src/Events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
7 changes: 3 additions & 4 deletions api/src/HelloWorld.controllers.ts → api/src/HelloWorld/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { User } from "#api/Accounts/models"
import { UserRepo } from "#api/Accounts/UserRepo"
import { matchFor, Router } from "#api/lib/routing"
import { UserRepo } from "#api/services"
import { User } from "#models/User"
import { HelloWorldRsc } from "#resources"
import { GetHelloWorld } from "#resources/HelloWorld"
import { getRequestContext } from "@effect-app/infra/api/setupRequest"
import { generate } from "@effect-app/infra/test"
import { Effect, S } from "effect-app"
import { GetHelloWorld, HelloWorldRsc } from "./resources.js"

export default Router(HelloWorldRsc)({
dependencies: [UserRepo.Default],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/HelloWorld.ts → api/src/HelloWorld/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { UserView } from "#api/Accounts/resources"
import { S } from "#resources/lib"
import { RequestContext } from "@effect-app/infra/RequestContext"
import { S } from "./lib.js"
import { UserView } from "./views.js"

class Response extends S.Class<Response>()({
now: S.Date.withDefault,
Expand All@@ -14,6 +14,7 @@ export class GetHelloWorld extends S.Req<GetHelloWorld>()("GetHelloWorld", {
echo: S.String
}, { allowAnonymous: true, allowRoles: ["user"], success: Response }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "HelloWorld" } as const
// codegen:end
export * as HelloWorldRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/Operations.controllers.ts → api/src/Operations/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { OperationsDefault } from "#api/lib/layers"
import { matchFor, Router } from "#api/lib/routing"
import { Operations } from "#api/services"
import { OperationsRsc } from "#resources"
import { Operations } from "@effect-app/infra/Operations"
import { Effect } from "effect-app"
import { OperationsDefault } from "./lib/layers.js"
import { OperationsRsc } from "./resources.js"

export default Router(OperationsRsc)({
dependencies: [OperationsDefault],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/Operations.ts → api/src/Operations/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { clientFor, S } from "#api/resources/lib"
import { Duration, Effect } from "effect-app"
import { NotFoundError } from "effect-app/client"
import { Operation, OperationFailure, OperationId } from "effect-app/Operations"
import { clientFor } from "./lib.js"
import * as S from "./lib/schema.js"

export class FindOperation extends S.Req<FindOperation>()("FindOperation", {
id: OperationId
}, { allowAnonymous: true, allowRoles: ["user"], success: S.NullOr(Operation) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Operations" } as const
// codegen:end

Expand DownExpand Up@@ -96,3 +95,5 @@ export const OperationsClient = Effect.gen(function*() {
waitForOperation_
})
})

export * as OperationsRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/UserProfile.ts → api/src/UserProfile.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Role } from "#models/User"
import { parseJwt } from "@effect-app/infra/api/routing/schema/jwt"
import { Context, S } from "effect-app"
import { UserProfileId } from "effect-app/ids"
import { Role } from "./Accounts/models.js"

export class UserProfile extends Context.assignTag<UserProfile>()(
S.Class<UserProfile>()({
Expand Down
13 changes: 6 additions & 7 deletions api/src/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
// codegen:start {preset: barrel, include: ./*.controllers.ts, import: default}
import accountsControllers from "./Accounts.controllers.js"
import blogControllers from "./Blog.controllers.js"
import helloWorldControllers from "./HelloWorld.controllers.js"
import operationsControllers from "./Operations.controllers.js"
import usersControllers from "./Users.controllers.js"
// codegen:start {preset: barrel, include: ./*/controllers.ts, import: default}
import accountsControllers from "./Accounts/controllers.js"
import blogControllers from "./Blog/controllers.js"
import helloWorldControllers from "./HelloWorld/controllers.js"
import operationsControllers from "./Operations/controllers.js"

export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers, usersControllers }
export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers }
// codegen:end
4 changes: 2 additions & 2 deletions api/src/lib/middleware/events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { Events } from "#api/services"
import { ClientEvents } from "#resources"
import { Events } from "#api/Events"
import { ClientEvents } from "#api/resources/Events"
import { makeSSE } from "@effect-app/infra/api/middlewares"
import { Effect } from "effect-app"

Expand Down
6 changes: 1 addition & 5 deletions api/src/lib/routing.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,7 @@ import { Context, Effect, Exit, Layer, Option } from "effect-app"
import type { GetEffectContext, RPCContextMap } from "effect-app/client"
import type { HttpHeaders, HttpServerRequest } from "effect-app/http"
import type * as EffectRequest from "effect/Request"
import {
makeUserProfileFromAuthorizationHeader,
makeUserProfileFromUserHeader,
UserProfile
} from "../services/UserProfile.js"
import { makeUserProfileFromAuthorizationHeader, makeUserProfileFromUserHeader, UserProfile } from "../UserProfile.js"
import { basicRuntime } from "./basicRuntime.js"

export interface CTX {
Expand Down
11 changes: 0 additions & 11 deletions api/src/resources.ts
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions api/src/resources/Accounts.ts
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions api/src/resources/Users.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion api/src/resources/lib/req.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Role } from "#models/User"
import type { Role } from "#api/Accounts/models"
import { NotLoggedInError, UnauthorizedError } from "@effect-app/infra/errors"
import { Duration, Layer, Request as EffectRequest } from "effect-app"
import type { RPCContextMap } from "effect-app/client"
Expand Down
4 changes: 0 additions & 4 deletions api/src/resources/views.ts
View file
Open in desktop

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

play with vertical slice 2#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
patroza wants to merge 4 commits into
base:main
Choose a base branch
from
Draft

play with vertical slice 2 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73b78db
initial awesome
patroza Jan 18, 2025
42367f6
cleanup
patroza Jan 18, 2025
4d31a9d
fix helloworld controllers
patroza Jan 18, 2025
db3d959
cleanup resources vs views and resolvers
patroza Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/model.code-snippets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@
"ResourceCodegen": {
"prefix": "genrsc",
"body": [
"// codegen:start {preset: meta, sourcePrefix: src/resources/}"
"// codegen:start {preset: meta, sourcePrefix: src/}"
]
},
"ModelComplete": {
Expand Down
15 changes: 0 additions & 15 deletions api/src/Accounts.controllers.ts
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions api/src/services/DBContext/UserRepo.ts → api/src/Accounts/UserRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
import { RepoConfig } from "#api/config"
import { RepoDefault } from "#api/lib/layers"
import type { UserId } from "#models/User"
import { User } from "#models/User"
import { Model } from "@effect-app/infra"
import { NotFoundError, NotLoggedInError } from "@effect-app/infra/errors"
import { Q } from "@effect-app/infra/Model"
import { generate } from "@effect-app/infra/test"
import { Array, Effect, Exit, Layer, Option, pipe, Request, RequestResolver, S } from "effect-app"
import { fakerArb } from "effect-app/faker"
import { Email } from "effect-app/Schema"
import fc from "fast-check"
import { Q } from "../lib.js"
import { UserProfile } from "../UserProfile.js"
import type { UserId } from "./models.js"
import { User } from "./models.js"

export type UserSeed = "sample" | ""

Expand Down
15 changes: 8 additions & 7 deletions api/src/Users.controllers.ts → api/src/Accounts/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
import { matchFor, Router } from "#api/lib/routing"
import { Q, UserRepo } from "#api/services"
import { UsersRsc } from "#resources"
import type { UserView } from "#resources/views"
import { Array } from "effect"
import { Effect, Order } from "effect-app"
import { Q} from "@effect-app/infra/Model"
import { Array, Effect, Order } from "effect-app"
import type { UserView } from "./resources.js"
import { AccountsRsc } from "./resources.js"
import { UserRepo } from "./UserRepo.js"

export default Router(UsersRsc)({
export default Router(AccountsRsc)({
dependencies: [UserRepo.Default],
effect: Effect.gen(function*() {
const userRepo = yield* UserRepo

return matchFor(UsersRsc)({
return matchFor(AccountsRsc)({
GetMe: userRepo.getCurrentUser,
IndexUsers: (req) =>
userRepo
.query(Q.where("id", "in", req.filterByIds))
Expand Down
0 api/src/models/User.ts → api/src/Accounts/models.ts
View file
Open in desktop
File renamed without changes.
7 changes: 3 additions & 4 deletions api/src/resources/resolvers/UserResolver.ts → api/src/Accounts/resolvers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { UserId } from "#models/User"
import { clientFor } from "#resources/lib"
import { Effect, Exit, Request, RequestResolver } from "effect"
import { Array, Option, pipe, S } from "effect-app"
import { ApiClientFactory, NotFoundError } from "effect-app/client"
import { type Schema } from "effect-app/Schema"
import * as UsersRsc from "../Users.js"
import { UserView } from "../views/UserView.js"
import { UserId } from "./models.js"
import { AccountsRsc, UserView } from "./resources.js"

interface GetUserViewById extends Request.Request<UserView, NotFoundError<"User">> {
readonly _tag: "GetUserViewById"
Expand All@@ -15,7 +14,7 @@ const GetUserViewById = Request.tagged<GetUserViewById>("GetUserViewById")

const getUserViewByIdResolver = RequestResolver
.makeBatched((requests: GetUserViewById[]) =>
clientFor(UsersRsc).pipe(
clientFor(AccountsRsc).pipe(
Effect.flatMap((client) =>
client
.IndexUsers
Expand Down
37 changes: 37 additions & 0 deletions api/src/Accounts/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import { S } from "#resources/lib"
import { NotFoundError } from "effect-app/client"
import { User, UserId } from "./models.js"

export class UserView extends S.ExtendedClass<UserView, UserView.Encoded>()({
...User.pick("id", "role"),
displayName: S.NonEmptyString2k
}) {}

export class GetMe extends S.Req<GetMe>()("GetMe", {}, { success: User, failure: NotFoundError }) {}

export class IndexUsers extends S.Req<IndexUsers>()("IndexUsers", {
filterByIds: S.NonEmptyArray(UserId)
}, {
allowAnonymous: true,
allowRoles: ["user"],
success: S.Struct({
users: S.Array(UserView)
})
}) {}

// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Accounts" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace UserView {
export interface Encoded extends S.Struct.Encoded<typeof UserView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end
//

export * as AccountsRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/services/DBContext/BlogPostRepo.ts → api/src/Blog/BlogPostRepo.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
import { UserFromIdResolver } from "#Accounts/models"
import { UserRepo } from "#Accounts/UserRepo"
import { RepoDefault } from "#api/lib/layers"
import { BlogPost } from "#models/Blog"
import { UserFromIdResolver } from "#models/User"
import { Model } from "@effect-app/infra"
import { Effect } from "effect"
import { Context } from "effect-app"
import { NonEmptyString255, NonEmptyString2k } from "effect-app/Schema"
import { UserRepo } from "./UserRepo.js"
import { BlogPost } from "./models.js"

export type BlogPostSeed = "sample" | ""

Expand Down
11 changes: 7 additions & 4 deletions api/src/Blog.controllers.ts → api/src/Blog/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
import { UserRepo } from "#api/Accounts/UserRepo"
import { Events } from "#api/Events"
import { matchFor, Router } from "#api/lib/routing"
import { BlogPostRepo, Events, Operations, UserRepo } from "#api/services"
import { BlogPost } from "#models/Blog"
import { BlogRsc } from "#resources"
import { BogusEvent } from "#resources/Events"
import { Operations } from "@effect-app/infra/Operations"
import { Duration, Effect, Schedule } from "effect"
import { Option } from "effect-app"
import { NonEmptyString2k, NonNegativeInt } from "effect-app/Schema"
import { OperationsDefault } from "./lib/layers.js"
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: [
Expand Down
2 changes: 1 addition & 1 deletion api/src/models/Blog.ts → api/src/Blog/models.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { UserFromId } from "#Accounts/models"
import { S } from "effect-app"
import { UserFromId } from "./User.js"

export const BlogPostId = S.prefixedStringId<BlogPostId>()("post", "BlogPostId")
export interface BlogPostIdBrand {
Expand Down
25 changes: 21 additions & 4 deletions api/src/resources/Blog.ts → api/src/Blog/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
import { BlogPost, BlogPostId } from "#models/Blog"
import { UserViewFromId } from "#api/Accounts/resolvers"
import { S } from "#resources/lib"
import { InvalidStateError, NotFoundError, OptimisticConcurrencyException } from "effect-app/client"
import { OperationId } from "effect-app/Operations"
import { S } from "./lib.js"
import { BlogPostView } from "./views.js"
import { BlogPost, BlogPostId } from "./models.js"

export class BlogPostView extends S.ExtendedClass<BlogPostView, BlogPostView.Encoded>()({
...BlogPost.omit("author"),
author: S.propertySignature(UserViewFromId).pipe(S.fromKey("authorId"))
}) {}

export class CreatePost extends S.Req<CreatePost>()("CreatePost", BlogPost.pick("title", "body"), {
allowRoles: ["user"],
Expand All@@ -26,6 +31,18 @@ export class PublishPost extends S.Req<PublishPost>()("PublishPost", {
id: BlogPostId
}, { allowRoles: ["user"], success: OperationId, failure: S.Union(NotFoundError) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Blog" } as const
// codegen:end

// codegen:start {preset: model}
//
/* eslint-disable */
export namespace BlogPostView {
export interface Encoded extends S.Struct.Encoded<typeof BlogPostView["fields"]> {}
}
/* eslint-enable */
//
// codegen:end

export * as BlogRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/Events.ts → api/src/Events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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,
Expand Down
7 changes: 3 additions & 4 deletions api/src/HelloWorld.controllers.ts → api/src/HelloWorld/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
import { User } from "#api/Accounts/models"
import { UserRepo } from "#api/Accounts/UserRepo"
import { matchFor, Router } from "#api/lib/routing"
import { UserRepo } from "#api/services"
import { User } from "#models/User"
import { HelloWorldRsc } from "#resources"
import { GetHelloWorld } from "#resources/HelloWorld"
import { getRequestContext } from "@effect-app/infra/api/setupRequest"
import { generate } from "@effect-app/infra/test"
import { Effect, S } from "effect-app"
import { GetHelloWorld, HelloWorldRsc } from "./resources.js"

export default Router(HelloWorldRsc)({
dependencies: [UserRepo.Default],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/HelloWorld.ts → api/src/HelloWorld/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { UserView } from "#api/Accounts/resources"
import { S } from "#resources/lib"
import { RequestContext } from "@effect-app/infra/RequestContext"
import { S } from "./lib.js"
import { UserView } from "./views.js"

class Response extends S.Class<Response>()({
now: S.Date.withDefault,
Expand All@@ -14,6 +14,7 @@ export class GetHelloWorld extends S.Req<GetHelloWorld>()("GetHelloWorld", {
echo: S.String
}, { allowAnonymous: true, allowRoles: ["user"], success: Response }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "HelloWorld" } as const
// codegen:end
export * as HelloWorldRsc from "./resources.js"
6 changes: 3 additions & 3 deletions api/src/Operations.controllers.ts → api/src/Operations/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import { OperationsDefault } from "#api/lib/layers"
import { matchFor, Router } from "#api/lib/routing"
import { Operations } from "#api/services"
import { OperationsRsc } from "#resources"
import { Operations } from "@effect-app/infra/Operations"
import { Effect } from "effect-app"
import { OperationsDefault } from "./lib/layers.js"
import { OperationsRsc } from "./resources.js"

export default Router(OperationsRsc)({
dependencies: [OperationsDefault],
Expand Down
7 changes: 4 additions & 3 deletions api/src/resources/Operations.ts → api/src/Operations/resources.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
import { clientFor, S } from "#api/resources/lib"
import { Duration, Effect } from "effect-app"
import { NotFoundError } from "effect-app/client"
import { Operation, OperationFailure, OperationId } from "effect-app/Operations"
import { clientFor } from "./lib.js"
import * as S from "./lib/schema.js"

export class FindOperation extends S.Req<FindOperation>()("FindOperation", {
id: OperationId
}, { allowAnonymous: true, allowRoles: ["user"], success: S.NullOr(Operation) }) {}

// codegen:start {preset: meta, sourcePrefix: src/resources/}
// codegen:start {preset: meta, sourcePrefix: src/}
export const meta = { moduleName: "Operations" } as const
// codegen:end

Expand DownExpand Up@@ -96,3 +95,5 @@ export const OperationsClient = Effect.gen(function*() {
waitForOperation_
})
})

export * as OperationsRsc from "./resources.js"
2 changes: 1 addition & 1 deletion api/src/services/UserProfile.ts → api/src/UserProfile.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { Role } from "#models/User"
import { parseJwt } from "@effect-app/infra/api/routing/schema/jwt"
import { Context, S } from "effect-app"
import { UserProfileId } from "effect-app/ids"
import { Role } from "./Accounts/models.js"

export class UserProfile extends Context.assignTag<UserProfile>()(
S.Class<UserProfile>()({
Expand Down
13 changes: 6 additions & 7 deletions api/src/controllers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
// codegen:start {preset: barrel, include: ./*.controllers.ts, import: default}
import accountsControllers from "./Accounts.controllers.js"
import blogControllers from "./Blog.controllers.js"
import helloWorldControllers from "./HelloWorld.controllers.js"
import operationsControllers from "./Operations.controllers.js"
import usersControllers from "./Users.controllers.js"
// codegen:start {preset: barrel, include: ./*/controllers.ts, import: default}
import accountsControllers from "./Accounts/controllers.js"
import blogControllers from "./Blog/controllers.js"
import helloWorldControllers from "./HelloWorld/controllers.js"
import operationsControllers from "./Operations/controllers.js"

export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers, usersControllers }
export { accountsControllers, blogControllers, helloWorldControllers, operationsControllers }
// codegen:end
4 changes: 2 additions & 2 deletions api/src/lib/middleware/events.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { Events } from "#api/services"
import { ClientEvents } from "#resources"
import { Events } from "#api/Events"
import { ClientEvents } from "#api/resources/Events"
import { makeSSE } from "@effect-app/infra/api/middlewares"
import { Effect } from "effect-app"

Expand Down
6 changes: 1 addition & 5 deletions api/src/lib/routing.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,11 +13,7 @@ import { Context, Effect, Exit, Layer, Option } from "effect-app"
import type { GetEffectContext, RPCContextMap } from "effect-app/client"
import type { HttpHeaders, HttpServerRequest } from "effect-app/http"
import type * as EffectRequest from "effect/Request"
import {
makeUserProfileFromAuthorizationHeader,
makeUserProfileFromUserHeader,
UserProfile
} from "../services/UserProfile.js"
import { makeUserProfileFromAuthorizationHeader, makeUserProfileFromUserHeader, UserProfile } from "../UserProfile.js"
import { basicRuntime } from "./basicRuntime.js"

export interface CTX {
Expand Down
11 changes: 0 additions & 11 deletions api/src/resources.ts
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions api/src/resources/Accounts.ts
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions api/src/resources/Users.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion api/src/resources/lib/req.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { Role } from "#models/User"
import type { Role } from "#api/Accounts/models"
import { NotLoggedInError, UnauthorizedError } from "@effect-app/infra/errors"
import { Duration, Layer, Request as EffectRequest } from "effect-app"
import type { RPCContextMap } from "effect-app/client"
Expand Down
4 changes: 0 additions & 4 deletions api/src/resources/views.ts
View file
Open in desktop

This file was deleted.

Loading