Split type repository facade and runtime

Author: Kirill Nesmeyanov

src/Mapper.php

@@ -17,11 +17,12 @@
 use TypeLang\Mapper\Runtime\Parser\TypeParser;
 use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
 use TypeLang\Mapper\Runtime\Parser\TypeParserRuntime;
-use TypeLang\Mapper\Runtime\Repository\InMemoryTypeRepository;
-use TypeLang\Mapper\Runtime\Repository\LoggableTypeRepository;
-use TypeLang\Mapper\Runtime\Repository\TraceableTypeRepository;
+use TypeLang\Mapper\Runtime\Repository\InMemoryTypeRepositoryRuntime;
+use TypeLang\Mapper\Runtime\Repository\LoggableTypeRepositoryRuntime;
+use TypeLang\Mapper\Runtime\Repository\TraceableTypeRepositoryRuntime;
 use TypeLang\Mapper\Runtime\Repository\TypeRepository;
 use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
+use TypeLang\Mapper\Runtime\Repository\TypeRepositoryRuntime;
 use TypeLang\Mapper\Type\TypeInterface;
 
 final class Mapper implements NormalizerInterface, DenormalizerInterface
@@ -57,20 +58,20 @@ private function createTypeParser(PlatformInterface $platform): TypeParserInterf
 
     private function createTypeRepository(PlatformInterface $platform): TypeRepositoryInterface
     {
-        $repository = TypeRepository::createFromPlatform(
-            platform: $platform,
-            parser: $this->parser,
-        );
+        $runtime = TypeRepositoryRuntime::createFromPlatform($platform, $this->parser);
 
         if (($tracer = $this->config->getTracer()) !== null) {
-            $repository = new TraceableTypeRepository($tracer, $repository);
+            $runtime = new TraceableTypeRepositoryRuntime($tracer, $runtime);
         }
 
         if (($logger = $this->config->getLogger()) !== null) {
-            $repository = new LoggableTypeRepository($logger, $repository);
+            $runtime = new LoggableTypeRepositoryRuntime($logger, $runtime);
         }
 
-        return new InMemoryTypeRepository($repository);
+        return new TypeRepository(
+            parser: $this->parser,
+            runtime: new InMemoryTypeRepositoryRuntime($runtime),
+        );
     }
 
     /**

src/Mapping/Driver/AttributeDriver.php

@@ -11,17 +11,17 @@
 use TypeLang\Mapper\Mapping\Metadata\ClassMetadata;
 use TypeLang\Mapper\Mapping\Metadata\TypeMetadata;
 use TypeLang\Mapper\Mapping\SkipWhen;
-use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
-use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
+use TypeLang\Mapper\Runtime\Parser\TypeParserRuntimeInterface;
+use TypeLang\Mapper\Runtime\Repository\TypeRepositoryRuntimeInterface;
 
 final class AttributeDriver extends LoadableDriver
 {
     #[\Override]
     protected function load(
         \ReflectionClass $reflection,
         ClassMetadata $class,
-        TypeRepositoryInterface $types,
-        TypeParserInterface $parser,
+        TypeRepositoryRuntimeInterface $types,
+        TypeParserRuntimeInterface $parser,
     ): void {
         foreach ($reflection->getProperties() as $property) {
             $metadata = $class->getPropertyOrCreate($property->getName());
@@ -71,8 +71,8 @@ protected function load(
     private function createType(
         string $type,
         \ReflectionProperty $property,
-        TypeRepositoryInterface $types,
-        TypeParserInterface $parser,
+        TypeRepositoryRuntimeInterface $types,
+        TypeParserRuntimeInterface $parser,
     ): TypeMetadata {
         $statement = $parser->getStatementByDefinition($type);
 

src/Mapping/Driver/DocBlockDriver.php

@@ -12,8 +12,8 @@
 use TypeLang\Mapper\Mapping\Metadata\ClassMetadata;
 use TypeLang\Mapper\Mapping\Metadata\PropertyMetadata;
 use TypeLang\Mapper\Mapping\Metadata\TypeMetadata;
-use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
-use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
+use TypeLang\Mapper\Runtime\Parser\TypeParserRuntimeInterface;
+use TypeLang\Mapper\Runtime\Repository\TypeRepositoryRuntimeInterface;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 use TypeLang\PHPDoc\Parser;
 use TypeLang\PHPDoc\Standard\ParamTagFactory;
@@ -119,8 +119,8 @@ private function findType(\ReflectionClass $class, PropertyMetadata $meta): ?Typ
     protected function load(
         \ReflectionClass $reflection,
         ClassMetadata $class,
-        TypeRepositoryInterface $types,
-        TypeParserInterface $parser,
+        TypeRepositoryRuntimeInterface $types,
+        TypeParserRuntimeInterface $parser,
     ): void {
         foreach ($reflection->getProperties() as $property) {
             $metadata = $class->getPropertyOrCreate($property->getName());

src/Mapping/Driver/Driver.php

@@ -5,8 +5,8 @@
 namespace TypeLang\Mapper\Mapping\Driver;
 
 use TypeLang\Mapper\Mapping\Metadata\ClassMetadata;
-use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
-use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
+use TypeLang\Mapper\Runtime\Parser\TypeParserRuntimeInterface;
+use TypeLang\Mapper\Runtime\Repository\TypeRepositoryRuntimeInterface;
 
 abstract class Driver implements DriverInterface
 {
@@ -16,8 +16,8 @@ public function __construct(
 
     public function getClassMetadata(
         \ReflectionClass $class,
-        TypeRepositoryInterface $types,
-        TypeParserInterface $parser,
+        TypeRepositoryRuntimeInterface $types,
+        TypeParserRuntimeInterface $parser,
     ): ClassMetadata {
         return $this->delegate->getClassMetadata($class, $types, $parser);
     }

src/Mapping/Driver/DriverInterface.php

@@ -5,8 +5,8 @@
 namespace TypeLang\Mapper\Mapping\Driver;
 
 use TypeLang\Mapper\Mapping\Metadata\ClassMetadata;
-use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
-use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
+use TypeLang\Mapper\Runtime\Parser\TypeParserRuntimeInterface;
+use TypeLang\Mapper\Runtime\Repository\TypeRepositoryRuntimeInterface;
 
 interface DriverInterface
 {
@@ -19,7 +19,7 @@ interface DriverInterface
      */
     public function getClassMetadata(
         \ReflectionClass $class,
-        TypeRepositoryInterface $types,
-        TypeParserInterface $parser,
+        TypeRepositoryRuntimeInterface $types,
+        TypeParserRuntimeInterface $parser,
     ): ClassMetadata;
 }

src/Mapping/Driver/InMemoryCachedDriver.php

@@ -5,8 +5,8 @@
 namespace TypeLang\Mapper\Mapping\Driver;
 
 use TypeLang\Mapper\Mapping\Metadata\ClassMetadata;
-use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
-use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
+use TypeLang\Mapper\Runtime\Parser\TypeParserRuntimeInterface;
+use TypeLang\Mapper\Runtime\Repository\TypeRepositoryRuntimeInterface;
 
 final class InMemoryCachedDriver extends Driver
 {
@@ -17,8 +17,8 @@ final class InMemoryCachedDriver extends Driver
 
     public function getClassMetadata(
         \ReflectionClass $class,
-        TypeRepositoryInterface $types,
-        TypeParserInterface $parser,
+        TypeRepositoryRuntimeInterface $types,
+        TypeParserRuntimeInterface $parser,
     ): ClassMetadata {
         // @phpstan-ignore-next-line : class-string<T> key contains ClassMetadata<T> instance
         return $this->memory[$class->name]

src/Mapping/Driver/LoadableDriver.php

@@ -6,8 +6,8 @@
 
 use TypeLang\Mapper\Exception\Definition\DefinitionException;
 use TypeLang\Mapper\Mapping\Metadata\ClassMetadata;
-use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
-use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
+use TypeLang\Mapper\Runtime\Parser\TypeParserRuntimeInterface;
+use TypeLang\Mapper\Runtime\Repository\TypeRepositoryRuntimeInterface;
 
 /**
  * Implements each driver that can supplement or modify existing
@@ -36,8 +36,8 @@ public function __construct(
      */
     public function getClassMetadata(
         \ReflectionClass $class,
-        TypeRepositoryInterface $types,
-        TypeParserInterface $parser,
+        TypeRepositoryRuntimeInterface $types,
+        TypeParserRuntimeInterface $parser,
     ): ClassMetadata {
         if (isset(self::$metadata[$class->getName()])) {
             /** @var ClassMetadata<TArg> */
@@ -68,7 +68,7 @@ public function getClassMetadata(
     abstract protected function load(
         \ReflectionClass $reflection,
         ClassMetadata $class,
-        TypeRepositoryInterface $types,
-        TypeParserInterface $parser,
+        TypeRepositoryRuntimeInterface $types,
+        TypeParserRuntimeInterface $parser,
     ): void;
 }

src/Mapping/Driver/NullDriver.php

@@ -5,15 +5,15 @@
 namespace TypeLang\Mapper\Mapping\Driver;
 
 use TypeLang\Mapper\Mapping\Metadata\ClassMetadata;
-use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
-use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
+use TypeLang\Mapper\Runtime\Parser\TypeParserRuntimeInterface;
+use TypeLang\Mapper\Runtime\Repository\TypeRepositoryRuntimeInterface;
 
 final class NullDriver implements DriverInterface
 {
     public function getClassMetadata(
         \ReflectionClass $class,
-        TypeRepositoryInterface $types,
-        TypeParserInterface $parser,
+        TypeRepositoryRuntimeInterface $types,
+        TypeParserRuntimeInterface $parser,
     ): ClassMetadata {
         return new ClassMetadata($class->getName());
     }

src/Mapping/Driver/Psr16CachedDriver.php

@@ -6,8 +6,8 @@
 
 use Psr\SimpleCache\CacheInterface;
 use TypeLang\Mapper\Mapping\Metadata\ClassMetadata;
-use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
-use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
+use TypeLang\Mapper\Runtime\Parser\TypeParserRuntimeInterface;
+use TypeLang\Mapper\Runtime\Repository\TypeRepositoryRuntimeInterface;
 
 final class Psr16CachedDriver extends CachedDriver
 {
@@ -22,8 +22,8 @@ public function __construct(
 
     public function getClassMetadata(
         \ReflectionClass $class,
-        TypeRepositoryInterface $types,
-        TypeParserInterface $parser,
+        TypeRepositoryRuntimeInterface $types,
+        TypeParserRuntimeInterface $parser,
     ): ClassMetadata {
         $index = $this->getKey($class);
 

src/Mapping/Driver/ReflectionDriver.php

@@ -9,8 +9,8 @@
 use TypeLang\Mapper\Mapping\Metadata\ClassMetadata;
 use TypeLang\Mapper\Mapping\Metadata\PropertyMetadata;
 use TypeLang\Mapper\Mapping\Metadata\TypeMetadata;
-use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
-use TypeLang\Mapper\Runtime\Repository\TypeRepositoryInterface;
+use TypeLang\Mapper\Runtime\Parser\TypeParserRuntimeInterface;
+use TypeLang\Mapper\Runtime\Repository\TypeRepositoryRuntimeInterface;
 use TypeLang\Parser\Node\FullQualifiedName;
 use TypeLang\Parser\Node\Identifier;
 use TypeLang\Parser\Node\Name;
@@ -26,8 +26,8 @@ final class ReflectionDriver extends LoadableDriver
     protected function load(
         \ReflectionClass $reflection,
         ClassMetadata $class,
-        TypeRepositoryInterface $types,
-        TypeParserInterface $parser,
+        TypeRepositoryRuntimeInterface $types,
+        TypeParserRuntimeInterface $parser,
     ): void {
         foreach ($reflection->getProperties() as $property) {
             if (!self::isValidProperty($property)) {
@@ -78,7 +78,7 @@ private function fillDefaultValue(\ReflectionProperty $property, PropertyMetadat
     private function fillType(
         \ReflectionProperty $property,
         PropertyMetadata $meta,
-        TypeRepositoryInterface $types,
+        TypeRepositoryRuntimeInterface $types,
     ): void {
         $statement = $this->getTypeStatement($property);