Skip to content

Commit 594c969

Browse files
yaacovCRyaacovCR
committed
remove labels
1 parent 505d096 commit 594c969

12 files changed

+27
-341
lines changed

‎src/execution/__tests__/defer-test.ts

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ describe('Execute: defer directive', () => {
206206
it('Can defer fragments on the top level Query field', async () => {
207207
const document = parse(`
208208
query HeroNameQuery {
209-
...QueryFragment @defer(label: "DeferQuery")
209+
...QueryFragment @defer
210210
}
211211
fragment QueryFragment on Query {
212212
hero {
@@ -230,7 +230,6 @@ describe('Execute: defer directive', () => {
230230
},
231231
},
232232
path: [],
233-
label: 'DeferQuery',
234233
},
235234
],
236235
hasNext: false,
@@ -240,7 +239,7 @@ describe('Execute: defer directive', () => {
240239
it('Can defer fragments with errors on the top level Query field', async () => {
241240
const document = parse(`
242241
query HeroNameQuery {
243-
...QueryFragment @defer(label: "DeferQuery")
242+
...QueryFragment @defer
244243
}
245244
fragment QueryFragment on Query {
246245
hero {
@@ -271,7 +270,6 @@ describe('Execute: defer directive', () => {
271270
},
272271
],
273272
path: [],
274-
label: 'DeferQuery',
275273
},
276274
],
277275
hasNext: false,
@@ -283,12 +281,12 @@ describe('Execute: defer directive', () => {
283281
query HeroNameQuery {
284282
hero {
285283
id
286-
...TopFragment @defer(label: "DeferTop")
284+
...TopFragment @defer
287285
}
288286
}
289287
fragment TopFragment on Hero {
290288
name
291-
...NestedFragment @defer(label: "DeferNested")
289+
...NestedFragment @defer
292290
}
293291
fragment NestedFragment on Hero {
294292
friends {
@@ -314,14 +312,12 @@ describe('Execute: defer directive', () => {
314312
friends: [{ name: 'Han' }, { name: 'Leia' }, { name: 'C-3PO' }],
315313
},
316314
path: ['hero'],
317-
label: 'DeferNested',
318315
},
319316
{
320317
data: {
321318
name: 'Luke',
322319
},
323320
path: ['hero'],
324-
label: 'DeferTop',
325321
},
326322
],
327323
hasNext: false,
@@ -333,7 +329,7 @@ describe('Execute: defer directive', () => {
333329
query HeroNameQuery {
334330
hero {
335331
id
336-
...TopFragment @defer(label: "DeferTop")
332+
...TopFragment @defer
337333
...TopFragment
338334
}
339335
}
@@ -359,7 +355,6 @@ describe('Execute: defer directive', () => {
359355
name: 'Luke',
360356
},
361357
path: ['hero'],
362-
label: 'DeferTop',
363358
},
364359
],
365360
hasNext: false,
@@ -372,7 +367,7 @@ describe('Execute: defer directive', () => {
372367
hero {
373368
id
374369
...TopFragment
375-
...TopFragment @defer(label: "DeferTop")
370+
...TopFragment @defer
376371
}
377372
}
378373
fragment TopFragment on Hero {
@@ -397,7 +392,6 @@ describe('Execute: defer directive', () => {
397392
name: 'Luke',
398393
},
399394
path: ['hero'],
400-
label: 'DeferTop',
401395
},
402396
],
403397
hasNext: false,
@@ -410,7 +404,7 @@ describe('Execute: defer directive', () => {
410404
query HeroNameQuery {
411405
hero {
412406
id
413-
... on Hero @defer(label: "InlineDeferred") {
407+
... on Hero @defer {
414408
name
415409
}
416410
}
@@ -424,9 +418,7 @@ describe('Execute: defer directive', () => {
424418
hasNext: true,
425419
},
426420
{
427-
incremental: [
428-
{ data: { name: 'Luke' }, path: ['hero'], label: 'InlineDeferred' },
429-
],
421+
incremental: [{ data: { name: 'Luke' }, path: ['hero'] }],
430422
hasNext: false,
431423
},
432424
]);

‎src/execution/__tests__/mutations-test.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ describe('Execute: Handles mutation execution ordering', () => {
206206
const document = parse(`
207207
mutation M {
208208
first: promiseToChangeTheNumber(newNumber: 1) {
209-
...DeferFragment @defer(label: "defer-label")
209+
...DeferFragment @defer
210210
},
211211
second: immediatelyChangeTheNumber(newNumber: 2) {
212212
theNumber
@@ -242,7 +242,6 @@ describe('Execute: Handles mutation execution ordering', () => {
242242
{
243243
incremental: [
244244
{
245-
label: 'defer-label',
246245
path: ['first'],
247246
data: {
248247
promiseToGetTheNumber: 2,
@@ -281,7 +280,7 @@ describe('Execute: Handles mutation execution ordering', () => {
281280
it('Mutation with @defer is not executed serially', async () => {
282281
const document = parse(`
283282
mutation M {
284-
...MutationFragment @defer(label: "defer-label")
283+
...MutationFragment @defer
285284
second: immediatelyChangeTheNumber(newNumber: 2) {
286285
theNumber
287286
}
@@ -317,7 +316,6 @@ describe('Execute: Handles mutation execution ordering', () => {
317316
{
318317
incremental: [
319318
{
320-
label: 'defer-label',
321319
path: [],
322320
data: {
323321
first: {

‎src/execution/__tests__/stream-test.ts

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,7 @@ describe('Execute: stream directive', () => {
210210
});
211211
});
212212
it('Returns label from stream directive', async () => {
213-
const document = parse(
214-
'{ scalarList @stream(initialCount: 1, label: "scalar-stream") }',
215-
);
213+
const document = parse('{ scalarList @stream(initialCount: 1) }');
216214
const result = await complete(document, {
217215
scalarList: () => ['apple', 'banana', 'coconut'],
218216
});
@@ -228,7 +226,6 @@ describe('Execute: stream directive', () => {
228226
{
229227
items: ['banana'],
230228
path: ['scalarList', 1],
231-
label: 'scalar-stream',
232229
},
233230
],
234231
hasNext: true,
@@ -238,7 +235,6 @@ describe('Execute: stream directive', () => {
238235
{
239236
items: ['coconut'],
240237
path: ['scalarList', 2],
241-
label: 'scalar-stream',
242238
},
243239
],
244240
hasNext: false,
@@ -1661,8 +1657,8 @@ describe('Execute: stream directive', () => {
16611657

16621658
const document = parse(`
16631659
query {
1664-
friendList @stream(initialCount: 1, label:"stream-label") {
1665-
...NameFragment @defer(label: "DeferName") @defer(label: "DeferName")
1660+
friendList @stream(initialCount: 1) {
1661+
...NameFragment @defer
16661662
id
16671663
}
16681664
}
@@ -1705,12 +1701,10 @@ describe('Execute: stream directive', () => {
17051701
{
17061702
data: { name: 'Luke' },
17071703
path: ['friendList', 0],
1708-
label: 'DeferName',
17091704
},
17101705
{
17111706
items: [{ id: '2' }],
17121707
path: ['friendList', 1],
1713-
label: 'stream-label',
17141708
},
17151709
],
17161710
hasNext: true,
@@ -1727,7 +1721,6 @@ describe('Execute: stream directive', () => {
17271721
{
17281722
data: { name: 'Han' },
17291723
path: ['friendList', 1],
1730-
label: 'DeferName',
17311724
},
17321725
],
17331726
hasNext: false,
@@ -1747,8 +1740,8 @@ describe('Execute: stream directive', () => {
17471740

17481741
const document = parse(`
17491742
query {
1750-
friendList @stream(initialCount: 1, label:"stream-label") {
1751-
...NameFragment @defer(label: "DeferName") @defer(label: "DeferName")
1743+
friendList @stream(initialCount: 1) {
1744+
...NameFragment @defer
17521745
id
17531746
}
17541747
}
@@ -1791,12 +1784,10 @@ describe('Execute: stream directive', () => {
17911784
{
17921785
data: { name: 'Luke' },
17931786
path: ['friendList', 0],
1794-
label: 'DeferName',
17951787
},
17961788
{
17971789
items: [{ id: '2' }],
17981790
path: ['friendList', 1],
1799-
label: 'stream-label',
18001791
},
18011792
],
18021793
hasNext: true,
@@ -1811,7 +1802,6 @@ describe('Execute: stream directive', () => {
18111802
{
18121803
data: { name: 'Han' },
18131804
path: ['friendList', 1],
1814-
label: 'DeferName',
18151805
},
18161806
],
18171807
hasNext: true,

‎src/execution/__tests__/sync-test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ describe('Execute: synchronously when possible', () => {
117117
it('throws if encountering async iterable execution', () => {
118118
const doc = `
119119
query Example {
120-
...deferFrag @defer(label: "deferLabel")
120+
...deferFrag @defer
121121
}
122122
fragment deferFrag on Query {
123123
syncField

‎src/execution/collectFields.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import { typeFromAST } from '../utilities/typeFromAST.js';
2727
import { getDirectiveValues } from './values.js';
2828

2929
export interface PatchFields {
30-
label: string | undefined;
3130
fields: Map<string, ReadonlyArray<FieldNode>>;
3231
}
3332

@@ -159,7 +158,6 @@ function collectFieldsImpl(
159158
visitedFragmentNames,
160159
);
161160
patches.push({
162-
label: defer.label,
163161
fields: patchFields,
164162
});
165163
} else {
@@ -215,7 +213,6 @@ function collectFieldsImpl(
215213
visitedFragmentNames,
216214
);
217215
patches.push({
218-
label: defer.label,
219216
fields: patchFields,
220217
});
221218
} else {
@@ -246,7 +243,7 @@ function getDeferValues(
246243
operation: OperationDefinitionNode,
247244
variableValues: { [variable: string]: unknown },
248245
node: FragmentSpreadNode | InlineFragmentNode,
249-
): undefined | { label: string | undefined } {
246+
): undefined | {} {
250247
const defer = getDirectiveValues(GraphQLDeferDirective, node, variableValues);
251248

252249
if (!defer) {
@@ -262,9 +259,7 @@ function getDeferValues(
262259
'`@defer` directive not supported on subscription operations. Disable `@defer` by setting the `if` argument to `false`.',
263260
);
264261

265-
return {
266-
label: typeof defer.label === 'string' ? defer.label : undefined,
267-
};
262+
return {};
268263
}
269264

270265
/**

0 commit comments

Comments
 (0)