Handle AggregateErrors by expanding them to result errors (#6354)

ardatan · Jul 18, 2024 · 97c88a0 · 97c88a0
1 parent 8b4930a
commit 97c88a0
Show file tree

Hide file tree

Showing 3 changed files with 118 additions and 90 deletions.
diff --git a/.changeset/strange-points-carry.md b/.changeset/strange-points-carry.md
@@ -0,0 +1,5 @@
+---
+'@graphql-tools/executor-http': patch
+---
+
+Handle AggregateErrors by expanding them to result errors
diff --git a/packages/executors/http/src/index.ts b/packages/executors/http/src/index.ts
@@ -316,15 +316,18 @@ export function buildHTTPExecutor(
               ) {
                 return {
                   errors: [
-                    createGraphQLError('Unexpected empty "data" and "errors" fields', {
-                      extensions: {
-                        requestBody: {
-                          query,
-                          operationName: request.operationName,
+                    createGraphQLError(
+                      'Unexpected empty "data" and "errors" fields in result: ' + result,
+                      {
+                        extensions: {
+                          requestBody: {
+                            query,
+                            operationName: request.operationName,
+                          },
+                          responseDetails: responseDetailsForError,
                         },
-                        responseDetails: responseDetailsForError,
                       },
-                    }),
+                    ),
                   ],
                 };
               }
@@ -372,82 +375,30 @@ export function buildHTTPExecutor(
         }
       })
       .catch((e: any) => {
-        if (typeof e === 'string') {
+        if (e.name === 'AggregateError') {
           return {
-            errors: [
-              createGraphQLError(e, {
-                extensions: {
-                  requestBody: {
-                    query,
-                    operationName: request.operationName,
-                  },
-                  responseDetails: responseDetailsForError,
-                },
-              }),
-            ],
-          };
-        } else if (e.name === 'GraphQLError') {
-          return {
-            errors: [e],
-          };
-        } else if (e.name === 'TypeError' && e.message === 'fetch failed') {
-          return {
-            errors: [
-              createGraphQLError(`fetch failed to ${endpoint}`, {
-                extensions: {
-                  requestBody: {
-                    query,
-                    operationName: request.operationName,
-                  },
-                  responseDetails: responseDetailsForError,
-                },
-                originalError: e,
-              }),
-            ],
-          };
-        } else if (e.name === 'AbortError' && signal?.reason) {
-          return createResultForAbort(
-            signal,
-            {
-              requestBody: {
+            errors: e.errors.map((e: any) =>
+              coerceFetchError(e, {
+                signal,
                 query,
-                operationName: request.operationName,
-              },
-              responseDetails: responseDetailsForError,
-            },
-            e,
-          );
-        } else if (e.message) {
-          return {
-            errors: [
-              createGraphQLError(e.message, {
-                extensions: {
-                  requestBody: {
-                    query,
-                    operationName: request.operationName,
-                  },
-                  responseDetails: responseDetailsForError,
-                },
-                originalError: e,
+                endpoint,
+                request,
+                responseDetailsForError,
               }),
-            ],
-          };
-        } else {
-          return {
-            errors: [
-              createGraphQLError('Unknown error', {
-                extensions: {
-                  requestBody: {
-                    query,
-                    operationName: request.operationName,
-                  },
-                  responseDetails: responseDetailsForError,
-                },
-                originalError: e,
-              }),
-            ],
+            ),
           };
         }
+        return {
+          errors: [
+            coerceFetchError(e, {
+              signal,
+              query,
+              endpoint,
+              request,
+              responseDetailsForError,
+            }),
+          ],
+        };
       })
       .resolve();
   };
@@ -512,22 +463,94 @@ export function buildHTTPExecutor(
   return executor;
 }
 
+function coerceFetchError(
+  e: any,
+  {
+    signal,
+    query,
+    endpoint,
+    request,
+    responseDetailsForError,
+  }: {
+    signal: AbortSignal | undefined;
+    query: string;
+    endpoint: string;
+    request: ExecutionRequest;
+    responseDetailsForError: {
+      status?: number;
+      statusText?: string;
+    };
+  },
+) {
+  if (typeof e === 'string') {
+    return createGraphQLError(e, {
+      extensions: {
+        requestBody: {
+          query,
+          operationName: request.operationName,
+        },
+        responseDetails: responseDetailsForError,
+      },
+    });
+  } else if (e.name === 'GraphQLError') {
+    return e;
+  } else if (e.name === 'TypeError' && e.message === 'fetch failed') {
+    return createGraphQLError(`fetch failed to ${endpoint}`, {
+      extensions: {
+        requestBody: {
+          query,
+          operationName: request.operationName,
+        },
+        responseDetails: responseDetailsForError,
+      },
+      originalError: e,
+    });
+  } else if (e.name === 'AbortError' && signal?.reason) {
+    return createGraphQLErrorForAbort(signal, {
+      requestBody: {
+        query,
+        operationName: request.operationName,
+      },
+      responseDetails: responseDetailsForError,
+    });
+  } else if (e.message) {
+    return createGraphQLError(e.message, {
+      extensions: {
+        requestBody: {
+          query,
+          operationName: request.operationName,
+        },
+        responseDetails: responseDetailsForError,
+      },
+      originalError: e,
+    });
+  } else {
+    return createGraphQLError('Unknown error', {
+      extensions: {
+        requestBody: {
+          query,
+          operationName: request.operationName,
+        },
+        responseDetails: responseDetailsForError,
+      },
+      originalError: e,
+    });
+  }
+}
+
 function createAbortErrorReason() {
   return new Error('Executor was disposed.');
 }
 
-function createResultForAbort(
-  signal: AbortSignal,
-  extensions?: Record<string, any>,
-  originalError?: Error,
-) {
+function createGraphQLErrorForAbort(signal: AbortSignal, extensions?: Record<string, any>) {
+  return createGraphQLError('The operation was aborted. reason: ' + signal.reason, {
+    extensions,
+  });
+}
+
+function createResultForAbort(signal: AbortSignal, extensions?: Record<string, any>) {
   return {
-    errors: [
-      createGraphQLError('The operation was aborted. reason: ' + signal.reason, {
-        extensions,
-        originalError,
-      }),
-    ],
+    errors: [createGraphQLErrorForAbort(signal, extensions)],
   };
 }
 

diff --git a/packages/executors/http/tests/buildHTTPExecutor.test.ts b/packages/executors/http/tests/buildHTTPExecutor.test.ts
@@ -70,7 +70,7 @@ describe('buildHTTPExecutor', () => {
     expect(result).toMatchObject({
       errors: [
         {
-          message: 'Unexpected empty "data" and "errors" fields',
+          message: expect.stringContaining('Unexpected empty "data" and "errors" fields'),
         },
       ],
     });