Skip to content

Commit 9c721e5

Browse files
lachlancollinslachlancollins
authored
refactor: Sort imports with eslint (#5634)
1 parent 8f19f73 commit 9c721e5

File tree

129 files changed

+460
-437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+460
-437
lines changed

‎.eslintrc.cjs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const config = {
55
extends: [
66
'plugin:@typescript-eslint/eslint-recommended',
77
'plugin:@typescript-eslint/recommended',
8+
'plugin:import/recommended',
89
'plugin:import/typescript',
910
'prettier',
1011
],
@@ -41,15 +42,38 @@ const config = {
4142
'@typescript-eslint/no-explicit-any': 'off',
4243
'@typescript-eslint/no-non-null-assertion': 'off',
4344
'@typescript-eslint/no-unnecessary-condition': 'error',
45+
'@typescript-eslint/no-unused-vars': 'off',
4446
'@typescript-eslint/no-inferrable-types': [
4547
'error',
4648
{ ignoreParameters: true },
4749
],
50+
'import/default': 'off',
51+
'import/export': 'off',
52+
'import/namespace': 'off',
53+
'import/newline-after-import': 'error',
4854
'import/no-cycle': 'error',
55+
'import/no-duplicates': 'off',
56+
'import/no-named-as-default-member': 'off',
4957
'import/no-unresolved': ['error', { ignore: ['^@tanstack/'] }],
5058
'import/no-unused-modules': ['off', { unusedExports: true }],
59+
'import/order': [
60+
'error',
61+
{
62+
groups: [
63+
'builtin',
64+
'external',
65+
'internal',
66+
'parent',
67+
'sibling',
68+
'index',
69+
'object',
70+
'type',
71+
],
72+
},
73+
],
5174
'no-redeclare': 'off',
5275
'no-shadow': 'error',
76+
'sort-imports': ['error', { ignoreDeclarationSort: true }],
5377
},
5478
overrides: [
5579
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import type { TSESLint } from '@typescript-eslint/utils'
21
import { rules } from '../rules'
2+
import type { TSESLint } from '@typescript-eslint/utils'
33

44
function generateRecommendedConfig(
55
allRules: Record<string, TSESLint.RuleModule<any, any>>,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import type { TSESLint } from '@typescript-eslint/utils'
21
import { AST_NODE_TYPES } from '@typescript-eslint/utils'
32
import { ASTUtils } from '../../utils/ast-utils'
43
import { createRule } from '../../utils/create-rule'
54
import { uniqueBy } from '../../utils/unique-by'
65
import { ExhaustiveDepsUtils } from './exhaustive-deps.utils'
6+
import type { TSESLint } from '@typescript-eslint/utils'
77

88
const QUERY_KEY = 'queryKey'
99
const QUERY_FN = 'queryFn'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import type { TSESLint } from '@typescript-eslint/utils'
21
import { AST_NODE_TYPES } from '@typescript-eslint/utils'
32
import { ASTUtils } from '../../utils/ast-utils'
3+
import type { TSESLint } from '@typescript-eslint/utils'
44

55
export const ExhaustiveDepsUtils = {
66
isRelevantReference(params: {

‎packages/eslint-plugin-query/src/rules/prefer-query-object-syntax/prefer-query-object-syntax.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { rule, name } from './prefer-query-object-syntax'
2-
import { normalizeIndent } from '../../utils/test-utils'
31
import { ESLintUtils } from '@typescript-eslint/utils'
2+
import { normalizeIndent } from '../../utils/test-utils'
3+
import { name, rule } from './prefer-query-object-syntax'
44

55
const ruleTester = new ESLintUtils.RuleTester({
66
parser: '@typescript-eslint/parser',

‎packages/eslint-plugin-query/src/rules/prefer-query-object-syntax/prefer-query-object-syntax.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import type { TSESLint, TSESTree } from '@typescript-eslint/utils'
21
import { AST_NODE_TYPES } from '@typescript-eslint/utils'
32
import { createRule } from '../../utils/create-rule'
43
import { ASTUtils } from '../../utils/ast-utils'
54
import { objectKeys } from '../../utils/object-utils'
5+
import type { TSESLint, TSESTree } from '@typescript-eslint/utils'
66

77
const QUERY_CALLS = {
88
useQuery: { key: 'queryKey', fn: 'queryFn', type: 'query' },

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { AST_NODE_TYPES } from '@typescript-eslint/utils'
2+
import { uniqueBy } from './unique-by'
13
import type { TSESLint, TSESTree } from '@typescript-eslint/utils'
24
import type TSESLintScopeManager from '@typescript-eslint/scope-manager'
3-
import { AST_NODE_TYPES } from '@typescript-eslint/utils'
45
import type { RuleContext } from '@typescript-eslint/utils/dist/ts-eslint'
5-
import { uniqueBy } from './unique-by'
66

77
export const ASTUtils = {
88
isNodeOfOneOf<T extends AST_NODE_TYPES>(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ESLintUtils } from '@typescript-eslint/utils'
2-
import type { EnhancedCreate } from './detect-react-query-imports'
32
import { detectTanstackQueryImports } from './detect-react-query-imports'
3+
import type { EnhancedCreate } from './detect-react-query-imports'
44

55
const getDocsUrl = (ruleName: string): string =>
66
`https://tanstack.com/query/v4/docs/eslint/${ruleName}`

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import { asyncThrottle } from './asyncThrottle'
12
import type {
23
PersistedClient,
34
Persister,
45
Promisable,
56
} from '@tanstack/query-persist-client-core'
6-
import { asyncThrottle } from './asyncThrottle'
77

88
interface AsyncStorage {
99
getItem: (key: string) => Promise<string | null>

‎packages/query-core/src/infiniteQueryObserver.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
import { QueryObserver } from './queryObserver'
2+
import {
3+
hasNextPage,
4+
hasPreviousPage,
5+
infiniteQueryBehavior,
6+
} from './infiniteQueryBehavior'
17
import type {
28
DefaultedInfiniteQueryObserverOptions,
39
FetchNextPageOptions,
@@ -9,12 +15,6 @@ import type {
915
} from './types'
1016
import type { QueryClient } from './queryClient'
1117
import type { NotifyOptions, ObserverFetchOptions } from './queryObserver'
12-
import { QueryObserver } from './queryObserver'
13-
import {
14-
hasNextPage,
15-
hasPreviousPage,
16-
infiniteQueryBehavior,
17-
} from './infiniteQueryBehavior'
1818
import type { Query } from './query'
1919

2020
type InfiniteQueryObserverListener<TData, TError> = (

‎packages/query-core/src/mutation.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import type { MutationOptions, MutationStatus, MutationMeta } from './types'
2-
import type { MutationCache } from './mutationCache'
3-
import type { MutationObserver } from './mutationObserver'
4-
import type { Logger } from './logger'
51
import { defaultLogger } from './logger'
62
import { notifyManager } from './notifyManager'
73
import { Removable } from './removable'
8-
import type { Retryer } from './retryer'
94
import { canFetch, createRetryer } from './retryer'
5+
import type { MutationMeta, MutationOptions, MutationStatus } from './types'
6+
import type { MutationCache } from './mutationCache'
7+
import type { MutationObserver } from './mutationObserver'
8+
import type { Logger } from './logger'
9+
import type { Retryer } from './retryer'
1010

1111
// TYPES
1212

‎packages/query-core/src/mutationCache.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
import { notifyManager } from './notifyManager'
2+
import { Mutation } from './mutation'
3+
import { matchMutation, noop } from './utils'
4+
import { Subscribable } from './subscribable'
15
import type { MutationObserver } from './mutationObserver'
26
import type { MutationOptions, NotifyEvent } from './types'
37
import type { QueryClient } from './queryClient'
4-
import { notifyManager } from './notifyManager'
58
import type { Action, MutationState } from './mutation'
6-
import { Mutation } from './mutation'
79
import type { MutationFilters } from './utils'
8-
import { matchMutation, noop } from './utils'
9-
import { Subscribable } from './subscribable'
1010

1111
// TYPES
1212

‎packages/query-core/src/mutationObserver.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import type { Action, Mutation } from './mutation'
21
import { getDefaultState } from './mutation'
32
import { notifyManager } from './notifyManager'
4-
import type { QueryClient } from './queryClient'
53
import { Subscribable } from './subscribable'
4+
import { shallowEqualObjects } from './utils'
5+
import type { QueryClient } from './queryClient'
66
import type {
77
MutateOptions,
88
MutationObserverBaseResult,
9-
MutationObserverResult,
109
MutationObserverOptions,
10+
MutationObserverResult,
1111
} from './types'
12-
import { shallowEqualObjects } from './utils'
12+
import type { Action, Mutation } from './mutation'
1313

1414
// TYPES
1515

‎packages/query-core/src/queriesObserver.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { difference, replaceAt } from './utils'
22
import { notifyManager } from './notifyManager'
3+
import { QueryObserver } from './queryObserver'
4+
import { Subscribable } from './subscribable'
35
import type {
6+
DefaultedQueryObserverOptions,
47
QueryObserverOptions,
58
QueryObserverResult,
6-
DefaultedQueryObserverOptions,
79
} from './types'
810
import type { QueryClient } from './queryClient'
911
import type { NotifyOptions } from './queryObserver'
10-
import { QueryObserver } from './queryObserver'
11-
import { Subscribable } from './subscribable'
1212

1313
type QueriesObserverListener = (result: QueryObserverResult[]) => void
1414

‎packages/query-core/src/query.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import { getAbortController, noop, replaceData, timeUntilStale } from './utils'
2+
import { defaultLogger } from './logger'
3+
import { notifyManager } from './notifyManager'
4+
import { canFetch, createRetryer, isCancelledError } from './retryer'
5+
import { Removable } from './removable'
26
import type {
7+
CancelOptions,
8+
FetchStatus,
39
InitialDataFunction,
10+
QueryFunctionContext,
411
QueryKey,
12+
QueryMeta,
513
QueryOptions,
614
QueryStatus,
7-
QueryFunctionContext,
8-
QueryMeta,
9-
CancelOptions,
1015
SetDataOptions,
11-
FetchStatus,
1216
} from './types'
1317
import type { QueryCache } from './queryCache'
1418
import type { QueryObserver } from './queryObserver'
1519
import type { Logger } from './logger'
16-
import { defaultLogger } from './logger'
17-
import { notifyManager } from './notifyManager'
1820
import type { Retryer } from './retryer'
19-
import { isCancelledError, canFetch, createRetryer } from './retryer'
20-
import { Removable } from './removable'
2121

2222
// TYPES
2323

‎packages/query-core/src/queryCache.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import type { QueryFilters } from './utils'
21
import { hashQueryKeyByOptions, matchQuery, parseFilterArgs } from './utils'
3-
import type { Action, QueryState } from './query'
42
import { Query } from './query'
5-
import type { NotifyEvent, QueryKey, QueryOptions } from './types'
63
import { notifyManager } from './notifyManager'
7-
import type { QueryClient } from './queryClient'
84
import { Subscribable } from './subscribable'
5+
import type { QueryFilters } from './utils'
6+
import type { Action, QueryState } from './query'
7+
import type { NotifyEvent, QueryKey, QueryOptions } from './types'
8+
import type { QueryClient } from './queryClient'
99
import type { QueryObserver } from './queryObserver'
1010

1111
// TYPES

‎packages/query-core/src/queryClient.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
1-
import type { QueryFilters, Updater, MutationFilters } from './utils'
21
import {
2+
functionalUpdate,
33
hashQueryKey,
4+
hashQueryKeyByOptions,
45
noop,
56
parseFilterArgs,
67
parseQueryArgs,
78
partialMatchKey,
8-
hashQueryKeyByOptions,
9-
functionalUpdate,
109
} from './utils'
10+
import { QueryCache } from './queryCache'
11+
import { MutationCache } from './mutationCache'
12+
import { focusManager } from './focusManager'
13+
import { onlineManager } from './onlineManager'
14+
import { notifyManager } from './notifyManager'
15+
import { infiniteQueryBehavior } from './infiniteQueryBehavior'
16+
import { defaultLogger } from './logger'
17+
import type { CancelOptions, DefaultedQueryObserverOptions } from './types'
18+
import type { Logger } from './logger'
19+
import type { QueryState } from './query'
1120
import type {
12-
QueryClientConfig,
1321
DefaultOptions,
1422
FetchInfiniteQueryOptions,
1523
FetchQueryOptions,
@@ -19,6 +27,7 @@ import type {
1927
MutationKey,
2028
MutationObserverOptions,
2129
MutationOptions,
30+
QueryClientConfig,
2231
QueryFunction,
2332
QueryKey,
2433
QueryObserverOptions,
@@ -30,16 +39,7 @@ import type {
3039
SetDataOptions,
3140
WithRequired,
3241
} from './types'
33-
import type { QueryState } from './query'
34-
import { QueryCache } from './queryCache'
35-
import { MutationCache } from './mutationCache'
36-
import { focusManager } from './focusManager'
37-
import { onlineManager } from './onlineManager'
38-
import { notifyManager } from './notifyManager'
39-
import { infiniteQueryBehavior } from './infiniteQueryBehavior'
40-
import type { CancelOptions, DefaultedQueryObserverOptions } from './types'
41-
import type { Logger } from './logger'
42-
import { defaultLogger } from './logger'
42+
import type { MutationFilters, QueryFilters, Updater } from './utils'
4343

4444
// TYPES
4545

‎packages/query-core/src/queryObserver.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import type { DefaultedQueryObserverOptions, RefetchPageFilters } from './types'
21
import {
32
isServer,
43
isValidTimeout,
@@ -8,6 +7,9 @@ import {
87
timeUntilStale,
98
} from './utils'
109
import { notifyManager } from './notifyManager'
10+
import { focusManager } from './focusManager'
11+
import { Subscribable } from './subscribable'
12+
import { canFetch, isCancelledError } from './retryer'
1113
import type {
1214
PlaceholderDataFunction,
1315
QueryKey,
@@ -17,11 +19,9 @@ import type {
1719
QueryOptions,
1820
RefetchOptions,
1921
} from './types'
20-
import type { Query, QueryState, Action, FetchOptions } from './query'
22+
import type { Action, FetchOptions, Query, QueryState } from './query'
2123
import type { QueryClient } from './queryClient'
22-
import { focusManager } from './focusManager'
23-
import { Subscribable } from './subscribable'
24-
import { canFetch, isCancelledError } from './retryer'
24+
import type { DefaultedQueryObserverOptions, RefetchPageFilters } from './types'
2525

2626
type QueryObserverListener<TData, TError> = (
2727
result: QueryObserverResult<TData, TError>,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import { QueryCache } from '../queryCache'
2+
import { dehydrate, hydrate } from '../hydration'
13
import {
24
createQueryClient,
35
executeMutation,
46
mockNavigatorOnLine,
57
sleep,
68
} from './utils'
7-
import { QueryCache } from '../queryCache'
8-
import { dehydrate, hydrate } from '../hydration'
99

1010
async function fetchData<TData>(value: TData, ms?: number): Promise<TData> {
1111
await sleep(ms || 0)

‎packages/query-core/src/tests/infiniteQueryBehavior.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { waitFor } from '@testing-library/react'
2+
import { InfiniteQueryObserver } from '@tanstack/query-core'
3+
import { createQueryClient, queryKey } from './utils'
24
import type {
3-
QueryClient,
45
InfiniteQueryObserverResult,
56
QueryCache,
7+
QueryClient,
68
} from '@tanstack/query-core'
7-
import { InfiniteQueryObserver } from '@tanstack/query-core'
8-
import { createQueryClient, queryKey } from './utils'
99

1010
describe('InfiniteQueryBehavior', () => {
1111
let queryClient: QueryClient

‎packages/query-core/src/tests/infiniteQueryObserver.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { InfiniteQueryObserver } from '..'
12
import { createQueryClient, queryKey, sleep } from './utils'
23
import type { QueryClient } from '..'
3-
import { InfiniteQueryObserver } from '..'
44

55
describe('InfiniteQueryObserver', () => {
66
let queryClient: QueryClient

‎packages/query-core/src/tests/mutationCache.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { waitFor } from '@testing-library/react'
2-
import { queryKey, sleep, executeMutation, createQueryClient } from './utils'
32
import { MutationCache, MutationObserver } from '..'
3+
import { createQueryClient, executeMutation, queryKey, sleep } from './utils'
44

55
describe('mutationCache', () => {
66
describe('MutationCacheConfig error callbacks', () => {

0 commit comments

Comments
 (0)