Remove removeMany(predicate) overload

Author: markerikson

src/entities/index.ts

@@ -5,7 +5,6 @@ export {
   EntityAdapter,
   Update,
   EntityMap,
-  Predicate,
   IdSelector,
   Comparer
 } from './models'

src/entities/models.ts

@@ -42,11 +42,6 @@ export interface UpdateNum<T> {
  */
 export type Update<T> = UpdateStr<T> | UpdateNum<T>
 
-/**
- * @alpha
- */
-export type Predicate<T> = (entity: T) => boolean
-
 /**
  * @alpha
  */
@@ -96,8 +91,6 @@ export interface EntityStateAdapter<T> {
     state: S,
     keys: TypeOrPayloadAction<number[]>
   ): S
-  /** @deprecated Should not pass functions inside of Redux actions */
-  removeMany<S extends EntityState<T>>(state: S, predicate: Predicate<T>): S
 
   removeAll<S extends EntityState<T>>(state: S): S
 

src/entities/sorted_state_adapter.test.ts

@@ -151,23 +151,6 @@ describe('Sorted State Adapter', () => {
     })
   })
 
-  it('should let you remove many entities by a predicate from the state', () => {
-    const withAll = adapter.setAll(state, [
-      TheGreatGatsby,
-      AClockworkOrange,
-      AnimalFarm
-    ])
-
-    const withoutMany = adapter.removeMany(withAll, p => p.id.startsWith('a'))
-
-    expect(withoutMany).toEqual({
-      ids: [TheGreatGatsby.id],
-      entities: {
-        [TheGreatGatsby.id]: TheGreatGatsby
-      }
-    })
-  })
-
   it('should let you remove all entities from the state', () => {
     const withAll = adapter.setAll(state, [
       TheGreatGatsby,

src/entities/unsorted_state_adapter.test.ts

@@ -117,23 +117,6 @@ describe('Unsorted State Adapter', () => {
     })
   })
 
-  it('should let you remove many entities by a predicate from the state', () => {
-    const withAll = adapter.setAll(state, [
-      TheGreatGatsby,
-      AClockworkOrange,
-      AnimalFarm
-    ])
-
-    const withoutMany = adapter.removeMany(withAll, p => p.id.startsWith('a'))
-
-    expect(withoutMany).toEqual({
-      ids: [TheGreatGatsby.id],
-      entities: {
-        [TheGreatGatsby.id]: TheGreatGatsby
-      }
-    })
-  })
-
   it('should let you remove all entities from the state', () => {
     const withAll = adapter.setAll(state, [
       TheGreatGatsby,

src/entities/unsorted_state_adapter.ts

@@ -3,7 +3,6 @@ import {
   EntityStateAdapter,
   IdSelector,
   Update,
-  Predicate,
   EntityMap
 } from './models'
 import { createStateOperator } from './state_adapter'
@@ -47,33 +46,20 @@ export function createUnsortedStateAdapter<T>(selectId: IdSelector<T>): any {
     return removeManyMutably([key], state)
   }
 
-  function removeManyMutably(keys: T[], state: R): void
-  function removeManyMutably(predicate: Predicate<T>, state: R): void
-  function removeManyMutably(
-    keysOrPredicate: any[] | Predicate<T>,
-    state: any
-  ): void {
-    let keysToRemove: any[] = []
-
-    if (keysOrPredicate instanceof Array) {
-      keysToRemove = keysOrPredicate
-    } else {
-      keysToRemove = state.ids.filter((key: any) =>
-        keysOrPredicate(state.entities[key])
-      )
-    }
-
+  function removeManyMutably(keys: any[], state: R): void {
     let didMutate = false
 
-    keysToRemove.forEach(key => {
+    keys.forEach(key => {
       if (key in state.entities) {
         delete state.entities[key]
         didMutate = true
       }
     })
 
     if (didMutate) {
-      state.ids = state.ids.filter((id: any) => id in state.entities)
+      // Work around TS not letting us call array methods if it's not a single known type
+      const ids = state.ids as string[]
+      state.ids = ids.filter((id: any) => id in state.entities)
     }
   }
 

src/index.ts

@@ -69,7 +69,6 @@ export {
   EntityAdapter,
   Update,
   EntityMap,
-  Predicate,
   IdSelector,
   Comparer
 } from './entities/models'