Revert "reset more entity files"

This reverts commit 82c9262.

Author: EskiMojo14

packages/toolkit/src/entities/tests/entity_slice_enhancer.test.ts

@@ -7,47 +7,44 @@ import {
 } from '@reduxjs/toolkit'
 import type {
   PayloadAction,
-  Slice,
   SliceCaseReducers,
-  UnknownAction,
+  ValidateSliceCaseReducers,
 } from '../..'
 import type { EntityId, EntityState, IdSelector } from '../models'
-import type { BookModel } from './fixtures/book'
+import { AClockworkOrange, type BookModel } from './fixtures/book'
 
 describe('Entity Slice Enhancer', () => {
-  let slice: Slice<EntityState<BookModel, BookModel['id']>>
+  let slice: ReturnType<typeof entitySliceEnhancer<BookModel, string>>
 
   beforeEach(() => {
-    const indieSlice = entitySliceEnhancer({
+    slice = entitySliceEnhancer({
       name: 'book',
       selectId: (book: BookModel) => book.id,
     })
-    slice = indieSlice
   })
 
   it('exposes oneAdded', () => {
-    const book = {
-      id: '0',
-      title: 'Der Steppenwolf',
-      author: 'Herman Hesse',
-    }
-    const action = slice.actions.oneAdded(book)
-    const oneAdded = slice.reducer(undefined, action as UnknownAction)
-    expect(oneAdded.entities['0']).toBe(book)
+    const action = slice.actions.oneAdded(AClockworkOrange)
+    const oneAdded = slice.reducer(undefined, action)
+    expect(oneAdded.entities[AClockworkOrange.id]).toBe(AClockworkOrange)
   })
 })
 
-interface EntitySliceArgs<T, Id extends EntityId> {
+interface EntitySliceArgs<
+  T,
+  Id extends EntityId,
+  CaseReducers extends SliceCaseReducers<EntityState<T, Id>>,
+> {
   name: string
   selectId: IdSelector<T, Id>
-  modelReducer?: SliceCaseReducers<T>
+  modelReducer?: ValidateSliceCaseReducers<EntityState<T, Id>, CaseReducers>
 }
 
-function entitySliceEnhancer<T, Id extends EntityId>({
-  name,
-  selectId,
-  modelReducer,
-}: EntitySliceArgs<T, Id>) {
+function entitySliceEnhancer<
+  T,
+  Id extends EntityId,
+  CaseReducers extends SliceCaseReducers<EntityState<T, Id>> = {},
+>({ name, selectId, modelReducer }: EntitySliceArgs<T, Id, CaseReducers>) {
   const modelAdapter = createEntityAdapter({
     selectId,
   })

packages/toolkit/src/entities/tests/entity_state.test.ts

@@ -1,5 +1,5 @@
-import type { EntityAdapter } from '../index'
-import { createEntityAdapter } from '../index'
+import type { EntityAdapter } from '../models'
+import { createEntityAdapter } from '../create_adapter'
 import type { PayloadAction } from '../../createAction'
 import { createAction } from '../../createAction'
 import { createSlice } from '../../createSlice'

packages/toolkit/src/entities/tests/state_adapter.test.ts

@@ -1,5 +1,5 @@
-import type { EntityAdapter } from '../index'
-import { createEntityAdapter } from '../index'
+import type { EntityAdapter } from '../models'
+import { createEntityAdapter } from '../create_adapter'
 import type { PayloadAction } from '../../createAction'
 import { configureStore } from '../../configureStore'
 import { createSlice } from '../../createSlice'

packages/toolkit/src/entities/tests/state_selectors.test.ts

@@ -1,6 +1,6 @@
 import { createDraftSafeSelectorCreator } from '../../createDraftSafeSelector'
-import type { EntityAdapter, EntityState } from '../index'
-import { createEntityAdapter } from '../index'
+import type { EntityAdapter, EntityState } from '../models'
+import { createEntityAdapter } from '../create_adapter'
 import type { EntitySelectors } from '../models'
 import type { BookModel } from './fixtures/book'
 import { AClockworkOrange, AnimalFarm, TheGreatGatsby } from './fixtures/book'

packages/toolkit/src/entities/utils.ts

@@ -55,3 +55,7 @@ export function splitAddedUpdatedEntities<T, Id extends EntityId>(
   }
   return [added, updated]
 }
+
+export function capitalize<S extends string>(str: S) {
+  return str && (str.replace(str[0], str[0].toUpperCase()) as Capitalize<S>)
+}