Rewrite Context

Author: vudaltsov

composer.json

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

composer.lock

@@ -4,28 +4,47 @@
 
 namespace Typhoon\PHPStanTypeParser;
 
-use Typhoon\Type;
+use Typhoon\Type\TemplateT;
 
-/**
- * @api
- */
-interface Context
+final class Context
 {
     /**
-     * @param non-empty-string $unresolvedName
-     * @return array{non-empty-string, ?non-empty-string}
+     * @var array<non-empty-lowercase-string, Name>
      */
-    public function resolveConstantName(string $unresolvedName): array;
+    private array $importTable = [];
 
     /**
-     * @param non-empty-string $unresolvedName
-     * @return class-string
+     * @var array<non-empty-string, TemplateT>
      */
-    public function resolveClassName(string $unresolvedName): string;
+    private array $templates = [];
 
-    /**
-     * @param non-empty-string $unresolvedName
-     * @param list<Type> $templateArguments
-     */
-    public function resolveNameAsType(string $unresolvedName, array $templateArguments = []): Type;
+    public function __construct(
+        public readonly ?Name $namespace = null,
+    ) {}
+
+    public function use(Name $name, ?Name $as = null): self
+    {
+        $context = clone $this;
+        $context->importTable[($as ?? $name)->toLowercaseString()] = $name;
+
+        return $context;
+    }
+
+    public function template(TemplateT $template): self
+    {
+        $context = clone $this;
+        $context->templates[$template->name] = $template;
+
+        return $context;
+    }
+
+    public function resolveAsClass(string $name): Name
+    {
+        return Name::parse($name)->resolveClass($this->namespace, $this->importTable);
+    }
+
+    public function resolve(string $name): TemplateT|Name
+    {
+        return $this->templates[$name] ?? $this->resolveAsClass($name);
+    }
 }

src/Context.php

@@ -12,8 +12,5 @@
  */
 interface CustomParser
 {
-    /**
-     * @param callable(TypeNode): Type $parse
-     */
-    public function parse(TypeNode $node, callable $parse, Context $context): ?Type;
+    public function parse(TypeNode $node, Parser $parser): ?Type;
 }

src/CustomParser.php

@@ -19,10 +19,10 @@ public function __construct(
         private iterable $customTypeParsers = [],
     ) {}
 
-    public function parse(TypeNode $node, callable $parse, Context $context): ?Type
+    public function parse(TypeNode $node, Parser $parser): ?Type
     {
         foreach ($this->customTypeParsers as $customTypeParser) {
-            $type = $customTypeParser->parse($node, $parse, $context);
+            $type = $customTypeParser->parse($node, $parser);
 
             if ($type !== null) {
                 return $type;