correctly allow extraOptions with required properties, or non-objects

docs/rtk-query/api/createApi.mdx

@@ -100,7 +100,7 @@ export type BaseQueryFn<
   Args = any,
   Result = unknown,
   Error = unknown,
-  DefinitionExtraOptions = {},
+  DefinitionExtraOptions = any,
   Meta = {},
 > = (
   args: Args,

docs/rtk-query/usage/customizing-queries.mdx

@@ -375,7 +375,8 @@ const axiosBaseQuery =
       headers?: AxiosRequestConfig['headers']
     },
     unknown,
-    unknown
+    unknown,
+    {}
   > =>
   async ({ url, method, data, params, headers }) => {
     try {
@@ -491,19 +492,14 @@ declare function loggedOut(): void
 export { tokenReceived, loggedOut }
 // file: baseQueryWithReauth.ts
 import { fetchBaseQuery } from '@reduxjs/toolkit/query'
-import type {
-  BaseQueryFn,
-  FetchArgs,
-  FetchBaseQueryError,
-} from '@reduxjs/toolkit/query'
 import { tokenReceived, loggedOut } from './authSlice'
 
 const baseQuery = fetchBaseQuery({ baseUrl: '/' })
-const baseQueryWithReauth: BaseQueryFn<
-  string | FetchArgs,
-  unknown,
-  FetchBaseQueryError
-> = async (args, api, extraOptions) => {
+const baseQueryWithReauth: typeof baseQuery = async (
+  args,
+  api,
+  extraOptions,
+) => {
   let result = await baseQuery(args, api, extraOptions)
   if (result.error && result.error.status === 401) {
     // try to get a new token
@@ -782,11 +778,6 @@ export interface Post {
 
 // file: src/services/api.ts
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
-import type {
-  BaseQueryFn,
-  FetchArgs,
-  FetchBaseQueryError,
-} from '@reduxjs/toolkit/query/react'
 import type { Post } from './types'
 import { selectProjectId } from './projectSlice'
 import type { RootState } from '../store'
@@ -795,11 +786,11 @@ const rawBaseQuery = fetchBaseQuery({
   baseUrl: 'www.my-cool-site.com/',
 })
 
-const dynamicBaseQuery: BaseQueryFn<
-  string | FetchArgs,
-  unknown,
-  FetchBaseQueryError
-> = async (args, api, extraOptions) => {
+const dynamicBaseQuery: typeof rawBaseQuery = async (
+  args,
+  api,
+  extraOptions,
+) => {
   const projectId = selectProjectId(api.getState() as RootState)
   // gracefully handle scenarios where data to generate the URL is missing
   if (!projectId) {

packages/toolkit/src/query/baseQueryTypes.ts

@@ -36,7 +36,7 @@ export type BaseQueryFn<
   Args = any,
   Result = unknown,
   Error = unknown,
-  DefinitionExtraOptions = {},
+  DefinitionExtraOptions = any,
   Meta = {},
 > = (
   args: Args,

packages/toolkit/src/query/tests/createApi.test-d.ts

@@ -9,6 +9,7 @@ import type {
   QueryDefinition,
   TagDescription,
   TagTypesFromApi,
+  BaseQueryFn,
 } from '@reduxjs/toolkit/query'
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query'
 
@@ -374,4 +375,129 @@ describe('type tests', () => {
       })
     })
   })
+  describe('extraOptions', () => {
+    describe('object with optional properties', () => {
+      const baseQuery: BaseQueryFn<
+        string,
+        unknown,
+        unknown,
+        { extra?: string }
+      > = (args, api, extraOptions) => {
+        expectTypeOf(extraOptions).toEqualTypeOf<{ extra?: string }>()
+        return { data: 'success' }
+      }
+
+      const api = createApi({
+        baseQuery,
+        endpoints: (build) => ({
+          noExtra: build.query<unknown, string>({
+            query: (id) => id,
+          }),
+          withEmptyExtra: build.query<unknown, string>({
+            query: (id) => id,
+            extraOptions: {},
+          }),
+          withExtra: build.query<unknown, string>({
+            query: (id) => id,
+            extraOptions: { extra: 'value' },
+          }),
+        }),
+      })
+    })
+    describe('object with required properties', () => {
+      const baseQuery: BaseQueryFn<
+        string,
+        unknown,
+        unknown,
+        { extra: string }
+      > = (args, api, extraOptions) => {
+        expectTypeOf(extraOptions).toEqualTypeOf<{ extra: string }>()
+        return { data: 'success' }
+      }
+
+      const api = createApi({
+        baseQuery,
+        endpoints: (build) => ({
+          // @ts-expect-error missing extra
+          noExtra: build.query<unknown, string>({
+            query: (id) => id,
+          }),
+          withEmptyExtra: build.query<unknown, string>({
+            query: (id) => id,
+            // @ts-expect-error key is missing
+            extraOptions: {},
+          }),
+          withExtra: build.query<unknown, string>({
+            query: (id) => id,
+            extraOptions: { extra: 'value' },
+          }),
+        }),
+      })
+    })
+    describe('non-object', () => {
+      const baseQuery: BaseQueryFn<string, unknown, unknown, string> = (
+        args,
+        api,
+        extraOptions,
+      ) => {
+        expectTypeOf(extraOptions).toEqualTypeOf<string>()
+        return { data: 'success' }
+      }
+
+      const api = createApi({
+        baseQuery,
+        endpoints: (build) => ({
+          // @ts-expect-error
+          noExtra: build.query<unknown, string>({
+            query: (id) => id,
+          }),
+          withExtra: build.query<unknown, string>({
+            query: (id) => id,
+            extraOptions: 'value',
+          }),
+        }),
+      })
+    })
+    describe('optional non-object', () => {
+      const baseQuery: BaseQueryFn<
+        string,
+        unknown,
+        unknown,
+        string | undefined
+      > = (args, api, extraOptions) => {
+        expectTypeOf(extraOptions).toEqualTypeOf<string | undefined>()
+        return { data: 'success' }
+      }
+
+      const api = createApi({
+        baseQuery,
+        endpoints: (build) => ({
+          noExtra: build.query<unknown, string>({
+            query: (id) => id,
+          }),
+          withExtra: build.query<unknown, string>({
+            query: (id) => id,
+            extraOptions: 'value',
+          }),
+        }),
+      })
+    })
+    describe('unspecified', () => {
+      const baseQuery = (args: string) => ({ data: 'success' })
+
+      const api = createApi({
+        baseQuery,
+        endpoints: (build) => ({
+          noExtra: build.query<unknown, string>({
+            query: (id) => id,
+          }),
+          withExtra: build.query<unknown, string>({
+            query: (id) => id,
+            // @ts-expect-error no extra options specified
+            extraOptions: 'value',
+          }),
+        }),
+      })
+    })
+  })
 })

packages/toolkit/src/query/tests/retry.test.ts

@@ -373,7 +373,7 @@ describe('configuration', () => {
 
   test('retryCondition with endpoint config that overrides baseQuery config', async () => {
     const baseBaseQuery = vi.fn<
-      Parameters<BaseQueryFn>,
+      Parameters<BaseQueryFn<any, unknown, unknown, {}>>,
       ReturnType<BaseQueryFn>
     >()
     baseBaseQuery.mockResolvedValue({ error: 'rejected' })
@@ -405,7 +405,7 @@ describe('configuration', () => {
 
   test('retryCondition also works with mutations', async () => {
     const baseBaseQuery = vi.fn<
-      Parameters<BaseQueryFn>,
+      Parameters<BaseQueryFn<any, unknown, unknown, {}>>,
       ReturnType<BaseQueryFn>
     >()