Skip to content

Commit

Permalink
fix(typescript-react-apollo): fix the type returned by useSuspenseQuery
Browse files Browse the repository at this point in the history
  • Loading branch information
@nekocode
nekocode committed Oct 26, 2024
1 parent 74da8bf commit 707c91e
Show file tree
Hide file tree
Showing 21 changed files with 834 additions and 94 deletions.
5 changes: 5 additions & 0 deletions .changeset/smooth-lobsters-behave.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@graphql-codegen/typescript-react-apollo': patch
---

fix return type of useSuspenseQuery
63 changes: 57 additions & 6 deletions dev-test/githunt/types.reactApollo.customSuffix.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,13 +500,26 @@ export function useCommentLazyQuery(
options,
);
}
export function useCommentSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQueryMyOperation, CommentQueryVariables>,
): Apollo.UseSuspenseQueryResult<CommentQueryMyOperation, CommentQueryVariables>;
export function useCommentSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<CommentQueryMyOperation, CommentQueryVariables>,
): Apollo.UseSuspenseQueryResult<CommentQueryMyOperation | undefined, CommentQueryVariables>;
export function useCommentSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<CommentQueryMyOperation, CommentQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
if (baseOptions === Apollo.skipToken) {
return Apollo.useSuspenseQuery<CommentQueryMyOperation, CommentQueryVariables>(
CommentDocument,
baseOptions as Apollo.SkipToken | undefined,
);
}
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<CommentQueryMyOperation, CommentQueryVariables>(
CommentDocument,
options,
Expand Down Expand Up @@ -564,6 +577,26 @@ export function useCurrentUserForProfileLazyQuery(
CurrentUserForProfileQueryVariables
>(CurrentUserForProfileDocument, options);
}
export function useCurrentUserForProfileSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<
CurrentUserForProfileQueryMyOperation,
CurrentUserForProfileQueryVariables
>,
): Apollo.UseSuspenseQueryResult<
CurrentUserForProfileQueryMyOperation,
CurrentUserForProfileQueryVariables
>;
export function useCurrentUserForProfileSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<
CurrentUserForProfileQueryMyOperation,
CurrentUserForProfileQueryVariables
>,
): Apollo.UseSuspenseQueryResult<
CurrentUserForProfileQueryMyOperation | undefined,
CurrentUserForProfileQueryVariables
>;
export function useCurrentUserForProfileSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
Expand All @@ -572,8 +605,13 @@ export function useCurrentUserForProfileSuspenseQuery(
CurrentUserForProfileQueryVariables
>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
if (baseOptions === Apollo.skipToken) {
return Apollo.useSuspenseQuery<
CurrentUserForProfileQueryMyOperation,
CurrentUserForProfileQueryVariables
>(CurrentUserForProfileDocument, baseOptions as Apollo.SkipToken | undefined);
}
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<
CurrentUserForProfileQueryMyOperation,
CurrentUserForProfileQueryVariables
Expand Down Expand Up @@ -633,13 +671,26 @@ export function useFeedLazyQuery(
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useLazyQuery<FeedQueryMyOperation, FeedQueryVariables>(FeedDocument, options);
}
export function useFeedSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQueryMyOperation, FeedQueryVariables>,
): Apollo.UseSuspenseQueryResult<FeedQueryMyOperation, FeedQueryVariables>;
export function useFeedSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<FeedQueryMyOperation, FeedQueryVariables>,
): Apollo.UseSuspenseQueryResult<FeedQueryMyOperation | undefined, FeedQueryVariables>;
export function useFeedSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<FeedQueryMyOperation, FeedQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
if (baseOptions === Apollo.skipToken) {
return Apollo.useSuspenseQuery<FeedQueryMyOperation, FeedQueryVariables>(
FeedDocument,
baseOptions as Apollo.SkipToken | undefined,
);
}
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<FeedQueryMyOperation, FeedQueryVariables>(FeedDocument, options);
}
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;
Expand Down
58 changes: 52 additions & 6 deletions dev-test/githunt/types.reactApollo.hooks.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,13 +543,26 @@ export function useCommentLazyQuery(
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useLazyQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
}
export function useCommentSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
): Apollo.UseSuspenseQueryResult<CommentQuery, CommentQueryVariables>;
export function useCommentSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
): Apollo.UseSuspenseQueryResult<CommentQuery | undefined, CommentQueryVariables>;
export function useCommentSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
if (baseOptions === Apollo.skipToken) {
return Apollo.useSuspenseQuery<CommentQuery, CommentQueryVariables>(
CommentDocument,
baseOptions as Apollo.SkipToken | undefined,
);
}
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
}
export type CommentQueryHookResult = ReturnType<typeof useCommentQuery>;
Expand Down Expand Up @@ -604,6 +617,23 @@ export function useCurrentUserForProfileLazyQuery(
options,
);
}
export function useCurrentUserForProfileSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<
CurrentUserForProfileQuery,
CurrentUserForProfileQueryVariables
>,
): Apollo.UseSuspenseQueryResult<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>;
export function useCurrentUserForProfileSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<
CurrentUserForProfileQuery,
CurrentUserForProfileQueryVariables
>,
): Apollo.UseSuspenseQueryResult<
CurrentUserForProfileQuery | undefined,
CurrentUserForProfileQueryVariables
>;
export function useCurrentUserForProfileSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
Expand All @@ -612,8 +642,13 @@ export function useCurrentUserForProfileSuspenseQuery(
CurrentUserForProfileQueryVariables
>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
if (baseOptions === Apollo.skipToken) {
return Apollo.useSuspenseQuery<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
CurrentUserForProfileDocument,
baseOptions as Apollo.SkipToken | undefined,
);
}
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
CurrentUserForProfileDocument,
options,
Expand Down Expand Up @@ -673,11 +708,22 @@ export function useFeedLazyQuery(
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useLazyQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
}
export function useFeedSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
): Apollo.UseSuspenseQueryResult<FeedQuery, FeedQueryVariables>;
export function useFeedSuspenseQuery(
baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
): Apollo.UseSuspenseQueryResult<FeedQuery | undefined, FeedQueryVariables>;
export function useFeedSuspenseQuery(
baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
if (baseOptions === Apollo.skipToken) {
return Apollo.useSuspenseQuery<FeedQuery, FeedQueryVariables>(
FeedDocument,
baseOptions as Apollo.SkipToken | undefined,
);
}
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
}
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;
Expand Down
58 changes: 52 additions & 6 deletions dev-test/githunt/types.reactApollo.preResolveTypes.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -497,13 +497,26 @@ export function useCommentLazyQuery(
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useLazyQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
}
export function useCommentSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
): Apollo.UseSuspenseQueryResult<CommentQuery, CommentQueryVariables>;
export function useCommentSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
): Apollo.UseSuspenseQueryResult<CommentQuery | undefined, CommentQueryVariables>;
export function useCommentSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
if (baseOptions === Apollo.skipToken) {
return Apollo.useSuspenseQuery<CommentQuery, CommentQueryVariables>(
CommentDocument,
baseOptions as Apollo.SkipToken | undefined,
);
}
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
}
export type CommentQueryHookResult = ReturnType<typeof useCommentQuery>;
Expand Down Expand Up @@ -558,6 +571,23 @@ export function useCurrentUserForProfileLazyQuery(
options,
);
}
export function useCurrentUserForProfileSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<
CurrentUserForProfileQuery,
CurrentUserForProfileQueryVariables
>,
): Apollo.UseSuspenseQueryResult<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>;
export function useCurrentUserForProfileSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<
CurrentUserForProfileQuery,
CurrentUserForProfileQueryVariables
>,
): Apollo.UseSuspenseQueryResult<
CurrentUserForProfileQuery | undefined,
CurrentUserForProfileQueryVariables
>;
export function useCurrentUserForProfileSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
Expand All @@ -566,8 +596,13 @@ export function useCurrentUserForProfileSuspenseQuery(
CurrentUserForProfileQueryVariables
>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
if (baseOptions === Apollo.skipToken) {
return Apollo.useSuspenseQuery<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
CurrentUserForProfileDocument,
baseOptions as Apollo.SkipToken | undefined,
);
}
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
CurrentUserForProfileDocument,
options,
Expand Down Expand Up @@ -627,11 +662,22 @@ export function useFeedLazyQuery(
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useLazyQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
}
export function useFeedSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
): Apollo.UseSuspenseQueryResult<FeedQuery, FeedQueryVariables>;
export function useFeedSuspenseQuery(
baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
): Apollo.UseSuspenseQueryResult<FeedQuery | undefined, FeedQueryVariables>;
export function useFeedSuspenseQuery(
baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
if (baseOptions === Apollo.skipToken) {
return Apollo.useSuspenseQuery<FeedQuery, FeedQueryVariables>(
FeedDocument,
baseOptions as Apollo.SkipToken | undefined,
);
}
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
}
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;
Expand Down
58 changes: 52 additions & 6 deletions dev-test/githunt/types.reactApollo.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -497,13 +497,26 @@ export function useCommentLazyQuery(
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useLazyQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
}
export function useCommentSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
): Apollo.UseSuspenseQueryResult<CommentQuery, CommentQueryVariables>;
export function useCommentSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
): Apollo.UseSuspenseQueryResult<CommentQuery | undefined, CommentQueryVariables>;
export function useCommentSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
if (baseOptions === Apollo.skipToken) {
return Apollo.useSuspenseQuery<CommentQuery, CommentQueryVariables>(
CommentDocument,
baseOptions as Apollo.SkipToken | undefined,
);
}
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
}
export type CommentQueryHookResult = ReturnType<typeof useCommentQuery>;
Expand Down Expand Up @@ -558,6 +571,23 @@ export function useCurrentUserForProfileLazyQuery(
options,
);
}
export function useCurrentUserForProfileSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<
CurrentUserForProfileQuery,
CurrentUserForProfileQueryVariables
>,
): Apollo.UseSuspenseQueryResult<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>;
export function useCurrentUserForProfileSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<
CurrentUserForProfileQuery,
CurrentUserForProfileQueryVariables
>,
): Apollo.UseSuspenseQueryResult<
CurrentUserForProfileQuery | undefined,
CurrentUserForProfileQueryVariables
>;
export function useCurrentUserForProfileSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
Expand All @@ -566,8 +596,13 @@ export function useCurrentUserForProfileSuspenseQuery(
CurrentUserForProfileQueryVariables
>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
if (baseOptions === Apollo.skipToken) {
return Apollo.useSuspenseQuery<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
CurrentUserForProfileDocument,
baseOptions as Apollo.SkipToken | undefined,
);
}
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
CurrentUserForProfileDocument,
options,
Expand Down Expand Up @@ -627,11 +662,22 @@ export function useFeedLazyQuery(
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useLazyQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
}
export function useFeedSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
): Apollo.UseSuspenseQueryResult<FeedQuery, FeedQueryVariables>;
export function useFeedSuspenseQuery(
baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
): Apollo.UseSuspenseQueryResult<FeedQuery | undefined, FeedQueryVariables>;
export function useFeedSuspenseQuery(
baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
if (baseOptions === Apollo.skipToken) {
return Apollo.useSuspenseQuery<FeedQuery, FeedQueryVariables>(
FeedDocument,
baseOptions as Apollo.SkipToken | undefined,
);
}
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
}
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;
Expand Down
Loading

0 comments on commit 707c91e

Please sign in to comment.