Fix problems related to the @typescript-eslint/array-type rule

packages/toolkit/src/combineSlices.ts

@@ -23,9 +23,10 @@ type SliceLikeReducerPath<A extends AnySliceLike> =
 type SliceLikeState<A extends AnySliceLike> =
   A extends SliceLike<any, infer State> ? State : never
 
-export type WithSlice<A extends AnySliceLike> = {
-  [Path in SliceLikeReducerPath<A>]: SliceLikeState<A>
-}
+export type WithSlice<A extends AnySliceLike> = Record<
+  SliceLikeReducerPath<A>,
+  SliceLikeState<A>
+>
 
 type ReducerMap = Record<string, Reducer>
 
@@ -292,7 +293,7 @@ export interface CombinedSliceReducer<
   }
 }
 
-type InitialState<Slices extends Array<AnySliceLike | ReducerMap>> =
+type InitialState<Slices extends (AnySliceLike | ReducerMap)[]> =
   UnionToIntersection<
     Slices[number] extends infer Slice
       ? Slice extends AnySliceLike
@@ -307,7 +308,7 @@ const isSliceLike = (
   'reducerPath' in maybeSliceLike &&
   typeof maybeSliceLike.reducerPath === 'string'
 
-const getReducers = (slices: Array<AnySliceLike | ReducerMap>) =>
+const getReducers = (slices: (AnySliceLike | ReducerMap)[]) =>
   slices.flatMap((sliceOrMap) =>
     isSliceLike(sliceOrMap)
       ? [[sliceOrMap.reducerPath, sliceOrMap.reducer] as const]
@@ -368,7 +369,7 @@ const original = (state: any) => {
 const emptyObject = {}
 const noopReducer: Reducer<Record<string, any>> = (state = emptyObject) => state
 
-export function combineSlices<Slices extends Array<AnySliceLike | ReducerMap>>(
+export function combineSlices<Slices extends (AnySliceLike | ReducerMap)[]>(
   ...slices: Slices
 ): CombinedSliceReducer<Id<InitialState<Slices>>> {
   const reducerMap = Object.fromEntries<Reducer>(getReducers(slices))

packages/toolkit/src/configureStore.ts

@@ -93,9 +93,9 @@ export interface ConfigureStoreOptions<
   enhancers?: (getDefaultEnhancers: GetDefaultEnhancers<M>) => E
 }
 
-export type Middlewares<S> = ReadonlyArray<Middleware<AnyNonNullishValue, S>>
+export type Middlewares<S> = readonly Middleware<AnyNonNullishValue, S>[]
 
-type Enhancers = ReadonlyArray<StoreEnhancer>
+type Enhancers = readonly StoreEnhancer[]
 
 /**
  * A Redux store returned by `configureStore()`. Supports dispatching

packages/toolkit/src/createReducer.ts

@@ -21,13 +21,13 @@ export type ActionMatcherDescription<S, A extends Action> = {
   reducer: CaseReducer<S, NoInfer<A>>
 }
 
-export type ReadonlyActionMatcherDescriptionCollection<S> = ReadonlyArray<
-  ActionMatcherDescription<S, any>
->
+export type ReadonlyActionMatcherDescriptionCollection<S> =
+  readonly ActionMatcherDescription<S, any>[]
 
-export type ActionMatcherDescriptionCollection<S> = Array<
-  ActionMatcherDescription<S, any>
->
+export type ActionMatcherDescriptionCollection<S> = ActionMatcherDescription<
+  S,
+  any
+>[]
 
 /**
  * A *case reducer* is a reducer function for a specific action type. Case

packages/toolkit/src/entities/models.ts

@@ -129,11 +129,11 @@ export interface EntityStateAdapter<T, Id extends EntityId> {
 
   updateMany<S extends DraftableEntityState<T, Id>>(
     state: PreventAny<S, T, Id>,
-    updates: ReadonlyArray<Update<T, Id>>,
+    updates: readonly Update<T, Id>[],
   ): S
   updateMany<S extends DraftableEntityState<T, Id>>(
     state: PreventAny<S, T, Id>,
-    updates: PayloadAction<ReadonlyArray<Update<T, Id>>>,
+    updates: PayloadAction<readonly Update<T, Id>[]>,
   ): S
 
   upsertOne<S extends DraftableEntityState<T, Id>>(

packages/toolkit/src/entities/sorted_state_adapter.ts

@@ -121,7 +121,7 @@ export function createSortedStateAdapter<T, Id extends EntityId>(
   }
 
   function updateManyMutably(
-    updates: ReadonlyArray<Update<T, Id>>,
+    updates: readonly Update<T, Id>[],
     state: R,
   ): void {
     let appliedUpdates = false

packages/toolkit/src/entities/unsorted_state_adapter.ts

@@ -102,7 +102,7 @@ export function createUnsortedStateAdapter<T, Id extends EntityId>(
   }
 
   function takeNewKey(
-    keys: Record<string, Id>,
+    keys: Record<EntityId, Id>,
     update: Update<T, Id>,
     state: R,
   ): boolean {
@@ -132,9 +132,9 @@ export function createUnsortedStateAdapter<T, Id extends EntityId>(
     updates: readonly Update<T, Id>[],
     state: R,
   ): void {
-    const newKeys: Record<string, Id> = {}
+    const newKeys: Record<EntityId, Id> = {}
 
-    const updatesPerEntity: Record<string, Update<T, Id>> = {}
+    const updatesPerEntity: Record<EntityId, Update<T, Id>> = {}
 
     updates.forEach((update) => {
       // Only apply updates to entities that currently exist

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

@@ -20,21 +20,17 @@ import type {
   InfiniteQuerySubState,
   MutationSubState,
   QueryCacheKey,
-  QueryKeys,
   QueryState,
   QuerySubState,
   RequestStatusFlags,
   RootState as _RootState,
 } from './apiState'
 import { QueryStatus, getRequestStatusFlags } from './apiState'
 import { getMutationCacheKey } from './buildSlice'
+import type { AllQueryKeys } from './buildThunks'
+import { getNextPageParam, getPreviousPageParam } from './buildThunks'
 import type { createSelector as _createSelector } from './rtkImports'
 import { createNextState } from './rtkImports'
-import {
-  type AllQueryKeys,
-  getNextPageParam,
-  getPreviousPageParam,
-} from './buildThunks'
 
 export type SkipToken = typeof skipToken
 /**
@@ -338,12 +334,12 @@ export function buildSelectors<
 
   function selectInvalidatedBy(
     state: RootState,
-    tags: ReadonlyArray<TagDescription<string> | null | undefined>,
-  ): Array<{
+    tags: readonly (TagDescription<string> | null | undefined)[],
+  ): {
     endpointName: string
     originalArgs: any
     queryCacheKey: QueryCacheKey
-  }> {
+  }[] {
     const apiState = state[reducerPath]
     const toInvalidate = new Set<QueryCacheKey>()
     for (const tag of tags.filter(isNotNullish).map(expandTagDescription)) {
@@ -385,7 +381,7 @@ export function buildSelectors<
   >(
     state: RootState,
     queryName: QueryName,
-  ): Array<QueryArgFromAnyQuery<Definitions[QueryName]>> {
+  ): QueryArgFromAnyQuery<Definitions[QueryName]>[] {
     return Object.values(selectQueries(state) as QueryState<any>)
       .filter(
         (

packages/toolkit/src/query/endpointDefinitions.ts

@@ -494,9 +494,11 @@ export enum DefinitionType {
   infinitequery = 'infinitequery',
 }
 
-type TagDescriptionArray<TagTypes extends string> = ReadonlyArray<
-  TagDescription<TagTypes> | undefined | null
->
+type TagDescriptionArray<TagTypes extends string> = readonly (
+  | TagDescription<TagTypes>
+  | undefined
+  | null
+)[]
 
 export type GetResultDescriptionFn<
   TagTypes extends string,

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

@@ -11,7 +11,7 @@ describe('type tests', () => {
       completed: boolean
     }
 
-    type Todos = Array<Todo>
+    type Todos = Todo[]
 
     const exampleApi = createApi({
       reducerPath: 'api',
@@ -62,7 +62,7 @@ describe('type tests', () => {
       completed: boolean
     }
 
-    type Todos = Array<Todo>
+    type Todos = Todo[]
 
     const exampleApi = createApi({
       reducerPath: 'api',

packages/toolkit/src/query/tsHelpers.ts

@@ -10,7 +10,7 @@ export function assertCast<T>(v: any): asserts v is T {
 
 export function safeAssign<T extends object>(
   target: T,
-  ...args: Array<Partial<NoInfer<T>>>
+  ...args: Partial<NoInfer<T>>[]
 ): T {
   return Object.assign(target, ...args)
 }

packages/toolkit/src/tests/configureStore.test-d.ts

@@ -636,11 +636,11 @@ describe('type tests', () => {
           const concatenated = gDM().concat(otherMiddleware)
 
           expectTypeOf(concatenated).toMatchTypeOf<
-            ReadonlyArray<
+            readonly (
               | typeof otherMiddleware
               | ThunkMiddleware
               | Middleware<AnyNonNullishValue>
-            >
+            )[]
           >()
 
           return concatenated

packages/toolkit/src/tests/createEntityAdapter.test-d.ts

@@ -36,11 +36,11 @@ describe('type tests', () => {
     >()
 
     expectTypeOf(slice.actions.addMany).toMatchTypeOf<
-      ActionCreatorWithPayload<ReadonlyArray<Entity> | Record<string, Entity>>
+      ActionCreatorWithPayload<readonly Entity[] | Record<string, Entity>>
     >()
 
     expectTypeOf(slice.actions.setAll).toMatchTypeOf<
-      ActionCreatorWithPayload<ReadonlyArray<Entity> | Record<string, Entity>>
+      ActionCreatorWithPayload<readonly Entity[] | Record<string, Entity>>
     >()
 
     expectTypeOf(slice.actions.removeOne).toMatchTypeOf<
@@ -52,15 +52,15 @@ describe('type tests', () => {
     >()
 
     expectTypeOf(slice.actions.setAll).not.toMatchTypeOf<
-      ActionCreatorWithPayload<ReadonlyArray<Id>>
+      ActionCreatorWithPayload<readonly Id[]>
     >()
 
     expectTypeOf(slice.actions.removeOne).toMatchTypeOf<
       ActionCreatorWithPayload<Id>
     >()
 
     expectTypeOf(slice.actions.removeMany).toMatchTypeOf<
-      ActionCreatorWithPayload<ReadonlyArray<Id>>
+      ActionCreatorWithPayload<readonly Id[]>
     >()
 
     expectTypeOf(slice.actions.removeMany).not.toMatchTypeOf<
@@ -84,15 +84,15 @@ describe('type tests', () => {
     >()
 
     expectTypeOf(slice.actions.updateMany).toMatchTypeOf<
-      ActionCreatorWithPayload<ReadonlyArray<Update<Entity, Id>>>
+      ActionCreatorWithPayload<readonly Update<Entity, Id>[]>
     >()
 
     expectTypeOf(slice.actions.upsertOne).toMatchTypeOf<
       ActionCreatorWithPayload<Entity>
     >()
 
     expectTypeOf(slice.actions.upsertMany).toMatchTypeOf<
-      ActionCreatorWithPayload<ReadonlyArray<Entity> | Record<string, Entity>>
+      ActionCreatorWithPayload<readonly Entity[] | Record<string, Entity>>
     >()
 
     expectTypeOf(slice.actions.upsertMany).not.toMatchTypeOf<

packages/toolkit/src/tests/utils/CustomMatchers.d.ts

@@ -1,7 +1,7 @@
-import type { Assertion, AsymmetricMatchersContaining } from 'vitest'
+import 'vitest'
 
 interface CustomMatchers<R = unknown> {
-  toMatchSequence(...matchers: Array<(arg: any) => boolean>): R
+  toMatchSequence(...matchers: ((arg: any) => boolean)[]): R
 }
 
 declare module 'vitest' {

packages/toolkit/src/tsHelpers.ts

@@ -3,7 +3,7 @@ import type { Tuple } from './utils'
 
 export function safeAssign<T extends object>(
   target: T,
-  ...args: Array<Partial<NoInfer<T>>>
+  ...args: Partial<NoInfer<T>>[]
 ) {
   Object.assign(target, ...args)
 }
@@ -108,7 +108,7 @@ type ExtractDispatchFromMiddlewareTuple<
 export type ExtractDispatchExtensions<M> =
   M extends Tuple<infer MiddlewareTuple>
     ? ExtractDispatchFromMiddlewareTuple<MiddlewareTuple, AnyNonNullishValue>
-    : M extends ReadonlyArray<Middleware>
+    : M extends readonly Middleware[]
       ? ExtractDispatchFromMiddlewareTuple<[...M], AnyNonNullishValue>
       : never
 
@@ -128,7 +128,7 @@ type ExtractStoreExtensionsFromEnhancerTuple<
 export type ExtractStoreExtensions<E> =
   E extends Tuple<infer EnhancerTuple>
     ? ExtractStoreExtensionsFromEnhancerTuple<EnhancerTuple, AnyNonNullishValue>
-    : E extends ReadonlyArray<StoreEnhancer>
+    : E extends readonly StoreEnhancer[]
       ? UnionToIntersection<
           E[number] extends StoreEnhancer<infer Ext>
             ? Ext extends AnyNonNullishValue
@@ -154,7 +154,7 @@ type ExtractStateExtensionsFromEnhancerTuple<
 export type ExtractStateExtensions<E> =
   E extends Tuple<infer EnhancerTuple>
     ? ExtractStateExtensionsFromEnhancerTuple<EnhancerTuple, AnyNonNullishValue>
-    : E extends ReadonlyArray<StoreEnhancer>
+    : E extends readonly StoreEnhancer[]
       ? UnionToIntersection<
           E[number] extends StoreEnhancer<any, infer StateExt>
             ? StateExt extends AnyNonNullishValue

packages/toolkit/src/utils.ts

@@ -26,7 +26,7 @@ export function delay(ms: number) {
   return new Promise((resolve) => setTimeout(resolve, ms))
 }
 
-export class Tuple<Items extends ReadonlyArray<unknown> = []> extends Array<
+export class Tuple<Items extends readonly unknown[] = []> extends Array<
   Items[number]
 > {
   constructor(length: number)
@@ -40,26 +40,26 @@ export class Tuple<Items extends ReadonlyArray<unknown> = []> extends Array<
     return Tuple as any
   }
 
-  override concat<AdditionalItems extends ReadonlyArray<unknown>>(
+  override concat<AdditionalItems extends readonly unknown[]>(
     items: Tuple<AdditionalItems>,
   ): Tuple<[...Items, ...AdditionalItems]>
-  override concat<AdditionalItems extends ReadonlyArray<unknown>>(
+  override concat<AdditionalItems extends readonly unknown[]>(
     items: AdditionalItems,
   ): Tuple<[...Items, ...AdditionalItems]>
-  override concat<AdditionalItems extends ReadonlyArray<unknown>>(
+  override concat<AdditionalItems extends readonly unknown[]>(
     ...items: AdditionalItems
   ): Tuple<[...Items, ...AdditionalItems]>
   override concat(...arr: any[]) {
     return super.concat.apply(this, arr)
   }
 
-  prepend<AdditionalItems extends ReadonlyArray<unknown>>(
+  prepend<AdditionalItems extends readonly unknown[]>(
     items: Tuple<AdditionalItems>,
   ): Tuple<[...AdditionalItems, ...Items]>
-  prepend<AdditionalItems extends ReadonlyArray<unknown>>(
+  prepend<AdditionalItems extends readonly unknown[]>(
     items: AdditionalItems,
   ): Tuple<[...AdditionalItems, ...Items]>
-  prepend<AdditionalItems extends ReadonlyArray<unknown>>(
+  prepend<AdditionalItems extends readonly unknown[]>(
     ...items: AdditionalItems
   ): Tuple<[...AdditionalItems, ...Items]>
   prepend(...arr: any[]) {

packages/toolkit/vitest.setup.ts

@@ -63,15 +63,15 @@ afterAll(() => {
 declare global {
   namespace jest {
     interface Matchers<R> {
-      toMatchSequence(...matchers: Array<(arg: any) => boolean>): R
+      toMatchSequence(...matchers: ((arg: any) => boolean)[]): R
     }
   }
 }
 
 expect.extend({
   toMatchSequence(
     _actions: UnknownAction[],
-    ...matchers: Array<(arg: any) => boolean>
+    ...matchers: ((arg: any) => boolean)[]
   ) {
     const actions = _actions.concat()
     actions.shift() // remove INIT