Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions apps/react-remix-example/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,18 @@
"typecheck": {
"executor": "nx:run-script",
"cache": true,
"dependsOn": ["prisma:generate"],
"options": {
"script": "typecheck"
}
},
"prisma:generate": {
"executor": "nx:run-commands",
"dependsOn": ["^build"],
"options": {
"command": "pnpm dlx prisma generate",
"cwd": "apps/react-remix-example"
}
}
},
"tags": []
Expand Down
21 changes: 17 additions & 4 deletions apps/react-router-example/app/routes/todo-app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { withActionEffect, withLoaderEffect } from "../lib/runtime.server.js"
import { randomUUID } from "node:crypto"
import { Form, useActionData, useSubmit } from "react-router"
import { useState } from "react"
import { withBetterAuthGuard, withBetterAuthGuardAction } from "@effectify/react-router-better-auth"
import { AuthService, withBetterAuthGuard, withBetterAuthGuardAction } from "@effectify/react-router-better-auth"
import * as PrismaRepository from "./../../prisma/generated/effect/prisma-repository.js"
import { TodoId, TodoModel } from "./../../prisma/generated/effect/index.js"

Expand All @@ -16,7 +16,10 @@ export const loader = Effect.gen(function*() {
})
const todos = yield* TodoRepo.findMany()
return yield* httpSuccess({ todos: todos })
}).pipe(withBetterAuthGuard.with({ redirectOnFail: "/login" }), withLoaderEffect)
}).pipe(
withBetterAuthGuard.with({ redirectOnFail: "/login" }),
withLoaderEffect,
)

export const action = Effect.gen(function*() {
const { request } = yield* ActionArgsContext
Expand All @@ -26,6 +29,10 @@ export const action = Effect.gen(function*() {
const title = String(formData.get("title") ?? "")
const content = String(formData.get("content") ?? "")

// Get authenticated user from auth context
const auth = yield* AuthService.AuthContext
const userId = auth.user?.id

const TodoRepo = yield* PrismaRepository.make(TodoModel, {
modelName: "todo",
spanPrefix: "Todo",
Expand Down Expand Up @@ -65,18 +72,24 @@ export const action = Effect.gen(function*() {
return yield* httpFailure("Title is required")
}

if (!userId) {
return yield* httpFailure("Not authenticated")
}

yield* TodoRepo.create({
data: {
id: TodoId.makeUnsafe(randomUUID()),
title,
content,
status: "PENDING",
authorId: 1,
published: false,
},
})
return yield* httpRedirect("/todo-app")
}).pipe(withBetterAuthGuardAction.with({ redirectOnFail: "/login" }), withActionEffect)
}).pipe(
withBetterAuthGuardAction.with({ redirectOnFail: "/login" }),
withActionEffect,
)

export default function TodoApp({ loaderData }: Route.ComponentProps) {
const actionData = useActionData<typeof action>()
Expand Down

This file was deleted.

3 changes: 1 addition & 2 deletions apps/react-router-example/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,4 @@ model Todo {
content String?
published Boolean @default(false)
status TodoStatus @default(PENDING)
authorId Int
}
}
10 changes: 9 additions & 1 deletion apps/react-router-example/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"command": "tsc",
"cwd": "apps/react-router-example"
},
"dependsOn": ["typegen"]
"dependsOn": ["typegen", "prisma:generate"]
},
"typegen": {
"executor": "nx:run-commands",
Expand All @@ -21,6 +21,14 @@
"cwd": "apps/react-router-example"
}
},
"prisma:generate": {
"executor": "nx:run-commands",
"dependsOn": ["^build"],
"options": {
"command": "pnpm dlx prisma generate",
"cwd": "apps/react-router-example"
}
},
"build": {
"executor": "@nx/vite:build",
"outputs": ["{options.outputPath}"],
Expand Down
Binary file modified dev.db
Binary file not shown.
Binary file modified packages/prisma/prisma/dev.db
Binary file not shown.
6 changes: 4 additions & 2 deletions packages/prisma/src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { prismaCommand } from "./commands/prisma.js"
import { GeneratorService } from "./services/generator-service.js"
import { RenderService } from "./services/render-service.js"
import { FormatterService } from "./services/formatter-service.js"
import { GenerateSchemnaService } from "./schema-generator/index.js"

const cli = Command.run(
prismaCommand.pipe(Command.withSubcommands([initCommand])),
Expand All @@ -22,13 +23,14 @@ const GeneratorLayer = GeneratorService.layer.pipe(
Layer.provide(RenderService.layer),
Layer.provide(FormatterService.layer),
Layer.provide(NodeServices.layer),
Layer.provide(GenerateSchemnaService.layer),
)

const MainLayer = Layer.mergeAll(
GeneratorLayer,
RenderService.layer,
FormatterService.layer,
NodeServices.layer,
)
GenerateSchemnaService.layer,
).pipe(Layer.provideMerge(NodeServices.layer))

cli.pipe(Effect.provide(MainLayer), NodeRuntime.runMain)
13 changes: 9 additions & 4 deletions packages/prisma/src/commands/init.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import * as Command from "effect/unstable/cli/Command"
import * as Flag from "effect/unstable/cli/Flag"
import * as NodeFileSystem from "@effect/platform-node/NodeFileSystem"
import * as NodePath from "@effect/platform-node/NodePath"
import * as FileSystem from "effect/FileSystem"
import * as Console from "effect/Console"
import * as Effect from "effect/Effect"
import * as Match from "effect/Match"
import { Data } from "effect"

// Tagged error for Prisma initialization
class PrismaNotInitialized extends Data.TaggedError("PrismaNotInitialized")<{
readonly message: string
}> {}

// Flag for the init command
const outputOption = Flag.string("output").pipe(
Expand Down Expand Up @@ -80,7 +85,7 @@ const checkPrismaSetup = () =>
yield* Console.log(
" https://www.prisma.io/docs/getting-started/setup-prisma/start-from-scratch/relational-databases-typescript-prismaPostgres",
)
yield* Effect.fail(new Error("Prisma not initialized"))
return yield* new PrismaNotInitialized({ message: "Prisma not initialized" })
}
})

Expand Down Expand Up @@ -126,7 +131,7 @@ generator effect {
yield* Console.log(" 1. Set your DATABASE_URL environment variable")
yield* Console.log(" 2. Run: npx prisma generate")

yield* Effect.sync(() => process.exit(0))
return yield* Effect.sync(() => process.exit(0))
})

export const initCommand = Command.make(
Expand All @@ -137,5 +142,5 @@ export const initCommand = Command.make(
({ output }) =>
initializePrismaSchema({
output,
}).pipe(Effect.provide(NodeFileSystem.layer), Effect.provide(NodePath.layer)),
}).pipe(Effect.provide(NodePath.layer)),
)
Loading
Loading