Skip to content
This repository has been archived by the owner on Apr 13, 2023. It is now read-only.

Added graphql hoc missing data type generic #2525

Merged
merged 9 commits into from
Mar 10, 2019
Merged

Added graphql hoc missing data type generic #2525

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1f158a2
Added graphql hoc missing data type generic
EricMcRay Oct 23, 2018
2a9b787
Merge branch 'master' into issue-1920
EricMcRay Jan 18, 2019
78c9934
Updated typescript typing for backward compatibility
EricMcRay Jan 18, 2019
129d868
Fixed declaration order for linter
EricMcRay Jan 18, 2019
788d3ba
Added deprecation warning for typing
EricMcRay Jan 18, 2019
062c23f
Replaced deprecated typing
EricMcRay Jan 18, 2019
453e6a2
Merge branch 'master' into issue-1920
hwillson Mar 7, 2019
d39c14d
Merge branch 'master' into issue-1920
hwillson Mar 9, 2019
a0b9834
Changelog update
hwillson Mar 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,28 +49,33 @@ export interface QueryOpts<TGraphQLVariables = OperationVariables> {
partialRefetch?: boolean;
}

export interface GraphqlQueryControls<TGraphQLVariables = OperationVariables> {
export interface QueryControls<TData = any, TGraphQLVariables = OperationVariables> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change all usages of GraphqlQueryControls to QueryControls.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed all usages and added TData generic for better typing but I am not sure it will break something. I don't have good knowledge about all code base. Can you check and confirm changes?

error?: ApolloError;
networkStatus: number;
loading: boolean;
variables: TGraphQLVariables;
fetchMore: (
fetchMoreOptions: FetchMoreQueryOptions<any, any> & FetchMoreOptions,
) => Promise<ApolloQueryResult<any>>;
refetch: (variables?: TGraphQLVariables) => Promise<ApolloQueryResult<any>>;
fetchMoreOptions: FetchMoreQueryOptions<TGraphQLVariables, any> &
FetchMoreOptions<TData, TGraphQLVariables>,
) => Promise<ApolloQueryResult<TData>>;
refetch: (variables?: TGraphQLVariables) => Promise<ApolloQueryResult<TData>>;
startPolling: (pollInterval: number) => void;
stopPolling: () => void;
subscribeToMore: (options: SubscribeToMoreOptions) => () => void;
updateQuery: (mapFn: (previousQueryResult: any, options: UpdateQueryOptions<any>) => any) => void;
}

export interface GraphqlQueryControls<TGraphQLVariables = OperationVariables>
EricMcRay marked this conversation as resolved.
Show resolved Hide resolved
extends QueryControls<any, TGraphQLVariables> {}

// XXX remove in the next breaking semver change (3.0)
export type MutationFunc<TData = any, TVariables = OperationVariables> = MutationFn<
TData,
TVariables
>;

export type DataValue<TData, TGraphQLVariables = OperationVariables> = GraphqlQueryControls<
export type DataValue<TData, TGraphQLVariables = OperationVariables> = QueryControls<
TData,
TGraphQLVariables
> &
// data may not yet be loaded
Expand Down