diff --git a/src/index.ts b/src/index.ts index 17996ec..a935c42 100644 --- a/src/index.ts +++ b/src/index.ts @@ -88,8 +88,8 @@ export class IteratorEnumerator implements IEnumerator, Iterator { } next(...[_value]: [] | [any]): IteratorResult { - const done = this.moveNext() - return { value: this.current, done } as IteratorResult + const next = this.moveNext() + return { value: this.current, done: !next } as IteratorResult } return(value?: any): IteratorResult { @@ -141,8 +141,8 @@ export class CachedIteratorEnumerator implements IEnumerator, Iterator } next(...[_value]: [] | [any]): IteratorResult { - const done = this.moveNext() - return { value: this.current, done } as IteratorResult + const next = this.moveNext() + return { value: this.current, done: !next } as IteratorResult } return?(value?: any): IteratorResult { @@ -194,8 +194,8 @@ export class IterableEnumerator implements IEnumerator, Iterator { } next(...[_value]: [] | [any]): IteratorResult { - const done = !this.moveNext() - return { value: this.current, done } as IteratorResult + const next = !this.moveNext() + return { value: this.current, done: !next } as IteratorResult } return?(value?: any): IteratorResult { @@ -266,8 +266,8 @@ export class ArrayEnumerator implements IEnumerator, Iterator, Iterable } next(...[_value]: [] | [any]): IteratorResult { - const done = this.moveNext() - return { value: this.current, done } as IteratorResult + const next = this.moveNext() + return { value: this.current, done: !next } as IteratorResult } return?(_value?: any): IteratorResult { @@ -329,9 +329,9 @@ export class Enumerator implements IEnumerator, Iterator { } next(...[_value]: [] | [any]): IteratorResult { - const done = this.moveNext() + const next = this.moveNext() - return { value: this.current, done } as IteratorResult + return { value: this.current, done: !next } as IteratorResult } return?(_value?: any): IteratorResult { @@ -377,9 +377,9 @@ export class HelperEnumerator implements IEnumerator, Iterator { } next(...[_value]: [] | [any]): IteratorResult { - const done = this.moveNext() + const next = this.moveNext() - return { value: this.current, done } as IteratorResult + return { value: this.current, done: !next } as IteratorResult } return?(_value?: any): IteratorResult {