fix(delegate): do not forward non-nullability errors to the gateway (#…

…257)
graphql-hive · Dec 3, 2024 · 9ce705c · 9ce705c
1 parent 1d6fa42
commit 9ce705c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/.changeset/slow-cars-mate.md b/.changeset/slow-cars-mate.md
@@ -0,0 +1,5 @@
+---
+'@graphql-tools/delegate': patch
+---
+
+Do not show internal non-nullability errors in the gateway
diff --git a/packages/delegate/src/mergeFields.ts b/packages/delegate/src/mergeFields.ts
@@ -147,7 +147,18 @@ export function handleResolverResult(
     for (const [responseKey, fieldNodes] of fields) {
       const combinedPath = [...path, responseKey];
       if (resolverResult instanceof GraphQLError) {
-        nullResult[responseKey] = relocatedError(resolverResult, combinedPath);
+        if (
+          resolverResult.message.includes(
+            'Cannot return null for non-nullable field',
+          )
+        ) {
+          nullResult[responseKey] = null;
+        } else {
+          nullResult[responseKey] = relocatedError(
+            resolverResult,
+            combinedPath,
+          );
+        }
       } else if (resolverResult instanceof Error) {
         nullResult[responseKey] = locatedError(
           resolverResult,

diff --git a/packages/stitch/tests/mergeFailures.test.ts b/packages/stitch/tests/mergeFailures.test.ts
@@ -240,7 +240,7 @@ describe('merge failures', () => {
       data: { thing: null },
       errors: [
         createGraphQLError(
-          'Cannot return null for non-nullable field Thing.id.',
+          'Cannot return null for non-nullable field Thing.description.',
         ),
       ],
     };