Add TypedOnQueryStarted type

Author: aryaemami59

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

@@ -35,6 +35,7 @@ export type {
   MutationLifecycleApi,
   QueryLifecycleApi,
   ReferenceQueryLifecycle,
+  TypedOnQueryStarted,
 } from './queryLifecycle'
 export type { SubscriptionSelectors } from './types'
 
@@ -148,7 +149,12 @@ export function buildMiddleware<
       { status: QueryStatus.uninitialized }
     >,
   ) {
-    return (input.api.endpoints[querySubState.endpointName] as ApiEndpointQuery<any, any>).initiate(querySubState.originalArgs as any, {
+    return (
+      input.api.endpoints[querySubState.endpointName] as ApiEndpointQuery<
+        any,
+        any
+      >
+    ).initiate(querySubState.originalArgs as any, {
       subscribe: false,
       forceRefetch: true,
     })

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

@@ -116,6 +116,45 @@ export type QueryLifecycleQueryExtraOptions<
   ): Promise<void> | void
 }
 
+/**
+ * @since 2.4.0
+ * @public
+ */
+export type TypedOnQueryStarted<
+  ResultType,
+  QueryArg,
+  BaseQuery extends BaseQueryFn,
+  ReducerPath extends string = string,
+  DefinitionType extends 'query' | 'mutation' = 'query' | 'mutation',
+> = 'query' | 'mutation' extends DefinitionType
+  ? QueryLifecycleMutationExtraOptions<
+      ResultType,
+      QueryArg,
+      BaseQuery,
+      ReducerPath
+    >['onQueryStarted'] &
+      QueryLifecycleQueryExtraOptions<
+        ResultType,
+        QueryArg,
+        BaseQuery,
+        ReducerPath
+      >['onQueryStarted']
+  : 'query' extends DefinitionType
+    ? QueryLifecycleQueryExtraOptions<
+        ResultType,
+        QueryArg,
+        BaseQuery,
+        ReducerPath
+      >['onQueryStarted']
+    : 'mutation' extends DefinitionType
+      ? QueryLifecycleMutationExtraOptions<
+          ResultType,
+          QueryArg,
+          BaseQuery,
+          ReducerPath
+        >['onQueryStarted']
+      : never
+
 export type QueryLifecycleMutationExtraOptions<
   ResultType,
   QueryArg,

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

@@ -24,7 +24,8 @@ export type {
   QueryCacheLifecycleApi,
   QueryLifecycleApi,
   SubscriptionSelectors,
-} from './buildMiddleware'
+  TypedOnQueryStarted,
+} from './buildMiddleware/index'
 export { skipToken } from './buildSelectors'
 export type {
   MutationResultSelectorResult,

packages/toolkit/src/query/index.ts

@@ -68,7 +68,8 @@ export type { CreateApi, CreateApiOptions } from './createApi'
 export { buildCreateApi } from './createApi'
 export { _NEVER, fakeBaseQuery } from './fakeBaseQuery'
 export { copyWithStructuralSharing } from './utils/copyWithStructuralSharing'
-export { createApi, coreModule, coreModuleName } from './core'
+export { createApi, coreModule, coreModuleName } from './core/index'
+export type { TypedOnQueryStarted } from './core/index'
 export type {
   ApiEndpointMutation,
   ApiEndpointQuery,

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

@@ -421,7 +421,7 @@ export type QueryStateSelector<
  * @template BaseQueryFunctionType - The type of the base query function being used.
  * @template SelectedResultType - The type of the selected result returned by the __`selectFromResult`__ function.
  *
- * @since 2.7.9
+ * @since 2.3.0
  * @public
  */
 export type TypedQueryStateSelector<
@@ -604,7 +604,7 @@ export type UseQueryStateOptions<
  * @template BaseQuery - The type of the base query function being used.
  * @template SelectedResult - The type of the selected result returned by the __`selectFromResult`__ function.
  *
- * @since 2.7.8
+ * @since 2.2.8
  * @public
  */
 export type TypedUseQueryStateOptions<