Fix problems related to the sort-imports rule

aryaemami59 · aryaemami59 · commit 2e3cd27d427a · 2024-09-13T22:13:33.000-05:00
diff --git a/packages/toolkit/src/configureStore.ts b/packages/toolkit/src/configureStore.ts
@@ -1,31 +1,31 @@
 import type {
+  Action,
+  Middleware,
   Reducer,
   ReducersMapObject,
-  Middleware,
-  Action,
-  StoreEnhancer,
   Store,
+  StoreEnhancer,
   UnknownAction,
 } from 'redux'
 import {
   applyMiddleware,
-  createStore,
-  compose,
   combineReducers,
+  compose,
+  createStore,
   isPlainObject,
 } from 'redux'
 import type { DevToolsEnhancerOptions as DevToolsOptions } from './devtoolsExtension'
 import { composeWithDevTools } from './devtoolsExtension'
 
 import type {
-  ThunkMiddlewareFor,
   GetDefaultMiddleware,
+  ThunkMiddlewareFor,
 } from './getDefaultMiddleware'
 import { buildGetDefaultMiddleware } from './getDefaultMiddleware'
 import type {
   ExtractDispatchExtensions,
-  ExtractStoreExtensions,
   ExtractStateExtensions,
+  ExtractStoreExtensions,
   UnknownIfNonSpecific,
 } from './tsHelpers'
 import type { Tuple } from './utils'
diff --git a/packages/toolkit/src/dynamicMiddleware/react/index.ts b/packages/toolkit/src/dynamicMiddleware/react/index.ts
@@ -9,8 +9,8 @@ import { createDynamicMiddleware as cDM } from '@reduxjs/toolkit'
 import type { Context } from 'react'
 import type { ReactReduxContextValue } from 'react-redux'
 import {
-  createDispatchHook,
   ReactReduxContext,
+  createDispatchHook,
   useDispatch as useDefaultDispatch,
 } from 'react-redux'
 import type { Action, Dispatch, Middleware, UnknownAction } from 'redux'
diff --git a/packages/toolkit/src/entities/create_adapter.ts b/packages/toolkit/src/entities/create_adapter.ts
@@ -1,4 +1,4 @@
-import type { EntityAdapter, EntityId, EntityAdapterOptions } from './models'
+import type { EntityAdapter, EntityAdapterOptions, EntityId } from './models'
 import { createInitialStateFactory } from './entity_state'
 import { createSelectorsFactory } from './state_selectors'
 import { createSortedStateAdapter } from './sorted_state_adapter'
diff --git a/packages/toolkit/src/entities/sorted_state_adapter.ts b/packages/toolkit/src/entities/sorted_state_adapter.ts
@@ -1,18 +1,18 @@
 import type {
-  IdSelector,
   Comparer,
+  DraftableEntityState,
+  EntityId,
   EntityStateAdapter,
+  IdSelector,
   Update,
-  EntityId,
-  DraftableEntityState,
 } from './models'
 import { createStateOperator } from './state_adapter'
 import { createUnsortedStateAdapter } from './unsorted_state_adapter'
 import {
-  selectIdValue,
   ensureEntitiesArray,
-  splitAddedUpdatedEntities,
   getCurrent,
+  selectIdValue,
+  splitAddedUpdatedEntities,
 } from './utils'
 
 // Borrowed from Replay
diff --git a/packages/toolkit/src/entities/state_adapter.ts b/packages/toolkit/src/entities/state_adapter.ts
@@ -1,6 +1,6 @@
 import { produce as createNextState, isDraft } from 'immer'
 import type { Draft } from 'immer'
-import type { EntityId, DraftableEntityState, PreventAny } from './models'
+import type { DraftableEntityState, EntityId, PreventAny } from './models'
 import type { PayloadAction } from '../createAction'
 import { isFSA } from '../createAction'
 
diff --git a/packages/toolkit/src/entities/tests/unsorted_state_adapter.test.ts b/packages/toolkit/src/entities/tests/unsorted_state_adapter.test.ts
@@ -2,9 +2,9 @@ import type { EntityAdapter, EntityState } from '../models'
 import { createEntityAdapter } from '../create_adapter'
 import type { BookModel } from './fixtures/book'
 import {
-  TheGreatGatsby,
   AClockworkOrange,
   AnimalFarm,
+  TheGreatGatsby,
   TheHobbit,
 } from './fixtures/book'
 import { createNextState } from '../..'
diff --git a/packages/toolkit/src/entities/unsorted_state_adapter.ts b/packages/toolkit/src/entities/unsorted_state_adapter.ts
@@ -1,18 +1,18 @@
 import type { Draft } from 'immer'
 import type {
+  DraftableEntityState,
+  EntityId,
   EntityStateAdapter,
   IdSelector,
   Update,
-  EntityId,
-  DraftableEntityState,
 } from './models'
 import {
-  createStateOperator,
   createSingleArgumentStateOperator,
+  createStateOperator,
 } from './state_adapter'
 import {
-  selectIdValue,
   ensureEntitiesArray,
+  selectIdValue,
   splitAddedUpdatedEntities,
 } from './utils'
 
diff --git a/packages/toolkit/src/listenerMiddleware/tests/effectScenarios.test.ts b/packages/toolkit/src/listenerMiddleware/tests/effectScenarios.test.ts
@@ -10,7 +10,7 @@ import { vi } from 'vitest'
 
 import type { PayloadAction } from '@reduxjs/toolkit'
 
-import { createListenerMiddleware, TaskAbortError } from '../index'
+import { TaskAbortError, createListenerMiddleware } from '../index'
 
 import type { TypedAddListener } from '../index'
 
diff --git a/packages/toolkit/src/listenerMiddleware/tests/fork.test.ts b/packages/toolkit/src/listenerMiddleware/tests/fork.test.ts
@@ -1,13 +1,13 @@
 import type { EnhancedStore } from '@reduxjs/toolkit'
-import { configureStore, createSlice, createAction } from '@reduxjs/toolkit'
+import { configureStore, createAction, createSlice } from '@reduxjs/toolkit'
 
 import type { PayloadAction } from '@reduxjs/toolkit'
 import type {
   AbortSignalWithReason,
   ForkedTaskExecutor,
   TaskResult,
 } from '../types'
-import { createListenerMiddleware, TaskAbortError } from '../index'
+import { TaskAbortError, createListenerMiddleware } from '../index'
 import {
   listenerCancelled,
   listenerCompleted,
diff --git a/packages/toolkit/src/mapBuilders.ts b/packages/toolkit/src/mapBuilders.ts
@@ -1,8 +1,8 @@
 import type { Action } from 'redux'
 import type {
+  ActionMatcherDescriptionCollection,
   CaseReducer,
   CaseReducers,
-  ActionMatcherDescriptionCollection,
 } from './createReducer'
 import type { TypeGuard } from './tsHelpers'
 
diff --git a/packages/toolkit/src/query/core/apiState.ts b/packages/toolkit/src/query/core/apiState.ts
@@ -1,12 +1,12 @@
 import type { SerializedError } from '@reduxjs/toolkit'
 import type { BaseQueryError } from '../baseQueryTypes'
 import type {
-  QueryDefinition,
-  MutationDefinition,
-  EndpointDefinitions,
   BaseEndpointDefinition,
-  ResultTypeFrom,
+  EndpointDefinitions,
+  MutationDefinition,
   QueryArgFrom,
+  QueryDefinition,
+  ResultTypeFrom,
 } from '../endpointDefinitions'
 import type { Id, WithRequiredProp } from '../tsHelpers'
 
diff --git a/packages/toolkit/src/query/core/buildMiddleware/invalidationByTags.ts b/packages/toolkit/src/query/core/buildMiddleware/invalidationByTags.ts
@@ -14,10 +14,10 @@ import type { CombinedState, QueryCacheKey } from '../apiState'
 import { QueryStatus } from '../apiState'
 import { calculateProvidedByThunk } from '../buildThunks'
 import type {
-  SubMiddlewareApi,
-  InternalHandlerBuilder,
   ApiMiddlewareInternalHandler,
+  InternalHandlerBuilder,
   InternalMiddlewareState,
+  SubMiddlewareApi,
 } from './types'
 import { countObjectKeys } from '../../utils/countObjectKeys'
 
diff --git a/packages/toolkit/src/query/core/buildMiddleware/polling.ts b/packages/toolkit/src/query/core/buildMiddleware/polling.ts
@@ -1,12 +1,12 @@
 import type { QuerySubstateIdentifier, Subscribers } from '../apiState'
 import { QueryStatus } from '../apiState'
 import type {
+  ApiMiddlewareInternalHandler,
+  InternalHandlerBuilder,
+  InternalMiddlewareState,
   QueryStateMeta,
   SubMiddlewareApi,
   TimeoutId,
-  InternalHandlerBuilder,
-  ApiMiddlewareInternalHandler,
-  InternalMiddlewareState,
 } from './types'
 
 export const buildPollingHandler: InternalHandlerBuilder = ({
diff --git a/packages/toolkit/src/query/core/buildThunks.ts b/packages/toolkit/src/query/core/buildThunks.ts
@@ -36,13 +36,13 @@ import type {
 import { forceQueryFnSymbol, isUpsertQuery } from './buildInitiate'
 import type { ApiEndpointQuery, PrefetchOptions } from './module'
 import {
+  SHOULD_AUTOBATCH,
   createAsyncThunk,
   isAllOf,
   isFulfilled,
   isPending,
   isRejected,
   isRejectedWithValue,
-  SHOULD_AUTOBATCH,
 } from './rtkImports'
 
 export type BuildThunksApiEndpointQuery<
diff --git a/packages/toolkit/src/query/core/setupListeners.ts b/packages/toolkit/src/query/core/setupListeners.ts
@@ -1,6 +1,6 @@
 import type {
-  ThunkDispatch,
-  ActionCreatorWithoutPayload, // Workaround for API-Extractor
+  ActionCreatorWithoutPayload,
+  ThunkDispatch, // Workaround for API-Extractor
 } from '@reduxjs/toolkit'
 import { createAction } from './rtkImports'
 
diff --git a/packages/toolkit/src/query/react/namedHooks.ts b/packages/toolkit/src/query/react/namedHooks.ts
@@ -1,4 +1,4 @@
-import type { UseMutation, UseLazyQuery, UseQuery } from './buildHooks'
+import type { UseLazyQuery, UseMutation, UseQuery } from './buildHooks'
 import type {
   DefinitionType,
   EndpointDefinitions,
diff --git a/packages/toolkit/src/query/react/useSerializedStableValue.ts b/packages/toolkit/src/query/react/useSerializedStableValue.ts
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useMemo } from 'react'
+import { useEffect, useMemo, useRef } from 'react'
 import type { SerializeQueryArgs } from '@reduxjs/toolkit/query'
 import type { EndpointDefinition } from '@reduxjs/toolkit/query'
 
diff --git a/packages/toolkit/src/query/tests/cleanup.test.tsx b/packages/toolkit/src/query/tests/cleanup.test.tsx
@@ -2,7 +2,7 @@
 import React from 'react'
 
 import { createListenerMiddleware } from '@reduxjs/toolkit'
-import { createApi, QueryStatus } from '@reduxjs/toolkit/query/react'
+import { QueryStatus, createApi } from '@reduxjs/toolkit/query/react'
 import { act, render, screen, waitFor } from '@testing-library/react'
 import { setupApiStore } from '../../tests/utils/helpers'
 import type { SubscriptionSelectors } from '../core/buildMiddleware/types'
diff --git a/packages/toolkit/src/query/tests/errorHandling.test.tsx b/packages/toolkit/src/query/tests/errorHandling.test.tsx
@@ -1,5 +1,5 @@
 import type { ThunkDispatch, UnknownAction } from '@reduxjs/toolkit'
-import type { BaseQueryFn, BaseQueryApi } from '@reduxjs/toolkit/query/react'
+import type { BaseQueryApi, BaseQueryFn } from '@reduxjs/toolkit/query/react'
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
 import {
   act,
diff --git a/packages/toolkit/src/query/tests/optimisticUpserts.test.tsx b/packages/toolkit/src/query/tests/optimisticUpserts.test.tsx
@@ -4,7 +4,7 @@ import {
   hookWaitFor,
   setupApiStore,
 } from '../../tests/utils/helpers'
-import { renderHook, act, waitFor } from '@testing-library/react'
+import { act, renderHook, waitFor } from '@testing-library/react'
 import { delay } from 'msw'
 
 interface Post {
diff --git a/packages/toolkit/src/query/tests/raceConditions.test.ts b/packages/toolkit/src/query/tests/raceConditions.test.ts
@@ -1,4 +1,4 @@
-import { createApi, QueryStatus } from '@reduxjs/toolkit/query'
+import { QueryStatus, createApi } from '@reduxjs/toolkit/query'
 import { delay } from 'msw'
 import { actionsReducer, setupApiStore } from '../../tests/utils/helpers'
 
diff --git a/packages/toolkit/src/query/tests/unionTypes.test-d.ts b/packages/toolkit/src/query/tests/unionTypes.test-d.ts
@@ -1,18 +1,18 @@
 import type { SerializedError } from '@reduxjs/toolkit'
 import type {
   FetchBaseQueryError,
-  TypedUseMutationResult,
-  TypedUseQueryHookResult,
-  TypedUseQueryState,
-  TypedUseQueryStateResult,
-  TypedUseQuerySubscriptionResult,
   TypedLazyQueryTrigger,
+  TypedMutationTrigger,
   TypedUseLazyQuery,
   TypedUseLazyQuerySubscription,
   TypedUseMutation,
-  TypedMutationTrigger,
-  TypedUseQuerySubscription,
+  TypedUseMutationResult,
   TypedUseQuery,
+  TypedUseQueryHookResult,
+  TypedUseQueryState,
+  TypedUseQueryStateResult,
+  TypedUseQuerySubscription,
+  TypedUseQuerySubscriptionResult,
 } from '@reduxjs/toolkit/query/react'
 import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
 
diff --git a/packages/toolkit/src/query/tests/utils.test.ts b/packages/toolkit/src/query/tests/utils.test.ts
@@ -1,8 +1,8 @@
 import { vi } from 'vitest'
 import {
-  isOnline,
-  isDocumentVisible,
   flatten,
+  isDocumentVisible,
+  isOnline,
   joinUrls,
 } from '@internal/query/utils'
 
diff --git a/packages/toolkit/src/tests/combinedTest.test.ts b/packages/toolkit/src/tests/combinedTest.test.ts
@@ -1,10 +1,10 @@
 import type { PayloadAction } from '@reduxjs/toolkit'
 import {
-  createAsyncThunk,
-  createAction,
-  createSlice,
   configureStore,
+  createAction,
+  createAsyncThunk,
   createEntityAdapter,
+  createSlice,
 } from '@reduxjs/toolkit'
 import type { EntityAdapter } from '@internal/entities/models'
 import type { BookModel } from '@internal/entities/tests/fixtures/book'
diff --git a/packages/toolkit/src/tests/createReducer.test.ts b/packages/toolkit/src/tests/createReducer.test.ts
@@ -1,17 +1,17 @@
 import { noop } from '@internal/tests/utils/helpers'
 import type {
   CaseReducer,
-  PayloadAction,
   Draft,
+  PayloadAction,
   Reducer,
   UnknownAction,
 } from '@reduxjs/toolkit'
 import { isPlainObject } from '@reduxjs/toolkit'
-import { createReducer, createAction, createNextState } from '@reduxjs/toolkit'
+import { createAction, createNextState, createReducer } from '@reduxjs/toolkit'
 import {
-  mockConsole,
   createConsole,
   getLog,
+  mockConsole,
 } from 'console-testing-library/pure'
 
 interface Todo {
diff --git a/packages/toolkit/src/tests/createSlice.test-d.ts b/packages/toolkit/src/tests/createSlice.test-d.ts
@@ -1,5 +1,4 @@
 import { noop } from '@internal/tests/utils/helpers'
-import type { AnyNonNullishValue, EmptyObject } from '@internal/tsHelpers'
 import type {
   Action,
   ActionCreatorWithNonInferrablePayload,
@@ -17,7 +16,6 @@ import type {
   SerializedError,
   SliceCaseReducers,
   ThunkDispatch,
-  UnknownAction,
   ValidateSliceCaseReducers,
 } from '@reduxjs/toolkit'
 import {
@@ -661,7 +659,7 @@ describe('type tests', () => {
               expectTypeOf(action.error).toEqualTypeOf<'error'>()
             },
           ),
-          testInferVoid: create.asyncThunk(() => {}, {
+          testInferVoid: create.asyncThunk(noop, {
             pending(state, action) {
               expectTypeOf(state).toEqualTypeOf<TestState>()
 
diff --git a/packages/toolkit/src/tests/matchers.test.ts b/packages/toolkit/src/tests/matchers.test.ts
@@ -1,16 +1,16 @@
 import { noop } from '@internal/tests/utils/helpers'
 import type { ThunkAction, UnknownAction } from '@reduxjs/toolkit'
 import {
+  createAction,
+  createAsyncThunk,
+  createReducer,
   isAllOf,
   isAnyOf,
   isAsyncThunkAction,
   isFulfilled,
   isPending,
   isRejected,
   isRejectedWithValue,
-  createAction,
-  createAsyncThunk,
-  createReducer,
 } from '@reduxjs/toolkit'
 
 const thunk: ThunkAction<any, any, any, UnknownAction> = noop
diff --git a/packages/toolkit/src/tests/serializableStateInvariantMiddleware.test.ts b/packages/toolkit/src/tests/serializableStateInvariantMiddleware.test.ts
@@ -1,12 +1,12 @@
 import { isNestedFrozen } from '@internal/serializableStateInvariantMiddleware'
 import type { Reducer } from '@reduxjs/toolkit'
 import {
+  Tuple,
   configureStore,
   createNextState,
   createSerializableStateInvariantMiddleware,
   findNonSerializableValue,
   isPlain,
-  Tuple,
 } from '@reduxjs/toolkit'
 import {
   createConsole,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { EntityAdapter, EntityId, EntityAdapterOptions } from './models'`
	`1`	`+import type { EntityAdapter, EntityAdapterOptions, EntityId } from './models'`
`2`	`2`	`import { createInitialStateFactory } from './entity_state'`
`3`	`3`	`import { createSelectorsFactory } from './state_selectors'`
`4`	`4`	`import { createSortedStateAdapter } from './sorted_state_adapter'`