Skip to content

Commit b5986a5

Browse files
author
Max van der Stam
committed
Revert "feat(typescript-react-apollo): support skip token for useSuspenseQuery (dotansimha#835)"
This reverts commit ea83cf4.
1 parent 9b5eee4 commit b5986a5

20 files changed

+155
-257
lines changed

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

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -501,12 +501,9 @@ export function useCommentLazyQuery(
501501
);
502502
}
503503
export function useCommentSuspenseQuery(
504-
baseOptions?:
505-
| Apollo.SkipToken
506-
| Apollo.SuspenseQueryHookOptions<CommentQueryMyOperation, CommentQueryVariables>,
504+
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQueryMyOperation, CommentQueryVariables>,
507505
) {
508-
const options =
509-
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
506+
const options = { ...defaultOptions, ...baseOptions };
510507
return Apollo.useSuspenseQuery<CommentQueryMyOperation, CommentQueryVariables>(
511508
CommentDocument,
512509
options,
@@ -565,15 +562,12 @@ export function useCurrentUserForProfileLazyQuery(
565562
>(CurrentUserForProfileDocument, options);
566563
}
567564
export function useCurrentUserForProfileSuspenseQuery(
568-
baseOptions?:
569-
| Apollo.SkipToken
570-
| Apollo.SuspenseQueryHookOptions<
571-
CurrentUserForProfileQueryMyOperation,
572-
CurrentUserForProfileQueryVariables
573-
>,
565+
baseOptions?: Apollo.SuspenseQueryHookOptions<
566+
CurrentUserForProfileQueryMyOperation,
567+
CurrentUserForProfileQueryVariables
568+
>,
574569
) {
575-
const options =
576-
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
570+
const options = { ...defaultOptions, ...baseOptions };
577571
return Apollo.useSuspenseQuery<
578572
CurrentUserForProfileQueryMyOperation,
579573
CurrentUserForProfileQueryVariables
@@ -634,12 +628,9 @@ export function useFeedLazyQuery(
634628
return Apollo.useLazyQuery<FeedQueryMyOperation, FeedQueryVariables>(FeedDocument, options);
635629
}
636630
export function useFeedSuspenseQuery(
637-
baseOptions?:
638-
| Apollo.SkipToken
639-
| Apollo.SuspenseQueryHookOptions<FeedQueryMyOperation, FeedQueryVariables>,
631+
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQueryMyOperation, FeedQueryVariables>,
640632
) {
641-
const options =
642-
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
633+
const options = { ...defaultOptions, ...baseOptions };
643634
return Apollo.useSuspenseQuery<FeedQueryMyOperation, FeedQueryVariables>(FeedDocument, options);
644635
}
645636
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;

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

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -544,12 +544,9 @@ export function useCommentLazyQuery(
544544
return Apollo.useLazyQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
545545
}
546546
export function useCommentSuspenseQuery(
547-
baseOptions?:
548-
| Apollo.SkipToken
549-
| Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
547+
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
550548
) {
551-
const options =
552-
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
549+
const options = { ...defaultOptions, ...baseOptions };
553550
return Apollo.useSuspenseQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
554551
}
555552
export type CommentQueryHookResult = ReturnType<typeof useCommentQuery>;
@@ -605,15 +602,12 @@ export function useCurrentUserForProfileLazyQuery(
605602
);
606603
}
607604
export function useCurrentUserForProfileSuspenseQuery(
608-
baseOptions?:
609-
| Apollo.SkipToken
610-
| Apollo.SuspenseQueryHookOptions<
611-
CurrentUserForProfileQuery,
612-
CurrentUserForProfileQueryVariables
613-
>,
605+
baseOptions?: Apollo.SuspenseQueryHookOptions<
606+
CurrentUserForProfileQuery,
607+
CurrentUserForProfileQueryVariables
608+
>,
614609
) {
615-
const options =
616-
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
610+
const options = { ...defaultOptions, ...baseOptions };
617611
return Apollo.useSuspenseQuery<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
618612
CurrentUserForProfileDocument,
619613
options,
@@ -674,10 +668,9 @@ export function useFeedLazyQuery(
674668
return Apollo.useLazyQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
675669
}
676670
export function useFeedSuspenseQuery(
677-
baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
671+
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
678672
) {
679-
const options =
680-
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
673+
const options = { ...defaultOptions, ...baseOptions };
681674
return Apollo.useSuspenseQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
682675
}
683676
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;

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

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -498,12 +498,9 @@ export function useCommentLazyQuery(
498498
return Apollo.useLazyQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
499499
}
500500
export function useCommentSuspenseQuery(
501-
baseOptions?:
502-
| Apollo.SkipToken
503-
| Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
501+
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
504502
) {
505-
const options =
506-
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
503+
const options = { ...defaultOptions, ...baseOptions };
507504
return Apollo.useSuspenseQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
508505
}
509506
export type CommentQueryHookResult = ReturnType<typeof useCommentQuery>;
@@ -559,15 +556,12 @@ export function useCurrentUserForProfileLazyQuery(
559556
);
560557
}
561558
export function useCurrentUserForProfileSuspenseQuery(
562-
baseOptions?:
563-
| Apollo.SkipToken
564-
| Apollo.SuspenseQueryHookOptions<
565-
CurrentUserForProfileQuery,
566-
CurrentUserForProfileQueryVariables
567-
>,
559+
baseOptions?: Apollo.SuspenseQueryHookOptions<
560+
CurrentUserForProfileQuery,
561+
CurrentUserForProfileQueryVariables
562+
>,
568563
) {
569-
const options =
570-
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
564+
const options = { ...defaultOptions, ...baseOptions };
571565
return Apollo.useSuspenseQuery<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
572566
CurrentUserForProfileDocument,
573567
options,
@@ -628,10 +622,9 @@ export function useFeedLazyQuery(
628622
return Apollo.useLazyQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
629623
}
630624
export function useFeedSuspenseQuery(
631-
baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
625+
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
632626
) {
633-
const options =
634-
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
627+
const options = { ...defaultOptions, ...baseOptions };
635628
return Apollo.useSuspenseQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
636629
}
637630
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;

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

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -498,12 +498,9 @@ export function useCommentLazyQuery(
498498
return Apollo.useLazyQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
499499
}
500500
export function useCommentSuspenseQuery(
501-
baseOptions?:
502-
| Apollo.SkipToken
503-
| Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
501+
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
504502
) {
505-
const options =
506-
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
503+
const options = { ...defaultOptions, ...baseOptions };
507504
return Apollo.useSuspenseQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
508505
}
509506
export type CommentQueryHookResult = ReturnType<typeof useCommentQuery>;
@@ -559,15 +556,12 @@ export function useCurrentUserForProfileLazyQuery(
559556
);
560557
}
561558
export function useCurrentUserForProfileSuspenseQuery(
562-
baseOptions?:
563-
| Apollo.SkipToken
564-
| Apollo.SuspenseQueryHookOptions<
565-
CurrentUserForProfileQuery,
566-
CurrentUserForProfileQueryVariables
567-
>,
559+
baseOptions?: Apollo.SuspenseQueryHookOptions<
560+
CurrentUserForProfileQuery,
561+
CurrentUserForProfileQueryVariables
562+
>,
568563
) {
569-
const options =
570-
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
564+
const options = { ...defaultOptions, ...baseOptions };
571565
return Apollo.useSuspenseQuery<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
572566
CurrentUserForProfileDocument,
573567
options,
@@ -628,10 +622,9 @@ export function useFeedLazyQuery(
628622
return Apollo.useLazyQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
629623
}
630624
export function useFeedSuspenseQuery(
631-
baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
625+
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
632626
) {
633-
const options =
634-
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
627+
const options = { ...defaultOptions, ...baseOptions };
635628
return Apollo.useSuspenseQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
636629
}
637630
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;

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

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -502,14 +502,9 @@ export function useCommentLazyQuery(
502502
);
503503
}
504504
export function useCommentSuspenseQuery(
505-
baseOptions?:
506-
| ApolloReactHooks.SkipToken
507-
| ApolloReactHooks.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
505+
baseOptions?: ApolloReactHooks.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
508506
) {
509-
const options =
510-
baseOptions === ApolloReactHooks.skipToken
511-
? baseOptions
512-
: { ...defaultOptions, ...baseOptions };
507+
const options = { ...defaultOptions, ...baseOptions };
513508
return ApolloReactHooks.useSuspenseQuery<CommentQuery, CommentQueryVariables>(
514509
CommentDocument,
515510
options,
@@ -568,17 +563,12 @@ export function useCurrentUserForProfileLazyQuery(
568563
>(CurrentUserForProfileDocument, options);
569564
}
570565
export function useCurrentUserForProfileSuspenseQuery(
571-
baseOptions?:
572-
| ApolloReactHooks.SkipToken
573-
| ApolloReactHooks.SuspenseQueryHookOptions<
574-
CurrentUserForProfileQuery,
575-
CurrentUserForProfileQueryVariables
576-
>,
566+
baseOptions?: ApolloReactHooks.SuspenseQueryHookOptions<
567+
CurrentUserForProfileQuery,
568+
CurrentUserForProfileQueryVariables
569+
>,
577570
) {
578-
const options =
579-
baseOptions === ApolloReactHooks.skipToken
580-
? baseOptions
581-
: { ...defaultOptions, ...baseOptions };
571+
const options = { ...defaultOptions, ...baseOptions };
582572
return ApolloReactHooks.useSuspenseQuery<
583573
CurrentUserForProfileQuery,
584574
CurrentUserForProfileQueryVariables
@@ -639,14 +629,9 @@ export function useFeedLazyQuery(
639629
return ApolloReactHooks.useLazyQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
640630
}
641631
export function useFeedSuspenseQuery(
642-
baseOptions?:
643-
| ApolloReactHooks.SkipToken
644-
| ApolloReactHooks.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
632+
baseOptions?: ApolloReactHooks.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
645633
) {
646-
const options =
647-
baseOptions === ApolloReactHooks.skipToken
648-
? baseOptions
649-
: { ...defaultOptions, ...baseOptions };
634+
const options = { ...defaultOptions, ...baseOptions };
650635
return ApolloReactHooks.useSuspenseQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
651636
}
652637
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: 2 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__/HeroDetails.tsx‎

Lines changed: 2 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__/HeroDetailsWithFragment.tsx‎

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

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

Lines changed: 2 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)