From 1e3b6ac6632d9f798fd6c45a37daef5a7cba593f Mon Sep 17 00:00:00 2001 From: Karsten Schmidt Date: Sat, 5 Sep 2020 21:21:32 +0100 Subject: [PATCH] refactor(arrays): update imports, use new Fn types --- packages/arrays/src/binary-search.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/arrays/src/binary-search.ts b/packages/arrays/src/binary-search.ts index 750767d906..5ee840af47 100644 --- a/packages/arrays/src/binary-search.ts +++ b/packages/arrays/src/binary-search.ts @@ -1,4 +1,4 @@ -import type { Comparator, Fn, FnU2 } from "@thi.ng/api"; +import type { Comparator, Fn, FnN, FnN2 } from "@thi.ng/api"; import { compare, compareNumAsc } from "@thi.ng/compare"; /** @@ -157,14 +157,14 @@ export const binarySearch32 = (buf: ArrayLike, x: number) => { * * @param i - binarySearch result index */ -export const bsLT = (i: number) => (i < 0 ? -i - 2 : i - 1); +export const bsLT: FnN = (i) => (i < 0 ? -i - 2 : i - 1); /** * Similar to {@link bsLT}, but for less-than-equals queries. * * @param i - binarySearch result index */ -export const bsLE = (i: number) => (i < 0 ? -i - 2 : i); +export const bsLE: FnN = (i) => (i < 0 ? -i - 2 : i); /** * {@link binarySearch} result index classifier for successor queries. @@ -185,7 +185,7 @@ export const bsLE = (i: number) => (i < 0 ? -i - 2 : i); * @param i - binarySearch result index * @param n - array length */ -export const bsGT: FnU2 = (i, n) => ( +export const bsGT: FnN2 = (i, n) => ( (i = i < 0 ? -i - 1 : i + 1), i < n ? i : -1 ); @@ -195,9 +195,7 @@ export const bsGT: FnU2 = (i, n) => ( * @param i - binarySearch result index * @param n - array length */ -export const bsGE: FnU2 = (i, n) => ( - (i = i < 0 ? -i - 1 : i), i < n ? i : -1 -); +export const bsGE: FnN2 = (i, n) => ((i = i < 0 ? -i - 1 : i), i < n ? i : -1); /** * {@link binarySearch} result index classifier for equals queries. @@ -205,4 +203,4 @@ export const bsGE: FnU2 = (i, n) => ( * * @param i - binarySearch result index */ -export const bsEQ = (i: number) => (i < 0 ? -1 : i); +export const bsEQ: FnN = (i) => (i < 0 ? -1 : i);