Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix generic defaulting w/ middleware types #155

Merged
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions packages/redux-query/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ declare module 'redux-query' {
queriesSelector: QueriesSelector<TState>,
entitiesSelector: EntitiesSelector<TEntities, TState>,
customConfig?: Config,
) => Middleware<ReduxQueryDispatch, any, ReduxQueryDispatch>;
) => Middleware<ReduxQueryDispatch<TEntities>, any, ReduxQueryDispatch<TEntities>>;
export const getQueryKey: QueryKeyBuilder;
export const queriesReducer: QueriesReducer;
export const entitiesReducer: EntitiesReducer;
Expand Down Expand Up @@ -254,7 +254,7 @@ declare module 'redux-query' {
};

export const queryMiddleware: QueryMiddlewareFactory;
export interface ReduxQueryDispatch<A extends AnyAction = ReduxQueryAction<TEntities>, TEntities = Entities> {
export interface ReduxQueryDispatch<TEntities = Entities, A extends AnyAction = ReduxQueryAction<TEntities>> {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why the change in order here?

Choose a reason for hiding this comment

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

Otherwise you get this errror:

node_modules/redux-query/index.d.ts:257:78 - error TS2744: Type parameter defaults can only reference previously declared type parameters.

257 export interface ReduxQueryDispatch<A extends AnyAction = ReduxQueryAction, TEntities = Entities> {

See also OpenAPITools/openapi-generator#3824

<T extends ReduxQueryAction<TEntities>>(action: ReduxQueryAction<TEntities>): Promise<ActionPromiseValue<TEntities>>;
<T extends A>(action: T): T;
}
Expand Down