[Functions] asPairs and asPairsGenerator.

whsv26 · whsv26 · commit f7ee2e1e7f76 · 2021-12-24T15:39:07.000+03:00
diff --git a/composer.json b/composer.json
@@ -39,6 +39,7 @@
             "src/Fp/Functions/Cast/AsArray.php",
             "src/Fp/Functions/Cast/AsBool.php",
             "src/Fp/Functions/Cast/AsFloat.php",
+            "src/Fp/Functions/Cast/AsPairs.php",
             "src/Fp/Functions/Cast/AsGenerator.php",
             "src/Fp/Functions/Cast/AsInt.php",
             "src/Fp/Functions/Cast/AsList.php",
diff --git a/src/Fp/Collections/ArrayList.php b/src/Fp/Collections/ArrayList.php
@@ -42,7 +42,7 @@
 use Fp\Streams\Stream;
 use Iterator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * O(1) {@see Seq::at()} and {@see Seq::__invoke} operations
diff --git a/src/Fp/Collections/HashMap.php b/src/Fp/Collections/HashMap.php
@@ -20,7 +20,7 @@
 use Fp\Operations\ValuesOperation;
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 use function Fp\Cast\asList;
 
 /**
diff --git a/src/Fp/Collections/HashSet.php b/src/Fp/Collections/HashSet.php
@@ -28,7 +28,7 @@
 use Fp\Streams\Stream;
 use Iterator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 use function Fp\Cast\asList;
 
 /**
diff --git a/src/Fp/Collections/LinkedList.php b/src/Fp/Collections/LinkedList.php
@@ -41,7 +41,7 @@
 use Fp\Streams\Stream;
 use Iterator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 use function Fp\Cast\asList;
 
 /**
diff --git a/src/Fp/Collections/NonEmptyArrayList.php b/src/Fp/Collections/NonEmptyArrayList.php
@@ -27,7 +27,7 @@
 use Fp\Streams\Stream;
 use Iterator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @psalm-immutable
diff --git a/src/Fp/Collections/NonEmptyHashMap.php b/src/Fp/Collections/NonEmptyHashMap.php
@@ -14,7 +14,7 @@
 use Fp\Operations\ValuesOperation;
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Collections/NonEmptyHashSet.php b/src/Fp/Collections/NonEmptyHashSet.php
@@ -21,7 +21,7 @@
 use Fp\Streams\Stream;
 use Iterator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 use function Fp\Cast\asNonEmptyList;
 
 /**
diff --git a/src/Fp/Collections/NonEmptyLinkedList.php b/src/Fp/Collections/NonEmptyLinkedList.php
@@ -28,7 +28,7 @@
 use Fp\Streams\Stream;
 use Iterator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @psalm-immutable
diff --git a/src/Fp/Functional/Monoid/HashMapMonoid.php b/src/Fp/Functional/Monoid/HashMapMonoid.php
@@ -6,7 +6,7 @@
 
 use Fp\Collections\HashMap;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Functional/Monoid/HashSetMonoid.php b/src/Fp/Functional/Monoid/HashSetMonoid.php
@@ -6,7 +6,7 @@
 
 use Fp\Collections\HashSet;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TV
diff --git a/src/Fp/Functional/Semigroup/NonEmptyHashMapSemigroup.php b/src/Fp/Functional/Semigroup/NonEmptyHashMapSemigroup.php
@@ -6,7 +6,7 @@
 
 use Fp\Collections\NonEmptyHashMap;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Functional/Semigroup/NonEmptyHashSetSemigroup.php b/src/Fp/Functional/Semigroup/NonEmptyHashSetSemigroup.php
@@ -7,7 +7,7 @@
 use Fp\Collections\NonEmptyHashSet;
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TV
diff --git a/src/Fp/Functions/Cast/AsGenerator.php b/src/Fp/Functions/Cast/AsGenerator.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Fp\Callable;
+namespace Fp\Cast;
 
 use Generator;
 
diff --git a/src/Fp/Functions/Cast/AsPairs.php b/src/Fp/Functions/Cast/AsPairs.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fp\Cast;
+
+use Generator;
+
+/**
+ * ```php
+ * >>> asPairs(['a' => 1, 'b' => 2]);
+ * => [['a', 1], ['b', 2]]
+ * ```
+ *
+ * @psalm-template TK
+ * @psalm-template TV
+ * @psalm-param iterable<TK, TV> $collection
+ * @psalm-return list<array{TK, TV}>
+ */
+function asPairs(iterable $collection): array
+{
+    return asList(asGenerator(function () use ($collection) {
+        foreach ($collection as $key => $value) {
+            yield [$key, $value];
+        }
+    }));
+}
+
+/**
+ * ```php
+ * >>> iterator_to_array(asPairsGenerator(['a' => 1, 'b' => 2]));
+ * => [['a', 1], ['b', 2]]
+ * ```
+ *
+ * @psalm-template TK
+ * @psalm-template TV
+ * @psalm-param iterable<TK, TV> $collection
+ * @psalm-return Generator<int, array{TK, TV}>
+ */
+function asPairsGenerator(iterable $collection): Generator
+{
+    return asGenerator(function () use ($collection) {
+        foreach ($collection as $key => $value) {
+            yield [$key, $value];
+        }
+    });
+}
diff --git a/src/Fp/Operations/AbstractOperation.php b/src/Fp/Operations/AbstractOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/AppendedAllOperation.php b/src/Fp/Operations/AppendedAllOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/AppendedOperation.php b/src/Fp/Operations/AppendedOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/ChunksOperation.php b/src/Fp/Operations/ChunksOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/DropOperation.php b/src/Fp/Operations/DropOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/DropWhileOperation.php b/src/Fp/Operations/DropWhileOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/EveryMapOperation.php b/src/Fp/Operations/EveryMapOperation.php
@@ -7,7 +7,7 @@
 use Fp\Functional\Option\Option;
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/FilterMapOperation.php b/src/Fp/Operations/FilterMapOperation.php
@@ -7,7 +7,7 @@
 use Fp\Functional\Option\Option;
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/FilterNotNullOperation.php b/src/Fp/Operations/FilterNotNullOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/FilterOfOperation.php b/src/Fp/Operations/FilterOfOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 use function Fp\Evidence\proveOf;
 
 /**
diff --git a/src/Fp/Operations/FilterOperation.php b/src/Fp/Operations/FilterOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/FlatMapOperation.php b/src/Fp/Operations/FlatMapOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/GroupAdjacentByOperationOperation.php b/src/Fp/Operations/GroupAdjacentByOperationOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/IntersperseOperation.php b/src/Fp/Operations/IntersperseOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/KeysOperation.php b/src/Fp/Operations/KeysOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/MapKeysOperation.php b/src/Fp/Operations/MapKeysOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/MapValuesOperation.php b/src/Fp/Operations/MapValuesOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/PrependedAllOperation.php b/src/Fp/Operations/PrependedAllOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/PrependedOperation.php b/src/Fp/Operations/PrependedOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/RepeatNOperation.php b/src/Fp/Operations/RepeatNOperation.php
@@ -7,7 +7,7 @@
 use Fp\Collections\ArrayList;
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/RepeatOperation.php b/src/Fp/Operations/RepeatOperation.php
@@ -7,7 +7,7 @@
 use Fp\Collections\ArrayList;
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/SortedOperation.php b/src/Fp/Operations/SortedOperation.php
@@ -7,7 +7,7 @@
 use Fp\Collections\ArrayList;
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/TailOperation.php b/src/Fp/Operations/TailOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/TakeOperation.php b/src/Fp/Operations/TakeOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/TakeWhileOperation.php b/src/Fp/Operations/TakeWhileOperation.php
@@ -6,7 +6,7 @@
 
 use Generator;
 
-use function Fp\Callable\asGenerator;
+use function Fp\Cast\asGenerator;
 
 /**
  * @template TK
diff --git a/src/Fp/Operations/TapOperation.php b/src/Fp/Operations/TapOperation.php
diff --git a/src/Fp/Operations/UniqueOperation.php b/src/Fp/Operations/UniqueOperation.php
diff --git a/src/Fp/Operations/ValuesOperation.php b/src/Fp/Operations/ValuesOperation.php
diff --git a/src/Fp/Operations/ZipOperation.php b/src/Fp/Operations/ZipOperation.php
diff --git a/src/Fp/Streams/Stream.php b/src/Fp/Streams/Stream.php
diff --git a/tests/Runtime/Functions/Cast/CastTest.php b/tests/Runtime/Functions/Cast/CastTest.php
