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 queryKeyGeneration when using invalidateQuery #3728

Merged
merged 21 commits into from
Oct 11, 2022
Merged

Fix queryKeyGeneration when using invalidateQuery #3728

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ed2a450
Fix generating wrong key
Zeko369 Aug 14, 2022
3c9c22b
Fix passing undefined vs no argument passed
Zeko369 Aug 15, 2022
d2b23fe
Fix some typing
Zeko369 Aug 15, 2022
474b087
Inline arguments
Zeko369 Aug 15, 2022
74c7a24
Merge branch 'main' into fix/invalidate-query-with-no-params-generate…
Zeko369 Aug 15, 2022
30eb48b
Create tame-pumpkins-nail.md
Zeko369 Aug 15, 2022
581f603
Fix wrong pass arg
Zeko369 Aug 15, 2022
9117987
Merge remote-tracking branch 'origin/fix/invalidate-query-with-no-par…
Zeko369 Aug 15, 2022
9dea9e3
Fix pnpm-lock
Zeko369 Aug 15, 2022
37a88b1
Merge branch 'main' into fix/invalidate-query-with-no-params-generate…
Zeko369 Aug 16, 2022
bcbe9c6
Fix lock
Zeko369 Aug 16, 2022
c6ec8c2
Merge branch 'main' into fix/invalidate-query-with-no-params-generate…
Zeko369 Sep 17, 2022
75f41a6
Merge branch 'main' into fix/invalidate-query-with-no-params-generate…
Zeko369 Sep 30, 2022
819ec3a
Add unit tests for react-query-utils
Zeko369 Sep 30, 2022
fd49e8c
Fix some typing
Zeko369 Sep 30, 2022
1bf61ac
Lock update
Zeko369 Sep 30, 2022
1d61d9a
Add integration tests for new invalidateQuery
Zeko369 Sep 30, 2022
adfe598
Add back server mode tests
Zeko369 Oct 1, 2022
59d9372
Update pnpm lock
beerose Oct 11, 2022
fd04e96
Merge branch 'main' into fix/invalidate-query-with-no-params-generate…
beerose Oct 11, 2022
2a10e37
Merge branch 'main' into fix/invalidate-query-with-no-params-generate…
beerose Oct 11, 2022
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
13 changes: 9 additions & 4 deletions packages/blitz-rpc/src/data-client/react-query-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,23 @@ const sanitize =
export const sanitizeQuery = sanitize("query")
export const sanitizeMutation = sanitize("mutation")

type BlitzNoParams = {__blitz_no_params_passed: true}
export const getQueryKeyFromUrlAndParams = (url: string, params: unknown) => {
const queryKey = [url]

const args = typeof params === "function" ? (params as Function)() : params
queryKey.push(serialize(args) as any)
if (
!(typeof params === "object" && (params as BlitzNoParams)["__blitz_no_params_passed"] === true)
) {
const args = typeof params === "function" ? (params as Function)() : params
queryKey.push(serialize(args) as any)
}

return queryKey as [string, any]
}

export function getQueryKey<TInput, TResult, T extends AsyncFunc>(
resolver: T | Resolver<TInput, TResult> | RpcClient<TInput, TResult>,
params?: TInput,
params: TInput | BlitzNoParams = {__blitz_no_params_passed: true},
) {
if (typeof resolver === "undefined") {
throw new Error("getQueryKey is missing the first argument - it must be a resolver function")
Expand All @@ -160,7 +165,7 @@ export function getInfiniteQueryKey<TInput, TResult, T extends AsyncFunc>(

export function invalidateQuery<TInput, TResult, T extends AsyncFunc>(
resolver: T | Resolver<TInput, TResult> | RpcClient<TInput, TResult>,
params?: TInput,
params: TInput | BlitzNoParams = {__blitz_no_params_passed: true},
) {
if (typeof resolver === "undefined") {
throw new Error(
Expand Down