Skip to content
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

fix(delegate): discriminator fields should be removed from unchecked create/update input types #1804

Merged
merged 2 commits into from
Oct 24, 2024
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
23 changes: 13 additions & 10 deletions packages/schema/src/plugins/enhancer/enhance/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -515,15 +515,11 @@ export function enhance(prisma: any, context?: EnhancementContext<${authTypePara
return source;
}

private removeCreateFromDelegateInput(
typeAlias: TypeAliasDeclaration,
delegateModels: DelegateInfo,
source: string
) {
private removeCreateFromDelegateInput(typeAlias: TypeAliasDeclaration, delegateInfo: DelegateInfo, source: string) {
// remove create/connectOrCreate/upsert fields from delegate's input types because
// delegate models cannot be created directly
const typeName = typeAlias.getName();
const delegateModelNames = delegateModels.map(([delegate]) => delegate.name);
const delegateModelNames = delegateInfo.map(([delegate]) => delegate.name);
const delegateCreateUpdateInputRegex = new RegExp(
`^(${delegateModelNames.join('|')})(Unchecked)?(Create|Update).*Input$`
);
Expand All @@ -538,17 +534,24 @@ export function enhance(prisma: any, context?: EnhancementContext<${authTypePara
return source;
}

private readonly ModelCreateUpdateInputRegex = /(\S+)(Unchecked)?(Create|Update).*Input/;

private removeDiscriminatorFromConcreteInput(
typeAlias: TypeAliasDeclaration,
_delegateInfo: DelegateInfo,
delegateInfo: DelegateInfo,
source: string
) {
// remove discriminator field from the create/update input because discriminator cannot be set directly
const typeName = typeAlias.getName();

const match = typeName.match(this.ModelCreateUpdateInputRegex);
const delegateModelNames = delegateInfo.map(([delegate]) => delegate.name);
const concreteModelNames = delegateInfo
.map(([_, concretes]) => concretes.flatMap((c) => c.name))
.flatMap((name) => name);
const allModelNames = [...new Set([...delegateModelNames, ...concreteModelNames])];
const concreteCreateUpdateInputRegex = new RegExp(
`^(${allModelNames.join('|')})(Unchecked)?(Create|Update).*Input$`
);

const match = typeName.match(concreteCreateUpdateInputRegex);
if (match) {
const modelName = match[1];
const dataModel = this.model.declarations.find(
Expand Down
47 changes: 47 additions & 0 deletions tests/regression/tests/issue-1763.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { loadSchema } from '@zenstackhq/testtools';

describe('issue 1763', () => {
it('regression', async () => {
await loadSchema(
`
model Post {
id Int @id @default(autoincrement())
name String

type String
@@delegate(type)

// full access by author
@@allow('all', true)
}
ymc9 marked this conversation as resolved.
Show resolved Hide resolved

model ConcretePost extends Post {
age Int
}
`,
{
compile: true,
extraSourceFiles: [
{
name: 'main.ts',
content: `
import { PrismaClient as Prisma } from '@prisma/client';
import { enhance } from '@zenstackhq/runtime';

async function test() {
const prisma = new Prisma();
const db = enhance(prisma);
await db.concretePost.create({
data: {
id: 5,
name: 'a name',
age: 20,
},
});
} `,
ymc9 marked this conversation as resolved.
Show resolved Hide resolved
},
],
}
);
});
ymc9 marked this conversation as resolved.
Show resolved Hide resolved
});
Loading