fix(lib): new hooks types var name

SaulMoro · Apr 26, 2021 · 923824d · 923824d
1 parent 1a39042
commit 923824d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/projects/ngrx-rtk-query/src/lib/module.ts b/projects/ngrx-rtk-query/src/lib/module.ts
@@ -16,7 +16,7 @@ import { MetaReducer } from '@ngrx/store';
 import { buildHooks } from './build-hooks';
 import { buildMetaReducer } from './build-metareducer';
 import { dispatch, getState as getStateFromStore, select } from './thunk.service';
-import { QueryHooks, MutationHooks, isQueryDefinition, isMutationDefinition, TS41Hooks } from './types';
+import { QueryHooks, MutationHooks, isQueryDefinition, isMutationDefinition, HooksWithUniqueNames } from './types';
 import { capitalize, safeAssign } from './utils';
 
 export const angularHooksModuleName = Symbol();
@@ -52,7 +52,7 @@ declare module '@reduxjs/toolkit/query' {
  endpointName: EndpointName,
  options?: PrefetchOptions,
  ): (arg: QueryArgFrom<Definitions[EndpointName]>, options?: PrefetchOptions) => void;
- } & TS41Hooks<Definitions> & { metareducer: MetaReducer<any> };
+ } & HooksWithUniqueNames<Definitions> & { metareducer: MetaReducer<any> };
  }
 }
 

diff --git a/projects/ngrx-rtk-query/src/lib/types/hooks-ts41-types.ts b/projects/ngrx-rtk-query/src/lib/types/hooks-ts41-types.ts
@@ -2,7 +2,9 @@ import { EndpointDefinitions, MutationDefinition, QueryDefinition } from '@redux
 import { DefinitionType } from '@reduxjs/toolkit/dist/query/endpointDefinitions';
 import { UseLazyQuery, UseMutation, UseQuery } from './hooks-types';
 
-export type TS41Hooks<Definitions extends EndpointDefinitions> = keyof Definitions extends infer Keys
+// For TS 4.1 and later, we can use string literal types to define
+// the exact names of each endpoint's exported hooks
+export type HooksWithUniqueNames<Definitions extends EndpointDefinitions> = keyof Definitions extends infer Keys
  ? Keys extends string
  ? Definitions[Keys] extends { type: DefinitionType.query }
  ? {