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

fix(svelte): Move Client subscription to writable start #3331

Merged
merged 1 commit into from
Jul 25, 2023
Merged

fix(svelte): Move Client subscription to writable start #3331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/many-rabbits-wave.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@urql/svelte': patch
---

Fix `queryStore` and `subscriptionStore` not subscribing when `writable` calls its `StartStopNotifier`. This caused both stores to be inactive and become unresponsive when they’ve been unsubscribed from once, as they wouldn’t be able to restart their subscriptions to the `Client`.
76 changes: 38 additions & 38 deletions packages/svelte-urql/src/queryStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,47 +138,47 @@ export function queryStore<
...initialResult,
operation,
};
const result$ = writable(initialState, () => {
return subscription.unsubscribe;
});

const isPaused$ = writable(!!args.pause);

const subscription = pipe(
fromStore(isPaused$),
switchMap(
(isPaused): Source<Partial<OperationResultState<Data, Variables>>> => {
if (isPaused) {
return never as any;
}
const result$ = writable(initialState, () => {
return pipe(
fromStore(isPaused$),
switchMap(
(isPaused): Source<Partial<OperationResultState<Data, Variables>>> => {
if (isPaused) {
return never as any;
}

return concat<Partial<OperationResultState<Data, Variables>>>([
fromValue({ fetching: true, stale: false }),
pipe(
args.client.executeRequestOperation(operation),
map(({ stale, data, error, extensions, operation }) => ({
fetching: false,
stale: !!stale,
data,
error,
operation,
extensions,
}))
),
fromValue({ fetching: false }),
]);
}
),
scan(
(result: OperationResultState<Data, Variables>, partial) => ({
...result,
...partial,
}),
initialState
),
subscribe(result => {
result$.set(result);
})
);
return concat<Partial<OperationResultState<Data, Variables>>>([
fromValue({ fetching: true, stale: false }),
pipe(
args.client.executeRequestOperation(operation),
map(({ stale, data, error, extensions, operation }) => ({
fetching: false,
stale: !!stale,
data,
error,
operation,
extensions,
}))
),
fromValue({ fetching: false }),
]);
}
),
scan(
(result: OperationResultState<Data, Variables>, partial) => ({
...result,
...partial,
}),
initialState
),
subscribe(result => {
result$.set(result);
})
).unsubscribe;
});

return {
...derived(result$, (result, set) => {
Expand Down
88 changes: 44 additions & 44 deletions packages/svelte-urql/src/subscriptionStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,53 +154,53 @@ export function subscriptionStore<
operation,
fetching: true,
};
const result$ = writable(initialState, () => {
return subscription.unsubscribe;
});

const isPaused$ = writable(!!args.pause);

const subscription = pipe(
fromStore(isPaused$),
switchMap(
(isPaused): Source<Partial<OperationResultState<Data, Variables>>> => {
if (isPaused) {
return never as any;
}
const result$ = writable(initialState, () => {
return pipe(
fromStore(isPaused$),
switchMap(
(isPaused): Source<Partial<OperationResultState<Data, Variables>>> => {
if (isPaused) {
return never as any;
}

return concat<Partial<OperationResultState<Data, Variables>>>([
fromValue({ fetching: true, stale: false }),
pipe(
args.client.executeRequestOperation(operation),
map(({ stale, data, error, extensions, operation }) => ({
fetching: true,
stale: !!stale,
data,
error,
operation,
extensions,
}))
),
fromValue({ fetching: false }),
]);
}
),
scan((result: OperationResultState<Result, Variables>, partial) => {
const data =
partial.data !== undefined
? typeof handler === 'function'
? handler(result.data, partial.data)
: partial.data
: result.data;
return {
...result,
...partial,
data,
} as OperationResultState<Result, Variables>;
}, initialState),
subscribe(result => {
result$.set(result);
})
);
return concat<Partial<OperationResultState<Data, Variables>>>([
fromValue({ fetching: true, stale: false }),
pipe(
args.client.executeRequestOperation(operation),
map(({ stale, data, error, extensions, operation }) => ({
fetching: true,
stale: !!stale,
data,
error,
operation,
extensions,
}))
),
fromValue({ fetching: false }),
]);
}
),
scan((result: OperationResultState<Result, Variables>, partial) => {
const data =
partial.data !== undefined
? typeof handler === 'function'
? handler(result.data, partial.data)
: partial.data
: result.data;
return {
...result,
...partial,
data,
} as OperationResultState<Result, Variables>;
}, initialState),
subscribe(result => {
result$.set(result);
})
).unsubscribe;
});

return {
...derived(result$, (result, set) => {
Expand Down