Syntactic sugar to reduce the amount of parenthesis.

loophp · Aug 28, 2020 · f40dc3b · f40dc3b
1 parent 6ce8ecf
commit f40dc3b
Show file tree

Hide file tree

Showing 38 changed files with 320 additions and 281 deletions.
diff --git a/src/Collection.php b/src/Collection.php
diff --git a/src/Contract/Operation.php b/src/Contract/Operation.php
@@ -9,4 +9,6 @@
 interface Operation
 {
     public function __invoke(): Closure;
+
+    public static function of(): Closure;
 }
diff --git a/src/Operation/AbstractOperation.php b/src/Operation/AbstractOperation.php
@@ -4,18 +4,17 @@
 
 namespace loophp\collection\Operation;
 
-abstract class AbstractOperation
+use Closure;
+use loophp\collection\Contract\Operation;
+
+abstract class AbstractOperation implements Operation
 {
-    /**
-     * @var array<string, mixed>
-     */
-    protected $storage = [];
+    final public function __construct()
+    {
+    }
 
-    /**
-     * @return array<string, mixed>
-     */
-    public function getArguments(): array
+    public static function of(): Closure
     {
-        return $this->storage;
+        return (new static())->__invoke();
     }
 }
diff --git a/src/Operation/Chunk.php b/src/Operation/Chunk.php
@@ -9,7 +9,6 @@
 use Generator;
 use Iterator;
 use loophp\collection\Contract\Operation;
-use loophp\collection\Transformation\Run;
 
 use function count;
 
@@ -37,7 +36,8 @@ static function (int ...$sizes): Closure {
                      * @psalm-return Generator<int, list<T>>
                      */
                     static function (Iterator $iterator) use ($sizes): Generator {
-                        $sizesIterator = (new Run())()((new Loop())())(new ArrayIterator($sizes));
+                        /** @var Iterator<int, int> $sizesIterator */
+                        $sizesIterator = Loop::of()(new ArrayIterator($sizes));
 
                         $values = [];
 

diff --git a/src/Operation/Column.php b/src/Operation/Column.php
@@ -8,7 +8,6 @@
 use Generator;
 use Iterator;
 use loophp\collection\Contract\Operation;
-use loophp\collection\Transformation\Run;
 
 /**
  * @psalm-template TKey
@@ -22,18 +21,30 @@ final class Column extends AbstractOperation implements Operation
      */
     public function __invoke(): Closure
     {
-        return static function ($column): Closure {
-            return static function (Iterator $iterator) use ($column): Generator {
-                /**
-                 * @psalm-var array-key $key
-                 * @psalm-var iterable<TKey, T> $value
-                 */
-                foreach ((new Run())()((new Transpose())())($iterator) as $key => $value) {
-                    if ($key === $column) {
-                        return yield from $value;
-                    }
-                }
+        return
+            /**
+             * @param int|string $column
+             *
+             * @psalm-param array-key $column
+             */
+            static function ($column): Closure {
+                return
+                    /**
+                     * @psalm-param Iterator<TKey, T> $iterator
+                     *
+                     * @psalm-return Generator<int, iterable<TKey, T>>
+                     */
+                    static function (Iterator $iterator) use ($column): Generator {
+                        /**
+                         * @psalm-var array-key $key
+                         * @psalm-var iterable<TKey, T> $value
+                         */
+                        foreach (Transpose::of()($iterator) as $key => $value) {
+                            if ($key === $column) {
+                                return yield from $value;
+                            }
+                        }
+                    };
             };
-        };
     }
 }
diff --git a/src/Operation/Compact.php b/src/Operation/Compact.php
@@ -8,7 +8,6 @@
 use Generator;
 use Iterator;
 use loophp\collection\Contract\Operation;
-use loophp\collection\Transformation\Run;
 
 use function in_array;
 
@@ -19,23 +18,37 @@
  */
 final class Compact extends AbstractOperation implements Operation
 {
+    /**
+     * @psalm-return Closure(T...): Closure(Iterator<TKey, T>): Generator<TKey, T>
+     */
     public function __invoke(): Closure
     {
-        return static function (...$values): Closure {
-            return static function (Iterator $iterator) use ($values): Generator {
-                $values = [] === $values ? [null] : $values;
-
-                $filter = (new Filter())()(
+        return
+            /**
+             * @psalm-param T ...$values
+             */
+            static function (...$values): Closure {
+                return
                     /**
-                     * @param mixed $item
+                     * @psalm-param Iterator<TKey, T> $iterator
+                     * @psalm-return Generator<TKey, T>
                      */
-                    static function ($item) use ($values): bool {
-                        return !in_array($item, $values, true);
-                    }
-                );
+                    static function (Iterator $iterator) use ($values): Generator {
+                        $values = [] === $values ? [null] : $values;
+
+                        /** @psalm-var callable(Iterator<TKey, T>):Generator<TKey, T> $filter */
+                        $filter = Filter::of()(
+                            /**
+                             * @param mixed $value
+                             * @psalm-param T $value
+                             */
+                            static function ($value) use ($values): bool {
+                                return !in_array($value, $values, true);
+                            }
+                        );
 
-                return yield from (new Run())()($filter)($iterator);
+                        return yield from $filter($iterator);
+                    };
             };
-        };
     }
 }
diff --git a/src/Operation/Explode.php b/src/Operation/Explode.php
@@ -8,7 +8,6 @@
 use Generator;
 use Iterator;
 use loophp\collection\Contract\Operation;
-use loophp\collection\Transformation\Run;
 
 /**
  * @psalm-template TKey
@@ -19,30 +18,38 @@ final class Explode extends AbstractOperation implements Operation
 {
     public function __invoke(): Closure
     {
-        return static function (...$explodes): Closure {
-            return static function (Iterator $iterator) use ($explodes): Generator {
-                $split = (new Split())()(
-                    ...array_map(
-                        /**
-                         * @param mixed $explode
-                         * @psalm-param T $explode
-                         */
-                        static function ($explode): Closure {
-                            return
+        return
+            /**
+             * @psalm-param T ...$explodes
+             */
+            static function (...$explodes): Closure {
+                return
+                    /**
+                     * @psalm-param Iterator<TKey, T> $iterator
+                     *
+                     * @psalm-return Generator<int, list<T>>
+                     */
+                    static function (Iterator $iterator) use ($explodes): Generator {
+                        return yield from Split::of()(
+                            ...array_map(
                                 /**
-                                 * @param mixed $value
-                                 * @psalm-param T $value
+                                 * @param mixed $explode
+                                 * @psalm-param T $explode
                                  */
-                                static function ($value) use ($explode): bool {
-                                    return $value === $explode;
-                                };
-                        },
-                        $explodes
-                    )
-                );
-
-                return yield from (new Run())()($split)($iterator);
+                                static function ($explode): Closure {
+                                    return
+                                        /**
+                                         * @param mixed $value
+                                         * @psalm-param T $value
+                                         */
+                                        static function ($value) use ($explode): bool {
+                                            return $value === $explode;
+                                        };
+                                },
+                                $explodes
+                            )
+                        )($iterator);
+                    };
             };
-        };
     }
 }
diff --git a/src/Operation/First.php b/src/Operation/First.php
@@ -8,7 +8,6 @@
 use Generator;
 use Iterator;
 use loophp\collection\Contract\Operation;
-use loophp\collection\Transformation\Run;
 
 /**
  * @psalm-template TKey
@@ -44,10 +43,10 @@ static function ($value, $key, Iterator $iterator): bool {
 
                         $callback = $callback ?? $defaultCallback;
 
-                        $filter = (new Filter())()($callback);
-                        $limit = (new Limit())()($size)(0);
-
-                        return yield from (new Run())()($filter, $limit)($iterator);
+                        return yield from Compose::of()(
+                            Filter::of()($callback),
+                            Limit::of()($size)(0)
+                        )($iterator);
                     };
             };
         };

diff --git a/src/Operation/Flatten.php b/src/Operation/Flatten.php
@@ -18,28 +18,37 @@
  */
 final class Flatten extends AbstractOperation implements Operation
 {
+    /**
+     * @psalm-return Closure(int): Closure(Iterator<TKey, T>): Generator<int, T>
+     */
     public function __invoke(): Closure
     {
         return static function (int $depth): Closure {
-            return static function (Iterator $iterator) use ($depth): Generator {
-                foreach ($iterator as $key => $value) {
-                    if (false === is_iterable($value)) {
-                        yield $key => $value;
-                    } elseif (1 === $depth) {
-                        /** @psalm-var T $subValue */
-                        foreach ($value as $subKey => $subValue) {
-                            yield $subKey => $subValue;
-                        }
-                    } else {
-                        /** @psalm-var IterableIterator<TKey, T> $flatten */
-                        $flatten = (new Flatten())()($depth - 1);
+            return
+                /**
+                 * @psalm-param Iterator<TKey, T> $iterator
+                 *
+                 * @psalm-return Generator<int, T>
+                 */
+                static function (Iterator $iterator) use ($depth): Generator {
+                    foreach ($iterator as $key => $value) {
+                        if (false === is_iterable($value)) {
+                            yield $key => $value;
+                        } elseif (1 === $depth) {
+                            /** @psalm-var T $subValue */
+                            foreach ($value as $subKey => $subValue) {
+                                yield $subKey => $subValue;
+                            }
+                        } else {
+                            /** @psalm-var callable(Iterator<TKey, T>): Generator<TKey, T> $flatten */
+                            $flatten = Flatten::of()($depth - 1);
 
-                        foreach ((new Run())()($flatten)(new IterableIterator($value)) as $subKey => $subValue) {
-                            yield $subKey => $subValue;
+                            foreach ($flatten(new IterableIterator($value)) as $subKey => $subValue) {
+                                yield $subKey => $subValue;
+                            }
                         }
                     }
-                }
-            };
+                };
         };
     }
 }
diff --git a/src/Operation/Group.php b/src/Operation/Group.php
@@ -8,8 +8,6 @@
 use Generator;
 use Iterator;
 use loophp\collection\Contract\Operation;
-use loophp\collection\Transformation\FoldLeft;
-use loophp\collection\Transformation\Transform;
 
 /**
  * @psalm-template TKey
@@ -72,7 +70,7 @@ static function (array $collect, $value, $key) use ($callable): array {
                                 return $collect;
                             };
 
-                        return yield from (new Transform(new FoldLeft($callback, [])))($iterator);
+                        return yield from (FoldLeft::of()($callback)([])($iterator))->current();
                     };
             };
     }

diff --git a/src/Operation/Iterate.php b/src/Operation/Iterate.php
@@ -16,18 +16,35 @@
  */
 final class Iterate extends AbstractOperation implements Operation
 {
+    /**
+     * @psalm-return Closure(callable(T...):(array<TKey, T>)): Closure(T...): Generator<TKey, T>
+     */
     public function __invoke(): Closure
     {
-        return static function (callable $callback): Closure {
-            return static function (...$parameters) use ($callback): Closure {
-                return static function (Iterator $iterator) use ($callback, $parameters): Generator {
-                    while (true) {
-                        yield current(
-                            $parameters = (array) $callback(...array_values((array) $parameters))
-                        );
-                    }
-                };
+        return
+            /**
+             * @psalm-param callable(T...):(array<TKey, T>) $callback
+             */
+            static function (callable $callback): Closure {
+                return
+                    /**
+                     * @psalm-param T ...$parameters
+                     */
+                    static function (...$parameters) use ($callback): Closure {
+                        return
+                            /**
+                             * @psalm-param Iterator<TKey, T> $iterator
+                             *
+                             * @psalm-return Generator<TKey, T>
+                             */
+                            static function (Iterator $iterator) use ($callback, $parameters): Generator {
+                                while (true) {
+                                    yield current(
+                                        $parameters = (array) $callback(...array_values((array) $parameters))
+                                    );
+                                }
+                            };
+                    };
             };
-        };
     }
 }
diff --git a/src/Operation/Last.php b/src/Operation/Last.php
@@ -8,7 +8,6 @@
 use Generator;
 use Iterator;
 use loophp\collection\Contract\Operation;
-use loophp\collection\Transformation\Run;
 
 /**
  * @psalm-template TKey
@@ -42,11 +41,11 @@ static function ($value, $key, Iterator $iterator): bool {
 
                         $callback = $callback ?? $defaultCallback;
 
-                        $filter = (new Filter())()($callback);
-                        $reverse = (new Reverse())();
-                        $limit = (new Limit())()($size)(0);
-
-                        return yield from (new Run())()($filter, $reverse, $limit)($iterator);
+                        return yield from Compose::of()(
+                            Filter::of()($callback),
+                            Reverse::of(),
+                            Limit::of()($size)(0)
+                        )($iterator);
                     };
             };
         };