Try alternative alias idea

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@dev"
+        "typhoon/type": "dev-alias"
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8.2",

composer.lock

@@ -4,7 +4,8 @@
 
 namespace Typhoon\PHPStanTypeParser;
 
-use Typhoon\Type\AliasT;
+use Typhoon\Type\Alias\AtClass;
+use Typhoon\Type\Alias\AtFunction;
 use Typhoon\Type\TemplateT;
 
 final class Context
@@ -20,7 +21,7 @@ final class Context
     private array $templates = [];
 
     /**
-     * @var array<non-empty-string, AliasT>
+     * @var array<non-empty-string, AtFunction|AtClass>
      */
     private array $aliases = [];
 
@@ -47,7 +48,7 @@ public function useTemplate(TemplateT $template): self
     /**
      * @param ?non-empty-string $as
      */
-    public function useAlias(AliasT $alias, ?string $as = null): self
+    public function useAlias(AtFunction|AtClass $alias, ?string $as = null): self
     {
         $context = clone $this;
         $context->aliases[$as ?? $alias->name] = $alias;
@@ -60,7 +61,7 @@ public function resolveAsClass(string $name): Name
         return Name::parse($name)->resolveClass($this->namespace, $this->importTable);
     }
 
-    public function resolve(string $name): Name|TemplateT|AliasT
+    public function resolve(string $name): TemplateT|AtFunction|AtClass|Name
     {
         return $this->templates[$name] ?? $this->aliases[$name] ?? $this->resolveAsClass($name);
     }

src/Context.php

@@ -31,6 +31,8 @@
 use PHPStan\PhpDocParser\Parser\TypeParser;
 use PHPStan\PhpDocParser\ParserConfig;
 use Typhoon\Type;
+use Typhoon\Type\Alias\AtClass;
+use Typhoon\Type\Alias\AtFunction;
 use Typhoon\Type\AliasT;
 use Typhoon\Type\ArrayBareT;
 use Typhoon\Type\ArrayT;
@@ -278,10 +280,9 @@ private function identifier(string $name, array $genericNodes = []): Type
             return $resolved;
         }
 
-        if ($resolved instanceof AliasT) {
+        if ($resolved instanceof AtFunction || $resolved instanceof AtClass) {
             return new AliasT(
-                class: $resolved->class,
-                name: $resolved->name,
+                name: $resolved,
                 templateArguments: $templateArguments,
             );
         }