refactor: Leverage tacit programming.

docs/pages/api.rst

@@ -500,7 +500,7 @@ first time till the end of the list.
 
 Interface: `DropWhileable`_
 
-Signature: ``Collection::dropWhile(callable $callback);``
+Signature: ``Collection::dropWhile(callable ...$callbacks);``
 
 .. code-block:: php
 

spec/loophp/collection/CollectionSpec.php

@@ -569,12 +569,16 @@ public function it_can_drop(): void
 
     public function it_can_dropWhile(): void
     {
-        $isSmallerThanThree = static function ($value) {
+        $isSmallerThanThree = static function (int $value): bool {
             return 3 > $value;
         };
 
+        $isGreaterThanFive = static function (int $value): bool {
+            return 5 > $value;
+        };
+
         $this::fromIterable([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3])
-            ->dropWhile($isSmallerThanThree)
+            ->dropWhile($isGreaterThanFive, $isSmallerThanThree)
             ->shouldIterateAs([
                 2 => 3,
                 3 => 4,
@@ -1876,11 +1880,11 @@ public function it_can_scanright1(): void
         $result = static function () {
             yield 0 => 8;
 
-            yield 0 => 1;
+            yield 1 => 1;
 
-            yield 1 => 12;
+            yield 2 => 12;
 
-            yield 2 => 2;
+            yield 0 => 2;
         };
 
         $this::fromIterable([8, 12, 24, 2])

src/Collection.php

@@ -357,9 +357,9 @@ public function drop(int ...$counts): CollectionInterface
         return $this->pipe(Drop::of()(...$counts));
     }
 
-    public function dropWhile(callable $callback): CollectionInterface
+    public function dropWhile(callable ...$callbacks): CollectionInterface
     {
-        return $this->pipe(DropWhile::of()($callback));
+        return $this->pipe(DropWhile::of()(...$callbacks));
     }
 
     public function duplicate(): CollectionInterface

src/Contract/Operation/DropWhileable.php

@@ -16,5 +16,5 @@ interface DropWhileable
     /**
      * @psalm-return \loophp\collection\Contract\Collection<TKey, T>
      */
-    public function dropWhile(callable $callback): Collection;
+    public function dropWhile(callable ...$callbacks): Collection;
 }

src/Operation/DropWhile.php

@@ -28,16 +28,26 @@ public function __invoke(): Closure
              *
              * @psalm-return Closure(Iterator<TKey, T>): Generator<TKey, T>
              */
-            static function (callable $callback): Closure {
+            static function (callable ...$callbacks): Closure {
                 return
                     /**
                      * @psalm-param Iterator<TKey, T> $iterator
                      *
                      * @psalm-return Generator<TKey, T>
                      */
-                    static function (Iterator $iterator) use ($callback): Generator {
+                    static function (Iterator $iterator) use ($callbacks): Generator {
                         for (; $iterator->valid(); $iterator->next()) {
-                            if (true === $callback($iterator->current(), $iterator->key(), $iterator)) {
+                            $reduced = array_reduce(
+                                $callbacks,
+                                static function (bool $carry, callable $callback) use ($iterator): bool {
+                                    return ($callback($iterator->current(), $iterator->key(), $iterator)) ?
+                                        $carry :
+                                        false;
+                                },
+                                true
+                            );
+
+                            if (true === $reduced) {
                                 continue;
                             }
 

src/Operation/FoldRight1.php

@@ -31,7 +31,6 @@ public function __invoke(): Closure
             static function (callable $callback): Closure {
                 /** @psalm-var Closure(Iterator<TKey, T>): Generator<int|TKey, T|null> $pipe */
                 $pipe = Pipe::of()(
-                    Reverse::of(),
                     ScanRight1::of()($callback),
                     Head::of()
                 );

src/Operation/Key.php

@@ -27,18 +27,14 @@ public function __invoke(): Closure
              * @psalm-return Closure(Iterator<TKey, T>): Generator<int, TKey>
              */
             static function (int $index): Closure {
-                return
-                    /**
-                     * @psalm-param Iterator<TKey, T> $iterator
-                     *
-                     * @psalm-return Generator<int, TKey>
-                     */
-                    static function (Iterator $iterator) use ($index): Generator {
-                        for ($i = 0; $i < $index; $i++, $iterator->next()) {
-                        }
+                /** @psalm-var Closure(Iterator<TKey, T>): Generator<int, TKey> $pipe */
+                $pipe = Pipe::of()(
+                    Limit::of()(1)($index),
+                    Flip::of()
+                );
 
-                        return yield $iterator->key();
-                    };
+                // Point free style.
+                return $pipe;
             };
     }
 }

src/Operation/ScanLeft.php

@@ -37,17 +37,14 @@ static function (callable $callback): Closure {
                      * @psalm-return Closure(Iterator<TKey, T>): Generator<int|TKey, T|null>
                      */
                     static function ($initial = null) use ($callback): Closure {
-                        return
-                            /**
-                             * @psalm-param Iterator<TKey, T> $iterator
-                             *
-                             * @psalm-return Generator<int|TKey, T|null>
-                             */
-                            static function (Iterator $iterator) use ($callback, $initial): Generator {
-                                yield $initial;
+                        /** @psalm-var Closure(Iterator<TKey, T>): Generator<int|TKey, T|null> $pipe */
+                        $pipe = Pipe::of()(
+                            Reduction::of()($callback)($initial),
+                            Prepend::of()($initial)
+                        );
 
-                                return yield from Reduction::of()($callback)($initial)($iterator);
-                            };
+                        // Point free style.
+                        return $pipe;
                     };
             };
     }

src/Operation/ScanLeft1.php

@@ -38,12 +38,11 @@ static function (callable $callback): Closure {
                     static function (Iterator $iterator) use ($callback): Generator {
                         $initial = $iterator->current();
 
-                        yield $initial;
-
                         /** @psalm-var Closure(Iterator<TKey, T>): Generator<int|TKey, T|null> $pipe */
                         $pipe = Pipe::of()(
                             Tail::of(),
-                            Reduction::of()($callback)($initial)
+                            Reduction::of()($callback)($initial),
+                            Prepend::of()($initial)
                         );
 
                         return yield from $pipe($iterator);

src/Operation/ScanRight.php

@@ -37,24 +37,16 @@ static function (callable $callback): Closure {
                      * @psalm-return Closure(Iterator<TKey, T>): Generator<int|TKey, T|null>
                      */
                     static function ($initial = null) use ($callback): Closure {
-                        return
-                            /**
-                             * @psalm-param Iterator<TKey, T> $iterator
-                             *
-                             * @psalm-return Generator<int|TKey, T|null>
-                             */
-                            static function (Iterator $iterator) use ($callback, $initial): Generator {
-                                /** @psalm-var Closure(Iterator<TKey, T>): Generator<TKey, T> $pipe */
-                                $pipe = Pipe::of()(
-                                    Reverse::of(),
-                                    Reduction::of()($callback)($initial),
-                                    Reverse::of()
-                                );
+                        /** @psalm-var Closure(Iterator<TKey, T>): Generator<int|TKey, T|null> $pipe */
+                        $pipe = Pipe::of()(
+                            Reverse::of(),
+                            Reduction::of()($callback)($initial),
+                            Reverse::of(),
+                            Append::of()($initial)
+                        );
 
-                                yield from $pipe($iterator);
-
-                                return yield $initial;
-                            };
+                        // Point free style.
+                        return $pipe;
                     };
             };
     }

src/Operation/ScanRight1.php

@@ -29,25 +29,15 @@ public function __invoke(): Closure
              * @psalm-return Closure(Iterator<TKey, T>): Generator<int|TKey, T|null>
              */
             static function (callable $callback): Closure {
-                return
-                    /**
-                     * @psalm-param Iterator<TKey, T> $iterator
-                     *
-                     * @psalm-return Generator<int|TKey, T|null>
-                     */
-                    static function (Iterator $iterator) use ($callback): Generator {
-                        $initial = $iterator->current();
+                /** @psalm-var Closure(Iterator<TKey, T>): Generator<TKey, T> $pipe */
+                $pipe = Pipe::of()(
+                    Reverse::of(),
+                    ScanLeft1::of()($callback),
+                    Reverse::of()
+                );
 
-                        yield $initial;
-
-                        /** @psalm-var Closure(Iterator<TKey, T>): Generator<TKey, T> $pipe */
-                        $pipe = Pipe::of()(
-                            Init::of(),
-                            Reduction::of()($callback)($initial)
-                        );
-
-                        return yield from $pipe($iterator);
-                    };
+                // Point free style.
+                return $pipe;
             };
     }
 }