Export reusable internal selectors

Author: markerikson

packages/toolkit/src/query/core/buildMiddleware/types.ts

@@ -26,6 +26,7 @@ import type {
   ThunkResult,
 } from '../buildThunks'
 import type { QueryActionCreatorResult } from '../buildInitiate'
+import type { AllSelectors } from '../buildSelectors'
 
 export type QueryStateMeta<T> = Record<string, undefined | T>
 export type TimeoutId = ReturnType<typeof setTimeout>
@@ -52,6 +53,7 @@ export interface BuildMiddlewareInput<
   infiniteQueryThunk: InfiniteQueryThunk<any>
   api: Api<any, Definitions, ReducerPath, TagTypes>
   assertTagType: AssertTagTypes
+  selectors: AllSelectors
 }
 
 export type SubMiddlewareApi = MiddlewareAPI<
@@ -69,6 +71,7 @@ export interface BuildSubMiddlewareInput
     >,
   ): ThunkAction<QueryActionCreatorResult<any>, any, any, UnknownAction>
   isThisApiSliceAction: (action: Action) => boolean
+  selectors: AllSelectors
 }
 
 export type SubMiddlewareBuilder = (

packages/toolkit/src/query/core/buildSelectors.ts

@@ -159,6 +159,8 @@ const defaultMutationSubState = /* @__PURE__ */ createNextState(
   () => {},
 )
 
+export type AllSelectors = ReturnType<typeof buildSelectors>
+
 export function buildSelectors<
   Definitions extends EndpointDefinitions,
   ReducerPath extends string,
@@ -182,6 +184,11 @@ export function buildSelectors<
     buildMutationSelector,
     selectInvalidatedBy,
     selectCachedArgsForQuery,
+    selectApiState,
+    selectQueries,
+    selectMutations,
+    selectQueryEntry,
+    selectConfig,
   }
 
   function withRequestFlags<T extends { status: QueryStatus }>(
@@ -193,12 +200,12 @@ export function buildSelectors<
     }
   }
 
-  function selectInternalState(rootState: RootState) {
+  function selectApiState(rootState: RootState) {
     const state = rootState[reducerPath]
     if (process.env.NODE_ENV !== 'production') {
       if (!state) {
-        if ((selectInternalState as any).triggered) return state
-        ;(selectInternalState as any).triggered = true
+        if ((selectApiState as any).triggered) return state
+        ;(selectApiState as any).triggered = true
         console.error(
           `Error: No data found at \`state.${reducerPath}\`. Did you forget to add the reducer to the store?`,
         )
@@ -207,6 +214,22 @@ export function buildSelectors<
     return state
   }
 
+  function selectQueries(rootState: RootState) {
+    return selectApiState(rootState)?.queries
+  }
+
+  function selectQueryEntry(rootState: RootState, cacheKey: QueryCacheKey) {
+    return selectQueries(rootState)?.[cacheKey]
+  }
+
+  function selectMutations(rootState: RootState) {
+    return selectApiState(rootState)?.mutations
+  }
+
+  function selectConfig(rootState: RootState) {
+    return selectApiState(rootState)?.config
+  }
+
   function buildAnyQuerySelector(
     endpointName: string,
     endpointDefinition: EndpointDefinition<any, any, any, any>,
@@ -221,8 +244,7 @@ export function buildSelectors<
         endpointName,
       })
       const selectQuerySubstate = (state: RootState) =>
-        selectInternalState(state)?.queries?.[serializedArgs] ??
-        defaultQuerySubState
+        selectQueryEntry(state, serializedArgs) ?? defaultQuerySubState
       const finalSelectQuerySubState =
         queryArgs === skipToken ? selectSkippedQuery : selectQuerySubstate
 
@@ -292,7 +314,7 @@ export function buildSelectors<
         mutationId = id
       }
       const selectMutationSubstate = (state: RootState) =>
-        selectInternalState(state)?.mutations?.[mutationId as string] ??
+        selectApiState(state)?.mutations?.[mutationId as string] ??
         defaultMutationSubState
       const finalSelectMutationSubstate =
         mutationId === skipToken
@@ -351,7 +373,7 @@ export function buildSelectors<
     state: RootState,
     queryName: QueryName,
   ): Array<QueryArgFrom<Definitions[QueryName]>> {
-    return Object.values(state[reducerPath].queries as QueryState<any>)
+    return Object.values(selectQueries(state) as QueryState<any>)
       .filter(
         (
           entry,

packages/toolkit/src/query/core/module.ts

@@ -546,6 +546,22 @@ export const coreModule = ({
       util: {},
     })
 
+    const selectors = buildSelectors({
+      serializeQueryArgs: serializeQueryArgs as any,
+      reducerPath,
+      createSelector,
+    })
+
+    const {
+      selectInvalidatedBy,
+      selectCachedArgsForQuery,
+      buildQuerySelector,
+      buildInfiniteQuerySelector,
+      buildMutationSelector,
+    } = selectors
+
+    safeAssign(api.util, { selectInvalidatedBy, selectCachedArgsForQuery })
+
     const {
       queryThunk,
       infiniteQueryThunk,
@@ -605,20 +621,6 @@ export const coreModule = ({
 
     safeAssign(api, { reducer: reducer as any, middleware })
 
-    const {
-      buildQuerySelector,
-      buildInfiniteQuerySelector,
-      buildMutationSelector,
-      selectInvalidatedBy,
-      selectCachedArgsForQuery,
-    } = buildSelectors({
-      serializeQueryArgs: serializeQueryArgs as any,
-      reducerPath,
-      createSelector,
-    })
-
-    safeAssign(api.util, { selectInvalidatedBy, selectCachedArgsForQuery })
-
     const {
       buildInitiateQuery,
       buildInitiateInfiniteQuery,