Skip to content

Commit ea83cf4

Browse files
jefrydcojefrydco
authored
feat(typescript-react-apollo): support skip token for useSuspenseQuery (#835)
* feat(typescript-react-apollo): support skip token for useSuspenseQuery * chore: generate changeset
1 parent 32d1b7d commit ea83cf4

21 files changed

+262
-155
lines changed

‎.changeset/lazy-games-juggle.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@graphql-codegen/typescript-react-apollo': patch
3+
---
4+
5+
feat: support skip token for useSuspenseQuery

‎dev-test/githunt/types.reactApollo.customSuffix.tsx‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -501,9 +501,12 @@ export function useCommentLazyQuery(
501501
);
502502
}
503503
export function useCommentSuspenseQuery(
504-
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQueryMyOperation, CommentQueryVariables>,
504+
baseOptions?:
505+
| Apollo.SkipToken
506+
| Apollo.SuspenseQueryHookOptions<CommentQueryMyOperation, CommentQueryVariables>,
505507
) {
506-
const options = { ...defaultOptions, ...baseOptions };
508+
const options =
509+
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
507510
return Apollo.useSuspenseQuery<CommentQueryMyOperation, CommentQueryVariables>(
508511
CommentDocument,
509512
options,
@@ -562,12 +565,15 @@ export function useCurrentUserForProfileLazyQuery(
562565
>(CurrentUserForProfileDocument, options);
563566
}
564567
export function useCurrentUserForProfileSuspenseQuery(
565-
baseOptions?: Apollo.SuspenseQueryHookOptions<
566-
CurrentUserForProfileQueryMyOperation,
567-
CurrentUserForProfileQueryVariables
568-
>,
568+
baseOptions?:
569+
| Apollo.SkipToken
570+
| Apollo.SuspenseQueryHookOptions<
571+
CurrentUserForProfileQueryMyOperation,
572+
CurrentUserForProfileQueryVariables
573+
>,
569574
) {
570-
const options = { ...defaultOptions, ...baseOptions };
575+
const options =
576+
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
571577
return Apollo.useSuspenseQuery<
572578
CurrentUserForProfileQueryMyOperation,
573579
CurrentUserForProfileQueryVariables
@@ -628,9 +634,12 @@ export function useFeedLazyQuery(
628634
return Apollo.useLazyQuery<FeedQueryMyOperation, FeedQueryVariables>(FeedDocument, options);
629635
}
630636
export function useFeedSuspenseQuery(
631-
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQueryMyOperation, FeedQueryVariables>,
637+
baseOptions?:
638+
| Apollo.SkipToken
639+
| Apollo.SuspenseQueryHookOptions<FeedQueryMyOperation, FeedQueryVariables>,
632640
) {
633-
const options = { ...defaultOptions, ...baseOptions };
641+
const options =
642+
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
634643
return Apollo.useSuspenseQuery<FeedQueryMyOperation, FeedQueryVariables>(FeedDocument, options);
635644
}
636645
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;

‎dev-test/githunt/types.reactApollo.hooks.tsx‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -544,9 +544,12 @@ export function useCommentLazyQuery(
544544
return Apollo.useLazyQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
545545
}
546546
export function useCommentSuspenseQuery(
547-
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
547+
baseOptions?:
548+
| Apollo.SkipToken
549+
| Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
548550
) {
549-
const options = { ...defaultOptions, ...baseOptions };
551+
const options =
552+
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
550553
return Apollo.useSuspenseQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
551554
}
552555
export type CommentQueryHookResult = ReturnType<typeof useCommentQuery>;
@@ -602,12 +605,15 @@ export function useCurrentUserForProfileLazyQuery(
602605
);
603606
}
604607
export function useCurrentUserForProfileSuspenseQuery(
605-
baseOptions?: Apollo.SuspenseQueryHookOptions<
606-
CurrentUserForProfileQuery,
607-
CurrentUserForProfileQueryVariables
608-
>,
608+
baseOptions?:
609+
| Apollo.SkipToken
610+
| Apollo.SuspenseQueryHookOptions<
611+
CurrentUserForProfileQuery,
612+
CurrentUserForProfileQueryVariables
613+
>,
609614
) {
610-
const options = { ...defaultOptions, ...baseOptions };
615+
const options =
616+
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
611617
return Apollo.useSuspenseQuery<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
612618
CurrentUserForProfileDocument,
613619
options,
@@ -668,9 +674,10 @@ export function useFeedLazyQuery(
668674
return Apollo.useLazyQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
669675
}
670676
export function useFeedSuspenseQuery(
671-
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
677+
baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
672678
) {
673-
const options = { ...defaultOptions, ...baseOptions };
679+
const options =
680+
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
674681
return Apollo.useSuspenseQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
675682
}
676683
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;

‎dev-test/githunt/types.reactApollo.preResolveTypes.tsx‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -498,9 +498,12 @@ export function useCommentLazyQuery(
498498
return Apollo.useLazyQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
499499
}
500500
export function useCommentSuspenseQuery(
501-
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
501+
baseOptions?:
502+
| Apollo.SkipToken
503+
| Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
502504
) {
503-
const options = { ...defaultOptions, ...baseOptions };
505+
const options =
506+
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
504507
return Apollo.useSuspenseQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
505508
}
506509
export type CommentQueryHookResult = ReturnType<typeof useCommentQuery>;
@@ -556,12 +559,15 @@ export function useCurrentUserForProfileLazyQuery(
556559
);
557560
}
558561
export function useCurrentUserForProfileSuspenseQuery(
559-
baseOptions?: Apollo.SuspenseQueryHookOptions<
560-
CurrentUserForProfileQuery,
561-
CurrentUserForProfileQueryVariables
562-
>,
562+
baseOptions?:
563+
| Apollo.SkipToken
564+
| Apollo.SuspenseQueryHookOptions<
565+
CurrentUserForProfileQuery,
566+
CurrentUserForProfileQueryVariables
567+
>,
563568
) {
564-
const options = { ...defaultOptions, ...baseOptions };
569+
const options =
570+
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
565571
return Apollo.useSuspenseQuery<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
566572
CurrentUserForProfileDocument,
567573
options,
@@ -622,9 +628,10 @@ export function useFeedLazyQuery(
622628
return Apollo.useLazyQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
623629
}
624630
export function useFeedSuspenseQuery(
625-
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
631+
baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
626632
) {
627-
const options = { ...defaultOptions, ...baseOptions };
633+
const options =
634+
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
628635
return Apollo.useSuspenseQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
629636
}
630637
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;

‎dev-test/githunt/types.reactApollo.tsx‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -498,9 +498,12 @@ export function useCommentLazyQuery(
498498
return Apollo.useLazyQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
499499
}
500500
export function useCommentSuspenseQuery(
501-
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
501+
baseOptions?:
502+
| Apollo.SkipToken
503+
| Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
502504
) {
503-
const options = { ...defaultOptions, ...baseOptions };
505+
const options =
506+
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
504507
return Apollo.useSuspenseQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
505508
}
506509
export type CommentQueryHookResult = ReturnType<typeof useCommentQuery>;
@@ -556,12 +559,15 @@ export function useCurrentUserForProfileLazyQuery(
556559
);
557560
}
558561
export function useCurrentUserForProfileSuspenseQuery(
559-
baseOptions?: Apollo.SuspenseQueryHookOptions<
560-
CurrentUserForProfileQuery,
561-
CurrentUserForProfileQueryVariables
562-
>,
562+
baseOptions?:
563+
| Apollo.SkipToken
564+
| Apollo.SuspenseQueryHookOptions<
565+
CurrentUserForProfileQuery,
566+
CurrentUserForProfileQueryVariables
567+
>,
563568
) {
564-
const options = { ...defaultOptions, ...baseOptions };
569+
const options =
570+
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
565571
return Apollo.useSuspenseQuery<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
566572
CurrentUserForProfileDocument,
567573
options,
@@ -622,9 +628,10 @@ export function useFeedLazyQuery(
622628
return Apollo.useLazyQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
623629
}
624630
export function useFeedSuspenseQuery(
625-
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
631+
baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
626632
) {
627-
const options = { ...defaultOptions, ...baseOptions };
633+
const options =
634+
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
628635
return Apollo.useSuspenseQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
629636
}
630637
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;

‎dev-test/githunt/types.reactApollo.v2.tsx‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -502,9 +502,14 @@ export function useCommentLazyQuery(
502502
);
503503
}
504504
export function useCommentSuspenseQuery(
505-
baseOptions?: ApolloReactHooks.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
505+
baseOptions?:
506+
| ApolloReactHooks.SkipToken
507+
| ApolloReactHooks.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
506508
) {
507-
const options = { ...defaultOptions, ...baseOptions };
509+
const options =
510+
baseOptions === ApolloReactHooks.skipToken
511+
? baseOptions
512+
: { ...defaultOptions, ...baseOptions };
508513
return ApolloReactHooks.useSuspenseQuery<CommentQuery, CommentQueryVariables>(
509514
CommentDocument,
510515
options,
@@ -563,12 +568,17 @@ export function useCurrentUserForProfileLazyQuery(
563568
>(CurrentUserForProfileDocument, options);
564569
}
565570
export function useCurrentUserForProfileSuspenseQuery(
566-
baseOptions?: ApolloReactHooks.SuspenseQueryHookOptions<
567-
CurrentUserForProfileQuery,
568-
CurrentUserForProfileQueryVariables
569-
>,
571+
baseOptions?:
572+
| ApolloReactHooks.SkipToken
573+
| ApolloReactHooks.SuspenseQueryHookOptions<
574+
CurrentUserForProfileQuery,
575+
CurrentUserForProfileQueryVariables
576+
>,
570577
) {
571-
const options = { ...defaultOptions, ...baseOptions };
578+
const options =
579+
baseOptions === ApolloReactHooks.skipToken
580+
? baseOptions
581+
: { ...defaultOptions, ...baseOptions };
572582
return ApolloReactHooks.useSuspenseQuery<
573583
CurrentUserForProfileQuery,
574584
CurrentUserForProfileQueryVariables
@@ -629,9 +639,14 @@ export function useFeedLazyQuery(
629639
return ApolloReactHooks.useLazyQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
630640
}
631641
export function useFeedSuspenseQuery(
632-
baseOptions?: ApolloReactHooks.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
642+
baseOptions?:
643+
| ApolloReactHooks.SkipToken
644+
| ApolloReactHooks.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
633645
) {
634-
const options = { ...defaultOptions, ...baseOptions };
646+
const options =
647+
baseOptions === ApolloReactHooks.skipToken
648+
? baseOptions
649+
: { ...defaultOptions, ...baseOptions };
635650
return ApolloReactHooks.useSuspenseQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
636651
}
637652
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;

‎dev-test/star-wars/__generated__/HeroAndFriendsNames.tsx‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev-test/star-wars/__generated__/HeroAppearsIn.tsx‎

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev-test/star-wars/__generated__/HeroDetails.tsx‎

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev-test/star-wars/__generated__/HeroDetailsWithFragment.tsx‎

Lines changed: 8 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)