refactor: Optimize Filter operation calls by calling regular constr…

…uctor. Special treatment for `Collapse` operation.
loophp · Aug 25, 2021 · 4cab31c · 4cab31c
1 parent 977b7bc
commit 4cab31c
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 36 deletions.
diff --git a/src/Operation/Collapse.php b/src/Operation/Collapse.php
@@ -24,6 +24,8 @@ final class Collapse extends AbstractOperation
     /**
      * @pure
      *
+     * @psalm-suppress ImpureFunctionCall - using Filter and Flatten as an internal tools, not returned.
+     *
      * @return Closure(Iterator<TKey, (T|iterable<TKey, T>)>): Generator<TKey, T>
      */
     public function __invoke(): Closure
@@ -36,8 +38,8 @@ public function __invoke(): Closure
 
         /** @var Closure(Iterator<TKey, (T|iterable<TKey, T>)>): Generator<TKey, T> $pipe */
         $pipe = Pipe::of()(
-            Filter::of()($filterCallback),
-            Flatten::of()(1),
+            (new Filter())()($filterCallback),
+            (new Flatten())()(1),
         );
 
         // Point free style.

diff --git a/src/Operation/Column.php b/src/Operation/Column.php
@@ -50,7 +50,7 @@ static function ($column): Closure {
                 /** @var Closure(Iterator<TKey, T>): Generator<int, mixed> $pipe */
                 $pipe = Pipe::of()(
                     Transpose::of(),
-                    Filter::of()($filterCallbackBuilder($column)),
+                    (new Filter())()($filterCallbackBuilder($column)),
                     Head::of(),
                     Flatten::of()(1)
                 );

diff --git a/src/Operation/Compact.php b/src/Operation/Compact.php
@@ -39,10 +39,17 @@ public function __invoke(): Closure
              * @return Closure(Iterator<TKey, T>): Generator<TKey, T>
              */
             static function (...$values): Closure {
-                $filterCallback = static fn (array $values): Closure => static fn ($value): bool => !in_array($value, $values, true);
+                $filterCallback =
+                    /**
+                     * @param non-empty-array<int, null|array|int|bool|string|T> $values
+                     */
+                    static fn (array $values): Closure =>
+                        /**
+                         * @param T $value
+                         */
+                        static fn ($value): bool => !in_array($value, $values, true);
 
-                /** @var Closure(Iterator<TKey, T>): Generator<TKey, T> $filter */
-                $filter = Filter::of()(
+                $filter = (new Filter())()(
                     $filterCallback(
                         [] === $values ?
                             Nullsy::VALUES :

diff --git a/src/Operation/Diff.php b/src/Operation/Diff.php
@@ -37,14 +37,17 @@ public function __invoke(): Closure
              * @return Closure(Iterator<TKey, T>): Generator<TKey, T>
              */
             static function (...$values): Closure {
-                $filterCallbackFactory = static fn (array $values): Closure =>
+                $filterCallbackFactory =
                     /**
-                     * @param T $value
+                     * @param list<T> $values
                      */
-                    static fn ($value): bool => false === in_array($value, $values, true);
+                    static fn (array $values): Closure =>
+                        /**
+                         * @param T $value
+                         */
+                        static fn ($value): bool => false === in_array($value, $values, true);
 
-                /** @var Closure(Iterator<TKey, T>): Generator<TKey, T> $filter */
-                $filter = Filter::of()($filterCallbackFactory($values));
+                $filter = (new Filter())()($filterCallbackFactory($values));
 
                 // Point free style.
                 return $filter;

diff --git a/src/Operation/DiffKeys.php b/src/Operation/DiffKeys.php
@@ -44,8 +44,7 @@ static function (...$keys): Closure {
                      */
                     static fn ($value, $key): bool => false === in_array($key, $keys, true);
 
-                /** @var Closure(Iterator<TKey, T>): Generator<TKey, T> $filter */
-                $filter = Filter::of()($filterCallbackFactory($keys));
+                $filter = (new Filter())()($filterCallbackFactory($keys));
 
                 // Point free style.
                 return $filter;

diff --git a/src/Operation/Forget.php b/src/Operation/Forget.php
@@ -37,15 +37,18 @@ public function __invoke(): Closure
              * @return Closure(Iterator<TKey, T>): Generator<TKey, T>
              */
             static function (...$keys): Closure {
-                $filterCallbackFactory = static fn (array $keys): Closure =>
+                $filterCallbackFactory =
                     /**
-                     * @param T $value
-                     * @param TKey $key
+                     * @param list<TKey> $keys
                      */
-                    static fn ($value, $key): bool => false === in_array($key, $keys, true);
-
-                /** @var Closure(Iterator<TKey, T>): Generator<TKey, T> $filter */
-                $filter = Filter::of()($filterCallbackFactory($keys));
+                    static fn (array $keys): Closure =>
+                        /**
+                         * @param T $value
+                         * @param TKey $key
+                         */
+                        static fn ($value, $key): bool => false === in_array($key, $keys, true);
+
+                $filter = (new Filter())()($filterCallbackFactory($keys));
 
                 // Point free style.
                 return $filter;

diff --git a/src/Operation/Get.php b/src/Operation/Get.php
@@ -50,7 +50,7 @@ static function ($default) use ($keyToGet): Closure {
 
                     /** @var Closure(Iterator<TKey, T>): (Generator<TKey, T|null>) $pipe */
                     $pipe = Pipe::of()(
-                        Filter::of()($filterCallback),
+                        (new Filter())()($filterCallback),
                         Append::of()($default),
                         Head::of()
                     );

diff --git a/src/Operation/Intersect.php b/src/Operation/Intersect.php
@@ -37,14 +37,17 @@ public function __invoke(): Closure
              * @return Closure(Iterator<TKey, T>): Generator<TKey, T>
              */
             static function (...$values): Closure {
-                $filterCallbackFactory = static fn (array $values): Closure =>
+                $filterCallbackFactory =
                     /**
-                     * @param T $value
+                     * @param list<T> $values
                      */
-                    static fn ($value): bool => in_array($value, $values, true);
+                    static fn (array $values): Closure =>
+                        /**
+                         * @param T $value
+                         */
+                        static fn ($value): bool => in_array($value, $values, true);
 
-                /** @var Closure(Iterator<TKey, T>): Generator<TKey, T> $filter */
-                $filter = Filter::of()($filterCallbackFactory($values));
+                $filter = (new Filter())()($filterCallbackFactory($values));
 
                 // Point free style.
                 return $filter;

diff --git a/src/Operation/IntersectKeys.php b/src/Operation/IntersectKeys.php
@@ -44,8 +44,7 @@ static function (...$keys): Closure {
                      */
                     static fn ($value, $key): bool => in_array($key, $keys, true);
 
-                /** @var Closure(Iterator<TKey, T>): Generator<TKey, T> $filter */
-                $filter = Filter::of()($filterCallbackFactory($keys));
+                $filter = (new Filter())()($filterCallbackFactory($keys));
 
                 // Point free style.
                 return $filter;

diff --git a/src/Operation/Matching.php b/src/Operation/Matching.php
@@ -42,7 +42,7 @@ static function (Criteria $criteria): Closure {
                 $pipes = [];
 
                 if (null !== $expr) {
-                    $pipes[] = Filter::of()((new ClosureExpressionVisitor())->dispatch($expr));
+                    $pipes[] = (new Filter())()((new ClosureExpressionVisitor())->dispatch($expr));
                 }
 
                 $orderings = $criteria->getOrderings();

diff --git a/src/Operation/Nth.php b/src/Operation/Nth.php
@@ -46,7 +46,7 @@ static function (int $offset) use ($step): Closure {
                     /** @var Closure(Iterator<TKey, T>): Generator<TKey, T> $pipe */
                     $pipe = Pipe::of()(
                         Pack::of(),
-                        Filter::of()($filterCallback),
+                        (new Filter())()($filterCallback),
                         Unpack::of()
                     );
 

diff --git a/src/Operation/RSample.php b/src/Operation/RSample.php
@@ -37,8 +37,7 @@ public function __invoke(): Closure
             static function (float $probability): Closure {
                 $callback = static fn (): bool => (mt_rand() / mt_getrandmax()) < $probability;
 
-                /** @var Closure(Iterator<TKey, T>): Generator<TKey, T> $filter */
-                $filter = Filter::of()($callback);
+                $filter = (new Filter())()($callback);
 
                 // Point free style.
                 return $filter;

diff --git a/src/Operation/Reject.php b/src/Operation/Reject.php
@@ -48,8 +48,7 @@ static function (callable ...$callbacks): Closure {
                     [$defaultCallback] :
                     $callbacks;
 
-                /** @var Closure(Iterator<TKey, T>): Generator<TKey, T> $reject */
-                $reject = Filter::of()(
+                $reject = (new Filter())()(
                     /**
                      * @param T $current
                      * @param TKey $key

diff --git a/src/Operation/Scale.php b/src/Operation/Scale.php
@@ -71,8 +71,7 @@ static function ($v) use ($lowerBound, $upperBound, $wantedLowerBound, $wantedUp
                                     }
                                 );
 
-                                /** @var callable(Iterator<TKey, (float | int)>):(Generator<TKey, float|int>) $filter */
-                                $filter = Filter::of()(
+                                $filter = (new Filter())()(
                                     /**
                                      * @param float|int $item
                                      */