strongly type action types

Author: EskiMojo14

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

@@ -19,6 +19,7 @@ import type {
   ReducerHandlingContextMethods,
   ReducerNamesOfType,
   SerializedError,
+  SliceActionType,
   SliceCaseReducers,
   ThunkAction,
   ThunkDispatch,
@@ -1032,17 +1033,23 @@ describe('type tests', () => {
     })
 
     const toastSlice = createAppSlice({
-      name: 'toast',
+      name: 'toasts',
       initialState: { toasts: {} } as ToastState,
       reducers: (create) => ({
         toast: create.toaster(),
       }),
     })
 
-    expectTypeOf(toastSlice.actions.toast).toEqualTypeOf<AddToastThunk>()
+    expectTypeOf(toastSlice.actions.toast).toEqualTypeOf<
+      AddToastThunk<'toasts', 'toast'>
+    >()
 
     expectTypeOf(toastSlice.actions.toast).toBeCallableWith(100, 'hello')
 
+    expectTypeOf(
+      toastSlice.actions.toast.toastOpened.type,
+    ).toEqualTypeOf<'toasts/toast/opened'>()
+
     const incompatibleSlice = createAppSlice({
       name: 'incompatible',
       initialState: {},
@@ -1062,13 +1069,19 @@ interface ToastState {
   toasts: Record<string, Toast>
 }
 
-interface AddToastThunk {
+interface AddToastThunk<Name extends string, ReducerName extends PropertyKey> {
   (
     ms: number,
     message: string,
   ): ThunkAction<void, unknown, unknown, UnknownAction>
-  toastOpened: PayloadActionCreator<{ message: string; id: string }>
-  toastClosed: PayloadActionCreator<string>
+  toastOpened: PayloadActionCreator<
+    { message: string; id: string },
+    `${SliceActionType<Name, ReducerName>}/opened`
+  >
+  toastClosed: PayloadActionCreator<
+    string,
+    `${SliceActionType<Name, ReducerName>}/closed`
+  >
 }
 
 declare module '@reduxjs/toolkit' {
@@ -1087,7 +1100,7 @@ declare module '@reduxjs/toolkit' {
           [ReducerName in ReducerNamesOfType<
             CaseReducers,
             typeof toasterCreatorType
-          >]: AddToastThunk
+          >]: AddToastThunk<Name, ReducerName>
         }
       }
     >

packages/toolkit/src/tests/createSlice.test.ts

@@ -1210,6 +1210,23 @@ interface LoaderReducerDefinition<State>
   ended?: CaseReducer<State, PayloadAction<string>>
 }
 
+interface LoaderThunk<Name extends string, ReducerName extends PropertyKey> {
+  (): ThunkAction<
+    { loaderId: string; end: () => void },
+    unknown,
+    unknown,
+    Action
+  >
+  started: PayloadActionCreator<
+    string,
+    `${SliceActionType<Name, ReducerName>}/started`
+  >
+  ended: PayloadActionCreator<
+    string,
+    `${SliceActionType<Name, ReducerName>}/ended`
+  >
+}
+
 interface PatchesState {
   undo: Patch[]
   redo: Patch[]
@@ -1241,21 +1258,7 @@ declare module '@reduxjs/toolkit' {
           [ReducerName in ReducerNamesOfType<
             CaseReducers,
             typeof loaderCreatorType
-          >]: (() => ThunkAction<
-            { loaderId: string; end: () => void },
-            unknown,
-            unknown,
-            Action
-          >) & {
-            started: PayloadActionCreator<
-              string,
-              `${SliceActionType<Name, ReducerName>}/started`
-            >
-            ended: PayloadActionCreator<
-              string,
-              `${SliceActionType<Name, ReducerName>}/ended`
-            >
-          }
+          >]: LoaderThunk<Name, ReducerName>
         }
         caseReducers: {
           [ReducerName in ReducerNamesOfType<