Skip to content

fix: Query keys should be shared between suspense and not suspense #973

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: Query keys should be shared between suspense and not suspense #973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4d7713
fix: Query keys should be shared between suspense and not suspense
mc-zoi Jan 30, 2025
81adae6
npm
mc-zoi Jan 30, 2025
1a5c52f
Revert "npm"
mc-zoi Feb 3, 2025
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
19 changes: 8 additions & 11 deletions packages/plugins/typescript/react-query/src/fetcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export abstract class FetcherRenderer {
${implHookOuter}
return ${infiniteQuery.getHook()}<${operationResultType}, TError, TData>(
${this.generateInfiniteQueryFormattedParameters(
this.generateInfiniteQueryKey(config, isSuspense),
this.generateInfiniteQueryKey(config),
implFetcher,
)}
)};`;
Expand Down Expand Up @@ -136,7 +136,7 @@ export abstract class FetcherRenderer {
${implHookOuter}
return ${query.getHook()}<${operationResultType}, TError, TData>(
${this.generateQueryFormattedParameters(
this.generateQueryKey(config, isSuspense),
this.generateQueryKey(config),
implFetcher,
)}
)};`;
Expand Down Expand Up @@ -222,8 +222,8 @@ export abstract class FetcherRenderer {
return `options: Omit<${infiniteQuery.getOptions()}<${operationResultType}, TError, TData>, 'queryKey'> & { queryKey?: ${infiniteQuery.getOptions()}<${operationResultType}, TError, TData>['queryKey'] }`;
}

public generateInfiniteQueryKey(config: GenerateConfig, isSuspense: boolean): string {
const identifier = isSuspense ? 'infiniteSuspense' : 'infinite';
public generateInfiniteQueryKey(config: GenerateConfig): string {
const identifier = 'infinite';
if (config.hasRequiredVariables)
return `['${config.node.name.value}.${identifier}', variables]`;
return `variables === undefined ? ['${config.node.name.value}.${identifier}'] : ['${config.node.name.value}.${identifier}', variables]`;
Expand All @@ -237,13 +237,13 @@ export abstract class FetcherRenderer {
hook: this.generateInfiniteQueryHook(config, isSuspense),
getKey: `${infiniteQuery.getHook(
operationName,
)}.getKey = (${signature}) => ${this.generateInfiniteQueryKey(config, isSuspense)};`,
)}.getKey = (${signature}) => ${this.generateInfiniteQueryKey(config)};`,
rootKey: `${infiniteQuery.getHook(operationName)}.rootKey = '${node.name.value}.infinite';`,
};
}

public generateQueryKey(config: GenerateConfig, isSuspense: boolean): string {
const identifier = isSuspense ? `${config.node.name.value}Suspense` : config.node.name.value;
public generateQueryKey(config: GenerateConfig): string {
const identifier = config.node.name.value;
if (config.hasRequiredVariables) return `['${identifier}', variables]`;
return `variables === undefined ? ['${identifier}'] : ['${identifier}', variables]`;
}
Expand All @@ -255,10 +255,7 @@ export abstract class FetcherRenderer {
return {
hook: this.generateQueryHook(config, isSuspense),
document: `${query.getHook(operationName)}.document = ${documentVariableName};`,
getKey: `${query.getHook(operationName)}.getKey = (${signature}) => ${this.generateQueryKey(
config,
isSuspense,
)};`,
getKey: `${query.getHook(operationName)}.getKey = (${signature}) => ${this.generateQueryKey(config)};`,
rootKey: `${query.getHook(operationName)}.rootKey = '${node.name.value}';`,
};
}
Expand Down
19 changes: 8 additions & 11 deletions packages/plugins/typescript/solid-query/src/fetcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export abstract class FetcherRenderer {
${implHookOuter}
return ${infiniteQuery.getHook()}<${operationResultType}, TError, TData>(
${this.generateInfiniteQueryFormattedParameters(
this.generateInfiniteQueryKey(config, isSuspense),
this.generateInfiniteQueryKey(config),
implFetcher,
)}
)};`;
Expand Down Expand Up @@ -126,7 +126,7 @@ export abstract class FetcherRenderer {
${implHookOuter}
return ${query.getHook()}<${operationResultType}, TError, TData>(
${this.generateQueryFormattedParameters(
this.generateQueryKey(config, isSuspense),
this.generateQueryKey(config),
implFetcher,
)}
)};`;
Expand Down Expand Up @@ -201,8 +201,8 @@ export abstract class FetcherRenderer {
return `options: Omit<${infiniteQuery.getOptions()}<${operationResultType}, TError, TData>, 'queryKey'> & { queryKey?: ${infiniteQuery.getOptions()}<${operationResultType}, TError, TData>['queryKey'] }`;
}

public generateInfiniteQueryKey(config: GenerateConfig, isSuspense: boolean): string {
const identifier = isSuspense ? 'infiniteSuspense' : 'infinite';
public generateInfiniteQueryKey(config: GenerateConfig): string {
const identifier = 'infinite';
if (config.hasRequiredVariables)
return `['${config.node.name.value}.${identifier}', variables]`;
return `variables === undefined ? ['${config.node.name.value}.${identifier}'] : ['${config.node.name.value}.${identifier}', variables]`;
Expand All @@ -216,13 +216,13 @@ export abstract class FetcherRenderer {
hook: this.generateInfiniteQueryHook(config, isSuspense),
getKey: `${infiniteQuery.getHook(
operationName,
)}.getKey = (${signature}) => ${this.generateInfiniteQueryKey(config, isSuspense)};`,
)}.getKey = (${signature}) => ${this.generateInfiniteQueryKey(config)};`,
rootKey: `${infiniteQuery.getHook(operationName)}.rootKey = '${node.name.value}.infinite';`,
};
}

public generateQueryKey(config: GenerateConfig, isSuspense: boolean): string {
const identifier = isSuspense ? `${config.node.name.value}Suspense` : config.node.name.value;
public generateQueryKey(config: GenerateConfig): string {
const identifier = config.node.name.value;
if (config.hasRequiredVariables) return `['${identifier}', variables]`;
return `variables === undefined ? ['${identifier}'] : ['${identifier}', variables]`;
}
Expand All @@ -234,10 +234,7 @@ export abstract class FetcherRenderer {
return {
hook: this.generateQueryHook(config, isSuspense),
document: `${query.getHook(operationName)}.document = ${documentVariableName};`,
getKey: `${query.getHook(operationName)}.getKey = (${signature}) => ${this.generateQueryKey(
config,
isSuspense,
)};`,
getKey: `${query.getHook(operationName)}.getKey = (${signature}) => ${this.generateQueryKey(config)};`,
rootKey: `${query.getHook(operationName)}.rootKey = '${node.name.value}';`,
};
}
Expand Down