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
2 changes: 1 addition & 1 deletion apps/react-router-example/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ generator client {
}

generator effect {
provider = "node ../../packages/prisma/bin/effect-prisma.mjs"
provider = "node ../../packages/prisma/dist/src/cli.js"
output = "./generated/effect"
}

Expand Down
6 changes: 6 additions & 0 deletions apps/react-router-example/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@
},
"prisma:generate": {
"executor": "nx:run-commands",
"dependsOn": [
{
"target": "build",
"projects": ["@effectify/prisma"]
}
],
"options": {
"command": "pnpm exec prisma generate",
"cwd": "apps/react-router-example"
Expand Down
4 changes: 2 additions & 2 deletions packages/prisma/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ A powerful Prisma generator that creates **Effect** services and layers from you
## 📦 Installation

```bash
pnpm add -D @effectify/prisma
pnpm add effect @prisma/client
pnpm add @effectify/prisma @effect/platform-node @prisma/client effect
pnpm add -D prisma
```

## 🛠️ Configuration
Expand Down
22 changes: 0 additions & 22 deletions packages/prisma/bin/effect-prisma.mjs

This file was deleted.

19 changes: 14 additions & 5 deletions packages/prisma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,25 @@
"url": "https://github.com/devx-op/effectify",
"directory": "packages/prisma"
},
"main": "./src/cli.js",
"main": "./dist/src/runtime/index.js",
"module": "./dist/src/runtime/index.js",
"types": "./dist/src/runtime/index.d.ts",
"type": "module",
"license": "MIT",
"bin": {
"effect-prisma": "./bin/effect-prisma.mjs"
"effect-prisma": "./dist/src/cli.js"
},
"exports": {
".": "./dist/src/runtime/index.js",
"./prisma": "./dist/prisma/index.js",
"./cli": "./src/cli.js"
".": {
"types": "./dist/src/runtime/index.d.ts",
"import": "./dist/src/runtime/index.js",
"default": "./dist/src/runtime/index.js"
},
"./cli": {
"types": "./dist/src/cli.d.ts",
"import": "./dist/src/cli.js",
"default": "./dist/src/cli.js"
}
},
"files": [
"dist"
Expand Down
36 changes: 9 additions & 27 deletions packages/prisma/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,16 @@
"targets": {
"build": {
"executor": "@nx/js:tsc",
"outputs": [
"{options.outputPath}"
],
"outputs": ["{options.outputPath}"],
"defaultConfiguration": "production",
"options": {
"outputPath": "packages/prisma/dist",
"main": "packages/prisma/src/cli.ts",
"main": "packages/prisma/src/runtime/index.ts",
"tsConfig": "packages/prisma/tsconfig.lib.json",
"format": [
"esm"
],
"format": ["esm"],
"generatePackageJson": false,
"updateBuildableProjectDepsInPackageJson": false,
"additionalEntryPoints": [],
"additionalEntryPoints": ["packages/prisma/src/cli.ts"],
Comment thread
coderabbitai[bot] marked this conversation as resolved.
"assets": [
{
"glob": "**/*.eta",
Expand Down Expand Up @@ -61,32 +57,18 @@
"command": "vitest run",
"cwd": "packages/prisma"
},
"dependsOn": [
"prisma:generate"
]
"dependsOn": ["build", "prisma:generate"]
},
"lint": {
"executor": "nx-oxlint:lint",
"outputs": [
"{options.outputFile}"
],
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
"packages/prisma/**/*.{ts,tsx,js,jsx}"
]
"lintFilePatterns": ["packages/prisma/**/*.{ts,tsx,js,jsx}"]
}
},
"typecheck": {
"dependsOn": [
"build",
"prisma:generate",
"^typecheck"
]
"dependsOn": ["build", "prisma:generate", "^typecheck"]
}
},
"tags": [
"node",
"react",
"prisma"
]
"tags": ["node", "react", "prisma"]
}
18 changes: 14 additions & 4 deletions packages/prisma/test/effect-beta57-prisma-generator.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,21 @@ describe("beta57 prisma generator migration", () => {
expect(indexSource).toContain('import { AppPrismaError, mapPrismaError } from "../errors/prisma-error.js"')
})

it("regenerates the react-router example runtime without the dist CLI build", async () => {
it("regenerates the react-router example runtime through the compiled dist CLI", async () => {
const appDir = path.resolve(import.meta.dirname, "../../../apps/react-router-example")
const generatedIndexPath = path.join(appDir, "prisma", "generated", "effect", "index.ts")

await runPnpm(appDir, ["exec", "prisma", "generate", "--schema", "prisma/schema.prisma"])
const appSchemaPath = path.join(appDir, "prisma", "schema.prisma")
const schemaSource = await readFile(appSchemaPath, "utf8")
const integrationDir = await makeTempDir()
const schemaPath = path.join(integrationDir, "schema.prisma")
const generatedIndexPath = path.join(integrationDir, "generated", "effect", "index.ts")

expect(schemaSource).toContain('provider = "node ../../packages/prisma/dist/src/cli.js"')
expect(schemaSource).not.toContain("packages/prisma/bin")
expect(schemaSource).not.toContain("src/cli.ts")
expect(schemaSource).not.toContain("tsx")

await writeFile(schemaPath, schemaSource)
await runPnpm(appDir, ["exec", "prisma", "generate", "--schema", schemaPath, "--generator", "effect"])

const indexSource = await readFile(generatedIndexPath, "utf8")

Expand Down
Loading
Loading