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.

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

Jump to bottom

fix(validation): catch OverlappingFieldsCanBeMergedRule violations with nested fragments (#4168) #4199

Merged
merged 2 commits into from
Sep 23, 2024
Merged

fix(validation): catch OverlappingFieldsCanBeMergedRule violations with nested fragments (#4168) #4199

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
23e2ba9
fix(validation): catch OverlappingFieldsCanBeMergedRule violations wi…
sachindshinde Sep 23, 2024
022396e
adjust a test to for code coverage
yaacovCR Sep 23, 2024
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
68 changes: 61 additions & 7 deletions src/validation/__tests__/OverlappingFieldsCanBeMergedRule-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,10 +638,10 @@ describe('Validate: Overlapping fields can be merged', () => {
expectErrors(`
{
field {
...F
...I
}
field {
...I
...F
}
}
fragment F on T {
Expand All @@ -661,14 +661,41 @@ describe('Validate: Overlapping fields can be merged', () => {
`).toDeepEqual([
{
message:
'Fields "field" conflict because subfields "x" conflict because "a" and "b" are different fields and subfields "y" conflict because "c" and "d" are different fields. Use different aliases on the fields to fetch both if this was intentional.',
'Fields "field" conflict because subfields "y" conflict because "d" and "c" are different fields and subfields "x" conflict because "b" and "a" are different fields. Use different aliases on the fields to fetch both if this was intentional.',
locations: [
{ line: 3, column: 9 },
{ line: 11, column: 9 },
{ line: 15, column: 9 },
{ line: 6, column: 9 },
{ line: 22, column: 9 },
{ line: 18, column: 9 },
{ line: 22, column: 9 },
{ line: 6, column: 9 },
{ line: 15, column: 9 },
{ line: 11, column: 9 },
],
},
]);
});

it('reports deep conflict after nested fragments', () => {
expectErrors(`
fragment F on T {
...G
}
fragment G on T {
...H
}
fragment H on T {
x: a
}
{
x: b
...F
}
`).toDeepEqual([
{
message:
'Fields "x" conflict because "b" and "a" are different fields. Use different aliases on the fields to fetch both if this was intentional.',
locations: [
{ line: 12, column: 9 },
{ line: 9, column: 9 },
],
},
]);
Expand Down Expand Up @@ -1265,6 +1292,33 @@ describe('Validate: Overlapping fields can be merged', () => {
]);
});

it('does not infinite loop on recursive fragments separated by fields', () => {
expectValid(`
{
...fragA
...fragB
}

fragment fragA on T {
x {
...fragA
x {
...fragA
}
}
}

fragment fragB on T {
x {
...fragB
x {
...fragB
}
}
}
`);
});

describe('fragment arguments must produce fields that can be merged', () => {
it('allows conflicting spreads at different depths', () => {
expectValid(`
Expand Down
Loading
Loading