refactor: Update MatchOne operation.

BREAKING CHANGE: no
loophp · Apr 11, 2021 · 287b158 · 287b158
1 parent 9a72f7d
commit 287b158
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 24 deletions.
diff --git a/spec/loophp/collection/CollectionSpec.php b/spec/loophp/collection/CollectionSpec.php
@@ -1802,13 +1802,6 @@ static function (int $value): bool {
             )
             ->shouldIterateAs([0 => false]);
 
-        $this::fromIterable($input)
-            ->match(
-                static fn (int $value): string => 17 === $value ? 'foo' : 'bar',
-                static fn (): string => 'foo'
-            )
-            ->shouldIterateAs([0 => false]);
-
         $this::fromIterable($input)
             ->match(
                 static fn (int $value): bool => 5 !== $value,

diff --git a/src/Operation/MatchOne.php b/src/Operation/MatchOne.php
@@ -18,24 +18,24 @@
 final class MatchOne extends AbstractOperation
 {
     /**
-     * @psalm-return Closure(callable(T, TKey, Iterator<TKey, T>): T): Closure(callable(T, TKey, Iterator<TKey, T>): bool): Closure(Iterator<TKey, T>): Generator<int, bool>
+     * @psalm-return Closure(callable(T, TKey, Iterator<TKey, T>): T): Closure(callable(T, TKey, Iterator<TKey, T>): bool): Closure(Iterator<TKey, T>): Generator<TKey|int, bool>
      */
     public function __invoke(): Closure
     {
         return
             /**
              * @psalm-param callable(T, TKey, Iterator<TKey, T>): T $matcher
              *
-             * @psalm-return Closure(callable(T, TKey, Iterator<TKey, T>): bool): Closure(Iterator<TKey, T>): Generator<int, bool>
+             * @psalm-return Closure(callable(T, TKey, Iterator<TKey, T>): bool): Closure(Iterator<TKey, T>): Generator<TKey|int, bool>
              */
-            static function (callable $matcher): Closure {
+            static function (callable ...$matchers): Closure {
                 return
                     /**
                      * @psalm-param callable(T, TKey, Iterator<TKey, T>): bool ...$callbacks
                      *
-                     * @psalm-return Closure(Iterator<TKey, T>): Generator<int, bool>
+                     * @psalm-return Closure(Iterator<TKey, T>): Generator<TKey|int, bool>
                      */
-                    static function (callable ...$callbacks) use ($matcher): Closure {
+                    static function (callable ...$callbacks) use ($matchers): Closure {
                         $callbackReducer =
                             /**
                              * @psalm-param list<callable(T, TKey, Iterator<TKey, T>): bool> $callbacks
@@ -58,30 +58,40 @@ static function (callable ...$callbacks) use ($matcher): Closure {
                                     false
                                 );
 
-                        $callback = $callbackReducer($callbacks);
-
                         $mapCallback =
                             /**
-                             * @param mixed $value
-                             * @psalm-param T $value
-                             *
-                             * @param mixed $key
-                             * @psalm-param TKey $key
+                             * @psalm-param callable(T, TKey, Iterator<TKey, T>) $reducer1
                              *
-                             * @psalm-param Iterator<TKey, T> $iterator
+                             * @psalm-return Closure(callable(T, TKey, Iterator<TKey, T>)): Closure(T, TKey, Iterator<TKey, T>): bool
                              */
-                            static fn ($value, $key, Iterator $iterator): bool => $matcher($value, $key, $iterator) === $callback($value, $key, $iterator);
+                            static fn (callable $reducer1): Closure =>
+                                /**
+                                 * @psalm-param callable(T, TKey, Iterator<TKey, T>) $reducer2
+                                 *
+                                 * @psalm-return Closure(T, TKey, Iterator<TKey, T>): bool
+                                 */
+                                static fn (callable $reducer2): Closure =>
+                                    /**
+                                     * @param mixed $value
+                                     * @psalm-param T $value
+                                     *
+                                     * @param mixed $key
+                                     * @psalm-param TKey $key
+                                     *
+                                     * @psalm-param Iterator<TKey, T> $iterator
+                                     */
+                                    static fn ($value, $key, Iterator $iterator): bool => $reducer1($value, $key, $iterator) === $reducer2($value, $key, $iterator);
 
                         $dropWhileCallback =
                             /**
                              * @param mixed $value
                              * @psalm-param T $value
                              */
-                            static fn ($value): bool => !(bool) $value;
+                            static fn (bool $value): bool => false === $value;
 
-                        /** @psalm-var Closure(Iterator<TKey, T>): Generator<int, bool> $pipe */
+                        /** @psalm-var Closure(Iterator<TKey, T>): Generator<TKey|int, bool> $pipe */
                         $pipe = Pipe::of()(
-                            Map::of()($mapCallback),
+                            Map::of()($mapCallback($callbackReducer($callbacks))($callbackReducer($matchers))),
                             DropWhile::of()($dropWhileCallback),
                             Append::of()(false),
                             Head::of()