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

Author: aryaemami59

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]
@@ -363,7 +364,7 @@ const original = (state: any) => {
 
 const noopReducer: Reducer<Record<string, any>> = (state = {}) => 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

@@ -88,9 +88,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

@@ -113,7 +113,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

@@ -27,9 +27,9 @@ import type {
 } from './apiState'
 import { QueryStatus, getRequestStatusFlags } from './apiState'
 import { getMutationCacheKey } from './buildSlice'
+import { getNextPageParam, getPreviousPageParam } from './buildThunks'
 import type { createSelector as _createSelector } from './rtkImports'
 import { createNextState } from './rtkImports'
-import { getNextPageParam, getPreviousPageParam } from './buildThunks'
 
 export type SkipToken = typeof skipToken
 /**
@@ -334,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)) {
@@ -379,7 +379,7 @@ export function buildSelectors<
   function selectCachedArgsForQuery<QueryName extends QueryKeys<Definitions>>(
     state: RootState,
     queryName: QueryName,
-  ): Array<QueryArgFrom<Definitions[QueryName]>> {
+  ): QueryArgFrom<Definitions[QueryName]>[] {
     return Object.values(selectQueries(state) as QueryState<any>)
       .filter(
         (

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

@@ -7,23 +7,23 @@ import type {
   AssertTagTypes,
   EndpointDefinitions,
   FullTagDescription,
-  QueryArgFrom,
   QueryDefinition,
-  ResultTypeFrom,
 } from '../endpointDefinitions'
+import { isInfiniteQueryDefinition } from '../endpointDefinitions'
 import {
   copyWithStructuralSharing,
   isDocumentVisible,
   isOnline,
 } from '../utils'
 import type {
   ConfigState,
+  InfiniteQueryDirection,
+  InfiniteQuerySubState,
   InvalidationState,
   MutationState,
   MutationSubState,
   MutationSubstateIdentifier,
   QueryCacheKey,
-  QueryKeys,
   QueryState,
   QuerySubState,
   QuerySubstateIdentifier,
@@ -32,7 +32,15 @@ import type {
 } from './apiState'
 import { QueryStatus } from './apiState'
 import { isUpsertQuery } from './buildInitiate'
-import type { MutationThunk, QueryThunk, QueryThunkArg } from './buildThunks'
+import type {
+  AllQueryKeys,
+  DataFromAnyQueryDefinition,
+  InfiniteQueryThunk,
+  MutationThunk,
+  QueryArgFromAnyQueryDefinition,
+  QueryThunk,
+  QueryThunkArg,
+} from './buildThunks'
 import { calculateProvidedByThunk } from './buildThunks'
 import {
   SHOULD_AUTOBATCH,
@@ -78,7 +86,7 @@ export type ProcessedQueryUpsertEntry = {
  * A typesafe representation of a util action creator that accepts cache entry descriptions to upsert
  */
 export type UpsertEntries<Definitions extends EndpointDefinitions> = (<
-  EndpointNames extends Array<AllQueryKeys<Definitions>>,
+  EndpointNames extends AllQueryKeys<Definitions>[],
 >(
   entries: [
     ...{

packages/toolkit/src/query/endpointDefinitions.ts

@@ -234,7 +234,7 @@ export type GetResultDescriptionFn<
   error: ErrorType | undefined,
   arg: QueryArg,
   meta: MetaType,
-) => ReadonlyArray<TagDescription<TagTypes> | undefined | null>
+) => readonly (TagDescription<TagTypes> | undefined | null)[]
 
 export type FullTagDescription<TagType> = {
   type: TagType
@@ -252,7 +252,7 @@ export type ResultDescription<
   ErrorType,
   MetaType,
 > =
-  | ReadonlyArray<TagDescription<TagTypes> | undefined | null>
+  | readonly (TagDescription<TagTypes> | undefined | null)[]
   | GetResultDescriptionFn<TagTypes, ResultType, QueryArg, ErrorType, MetaType>
 
 type QueryTypes<

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',