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
1 change: 1 addition & 0 deletions scripts/runTests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const program = Effect.gen(function* () {
yield* run("./tests", "prisma", "db", "push");
}
yield* run("./tests", "prisma", "generate", "--sql");
yield* run("./tests/no-typedsql", "prisma", "generate");
yield* run("./tests", "tsc", "--noEmit");
yield* run("./tests", "vitest", "run");
}).pipe(
Expand Down
35 changes: 21 additions & 14 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,27 @@ generatorHandler({
throw new Error("effect-prisma-generator: outputPath must be a ts file");
}

const hasTypedSql = [options.generator, ...options.otherGenerators]
.some(g => g.previewFeatures.includes("typedSql"));

const outputDir = path.dirname(outputPath);
await fs.mkdir(outputDir, { recursive: true });

await generateUnifiedService([...models], outputPath, clientImportPath);
await generateUnifiedService([...models], outputPath, clientImportPath, hasTypedSql);
},
});

function generateRawSqlOperations() {
function generateRawSqlOperations(hasTypedSql: boolean) {
const typedSqlOperation = hasTypedSql ? `

$queryRawTyped: <T>(typedQuery: runtime.TypedSql<unknown[], T>) =>
Effect.flatMap(clientOrTx(client), client =>
Effect.tryPromise({
try: () => client.$queryRawTyped(typedQuery),
catch: (error) => mapError(error, "$queryRawTyped", "Prisma")
}),
),` : '';

return `
$executeRaw: (args: Prisma.Sql | [Prisma.Sql, ...any[]]) =>
Effect.flatMap(clientOrTx(client), client =>
Expand Down Expand Up @@ -76,15 +89,7 @@ function generateRawSqlOperations() {
try: () => client.$queryRawUnsafe(query, ...values),
catch: (error) => mapError(error, "$queryRawUnsafe", "Prisma")
}),
),

$queryRawTyped: <T>(typedQuery: runtime.TypedSql<unknown[], T>) =>
Effect.flatMap(clientOrTx(client), client =>
Effect.tryPromise({
try: () => client.$queryRawTyped(typedQuery),
catch: (error) => mapError(error, "$queryRawTyped", "Prisma")
}),
),`;
),${typedSqlOperation}`;
}

function generateModelOperations(models: DMMF.Model[]) {
Expand Down Expand Up @@ -310,15 +315,17 @@ async function generateUnifiedService(
models: DMMF.Model[],
outputPath: string,
clientImportPath: string,
hasTypedSql: boolean,
) {
const rawSqlOperations = generateRawSqlOperations();
const rawSqlOperations = generateRawSqlOperations(hasTypedSql);
const modelOperations = generateModelOperations(models);

const runtimeImport = hasTypedSql ? `\nimport * as runtime from "@prisma/client/runtime/client"` : '';

const serviceContent = `${header}
import { Cause, Context, Data, Effect, Exit, Option, Runtime } from "effect"
import { Service } from "effect/Effect"
import { Prisma, PrismaClient } from "${clientImportPath}"
import * as runtime from "@prisma/client/runtime/client"
import { Prisma, PrismaClient } from "${clientImportPath}"${runtimeImport}

export class PrismaClientService extends Context.Tag("PrismaClientService")<
PrismaClientService,
Expand Down
13 changes: 13 additions & 0 deletions tests/integration.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { describe, expect, it } from "@effect/vitest";
import { PrismaBetterSqlite3 } from "@prisma/adapter-better-sqlite3";
import { Data, Effect, Layer } from "effect";
import * as fs from "fs";
import { PrismaClient } from "./prisma/generated/client";
import {
PrismaClientService,
Expand Down Expand Up @@ -290,4 +291,16 @@ describe("Prisma Effect Generator", () => {
yield* prisma.user.delete({ where: { email } });
}).pipe(Effect.provide(MainLayer)),
);

it("should include $queryRawTyped when typedSql preview feature is enabled", () => {
const generated = fs.readFileSync("prisma/generated/effect.ts", "utf-8");
expect(generated).toContain("$queryRawTyped");
expect(generated).toContain('import * as runtime from "@prisma/client/runtime/client"');
});

it("should not include $queryRawTyped when typedSql preview feature is not enabled", () => {
const generated = fs.readFileSync("no-typedsql/generated/effect.ts", "utf-8");
expect(generated).not.toContain("$queryRawTyped");
expect(generated).not.toContain('import * as runtime from "@prisma/client/runtime/client"');
});
});
7 changes: 7 additions & 0 deletions tests/no-typedsql/prisma.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { defineConfig } from "prisma/config";

export default defineConfig({
datasource: {
url: "file:dev.db",
},
});
19 changes: 19 additions & 0 deletions tests/no-typedsql/schema.prisma
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
datasource db {
provider = "sqlite"
}

generator client {
provider = "prisma-client"
output = "./generated"
}

generator effect {
provider = "node ../../dist/index.js"
output = "./generated/effect.ts"
clientImportPath = "./client"
}

model User {
id Int @id @default(autoincrement())
email String @unique
}