Skip to content

fix: check and complaint if @@index references fields fro m delegate base #322

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.

Sign up for GitHub

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 2 commits into from
Oct 21, 2025
Merged

fix: check and complaint if @@index references fields fro m delegate base #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db8b3b1
fix: check and complaint if `@@index` references fields fro m delegat…
ymc9 Oct 21, 2025
eae9179
update
ymc9 Oct 21, 2025
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
10 changes: 6 additions & 4 deletions packages/language/src/validators/attribute-application-validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,11 +290,13 @@ export default class AttributeApplicationValidator implements AstValidator<Attri
}
}

@check('@@unique')
@check('@@id')
@check('@@index')
@check('@@unique')
// @ts-expect-error
private _checkUnique(attr: AttributeApplication, accept: ValidationAcceptor) {
private _checkConstraint(attr: AttributeApplication, accept: ValidationAcceptor) {
const fields = attr.args[0]?.value;
const attrName = attr.decl.ref?.name;
if (!fields) {
accept('error', `expects an array of field references`, {
node: attr.args[0]!,
Expand All @@ -303,7 +305,7 @@ export default class AttributeApplicationValidator implements AstValidator<Attri
}
if (isArrayExpr(fields)) {
if (fields.items.length === 0) {
accept('error', `\`@@unique\` expects at least one field reference`, { node: fields });
accept('error', `\`${attrName}\` expects at least one field reference`, { node: fields });
return;
}
fields.items.forEach((item) => {
Expand All @@ -321,7 +323,7 @@ export default class AttributeApplicationValidator implements AstValidator<Attri
}

if (item.target.ref.$container !== attr.$container && isDelegateModel(item.target.ref.$container)) {
accept('error', `Cannot use fields inherited from a polymorphic base model in \`@@unique\``, {
accept('error', `Cannot use fields inherited from a polymorphic base model in \`${attrName}\``, {
node: item,
});
}
Expand Down
23 changes: 23 additions & 0 deletions tests/regression/test/issue-283.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { loadSchemaWithError } from '@zenstackhq/testtools';
import { describe, it } from 'vitest';

describe('Regression for issue #283', () => {
it('verifies issue 283', async () => {
await loadSchemaWithError(
`
model Base {
id Int @id @default(autoincrement())
x Int
type String
@@delegate(type)
}

model Sub extends Base {
y Int
@@index([x, y])
}
`,
'Cannot use fields inherited from a polymorphic base model',
);
});
});