-
-
Notifications
You must be signed in to change notification settings - Fork 89
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(runtime): intercepts
$extends to reproxy its result to make sur…
…e enhancements persist (#1847)
- Loading branch information
Showing
4 changed files
with
224 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| import { loadSchema } from '@zenstackhq/testtools'; | ||
|
|
||
| describe('issue 1859', () => { | ||
| it('extend enhanced client', async () => { | ||
| const { enhance, prisma } = await loadSchema( | ||
| ` | ||
| model Post { | ||
| id Int @id | ||
| title String | ||
| published Boolean | ||
| @@allow('create', true) | ||
| @@allow('read', published) | ||
| } | ||
| ` | ||
| ); | ||
|
|
||
| await prisma.post.create({ data: { id: 1, title: 'post1', published: true } }); | ||
| await prisma.post.create({ data: { id: 2, title: 'post2', published: false } }); | ||
|
|
||
| const db = enhance(); | ||
| await expect(db.post.findMany()).resolves.toHaveLength(1); | ||
|
|
||
| const extended = db.$extends({ | ||
| model: { | ||
| post: { | ||
| findManyListView: async (args: any) => { | ||
| return { view: true, data: await db.post.findMany(args) }; | ||
| }, | ||
| }, | ||
| }, | ||
| }); | ||
|
|
||
| await expect(extended.post.findManyListView()).resolves.toMatchObject({ | ||
| view: true, | ||
| data: [{ id: 1, title: 'post1', published: true }], | ||
| }); | ||
| await expect(extended.post.findMany()).resolves.toHaveLength(1); | ||
| }); | ||
|
|
||
| it('enhance extended client', async () => { | ||
| const { enhanceRaw, prisma, prismaModule } = await loadSchema( | ||
| ` | ||
| model Post { | ||
| id Int @id | ||
| title String | ||
| published Boolean | ||
| @@allow('create', true) | ||
| @@allow('read', published) | ||
| } | ||
| ` | ||
| ); | ||
|
|
||
| await prisma.post.create({ data: { id: 1, title: 'post1', published: true } }); | ||
| await prisma.post.create({ data: { id: 2, title: 'post2', published: false } }); | ||
|
|
||
| const ext = prismaModule.defineExtension((_prisma: any) => { | ||
| return _prisma.$extends({ | ||
| model: { | ||
| post: { | ||
| findManyListView: async (args: any) => { | ||
| return { view: true, data: await prisma.post.findMany(args) }; | ||
| }, | ||
| }, | ||
| }, | ||
| }); | ||
| }); | ||
|
|
||
| await expect(prisma.$extends(ext).post.findMany()).resolves.toHaveLength(2); | ||
| await expect(prisma.$extends(ext).post.findManyListView()).resolves.toMatchObject({ | ||
| view: true, | ||
| data: [ | ||
| { id: 1, title: 'post1', published: true }, | ||
| { id: 2, title: 'post2', published: false }, | ||
| ], | ||
| }); | ||
|
|
||
| const enhanced = enhanceRaw(prisma.$extends(ext)); | ||
| await expect(enhanced.post.findMany()).resolves.toHaveLength(1); | ||
| // findManyListView internally uses the un-enhanced client | ||
| await expect(enhanced.post.findManyListView()).resolves.toMatchObject({ | ||
| view: true, | ||
| data: [ | ||
| { id: 1, title: 'post1', published: true }, | ||
| { id: 2, title: 'post2', published: false }, | ||
| ], | ||
| }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| import { loadSchema } from '@zenstackhq/testtools'; | ||
|
|
||
| describe('issue prisma extension', () => { | ||
| it('extend enhanced client', async () => { | ||
| const { enhance, prisma } = await loadSchema( | ||
| ` | ||
| model Post { | ||
| id Int @id | ||
| title String | ||
| published Boolean | ||
| @@allow('create', true) | ||
| @@allow('read', published) | ||
| } | ||
| ` | ||
| ); | ||
|
|
||
| await prisma.post.create({ data: { id: 1, title: 'post1', published: true } }); | ||
| await prisma.post.create({ data: { id: 2, title: 'post2', published: false } }); | ||
|
|
||
| const db = enhance(); | ||
| await expect(db.post.findMany()).resolves.toHaveLength(1); | ||
|
|
||
| const extended = db.$extends({ | ||
| model: { | ||
| post: { | ||
| findManyListView: async (args: any) => { | ||
| return { view: true, data: await db.post.findMany(args) }; | ||
| }, | ||
| }, | ||
| }, | ||
| }); | ||
|
|
||
| await expect(extended.post.findManyListView()).resolves.toMatchObject({ | ||
| view: true, | ||
| data: [{ id: 1, title: 'post1', published: true }], | ||
| }); | ||
| await expect(extended.post.findMany()).resolves.toHaveLength(1); | ||
| }); | ||
|
|
||
| it('enhance extended client', async () => { | ||
| const { enhanceRaw, prisma, prismaModule } = await loadSchema( | ||
| ` | ||
| model Post { | ||
| id Int @id | ||
| title String | ||
| published Boolean | ||
| @@allow('create', true) | ||
| @@allow('read', published) | ||
| } | ||
| ` | ||
| ); | ||
|
|
||
| await prisma.post.create({ data: { id: 1, title: 'post1', published: true } }); | ||
| await prisma.post.create({ data: { id: 2, title: 'post2', published: false } }); | ||
|
|
||
| const ext = prismaModule.defineExtension((_prisma: any) => { | ||
| return _prisma.$extends({ | ||
| model: { | ||
| post: { | ||
| findManyListView: async (args: any) => { | ||
| return { view: true, data: await prisma.post.findMany(args) }; | ||
| }, | ||
| }, | ||
| }, | ||
| }); | ||
| }); | ||
|
|
||
| await expect(prisma.$extends(ext).post.findMany()).resolves.toHaveLength(2); | ||
| await expect(prisma.$extends(ext).post.findManyListView()).resolves.toMatchObject({ | ||
| view: true, | ||
| data: [ | ||
| { id: 1, title: 'post1', published: true }, | ||
| { id: 2, title: 'post2', published: false }, | ||
| ], | ||
| }); | ||
|
|
||
| const enhanced = enhanceRaw(prisma.$extends(ext)); | ||
| await expect(enhanced.post.findMany()).resolves.toHaveLength(1); | ||
| // findManyListView internally uses the un-enhanced client | ||
| await expect(enhanced.post.findManyListView()).resolves.toMatchObject({ | ||
| view: true, | ||
| data: [ | ||
| { id: 1, title: 'post1', published: true }, | ||
| { id: 2, title: 'post2', published: false }, | ||
| ], | ||
| }); | ||
| }); | ||
| }); |