refactor: Minor code style update.

loophp · Dec 15, 2020 · 54d0f8e · 54d0f8e
1 parent 65769b4
commit 54d0f8e
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 70 deletions.
diff --git a/src/Operation/Append.php b/src/Operation/Append.php
@@ -33,13 +33,9 @@ public function __invoke(): Closure
                  * @psalm-return Generator<int|TKey, T>
                  */
                 static function (Iterator $iterator) use ($items): Generator {
-                    foreach ($iterator as $key => $value) {
-                        yield $key => $value;
-                    }
+                    yield from $iterator;
 
-                    foreach ($items as $key => $item) {
-                        yield $key => $item;
-                    }
+                    return yield from $items;
                 };
     }
 }
diff --git a/src/Operation/Collapse.php b/src/Operation/Collapse.php
@@ -32,13 +32,7 @@ static function (Iterator $iterator): Generator {
                         continue;
                     }
 
-                    /**
-                     * @psalm-var TKey $subKey
-                     * @psalm-var T $subValue
-                     */
-                    foreach ($value as $subKey => $subValue) {
-                        yield $subKey => $subValue;
-                    }
+                    yield from $value;
                 }
             };
     }

diff --git a/src/Operation/Flatten.php b/src/Operation/Flatten.php
@@ -44,13 +44,7 @@ static function (Iterator $iterator) use ($depth): Generator {
                             $value = $flatten(new IterableIterator($value));
                         }
 
-                        /**
-                         * @psalm-var TKey $subKey
-                         * @psalm-var T $subValue
-                         */
-                        foreach ($value as $subKey => $subValue) {
-                            yield $subKey => $subValue;
-                        }
+                        yield from $value;
                     }
                 };
     }

diff --git a/src/Operation/Flip.php b/src/Operation/Flip.php
@@ -20,16 +20,15 @@ final class Flip extends AbstractOperation
      */
     public function __invoke(): Closure
     {
-        return
-            /**
-             * @psalm-param Iterator<TKey, T> $iterator
-             *
-             * @psalm-return Generator<T, TKey>
-             */
-            static function (Iterator $iterator): Generator {
-                foreach ($iterator as $key => $value) {
-                    yield $value => $key;
-                }
-            };
+        $callbackForKeys = static fn ($carry, $key, $value) => $value;
+        $callbackForValues = static fn ($carry, $key, $value) => $key;
+
+        /**
+         * @var Closure(Iterator<TKey, T>): Generator<T, TKey>
+         */
+        $associate = Associate::of()($callbackForKeys)($callbackForValues);
+
+        // Point free style.
+        return $associate;
     }
 }
diff --git a/src/Operation/Keys.php b/src/Operation/Keys.php
@@ -20,16 +20,13 @@ final class Keys extends AbstractOperation
      */
     public function __invoke(): Closure
     {
-        return
-            /**
-             * @psalm-param Iterator<TKey, T> $iterator
-             *
-             * @psalm-return Generator<int, TKey>
-             */
-            static function (Iterator $iterator): Generator {
-                foreach ($iterator as $key => $value) {
-                    yield $key;
-                }
-            };
+        /** @psalm-var Closure(Iterator<TKey, T>): Generator<int, TKey> $pipe */
+        $pipe = Pipe::of()(
+            Flip::of(),
+            Normalize::of()
+        );
+
+        // Point free style.
+        return $pipe;
     }
 }
diff --git a/src/Operation/Merge.php b/src/Operation/Merge.php
@@ -31,14 +31,10 @@ public function __invoke(): Closure
                  * @psalm-return Generator<TKey, T>
                  */
                 static function (Iterator $iterator) use ($sources): Generator {
-                    foreach ($iterator as $key => $value) {
-                        yield $key => $value;
-                    }
+                    yield from $iterator;
 
                     foreach ($sources as $source) {
-                        foreach ($source as $key => $value) {
-                            yield $key => $value;
-                        }
+                        yield from $source;
                     }
                 };
     }

diff --git a/src/Operation/Prepend.php b/src/Operation/Prepend.php
@@ -33,13 +33,9 @@ public function __invoke(): Closure
                  * @psalm-return Generator<int|TKey, T>
                  */
                 static function (Iterator $iterator) use ($items): Generator {
-                    foreach ($items as $key => $item) {
-                        yield $key => $item;
-                    }
+                    yield from $items;
 
-                    foreach ($iterator as $key => $value) {
-                        yield $key => $value;
-                    }
+                    return yield from $iterator;
                 };
     }
 }
diff --git a/src/Operation/Transpose.php b/src/Operation/Transpose.php
@@ -31,13 +31,30 @@ public function __invoke(): Closure
             static function (Iterator $iterator): Generator {
                 $mit = new MultipleIterator(MultipleIterator::MIT_NEED_ANY);
 
-                foreach ($iterator as $collectionItem) {
-                    $mit->attachIterator(new IterableIterator($collectionItem));
+                foreach ($iterator as $iterableIterator) {
+                    $mit->attachIterator(new IterableIterator($iterableIterator));
                 }
 
-                foreach ($mit as $key => $value) {
-                    yield current($key) => $value;
-                }
+                $callbackForKeys =
+                    /**
+                     * @psalm-param array $carry
+                     * @psalm-param array<int, TKey> $key
+                     *
+                     * @psalm-return TKey
+                     */
+                    static fn (array $carry, array $key) => current($key);
+
+                $callbackForValues =
+                    /**
+                     * @psalm-param array $carry
+                     * @psalm-param array<int, TKey> $key
+                     * @psalm-param array<int, T> $value
+                     *
+                     * @psalm-return array<int, T>
+                     */
+                    static fn (array $carry, array $key, array $value): array => $value;
+
+                return yield from Associate::of()($callbackForKeys)($callbackForValues)($mit);
             };
     }
 }
diff --git a/src/Operation/Unzip.php b/src/Operation/Unzip.php
@@ -45,6 +45,7 @@ static function (array $carry, iterable $value): array {
             Unwrap::of()
         );
 
+        // Point free style.
         return $pipe;
     }
 }
diff --git a/src/Operation/Wrap.php b/src/Operation/Wrap.php
@@ -23,9 +23,11 @@ public function __invoke(): Closure
         $mapCallback =
             /**
              * @psalm-param T $value
-             * @psalm-param TKey $key
              *
              * @param mixed $value
+             *
+             * @psalm-param TKey $key
+             *
              * @param mixed $key
              *
              * @psalm-return array<TKey, T>

diff --git a/src/Operation/Zip.php b/src/Operation/Zip.php
@@ -30,17 +30,24 @@ public function __invoke(): Closure
              *
              * @psalm-return Closure(Iterator<TKey, T>): Generator<int, list<T>>
              */
-            static fn (iterable ...$iterables): Closure => static function (Iterator $iterator) use ($iterables): Generator {
-                $mit = new MultipleIterator(MultipleIterator::MIT_NEED_ANY);
-                $mit->attachIterator($iterator);
+            static fn (iterable ...$iterables): Closure =>
+                /**
+                 * @psalm-param Iterator<TKey, T>: Generator<int, list<T>>
+                 *
+                 * @psalm-return Generator<int, list<T>>
+                 */
+                static function (Iterator $iterator) use ($iterables): Generator {
+                    $mit = new MultipleIterator(MultipleIterator::MIT_NEED_ANY);
+                    $mit->attachIterator($iterator);
 
-                foreach ($iterables as $iterableIterator) {
-                    $mit->attachIterator(new IterableIterator($iterableIterator));
-                }
+                    foreach ($iterables as $iterableIterator) {
+                        $mit->attachIterator(new IterableIterator($iterableIterator));
+                    }
 
-                foreach ($mit as $values) {
-                    yield $values;
-                }
-            };
+                    // @todo: Why "yield from $mit" doesn't work here?
+                    foreach ($mit as $values) {
+                        yield $values;
+                    }
+                };
     }
 }