Update internal selector usage to compile with Reselect 4.1.5

Author: markerikson

packages/toolkit/src/entities/state_selectors.ts

@@ -1,3 +1,4 @@
+import type { Selector } from 'reselect'
 import { createDraftSafeSelector } from '../createDraftSafeSelector'
 import type {
   EntityState,
@@ -11,21 +12,20 @@ export function createSelectorsFactory<T>() {
   function getSelectors<V>(
     selectState: (state: V) => EntityState<T>
   ): EntitySelectors<T, V>
-  function getSelectors(
-    selectState?: (state: any) => EntityState<T>
+  function getSelectors<V>(
+    selectState?: (state: V) => EntityState<T>
   ): EntitySelectors<T, any> {
-    const selectIds = (state: any) => state.ids
+    const selectIds = (state: EntityState<T>) => state.ids
 
     const selectEntities = (state: EntityState<T>) => state.entities
 
     const selectAll = createDraftSafeSelector(
       selectIds,
       selectEntities,
-      (ids: readonly T[], entities: Dictionary<T>): any =>
-        ids.map((id: any) => (entities as any)[id])
+      (ids, entities): T[] => ids.map((id) => entities[id]!)
     )
 
-    const selectId = (_: any, id: EntityId) => id
+    const selectId = (_: unknown, id: EntityId) => id
 
     const selectById = (entities: Dictionary<T>, id: EntityId) => entities[id]
 
@@ -46,7 +46,7 @@ export function createSelectorsFactory<T>() {
     }
 
     const selectGlobalizedEntities = createDraftSafeSelector(
-      selectState,
+      selectState as Selector<V, EntityState<T>>,
       selectEntities
     )
 

packages/toolkit/src/query/react/buildHooks.ts

@@ -1,5 +1,5 @@
 import type { AnyAction, ThunkAction, ThunkDispatch } from '@reduxjs/toolkit'
-import { createSelector } from '@reduxjs/toolkit'
+import { createSelector, Selector } from '@reduxjs/toolkit'
 import type { DependencyList } from 'react'
 import {
   useCallback,
@@ -556,7 +556,7 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
           endpointName,
         })
       )
-      lastResult = undefined
+        lastResult = undefined
     }
 
     // data is the last known good request result we have tracked - or if none has been tracked yet the last good result for the current args
@@ -789,22 +789,24 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
         name
       )
 
+      type ApiRootState = Parameters<ReturnType<typeof select>>[0]
+
       const lastValue = useRef<any>()
 
-      const selectDefaultResult = useMemo(
+      const selectDefaultResult: Selector<ApiRootState, any, [any]> = useMemo(
         () =>
           createSelector(
             [
               select(stableArg),
-              (_: any, lastResult: any) => lastResult,
-              () => stableArg,
+              (_: ApiRootState, lastResult: any) => lastResult,
+              (_: ApiRootState) => stableArg,
             ],
             queryStatePreSelector
           ),
         [select, stableArg]
       )
 
-      const querySelector = useMemo(
+      const querySelector: Selector<ApiRootState, any, [any]> = useMemo(
         () => createSelector([selectDefaultResult], selectFromResult),
         [selectDefaultResult, selectFromResult]
       )