fix(utils): remove conditional types from getFilteredCollection()

MTES-MCT · Mar 15, 2024 · 472e11f · 472e11f
1 parent 82a59ee
commit 472e11f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/utils/__tests__/getFilteredCollection.test.ts b/src/utils/__tests__/getFilteredCollection.test.ts
@@ -8,7 +8,7 @@ describe('utils/getFilteredCollection()', () => {
   it('should return the collection with 0 filter', () => {
     type Item = { id: number; name: string }
 
-    const collection: Item[] = [{ id: 1, name: 'Item A' }]
+    const collection = [{ id: 1, name: 'Item A' }] as Item[] | undefined
     const filters: Array<Filter<Item>> = []
 
     const result = getFilteredCollection(collection, filters)
@@ -19,10 +19,10 @@ describe('utils/getFilteredCollection()', () => {
   it('should filter the collection with 1 filter', () => {
     type Item = { id: number; name: string }
 
-    const collection: Item[] = [
+    const collection = [
       { id: 1, name: 'Item A' },
       { id: 2, name: 'Item B' }
-    ]
+    ] as Item[] | undefined
     const filters: Array<Filter<Item>> = [items => items.filter(item => item.id === 1)]
 
     const result = getFilteredCollection(collection, filters)
@@ -33,11 +33,11 @@ describe('utils/getFilteredCollection()', () => {
   it('should filter the collection with 2 filters', () => {
     type Item = { id: number; isActive: boolean; name: string }
 
-    const collection: Item[] = [
+    const collection = [
       { id: 1, isActive: true, name: 'Item A' },
       { id: 2, isActive: false, name: 'Item B' },
       { id: 3, isActive: true, name: 'Item C' }
-    ]
+    ] as Item[] | undefined
     const filters: Array<Filter<Item>> = [
       items => items.filter(item => item.isActive),
       items => items.filter(item => item.id > 1)
@@ -51,7 +51,7 @@ describe('utils/getFilteredCollection()', () => {
   it('should return `undefined` with an undefined collection', () => {
     type Item = { id: number; name: string }
 
-    const collection = undefined
+    const collection = undefined as Item[] | undefined
     const filters: Array<Filter<Item>> = [items => items.filter(item => item.id === 1)]
 
     const result = getFilteredCollection(collection, filters)

diff --git a/src/utils/getFilteredCollection.ts b/src/utils/getFilteredCollection.ts
@@ -1,7 +1,5 @@
 import type { Filter } from '../types/definitions'
 
-export function getFilteredCollection<T>(collection: undefined, filters: Array<Filter<T>>): undefined
-export function getFilteredCollection<T>(collection: T[], filters: Array<Filter<T>>): T[]
 export function getFilteredCollection<T>(collection: T[] | undefined, filters: Array<Filter<T>>): T[] | undefined {
   if (collection === undefined) {
     return undefined