Skip to content

Commit 86d8438

Browse files
chore: better type vs value import separation (#7972)
1 parent 756164a commit 86d8438

File tree

22 files changed

+69
-98
lines changed

22 files changed

+69
-98
lines changed

examples/react/react-native/src/components/ErrorMessage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react'
2-
import { Text, View, StyleSheet } from 'react-native'
2+
import { StyleSheet, Text, View } from 'react-native'
33

44
type Props = {
55
message: string

examples/react/react-native/src/components/ListItem.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react'
2-
import { View, StyleSheet } from 'react-native'
2+
import { StyleSheet, View } from 'react-native'
33
import { Paragraph, TouchableRipple } from 'react-native-paper'
4-
import { MovieDetails } from '../lib/api'
4+
import type { MovieDetails } from '../lib/api'
55

66
type Props = {
77
item: MovieDetails

examples/react/react-native/src/components/LoadingIndicator.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react'
2-
import { ActivityIndicator, View, StyleSheet } from 'react-native'
2+
import { ActivityIndicator, StyleSheet, View } from 'react-native'
33

44
export function LoadingIndicator() {
55
return (

examples/react/react-native/src/hooks/useAppState.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { useEffect } from 'react'
2-
import { AppState, AppStateStatus } from 'react-native'
2+
import { AppState } from 'react-native'
3+
import type { AppStateStatus } from 'react-native'
34

45
export function useAppState(onChange: (status: AppStateStatus) => void) {
56
useEffect(() => {

examples/react/react-native/src/navigation/MoviesStack.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { createStackNavigator } from '@react-navigation/stack'
33

44
import { MoviesListScreen } from '../screens/MoviesListScreen'
55
import { MovieDetailsScreen } from '../screens/MovieDetailsScreen'
6-
import { MoviesStackNavigator } from './types'
6+
import type { MoviesStackNavigator } from './types'
77

88
const Stack = createStackNavigator<MoviesStackNavigator>()
99

examples/react/react-native/src/navigation/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Movie } from '../lib/api'
1+
import type { Movie } from '../lib/api'
22

33
export type MoviesStackNavigator = {
44
MoviesList: undefined

examples/react/react-native/src/screens/MovieDetailsScreen.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import * as React from 'react'
2-
import { View, RefreshControl, StyleSheet, ScrollView } from 'react-native'
3-
import { Title, Paragraph } from 'react-native-paper'
4-
import { StackNavigationProp } from '@react-navigation/stack'
5-
import { RouteProp } from '@react-navigation/native'
2+
import { RefreshControl, ScrollView, StyleSheet, View } from 'react-native'
3+
import { Paragraph, Title } from 'react-native-paper'
64
import { useQuery } from '@tanstack/react-query'
7-
85
import { LoadingIndicator } from '../components/LoadingIndicator'
96
import { ErrorMessage } from '../components/ErrorMessage'
107
import { useRefreshByUser } from '../hooks/useRefreshByUser'
11-
import { fetchMovie, MovieDetails } from '../lib/api'
8+
import { fetchMovie } from '../lib/api'
9+
import type { MovieDetails } from '../lib/api'
1210
import type { MoviesStackNavigator } from '../navigation/types'
11+
import type { StackNavigationProp } from '@react-navigation/stack'
12+
import type { RouteProp } from '@react-navigation/native'
1313

1414
type MoviesDetailsScreenNavigationProp = StackNavigationProp<
1515
MoviesStackNavigator,

examples/react/react-native/src/screens/MoviesListScreen.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import * as React from 'react'
22
import { FlatList, RefreshControl } from 'react-native'
33
import { useQuery } from '@tanstack/react-query'
4-
5-
import { StackNavigationProp } from '@react-navigation/stack'
64
import { LoadingIndicator } from '../components/LoadingIndicator'
75
import { ErrorMessage } from '../components/ErrorMessage'
86
import { Divider } from '../components/Divider'
97
import { ListItem } from '../components/ListItem'
108
import { useRefreshByUser } from '../hooks/useRefreshByUser'
119
import { useRefreshOnFocus } from '../hooks/useRefreshOnFocus'
12-
import { fetchMovies, Movie, MovieDetails } from '../lib/api'
13-
import { MoviesStackNavigator } from '../navigation/types'
10+
import { fetchMovies } from '../lib/api'
11+
import type { Movie, MovieDetails } from '../lib/api'
12+
import type { MoviesStackNavigator } from '../navigation/types'
13+
import type { StackNavigationProp } from '@react-navigation/stack'
1414

1515
type MoviesListScreenNavigationProp = StackNavigationProp<
1616
MoviesStackNavigator,

examples/react/react-router/src/routes/root.tsx

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
import {
2-
Outlet,
3-
useLoaderData,
42
Link,
53
NavLink,
4+
Outlet,
5+
useLoaderData,
66
useNavigation,
77
useSubmit,
8-
LoaderFunctionArgs,
98
} from 'react-router-dom'
109
import { useDebounce } from 'rooks'
11-
12-
import { getContacts } from '../contacts'
1310
import {
14-
useSuspenseQuery,
15-
useIsFetching,
16-
type QueryClient,
1711
queryOptions,
12+
useIsFetching,
13+
useSuspenseQuery,
1814
} from '@tanstack/react-query'
15+
import { getContacts } from '../contacts'
16+
import type { QueryClient } from '@tanstack/react-query'
17+
import type { LoaderFunctionArgs } from 'react-router-dom'
1918

2019
const contactListQuery = (q?: string) =>
2120
queryOptions({

examples/svelte/playground/src/routes/AddTodo.svelte

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
<script lang="ts">
22
import { createMutation, useQueryClient } from '@tanstack/svelte-query'
3-
import {
4-
errorRate,
5-
queryTimeMin,
6-
queryTimeMax,
7-
list,
8-
id,
9-
type Todo,
10-
} from '../lib/stores'
3+
import { errorRate, queryTimeMin, queryTimeMax, list, id } from '$lib/stores'
4+
import type { Todo } from '$lib/stores'
115
126
const queryClient = useQueryClient()
137

examples/svelte/playground/src/routes/EditTodo.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
queryTimeMax,
1111
list,
1212
editingIndex,
13-
type Todo,
1413
} from '$lib/stores'
1514
import { derived } from 'svelte/store'
15+
import type { Todo } from '$lib/stores'
1616
1717
const queryClient = useQueryClient()
1818

examples/svelte/playground/src/routes/TodosList.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
queryTimeMax,
77
list,
88
editingIndex,
9-
type Todos,
109
} from '$lib/stores'
1110
import { derived, writable } from 'svelte/store'
11+
import type { Todos } from '$lib/stores'
1212
1313
export let initialFilter: string
1414

packages/angular-query-experimental/etc/angular-query-experimental.api.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import type { InitialDataFunction } from '@tanstack/query-core';
1616
import { InjectOptions } from '@angular/core';
1717
import { Injector } from '@angular/core';
1818
import type { MutateFunction } from '@tanstack/query-core';
19-
import { Mutation } from '@tanstack/query-core';
19+
import type { Mutation } from '@tanstack/query-core';
2020
import { MutationFilters } from '@tanstack/query-core';
2121
import type { MutationObserverOptions } from '@tanstack/query-core';
2222
import type { MutationObserverResult } from '@tanstack/query-core';
23-
import { MutationState } from '@tanstack/query-core';
23+
import type { MutationState } from '@tanstack/query-core';
2424
import type { OmitKeyof } from '@tanstack/query-core';
2525
import { Provider } from '@angular/core';
2626
import type { QueriesPlaceholderDataFunction } from '@tanstack/query-core';

packages/angular-query-experimental/src/__tests__/util/lazy-init/lazy-init.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { describe, expect, test } from 'vitest'
22
import {
33
ChangeDetectionStrategy,
44
Component,
5-
type WritableSignal,
65
computed,
76
effect,
87
input,
@@ -11,6 +10,7 @@ import {
1110
import { TestBed } from '@angular/core/testing'
1211
import { flushQueue, setFixtureSignalInputs } from '../../test-utils'
1312
import { lazyInit } from '../../../util/lazy-init/lazy-init'
13+
import type { WritableSignal } from '@angular/core'
1414

1515
describe('lazyInit', () => {
1616
test('should init lazily in next tick when not accessing manually', async () => {

packages/angular-query-experimental/src/__tests__/util/lazy-signal-initializer/lazy-signal-initializer.test.ts

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
import { describe, expect, test } from 'vitest'
2-
import {
3-
Component,
4-
type Signal,
5-
type WritableSignal,
6-
effect,
7-
input,
8-
signal,
9-
} from '@angular/core'
2+
import { Component, effect, input, signal } from '@angular/core'
103
import { TestBed } from '@angular/core/testing'
114
import { lazySignalInitializer } from '../../../util/lazy-signal-initializer/lazy-signal-initializer'
125
import { flushQueue, setFixtureSignalInputs } from '../../test-utils'
6+
import type { Signal, WritableSignal } from '@angular/core'
137

148
describe('lazySignalInitializer', () => {
159
test('should init lazily in next tick when not accessing manually', async () => {

packages/angular-query-experimental/src/inject-mutation-state.ts

+7-8
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,17 @@ import {
66
signal,
77
untracked,
88
} from '@angular/core'
9-
import {
10-
type Mutation,
11-
type MutationCache,
12-
type MutationFilters,
13-
type MutationState,
14-
notifyManager,
15-
replaceEqualDeep,
16-
} from '@tanstack/query-core'
9+
import { notifyManager, replaceEqualDeep } from '@tanstack/query-core'
1710
import { assertInjector } from './util/assert-injector/assert-injector'
1811
import { injectQueryClient } from './inject-query-client'
1912
import { lazySignalInitializer } from './util/lazy-signal-initializer/lazy-signal-initializer'
2013
import type { Injector, Signal } from '@angular/core'
14+
import type {
15+
Mutation,
16+
MutationCache,
17+
MutationFilters,
18+
MutationState,
19+
} from '@tanstack/query-core'
2120

2221
type MutationStateOptions<TResult = MutationState> = {
2322
filters?: MutationFilters

packages/angular-query-experimental/src/util/create-injection-token/create-injection-token.ts

+13-15
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,20 @@
1111
*/
1212
/* eslint-enable */
1313

14-
import {
15-
type EnvironmentProviders,
16-
type FactoryProvider,
17-
type Host,
18-
type InjectOptions,
19-
InjectionToken,
20-
type Injector,
21-
type Optional,
22-
type Provider,
23-
type Self,
24-
type SkipSelf,
25-
type Type,
26-
inject,
27-
runInInjectionContext,
28-
} from '@angular/core'
14+
import { InjectionToken, inject, runInInjectionContext } from '@angular/core'
2915
import { assertInjector } from '../assert-injector/assert-injector'
16+
import type {
17+
EnvironmentProviders,
18+
FactoryProvider,
19+
Host,
20+
InjectOptions,
21+
Injector,
22+
Optional,
23+
Provider,
24+
Self,
25+
SkipSelf,
26+
Type,
27+
} from '@angular/core'
3028

3129
type CreateInjectionTokenDep<TTokenType> =
3230
| Type<TTokenType>

packages/angular-query-experimental/src/util/lazy-signal-initializer/lazy-signal-initializer.ts

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
import {
2-
Injector,
3-
type Signal,
4-
computed,
5-
inject,
6-
untracked,
7-
} from '@angular/core'
1+
import { Injector, computed, inject, untracked } from '@angular/core'
2+
import type { Signal } from '@angular/core'
83

94
type SignalInitializerFn<T> = (injector: Injector) => Signal<T>
105

packages/react-query/src/useSuspenseQueries.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
'use client'
2-
import {
3-
type DefaultError,
4-
type QueryClient,
5-
type QueryFunction,
6-
type ThrowOnError,
7-
skipToken,
8-
} from '@tanstack/query-core'
2+
import { skipToken } from '@tanstack/query-core'
93
import { useQueries } from './useQueries'
104
import { defaultThrowOnError } from './suspense'
115
import type { UseSuspenseQueryOptions, UseSuspenseQueryResult } from './types'
6+
import type {
7+
DefaultError,
8+
QueryClient,
9+
QueryFunction,
10+
ThrowOnError,
11+
} from '@tanstack/query-core'
1212

1313
// Avoid TS depth-limit error in case of large array literal
1414
type MAXIMUM_DEPTH = 20

packages/svelte-query/src/useHydrate.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
import {
2-
type HydrateOptions,
3-
type QueryClient,
4-
hydrate,
5-
} from '@tanstack/query-core'
1+
import { hydrate } from '@tanstack/query-core'
62
import { useQueryClient } from './useQueryClient.js'
3+
import type { HydrateOptions, QueryClient } from '@tanstack/query-core'
74

85
export function useHydrate(
96
state?: unknown,

packages/svelte-query/src/useIsFetching.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import {
2-
type QueryClient,
3-
type QueryFilters,
4-
notifyManager,
5-
} from '@tanstack/query-core'
1+
import { notifyManager } from '@tanstack/query-core'
62
import { readable } from 'svelte/store'
73
import { useQueryClient } from './useQueryClient.js'
84
import type { Readable } from 'svelte/store'
5+
import type { QueryClient, QueryFilters } from '@tanstack/query-core'
96

107
export function useIsFetching(
118
filters?: QueryFilters,

packages/svelte-query/src/useIsMutating.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import {
2-
type MutationFilters,
3-
type QueryClient,
4-
notifyManager,
5-
} from '@tanstack/query-core'
1+
import { notifyManager } from '@tanstack/query-core'
62
import { readable } from 'svelte/store'
73
import { useQueryClient } from './useQueryClient.js'
84
import type { Readable } from 'svelte/store'
5+
import type { MutationFilters, QueryClient } from '@tanstack/query-core'
96

107
export function useIsMutating(
118
filters?: MutationFilters,

0 commit comments

Comments
 (0)