refactor: Update Unpack operation.

BREAKING CHANGE: yes
loophp · Apr 23, 2022 · 34c36da · 34c36da
1 parent cd11914
commit 34c36da
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 41 deletions.
diff --git a/src/Operation/Unpack.php b/src/Operation/Unpack.php
@@ -11,8 +11,6 @@
 
 use Closure;
 use Generator;
-use IteratorAggregate;
-use loophp\iterators\IterableIteratorAggregate;
 use loophp\iterators\UnpackIterableAggregate;
 
 // phpcs:disable Generic.Files.LineLength.TooLong
@@ -30,15 +28,10 @@ final class Unpack extends AbstractOperation
      */
     public function __invoke(): Closure
     {
-        /** @var Closure(iterable<array-key, array{0: TKey, 1: T}>): Generator<TKey, T> $pipe */
-        $pipe = (new Pipe())()(
-            (new Map())()(static fn (iterable $iterable): iterable => new IterableIteratorAggregate($iterable)),
-            (new Map())()((new Chunk())()(2)),
-            (new Flatten())()(1),
-            static fn (iterable $iterable): IteratorAggregate => new UnpackIterableAggregate($iterable)
-        );
-
-        // Point free style.
-        return $pipe;
+        return
+           /**
+            * @param iterable<array{0: TKey, 1: T}> $iterable
+            */
+           static fn (iterable $iterable): Generator => yield from new UnpackIterableAggregate($iterable);
     }
 }
diff --git a/tests/unit/Traits/GenericCollectionProviders.php b/tests/unit/Traits/GenericCollectionProviders.php
@@ -4044,42 +4044,23 @@ public function unpackOperationProvider()
         $operation = 'unpack';
 
         $input = [
-            ['a', 'a'],
-            ['b', 'b'],
-            ['c', 'c'],
-            ['d', 'd'],
-            ['e', 'e'],
+            ['A', 'a'],
+            ['B', 'b'],
+            ['C', 'c'],
+            ['D', 'd'],
+            ['E', 'e'],
         ];
 
         yield [
             $operation,
             [],
             $input,
             [
-                'a' => 'a',
-                'b' => 'b',
-                'c' => 'c',
-                'd' => 'd',
-                'e' => 'e',
-            ],
-        ];
-
-        $input = [
-            ['a', 'b', 'c' => 'c', 'd' => 'd'],
-            ['e', 'f', 'g' => 'g', 'h' => 'h'],
-            ['i', 'j'],
-        ];
-
-        yield [
-            $operation,
-            [],
-            $input,
-            [
-                'a' => 'b',
-                'c' => 'd',
-                'e' => 'f',
-                'g' => 'h',
-                'i' => 'j',
+                'A' => 'a',
+                'B' => 'b',
+                'C' => 'c',
+                'D' => 'd',
+                'E' => 'e',
             ],
         ];
     }