Improve type repositories

Author: Kirill Nesmeyanov

src/Runtime/Repository/InMemoryTypeRepository.php

@@ -4,7 +4,6 @@
 
 namespace TypeLang\Mapper\Runtime\Repository;
 
-use JetBrains\PhpStorm\Language;
 use TypeLang\Mapper\Type\TypeInterface;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 
@@ -23,20 +22,10 @@ public function __construct(
         $this->types = new \WeakMap();
     }
 
-    public function getTypeByDefinition(#[Language('PHP')] string $definition, ?\ReflectionClass $context = null): TypeInterface
-    {
-        return $this->delegate->getTypeByDefinition($definition, $context);
-    }
-
-    public function getTypeByValue(mixed $value, ?\ReflectionClass $context = null): TypeInterface
-    {
-        return $this->delegate->getTypeByValue($value, $context);
-    }
-
+    #[\Override]
     public function getTypeByStatement(TypeStatement $statement, ?\ReflectionClass $context = null): TypeInterface
     {
         // @phpstan-ignore-next-line : PHPStan bug (array assign over readonly)
-        return $this->types[$statement]
-            ??= $this->delegate->getTypeByStatement($statement, $context);
+        return $this->types[$statement] ??= parent::getTypeByStatement($statement, $context);
     }
 }

src/Runtime/Repository/LoggableTypeRepository.php

@@ -19,14 +19,15 @@ public function __construct(
         parent::__construct($delegate);
     }
 
+    #[\Override]
     public function getTypeByDefinition(#[Language('PHP')] string $definition, ?\ReflectionClass $context = null): TypeInterface
     {
         $this->logger->debug('Fetching the type by the definition "{definition}"', [
             'definition' => $definition,
             'context' => $context,
         ]);
 
-        $result = $this->delegate->getTypeByDefinition($definition, $context);
+        $result = parent::getTypeByDefinition($definition, $context);
 
         $this->logger->info('The {type_name} was fetched by the definition "{definition}"', [
             'definition' => $definition,
@@ -38,14 +39,15 @@ public function getTypeByDefinition(#[Language('PHP')] string $definition, ?\Ref
         return new LoggableType($this->logger, $result);
     }
 
+    #[\Override]
     public function getTypeByValue(mixed $value, ?\ReflectionClass $context = null): TypeInterface
     {
         $this->logger->debug('Fetching the type by the value "{value}"', [
             'value' => $value,
             'context' => $context,
         ]);
 
-        $result = $this->delegate->getTypeByValue($value, $context);
+        $result = parent::getTypeByValue($value, $context);
 
         $this->logger->info('The {type_name} was fetched by the value "{value}"', [
             'value' => $value,
@@ -57,6 +59,7 @@ public function getTypeByValue(mixed $value, ?\ReflectionClass $context = null):
         return new LoggableType($this->logger, $result);
     }
 
+    #[\Override]
     public function getTypeByStatement(TypeStatement $statement, ?\ReflectionClass $context = null): TypeInterface
     {
         $this->logger->debug('Fetching the type by the AST statement {statement_name}', [
@@ -65,7 +68,7 @@ public function getTypeByStatement(TypeStatement $statement, ?\ReflectionClass $
             'context' => $context,
         ]);
 
-        $result = $this->delegate->getTypeByStatement($statement, $context);
+        $result = parent::getTypeByStatement($statement, $context);
 
         $this->logger->info('The {type_name} was fetched by the AST statement {statement_name}', [
             'statement' => $statement,

src/Runtime/Repository/TraceableTypeRepository.php

@@ -19,6 +19,7 @@ public function __construct(
         parent::__construct($delegate);
     }
 
+    #[\Override]
     public function getTypeByDefinition(
         #[Language('PHP')]
         string $definition,
@@ -29,7 +30,7 @@ public function getTypeByDefinition(
         try {
             $span->setAttribute('value', $definition);
 
-            $result = $this->delegate->getTypeByDefinition($definition, $context);
+            $result = parent::getTypeByDefinition($definition, $context);
 
             $span->setAttribute('result', $result);
         } finally {
@@ -39,14 +40,15 @@ public function getTypeByDefinition(
         return new TraceableType($this->tracer, $result);
     }
 
+    #[\Override]
     public function getTypeByValue(mixed $value, ?\ReflectionClass $context = null): TypeInterface
     {
         $span = $this->tracer->start(\sprintf('Fetching by value [%s]', \get_debug_type($value)));
 
         try {
             $span->setAttribute('value', $value);
 
-            $result = $this->delegate->getTypeByValue($value, $context);
+            $result = parent::getTypeByValue($value, $context);
 
             $span->setAttribute('result', $result);
         } finally {
@@ -56,14 +58,15 @@ public function getTypeByValue(mixed $value, ?\ReflectionClass $context = null):
         return new TraceableType($this->tracer, $result);
     }
 
+    #[\Override]
     public function getTypeByStatement(TypeStatement $statement, ?\ReflectionClass $context = null): TypeInterface
     {
         $span = $this->tracer->start(\sprintf('Fetching by statement "%s"', \get_debug_type($statement)));
 
         try {
             $span->setAttribute('value', $statement);
 
-            $result = $this->delegate->getTypeByStatement($statement, $context);
+            $result = parent::getTypeByStatement($statement, $context);
 
             $span->setAttribute('result', $result);
         } finally {

src/Runtime/Repository/TypeRepository.php

@@ -63,14 +63,14 @@ public function getTypeByDefinition(#[Language('PHP')] string $definition, ?\Ref
     {
         $statement = $this->parser->getStatementByDefinition($definition);
 
-        return $this->getTypeByStatement($statement, $context);
+        return $this->inner->getTypeByStatement($statement, $context);
     }
 
     public function getTypeByValue(mixed $value, ?\ReflectionClass $context = null): TypeInterface
     {
         $statement = $this->parser->getStatementByValue($value);
 
-        return $this->getTypeByStatement($statement, $context);
+        return $this->inner->getTypeByStatement($statement, $context);
     }
 
     public function getTypeByStatement(TypeStatement $statement, ?\ReflectionClass $context = null): TypeInterface

src/Runtime/Repository/TypeRepositoryDecorator.php

@@ -4,12 +4,16 @@
 
 namespace TypeLang\Mapper\Runtime\Repository;
 
+use JetBrains\PhpStorm\Language;
+use TypeLang\Mapper\Type\TypeInterface;
+use TypeLang\Parser\Node\Stmt\TypeStatement;
+
 abstract class TypeRepositoryDecorator implements
     TypeRepositoryInterface,
     InnerTypeRepositoryContainerInterface
 {
     public function __construct(
-        protected readonly TypeRepositoryInterface $delegate,
+        private readonly TypeRepositoryInterface $delegate,
     ) {
         $this->setInnerContext($this);
     }
@@ -22,4 +26,19 @@ public function setInnerContext(TypeRepositoryInterface $inner): void
 
         $this->delegate->setInnerContext($this);
     }
+
+    public function getTypeByDefinition(#[Language('PHP')] string $definition, ?\ReflectionClass $context = null): TypeInterface
+    {
+        return $this->delegate->getTypeByDefinition($definition, $context);
+    }
+
+    public function getTypeByValue(mixed $value, ?\ReflectionClass $context = null): TypeInterface
+    {
+        return $this->delegate->getTypeByValue($value, $context);
+    }
+
+    public function getTypeByStatement(TypeStatement $statement, ?\ReflectionClass $context = null): TypeInterface
+    {
+        return $this->delegate->getTypeByStatement($statement, $context);
+    }
 }