Improve types

SerafimArts · SerafimArts · commit c058333bdcf2 · 2025-09-30T03:11:58.000+03:00
diff --git a/src/Type/ArrayKeyType.php b/src/Type/ArrayKeyType.php
@@ -7,6 +7,9 @@
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
 use TypeLang\Mapper\Runtime\Context;
 
+/**
+ * @template-implements TypeInterface<array-key>
+ */
 class ArrayKeyType implements TypeInterface
 {
     public function __construct(
diff --git a/src/Type/BoolType.php b/src/Type/BoolType.php
@@ -7,6 +7,9 @@
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
 use TypeLang\Mapper\Runtime\Context;
 
+/**
+ * @template-implements TypeInterface<bool>
+ */
 class BoolType implements TypeInterface
 {
     public function match(mixed $value, Context $context): bool
diff --git a/src/Type/Builder/ArrayTypeBuilder.php b/src/Type/Builder/ArrayTypeBuilder.php
@@ -55,6 +55,8 @@ public function build(
         TypeRepositoryInterface $types,
         TypeParserInterface $parser,
     ): ArrayType {
+        assert($statement instanceof NamedTypeNode);
+
         $this->expectNoShapeFields($statement);
 
         $arguments = $statement->arguments->items ?? [];
diff --git a/src/Type/Builder/CallableTypeBuilder.php b/src/Type/Builder/CallableTypeBuilder.php
@@ -8,6 +8,7 @@
 use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
 use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
 use TypeLang\Mapper\Type\TypeInterface;
+use TypeLang\Parser\Node\Stmt\NamedTypeNode;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 
 /**
@@ -41,6 +42,8 @@ public function build(
         TypeRepositoryInterface $types,
         TypeParserInterface $parser,
     ): TypeInterface {
+        assert($statement instanceof NamedTypeNode);
+
         $this->expectNoShapeFields($statement);
         $this->expectNoTemplateArguments($statement);
 
diff --git a/src/Type/Builder/IntRangeTypeBuilder.php b/src/Type/Builder/IntRangeTypeBuilder.php
@@ -35,6 +35,8 @@ public function build(
         TypeRepositoryInterface $types,
         TypeParserInterface $parser,
     ): IntRangeType|IntType {
+        assert($statement instanceof NamedTypeNode);
+
         $this->expectNoShapeFields($statement);
 
         $arguments = $statement->arguments->items ?? [];
diff --git a/src/Type/Builder/ListTypeBuilder.php b/src/Type/Builder/ListTypeBuilder.php
@@ -48,6 +48,8 @@ public function build(
         TypeRepositoryInterface $types,
         TypeParserInterface $parser,
     ): ListType {
+        assert($statement instanceof NamedTypeNode);
+
         $this->expectNoShapeFields($statement);
 
         $arguments = $statement->arguments->items ?? [];
diff --git a/src/Type/Builder/NullTypeBuilder.php b/src/Type/Builder/NullTypeBuilder.php
@@ -41,6 +41,8 @@ public function build(
             return new NullType();
         }
 
+        assert($statement instanceof NamedTypeNode);
+
         $this->expectNoShapeFields($statement);
         $this->expectNoTemplateArguments($statement);
 
diff --git a/src/Type/Builder/ObjectTypeBuilder.php b/src/Type/Builder/ObjectTypeBuilder.php
@@ -7,6 +7,7 @@
 use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
 use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
 use TypeLang\Mapper\Type\ObjectType;
+use TypeLang\Parser\Node\Stmt\NamedTypeNode;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 
 /**
@@ -19,6 +20,8 @@ public function build(
         TypeRepositoryInterface $types,
         TypeParserInterface $parser,
     ): ObjectType {
+        assert($statement instanceof NamedTypeNode);
+
         $this->expectNoShapeFields($statement);
         $this->expectNoTemplateArguments($statement);
 
diff --git a/src/Type/Builder/PsrContainerTypeBuilder.php b/src/Type/Builder/PsrContainerTypeBuilder.php
@@ -9,6 +9,7 @@
 use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
 use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
 use TypeLang\Mapper\Type\TypeInterface;
+use TypeLang\Parser\Node\Stmt\NamedTypeNode;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 
 /**
@@ -46,6 +47,8 @@ public function build(
         TypeRepositoryInterface $types,
         TypeParserInterface $parser,
     ): TypeInterface {
+        assert($statement instanceof NamedTypeNode);
+
         $this->expectNoShapeFields($statement);
         $this->expectNoTemplateArguments($statement);
 
diff --git a/src/Type/Builder/SimpleTypeBuilder.php b/src/Type/Builder/SimpleTypeBuilder.php
@@ -9,6 +9,7 @@
 use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
 use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
 use TypeLang\Mapper\Type\TypeInterface;
+use TypeLang\Parser\Node\Stmt\NamedTypeNode;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 
 /**
@@ -36,6 +37,8 @@ public function build(
         TypeRepositoryInterface $types,
         TypeParserInterface $parser,
     ): TypeInterface {
+        assert($statement instanceof NamedTypeNode);
+
         $this->expectNoShapeFields($statement);
         $this->expectNoTemplateArguments($statement);
 
diff --git a/src/Type/FloatLiteralType.php b/src/Type/FloatLiteralType.php
@@ -7,6 +7,9 @@
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
 use TypeLang\Mapper\Runtime\Context;
 
+/**
+ * @template-implements TypeInterface<float>
+ */
 class FloatLiteralType implements TypeInterface
 {
     private readonly float $expected;
diff --git a/src/Type/FloatType.php b/src/Type/FloatType.php
@@ -7,11 +7,18 @@
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
 use TypeLang\Mapper\Runtime\Context;
 
+/**
+ * @template-implements TypeInterface<float|int>
+ */
 class FloatType implements TypeInterface
 {
     public function match(mixed $value, Context $context): bool
     {
-        return \is_float($value) || \is_int($value);
+        if ($context->isNormalization()) {
+            return \is_float($value) || \is_int($value);
+        }
+
+        return \is_float($value);
     }
 
     public function cast(mixed $value, Context $context): float
diff --git a/src/Type/IntLiteralType.php b/src/Type/IntLiteralType.php
@@ -7,6 +7,9 @@
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
 use TypeLang\Mapper\Runtime\Context;
 
+/**
+ * @template-implements TypeInterface<int>
+ */
 class IntLiteralType implements TypeInterface
 {
     public function __construct(
diff --git a/src/Type/IntRangeType.php b/src/Type/IntRangeType.php
@@ -7,6 +7,9 @@
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
 use TypeLang\Mapper\Runtime\Context;
 
+/**
+ * @template-implements TypeInterface<int>
+ */
 class IntRangeType implements TypeInterface
 {
     public const DEFAULT_INT_MIN = \PHP_INT_MIN;
diff --git a/src/Type/IntType.php b/src/Type/IntType.php
@@ -7,6 +7,9 @@
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
 use TypeLang\Mapper\Runtime\Context;
 
+/**
+ * @template-implements TypeInterface<int>
+ */
 class IntType implements TypeInterface
 {
     public function match(mixed $value, Context $context): bool
diff --git a/src/Type/ListType.php b/src/Type/ListType.php
@@ -9,15 +9,20 @@
 use TypeLang\Mapper\Runtime\Context;
 use TypeLang\Mapper\Runtime\Path\Entry\ArrayIndexEntry;
 
+/**
+ * @template T of mixed = mixed
+ *
+ * @template-implements TypeInterface<T>
+ */
 class ListType implements TypeInterface
 {
     public function __construct(
+        /**
+         * @var TypeInterface<T>
+         */
         protected readonly TypeInterface $value = new MixedType(),
     ) {}
 
-    /**
-     * @return ($value is iterable ? bool : false)
-     */
     public function match(mixed $value, Context $context): bool
     {
         if ($context->isDenormalization()) {
@@ -28,7 +33,8 @@ public function match(mixed $value, Context $context): bool
     }
 
     /**
-     * @return list<mixed>
+     * @return list<T>
+     *
      * @throws InvalidValueException in case the value is incorrect
      * @throws InvalidIterableValueException in case the value of a certain element is incorrect
      * @throws \Throwable in case of internal error occurs
diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -6,6 +6,9 @@
 
 use TypeLang\Mapper\Runtime\Context;
 
+/**
+ * @template-implements TypeInterface<mixed>
+ */
 class MixedType implements TypeInterface
 {
     public function match(mixed $value, Context $context): bool
diff --git a/src/Type/NullType.php b/src/Type/NullType.php
@@ -7,6 +7,9 @@
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
 use TypeLang\Mapper\Runtime\Context;
 
+/**
+ * @template-implements TypeInterface<null>
+ */
 class NullType implements TypeInterface
 {
     public function match(mixed $value, Context $context): bool
diff --git a/src/Type/NullableType.php b/src/Type/NullableType.php
@@ -6,9 +6,17 @@
 
 use TypeLang\Mapper\Runtime\Context;
 
+/**
+ * @template T of mixed = mixed
+ *
+ * @template-implements TypeInterface<T|null>
+ */
 class NullableType implements TypeInterface
 {
     public function __construct(
+        /**
+         * @var TypeInterface<T>
+         */
         private readonly TypeInterface $parent,
     ) {}
 
diff --git a/src/Type/StringType.php b/src/Type/StringType.php
@@ -7,6 +7,9 @@
 use TypeLang\Mapper\Exception\Mapping\InvalidValueException;
 use TypeLang\Mapper\Runtime\Context;
 
+/**
+ * @template-implements TypeInterface<string>
+ */
 class StringType implements TypeInterface
 {
     /** @var string */
diff --git a/src/Type/TypeInterface.php b/src/Type/TypeInterface.php
@@ -7,14 +7,21 @@
 use TypeLang\Mapper\Exception\Mapping\RuntimeException;
 use TypeLang\Mapper\Runtime\Context;
 
+/**
+ * @template T of mixed = mixed
+ */
 interface TypeInterface
 {
     /**
      * Checks that the value matches the selected type
+     *
+     * @phpstan-assert-if-true T $value
      */
     public function match(mixed $value, Context $context): bool;
 
     /**
+     * @return T
+     *
      * @throws RuntimeException in case of known mapping issue
      * @throws \Throwable in case of internal error occurs
      */
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
@@ -8,12 +8,17 @@
 use TypeLang\Mapper\Runtime\Context;
 use TypeLang\Mapper\Runtime\Path\Entry\UnionLeafEntry;
 
+/**
+ * @template T of mixed = mixed
+ *
+ * @template-implements TypeInterface<T>
+ */
 class UnionType implements TypeInterface
 {
-    /**
-     * @param non-empty-list<TypeInterface> $types
-     */
     public function __construct(
+        /**
+         * @var non-empty-list<TypeInterface<T>>
+         */
         private readonly array $types,
     ) {}
 

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@`
`7`	`7`	`use TypeLang\Mapper\Exception\Mapping\InvalidValueException;`
`8`	`8`	`use TypeLang\Mapper\Runtime\Context;`
`9`	`9`
	`10`	`+/**`
	`11`	`+ * @template-implements TypeInterface<array-key>`
	`12`	`+ */`
`10`	`13`	`class ArrayKeyType implements TypeInterface`
`11`	`14`	`{`
`12`	`15`	`public function __construct(`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ public function build(`
`41`	`41`	`return new NullType();`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ assert($statement instanceof NamedTypeNode);`
	`45`	`+`
`44`	`46`	`$this->expectNoShapeFields($statement);`
`45`	`47`	`$this->expectNoTemplateArguments($statement);`
`46`	`48`