move reducerPath to reducerDetails

Author: EskiMojo14

packages/toolkit/src/createSlice.ts

@@ -210,11 +210,7 @@ interface InternalReducerHandlingContext<State> {
   actionCreators: Record<string, any>
 }
 
-export interface ReducerHandlingContext<
-  State,
-  Name extends string = string,
-  ReducerPath extends string = Name,
-> {
+export interface ReducerHandlingContext<State> {
   /**
    * Adds a case reducer to handle a single action type.
    * @param actionCreator - Either a plain action type string, or an action creator generated by [`createAction`](./createAction) that can be used to determine the action type.
@@ -223,7 +219,7 @@ export interface ReducerHandlingContext<
   addCase<ActionCreator extends TypedActionCreator<string>>(
     actionCreator: ActionCreator,
     reducer: CaseReducer<State, ReturnType<ActionCreator>>,
-  ): ReducerHandlingContext<State, Name, ReducerPath>
+  ): ReducerHandlingContext<State>
   /**
    * Adds a case reducer to handle a single action type.
    * @param actionCreator - Either a plain action type string, or an action creator generated by [`createAction`](./createAction) that can be used to determine the action type.
@@ -232,7 +228,7 @@ export interface ReducerHandlingContext<
   addCase<Type extends string, A extends Action<Type>>(
     type: Type,
     reducer: CaseReducer<State, A>,
-  ): ReducerHandlingContext<State, Name, ReducerPath>
+  ): ReducerHandlingContext<State>
 
   /**
    * Allows you to match incoming actions against your own filter function instead of only the `action.type` property.
@@ -248,7 +244,7 @@ export interface ReducerHandlingContext<
   addMatcher<A>(
     matcher: TypeGuard<A>,
     reducer: CaseReducer<State, A extends Action ? A : A & Action>,
-  ): ReducerHandlingContext<State, Name, ReducerPath>
+  ): ReducerHandlingContext<State>
   /**
    * Add an action to be exposed under the final `slice.actions[reducerName]` key.
    *
@@ -262,9 +258,7 @@ export interface ReducerHandlingContext<
    *
    * dispatch(addPost(post))
    */
-  exposeAction(
-    actionCreator: unknown,
-  ): ReducerHandlingContext<State, Name, ReducerPath>
+  exposeAction(actionCreator: unknown): ReducerHandlingContext<State>
 
   /**
    * Add a case reducer to be exposed under the final `slice.caseReducers[reducerName]` key.
@@ -279,39 +273,28 @@ export interface ReducerHandlingContext<
    *
    * slice.caseReducers.addPost([], addPost(post))
    */
-  exposeCaseReducer(
-    reducer: unknown,
-  ): ReducerHandlingContext<State, Name, ReducerPath>
+  exposeCaseReducer(reducer: unknown): ReducerHandlingContext<State>
 
   /**
    * Provides access to the initial state value given to the slice.
    * If a lazy state initializer was provided, it will be called and a fresh value returned.
    */
   getInitialState(): State
 
-  /**
-   * The `name` option provided for the slice.
-   */
-  name: Name
-
-  /**
-   * The `reducerPath` option provided for the slice.
-   * Defaults to `name` if not provided.
-   */
-  reducerPath: ReducerPath
-
   /**
    * Tries to select the slice's state from a possible root state shape, using `reducerPath`.
    * Throws an error if slice's state is not found.
    *
    * *Note that only the original `reducerPath` option is used - if a different `reducerPath` is used when injecting, this will not be reflected.*
    */
-  selectSlice(state: Record<ReducerPath, State>): State
+  selectSlice(state: Record<string, State>): State
 }
 
 export interface ReducerDetails {
   /** The name of the slice */
   sliceName: string
+  /** The reducerPath option passed for the slice. Defaults to `sliceName` if not provided. */
+  reducerPath: string
   /** The key the reducer was defined under */
   reducerName: string
   /** The predefined action type, i.e. `${sliceName}/${reducerName}` */
@@ -367,10 +350,10 @@ export type ReducerCreator<Type extends RegisteredReducerType> = {
 } & (ReducerDefinitionsForType<Type> extends never
   ? {}
   : {
-      handle<State, Name extends string, ReducerPath extends string>(
+      handle<State>(
         details: ReducerDetails,
         definition: ReducerDefinitionsForType<Type>,
-        context: ReducerHandlingContext<State, Name, ReducerPath>,
+        context: ReducerHandlingContext<State>,
       ): void
     })
 
@@ -966,7 +949,7 @@ export function buildCreateSlice<
     }
 
     function getContext({ reducerName }: ReducerDetails) {
-      const context: ReducerHandlingContext<State, Name, ReducerPath> = {
+      const context: ReducerHandlingContext<State> = {
         addCase(
           typeOrActionCreator: string | TypedActionCreator<any>,
           reducer: CaseReducer<State>,
@@ -1014,8 +997,6 @@ export function buildCreateSlice<
           return context
         },
         getInitialState,
-        name,
-        reducerPath,
         selectSlice(state) {
           const sliceState = state[reducerPath]
           if (typeof sliceState === 'undefined') {
@@ -1045,6 +1026,7 @@ export function buildCreateSlice<
         const reducerDetails: ReducerDetails = {
           sliceName: name,
           reducerName,
+          reducerPath,
           type: getType(name, reducerName),
         }
         handler(
@@ -1060,6 +1042,7 @@ export function buildCreateSlice<
         const reducerDetails: ReducerDetails = {
           sliceName: name,
           reducerName,
+          reducerPath,
           type: getType(name, reducerName),
         }
         const handler =