Improve array and list type

Author: SerafimArts

src/Platform/StandardPlatform.php

@@ -64,6 +64,9 @@ public function getTypes(Direction $direction): iterable
         yield new Builder\TypeAliasBuilder(\Traversable::class, $array);
         yield new Builder\TypeAliasBuilder(\IteratorAggregate::class, $array);
 
+        // Adds support for the "iterable<T> -> list<T>" type
+        yield new Builder\ListTypeBuilder('list', 'mixed');
+
         // Adds support for the "?T" statement
         yield new Builder\NullableTypeBuilder();
 
@@ -116,8 +119,6 @@ public function getTypes(Direction $direction): iterable
 
         // Other
         if ($direction === Direction::Normalize) {
-            // Adds support for the "iterable<T> -> list<T>" type
-            yield new Builder\ListFromIterableTypeBuilder('list', 'mixed');
             // Adds support for the "object -> array{ ... }" type
             yield $object = new Builder\ObjectToArrayTypeBuilder('object');
             yield new Builder\TypeAliasBuilder(\stdClass::class, $object);
@@ -130,8 +131,6 @@ public function getTypes(Direction $direction): iterable
             // Adds support for the "object(ClassName) -> array{ ... }" type
             yield new Builder\ClassToArrayTypeBuilder($this->meta);
         } else {
-            // Adds support for the "array<T> -> list<T>" type
-            yield new Builder\ListFromArrayTypeBuilder('list', 'mixed');
             // Adds support for the "array{ ... } -> object" type
             yield $object = new Builder\ObjectFromArrayTypeBuilder('object');
             yield new Builder\TypeAliasBuilder(\stdClass::class, $object);
@@ -170,6 +169,12 @@ public function getTypeCoercers(Direction $direction): iterable
         // string
         yield Type\StringType::class => $string = new Coercer\StringTypeCoercer();
         yield Type\StringLiteralType::class => $string;
+
+        // array
+        yield Type\ArrayType::class => $array = new Coercer\ArrayTypeCoercer();
+
+        // list
+        yield Type\ListType::class => $list = new Coercer\ListTypeCoercer();
     }
 
     #[\Override]

src/Type/ArrayType.php

@@ -5,7 +5,6 @@
 namespace TypeLang\Mapper\Type;
 
 use TypeLang\Mapper\Context\Context;
-use TypeLang\Mapper\Context\Direction;
 use TypeLang\Mapper\Context\Path\Entry\ArrayIndexEntry;
 use TypeLang\Mapper\Exception\Runtime\InvalidIterableKeyException;
 use TypeLang\Mapper\Exception\Runtime\InvalidIterableValueException;
@@ -34,11 +33,7 @@ public function __construct(
      */
     public function match(mixed $value, Context $context): bool
     {
-        if ($context->direction === Direction::Denormalize) {
-            return \is_array($value);
-        }
-
-        return \is_iterable($value);
+        return \is_array($value);
     }
 
     public function cast(mixed $value, Context $context): array

src/Type/Builder/ListFromArrayTypeBuilder.php

@@ -8,6 +8,7 @@
 use TypeLang\Mapper\Exception\Definition\Template\Hint\TemplateArgumentHintsNotSupportedException;
 use TypeLang\Mapper\Exception\Definition\Template\TooManyTemplateArgumentsException;
 use TypeLang\Mapper\Exception\Definition\TypeNotFoundException;
+use TypeLang\Mapper\Type\ListType;
 use TypeLang\Mapper\Type\Parser\TypeParserInterface;
 use TypeLang\Mapper\Type\Repository\TypeRepositoryInterface;
 use TypeLang\Mapper\Type\TypeInterface;
@@ -18,7 +19,7 @@
 /**
  * @template-extends NamedTypeBuilder<TypeInterface>
  */
-abstract class ListTypeBuilder extends NamedTypeBuilder
+class ListTypeBuilder extends NamedTypeBuilder
 {
     /**
      * @var non-empty-lowercase-string
@@ -72,8 +73,8 @@ public function build(
      */
     private function buildWithNoValue(TypeRepositoryInterface $types, TypeParserInterface $parser): TypeInterface
     {
-        return $this->create(
-            type: $types->getTypeByStatement(
+        return new ListType(
+            value: $types->getTypeByStatement(
                 statement: $parser->getStatementByDefinition(
                     definition: $this->defaultValueType,
                 ),
@@ -97,12 +98,10 @@ private function buildWithValue(NamedTypeNode $statement, TypeRepositoryInterfac
 
         $this->expectNoTemplateArgumentHint($statement, $value);
 
-        return $this->create(
-            type: $types->getTypeByStatement(
+        return new ListType(
+            value: $types->getTypeByStatement(
                 statement: $value->value,
             ),
         );
     }
-
-    abstract protected function create(TypeInterface $type): TypeInterface;
 }

src/Type/Builder/ListFromIterableTypeBuilder.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TypeLang\Mapper\Type\Coercer;
+
+use TypeLang\Mapper\Context\Context;
+use TypeLang\Mapper\Exception\Runtime\InvalidValueException;
+
+/**
+ * @template-implements TypeCoercerInterface<array<array-key, mixed>>
+ */
+class ArrayTypeCoercer implements TypeCoercerInterface
+{
+    public function coerce(mixed $value, Context $context): array
+    {
+        return match (true) {
+            \is_array($value) => $value,
+            $value instanceof \Traversable => \iterator_to_array($value, true),
+            default => throw InvalidValueException::createFromContext($context),
+        };
+    }
+}

src/Type/Builder/ListTypeBuilder.php

@@ -18,8 +18,6 @@ public function coerce(mixed $value, Context $context): int
             return $value->value;
         }
 
-        $original = $value;
-
         if (\is_string($value) && \is_numeric($value)) {
             $value = (float) $value;
         }

src/Type/Coercer/ArrayTypeCoercer.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TypeLang\Mapper\Type\Coercer;
+
+use TypeLang\Mapper\Context\Context;
+use TypeLang\Mapper\Exception\Runtime\InvalidValueException;
+
+/**
+ * @template-implements TypeCoercerInterface<list<mixed>>
+ */
+class ListTypeCoercer implements TypeCoercerInterface
+{
+    public function coerce(mixed $value, Context $context): array
+    {
+        return match (true) {
+            \is_array($value) => \array_is_list($value) ? $value : \array_values($value),
+            $value instanceof \Traversable => \iterator_to_array($value, false),
+            default => throw InvalidValueException::createFromContext($context),
+        };
+    }
+}

src/Type/Coercer/IntTypeCoercer.php

@@ -13,7 +13,7 @@
  * @template-covariant TItem of mixed = mixed
  * @template-implements TypeInterface<list<TItem>>
  */
-class ListFromIterableType implements TypeInterface
+class ListType implements TypeInterface
 {
     public function __construct(
         /**
@@ -27,7 +27,7 @@ public function __construct(
      */
     public function match(mixed $value, Context $context): bool
     {
-        return \is_iterable($value);
+        return \is_array($value) && \array_is_list($value);
     }
 
     public function cast(mixed $value, Context $context): array