Skip to content

Commit a45a02d

Browse files
leebyronleebyron
committed
Merge branch 'rexxars-improve-non-null-error'
2 parents 44aa585 + a617fa7 commit a45a02d

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

‎src/execution/__tests__/lists.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ describe('Execute: Handles list nullability', () => {
162162
null,
163163
{ data: { nest: null },
164164
errors: [
165-
{ message: 'Cannot return null for non-nullable type.',
165+
{ message: 'Cannot return null for non-nullable field DataType.test.',
166166
locations: [ { line: 1, column: 10 } ] }
167167
] }
168168
));
@@ -185,7 +185,7 @@ describe('Execute: Handles list nullability', () => {
185185
resolved(null),
186186
{ data: { nest: null },
187187
errors: [
188-
{ message: 'Cannot return null for non-nullable type.',
188+
{ message: 'Cannot return null for non-nullable field DataType.test.',
189189
locations: [ { line: 1, column: 10 } ] }
190190
] }
191191
));
@@ -240,7 +240,7 @@ describe('Execute: Handles list nullability', () => {
240240
[ 1, null, 2 ],
241241
{ data: { nest: { test: null } },
242242
errors: [
243-
{ message: 'Cannot return null for non-nullable type.',
243+
{ message: 'Cannot return null for non-nullable field DataType.test.',
244244
locations: [ { line: 1, column: 10 } ] }
245245
] }
246246
));
@@ -263,7 +263,7 @@ describe('Execute: Handles list nullability', () => {
263263
resolved([ 1, null, 2 ]),
264264
{ data: { nest: { test: null } },
265265
errors: [
266-
{ message: 'Cannot return null for non-nullable type.',
266+
{ message: 'Cannot return null for non-nullable field DataType.test.',
267267
locations: [ { line: 1, column: 10 } ] }
268268
] }
269269
));
@@ -295,7 +295,7 @@ describe('Execute: Handles list nullability', () => {
295295
[ resolved(1), resolved(null), resolved(2) ],
296296
{ data: { nest: { test: null } },
297297
errors: [
298-
{ message: 'Cannot return null for non-nullable type.',
298+
{ message: 'Cannot return null for non-nullable field DataType.test.',
299299
locations: [ { line: 1, column: 10 } ] }
300300
] }
301301
));
@@ -329,7 +329,7 @@ describe('Execute: Handles list nullability', () => {
329329
[ 1, null, 2 ],
330330
{ data: { nest: null },
331331
errors: [
332-
{ message: 'Cannot return null for non-nullable type.',
332+
{ message: 'Cannot return null for non-nullable field DataType.test.',
333333
locations: [ { line: 1, column: 10 } ] }
334334
] }
335335
));
@@ -338,7 +338,7 @@ describe('Execute: Handles list nullability', () => {
338338
null,
339339
{ data: { nest: null },
340340
errors: [
341-
{ message: 'Cannot return null for non-nullable type.',
341+
{ message: 'Cannot return null for non-nullable field DataType.test.',
342342
locations: [ { line: 1, column: 10 } ] }
343343
] }
344344
));
@@ -356,7 +356,7 @@ describe('Execute: Handles list nullability', () => {
356356
resolved([ 1, null, 2 ]),
357357
{ data: { nest: null },
358358
errors: [
359-
{ message: 'Cannot return null for non-nullable type.',
359+
{ message: 'Cannot return null for non-nullable field DataType.test.',
360360
locations: [ { line: 1, column: 10 } ] }
361361
] }
362362
));
@@ -365,7 +365,7 @@ describe('Execute: Handles list nullability', () => {
365365
resolved(null),
366366
{ data: { nest: null },
367367
errors: [
368-
{ message: 'Cannot return null for non-nullable type.',
368+
{ message: 'Cannot return null for non-nullable field DataType.test.',
369369
locations: [ { line: 1, column: 10 } ] }
370370
] }
371371
));
@@ -392,7 +392,7 @@ describe('Execute: Handles list nullability', () => {
392392
[ resolved(1), resolved(null), resolved(2) ],
393393
{ data: { nest: null },
394394
errors: [
395-
{ message: 'Cannot return null for non-nullable type.',
395+
{ message: 'Cannot return null for non-nullable field DataType.test.',
396396
locations: [ { line: 1, column: 10 } ] }
397397
] }
398398
));

‎src/execution/__tests__/nonnull.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ describe('Execute: handles non-nullable types', () => {
500500
nest: null
501501
},
502502
errors: [
503-
{ message: 'Cannot return null for non-nullable type.',
503+
{ message: 'Cannot return null for non-nullable field DataType.nonNullSync.',
504504
locations: [ { line: 4, column: 11 } ] }
505505
]
506506
};
@@ -526,7 +526,7 @@ describe('Execute: handles non-nullable types', () => {
526526
nest: null
527527
},
528528
errors: [
529-
{ message: 'Cannot return null for non-nullable type.',
529+
{ message: 'Cannot return null for non-nullable field DataType.nonNullPromise.',
530530
locations: [ { line: 4, column: 11 } ] }
531531
]
532532
};
@@ -552,7 +552,7 @@ describe('Execute: handles non-nullable types', () => {
552552
promiseNest: null
553553
},
554554
errors: [
555-
{ message: 'Cannot return null for non-nullable type.',
555+
{ message: 'Cannot return null for non-nullable field DataType.nonNullSync.',
556556
locations: [ { line: 4, column: 11 } ] }
557557
]
558558
};
@@ -578,7 +578,7 @@ describe('Execute: handles non-nullable types', () => {
578578
promiseNest: null
579579
},
580580
errors: [
581-
{ message: 'Cannot return null for non-nullable type.',
581+
{ message: 'Cannot return null for non-nullable field DataType.nonNullPromise.',
582582
locations: [ { line: 4, column: 11 } ] }
583583
]
584584
};
@@ -714,13 +714,13 @@ describe('Execute: handles non-nullable types', () => {
714714
anotherPromiseNest: null
715715
},
716716
errors: [
717-
{ message: 'Cannot return null for non-nullable type.',
717+
{ message: 'Cannot return null for non-nullable field DataType.nonNullSync.',
718718
locations: [ { line: 8, column: 19 } ] },
719-
{ message: 'Cannot return null for non-nullable type.',
719+
{ message: 'Cannot return null for non-nullable field DataType.nonNullSync.',
720720
locations: [ { line: 19, column: 19 } ] },
721-
{ message: 'Cannot return null for non-nullable type.',
721+
{ message: 'Cannot return null for non-nullable field DataType.nonNullPromise.',
722722
locations: [ { line: 30, column: 19 } ] },
723-
{ message: 'Cannot return null for non-nullable type.',
723+
{ message: 'Cannot return null for non-nullable field DataType.nonNullPromise.',
724724
locations: [ { line: 41, column: 19 } ] }
725725
]
726726
};
@@ -774,7 +774,7 @@ describe('Execute: handles non-nullable types', () => {
774774
var expected = {
775775
data: null,
776776
errors: [
777-
{ message: 'Cannot return null for non-nullable type.',
777+
{ message: 'Cannot return null for non-nullable field DataType.nonNullSync.',
778778
locations: [ { line: 2, column: 17 } ] }
779779
]
780780
};
@@ -792,7 +792,7 @@ describe('Execute: handles non-nullable types', () => {
792792
var expected = {
793793
data: null,
794794
errors: [
795-
{ message: 'Cannot return null for non-nullable type.',
795+
{ message: 'Cannot return null for non-nullable field DataType.nonNullPromise.',
796796
locations: [ { line: 2, column: 17 } ] }
797797
]
798798
};

‎src/execution/execute.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,8 @@ function completeValue(
614614
);
615615
if (completed === null) {
616616
throw new GraphQLError(
617-
'Cannot return null for non-nullable type.',
617+
`Cannot return null for non-nullable ` +
618+
`field ${info.parentType}.${info.fieldName}.`,
618619
fieldASTs
619620
);
620621
}

0 commit comments

Comments
 (0)