Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Mar 16, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb63446
Add alternative rethrow method by wrapping yield
kitten Mar 16, 2023
c51260b
Isolate networkMode flag from makeResult
kitten Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/silent-numbers-look.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@urql/core': patch
---

Ensure network errors are always issued with `CombinedError`s, while downstream errors are re-thrown.
10 changes: 7 additions & 3 deletions packages/core/src/internal/fetchSource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down