Skip to content

Commit

Permalink
Revert "feat(typescript-react-apollo): support skip token for useSusp…
Browse files Browse the repository at this point in the history 
…enseQuery (#835)"

This reverts commit ea83cf4.
  • Loading branch information
Max van der Stam committed Sep 27, 2024
1 parent 9b5eee4 commit b5986a5
Show file tree
Hide file tree
Showing 20 changed files with 155 additions and 257 deletions.
27 changes: 9 additions & 18 deletions dev-test/githunt/types.reactApollo.customSuffix.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,12 +501,9 @@ export function useCommentLazyQuery(
);
}
export function useCommentSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<CommentQueryMyOperation, CommentQueryVariables>,
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQueryMyOperation, CommentQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<CommentQueryMyOperation, CommentQueryVariables>(
CommentDocument,
options,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -634,12 +628,9 @@ export function useFeedLazyQuery(
return Apollo.useLazyQuery<FeedQueryMyOperation, FeedQueryVariables>(FeedDocument, options);
}
export function useFeedSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<FeedQueryMyOperation, FeedQueryVariables>,
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQueryMyOperation, FeedQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<FeedQueryMyOperation, FeedQueryVariables>(FeedDocument, options);
}
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;
Expand Down
25 changes: 9 additions & 16 deletions dev-test/githunt/types.reactApollo.hooks.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -544,12 +544,9 @@ export function useCommentLazyQuery(
return Apollo.useLazyQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
}
export function useCommentSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
}
export type CommentQueryHookResult = ReturnType<typeof useCommentQuery>;
Expand Down Expand Up @@ -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<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
CurrentUserForProfileDocument,
options,
Expand Down Expand Up @@ -674,10 +668,9 @@ export function useFeedLazyQuery(
return Apollo.useLazyQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
}
export function useFeedSuspenseQuery(
baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
}
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;
Expand Down
25 changes: 9 additions & 16 deletions dev-test/githunt/types.reactApollo.preResolveTypes.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,12 +498,9 @@ export function useCommentLazyQuery(
return Apollo.useLazyQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
}
export function useCommentSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
}
export type CommentQueryHookResult = ReturnType<typeof useCommentQuery>;
Expand Down Expand Up @@ -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<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
CurrentUserForProfileDocument,
options,
Expand Down Expand Up @@ -628,10 +622,9 @@ export function useFeedLazyQuery(
return Apollo.useLazyQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
}
export function useFeedSuspenseQuery(
baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
}
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;
Expand Down
25 changes: 9 additions & 16 deletions dev-test/githunt/types.reactApollo.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,12 +498,9 @@ export function useCommentLazyQuery(
return Apollo.useLazyQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
}
export function useCommentSuspenseQuery(
baseOptions?:
| Apollo.SkipToken
| Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
baseOptions?: Apollo.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<CommentQuery, CommentQueryVariables>(CommentDocument, options);
}
export type CommentQueryHookResult = ReturnType<typeof useCommentQuery>;
Expand Down Expand Up @@ -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<CurrentUserForProfileQuery, CurrentUserForProfileQueryVariables>(
CurrentUserForProfileDocument,
options,
Expand Down Expand Up @@ -628,10 +622,9 @@ export function useFeedLazyQuery(
return Apollo.useLazyQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
}
export function useFeedSuspenseQuery(
baseOptions?: Apollo.SkipToken | Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
baseOptions?: Apollo.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
) {
const options =
baseOptions === Apollo.skipToken ? baseOptions : { ...defaultOptions, ...baseOptions };
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
}
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;
Expand Down
33 changes: 9 additions & 24 deletions dev-test/githunt/types.reactApollo.v2.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,14 +502,9 @@ export function useCommentLazyQuery(
);
}
export function useCommentSuspenseQuery(
baseOptions?:
| ApolloReactHooks.SkipToken
| ApolloReactHooks.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
baseOptions?: ApolloReactHooks.SuspenseQueryHookOptions<CommentQuery, CommentQueryVariables>,
) {
const options =
baseOptions === ApolloReactHooks.skipToken
? baseOptions
: { ...defaultOptions, ...baseOptions };
const options = { ...defaultOptions, ...baseOptions };
return ApolloReactHooks.useSuspenseQuery<CommentQuery, CommentQueryVariables>(
CommentDocument,
options,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -639,14 +629,9 @@ export function useFeedLazyQuery(
return ApolloReactHooks.useLazyQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
}
export function useFeedSuspenseQuery(
baseOptions?:
| ApolloReactHooks.SkipToken
| ApolloReactHooks.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
baseOptions?: ApolloReactHooks.SuspenseQueryHookOptions<FeedQuery, FeedQueryVariables>,
) {
const options =
baseOptions === ApolloReactHooks.skipToken
? baseOptions
: { ...defaultOptions, ...baseOptions };
const options = { ...defaultOptions, ...baseOptions };
return ApolloReactHooks.useSuspenseQuery<FeedQuery, FeedQueryVariables>(FeedDocument, options);
}
export type FeedQueryHookResult = ReturnType<typeof useFeedQuery>;
Expand Down
10 changes: 5 additions & 5 deletions dev-test/star-wars/__generated__/HeroAndFriendsNames.tsx
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions dev-test/star-wars/__generated__/HeroAppearsIn.tsx
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions dev-test/star-wars/__generated__/HeroDetails.tsx
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 5 additions & 8 deletions dev-test/star-wars/__generated__/HeroDetailsWithFragment.tsx
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions dev-test/star-wars/__generated__/HeroName.tsx
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 10 additions & 16 deletions dev-test/star-wars/__generated__/HeroNameConditional.tsx
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b5986a5

Please sign in to comment.