Improve Outerlist constructors

Author: nyamsprod

README.md

@@ -667,22 +667,22 @@ of pairs.
 use Bakame\Http\StructuredFields\OuterList;
 
 $list = OuterList::fromPairs([
+    [
+        ['foo', 'bar'],
         [
-            ['foo', 'bar'],
-            [
-                ['expire', $expire],
-                ['path', '/'],
-                [ 'max-age', 2500],
-                ['secure', true],
-                ['httponly', true],
-                ['samesite', Token::fromString('lax')],
-            ]
-        ],
-        [
-            'coucoulesamis', 
-            [['a', false]],
+            ['expire', $expire],
+            ['path', '/'],
+            [ 'max-age', 2500],
+            ['secure', true],
+            ['httponly', true],
+            ['samesite', Token::fromString('lax')],
         ]
-    ]);
+    ],
+    [
+        'coucoulesamis', 
+        [['a', false]],
+    ]
+]);
 ```
 
 The pairs definitions are the same as for creating either a `InnerList` or an `Item` using

src/DataType.php

@@ -8,22 +8,22 @@
 
 enum DataType: string
 {
-    case Item = 'item';
-    case Parameters = 'parameters';
-    case InnerList = 'innerlist';
     case List = 'list';
+    case InnerList = 'innerlist';
+    case Parameters = 'parameters';
     case Dictionary = 'dictionary';
+    case Item = 'item';
 
     /**
      * @throws StructuredFieldError
      */
     public function parse(Stringable|string $httpValue): StructuredField
     {
         return match ($this) {
-            self::Dictionary => Dictionary::fromHttpValue($httpValue),
-            self::Parameters => Parameters::fromHttpValue($httpValue),
             self::List => OuterList::fromHttpValue($httpValue),
             self::InnerList => InnerList::fromHttpValue($httpValue),
+            self::Parameters => Parameters::fromHttpValue($httpValue),
+            self::Dictionary => Dictionary::fromHttpValue($httpValue),
             self::Item => Item::fromHttpValue($httpValue),
         };
     }
@@ -34,10 +34,10 @@ public function parse(Stringable|string $httpValue): StructuredField
     public function build(iterable $data): string
     {
         return (match ($this) {
-            self::Dictionary => Dictionary::fromPairs($data),
-            self::Parameters => Parameters::fromPairs($data),
             self::List => OuterList::fromPairs($data),
             self::InnerList => InnerList::fromPair([...$data]), /* @phpstan-ignore-line */
+            self::Parameters => Parameters::fromPairs($data),
+            self::Dictionary => Dictionary::fromPairs($data),
             self::Item => Item::fromPair([...$data]), /* @phpstan-ignore-line */
         })->toHttpValue();
     }

src/Dictionary.php

@@ -92,11 +92,33 @@ public static function fromAssociative(iterable $members): self
      */
     public static function fromPairs(iterable $pairs): self
     {
+        $converter = function (mixed $pair): InnerList|Item {
+            if ($pair instanceof ParameterAccess) {
+                return $pair; /* @phpstan-ignore-line */
+            }
+
+            if (!is_array($pair)) {
+                return Item::new($pair); /* @phpstan-ignore-line */
+            }
+
+            if (!array_is_list($pair)) {
+                throw new SyntaxError('The pair must be represented by an array as a list.');
+            }
+
+            if (2 !== count($pair)) {
+                throw new SyntaxError('The pair first member is the item value; its second member is the item parameters.');
+            }
+
+            [$member, $parameters] = $pair;
+
+            return is_iterable($member) ? InnerList::fromPair([$member, $parameters]) : Item::fromPair([$member, $parameters]);
+        };
+
         return match (true) {
             $pairs instanceof MemberOrderedMap => new self($pairs),
-            default => new self((function (iterable $pairs) {
+            default => new self((function (iterable $pairs) use ($converter) {
                 foreach ($pairs as [$key, $member]) {
-                    yield $key => $member;
+                    yield $key => $converter($member);
                 }
             })($pairs)),
         };

src/OuterList.php

@@ -10,6 +10,7 @@
 use Stringable;
 
 use function array_filter;
+use function array_is_list;
 use function array_map;
 use function array_replace;
 use function array_splice;
@@ -18,12 +19,14 @@
 use function implode;
 use function is_array;
 use function is_int;
+use function is_iterable;
 
 use const ARRAY_FILTER_USE_KEY;
 
 /**
  * @see https://www.rfc-editor.org/rfc/rfc8941.html#name-lists
  *
+ * @phpstan-import-type SfItem from StructuredField
  * @phpstan-import-type SfMember from StructuredField
  * @phpstan-import-type SfMemberInput from StructuredField
  * @phpstan-import-type SfInnerListPair from InnerList
@@ -79,16 +82,40 @@ public static function fromHttpValue(Stringable|string $httpValue, ListParser $p
     }
 
     /**
-     * @param iterable<SfInnerListPair|SfItemPair> $pairs
+     * @param iterable<SfInnerListPair|SfItemPair>|MemberList<int, SfItem> $pairs
      */
     public static function fromPairs(iterable $pairs): self
     {
-        $members = [];
-        foreach ($pairs as [$member, $parameters]) {
-            $members[] = is_iterable($member) ? InnerList::fromPair([$member, $parameters]) : Item::fromPair([$member, $parameters]);
-        }
+        $converter = function (mixed $pair): InnerList|Item {
+            if ($pair instanceof ParameterAccess) {
+                return $pair; /* @phpstan-ignore-line */
+            }
+
+            if (!is_array($pair)) {
+                return Item::new($pair); /* @phpstan-ignore-line */
+            }
 
-        return self::new(...$members);
+            if (!array_is_list($pair)) {
+                throw new SyntaxError('The pair must be represented by an array as a list.');
+            }
+
+            if (2 !== count($pair)) {
+                throw new SyntaxError('The pair first member is the item value; its second member is the item parameters.');
+            }
+
+            [$member, $parameters] = $pair;
+
+            return is_iterable($member) ? InnerList::fromPair([$member, $parameters]) : Item::fromPair([$member, $parameters]);
+        };
+
+        return match (true) {
+            $pairs instanceof MemberList => new self($pairs),
+            default => new self(...(function (iterable $pairs) use ($converter) {
+                foreach ($pairs as $member) {
+                    yield $converter($member);
+                }
+            })($pairs)),
+        };
     }
 
     /**

tests/DataTypeTest.php

@@ -50,7 +50,7 @@ public function ti_will_generate_the_structured_field_text_represenation_for_dic
     }
 
     #[Test]
-    public function ti_will_generate_the_structured_field_text_represenation_for_list(): void
+    public function it_will_generate_the_structured_field_text_represenation_for_list(): void
     {
         $data = [
             ['coucoulesamis', [['a', false]]],