Improve types

Author: Kirill Nesmeyanov

src/Runtime/Repository/TypeRepository.php

@@ -31,13 +31,25 @@ public function __construct(
         private readonly ReferencesResolver $references = new ReferencesResolver(),
     ) {
         $this->context = $this;
-        $this->builders = match (true) {
+        $this->builders = self::toArrayList($types);
+    }
+
+    /**
+     * @param iterable<array-key, TypeBuilderInterface<covariant TypeStatement, TypeInterface>> $types
+     * @return list<TypeBuilderInterface<covariant TypeStatement, TypeInterface>>
+     */
+    private static function toArrayList(iterable $types): array
+    {
+        return match (true) {
             $types instanceof \Traversable => \iterator_to_array($types, false),
             \array_is_list($types) => $types,
             default => \array_values($types),
         };
     }
 
+    /**
+     * @internal internal method for passing the root calling context
+     */
     public function setTypeRepository(TypeRepositoryInterface $parent): void
     {
         $this->context = $parent;

src/Runtime/Repository/TypeRepositoryDecorator.php

@@ -15,6 +15,9 @@ public function __construct(
         $this->setTypeRepository($this);
     }
 
+    /**
+     * @internal internal method for passing the root calling context
+     */
     public function setTypeRepository(TypeRepositoryInterface $parent): void
     {
         if ($this->delegate instanceof TypeRepositoryDecoratorInterface) {

src/Runtime/Repository/TypeRepositoryDecoratorInterface.php

@@ -5,10 +5,15 @@
 namespace TypeLang\Mapper\Runtime\Repository;
 
 /**
+ * Defines a repository that supports embedding/decoration.
+ *
  * @internal this is an internal library interface, please do not use it in your code
  * @psalm-internal TypeLang\Mapper\Runtime\Repository
  */
 interface TypeRepositoryDecoratorInterface extends TypeRepositoryInterface
 {
+    /**
+     * @internal internal method for passing the root calling context
+     */
     public function setTypeRepository(TypeRepositoryInterface $parent): void;
 }

src/Type/ClassStringType.php

@@ -18,6 +18,10 @@ public function __construct(
 
     public function match(mixed $value, Context $context): bool
     {
+        if ($context->isNormalization()) {
+            return \is_string($value);
+        }
+
         $isValidString = $value !== '' && \is_string($value);
 
         if (!$isValidString) {

src/Type/NumericStringType.php

@@ -11,6 +11,10 @@ class NumericStringType implements TypeInterface
 {
     public function match(mixed $value, Context $context): bool
     {
+        if ($context->isNormalization()) {
+            return \is_string($value);
+        }
+
         return \is_string($value) && \is_numeric($value);
     }