refactor: Add new eslint sorting from main (#5723)

Author: lachlancollins

.eslintrc.cjs

@@ -54,13 +54,31 @@ const config = {
     ],
     'import/default': 'off',
     'import/export': 'off',
+    'import/namespace': 'off',
     'import/newline-after-import': 'error',
     'import/no-cycle': 'error',
     'import/no-duplicates': 'off',
+    'import/no-named-as-default-member': 'off',
     'import/no-unresolved': ['error', { ignore: ['^@tanstack/'] }],
     'import/no-unused-modules': ['off', { unusedExports: true }],
+    'import/order': [
+      'error',
+      {
+        groups: [
+          'builtin',
+          'external',
+          'internal',
+          'parent',
+          'sibling',
+          'index',
+          'object',
+          'type',
+        ],
+      },
+    ],
     'no-redeclare': 'off',
     'no-shadow': 'error',
+    'sort-imports': ['error', { ignoreDeclarationSort: true }],
   },
   overrides: [
     {

packages/eslint-plugin-query/src/configs/index.ts

@@ -1,5 +1,5 @@
-import type { TSESLint } from '@typescript-eslint/utils'
 import { rules } from '../rules'
+import type { TSESLint } from '@typescript-eslint/utils'
 
 function generateRecommendedConfig(
   allRules: Record<string, TSESLint.RuleModule<any, any>>,

packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.rule.ts

@@ -1,9 +1,9 @@
-import type { TSESLint } from '@typescript-eslint/utils'
 import { AST_NODE_TYPES } from '@typescript-eslint/utils'
 import { ASTUtils } from '../../utils/ast-utils'
 import { createRule } from '../../utils/create-rule'
 import { uniqueBy } from '../../utils/unique-by'
 import { ExhaustiveDepsUtils } from './exhaustive-deps.utils'
+import type { TSESLint } from '@typescript-eslint/utils'
 
 const QUERY_KEY = 'queryKey'
 const QUERY_FN = 'queryFn'

packages/eslint-plugin-query/src/rules/exhaustive-deps/exhaustive-deps.utils.ts

@@ -1,6 +1,6 @@
-import type { TSESLint } from '@typescript-eslint/utils'
 import { AST_NODE_TYPES } from '@typescript-eslint/utils'
 import { ASTUtils } from '../../utils/ast-utils'
+import type { TSESLint } from '@typescript-eslint/utils'
 
 export const ExhaustiveDepsUtils = {
   isRelevantReference(params: {

packages/eslint-plugin-query/src/utils/ast-utils.ts

@@ -1,8 +1,8 @@
+import { AST_NODE_TYPES } from '@typescript-eslint/utils'
+import { uniqueBy } from './unique-by'
 import type { TSESLint, TSESTree } from '@typescript-eslint/utils'
 import type TSESLintScopeManager from '@typescript-eslint/scope-manager'
-import { AST_NODE_TYPES } from '@typescript-eslint/utils'
 import type { RuleContext } from '@typescript-eslint/utils/dist/ts-eslint'
-import { uniqueBy } from './unique-by'
 
 export const ASTUtils = {
   isNodeOfOneOf<T extends AST_NODE_TYPES>(

packages/eslint-plugin-query/src/utils/create-rule.ts

@@ -1,6 +1,6 @@
 import { ESLintUtils } from '@typescript-eslint/utils'
-import type { EnhancedCreate } from './detect-react-query-imports'
 import { detectTanstackQueryImports } from './detect-react-query-imports'
+import type { EnhancedCreate } from './detect-react-query-imports'
 
 const getDocsUrl = (ruleName: string): string =>
   `https://tanstack.com/query/v4/docs/eslint/${ruleName}`

packages/query-async-storage-persister/src/__tests__/asyncThrottle.test.ts

@@ -1,6 +1,6 @@
+import { vi } from 'vitest'
 import { asyncThrottle } from '../asyncThrottle'
 import { sleep as delay } from './utils'
-import { vi } from 'vitest'
 
 describe('asyncThrottle', () => {
   test('basic', async () => {

packages/query-async-storage-persister/src/index.ts

@@ -1,9 +1,9 @@
+import { asyncThrottle } from './asyncThrottle'
 import type {
   PersistedClient,
   Persister,
   Promisable,
 } from '@tanstack/query-persist-client-core'
-import { asyncThrottle } from './asyncThrottle'
 
 interface AsyncStorage {
   getItem: (key: string) => Promise<string | null>

packages/query-core/src/infiniteQueryBehavior.ts

@@ -1,5 +1,5 @@
-import type { QueryBehavior } from './query'
 import { addToEnd, addToStart } from './utils'
+import type { QueryBehavior } from './query'
 import type {
   InfiniteData,
   InfiniteQueryPageParamsOptions,

packages/query-core/src/infiniteQueryObserver.ts

@@ -1,21 +1,21 @@
+import { QueryObserver } from './queryObserver'
+import {
+  hasNextPage,
+  hasPreviousPage,
+  infiniteQueryBehavior,
+} from './infiniteQueryBehavior'
 import type {
+  DefaultError,
   DefaultedInfiniteQueryObserverOptions,
   FetchNextPageOptions,
   FetchPreviousPageOptions,
   InfiniteData,
   InfiniteQueryObserverOptions,
   InfiniteQueryObserverResult,
   QueryKey,
-  DefaultError,
 } from './types'
 import type { QueryClient } from './queryClient'
 import type { NotifyOptions, ObserverFetchOptions } from './queryObserver'
-import { QueryObserver } from './queryObserver'
-import {
-  hasNextPage,
-  hasPreviousPage,
-  infiniteQueryBehavior,
-} from './infiniteQueryBehavior'
 import type { Query } from './query'
 
 type InfiniteQueryObserverListener<TData, TError> = (

packages/query-core/src/mutation.ts

@@ -1,15 +1,15 @@
+import { notifyManager } from './notifyManager'
+import { Removable } from './removable'
+import { canFetch, createRetryer } from './retryer'
 import type {
+  DefaultError,
+  MutationMeta,
   MutationOptions,
   MutationStatus,
-  MutationMeta,
-  DefaultError,
 } from './types'
 import type { MutationCache } from './mutationCache'
 import type { MutationObserver } from './mutationObserver'
-import { notifyManager } from './notifyManager'
-import { Removable } from './removable'
 import type { Retryer } from './retryer'
-import { canFetch, createRetryer } from './retryer'
 
 // TYPES
 

packages/query-core/src/mutationCache.ts

@@ -1,12 +1,12 @@
-import type { MutationObserver } from './mutationObserver'
-import type { NotifyEvent, MutationOptions, DefaultError } from './types'
-import type { QueryClient } from './queryClient'
 import { notifyManager } from './notifyManager'
-import type { Action, MutationState } from './mutation'
 import { Mutation } from './mutation'
-import type { MutationFilters } from './utils'
 import { matchMutation, noop } from './utils'
 import { Subscribable } from './subscribable'
+import type { MutationObserver } from './mutationObserver'
+import type { DefaultError, MutationOptions, NotifyEvent } from './types'
+import type { QueryClient } from './queryClient'
+import type { Action, MutationState } from './mutation'
+import type { MutationFilters } from './utils'
 
 // TYPES
 

packages/query-core/src/mutationObserver.ts

@@ -1,15 +1,15 @@
-import type { Action, Mutation } from './mutation'
 import { getDefaultState } from './mutation'
 import { notifyManager } from './notifyManager'
-import type { QueryClient } from './queryClient'
 import { Subscribable } from './subscribable'
+import { shallowEqualObjects } from './utils'
+import type { QueryClient } from './queryClient'
 import type {
+  DefaultError,
   MutateOptions,
-  MutationObserverResult,
   MutationObserverOptions,
-  DefaultError,
+  MutationObserverResult,
 } from './types'
-import { shallowEqualObjects } from './utils'
+import type { Action, Mutation } from './mutation'
 
 // TYPES
 

packages/query-core/src/queriesObserver.ts

@@ -1,14 +1,14 @@
 import { notifyManager } from './notifyManager'
+import { QueryObserver } from './queryObserver'
+import { Subscribable } from './subscribable'
+import { replaceEqualDeep } from './utils'
 import type {
+  DefaultedQueryObserverOptions,
   QueryObserverOptions,
   QueryObserverResult,
-  DefaultedQueryObserverOptions,
 } from './types'
 import type { QueryClient } from './queryClient'
 import type { NotifyOptions } from './queryObserver'
-import { QueryObserver } from './queryObserver'
-import { Subscribable } from './subscribable'
-import { replaceEqualDeep } from './utils'
 
 function difference<T>(array1: T[], array2: T[]): T[] {
   return array1.filter((x) => !array2.includes(x))

packages/query-core/src/query.ts

@@ -1,22 +1,22 @@
 import { noop, replaceData, timeUntilStale } from './utils'
+import { notifyManager } from './notifyManager'
+import { canFetch, createRetryer, isCancelledError } from './retryer'
+import { Removable } from './removable'
 import type {
+  CancelOptions,
+  DefaultError,
+  FetchStatus,
   InitialDataFunction,
+  QueryFunctionContext,
   QueryKey,
+  QueryMeta,
   QueryOptions,
   QueryStatus,
-  QueryFunctionContext,
-  QueryMeta,
-  CancelOptions,
   SetDataOptions,
-  FetchStatus,
-  DefaultError,
 } from './types'
 import type { QueryCache } from './queryCache'
 import type { QueryObserver } from './queryObserver'
-import { notifyManager } from './notifyManager'
 import type { Retryer } from './retryer'
-import { isCancelledError, canFetch, createRetryer } from './retryer'
-import { Removable } from './removable'
 
 // TYPES
 

packages/query-core/src/queryCache.ts

@@ -1,17 +1,17 @@
-import type { QueryFilters } from './utils'
 import { hashQueryKeyByOptions, matchQuery } from './utils'
-import type { Action, QueryState } from './query'
 import { Query } from './query'
+import { notifyManager } from './notifyManager'
+import { Subscribable } from './subscribable'
+import type { QueryFilters } from './utils'
+import type { Action, QueryState } from './query'
 import type {
+  DefaultError,
   NotifyEvent,
   QueryKey,
   QueryOptions,
-  DefaultError,
   WithRequired,
 } from './types'
-import { notifyManager } from './notifyManager'
 import type { QueryClient } from './queryClient'
-import { Subscribable } from './subscribable'
 import type { QueryObserver } from './queryObserver'
 
 // TYPES

packages/query-core/src/queryClient.ts

@@ -1,14 +1,22 @@
-import type { QueryFilters, Updater, MutationFilters } from './utils'
 import {
+  functionalUpdate,
   hashKey,
+  hashQueryKeyByOptions,
   noop,
   partialMatchKey,
-  hashQueryKeyByOptions,
-  functionalUpdate,
 } from './utils'
+import { QueryCache } from './queryCache'
+import { MutationCache } from './mutationCache'
+import { focusManager } from './focusManager'
+import { onlineManager } from './onlineManager'
+import { notifyManager } from './notifyManager'
+import { infiniteQueryBehavior } from './infiniteQueryBehavior'
+import type { QueryState } from './query'
 import type {
-  QueryClientConfig,
+  CancelOptions,
+  DefaultError,
   DefaultOptions,
+  DefaultedQueryObserverOptions,
   FetchInfiniteQueryOptions,
   FetchQueryOptions,
   InfiniteData,
@@ -17,24 +25,16 @@ import type {
   MutationKey,
   MutationObserverOptions,
   MutationOptions,
+  QueryClientConfig,
   QueryKey,
   QueryObserverOptions,
   QueryOptions,
   RefetchOptions,
   RefetchQueryFilters,
   ResetOptions,
   SetDataOptions,
-  DefaultError,
-  CancelOptions,
-  DefaultedQueryObserverOptions,
 } from './types'
-import type { QueryState } from './query'
-import { QueryCache } from './queryCache'
-import { MutationCache } from './mutationCache'
-import { focusManager } from './focusManager'
-import { onlineManager } from './onlineManager'
-import { notifyManager } from './notifyManager'
-import { infiniteQueryBehavior } from './infiniteQueryBehavior'
+import type { MutationFilters, QueryFilters, Updater } from './utils'
 
 // TYPES
 

packages/query-core/src/queryObserver.ts

@@ -1,14 +1,3 @@
-import type {
-  DefaultedQueryObserverOptions,
-  DefaultError,
-  PlaceholderDataFunction,
-  QueryKey,
-  QueryObserverBaseResult,
-  QueryObserverOptions,
-  QueryObserverResult,
-  QueryOptions,
-  RefetchOptions,
-} from './types'
 import {
   isServer,
   isValidTimeout,
@@ -18,11 +7,22 @@ import {
   timeUntilStale,
 } from './utils'
 import { notifyManager } from './notifyManager'
-import type { Query, QueryState, FetchOptions } from './query'
-import type { QueryClient } from './queryClient'
 import { focusManager } from './focusManager'
 import { Subscribable } from './subscribable'
 import { canFetch } from './retryer'
+import type { QueryClient } from './queryClient'
+import type { FetchOptions, Query, QueryState } from './query'
+import type {
+  DefaultError,
+  DefaultedQueryObserverOptions,
+  PlaceholderDataFunction,
+  QueryKey,
+  QueryObserverBaseResult,
+  QueryObserverOptions,
+  QueryObserverResult,
+  QueryOptions,
+  RefetchOptions,
+} from './types'
 
 type QueryObserverListener<TData, TError> = (
   result: QueryObserverResult<TData, TError>,

packages/query-core/src/retryer.ts

@@ -1,7 +1,7 @@
 import { focusManager } from './focusManager'
 import { onlineManager } from './onlineManager'
 import { sleep } from './utils'
-import type { CancelOptions, NetworkMode, DefaultError } from './types'
+import type { CancelOptions, DefaultError, NetworkMode } from './types'
 
 // TYPES
 

packages/query-core/src/tests/focusManager.test.tsx

@@ -1,7 +1,7 @@
+import { vi } from 'vitest'
 import { sleep } from '../utils'
 import { FocusManager } from '../focusManager'
 import { setIsServer } from './utils'
-import { vi } from 'vitest'
 
 describe('focusManager', () => {
   let focusManager: FocusManager

packages/query-core/src/tests/hydration.test.tsx

@@ -1,12 +1,12 @@
+import { vi } from 'vitest'
+import { QueryCache } from '../queryCache'
+import { dehydrate, hydrate } from '../hydration'
 import {
   createQueryClient,
   executeMutation,
   mockNavigatorOnLine,
   sleep,
 } from './utils'
-import { QueryCache } from '../queryCache'
-import { dehydrate, hydrate } from '../hydration'
-import { vi } from 'vitest'
 
 async function fetchData<TData>(value: TData, ms?: number): Promise<TData> {
   await sleep(ms || 0)