diff --git a/src/mol-data/iterator.ts b/src/mol-data/iterator.ts index 106efa325b8c11f8d6640e1bbd135dbb18ff5ce8..8d5713f1fd56e138d61a6a1aba77010b746ae2bc 100644 --- a/src/mol-data/iterator.ts +++ b/src/mol-data/iterator.ts @@ -107,11 +107,11 @@ namespace Iterator { export function map<T, R>(base: Iterator<T>, f: (v: T) => R): Iterator<R> { return new MapIteratorImpl(base, f); } export function filter<T>(base: Iterator<T>, p: (v: T) => boolean): Iterator<T> { return new FilterIteratorImpl(base, p); } - // f can return non-undefined falsy value to stop the iteration. - export function forEach<T, Ctx>(it: Iterator<T>, f: (v: T, ctx: Ctx) => boolean | void, ctx: Ctx): Ctx { + // Iterate until first truthy value is returned. + export function forEach<T, Ctx>(it: Iterator<T>, f: (v: T, ctx: Ctx) => any, ctx: Ctx): Ctx { while (it.hasNext) { const c = f(it.move(), ctx); - if (typeof c !== 'undefined' && !c) return ctx; + if (c) return ctx; } return ctx; }