fix(core): Add alternative rethrow method by wrapping yield (#3063)

urql-graphql · Mar 16, 2023 · 33d64b0 · 33d64b0
1 parent 9f91c2b
commit 33d64b0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.changeset/silent-numbers-look.md b/.changeset/silent-numbers-look.md
@@ -0,0 +1,5 @@
+---
+'@urql/core': patch
+---
+
+Ensure network errors are always issued with `CombinedError`s, while downstream errors are re-thrown.
diff --git a/packages/core/src/internal/fetchSource.ts b/packages/core/src/internal/fetchSource.ts
@@ -104,6 +104,7 @@ async function* fetchOperation(
   url: string,
   fetchOptions: RequestInit
 ) {
+  let networkMode = true;
   let abortController: AbortController | void;
   let result: OperationResult | null = null;
   let response: Response;
@@ -132,16 +133,19 @@ async function* fetchOperation(
     }
 
     for await (const payload of results) {
-      yield (result = result
+      result = result
         ? mergeResultPatch(result, payload, response)
-        : makeResult(operation, payload, response));
+        : makeResult(operation, payload, response);
+      networkMode = false;
+      yield result;
+      networkMode = true;
     }
 
     if (!result) {
       yield (result = makeResult(operation, {}, response));
     }
   } catch (error: any) {
-    if (result) {
+    if (!networkMode) {
       throw error;
     }