Try alternative alias idea

Author: vudaltsov

composer.lock

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

src/Context.php

@@ -31,8 +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\AliasAtClassT;
+use Typhoon\Type\AliasAtFunctionT;
 use Typhoon\Type\AliasT;
 use Typhoon\Type\ArrayBareT;
 use Typhoon\Type\ArrayT;
@@ -280,11 +280,12 @@ private function identifier(string $name, array $genericNodes = []): Type
             return $resolved;
         }
 
-        if ($resolved instanceof AtFunction || $resolved instanceof AtClass) {
-            return new AliasT(
-                name: $resolved,
-                templateArguments: $templateArguments,
-            );
+        if ($resolved instanceof AliasAtFunctionT || $resolved instanceof AliasAtClassT) {
+            if ($templateArguments === []) {
+                return $resolved;
+            }
+
+            return new AliasT($resolved, $templateArguments);
         }
 
         /** @var class-string */