@@ -38,7 +38,7 @@ export enum ReducerType {
38
38
asyncThunk = 'asyncThunk' ,
39
39
}
40
40
41
- export type RegisteredReducerType = keyof SliceReducerCreators < any , any , any >
41
+ export type RegisteredReducerType = keyof SliceReducerCreators < any >
42
42
43
43
export type ReducerDefinition <
44
44
T extends RegisteredReducerType = RegisteredReducerType ,
@@ -50,11 +50,7 @@ export type CreatorCaseReducers<State> =
50
50
| Record < string , ReducerDefinition >
51
51
| SliceCaseReducers < State >
52
52
53
- export interface SliceReducerCreators <
54
- State ,
55
- SliceName extends string ,
56
- ReducerPath extends string ,
57
- > {
53
+ export interface SliceReducerCreators < State > {
58
54
[ ReducerType . reducer ] : {
59
55
(
60
56
caseReducer : CaseReducer < State , PayloadAction > ,
@@ -111,28 +107,14 @@ export interface SliceReducerCreatorsExposes<
111
107
112
108
export type ReducerCreators <
113
109
State ,
114
- Name extends string = string ,
115
- ReducerPath extends string = Name ,
116
110
CreatorMap extends Record < string , RegisteredReducerType > = { } ,
117
111
> = {
118
- reducer : SliceReducerCreators < State , Name , ReducerPath > [ ReducerType . reducer ]
119
- preparedReducer : SliceReducerCreators <
120
- State ,
121
- Name ,
122
- ReducerPath
123
- > [ ReducerType . reducerWithPrepare ]
112
+ reducer : SliceReducerCreators < State > [ ReducerType . reducer ]
113
+ preparedReducer : SliceReducerCreators < State > [ ReducerType . reducerWithPrepare ]
124
114
} & {
125
- [ CreatorName in keyof CreatorMap as SliceReducerCreators <
126
- State ,
127
- Name ,
128
- ReducerPath
129
- > [ CreatorMap [ CreatorName ] ] extends never
115
+ [ CreatorName in keyof CreatorMap as SliceReducerCreators < State > [ CreatorMap [ CreatorName ] ] extends never
130
116
? never
131
- : CreatorName ] : SliceReducerCreators <
132
- State ,
133
- Name ,
134
- ReducerPath
135
- > [ CreatorMap [ CreatorName ] ]
117
+ : CreatorName ] : SliceReducerCreators < State > [ CreatorMap [ CreatorName ] ]
136
118
}
137
119
138
120
interface InternalReducerHandlingContext < State > {
@@ -259,14 +241,14 @@ type DefinitionFromValue<
259
241
260
242
type ReducerDefinitionsForType < Type extends RegisteredReducerType > = {
261
243
[ CreatorType in RegisteredReducerType ] : DefinitionFromValue <
262
- SliceReducerCreators < any , any , any > [ CreatorType ] ,
244
+ SliceReducerCreators < any > [ CreatorType ] ,
263
245
Type
264
246
>
265
247
} [ RegisteredReducerType ]
266
248
267
249
export type ReducerCreator < Type extends RegisteredReducerType > = {
268
250
type : Type
269
- create : SliceReducerCreators < any , any , any > [ Type ]
251
+ create : SliceReducerCreators < any > [ Type ]
270
252
} & ( ReducerDefinitionsForType < Type > extends never
271
253
? {
272
254
handle ?< State > (
@@ -425,23 +407,16 @@ type InjectedSlice<
425
407
426
408
type CreatorCallback <
427
409
State ,
428
- Name extends string ,
429
- ReducerPath extends string ,
430
410
CreatorMap extends Record < string , RegisteredReducerType > ,
431
411
> = (
432
- create : ReducerCreators < State , Name , ReducerPath , CreatorMap > ,
412
+ create : ReducerCreators < State , CreatorMap > ,
433
413
) => Record < string , ReducerDefinition >
434
414
435
415
type GetCaseReducers <
436
416
State ,
437
- Name extends string ,
438
- ReducerPath extends string ,
439
417
CreatorMap extends Record < string , RegisteredReducerType > ,
440
- CR extends SliceCaseReducers < State > | CreatorCallback < State , any , any , any > ,
441
- > =
442
- CR extends CreatorCallback < State , Name , ReducerPath , CreatorMap >
443
- ? ReturnType < CR >
444
- : CR
418
+ CR extends SliceCaseReducers < State > | CreatorCallback < State , any > ,
419
+ > = CR extends CreatorCallback < State , CreatorMap > ? ReturnType < CR > : CR
445
420
446
421
/**
447
422
* Options for `createSlice()`.
@@ -452,12 +427,7 @@ export interface CreateSliceOptions<
452
427
State = any ,
453
428
CR extends
454
429
| SliceCaseReducers < State >
455
- | CreatorCallback <
456
- State ,
457
- Name ,
458
- ReducerPath ,
459
- CreatorMap
460
- > = SliceCaseReducers < State > ,
430
+ | CreatorCallback < State , CreatorMap > = SliceCaseReducers < State > ,
461
431
Name extends string = string ,
462
432
ReducerPath extends string = Name ,
463
433
Selectors extends SliceSelectors < State > = SliceSelectors < State > ,
@@ -712,7 +682,7 @@ type SliceDefinedSelectors<
712
682
*/
713
683
export type ValidateSliceCaseReducers <
714
684
S ,
715
- ACR extends SliceCaseReducers < S > | CreatorCallback < S , any , any , any > ,
685
+ ACR extends SliceCaseReducers < S > | CreatorCallback < S , any > ,
716
686
> = ACR & {
717
687
[ T in keyof ACR ] : ACR [ T ] extends {
718
688
reducer ( s : S , action ?: infer A ) : any
@@ -771,8 +741,7 @@ export const preparedReducerCreator: ReducerCreator<ReducerType.reducerWithPrepa
771
741
772
742
const isCreatorCallback = (
773
743
reducers : unknown ,
774
- ) : reducers is CreatorCallback < any , any , any , any > =>
775
- typeof reducers === 'function'
744
+ ) : reducers is CreatorCallback < any , any > => typeof reducers === 'function'
776
745
777
746
interface BuildCreateSliceConfig <
778
747
CreatorMap extends Record < string , RegisteredReducerType > ,
@@ -838,7 +807,7 @@ export function buildCreateSlice<
838
807
State ,
839
808
CaseReducers extends
840
809
| SliceCaseReducers < State >
841
- | CreatorCallback < State , Name , ReducerPath , CreatorMap > ,
810
+ | CreatorCallback < State , CreatorMap > ,
842
811
Name extends string ,
843
812
Selectors extends SliceSelectors < State > ,
844
813
ReducerPath extends string = Name ,
@@ -853,7 +822,7 @@ export function buildCreateSlice<
853
822
> ,
854
823
) : Slice <
855
824
State ,
856
- GetCaseReducers < State , Name , ReducerPath , CreatorMap , CaseReducers > ,
825
+ GetCaseReducers < State , CreatorMap , CaseReducers > ,
857
826
Name ,
858
827
ReducerPath ,
859
828
Selectors
@@ -1056,7 +1025,7 @@ export function buildCreateSlice<
1056
1025
) : Pick <
1057
1026
Slice <
1058
1027
State ,
1059
- GetCaseReducers < State , Name , ReducerPath , CreatorMap , CaseReducers > ,
1028
+ GetCaseReducers < State , CreatorMap , CaseReducers > ,
1060
1029
Name ,
1061
1030
CurrentReducerPath ,
1062
1031
Selectors
@@ -1122,7 +1091,7 @@ export function buildCreateSlice<
1122
1091
1123
1092
const slice : Slice <
1124
1093
State ,
1125
- GetCaseReducers < State , Name , ReducerPath , CreatorMap , CaseReducers > ,
1094
+ GetCaseReducers < State , CreatorMap , CaseReducers > ,
1126
1095
Name ,
1127
1096
ReducerPath ,
1128
1097
Selectors
0 commit comments