Simplify template exceptions

Author: Kirill Nesmeyanov

src/Exception/Definition/Template/MissingTemplateArgumentsException.php

@@ -4,23 +4,21 @@
 
 namespace TypeLang\Mapper\Exception\Definition\Template;
 
-use TypeLang\Parser\Node\Stmt\TypeStatement;
+use TypeLang\Parser\Node\Stmt\NamedTypeNode;
 
 /**
  * Occurs when a type requires more template arguments to be specified than required
  */
 class MissingTemplateArgumentsException extends TemplateArgumentsCountException
 {
     /**
-     * @param int<0, max> $passedArgumentsCount
      * @param int<0, max> $minSupportedArgumentsCount
      * @param int<0, max> $maxSupportedArgumentsCount
      */
     public static function becauseTemplateArgumentsRangeRequired(
-        int $passedArgumentsCount,
         int $minSupportedArgumentsCount,
         int $maxSupportedArgumentsCount,
-        TypeStatement $type,
+        NamedTypeNode $type,
         ?\Throwable $previous = null
     ): self {
         $template = 'Type "{{type}}" expects at least %s template argument(s), '
@@ -31,7 +29,7 @@ public static function becauseTemplateArgumentsRangeRequired(
             : \sprintf($template, 'from {{minSupportedArgumentsCount}} to {{maxSupportedArgumentsCount}}');
 
         return new self(
-            passedArgumentsCount: $passedArgumentsCount,
+            passedArgumentsCount: $type->arguments?->count() ?? 0,
             minSupportedArgumentsCount: $minSupportedArgumentsCount,
             maxSupportedArgumentsCount: $maxSupportedArgumentsCount,
             type: $type,

src/Exception/Definition/Template/TemplateArgumentsCountException.php

@@ -4,7 +4,7 @@
 
 namespace TypeLang\Mapper\Exception\Definition\Template;
 
-use TypeLang\Parser\Node\Stmt\TypeStatement;
+use TypeLang\Parser\Node\Stmt\NamedTypeNode;
 
 /**
  * Group of errors related to incorrect number of template arguments
@@ -20,12 +20,17 @@ public function __construct(
         protected readonly int $passedArgumentsCount,
         protected readonly int $minSupportedArgumentsCount,
         protected readonly int $maxSupportedArgumentsCount,
-        TypeStatement $type,
+        NamedTypeNode $type,
         string $template,
         int $code = 0,
         ?\Throwable $previous = null
     ) {
-        parent::__construct($type, $template, $code, $previous);
+        parent::__construct(
+            type: $type,
+            template: $template,
+            code: $code,
+            previous: $previous,
+        );
     }
 
     /**

src/Exception/Definition/Template/TemplateArgumentsNotSupportedException.php

@@ -4,26 +4,22 @@
 
 namespace TypeLang\Mapper\Exception\Definition\Template;
 
-use TypeLang\Parser\Node\Stmt\TypeStatement;
+use TypeLang\Parser\Node\Stmt\NamedTypeNode;
 
 /**
  * Occurs when a type does not support template arguments
  */
 class TemplateArgumentsNotSupportedException extends TemplateArgumentsCountException
 {
-    /**
-     * @param int<0, max> $passedArgumentsCount
-     */
     public static function becauseTemplateArgumentsNotSupported(
-        int $passedArgumentsCount,
-        TypeStatement $type,
+        NamedTypeNode $type,
         ?\Throwable $previous = null
     ): self {
         $template = 'Type "{{type}}" does not support template arguments, '
             . 'but {{passedArgumentsCount}} were passed';
 
         return new self(
-            passedArgumentsCount: $passedArgumentsCount,
+            passedArgumentsCount: $type->arguments?->count() ?? 0,
             minSupportedArgumentsCount: 0,
             maxSupportedArgumentsCount: 0,
             type: $type,

src/Exception/Definition/Template/TooManyTemplateArgumentsException.php

@@ -4,6 +4,7 @@
 
 namespace TypeLang\Mapper\Exception\Definition\Template;
 
+use TypeLang\Parser\Node\Stmt\NamedTypeNode;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 
 /**
@@ -12,16 +13,14 @@
 class TooManyTemplateArgumentsException extends TemplateArgumentsCountException
 {
     /**
-     * @param int<0, max> $passedArgumentsCount
      * @param int<0, max> $minSupportedArgumentsCount
      * @param int<0, max> $maxSupportedArgumentsCount
      */
     public static function becauseTemplateArgumentsRangeOverflows(
-        int $passedArgumentsCount,
         int $minSupportedArgumentsCount,
         int $maxSupportedArgumentsCount,
-        TypeStatement $type,
-        ?\Throwable $previous = null
+        NamedTypeNode $type,
+        ?\Throwable $previous = null,
     ): self {
         $template = 'Type "{{type}}" only accepts %s template argument(s), '
             . 'but {{passedArgumentsCount}} were passed';
@@ -31,7 +30,7 @@ public static function becauseTemplateArgumentsRangeOverflows(
             : \sprintf($template, 'from {{minSupportedArgumentsCount}} to {{maxSupportedArgumentsCount}}');
 
         return new self(
-            passedArgumentsCount: $passedArgumentsCount,
+            passedArgumentsCount: $type->arguments?->count() ?? 0,
             minSupportedArgumentsCount: $minSupportedArgumentsCount,
             maxSupportedArgumentsCount: $maxSupportedArgumentsCount,
             type: $type,

src/Type/Builder/ArrayTypeBuilder.php

@@ -64,7 +64,6 @@ public function build(
             1 => $this->buildWithValue($statement, $types, $parser),
             2 => $this->buildWithKeyValue($statement, $types),
             default => throw TooManyTemplateArgumentsException::becauseTemplateArgumentsRangeOverflows(
-                passedArgumentsCount: \count($arguments),
                 minSupportedArgumentsCount: 0,
                 maxSupportedArgumentsCount: 2,
                 type: $statement,

src/Type/Builder/Builder.php

@@ -33,7 +33,6 @@ protected function expectNoTemplateArguments(NamedTypeNode $stmt): void
         }
 
         throw TemplateArgumentsNotSupportedException::becauseTemplateArgumentsNotSupported(
-            passedArgumentsCount: $stmt->arguments->count(),
             type: $stmt,
         );
     }
@@ -94,7 +93,6 @@ protected function expectTemplateArgumentsLessOrEqualThan(NamedTypeNode $stmt, i
         }
 
         throw TooManyTemplateArgumentsException::becauseTemplateArgumentsRangeOverflows(
-            passedArgumentsCount: $stmt->arguments->count(),
             minSupportedArgumentsCount: $min,
             maxSupportedArgumentsCount: $max,
             type: $stmt,
@@ -131,7 +129,6 @@ protected function expectTemplateArgumentsGreaterOrEqualThan(NamedTypeNode $stmt
         }
 
         throw MissingTemplateArgumentsException::becauseTemplateArgumentsRangeRequired(
-            passedArgumentsCount: $actualArgumentsCount,
             minSupportedArgumentsCount: $min,
             maxSupportedArgumentsCount: $max ?? $min,
             type: $stmt,

src/Type/Builder/IntRangeTypeBuilder.php

@@ -44,7 +44,6 @@ public function build(
             1 => $this->buildWithMinValue($statement, $arguments[0]),
             2 => $this->buildWithMinMaxValues($statement, $arguments[0], $arguments[1]),
             default => throw TooManyTemplateArgumentsException::becauseTemplateArgumentsRangeOverflows(
-                passedArgumentsCount: \count($arguments),
                 minSupportedArgumentsCount: 0,
                 maxSupportedArgumentsCount: 2,
                 type: $statement,

src/Type/Builder/ListTypeBuilder.php

@@ -56,7 +56,6 @@ public function build(
             0 => $this->buildWithNoValue($types, $parser),
             1 => $this->buildWithValue($statement, $types),
             default => throw TooManyTemplateArgumentsException::becauseTemplateArgumentsRangeOverflows(
-                passedArgumentsCount: \count($arguments),
                 minSupportedArgumentsCount: 0,
                 maxSupportedArgumentsCount: 1,
                 type: $statement,