Fix "running thunks" types and remove unnecessary RTKQ selectors

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

@@ -129,6 +129,9 @@ export function buildSelectors<
 }) {
   type RootState = _RootState<Definitions, string, string>
 
+  const selectSkippedQuery = (state: RootState) => defaultQuerySubState
+  const selectSkippedMutation = (state: RootState) => defaultMutationSubState
+
   return { buildQuerySelector, buildMutationSelector, selectInvalidatedBy }
 
   function withRequestFlags<T extends { status: QueryStatus }>(
@@ -159,20 +162,18 @@ export function buildSelectors<
     endpointDefinition: QueryDefinition<any, any, any, any>
   ) {
     return ((queryArgs: any) => {
-      const selectQuerySubState = createSelector(
-        selectInternalState,
-        (internalState) =>
-          (queryArgs === skipToken
-            ? undefined
-            : internalState?.queries?.[
-                serializeQueryArgs({
-                  queryArgs,
-                  endpointDefinition,
-                  endpointName,
-                })
-              ]) ?? defaultQuerySubState
-      )
-      return createSelector(selectQuerySubState, withRequestFlags)
+      const serializedArgs = serializeQueryArgs({
+        queryArgs,
+        endpointDefinition,
+        endpointName,
+      })
+      const selectQuerySubstate = (state: RootState) =>
+        selectInternalState(state)?.queries?.[serializedArgs] ??
+        defaultQuerySubState
+      const finalSelectQuerySubState =
+        queryArgs === skipToken ? selectSkippedQuery : selectQuerySubstate
+
+      return createSelector(finalSelectQuerySubState, withRequestFlags)
     }) as QueryResultSelectorFactory<any, RootState>
   }
 
@@ -184,14 +185,15 @@ export function buildSelectors<
       } else {
         mutationId = id
       }
-      const selectMutationSubstate = createSelector(
-        selectInternalState,
-        (internalState) =>
-          (mutationId === skipToken
-            ? undefined
-            : internalState?.mutations?.[mutationId]) ?? defaultMutationSubState
-      )
-      return createSelector(selectMutationSubstate, withRequestFlags)
+      const selectMutationSubstate = (state: RootState) =>
+        selectInternalState(state)?.mutations?.[mutationId as string] ??
+        defaultMutationSubState
+      const finalSelectMutationSubstate =
+        mutationId === skipToken
+          ? selectSkippedMutation
+          : selectMutationSubstate
+
+      return createSelector(finalSelectMutationSubstate, withRequestFlags)
     }) as MutationResultSelectorFactory<any, RootState>
   }
 

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

@@ -71,8 +71,7 @@ export type CoreModule =
   | ReferenceQueryLifecycle
   | ReferenceCacheCollection
 
-interface ThunkWithReturnValue<T>
-  extends ThunkAction<T | undefined, any, any, AnyAction> {}
+interface ThunkWithReturnValue<T> extends ThunkAction<T, any, any, AnyAction> {}
 
 declare module '../apiTypes' {
   export interface ApiModules<

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

@@ -885,7 +885,7 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
 
     const useQueryState: UseQueryState<any> = (
       arg: any,
-      { skip = false, selectFromResult = defaultQueryStateSelector } = {}
+      { skip = false, selectFromResult } = {}
     ) => {
       const { select } = api.endpoints[name] as ApiEndpointQuery<
         QueryDefinition<any, any, any, any, any>,
@@ -916,7 +916,10 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
       )
 
       const querySelector: Selector<ApiRootState, any, [any]> = useMemo(
-        () => createSelector([selectDefaultResult], selectFromResult),
+        () =>
+          selectFromResult
+            ? createSelector([selectDefaultResult], selectFromResult)
+            : selectDefaultResult,
         [selectDefaultResult, selectFromResult]
       )