@tim-code/my-util 0.4.3 → 0.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tim-code/my-util",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "",
   "type": "module",
   "author": "Tim Sprowl",

package/src/find.js

@@ -270,81 +270,42 @@ export function findMax(array, { key, cutoff = -Infinity } = {}) {
 }
 
 /**
- * Like Array.prototype.findIndex but starts from given index.
+ * Find the first truthy value in an array.
+ * Supports "from" and "to" being reversed to "find last truthy".
  * @template T
  * @param {Array<T>} array
- * @param {number} fromIndex
- * @param {(value: T, index: number, array: Array<T>) => boolean} callback
- * @returns {number}
+ * @param {Object} $1
+ * @param {string|Function=} $1.key Specifies an alternative to using each element as the value.
+ *  If string, then accesses each element at that key to get value.
+ *  If function, then calls the callback on each element to get value.
+ * @param {number=} $1.from Numeric index to start from: inclusive, defaults to 0
+ * @param {number=} $1.until Numeric index to end at: exclusive, defaults to `array.length`
+ * @returns {T}
  */
-export function findIndexFrom(array, fromIndex, callback) {
-  for (let i = fromIndex; i < array.length; i++) {
-    if (callback(array[i], i, array)) {
-      return i
+export function findTruthy(array, { key, from = 0, until = array.length } = {}) {
+  if (typeof key === "function") {
+    for (let i = from; i < until; i++) {
+      const element = array[i]
+      const value = key(element, i, array)
+      if (value) {
+        return element
+      }
     }
-  }
-  return -1
-}
-
-/**
- * Like Array.prototype.find but starts from given index.
- * @template T
- * @param {Array<T>} array
- * @param {number} fromIndex
- * @param {(value: T, index: number, array: Array<T>) => boolean} callback
- * @returns {T|undefined}
- */
-export function findFrom(array, fromIndex, callback) {
-  const foundIndex = findIndexFrom(array, fromIndex, callback)
-  if (foundIndex < 0) {
-    return undefined
-  }
-  return array[foundIndex]
-}
-
-/**
- * Like Array.prototype.findLastIndex but starts from given index.
- * @template T
- * @param {Array<T>} array
- * @param {number} fromIndex If greater or equal to length, coerces to last index in array.
- * @param {(value: T, index: number, array: Array<T>) => boolean} callback
- * @returns {number}
- */
-export function findLastIndexFrom(array, fromIndex, callback) {
-  if (fromIndex >= array.length) {
-    fromIndex = array.length - 1
-  }
-  for (let i = fromIndex; i >= 0; i--) {
-    if (callback(array[i], i, array)) {
-      return i
+  } else if (typeof key === "number" || typeof key === "string") {
+    for (let i = from; i < until; i++) {
+      const element = array[i]
+      const value = element[key]
+      if (value) {
+        return element
+      }
+    }
+  } else {
+    for (let i = from; i < until; i++) {
+      const value = array[i]
+      if (value) {
+        return value
+      }
     }
   }
-  return -1
-}
-
-/**
- * Like Array.prototype.findLast but starts from given index.
- * @template T
- * @param {Array<T>} array
- * @param {number} fromIndex
- * @param {(value: T, index: number, array: Array<T>) => boolean} callback
- * @returns {T|undefined}
- */
-export function findLastFrom(array, fromIndex, callback) {
-  const foundIndex = findLastIndexFrom(array, fromIndex, callback)
-  if (foundIndex < 0) {
-    return undefined
-  }
-  return array[foundIndex]
-}
-
-/**
- * Returns truthy if argument is truthy and falsy otherwise.
- * Meant to used with find(): `array.find(isTruthy)`
- * @template T
- * @param {T} anything
- * @returns {T}
- */
-export function isTruthy(anything) {
-  return anything
+  return undefined
 }

package/src/find.test.js

@@ -10,11 +10,7 @@ const {
   findClosest,
   findMin,
   findMax,
-  findIndexFrom,
-  findFrom,
-  findLastIndexFrom,
-  findLastFrom,
-  isTruthy,
+  findTruthy,
 } = await import("./find.js")
 
 describe("findClosestAbs", () => {
@@ -291,140 +287,40 @@ describe("findMax", () => {
   })
 })
 
-describe("findIndexFrom", () => {
-  it("returns the index of the first matching element from fromIndex", () => {
-    expect(findIndexFrom([1, 2, 3, 4], 1, (x) => x > 2)).toBe(2)
-    expect(findIndexFrom([1, 2, 3, 4], 2, (x) => x > 2)).toBe(2)
-    expect(findIndexFrom([1, 2, 3, 4], 3, (x) => x > 2)).toBe(3)
+describe("findTruthy", () => {
+  it("returns the first truthy value in array", () => {
+    expect(findTruthy([0, null, false, 2, 3], {})).toBe(2)
   })
 
-  it("returns -1 if no element matches", () => {
-    expect(findIndexFrom([1, 2, 3, 4], 2, (x) => x > 10)).toBe(-1)
+  it("returns undefined if no truthy value", () => {
+    expect(findTruthy([0, null, false], {})).toBeUndefined()
   })
 
-  it("returns -1 for empty array", () => {
-    expect(findIndexFrom([], 0, () => true)).toBe(-1)
-  })
-
-  it("passes correct arguments to callback", () => {
-    const arr = [10, 20, 30]
-    const called = []
-    findIndexFrom(arr, 1, (value, index, array) => {
-      called.push([value, index, array])
-      return false
-    })
-    expect(called[0][0]).toBe(20)
-    expect(called[0][1]).toBe(1)
-    expect(called[0][2]).toBe(arr)
-  })
-})
-
-describe("findFrom", () => {
-  it("returns the first matching element from fromIndex", () => {
-    expect(findFrom([1, 2, 3, 4], 1, (x) => x > 2)).toBe(3)
-    expect(findFrom([1, 2, 3, 4], 2, (x) => x > 2)).toBe(3)
-    expect(findFrom([1, 2, 3, 4], 3, (x) => x > 2)).toBe(4)
-  })
-
-  it("returns undefined if no element matches", () => {
-    expect(findFrom([1, 2, 3, 4], 2, (x) => x > 10)).toBeUndefined()
-  })
-
-  it("returns undefined for empty array", () => {
-    expect(findFrom([], 0, () => true)).toBeUndefined()
-  })
-
-  it("passes correct arguments to callback", () => {
-    const arr = [10, 20, 30]
-    const called = []
-    findFrom(arr, 1, (value, index, array) => {
-      called.push([value, index, array])
-      return false
-    })
-    expect(called[0][0]).toBe(20)
-    expect(called[0][1]).toBe(1)
-    expect(called[0][2]).toBe(arr)
-  })
-})
-
-describe("findLastIndexFrom", () => {
-  it("returns the index of the last matching element from fromIndex (backwards)", () => {
-    expect(findLastIndexFrom([1, 2, 3, 4], 2, (x) => x < 3)).toBe(1)
-    expect(findLastIndexFrom([1, 2, 3, 4], 3, (x) => x < 3)).toBe(1)
-    expect(findLastIndexFrom([1, 2, 3, 4], 1, (x) => x < 3)).toBe(1)
-    expect(findLastIndexFrom([1, 2, 3, 4], 0, (x) => x < 3)).toBe(0)
-  })
-
-  it("returns -1 if no element matches", () => {
-    expect(findLastIndexFrom([1, 2, 3, 4], 3, (x) => x > 10)).toBe(-1)
-  })
-
-  it("returns -1 for empty array", () => {
-    expect(findLastIndexFrom([], 0, () => true)).toBe(-1)
-  })
-
-  it("passes correct arguments to callback", () => {
-    const arr = [10, 20, 30]
-    const called = []
-    findLastIndexFrom(arr, 2, (value, index, array) => {
-      called.push([value, index, array])
-      return false
-    })
-    expect(called[0][0]).toBe(30)
-    expect(called[0][1]).toBe(2)
-    expect(called[0][2]).toBe(arr)
-  })
-})
-
-describe("findLastFrom", () => {
-  it("returns the last matching element from fromIndex (backwards)", () => {
-    expect(findLastFrom([1, 2, 3, 4], 2, (x) => x < 3)).toBe(2)
-    expect(findLastFrom([1, 2, 3, 4], 3, (x) => x < 3)).toBe(2)
-    expect(findLastFrom([1, 2, 3, 4], 1, (x) => x < 3)).toBe(2)
-    expect(findLastFrom([1, 2, 3, 4], 0, (x) => x < 3)).toBe(1)
-  })
-
-  it("returns undefined if no element matches", () => {
-    expect(findLastFrom([1, 2, 3, 4], 3, (x) => x > 10)).toBeUndefined()
-  })
-
-  it("returns undefined for empty array", () => {
-    expect(findLastFrom([], 0, () => true)).toBeUndefined()
+  it("supports key as function", () => {
+    const arr = [{ v: 0 }, { v: 2 }, { v: 0 }]
+    expect(findTruthy(arr, { key: (e) => e.v })).toEqual({ v: 2 })
   })
 
-  it("passes correct arguments to callback", () => {
-    const arr = [10, 20, 30]
-    const called = []
-    findLastFrom(arr, 2, (value, index, array) => {
-      called.push([value, index, array])
-      return false
-    })
-    expect(called[0][0]).toBe(30)
-    expect(called[0][1]).toBe(2)
-    expect(called[0][2]).toBe(arr)
+  it("supports key as string", () => {
+    const arr = [{ x: 0 }, { x: 2 }, { x: 0 }]
+    expect(findTruthy(arr, { key: "x" })).toEqual({ x: 2 })
   })
-})
 
-describe("isTruthy", () => {
-  it("returns the argument if it is truthy", () => {
-    expect(isTruthy(1)).toBe(1)
-    expect(isTruthy("foo")).toBe("foo")
-    expect(isTruthy({})).toEqual({})
-    expect(isTruthy([])).toEqual([])
-    expect(isTruthy(true)).toBe(true)
+  it("supports key as number", () => {
+    const arr = [[0], [2], [0]]
+    expect(findTruthy(arr, { key: 0 })).toEqual([2])
   })
 
-  it("returns the argument if it is falsy", () => {
-    expect(isTruthy(0)).toBe(0)
-    expect(isTruthy("")).toBe("")
-    expect(isTruthy(null)).toBe(null)
-    expect(isTruthy(undefined)).toBe(undefined)
-    expect(isTruthy(false)).toBe(false)
-    expect(isTruthy(NaN)).toBe(NaN)
+  it("respects from and until (forward)", () => {
+    const arr = [0, 1, 2, 3]
+    expect(findTruthy(arr, { from: 2, until: 4 })).toBe(2)
+    expect(findTruthy(arr, { from: 1, until: 3 })).toBe(1)
+    expect(findTruthy(arr, { from: 3, until: 4 })).toBe(3)
+    expect(findTruthy(arr, { from: 3, until: 3 })).toBeUndefined()
   })
 
-  it("can be used with Array.prototype.find to filter out falsy values", () => {
-    const arr = [0, null, undefined, false, "", "hello", 42]
-    expect(arr.find(isTruthy)).toBe("hello")
+  it("returns undefined if from >= until", () => {
+    expect(findTruthy([0, 1, 2], { from: 2, until: 2 })).toBeUndefined()
+    expect(findTruthy([0, 1, 2], { from: 3, until: 2 })).toBeUndefined()
   })
 })