Skip to content

Commit 2518b10

Browse files
committed
Fix remaining type test issues
1 parent c76527d commit 2518b10

File tree

4 files changed

+18
-16
lines changed

4 files changed

+18
-16
lines changed

packages/toolkit/src/query/tests/buildSelector.test-d.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react'
22

33
import { configureStore, createSelector } from '@reduxjs/toolkit'
44

5-
describe('buildSelector', () => {
5+
describe('type tests', () => {
66
test('buildSelector type test', () => {
77
interface Todo {
88
userId: number
@@ -31,11 +31,12 @@ describe('buildSelector', () => {
3131
[exampleQuerySelector],
3232
(queryState) => {
3333
return queryState?.data?.[0] ?? ({} as Todo)
34-
}
34+
},
3535
)
36+
3637
const firstTodoTitleSelector = createSelector(
3738
[todosSelector],
38-
(todo) => todo?.title
39+
(todo) => todo?.title,
3940
)
4041

4142
const store = configureStore({
@@ -49,6 +50,7 @@ describe('buildSelector', () => {
4950

5051
// This only compiles if we carried the types through
5152
const upperTitle = todoTitle.toUpperCase()
53+
5254
expectTypeOf(upperTitle).toBeString()
5355
})
5456

@@ -82,7 +84,7 @@ describe('buildSelector', () => {
8284
})
8385

8486
expectTypeOf(
85-
exampleApi.util.selectCachedArgsForQuery(store.getState(), 'getTodos')
87+
exampleApi.util.selectCachedArgsForQuery(store.getState(), 'getTodos'),
8688
).toEqualTypeOf<string[]>()
8789
})
8890
})

packages/toolkit/src/query/tests/errorHandling.test-d.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ describe('type tests', () => {
1919
test('a mutation is unwrappable and has the correct types', () => {
2020
function User() {
2121
const [manualError, setManualError] = useState<any>()
22+
2223
const [update, { isLoading, data, error }] =
2324
api.endpoints.update.useMutation()
2425

packages/toolkit/src/tests/createReducer.test-d.ts

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import type { ActionReducerMapBuilder } from '@reduxjs/toolkit'
1+
import type { ActionReducerMapBuilder, Reducer } from '@reduxjs/toolkit'
22
import { createAction, createReducer } from '@reduxjs/toolkit'
3-
import type { Reducer } from 'redux'
43

54
describe('type tests', () => {
65
test('createReducer() infers type of returned reducer.', () => {
76
const incrementHandler = (
87
state: number,
9-
action: { type: 'increment'; payload: number }
8+
action: { type: 'increment'; payload: number },
109
) => state + 1
10+
1111
const decrementHandler = (
1212
state: number,
13-
action: { type: 'decrement'; payload: number }
13+
action: { type: 'decrement'; payload: number },
1414
) => state - 1
1515

1616
const reducer = createReducer(0 as number, (builder) => {
@@ -19,21 +19,20 @@ describe('type tests', () => {
1919
.addCase('decrement', decrementHandler)
2020
})
2121

22-
const numberReducer: Reducer<number> = reducer
22+
expectTypeOf(reducer).toMatchTypeOf<Reducer<number>>()
2323

24-
// @ts-expect-error
25-
const stringReducer: Reducer<string> = reducer
24+
expectTypeOf(reducer).not.toMatchTypeOf<Reducer<string>>()
2625
})
2726

28-
test('createReducer() state type can be specified expliclity.', () => {
27+
test('createReducer() state type can be specified explicitly.', () => {
2928
const incrementHandler = (
3029
state: number,
31-
action: { type: 'increment'; payload: number }
30+
action: { type: 'increment'; payload: number },
3231
) => state + action.payload
3332

3433
const decrementHandler = (
3534
state: number,
36-
action: { type: 'decrement'; payload: number }
35+
action: { type: 'decrement'; payload: number },
3736
) => state - action.payload
3837

3938
createReducer(0 as number, (builder) => {
@@ -65,7 +64,7 @@ describe('type tests', () => {
6564
const increment = createAction<number, 'increment'>('increment')
6665

6766
const reducer = createReducer(0, (builder) =>
68-
expectTypeOf(builder).toEqualTypeOf<ActionReducerMapBuilder<number>>()
67+
expectTypeOf(builder).toEqualTypeOf<ActionReducerMapBuilder<number>>(),
6968
)
7069

7170
expectTypeOf(reducer(0, increment(5))).toBeNumber()

packages/toolkit/src/tests/getDefaultEnhancers.test-d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import type { StoreEnhancer } from '@reduxjs/toolkit'
12
import { configureStore } from '@reduxjs/toolkit'
2-
import type { StoreEnhancer } from 'redux'
33

44
declare const enhancer1: StoreEnhancer<
55
{

0 commit comments

Comments
 (0)