Merge pull request #4485 from reduxjs/entity-golf

Golf a few pieces of entity adapter code

Author: EskiMojo14

packages/toolkit/src/entities/sorted_state_adapter.ts

@@ -69,9 +69,7 @@ export function createSortedStateAdapter<T, Id extends EntityId>(
   ): void {
     newEntities = ensureEntitiesArray(newEntities)
 
-    const existingKeys = new Set<Id>(
-      existingIds ?? (getCurrent(state.ids) as Id[]),
-    )
+    const existingKeys = new Set<Id>(existingIds ?? getCurrent(state.ids))
 
     const models = newEntities.filter(
       (model) => !existingKeys.has(selectIdValue(model, selectId)),
@@ -175,7 +173,7 @@ export function createSortedStateAdapter<T, Id extends EntityId>(
       return false
     }
 
-    for (let i = 0; i < a.length && i < b.length; i++) {
+    for (let i = 0; i < a.length; i++) {
       if (a[i] === b[i]) {
         continue
       }
@@ -191,20 +189,20 @@ export function createSortedStateAdapter<T, Id extends EntityId>(
     replacedIds?: boolean,
   ) => void
 
-  const mergeInsertion: MergeFunction = (
+  const mergeFunction: MergeFunction = (
     state,
     addedItems,
     appliedUpdates,
     replacedIds,
   ) => {
-    const currentEntities = getCurrent(state.entities) as Record<Id, T>
-    const currentIds = getCurrent(state.ids) as Id[]
+    const currentEntities = getCurrent(state.entities)
+    const currentIds = getCurrent(state.ids)
 
     const stateEntities = state.entities as Record<Id, T>
 
-    let ids = currentIds
+    let ids: Iterable<Id> = currentIds
     if (replacedIds) {
-      ids = Array.from(new Set(currentIds))
+      ids = new Set(currentIds)
     }
 
     let sortedEntities: T[] = []
@@ -241,8 +239,6 @@ export function createSortedStateAdapter<T, Id extends EntityId>(
     }
   }
 
-  const mergeFunction: MergeFunction = mergeInsertion
-
   return {
     removeOne,
     removeMany,

packages/toolkit/src/entities/unsorted_state_adapter.ts

@@ -145,9 +145,7 @@ export function createUnsortedStateAdapter<T, Id extends EntityId>(
           // Spreads ignore falsy values, so this works even if there isn't
           // an existing update already at this key
           changes: {
-            ...(updatesPerEntity[update.id]
-              ? updatesPerEntity[update.id].changes
-              : null),
+            ...updatesPerEntity[update.id]?.changes,
             ...update.changes,
           },
         }

packages/toolkit/src/entities/utils.ts

@@ -1,4 +1,4 @@
-import { current, isDraft } from 'immer'
+import { Draft, current, isDraft } from 'immer'
 import type {
   IdSelector,
   Update,
@@ -36,8 +36,8 @@ export function ensureEntitiesArray<T, Id extends EntityId>(
   return entities
 }
 
-export function getCurrent<T>(value: T): T {
-  return isDraft(value) ? current(value) : value
+export function getCurrent<T>(value: T | Draft<T>): T {
+  return (isDraft(value) ? current(value) : value) as T
 }
 
 export function splitAddedUpdatedEntities<T, Id extends EntityId>(
@@ -47,7 +47,7 @@ export function splitAddedUpdatedEntities<T, Id extends EntityId>(
 ): [T[], Update<T, Id>[], Id[]] {
   newEntities = ensureEntitiesArray(newEntities)
 
-  const existingIdsArray = getCurrent(state.ids) as Id[]
+  const existingIdsArray = getCurrent(state.ids)
   const existingIds = new Set<Id>(existingIdsArray)
 
   const added: T[] = []