diff --git a/dev-test/githunt/types.reactApollo.customSuffix.tsx b/dev-test/githunt/types.reactApollo.customSuffix.tsx index 9e9520f49..a8e7ed9a0 100644 --- a/dev-test/githunt/types.reactApollo.customSuffix.tsx +++ b/dev-test/githunt/types.reactApollo.customSuffix.tsx @@ -501,12 +501,9 @@ export function useCommentLazyQuery( ); } export function useCommentSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery( CommentDocument, options, @@ -565,15 +562,12 @@ export function useCurrentUserForProfileLazyQuery( >(CurrentUserForProfileDocument, options); } export function useCurrentUserForProfileSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions< - CurrentUserForProfileQueryMyOperation, - CurrentUserForProfileQueryVariables - >, + baseOptions?: Apollo.SuspenseQueryHookOptions< + CurrentUserForProfileQueryMyOperation, + CurrentUserForProfileQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery< CurrentUserForProfileQueryMyOperation, CurrentUserForProfileQueryVariables @@ -634,12 +628,9 @@ export function useFeedLazyQuery( return Apollo.useLazyQuery(FeedDocument, options); } export function useFeedSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery(FeedDocument, options); } export type FeedQueryHookResult = ReturnType; diff --git a/dev-test/githunt/types.reactApollo.hooks.tsx b/dev-test/githunt/types.reactApollo.hooks.tsx index 4212db745..d26973a7e 100644 --- a/dev-test/githunt/types.reactApollo.hooks.tsx +++ b/dev-test/githunt/types.reactApollo.hooks.tsx @@ -544,12 +544,9 @@ export function useCommentLazyQuery( return Apollo.useLazyQuery(CommentDocument, options); } export function useCommentSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery(CommentDocument, options); } export type CommentQueryHookResult = ReturnType; @@ -605,15 +602,12 @@ export function useCurrentUserForProfileLazyQuery( ); } export function useCurrentUserForProfileSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions< - CurrentUserForProfileQuery, - CurrentUserForProfileQueryVariables - >, + baseOptions?: Apollo.SuspenseQueryHookOptions< + CurrentUserForProfileQuery, + CurrentUserForProfileQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery( CurrentUserForProfileDocument, options, @@ -674,10 +668,9 @@ export function useFeedLazyQuery( return Apollo.useLazyQuery(FeedDocument, options); } export function useFeedSuspenseQuery( - baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery(FeedDocument, options); } export type FeedQueryHookResult = ReturnType; diff --git a/dev-test/githunt/types.reactApollo.preResolveTypes.tsx b/dev-test/githunt/types.reactApollo.preResolveTypes.tsx index 5a9956e3e..06ba7df32 100644 --- a/dev-test/githunt/types.reactApollo.preResolveTypes.tsx +++ b/dev-test/githunt/types.reactApollo.preResolveTypes.tsx @@ -498,12 +498,9 @@ export function useCommentLazyQuery( return Apollo.useLazyQuery(CommentDocument, options); } export function useCommentSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery(CommentDocument, options); } export type CommentQueryHookResult = ReturnType; @@ -559,15 +556,12 @@ export function useCurrentUserForProfileLazyQuery( ); } export function useCurrentUserForProfileSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions< - CurrentUserForProfileQuery, - CurrentUserForProfileQueryVariables - >, + baseOptions?: Apollo.SuspenseQueryHookOptions< + CurrentUserForProfileQuery, + CurrentUserForProfileQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery( CurrentUserForProfileDocument, options, @@ -628,10 +622,9 @@ export function useFeedLazyQuery( return Apollo.useLazyQuery(FeedDocument, options); } export function useFeedSuspenseQuery( - baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery(FeedDocument, options); } export type FeedQueryHookResult = ReturnType; diff --git a/dev-test/githunt/types.reactApollo.tsx b/dev-test/githunt/types.reactApollo.tsx index 5a9956e3e..06ba7df32 100644 --- a/dev-test/githunt/types.reactApollo.tsx +++ b/dev-test/githunt/types.reactApollo.tsx @@ -498,12 +498,9 @@ export function useCommentLazyQuery( return Apollo.useLazyQuery(CommentDocument, options); } export function useCommentSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery(CommentDocument, options); } export type CommentQueryHookResult = ReturnType; @@ -559,15 +556,12 @@ export function useCurrentUserForProfileLazyQuery( ); } export function useCurrentUserForProfileSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions< - CurrentUserForProfileQuery, - CurrentUserForProfileQueryVariables - >, + baseOptions?: Apollo.SuspenseQueryHookOptions< + CurrentUserForProfileQuery, + CurrentUserForProfileQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery( CurrentUserForProfileDocument, options, @@ -628,10 +622,9 @@ export function useFeedLazyQuery( return Apollo.useLazyQuery(FeedDocument, options); } export function useFeedSuspenseQuery( - baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery(FeedDocument, options); } export type FeedQueryHookResult = ReturnType; diff --git a/dev-test/githunt/types.reactApollo.v2.tsx b/dev-test/githunt/types.reactApollo.v2.tsx index 977261f5f..d601cd4c5 100644 --- a/dev-test/githunt/types.reactApollo.v2.tsx +++ b/dev-test/githunt/types.reactApollo.v2.tsx @@ -502,14 +502,9 @@ export function useCommentLazyQuery( ); } export function useCommentSuspenseQuery( - baseOptions?: - | ApolloReactHooks.SkipToken - | ApolloReactHooks.SuspenseQueryHookOptions, + baseOptions?: ApolloReactHooks.SuspenseQueryHookOptions, ) { - const options = - baseOptions === ApolloReactHooks.skipToken - ? baseOptions - : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return ApolloReactHooks.useSuspenseQuery( CommentDocument, options, @@ -568,17 +563,12 @@ export function useCurrentUserForProfileLazyQuery( >(CurrentUserForProfileDocument, options); } export function useCurrentUserForProfileSuspenseQuery( - baseOptions?: - | ApolloReactHooks.SkipToken - | ApolloReactHooks.SuspenseQueryHookOptions< - CurrentUserForProfileQuery, - CurrentUserForProfileQueryVariables - >, + baseOptions?: ApolloReactHooks.SuspenseQueryHookOptions< + CurrentUserForProfileQuery, + CurrentUserForProfileQueryVariables + >, ) { - const options = - baseOptions === ApolloReactHooks.skipToken - ? baseOptions - : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return ApolloReactHooks.useSuspenseQuery< CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables @@ -639,14 +629,9 @@ export function useFeedLazyQuery( return ApolloReactHooks.useLazyQuery(FeedDocument, options); } export function useFeedSuspenseQuery( - baseOptions?: - | ApolloReactHooks.SkipToken - | ApolloReactHooks.SuspenseQueryHookOptions, + baseOptions?: ApolloReactHooks.SuspenseQueryHookOptions, ) { - const options = - baseOptions === ApolloReactHooks.skipToken - ? baseOptions - : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return ApolloReactHooks.useSuspenseQuery(FeedDocument, options); } export type FeedQueryHookResult = ReturnType; diff --git a/dev-test/star-wars/__generated__/HeroAndFriendsNames.tsx b/dev-test/star-wars/__generated__/HeroAndFriendsNames.tsx index 19e57573b..56897ff38 100644 --- a/dev-test/star-wars/__generated__/HeroAndFriendsNames.tsx +++ b/dev-test/star-wars/__generated__/HeroAndFriendsNames.tsx @@ -79,12 +79,12 @@ export function useHeroAndFriendsNamesLazyQuery( ); } export function useHeroAndFriendsNamesSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions< + HeroAndFriendsNamesQuery, + HeroAndFriendsNamesQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery( HeroAndFriendsNamesDocument, options, diff --git a/dev-test/star-wars/__generated__/HeroAppearsIn.tsx b/dev-test/star-wars/__generated__/HeroAppearsIn.tsx index 682368d87..2936042c6 100644 --- a/dev-test/star-wars/__generated__/HeroAppearsIn.tsx +++ b/dev-test/star-wars/__generated__/HeroAppearsIn.tsx @@ -56,12 +56,9 @@ export function useHeroAppearsInLazyQuery( ); } export function useHeroAppearsInSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery( HeroAppearsInDocument, options, diff --git a/dev-test/star-wars/__generated__/HeroDetails.tsx b/dev-test/star-wars/__generated__/HeroDetails.tsx index dd302c5a7..9a57ccf0b 100644 --- a/dev-test/star-wars/__generated__/HeroDetails.tsx +++ b/dev-test/star-wars/__generated__/HeroDetails.tsx @@ -61,12 +61,9 @@ export function useHeroDetailsLazyQuery( ); } export function useHeroDetailsSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery( HeroDetailsDocument, options, diff --git a/dev-test/star-wars/__generated__/HeroDetailsWithFragment.tsx b/dev-test/star-wars/__generated__/HeroDetailsWithFragment.tsx index 076637432..451616bed 100644 --- a/dev-test/star-wars/__generated__/HeroDetailsWithFragment.tsx +++ b/dev-test/star-wars/__generated__/HeroDetailsWithFragment.tsx @@ -66,15 +66,12 @@ export function useHeroDetailsWithFragmentLazyQuery( ); } export function useHeroDetailsWithFragmentSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions< - HeroDetailsWithFragmentQuery, - HeroDetailsWithFragmentQueryVariables - >, + baseOptions?: Apollo.SuspenseQueryHookOptions< + HeroDetailsWithFragmentQuery, + HeroDetailsWithFragmentQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery< HeroDetailsWithFragmentQuery, HeroDetailsWithFragmentQueryVariables diff --git a/dev-test/star-wars/__generated__/HeroName.tsx b/dev-test/star-wars/__generated__/HeroName.tsx index 86b2fe10a..984f5581e 100644 --- a/dev-test/star-wars/__generated__/HeroName.tsx +++ b/dev-test/star-wars/__generated__/HeroName.tsx @@ -49,12 +49,9 @@ export function useHeroNameLazyQuery( return Apollo.useLazyQuery(HeroNameDocument, options); } export function useHeroNameSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery(HeroNameDocument, options); } export type HeroNameQueryHookResult = ReturnType; diff --git a/dev-test/star-wars/__generated__/HeroNameConditional.tsx b/dev-test/star-wars/__generated__/HeroNameConditional.tsx index 2255e0e25..00df11e9c 100644 --- a/dev-test/star-wars/__generated__/HeroNameConditional.tsx +++ b/dev-test/star-wars/__generated__/HeroNameConditional.tsx @@ -74,15 +74,12 @@ export function useHeroNameConditionalInclusionLazyQuery( >(HeroNameConditionalInclusionDocument, options); } export function useHeroNameConditionalInclusionSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions< - HeroNameConditionalInclusionQuery, - HeroNameConditionalInclusionQueryVariables - >, + baseOptions?: Apollo.SuspenseQueryHookOptions< + HeroNameConditionalInclusionQuery, + HeroNameConditionalInclusionQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery< HeroNameConditionalInclusionQuery, HeroNameConditionalInclusionQueryVariables @@ -152,15 +149,12 @@ export function useHeroNameConditionalExclusionLazyQuery( >(HeroNameConditionalExclusionDocument, options); } export function useHeroNameConditionalExclusionSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions< - HeroNameConditionalExclusionQuery, - HeroNameConditionalExclusionQueryVariables - >, + baseOptions?: Apollo.SuspenseQueryHookOptions< + HeroNameConditionalExclusionQuery, + HeroNameConditionalExclusionQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery< HeroNameConditionalExclusionQuery, HeroNameConditionalExclusionQueryVariables diff --git a/dev-test/star-wars/__generated__/HeroParentTypeDependentField.tsx b/dev-test/star-wars/__generated__/HeroParentTypeDependentField.tsx index 768f2af5a..37ae1d3a7 100644 --- a/dev-test/star-wars/__generated__/HeroParentTypeDependentField.tsx +++ b/dev-test/star-wars/__generated__/HeroParentTypeDependentField.tsx @@ -96,15 +96,12 @@ export function useHeroParentTypeDependentFieldLazyQuery( >(HeroParentTypeDependentFieldDocument, options); } export function useHeroParentTypeDependentFieldSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions< - HeroParentTypeDependentFieldQuery, - HeroParentTypeDependentFieldQueryVariables - >, + baseOptions?: Apollo.SuspenseQueryHookOptions< + HeroParentTypeDependentFieldQuery, + HeroParentTypeDependentFieldQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery< HeroParentTypeDependentFieldQuery, HeroParentTypeDependentFieldQueryVariables diff --git a/dev-test/star-wars/__generated__/HeroTypeDependentAliasedField.tsx b/dev-test/star-wars/__generated__/HeroTypeDependentAliasedField.tsx index c57b6057f..109b6e56a 100644 --- a/dev-test/star-wars/__generated__/HeroTypeDependentAliasedField.tsx +++ b/dev-test/star-wars/__generated__/HeroTypeDependentAliasedField.tsx @@ -69,15 +69,12 @@ export function useHeroTypeDependentAliasedFieldLazyQuery( >(HeroTypeDependentAliasedFieldDocument, options); } export function useHeroTypeDependentAliasedFieldSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions< - HeroTypeDependentAliasedFieldQuery, - HeroTypeDependentAliasedFieldQueryVariables - >, + baseOptions?: Apollo.SuspenseQueryHookOptions< + HeroTypeDependentAliasedFieldQuery, + HeroTypeDependentAliasedFieldQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery< HeroTypeDependentAliasedFieldQuery, HeroTypeDependentAliasedFieldQueryVariables diff --git a/dev-test/star-wars/__generated__/HumanWithNullWeight.tsx b/dev-test/star-wars/__generated__/HumanWithNullWeight.tsx index 337dc6182..58a581582 100644 --- a/dev-test/star-wars/__generated__/HumanWithNullWeight.tsx +++ b/dev-test/star-wars/__generated__/HumanWithNullWeight.tsx @@ -60,12 +60,12 @@ export function useHumanWithNullHeightLazyQuery( ); } export function useHumanWithNullHeightSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions< + HumanWithNullHeightQuery, + HumanWithNullHeightQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery( HumanWithNullHeightDocument, options, diff --git a/dev-test/star-wars/__generated__/TwoHeroes.tsx b/dev-test/star-wars/__generated__/TwoHeroes.tsx index 207194163..0de6ee8cf 100644 --- a/dev-test/star-wars/__generated__/TwoHeroes.tsx +++ b/dev-test/star-wars/__generated__/TwoHeroes.tsx @@ -50,12 +50,9 @@ export function useTwoHeroesLazyQuery( return Apollo.useLazyQuery(TwoHeroesDocument, options); } export function useTwoHeroesSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery( TwoHeroesDocument, options, diff --git a/dev-test/star-wars/types.refetchFn.tsx b/dev-test/star-wars/types.refetchFn.tsx index 32c933adb..250f84830 100644 --- a/dev-test/star-wars/types.refetchFn.tsx +++ b/dev-test/star-wars/types.refetchFn.tsx @@ -363,12 +363,12 @@ export function useHeroAndFriendsNamesLazyQuery( ); } export function useHeroAndFriendsNamesSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions< + HeroAndFriendsNamesQuery, + HeroAndFriendsNamesQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery( HeroAndFriendsNamesDocument, options, @@ -431,12 +431,9 @@ export function useHeroAppearsInLazyQuery( ); } export function useHeroAppearsInSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery( HeroAppearsInDocument, options, @@ -498,12 +495,9 @@ export function useHeroDetailsLazyQuery( ); } export function useHeroDetailsSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery( HeroDetailsDocument, options, @@ -569,15 +563,12 @@ export function useHeroDetailsWithFragmentLazyQuery( ); } export function useHeroDetailsWithFragmentSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions< - HeroDetailsWithFragmentQuery, - HeroDetailsWithFragmentQueryVariables - >, + baseOptions?: Apollo.SuspenseQueryHookOptions< + HeroDetailsWithFragmentQuery, + HeroDetailsWithFragmentQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery< HeroDetailsWithFragmentQuery, HeroDetailsWithFragmentQueryVariables @@ -638,12 +629,9 @@ export function useHeroNameLazyQuery( return Apollo.useLazyQuery(HeroNameDocument, options); } export function useHeroNameSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery(HeroNameDocument, options); } export type HeroNameQueryHookResult = ReturnType; @@ -704,15 +692,12 @@ export function useHeroNameConditionalInclusionLazyQuery( >(HeroNameConditionalInclusionDocument, options); } export function useHeroNameConditionalInclusionSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions< - HeroNameConditionalInclusionQuery, - HeroNameConditionalInclusionQueryVariables - >, + baseOptions?: Apollo.SuspenseQueryHookOptions< + HeroNameConditionalInclusionQuery, + HeroNameConditionalInclusionQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery< HeroNameConditionalInclusionQuery, HeroNameConditionalInclusionQueryVariables @@ -787,15 +772,12 @@ export function useHeroNameConditionalExclusionLazyQuery( >(HeroNameConditionalExclusionDocument, options); } export function useHeroNameConditionalExclusionSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions< - HeroNameConditionalExclusionQuery, - HeroNameConditionalExclusionQueryVariables - >, + baseOptions?: Apollo.SuspenseQueryHookOptions< + HeroNameConditionalExclusionQuery, + HeroNameConditionalExclusionQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery< HeroNameConditionalExclusionQuery, HeroNameConditionalExclusionQueryVariables @@ -884,15 +866,12 @@ export function useHeroParentTypeDependentFieldLazyQuery( >(HeroParentTypeDependentFieldDocument, options); } export function useHeroParentTypeDependentFieldSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions< - HeroParentTypeDependentFieldQuery, - HeroParentTypeDependentFieldQueryVariables - >, + baseOptions?: Apollo.SuspenseQueryHookOptions< + HeroParentTypeDependentFieldQuery, + HeroParentTypeDependentFieldQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery< HeroParentTypeDependentFieldQuery, HeroParentTypeDependentFieldQueryVariables @@ -970,15 +949,12 @@ export function useHeroTypeDependentAliasedFieldLazyQuery( >(HeroTypeDependentAliasedFieldDocument, options); } export function useHeroTypeDependentAliasedFieldSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions< - HeroTypeDependentAliasedFieldQuery, - HeroTypeDependentAliasedFieldQueryVariables - >, + baseOptions?: Apollo.SuspenseQueryHookOptions< + HeroTypeDependentAliasedFieldQuery, + HeroTypeDependentAliasedFieldQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery< HeroTypeDependentAliasedFieldQuery, HeroTypeDependentAliasedFieldQueryVariables @@ -1051,12 +1027,12 @@ export function useHumanWithNullHeightLazyQuery( ); } export function useHumanWithNullHeightSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions< + HumanWithNullHeightQuery, + HumanWithNullHeightQueryVariables + >, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery( HumanWithNullHeightDocument, options, @@ -1115,12 +1091,9 @@ export function useTwoHeroesLazyQuery( return Apollo.useLazyQuery(TwoHeroesDocument, options); } export function useTwoHeroesSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery( TwoHeroesDocument, options, diff --git a/dev-test/test-message/types.tsx b/dev-test/test-message/types.tsx index 84f13e6cf..f665857ba 100644 --- a/dev-test/test-message/types.tsx +++ b/dev-test/test-message/types.tsx @@ -141,12 +141,9 @@ export function useGetMessagesLazyQuery( ); } export function useGetMessagesSuspenseQuery( - baseOptions?: - | Apollo.SkipToken - | Apollo.SuspenseQueryHookOptions, + baseOptions?: Apollo.SuspenseQueryHookOptions, ) { - const options = - baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions }; + const options = { ...defaultOptions, ...baseOptions }; return Apollo.useSuspenseQuery( Operations.GetMessages, options, diff --git a/packages/plugins/typescript/react-apollo/src/visitor.ts b/packages/plugins/typescript/react-apollo/src/visitor.ts index 7ffd85477..fd37552c1 100644 --- a/packages/plugins/typescript/react-apollo/src/visitor.ts +++ b/packages/plugins/typescript/react-apollo/src/visitor.ts @@ -436,8 +436,8 @@ export class ReactApolloVisitor extends ClientSideBaseVisitor< }) + this.config.hooksSuffix; hookFns.push( - `export function use${suspenseOperationName}(baseOptions?: ${this.getApolloReactHooksIdentifier()}.SkipToken | ${this.getApolloReactHooksIdentifier()}.SuspenseQueryHookOptions<${operationResultType}, ${operationVariablesTypes}>) { - const options = baseOptions === ${this.getApolloReactHooksIdentifier()}.skipToken ? baseOptions : {...defaultOptions, ...baseOptions} + `export function use${suspenseOperationName}(baseOptions?: ${this.getApolloReactHooksIdentifier()}.SuspenseQueryHookOptions<${operationResultType}, ${operationVariablesTypes}>) { + const options = {...defaultOptions, ...baseOptions} return ${this.getApolloReactHooksIdentifier()}.useSuspenseQuery<${operationResultType}, ${operationVariablesTypes}>(${this.getDocumentNodeVariable( node, documentVariableName, diff --git a/packages/plugins/typescript/react-apollo/tests/__snapshots__/react-apollo.spec.ts.snap b/packages/plugins/typescript/react-apollo/tests/__snapshots__/react-apollo.spec.ts.snap index b1b88a44d..a1d3de1ce 100644 --- a/packages/plugins/typescript/react-apollo/tests/__snapshots__/react-apollo.spec.ts.snap +++ b/packages/plugins/typescript/react-apollo/tests/__snapshots__/react-apollo.spec.ts.snap @@ -190,8 +190,8 @@ export function useGet_SomethingLazyQuery(baseOptions?: Apollo.LazyQueryHookOpti const options = {...defaultOptions, ...baseOptions} return Apollo.useLazyQuery(Get_SomethingDocument, options); } -export function useGet_SomethingSuspenseQuery(baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions) { - const options = baseOptions === Apollo.skipToken ? baseOptions : {...defaultOptions, ...baseOptions} +export function useGet_SomethingSuspenseQuery(baseOptions?: Apollo.SuspenseQueryHookOptions) { + const options = {...defaultOptions, ...baseOptions} return Apollo.useSuspenseQuery(Get_SomethingDocument, options); } export type Get_SomethingQueryHookResult = ReturnType; @@ -390,8 +390,8 @@ export function useGet_SomethingLazyQuery(baseOptions?: Apollo.LazyQueryHookOpti const options = {...defaultOptions, ...baseOptions} return Apollo.useLazyQuery(Get_SomethingDocument, options); } -export function useGet_SomethingSuspenseQuery(baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions) { - const options = baseOptions === Apollo.skipToken ? baseOptions : {...defaultOptions, ...baseOptions} +export function useGet_SomethingSuspenseQuery(baseOptions?: Apollo.SuspenseQueryHookOptions) { + const options = {...defaultOptions, ...baseOptions} return Apollo.useSuspenseQuery(Get_SomethingDocument, options); } export type Get_SomethingQueryHookResult = ReturnType; @@ -590,8 +590,8 @@ export function useGetSomethingLazyQuery(baseOptions?: Apollo.LazyQueryHookOptio const options = {...defaultOptions, ...baseOptions} return Apollo.useLazyQuery(GetSomethingDocument, options); } -export function useGetSomethingSuspenseQuery(baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions) { - const options = baseOptions === Apollo.skipToken ? baseOptions : {...defaultOptions, ...baseOptions} +export function useGetSomethingSuspenseQuery(baseOptions?: Apollo.SuspenseQueryHookOptions) { + const options = {...defaultOptions, ...baseOptions} return Apollo.useSuspenseQuery(GetSomethingDocument, options); } export type GetSomethingQueryHookResult = ReturnType; @@ -790,8 +790,8 @@ export function useGetSomethingLazyQuery(baseOptions?: Apollo.LazyQueryHookOptio const options = {...defaultOptions, ...baseOptions} return Apollo.useLazyQuery(GetSomethingDocument, options); } -export function useGetSomethingSuspenseQuery(baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions) { - const options = baseOptions === Apollo.skipToken ? baseOptions : {...defaultOptions, ...baseOptions} +export function useGetSomethingSuspenseQuery(baseOptions?: Apollo.SuspenseQueryHookOptions) { + const options = {...defaultOptions, ...baseOptions} return Apollo.useSuspenseQuery(GetSomethingDocument, options); } export type GetSomethingQueryHookResult = ReturnType; diff --git a/packages/plugins/typescript/react-apollo/tests/react-apollo.spec.ts b/packages/plugins/typescript/react-apollo/tests/react-apollo.spec.ts index 3e1f76897..753ee6d50 100644 --- a/packages/plugins/typescript/react-apollo/tests/react-apollo.spec.ts +++ b/packages/plugins/typescript/react-apollo/tests/react-apollo.spec.ts @@ -1830,8 +1830,8 @@ export function useListenToCommentsSubscription(baseOptions?: Apollo.Subscriptio )) as Types.ComplexPluginOutput; expect(content.content).toBeSimilarStringTo(` - export function useFeedSuspenseQuery(baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions) { - const options = baseOptions === Apollo.skipToken ? baseOptions : {...defaultOptions, ...baseOptions} + export function useFeedSuspenseQuery(baseOptions?: Apollo.SuspenseQueryHookOptions) { + const options = {...defaultOptions, ...baseOptions} return Apollo.useSuspenseQuery(FeedDocument, options); }`); await validateTypeScript(content, schema, docs, {}); @@ -1898,8 +1898,8 @@ export function useListenToCommentsSubscription(baseOptions?: Apollo.Subscriptio )) as Types.ComplexPluginOutput; expect(content.content).toBeSimilarStringTo(` - export function useFeedSuspenseQueryMySuffix(baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions) { - const options = baseOptions === Apollo.skipToken ? baseOptions : {...defaultOptions, ...baseOptions} + export function useFeedSuspenseQueryMySuffix(baseOptions?: Apollo.SuspenseQueryHookOptions) { + const options = {...defaultOptions, ...baseOptions} return Apollo.useSuspenseQuery(FeedDocument, options); }`); await validateTypeScript(content, schema, docs, {}); @@ -2356,8 +2356,8 @@ export function useListenToCommentsSubscription(baseOptions?: Apollo.Subscriptio } `); expect(content.content).toBeSimilarStringTo(` - export function useTestSuspenseQuery(baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions) { - const options = baseOptions === Apollo.skipToken ? baseOptions : {...defaultOptions, ...baseOptions} + export function useTestSuspenseQuery(baseOptions?: Apollo.SuspenseQueryHookOptions) { + const options = {...defaultOptions, ...baseOptions} return Apollo.useSuspenseQuery(Operations.test, options); } `); @@ -2614,8 +2614,8 @@ export function useListenToCommentsSubscription(baseOptions?: Apollo.Subscriptio } `); expect(content.content).toBeSimilarStringTo(` - export function useTestOneSuspenseQuery(baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions) { - const options = baseOptions === Apollo.skipToken ? baseOptions : {...defaultOptions, ...baseOptions} + export function useTestOneSuspenseQuery(baseOptions?: Apollo.SuspenseQueryHookOptions) { + const options = {...defaultOptions, ...baseOptions} return Apollo.useSuspenseQuery(Operations.testOne, options); } `); @@ -2742,8 +2742,8 @@ export function useListenToCommentsSubscription(baseOptions?: Apollo.Subscriptio } `); expect(content.content).toBeSimilarStringTo(` - export function useTestSuspenseQuery(baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions) { - const options = baseOptions === Apollo.skipToken ? baseOptions : {...defaultOptions, ...baseOptions} + export function useTestSuspenseQuery(baseOptions?: Apollo.SuspenseQueryHookOptions) { + const options = {...defaultOptions, ...baseOptions} return Apollo.useSuspenseQuery(Operations.test, options); } `); @@ -3032,8 +3032,8 @@ export function useListenToCommentsSubscription(baseOptions?: Apollo.Subscriptio } `); expect(content.content).toBeSimilarStringTo(` - export function useTestOneSuspenseQuery(baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions) { - const options = baseOptions === Apollo.skipToken ? baseOptions : {...defaultOptions, ...baseOptions} + export function useTestOneSuspenseQuery(baseOptions?: Apollo.SuspenseQueryHookOptions) { + const options = {...defaultOptions, ...baseOptions} return Apollo.useSuspenseQuery(Operations.testOne, options); } `);