Undo renaming of Id to Simplify

packages/toolkit/src/combineSlices.ts

@@ -2,8 +2,8 @@ import type { Reducer, StateFromReducersMapObject, UnknownAction } from 'redux'
 import { combineReducers } from 'redux'
 import { nanoid } from './nanoid'
 import type {
+  Id,
   NonUndefined,
-  Simplify,
   Tail,
   UnionToIntersection,
   WithOptionalProp,
@@ -81,7 +81,7 @@ export interface CombinedSliceReducer<
    */
   withLazyLoadedSlices<Lazy = {}>(): CombinedSliceReducer<
     InitialState,
-    Simplify<DeclaredState & Partial<Lazy>>
+    Id<DeclaredState & Partial<Lazy>>
   >
 
   /**
@@ -96,10 +96,10 @@ export interface CombinedSliceReducer<
    * ```
    *
    */
-  inject<Sl extends Simplify<ExistingSliceLike<DeclaredState>>>(
+  inject<Sl extends Id<ExistingSliceLike<DeclaredState>>>(
     slice: Sl,
     config?: InjectConfig,
-  ): CombinedSliceReducer<InitialState, Simplify<DeclaredState & WithSlice<Sl>>>
+  ): CombinedSliceReducer<InitialState, Id<DeclaredState & WithSlice<Sl>>>
 
   /**
    * Inject a slice.
@@ -121,7 +121,7 @@ export interface CombinedSliceReducer<
     config?: InjectConfig,
   ): CombinedSliceReducer<
     InitialState,
-    Simplify<DeclaredState & WithSlice<SliceLike<ReducerPath, State>>>
+    Id<DeclaredState & WithSlice<SliceLike<ReducerPath, State>>>
   >
 
   /**
@@ -363,7 +363,7 @@ const noopReducer: Reducer<Record<string, any>> = (state = {}) => state
 
 export function combineSlices<Slices extends Array<AnySliceLike | ReducerMap>>(
   ...slices: Slices
-): CombinedSliceReducer<Simplify<InitialState<Slices>>> {
+): CombinedSliceReducer<Id<InitialState<Slices>>> {
   const reducerMap = Object.fromEntries<Reducer>(getReducers(slices))
 
   const getReducer = () =>

packages/toolkit/src/createAsyncThunk.ts

@@ -7,10 +7,10 @@ import { isAnyOf } from './matchers'
 import { nanoid } from './nanoid'
 import type {
   FallbackIfUnknown,
+  Id,
   IsAny,
   IsUnknown,
   SafePromise,
-  Simplify,
 } from './tsHelpers'
 
 export type BaseThunkAPI<
@@ -428,7 +428,7 @@ export type AsyncThunk<
   typePrefix: string
 }
 
-export type OverrideThunkApiConfigs<OldConfig, NewConfig> = Simplify<
+export type OverrideThunkApiConfigs<OldConfig, NewConfig> = Id<
   NewConfig & Omit<OldConfig, keyof NewConfig>
 >
 

packages/toolkit/src/createSlice.ts

@@ -25,7 +25,7 @@ import type {
 import { createReducer } from './createReducer'
 import type { ActionReducerMapBuilder, TypedActionCreator } from './mapBuilders'
 import { executeReducerBuilderCallback } from './mapBuilders'
-import type { Simplify, TypeGuard } from './tsHelpers'
+import type { Id, TypeGuard } from './tsHelpers'
 import { emplace } from './utils'
 
 const asyncThunkSymbol = /* @__PURE__ */ Symbol.for(
@@ -90,21 +90,21 @@ export interface Slice<
   /**
    * Get localised slice selectors (expects to be called with *just* the slice's state as the first parameter)
    */
-  getSelectors(): Simplify<SliceDefinedSelectors<State, Selectors, State>>
+  getSelectors(): Id<SliceDefinedSelectors<State, Selectors, State>>
 
   /**
    * Get globalised slice selectors (`selectState` callback is expected to receive first parameter and return slice state)
    */
   getSelectors<RootState>(
     selectState: (rootState: RootState) => State,
-  ): Simplify<SliceDefinedSelectors<State, Selectors, RootState>>
+  ): Id<SliceDefinedSelectors<State, Selectors, RootState>>
 
   /**
    * Selectors that assume the slice's state is `rootState[slice.reducerPath]` (which is usually the case)
    *
    * Equivalent to `slice.getSelectors((state: RootState) => state[slice.reducerPath])`.
    */
-  get selectors(): Simplify<
+  get selectors(): Id<
     SliceDefinedSelectors<State, Selectors, { [K in ReducerPath]: State }>
   >
 
@@ -148,23 +148,21 @@ type InjectedSlice<
   /**
    * Get localised slice selectors (expects to be called with *just* the slice's state as the first parameter)
    */
-  getSelectors(): Simplify<
-    SliceDefinedSelectors<State, Selectors, State | undefined>
-  >
+  getSelectors(): Id<SliceDefinedSelectors<State, Selectors, State | undefined>>
 
   /**
    * Get globalised slice selectors (`selectState` callback is expected to receive first parameter and return slice state)
    */
   getSelectors<RootState>(
     selectState: (rootState: RootState) => State | undefined,
-  ): Simplify<SliceDefinedSelectors<State, Selectors, RootState>>
+  ): Id<SliceDefinedSelectors<State, Selectors, RootState>>
 
   /**
    * Selectors that assume the slice's state is `rootState[slice.name]` (which is usually the case)
    *
    * Equivalent to `slice.getSelectors((state: RootState) => state[slice.name])`.
    */
-  get selectors(): Simplify<
+  get selectors(): Id<
     SliceDefinedSelectors<
       State,
       Selectors,
@@ -509,7 +507,7 @@ type ActionCreatorForCaseReducer<CR, Type extends string> = CR extends (
 type SliceDefinedCaseReducers<CaseReducers extends SliceCaseReducers<any>> = {
   [Type in keyof CaseReducers]: CaseReducers[Type] extends infer Definition
     ? Definition extends AsyncThunkSliceReducerDefinition<any, any, any>
-      ? Simplify<
+      ? Id<
           Pick<
             Required<Definition>,
             'fulfilled' | 'rejected' | 'pending' | 'settled'

packages/toolkit/src/entities/models.ts

@@ -1,6 +1,6 @@
 import type { Draft } from 'immer'
 import type { PayloadAction } from '../createAction'
-import type { CastAny, Simplify } from '../tsHelpers'
+import type { CastAny, Id } from '../tsHelpers'
 import type { UncheckedIndexedAccess } from '../uncheckedindexed.js'
 import type { GetSelectorsOptions } from './state_selectors'
 
@@ -158,12 +158,12 @@ export interface EntityStateAdapter<T, Id extends EntityId> {
 /**
  * @public
  */
-export interface EntitySelectors<T, V, Id extends EntityId> {
-  selectIds: (state: V) => Id[]
-  selectEntities: (state: V) => Record<Id, T>
+export interface EntitySelectors<T, V, IdType extends EntityId> {
+  selectIds: (state: V) => IdType[]
+  selectEntities: (state: V) => Record<IdType, T>
   selectAll: (state: V) => T[]
   selectTotal: (state: V) => number
-  selectById: (state: V, id: Id) => Simplify<UncheckedIndexedAccess<T>>
+  selectById: (state: V, id: IdType) => Id<UncheckedIndexedAccess<T>>
 }
 
 /**

packages/toolkit/src/tsHelpers.ts

@@ -196,7 +196,7 @@ export type Matcher<T> = HasMatchFunction<T> | TypeGuard<T>
 export type ActionFromMatcher<M extends Matcher<any>> =
   M extends Matcher<infer T> ? T : never
 
-export type Simplify<T> = { [K in keyof T]: T[K] } & {}
+export type Id<T> = { [K in keyof T]: T[K] } & {}
 
 export type Tail<T extends any[]> = T extends [any, ...infer Tail]
   ? Tail