move module augmentation back to createSlice

Author: EskiMojo14

packages/toolkit/src/asyncThunkCreator.ts

@@ -1,10 +1,3 @@
-import type {
-  ReducerNamesOfType,
-  ReducerCreatorEntry,
-  ReducerCreator,
-  ReducerDefinition,
-  CreatorCaseReducers,
-} from '@reduxjs/toolkit'
 import type {
   AsyncThunk,
   AsyncThunkConfig,
@@ -14,53 +7,8 @@ import type {
 } from './createAsyncThunk'
 import { createAsyncThunk } from './createAsyncThunk'
 import type { CaseReducer } from './createReducer'
+import type { ReducerCreator, ReducerDefinition } from './createSlice'
 import { ReducerType } from './createSlice'
-import type { Id } from './tsHelpers'
-
-declare module '@reduxjs/toolkit' {
-  export interface SliceReducerCreators<
-    State,
-    CaseReducers extends CreatorCaseReducers<State>,
-    Name extends string,
-  > {
-    [ReducerType.asyncThunk]: ReducerCreatorEntry<
-      AsyncThunkCreator<State>,
-      {
-        actions: {
-          [ReducerName in ReducerNamesOfType<
-            CaseReducers,
-            ReducerType.asyncThunk
-          >]: CaseReducers[ReducerName] extends AsyncThunkSliceReducerDefinition<
-            State,
-            infer ThunkArg,
-            infer Returned,
-            infer ThunkApiConfig
-          >
-            ? AsyncThunk<Returned, ThunkArg, ThunkApiConfig>
-            : never
-        }
-        caseReducers: {
-          [ReducerName in ReducerNamesOfType<
-            CaseReducers,
-            ReducerType.asyncThunk
-          >]: CaseReducers[ReducerName] extends AsyncThunkSliceReducerDefinition<
-            State,
-            any,
-            any,
-            any
-          >
-            ? Id<
-                Pick<
-                  Required<CaseReducers[ReducerName]>,
-                  'fulfilled' | 'rejected' | 'pending' | 'settled'
-                >
-              >
-            : never
-        }
-      }
-    >
-  }
-}
 
 export interface AsyncThunkSliceReducerConfig<
   State,
@@ -113,7 +61,7 @@ type PreventCircular<ThunkApiConfig> = {
     : ThunkApiConfig[K]
 }
 
-interface AsyncThunkCreator<
+export interface AsyncThunkCreator<
   State,
   CurriedThunkApiConfig extends
     PreventCircular<AsyncThunkConfig> = PreventCircular<AsyncThunkConfig>,

packages/toolkit/src/createSlice.ts

@@ -1,5 +1,9 @@
 import type { Action, UnknownAction, Reducer } from 'redux'
 import type { Selector } from 'reselect'
+import type {
+  AsyncThunkCreator,
+  AsyncThunkSliceReducerDefinition,
+} from './asyncThunkCreator'
 import type {
   ActionCreatorWithoutPayload,
   PayloadAction,
@@ -8,6 +12,7 @@ import type {
   _ActionCreatorWithPreparedPayload,
 } from './createAction'
 import { createAction } from './createAction'
+import type { AsyncThunk } from './createAsyncThunk'
 import type {
   ActionMatcherDescriptionCollection,
   CaseReducer,
@@ -124,6 +129,42 @@ export interface SliceReducerCreators<
       }
     }
   >
+  [ReducerType.asyncThunk]: ReducerCreatorEntry<
+    AsyncThunkCreator<State>,
+    {
+      actions: {
+        [ReducerName in ReducerNamesOfType<
+          CaseReducers,
+          ReducerType.asyncThunk
+        >]: CaseReducers[ReducerName] extends AsyncThunkSliceReducerDefinition<
+          State,
+          infer ThunkArg,
+          infer Returned,
+          infer ThunkApiConfig
+        >
+          ? AsyncThunk<Returned, ThunkArg, ThunkApiConfig>
+          : never
+      }
+      caseReducers: {
+        [ReducerName in ReducerNamesOfType<
+          CaseReducers,
+          ReducerType.asyncThunk
+        >]: CaseReducers[ReducerName] extends AsyncThunkSliceReducerDefinition<
+          State,
+          any,
+          any,
+          any
+        >
+          ? Id<
+              Pick<
+                Required<CaseReducers[ReducerName]>,
+                'fulfilled' | 'rejected' | 'pending' | 'settled'
+              >
+            >
+          : never
+      }
+    }
+  >
 }
 
 export type ReducerCreators<