Extract builtTypes in memory to registry

Author: jerowork

src/SchemaBuilderFactory.php

@@ -5,6 +5,7 @@
 namespace Jerowork\GraphqlAttributeSchema;
 
 use Jerowork\GraphqlAttributeSchema\Parser\Node\Node;
+use Jerowork\GraphqlAttributeSchema\TypeBuilder\BuiltTypesRegistry;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\Object\CustomScalarObjectTypeBuilder;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\Object\EnumObjectTypeBuilder;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\Object\InputTypeObjectTypeBuilder;
@@ -45,7 +46,10 @@ public static function create(
 
         return new SchemaBuilder(
             new RootTypeBuilder(
-                new TypeBuilder($objectTypeBuilders),
+                new TypeBuilder(
+                    new BuiltTypesRegistry(),
+                    $objectTypeBuilders,
+                ),
                 new RootTypeResolver(
                     $container,
                     [

src/TypeBuilder/BuiltTypesRegistry.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Jerowork\GraphqlAttributeSchema\TypeBuilder;
+
+use GraphQL\Type\Definition\Type;
+
+final class BuiltTypesRegistry
+{
+    /**
+     * @var array<string, Type>
+     */
+    private array $builtTypes = [];
+
+    public function hasType(string $key): bool
+    {
+        return array_key_exists($key, $this->builtTypes);
+    }
+
+    /**
+     * @throws BuildException
+     */
+    public function getType(string $key): Type
+    {
+        if (!$this->hasType($key)) {
+            throw BuildException::logicError(sprintf('Type with key %s not found in registry', $key));
+        }
+
+        return $this->builtTypes[$key];
+    }
+
+    public function addType(string $key, Type $type): void
+    {
+        $this->builtTypes[$key] = $type;
+    }
+}

src/TypeBuilder/TypeBuilder.php

@@ -14,18 +14,14 @@
 use Jerowork\GraphqlAttributeSchema\Parser\Node\Type\ScalarNodeType;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\Object\ObjectTypeBuilder;
 
-final class TypeBuilder
+final readonly class TypeBuilder
 {
-    /**
-     * @var array<class-string, WebonyxType>
-     */
-    private array $builtTypes = [];
-
     /**
      * @param iterable<ObjectTypeBuilder<Node>> $objectTypeBuilders
      */
     public function __construct(
-        private readonly iterable $objectTypeBuilders,
+        private BuiltTypesRegistry $builtTypesRegistry,
+        private iterable $objectTypeBuilders,
     ) {}
 
     /**
@@ -95,18 +91,20 @@ private function buildObject(string $className, Ast $ast): WebonyxType
             $nodeClassName = $node->getClassName();
         }
 
-        if (array_key_exists($nodeClassName, $this->builtTypes)) {
-            return $this->builtTypes[$nodeClassName];
+        if ($this->builtTypesRegistry->hasType($nodeClassName)) {
+            return $this->builtTypesRegistry->getType($nodeClassName);
         }
 
         foreach ($this->objectTypeBuilders as $objectTypeBuilder) {
             if (!$objectTypeBuilder->supports($node)) {
                 continue;
             }
 
-            $this->builtTypes[$nodeClassName] = $objectTypeBuilder->build($node, $this, $ast);
+            $builtType = $objectTypeBuilder->build($node, $this, $ast);
+
+            $this->builtTypesRegistry->addType($nodeClassName, $builtType);
 
-            return $this->builtTypes[$nodeClassName];
+            return $builtType;
         }
 
         throw BuildException::logicError(sprintf('Invalid object class %s', $nodeClassName));

tests/TypeBuilder/Object/BuildArgsTraitTest.php

@@ -10,6 +10,7 @@
 use Jerowork\GraphqlAttributeSchema\Parser\Node\Child\FieldNode;
 use Jerowork\GraphqlAttributeSchema\Parser\Node\Child\FieldNodeType;
 use Jerowork\GraphqlAttributeSchema\Parser\Node\Type\ScalarNodeType;
+use Jerowork\GraphqlAttributeSchema\TypeBuilder\BuiltTypesRegistry;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\TypeBuilder;
 use PHPUnit\Framework\TestCase;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\Object\BuildArgsTrait;
@@ -51,7 +52,7 @@ public function itShouldBuildArgs(): void
                 'name',
                 null,
             ),
-            new TypeBuilder([]),
+            new TypeBuilder(new BuiltTypesRegistry(), []),
             new Ast(),
         );
 

tests/TypeBuilder/Object/CustomScalarObjectTypeBuilderTest.php

@@ -10,6 +10,7 @@
 use Jerowork\GraphqlAttributeSchema\Parser\Node\Class\TypeNode;
 use Jerowork\GraphqlAttributeSchema\Test\Doubles\Scalar\TestScalarType;
 use Jerowork\GraphqlAttributeSchema\Test\Doubles\Type\TestType;
+use Jerowork\GraphqlAttributeSchema\TypeBuilder\BuiltTypesRegistry;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\TypeBuilder;
 use PHPUnit\Framework\TestCase;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\Object\CustomScalarObjectTypeBuilder;
@@ -60,7 +61,7 @@ public function itShouldBuildCustomScalarType(): void
                 null,
                 DateTime::class,
             ),
-            new TypeBuilder([]),
+            new TypeBuilder(new BuiltTypesRegistry(), []),
             new Ast(),
         );
 

tests/TypeBuilder/Object/EnumObjectTypeBuilderTest.php

@@ -11,6 +11,7 @@
 use Jerowork\GraphqlAttributeSchema\Parser\Node\Class\TypeNode;
 use Jerowork\GraphqlAttributeSchema\Test\Doubles\Enum\TestEnumType;
 use Jerowork\GraphqlAttributeSchema\Test\Doubles\Type\TestType;
+use Jerowork\GraphqlAttributeSchema\TypeBuilder\BuiltTypesRegistry;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\TypeBuilder;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
@@ -63,7 +64,7 @@ public function itShouldBuildEnumType(): void
                     new EnumValueNode('closed', 'Case Closed', null),
                 ],
             ),
-            new TypeBuilder([]),
+            new TypeBuilder(new BuiltTypesRegistry(), []),
             new Ast(),
         );
 

tests/TypeBuilder/Object/InputTypeObjectTypeBuilderTest.php

@@ -15,6 +15,7 @@
 use Jerowork\GraphqlAttributeSchema\Parser\Node\Type\ScalarNodeType;
 use Jerowork\GraphqlAttributeSchema\Test\Doubles\Enum\TestEnumType;
 use Jerowork\GraphqlAttributeSchema\Test\Doubles\Type\TestType;
+use Jerowork\GraphqlAttributeSchema\TypeBuilder\BuiltTypesRegistry;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\Object\InputTypeObjectTypeBuilder;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\TypeBuilder;
 use PHPUnit\Framework\TestCase;
@@ -82,7 +83,7 @@ public function itShouldBuildType(): void
                     ),
                 ],
             ),
-            new TypeBuilder([]),
+            new TypeBuilder(new BuiltTypesRegistry(), []),
             new Ast(),
         );
 

tests/TypeBuilder/Object/TypeObjectTypeBuilderTest.php

@@ -16,6 +16,7 @@
 use Jerowork\GraphqlAttributeSchema\Test\Doubles\Container\TestContainer;
 use Jerowork\GraphqlAttributeSchema\Test\Doubles\Enum\TestEnumType;
 use Jerowork\GraphqlAttributeSchema\Test\Doubles\Type\TestType;
+use Jerowork\GraphqlAttributeSchema\TypeBuilder\BuiltTypesRegistry;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\TypeBuilder;
 use Jerowork\GraphqlAttributeSchema\TypeResolver\Child\Output\EnumNodeOutputChildResolver;
 use Jerowork\GraphqlAttributeSchema\TypeResolver\Child\Output\ScalarTypeOutputChildResolver;
@@ -94,7 +95,7 @@ public function itShouldBuildType(): void
                     ),
                 ],
             ),
-            new TypeBuilder([]),
+            new TypeBuilder(new BuiltTypesRegistry(), []),
             new Ast(),
         );
 

tests/TypeBuilder/RootTypeBuilderTest.php

@@ -11,6 +11,7 @@
 use Jerowork\GraphqlAttributeSchema\Parser\Node\Type\ScalarNodeType;
 use Jerowork\GraphqlAttributeSchema\Test\Doubles\Container\TestContainer;
 use Jerowork\GraphqlAttributeSchema\Test\Doubles\Mutation\TestMutation;
+use Jerowork\GraphqlAttributeSchema\TypeBuilder\BuiltTypesRegistry;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\RootTypeBuilder;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\TypeBuilder;
 use Jerowork\GraphqlAttributeSchema\TypeResolver\Child\Input\CustomScalarNodeInputChildResolver;
@@ -36,7 +37,7 @@ protected function setUp(): void
         parent::setUp();
 
         $this->builder = new RootTypeBuilder(
-            new TypeBuilder([]),
+            new TypeBuilder(new BuiltTypesRegistry(), []),
             new RootTypeResolver(
                 $this->container = new TestContainer(),
                 [

tests/TypeBuilder/TypeBuilderTest.php

@@ -14,6 +14,7 @@
 use Jerowork\GraphqlAttributeSchema\Test\Doubles\Container\TestContainer;
 use Jerowork\GraphqlAttributeSchema\Test\Doubles\Enum\TestEnumType;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\BuildException;
+use Jerowork\GraphqlAttributeSchema\TypeBuilder\BuiltTypesRegistry;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\Object\EnumObjectTypeBuilder;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\Object\InputTypeObjectTypeBuilder;
 use Jerowork\GraphqlAttributeSchema\TypeBuilder\Object\ObjectTypeBuilder;
@@ -52,7 +53,7 @@ protected function setUp(): void
             )),
         ];
 
-        $this->builder = new TypeBuilder($objectTypeBuilders);
+        $this->builder = new TypeBuilder(new BuiltTypesRegistry(), $objectTypeBuilders);
     }
 
     #[Test]