refactor: TakeWhile - simplify things

loophp · Feb 15, 2023 · 9d4bee7 · 9d4bee7
1 parent 09eb135
commit 9d4bee7
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/src/Operation/TakeWhile.php b/src/Operation/TakeWhile.php
@@ -7,7 +7,6 @@
 use Closure;
 use Generator;
 use loophp\collection\Utils\CallbacksArrayReducer;
-use loophp\iterators\IterableIteratorAggregate;
 
 /**
  * @immutable
@@ -35,20 +34,15 @@ public function __invoke(): Closure
                  * @return Generator<TKey, T>
                  */
                 static function (iterable $iterable) use ($callbacks): Generator {
-                    $iteratorAggregate = (new IterableIteratorAggregate($iterable))->getIterator();
+                    $callback = CallbacksArrayReducer::or()($callbacks);
 
-                    $every = (new Every())()(
-                        /**
-                         * @param T $value
-                         * @param TKey $key
-                         * @param iterable<TKey, T> $iterable
-                         */
-                        static fn (int $index, mixed $value, mixed $key, iterable $iterable): bool => CallbacksArrayReducer::or()($callbacks)($value, $key, $iterable)
-                    )($iteratorAggregate);
+                    foreach ($iterable as $key => $current) {
+                        if (false === $callback($current, $key, $iterable)) {
+                            break;
+                        }
 
-                    $size = (true === $every->current()) ? -1 : $every->key();
-
-                    yield from (new Limit())()($size)(0)($iteratorAggregate);
+                        yield $key => $current;
+                    }
                 };
     }
 }