Skip to content

fix incremental label null validation #4692

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
yaacovCR merged 4 commits into from
Apr 29, 2026
Merged

fix incremental label null validation #4692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d19459e
fix(validation): allow explicit null @defer/@stream label
jbellenger Apr 26, 2026
83c9c88
test: simplify null-label cases
jbellenger Apr 26, 2026
b23ea8d
add some execution tests
yaacovCR Apr 29, 2026
e6c4488
ws
yaacovCR Apr 29, 2026
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
70 changes: 70 additions & 0 deletions src/execution/incremental/__tests__/defer-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,76 @@ describe('Execute: defer directive', () => {
},
]);
});
it('Returns label from defer directive', async () => {
const document = parse(`
query HeroNameQuery {
hero {
id
...NameFragment @defer(label: "defer-label")
}
}
fragment NameFragment on Hero {
name
}
`);
const result = await complete(document);

expectJSON(result).toDeepEqual([
{
data: {
hero: {
id: '1',
},
},
pending: [{ id: '0', path: ['hero'], label: 'defer-label' }],
hasNext: true,
},
{
incremental: [
{
data: {
name: 'Luke',
},
id: '0',
},
],
completed: [{ id: '0' }],
hasNext: false,
},
]);
});
it('Treats null defer label the same as no label', async () => {
const document = parse(`
query HeroNameQuery {
hero {
id
...NameFragment @defer(label: null)
}
}
fragment NameFragment on Hero {
name
}
`);
const result = await complete(document);

expectJSON(result).toDeepEqual([
{
data: { hero: { id: '1' } },
pending: [{ id: '0', path: ['hero'] }],
hasNext: true,
},
{
incremental: [
{
data: { name: 'Luke' },
id: '0',
},
],
completed: [{ id: '0' }],
hasNext: false,
},
]);
});
it('Can disable defer using if argument', async () => {
const document = parse(`
query HeroNameQuery {
Expand Down
27 changes: 27 additions & 0 deletions src/execution/incremental/__tests__/stream-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,33 @@ describe('Execute: stream directive', () => {
},
]);
});
it('Treats null stream label the same as no label', async () => {
const document = parse(
'{ scalarList @stream(initialCount: 1, label: null) }',
);
const result = await complete(document, {
scalarList: () => ['apple', 'banana', 'coconut'],
});
expectJSON(result).toDeepEqual([
{
data: {
scalarList: ['apple'],
},
pending: [{ id: '0', path: ['scalarList'] }],
hasNext: true,
},
{
incremental: [
{
items: ['banana', 'coconut'],
id: '0',
},
],
completed: [{ id: '0' }],
hasNext: false,
},
]);
});
it('Can disable @stream using if argument', async () => {
const document = parse(
'{ scalarList @stream(initialCount: 0, if: false) }',
Expand Down
67 changes: 67 additions & 0 deletions src/execution/legacyIncremental/__tests__/legacy-defer-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,73 @@ describe('Execute: defer directive (legacy)', () => {
},
]);
});
it('Returns label from defer directive', async () => {
const document = parse(`
query HeroNameQuery {
hero {
id
...NameFragment @defer(label: "defer-label")
}
}
fragment NameFragment on Hero {
name
}
`);
const result = await complete(document);

expectJSON(result).toDeepEqual([
{
data: {
hero: {
id: '1',
},
},
hasNext: true,
},
{
incremental: [
{
data: {
name: 'Luke',
},
path: ['hero'],
label: 'defer-label',
},
],
hasNext: false,
},
]);
});
it('Treats null defer label the same as no label', async () => {
const document = parse(`
query HeroNameQuery {
hero {
id
...NameFragment @defer(label: null)
}
}
fragment NameFragment on Hero {
name
}
`);
const result = await complete(document);

expectJSON(result).toDeepEqual([
{
data: { hero: { id: '1' } },
hasNext: true,
},
{
incremental: [
{
data: { name: 'Luke' },
path: ['hero'],
},
],
hasNext: false,
},
]);
});
it('Can disable defer using if argument', async () => {
const document = parse(`
query HeroNameQuery {
Expand Down
25 changes: 25 additions & 0 deletions src/execution/legacyIncremental/__tests__/legacy-stream-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,31 @@ describe('Execute: stream directive (legacy)', () => {
},
]);
});
it('Treats null stream label the same as no label', async () => {
const document = parse(
'{ scalarList @stream(initialCount: 1, label: null) }',
);
const result = await complete(document, {
scalarList: () => ['apple', 'banana', 'coconut'],
});
expectJSON(result).toDeepEqual([
{
data: {
scalarList: ['apple'],
},
hasNext: true,
},
{
incremental: [
{
items: ['banana', 'coconut'],
path: ['scalarList', 1],
},
],
hasNext: false,
},
]);
});
it('Can disable @stream using if argument', async () => {
const document = parse(
'{ scalarList @stream(initialCount: 0, if: false) }',
Expand Down
22 changes: 22 additions & 0 deletions src/validation/__tests__/DeferStreamDirectiveLabelRule-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,19 @@ describe('Validate: Defer/Stream directive labels', () => {
`);
});

it('Defer fragment with null label', () => {
expectValid(`
{
dog {
...dogFragmentA @defer(label: null)
}
}
fragment dogFragmentA on Dog {
name
}
`);
});

it('Defer fragment with variable label', () => {
expectErrors(`
query($label: String) {
Expand Down Expand Up @@ -125,6 +138,15 @@ describe('Validate: Defer/Stream directive labels', () => {
}
`);
});
it('Stream with null label', () => {
expectValid(`
{
pets @stream(label: null) {
name
}
}
`);
});
it('Stream with variable label', () => {
expectErrors(`
query ($label: String!) {
Expand Down
2 changes: 1 addition & 1 deletion src/validation/rules/DeferStreamDirectiveLabelRule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export function DeferStreamDirectiveLabelRule(
(arg) => arg.name.value === 'label',
);
const labelValue = labelArgument?.value;
if (!labelValue) {
if (!labelValue || labelValue.kind === Kind.NULL) {
return;
}
if (labelValue.kind !== Kind.STRING) {
Expand Down
Loading