Merge pull request #8 from productive-codebases/fix/filterFalsies

Fix filterFalsies.

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.1.4
+
+### Fixed
+
+- Fix `filterFalsies` which was reversed.
+
 ## v1.1.3
 
 ### Fixed

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@productive-codebases/toolbox",
   "description": "Tooling for productive codebases.",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "scripts": {
     ":d": "npm run dev",
     "build": "tsc && vite build",

src/libs/filterFalsies/filterFalsies.test.ts

@@ -0,0 +1,24 @@
+import { filterFalsies } from '.'
+
+describe('filterFalsies', () => {
+  it('should remove falsies values', () => {
+    const arr = [
+      0,
+      1,
+      'two',
+      undefined,
+      'four',
+      5,
+      null,
+      '',
+      'height',
+      {},
+      false,
+      NaN
+    ]
+
+    const results = filterFalsies(arr)
+
+    expect(results).toEqual([1, 'two', 'four', 5, 'height', {}, NaN])
+  })
+})

src/libs/filterFalsies/index.ts

@@ -7,15 +7,13 @@ import { isTruthy } from '../isTruthy'
  * Usage:
  * arr.filter(isNotFalsy)
  */
-export function isNotFalsy<T>(o: Perhaps<T | boolean | string>): o is T {
+export function isNotFalsy<T>(o: Perhaps<T>): o is T {
   return !isTruthy(o)
 }
 
 /**
- * Remove from an array falsy values.
+ * Remove falsy values of an array.
  */
-export function filterFalsies<T>(
-  arr: Array<T | null | undefined | boolean>
-): T[] {
-  return arr.filter(isNotFalsy)
+export function filterFalsies<T>(arr: Array<T>): T[] {
+  return arr.filter(isTruthy)
 }

src/libs/isDefined/isDefined.test.ts

@@ -2,17 +2,10 @@ import { isDefined } from '.'
 
 describe('isDefined', () => {
   it('should remove undefined or nullable values', () => {
-    const arr = [0, 1, 'two', undefined, 'four', 5, null, '', 'height', NaN]
+    const arr = [0, 1, 'two', undefined, 'four', 5, null, '', 'height', {}, NaN]
 
-    expect(arr.filter(isDefined)).toEqual([
-      0,
-      1,
-      'two',
-      'four',
-      5,
-      '',
-      'height',
-      NaN
-    ])
+    const results = arr.filter(isDefined)
+
+    expect(results).toEqual([0, 1, 'two', 'four', 5, '', 'height', {}, NaN])
   })
 })

src/libs/isTruthy/index.ts

@@ -6,6 +6,6 @@ import { Perhaps } from '../../types'
  * Usage:
  * arr.filter(isTruthy)
  */
-export function isTruthy<T>(o: Perhaps<T | boolean | number | string>): o is T {
+export function isTruthy<T>(o: Perhaps<T>): o is T {
   return o !== undefined && o !== null && o !== false && o !== '' && o !== 0
 }

src/libs/isTruthy/isTruthy.test.ts

@@ -2,8 +2,23 @@ import { isTruthy } from '.'
 
 describe('isTruthy', () => {
   it('should keep truthty values', () => {
-    const arr = [0, 1, 'two', undefined, 'four', 5, null, '', 'height', NaN]
+    const arr = [
+      0,
+      1,
+      'two',
+      undefined,
+      'four',
+      5,
+      null,
+      '',
+      'height',
+      {},
+      false,
+      NaN
+    ]
 
-    expect(arr.filter(isTruthy)).toEqual([1, 'two', 'four', 5, 'height', NaN])
+    const results = arr.filter(isTruthy)
+
+    expect(results).toEqual([1, 'two', 'four', 5, 'height', {}, NaN])
   })
 })