chore: update type tests to use toMatchObjectType and toExtend

aryaemami59 · aryaemami59 · commit 08493f2cc515 · 2025-12-13T20:04:42.000-06:00
diff --git a/packages/toolkit/src/dynamicMiddleware/tests/index.test-d.ts b/packages/toolkit/src/dynamicMiddleware/tests/index.test-d.ts
@@ -1,7 +1,10 @@
-import type { Action, Middleware, UnknownAction } from 'redux'
-import type { ThunkDispatch } from 'redux-thunk'
-import { configureStore } from '../../configureStore'
-import { createDynamicMiddleware } from '../index'
+import type {
+  Action,
+  Middleware,
+  ThunkDispatch,
+  UnknownAction,
+} from '@reduxjs/toolkit'
+import { configureStore, createDynamicMiddleware } from '@reduxjs/toolkit'
 
 const untypedInstance = createDynamicMiddleware()
 
diff --git a/packages/toolkit/src/dynamicMiddleware/tests/react.test-d.ts b/packages/toolkit/src/dynamicMiddleware/tests/react.test-d.ts
@@ -1,8 +1,12 @@
+import type {
+  Action,
+  Middleware,
+  ThunkDispatch,
+  UnknownAction,
+} from '@reduxjs/toolkit'
+import { createDynamicMiddleware } from '@reduxjs/toolkit/react'
 import type { Context } from 'react'
 import type { ReactReduxContextValue } from 'react-redux'
-import type { Action, Middleware, UnknownAction } from 'redux'
-import type { ThunkDispatch } from 'redux-thunk'
-import { createDynamicMiddleware } from '../react'
 
 interface AppDispatch extends ThunkDispatch<number, undefined, UnknownAction> {
   (n: 1): 1
diff --git a/packages/toolkit/src/entities/tests/state_selectors.test.ts b/packages/toolkit/src/entities/tests/state_selectors.test.ts
@@ -1,12 +1,14 @@
-import { createDraftSafeSelectorCreator } from '../../createDraftSafeSelector'
-import type { EntityAdapter, EntityState } from '../index'
-import { createEntityAdapter } from '../index'
-import type { EntitySelectors } from '../models'
+import type {
+  EntityAdapter,
+  EntitySelectors,
+  EntityState,
+} from '@reduxjs/toolkit'
+import {
+  createDraftSafeSelectorCreator,
+  createEntityAdapter,
+} from '@reduxjs/toolkit'
 import type { BookModel } from './fixtures/book'
 import { AClockworkOrange, AnimalFarm, TheGreatGatsby } from './fixtures/book'
-import type { Selector } from 'reselect'
-import { createSelector, weakMapMemoize } from 'reselect'
-import { vi } from 'vitest'
 
 describe('Entity State Selectors', () => {
   describe('Composed Selectors', () => {
@@ -103,12 +105,6 @@ describe('Entity State Selectors', () => {
       expect(entities).toEqual(state.entities)
     })
 
-    it('should type single entity from Dictionary as entity type or undefined', () => {
-      expectType<
-        Selector<EntityState<BookModel, string>, BookModel | undefined>
-      >(createSelector(selectors.selectEntities, (entities) => entities[0]))
-    })
-
     it('should create a selector for selecting the list of models', () => {
       const models = selectors.selectAll(state)
 
@@ -148,7 +144,3 @@ describe('Entity State Selectors', () => {
     })
   })
 })
-
-function expectType<T>(t: T) {
-  return t
-}
diff --git a/packages/toolkit/src/listenerMiddleware/tests/listenerMiddleware.withTypes.test-d.ts b/packages/toolkit/src/listenerMiddleware/tests/listenerMiddleware.withTypes.test-d.ts
@@ -115,7 +115,11 @@ describe('listenerMiddleware.withTypes<RootState, AppDispatch>()', () => {
   })
 
   test('addListener.withTypes', () => {
-    const addAppListener = addListener.withTypes<RootState, AppDispatch, ExtraArgument>()
+    const addAppListener = addListener.withTypes<
+      RootState,
+      AppDispatch,
+      ExtraArgument
+    >()
 
     expectTypeOf(addAppListener).toEqualTypeOf<
       TypedAddListener<RootState, AppDispatch, ExtraArgument>
@@ -138,7 +142,11 @@ describe('listenerMiddleware.withTypes<RootState, AppDispatch>()', () => {
   })
 
   test('removeListener.withTypes', () => {
-    const removeAppListener = removeListener.withTypes<RootState, AppDispatch, ExtraArgument>()
+    const removeAppListener = removeListener.withTypes<
+      RootState,
+      AppDispatch,
+      ExtraArgument
+    >()
 
     expectTypeOf(removeAppListener).toEqualTypeOf<
       TypedRemoveListener<RootState, AppDispatch, ExtraArgument>
diff --git a/packages/toolkit/src/query/tests/buildHooks.test-d.tsx b/packages/toolkit/src/query/tests/buildHooks.test-d.tsx
@@ -1,12 +1,7 @@
-import type {
-  QueryStateSelector,
-  UseMutation,
-  UseQuery,
-} from '@internal/query/react/buildHooks'
+import type { UseMutation, UseQuery } from '@internal/query/react/buildHooks'
 import { ANY } from '@internal/tests/utils/helpers'
 import type { SerializedError } from '@reduxjs/toolkit'
 import type {
-  QueryDefinition,
   SubscriptionOptions,
   TypedQueryStateSelector,
 } from '@reduxjs/toolkit/query/react'
diff --git a/packages/toolkit/src/query/tests/buildSelector.test-d.ts b/packages/toolkit/src/query/tests/buildSelector.test-d.ts
@@ -1,6 +1,5 @@
-import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
-
 import { configureStore, createSelector } from '@reduxjs/toolkit'
+import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
 
 describe('type tests', () => {
   test('buildSelector type test', () => {
diff --git a/packages/toolkit/src/query/tests/createApi.test-d.ts b/packages/toolkit/src/query/tests/createApi.test-d.ts
@@ -506,7 +506,7 @@ describe('type tests', () => {
         ).toEqualTypeOf<Post>()
         expectTypeOf(api.endpoints.query2.Types.RawResultType).toBeAny()
 
-        expectTypeOf(api.endpoints.query3.Types.QueryArg).toEqualTypeOf<void>()
+        expectTypeOf(api.endpoints.query3.Types.QueryArg).toBeVoid()
         expectTypeOf(api.endpoints.query3.Types.ResultType).toEqualTypeOf<
           EntityState<Post, Post['id']>
         >()
diff --git a/packages/toolkit/src/query/tests/fetchBaseQuery.test.tsx b/packages/toolkit/src/query/tests/fetchBaseQuery.test.tsx
@@ -1,13 +1,12 @@
 import { createSlice } from '@reduxjs/toolkit'
-import type { FetchArgs } from '@reduxjs/toolkit/query'
+import type { BaseQueryApi, FetchArgs } from '@reduxjs/toolkit/query'
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query'
 import { headersToObject } from 'headers-polyfill'
 import { HttpResponse, delay, http } from 'msw'
 import nodeFetch from 'node-fetch'
 import queryString from 'query-string'
 import { vi } from 'vitest'
 import { setupApiStore } from '../../tests/utils/helpers'
-import type { BaseQueryApi } from '../baseQueryTypes'
 import { server } from './mocks/server'
 
 const defaultHeaders: Record<string, string> = {
@@ -854,7 +853,6 @@ describe('fetchBaseQuery', () => {
       const prepare = vitest.fn()
       const baseQuery = fetchBaseQuery({
         prepareHeaders(headers, api) {
-          expectTypeOf(api.extraOptions).toEqualTypeOf<unknown>()
           prepare.apply(undefined, arguments as unknown as any[])
         },
       })
diff --git a/packages/toolkit/src/query/tests/infiniteQueries.test-d.ts b/packages/toolkit/src/query/tests/infiniteQueries.test-d.ts
@@ -1,11 +1,11 @@
-import type { skipToken, InfiniteData } from '@reduxjs/toolkit/query/react'
+import { createSlice } from '@reduxjs/toolkit'
+import type { InfiniteData, skipToken } from '@reduxjs/toolkit/query/react'
 import {
   createApi,
   fetchBaseQuery,
   QueryStatus,
 } from '@reduxjs/toolkit/query/react'
 import { setupApiStore } from '../../tests/utils/helpers'
-import { createSlice } from '@internal/createSlice'
 
 describe('Infinite queries', () => {
   test('Basic infinite query behavior', async () => {
diff --git a/packages/toolkit/src/query/tests/retry.test-d.ts b/packages/toolkit/src/query/tests/retry.test-d.ts
@@ -1,9 +1,9 @@
-import {
-  fetchBaseQuery,
-  type FetchBaseQueryError,
-  type FetchBaseQueryMeta,
-} from '@internal/query/fetchBaseQuery'
-import { retry, type RetryOptions } from '@internal/query/retry'
+import type {
+  FetchBaseQueryError,
+  FetchBaseQueryMeta,
+  RetryOptions,
+} from '@reduxjs/toolkit/query/react'
+import { fetchBaseQuery, retry } from '@reduxjs/toolkit/query/react'
 
 describe('type tests', () => {
   test('RetryOptions only accepts one of maxRetries or retryCondition', () => {
@@ -20,7 +20,7 @@ describe('type tests', () => {
     }).not.toExtend<RetryOptions>()
   })
   test('fail can be pretyped to only accept correct error and meta', () => {
-    expectTypeOf(retry.fail).parameter(0).toEqualTypeOf<unknown>()
+    expectTypeOf(retry.fail).parameter(0).toBeUnknown()
     expectTypeOf(retry.fail).parameter(1).toEqualTypeOf<{} | undefined>()
     expectTypeOf(retry.fail).toBeCallableWith('Literally anything', {})
 
diff --git a/packages/toolkit/src/tests/combineSlices.test-d.ts b/packages/toolkit/src/tests/combineSlices.test-d.ts
@@ -199,12 +199,10 @@ describe('type tests', () => {
     expectTypeOf(selector).toBeCallableWith(state, 0)
 
     // required argument
-    expectTypeOf(selector).parameters.not.toMatchObjectType<[typeof state]>()
+    expectTypeOf(selector).parameters.not.toExtend<[typeof state]>()
 
     // number not string
-    expectTypeOf(selector).parameters.not.toMatchObjectType<
-      [typeof state, '']
-    >()
+    expectTypeOf(selector).parameters.not.toExtend<[typeof state, '']>()
   })
 
   test('nested calls inferred correctly', () => {
diff --git a/packages/toolkit/src/tests/createAction.test-d.tsx b/packages/toolkit/src/tests/createAction.test-d.tsx
@@ -26,7 +26,7 @@ describe('type tests', () => {
       expectTypeOf({
         type: '',
         payload: 5,
-      }).not.toMatchObjectType<PayloadAction>()
+      }).not.toExtend<PayloadAction>()
     })
 
     test('PayloadAction has a string type tag.', () => {
@@ -37,7 +37,7 @@ describe('type tests', () => {
       expectTypeOf({
         type: 1,
         payload: 5,
-      }).not.toMatchObjectType<PayloadAction>()
+      }).not.toExtend<PayloadAction>()
     })
 
     test('PayloadAction is compatible with Action<string>', () => {
diff --git a/packages/toolkit/src/tests/createAsyncThunk.test-d.ts b/packages/toolkit/src/tests/createAsyncThunk.test-d.ts
@@ -1,7 +1,7 @@
-import type { AsyncThunkDispatchConfig } from '@internal/createAsyncThunk'
 import type { TSVersion } from '@phryneas/ts-version'
 import type {
   AsyncThunk,
+  AsyncThunkDispatchConfig,
   SerializedError,
   ThunkDispatch,
   UnknownAction,
diff --git a/packages/toolkit/src/tests/createEntityAdapter.test-d.ts b/packages/toolkit/src/tests/createEntityAdapter.test-d.ts
@@ -51,7 +51,7 @@ describe('type tests', () => {
       ActionCreatorWithPayload<Entity[] | Record<string, Entity>>
     >()
 
-    expectTypeOf(slice.actions.setAll).not.toMatchObjectType<
+    expectTypeOf(slice.actions.setAll).not.toExtend<
       ActionCreatorWithPayload<ReadonlyArray<Id>>
     >()
 
@@ -63,7 +63,7 @@ describe('type tests', () => {
       ActionCreatorWithPayload<ReadonlyArray<Id>>
     >()
 
-    expectTypeOf(slice.actions.removeMany).not.toMatchObjectType<
+    expectTypeOf(slice.actions.removeMany).not.toExtend<
       ActionCreatorWithPayload<EntityId[]>
     >()
 
@@ -75,7 +75,7 @@ describe('type tests', () => {
       ActionCreatorWithPayload<Update<Entity, Id>>
     >()
 
-    expectTypeOf(slice.actions.updateMany).not.toMatchObjectType<
+    expectTypeOf(slice.actions.updateMany).not.toExtend<
       ActionCreatorWithPayload<Update<Entity, Id>[]>
     >()
 
@@ -95,7 +95,7 @@ describe('type tests', () => {
       ActionCreatorWithPayload<ReadonlyArray<Entity> | Record<string, Entity>>
     >()
 
-    expectTypeOf(slice.actions.upsertMany).not.toMatchObjectType<
+    expectTypeOf(slice.actions.upsertMany).not.toExtend<
       ActionCreatorWithPayload<Entity[] | Record<string, Entity>>
     >()
   })
diff --git a/packages/toolkit/src/tests/createSlice.test-d.ts b/packages/toolkit/src/tests/createSlice.test-d.ts
@@ -141,15 +141,11 @@ describe('type tests', () => {
 
     counter.actions.addTwo(1, 2)
 
-    expectTypeOf(counter.actions.multiply).parameters.not.toMatchObjectType<
-      []
-    >()
+    expectTypeOf(counter.actions.multiply).parameters.not.toExtend<[]>()
 
     expectTypeOf(counter.actions.multiply).parameter(0).not.toBeString()
 
-    expectTypeOf(counter.actions.addTwo).parameters.not.toMatchObjectType<
-      [number]
-    >()
+    expectTypeOf(counter.actions.addTwo).parameters.not.toExtend<[number]>()
 
     expectTypeOf(counter.actions.addTwo).parameters.toEqualTypeOf<
       [number, number]
diff --git a/packages/toolkit/src/tests/matchers.test-d.ts b/packages/toolkit/src/tests/matchers.test-d.ts
@@ -1,5 +1,4 @@
-import type { UnknownAction } from 'redux'
-import type { SerializedError } from '../../src'
+import type { SerializedError, UnknownAction } from '@reduxjs/toolkit'
 import {
   createAction,
   createAsyncThunk,
@@ -10,7 +9,7 @@ import {
   isPending,
   isRejected,
   isRejectedWithValue,
-} from '../../src'
+} from '@reduxjs/toolkit'
 
 const action: UnknownAction = { type: 'foo' }
 
