refactor(iterators): use Predicate/Predicate2

thi-ng · Jan 31, 2018 · 42bbb86 · 42bbb86
1 parent fbf8453
commit 42bbb86
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/packages/iterators/src/dedupe-with.ts b/packages/iterators/src/dedupe-with.ts
@@ -1,6 +1,8 @@
+import { Predicate2 } from "@thi.ng/api/api";
+
 import { iterator } from "./iterator";
 
-export function* dedupeWith<T>(equiv: (a: T, b: T) => boolean, input: Iterable<T>) {
+export function* dedupeWith<T>(equiv: Predicate2<T>, input: Iterable<T>) {
     let iter = iterator(input),
         v: IteratorResult<T>,
         prev: T;

diff --git a/packages/iterators/src/drop-while.ts b/packages/iterators/src/drop-while.ts
@@ -1,6 +1,8 @@
+import { Predicate } from "@thi.ng/api/api";
+
 import { ensureIterator } from "./ensure";
 
-export function* dropWhile<T>(pred: (x: T) => boolean, input: Iterable<T>) {
+export function* dropWhile<T>(pred: Predicate<T>, input: Iterable<T>) {
     let iter = ensureIterator(input),
         v: IteratorResult<T>;
     while (((v = iter.next()), !v.done && pred(v.value) === true)) { }

diff --git a/packages/iterators/src/every.ts b/packages/iterators/src/every.ts
@@ -1,6 +1,8 @@
+import { Predicate } from "@thi.ng/api/api";
+
 import { iterator } from "./iterator";
 
-export function every<T>(pred: (x: T) => boolean, input: Iterable<T>) {
+export function every<T>(pred: Predicate<T>, input: Iterable<T>) {
     let iter = iterator(input),
         v: IteratorResult<T>,
         empty = true;

diff --git a/packages/iterators/src/filter.ts b/packages/iterators/src/filter.ts
@@ -1,6 +1,8 @@
+import { Predicate } from "@thi.ng/api/api";
+
 import { iterator } from "./iterator";
 
-export function* filter<T>(pred: (x: T) => boolean, input: Iterable<T>) {
+export function* filter<T>(pred: Predicate<T>, input: Iterable<T>) {
     let iter = iterator(input),
         v: IteratorResult<T>;
     while (((v = iter.next()), !v.done)) {

diff --git a/packages/iterators/src/some.ts b/packages/iterators/src/some.ts
@@ -1,6 +1,8 @@
+import { Predicate } from "@thi.ng/api/api";
+
 import { iterator } from "./iterator";
 
-export function some<T>(pred: (x: T) => boolean, input: Iterable<T>) {
+export function some<T>(pred: Predicate<T>, input: Iterable<T>) {
     let iter = iterator(input),
         v: IteratorResult<T>;
     while (((v = iter.next()), !v.done)) {

diff --git a/packages/iterators/src/take-while.ts b/packages/iterators/src/take-while.ts
@@ -1,6 +1,8 @@
+import { Predicate } from "@thi.ng/api/api";
+
 import { iterator } from "./iterator";
 
-export function* takeWhile<T>(pred: (x: T) => boolean, input: Iterable<T>) {
+export function* takeWhile<T>(pred: Predicate<T>, input: Iterable<T>) {
     let iter = iterator(input),
         v: IteratorResult<T>;
     while (((v = iter.next()), !v.done && pred(v.value))) {