Skip to content

fix: regression with client extension typing #2182

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.

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

Merged
merged 1 commit into from
Jul 14, 2025
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
8 changes: 7 additions & 1 deletion packages/schema/src/plugins/enhancer/enhance/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,14 @@ export function enhance<DbClient extends object>(prisma: DbClient, context?: Enh

private createLogicalPrismaImports(prismaImport: string, prismaClientImport: string, target: string) {
const prismaTargetImport = target === 'edge' ? `${prismaImport}/edge` : prismaImport;
const runtimeLibraryImport = this.isNewPrismaClientGenerator
? // new generator has these typed only in "@prisma/client"
'@prisma/client/runtime/library'
: // old generator has these types generated with the client
`${prismaImport}/runtime/library`;

return `import { Prisma as _Prisma, PrismaClient as _PrismaClient } from '${prismaTargetImport}';
import type { InternalArgs, DynamicClientExtensionThis } from '@prisma/client/runtime/library';
import type { InternalArgs, DynamicClientExtensionThis } from '${runtimeLibraryImport}';
import type * as _P from '${prismaClientImport}';
import type { Prisma, PrismaClient } from '${prismaClientImport}';
export type { PrismaClient };
Expand Down
121 changes: 121 additions & 0 deletions tests/regression/tests/issue-2175.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
import { loadSchema } from '@zenstackhq/testtools';

describe('issue 2175', () => {
it('regression standard generator', async () => {
await loadSchema(
`
model User {
id Int @id @default(autoincrement())
email String @unique
posts Post[]
}

model Post {
id Int @id @default(autoincrement())
title String
author User? @relation(fields: [authorId], references: [id])
authorId Int? @default(auth().id)
}

`,
{
compile: true,
extraSourceFiles: [
{
name: 'main.ts',
content: `
import { PrismaClient } from "@prisma/client";
import { enhance } from ".zenstack/enhance";

const prisma = new PrismaClient();
const prismaExtended = prisma.$extends({
model: {
user: {
async signUp(email: string) {
return prisma.user.create({ data: { email } });
},
},
},
});

const dbExtended = enhance(prismaExtended);

async function main() {
const newUser = await dbExtended.user.signUp("a@b.com");
console.log(newUser);
}

main();
`,
},
],
}
);
});

it('regression new generator', async () => {
await loadSchema(
`
datasource db {
provider = "sqlite"
url = "file:./test.db"
}

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

model User {
id Int @id @default(autoincrement())
email String @unique
posts Post[]
}

model Post {
id Int @id @default(autoincrement())
title String
author User? @relation(fields: [authorId], references: [id])
authorId Int? @default(auth().id)
}

`,
{
addPrelude: false,
compile: true,
extraSourceFiles: [
{
name: 'main.ts',
content: `
import { PrismaClient } from "./generated/prisma/client";
import { enhance } from "./generated/zenstack/enhance";

const prisma = new PrismaClient();
const prismaExtended = prisma.$extends({
model: {
user: {
async signUp(email: string) {
return prisma.user.create({ data: { email } });
},
},
},
});

const dbExtended = enhance(prismaExtended);

async function main() {
const newUser = await dbExtended.user.signUp("a@b.com");
console.log(newUser);
}

main();
`,
},
],
output: './generated/zenstack',
prismaLoadPath: './generated/prisma/client',
}
);
});
});
Loading