Added arguments to alias and template

typhoon-php · Feb 27, 2024 · 22f9af6 · 22f9af6
1 parent c428b79
commit 22f9af6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/src/AliasType.php b/src/AliasType.php
@@ -14,14 +14,16 @@ final class AliasType implements Type
     /**
      * @param non-empty-string $class
      * @param non-empty-string $name
+     * @param list<Type> $arguments
      */
     public function __construct(
         private readonly string $class,
         private readonly string $name,
+        private readonly array $arguments,
     ) {}
 
     public function accept(TypeVisitor $visitor): mixed
     {
-        return $visitor->alias($this, $this->class, $this->name);
+        return $visitor->alias($this, $this->class, $this->name, $this->arguments);
     }
 }
diff --git a/src/DefaultTypeVisitor.php b/src/DefaultTypeVisitor.php
@@ -11,7 +11,7 @@
  */
 abstract class DefaultTypeVisitor implements TypeVisitor
 {
-    public function alias(Type $self, string $class, string $name): mixed
+    public function alias(Type $self, string $class, string $name, array $arguments): mixed
     {
         return $this->default($self);
     }
@@ -176,7 +176,7 @@ public function string(Type $self): mixed
         return $this->default($self);
     }
 
-    public function template(Type $self, string $name, AtClass|AtFunction|AtMethod $declaredAt): mixed
+    public function template(Type $self, string $name, AtClass|AtFunction|AtMethod $declaredAt, array $arguments): mixed
     {
         return $this->default($self);
     }

diff --git a/src/TemplateType.php b/src/TemplateType.php
@@ -13,14 +13,16 @@ final class TemplateType implements Type
 {
     /**
      * @param non-empty-string $name
+     * @param list<Type> $arguments
      */
     public function __construct(
         private readonly string $name,
         private readonly AtFunction|AtClass|AtMethod $declaredAt,
+        private readonly array $arguments,
     ) {}
 
     public function accept(TypeVisitor $visitor): mixed
     {
-        return $visitor->template($this, $this->name, $this->declaredAt);
+        return $visitor->template($this, $this->name, $this->declaredAt, $this->arguments);
     }
 }
diff --git a/src/TypeVisitor.php b/src/TypeVisitor.php
@@ -13,9 +13,10 @@ interface TypeVisitor
     /**
      * @param non-empty-string $class
      * @param non-empty-string $name
+     * @param list<Type> $arguments
      * @return TReturn
      */
-    public function alias(Type $self, string $class, string $name): mixed;
+    public function alias(Type $self, string $class, string $name, array $arguments): mixed;
 
     /**
      * @param Type<array<mixed>> $self
@@ -211,9 +212,10 @@ public function string(Type $self): mixed;
 
     /**
      * @param non-empty-string $name
+     * @param list<Type> $arguments
      * @return TReturn
      */
-    public function template(Type $self, string $name, AtFunction|AtClass|AtMethod $declaredAt): mixed;
+    public function template(Type $self, string $name, AtFunction|AtClass|AtMethod $declaredAt, array $arguments): mixed;
 
     /**
      * @param Type<truthy-string> $self

diff --git a/src/types.php b/src/types.php
@@ -44,9 +44,9 @@ enum types implements Type
      * @param non-empty-string $class
      * @param non-empty-string $name
      */
-    public static function alias(string $class, string $name): Type
+    public static function alias(string $class, string $name, Type ...$arguments): Type
     {
-        return new AliasType($class, $name);
+        return new AliasType($class, $name, array_values($arguments));
     }
 
     /**
@@ -393,9 +393,9 @@ public static function prop(Type $type, bool $optional = false): Property
     /**
      * @param non-empty-string $name
      */
-    public static function template(string $name, AtMethod|AtClass|AtFunction $declaredAt): Type
+    public static function template(string $name, AtMethod|AtClass|AtFunction $declaredAt, Type ...$arguments): Type
     {
-        return new TemplateType($name, $declaredAt);
+        return new TemplateType($name, $declaredAt, array_values($arguments));
     }
 
     /**