Skip to content

Commit 795ba53

Browse files
committed
fix: apply feedback to default query key values
1 parent 3794bb1 commit 795ba53

File tree

4 files changed

+74
-81
lines changed

4 files changed

+74
-81
lines changed

dev-test/githunt/types.react-query.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -507,11 +507,11 @@ export const CurrentUserForProfileDocument = `
507507

508508
export const useCurrentUserForProfileQuery = <TData = CurrentUserForProfileQuery, TError = unknown>(
509509
dataSource: { endpoint: string; fetchParams?: RequestInit },
510-
variables?: CurrentUserForProfileQueryVariables,
510+
variables: CurrentUserForProfileQueryVariables = {},
511511
options?: UseQueryOptions<CurrentUserForProfileQuery, TError, TData>,
512512
) => {
513513
return useQuery<CurrentUserForProfileQuery, TError, TData>(
514-
variables === undefined ? ['CurrentUserForProfile', {}] : ['CurrentUserForProfile', variables],
514+
['CurrentUserForProfile', variables],
515515
fetcher<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
516516
dataSource.endpoint,
517517
dataSource.fetchParams || {},
@@ -527,13 +527,11 @@ export const useInfiniteCurrentUserForProfileQuery = <
527527
TError = unknown,
528528
>(
529529
dataSource: { endpoint: string; fetchParams?: RequestInit },
530-
variables?: CurrentUserForProfileQueryVariables,
530+
variables: CurrentUserForProfileQueryVariables = {},
531531
options?: UseInfiniteQueryOptions<CurrentUserForProfileQuery, TError, TData>,
532532
) => {
533533
return useInfiniteQuery<CurrentUserForProfileQuery, TError, TData>(
534-
variables === undefined
535-
? ['CurrentUserForProfile.infinite', {}]
536-
: ['CurrentUserForProfile.infinite', variables],
534+
['CurrentUserForProfile.infinite', variables],
537535
metaData =>
538536
fetcher<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
539537
dataSource.endpoint,

packages/plugins/typescript/react-query/src/fetcher.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ export abstract class FetcherRenderer {
186186
hasRequiredVariables,
187187
operationVariablesTypes,
188188
}: GenerateConfig): string {
189-
return `variables${hasRequiredVariables ? '' : '?'}: ${operationVariablesTypes}`;
189+
return `variables: ${operationVariablesTypes}${hasRequiredVariables ? '' : ' = {}'}`;
190190
}
191191

192192
private generateQueryOptionsSignature(
@@ -203,9 +203,7 @@ export abstract class FetcherRenderer {
203203

204204
private generateInfiniteQueryVariablesSignature(config: GenerateConfig): string {
205205
if (this.visitor.config.reactQueryVersion <= 4) {
206-
return `variables${config.hasRequiredVariables ? '' : '?'}: ${
207-
config.operationVariablesTypes
208-
}`;
206+
return `variables: ${config.operationVariablesTypes}${config.hasRequiredVariables ? '' : ' = {}'}`;
209207
}
210208
return `variables: ${config.operationVariablesTypes}`;
211209
}
@@ -224,9 +222,7 @@ export abstract class FetcherRenderer {
224222

225223
public generateInfiniteQueryKey(config: GenerateConfig, isSuspense: boolean): string {
226224
const identifier = isSuspense ? 'infiniteSuspense' : 'infinite';
227-
if (config.hasRequiredVariables)
228-
return `['${config.node.name.value}.${identifier}', variables]`;
229-
return `variables === undefined ? ['${config.node.name.value}.${identifier}', {}] : ['${config.node.name.value}.${identifier}', variables]`;
225+
return `['${config.node.name.value}.${identifier}', variables]`;
230226
}
231227

232228
public generateInfiniteQueryOutput(config: GenerateConfig, isSuspense = false) {
@@ -244,8 +240,7 @@ export abstract class FetcherRenderer {
244240

245241
public generateQueryKey(config: GenerateConfig, isSuspense: boolean): string {
246242
const identifier = isSuspense ? `${config.node.name.value}Suspense` : config.node.name.value;
247-
if (config.hasRequiredVariables) return `['${identifier}', variables]`;
248-
return `variables === undefined ? ['${identifier}', {}] : ['${identifier}', variables]`;
243+
return `['${identifier}', variables]`;
249244
}
250245

251246
public generateQueryOutput(config: GenerateConfig, isSuspense = false) {

0 commit comments

Comments
 (0)