Respect BaseQuery meta types when enhancing (#2225)

* Respect BaseQuery meta types when enhancing

* Revert Meta default type

* Exclude undefined

* Silence UnknownInCatch error

* Add type test for meta

* Run prettier

* Improve comments

* Improve comments

Author: TamasSzigeti

packages/toolkit/src/query/baseQueryTypes.ts

@@ -54,7 +54,8 @@ export type BaseQueryEnhancer<
   BaseQueryArg<BaseQuery> & AdditionalArgs,
   BaseQueryResult<BaseQuery>,
   BaseQueryError<BaseQuery>,
-  BaseQueryExtraOptions<BaseQuery> & AdditionalDefinitionExtraOptions
+  BaseQueryExtraOptions<BaseQuery> & AdditionalDefinitionExtraOptions,
+  NonNullable<BaseQueryMeta<BaseQuery>>
 >
 
 export type BaseQueryResult<BaseQuery extends BaseQueryFn> = UnwrapPromise<

packages/toolkit/src/query/tests/baseQueryTypes.typetest.ts

@@ -0,0 +1,33 @@
+import { createApi, fetchBaseQuery, retry } from '@reduxjs/toolkit/query'
+
+/**
+ * Test: BaseQuery meta types propagate to endpoint callbacks
+ */
+{
+  createApi({
+    baseQuery: fetchBaseQuery(),
+    endpoints: (build) => ({
+      getDummy: build.query<null, undefined>({
+        query: () => 'dummy',
+        onCacheEntryAdded: async (arg, { cacheDataLoaded }) => {
+          const { meta } = await cacheDataLoaded
+          const { request, response } = meta! // Expect request and response to be there
+        },
+      }),
+    }),
+  })
+
+  const baseQuery = retry(fetchBaseQuery()) // Even when wrapped with retry
+  createApi({
+    baseQuery,
+    endpoints: (build) => ({
+      getDummy: build.query<null, undefined>({
+        query: () => 'dummy',
+        onCacheEntryAdded: async (arg, { cacheDataLoaded }) => {
+          const { meta } = await cacheDataLoaded
+          const { request, response } = meta! // Expect request and response to be there
+        },
+      }),
+    }),
+  })
+}