Add Context::useAlias()

Author: vudaltsov

composer.json

@@ -18,7 +18,7 @@
         "brick/math": "^0.14.0",
         "phpstan/phpdoc-parser": "^2.1",
         "symfony/polyfill-php84": "^1.33",
-        "typhoon/type": "^0.6"
+        "typhoon/type": "^0.6@dev"
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8.2",

composer.lock

@@ -4,6 +4,7 @@
 
 namespace Typhoon\PHPStanTypeParser;
 
+use Typhoon\Type\AliasT;
 use Typhoon\Type\TemplateT;
 
 final class Context
@@ -18,6 +19,11 @@ final class Context
      */
     private array $templates = [];
 
+    /**
+     * @var array<non-empty-string, AliasT>
+     */
+    private array $aliases = [];
+
     public function __construct(
         public readonly ?Name $namespace = null,
     ) {}
@@ -30,21 +36,32 @@ public function use(Name $name, ?Name $as = null): self
         return $context;
     }
 
-    public function template(TemplateT $template): self
+    public function useTemplate(TemplateT $template): self
     {
         $context = clone $this;
         $context->templates[$template->name] = $template;
 
         return $context;
     }
 
+    /**
+     * @param ?non-empty-string $as
+     */
+    public function useAlias(AliasT $alias, ?string $as = null): self
+    {
+        $context = clone $this;
+        $context->aliases[$as ?? $alias->name] = $alias;
+
+        return $context;
+    }
+
     public function resolveAsClass(string $name): Name
     {
         return Name::parse($name)->resolveClass($this->namespace, $this->importTable);
     }
 
-    public function resolve(string $name): TemplateT|Name
+    public function resolve(string $name): Name|TemplateT|AliasT
     {
-        return $this->templates[$name] ?? $this->resolveAsClass($name);
+        return $this->templates[$name] ?? $this->aliases[$name] ?? $this->resolveAsClass($name);
     }
 }

src/Context.php

@@ -31,6 +31,7 @@
 use PHPStan\PhpDocParser\Parser\TypeParser;
 use PHPStan\PhpDocParser\ParserConfig;
 use Typhoon\Type;
+use Typhoon\Type\AliasT;
 use Typhoon\Type\ArrayBareT;
 use Typhoon\Type\ArrayT;
 use Typhoon\Type\CallableT;
@@ -277,6 +278,14 @@ private function identifier(string $name, array $genericNodes = []): Type
             return $resolved;
         }
 
+        if ($resolved instanceof AliasT) {
+            return new AliasT(
+                class: $resolved->class,
+                name: $resolved->name,
+                templateArguments: $templateArguments,
+            );
+        }
+
         /** @var class-string */
         $class = $resolved->toString();
 
@@ -404,7 +413,7 @@ private function callable(CallableTypeNode $node): CallableT
 
         foreach ($node->templateTypes as $templateNode) {
             $templateFactories[] = Template::factory($templateNode->name, type: $type);
-            $context = $context->template($type);
+            $context = $context->useTemplate($type);
         }
 
         $parser = $this->withContext($context);