Refac trait 'MutableTrait' to decorate class 'GraphQL\Type\Definition\TypeWithFields'

Author: dsavina

src/Types/MutableObjectType.php

@@ -4,7 +4,6 @@
 
 namespace TheCodingMachine\GraphQLite\Types;
 
-use GraphQL\Type\Definition\FieldDefinition;
 use GraphQL\Type\Definition\ObjectType;
 
 /**
@@ -25,19 +24,4 @@ public function __construct(array $config, ?string $className = null)
         parent::__construct($config);
         $this->className = $className;
     }
-
-    public function findField(string $name): ?FieldDefinition
-    {
-        $field = parent::findField($name);
-        if ($field) {
-            return $field;
-        }
-
-        $fields = $this->getFields();
-        if (! isset($fields[$name])) {
-            return null;
-        }
-
-        return $fields[$name];
-    }
 }

src/Types/MutableTrait.php

@@ -9,6 +9,10 @@
 use GraphQL\Type\Definition\FieldDefinition;
 use RuntimeException;
 
+use function array_keys;
+use function array_merge;
+use function array_unique;
+
 trait MutableTrait
 {
     /** @var string */
@@ -17,8 +21,8 @@ trait MutableTrait
     /** @var array<callable> */
     private $fieldsCallables = [];
 
-    /** @var FieldDefinition[]|null */
-    private $finalFields;
+    /** @var FieldDefinition[] */
+    private $fields;
     /** @var class-string<object>|null */
     private $className;
 
@@ -47,15 +51,18 @@ public function addFields(callable $fields): void
      *
      * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint
      */
-    public function getField($name): FieldDefinition
+    public function getField(string $name): FieldDefinition
     {
-        if ($this->status === MutableInterface::STATUS_PENDING) {
-            throw new RuntimeException(
-                'You must freeze() the MutableObjectType, ' . $this->className . ', before fetching its fields.'
-            );
-        }
+        $this->initializeFields();
+
+        return $this->fields[$name] ?? parent::getField($name);
+    }
+
+    public function findField(string $name): ?FieldDefinition
+    {
+        $this->initializeFields();
 
-        return parent::getField($name);
+        return $this->fields[$name] ?? parent::findField($name);
     }
 
     /**
@@ -65,13 +72,9 @@ public function getField($name): FieldDefinition
      */
     public function hasField($name): bool
     {
-        if ($this->status === MutableInterface::STATUS_PENDING) {
-            throw new RuntimeException(
-                'You must freeze() the MutableObjectType, ' . $this->className . ', before fetching its fields.'
-            );
-        }
+        $this->initializeFields();
 
-        return parent::hasField($name);
+        return isset($this->fields[$name]) || parent::hasField($name);
     }
 
     /**
@@ -81,23 +84,19 @@ public function hasField($name): bool
      */
     public function getFields(): array
     {
-        if ($this->finalFields === null) {
-            if ($this->status === MutableInterface::STATUS_PENDING) {
-                throw new RuntimeException(
-                    'You must freeze() the MutableObjectType, ' . $this->className . ', before fetching its fields.'
-                );
-            }
-
-            $this->finalFields = parent::getFields();
-            foreach ($this->fieldsCallables as $fieldsCallable) {
-                $this->finalFields = FieldDefinition::defineFieldMap($this, $fieldsCallable()) + $this->finalFields;
-            }
-            if (empty($this->finalFields)) {
-                throw NoFieldsException::create($this->name);
-            }
-        }
+        $this->initializeFields();
+
+        return array_merge(parent::getFields(), $this->fields);
+    }
 
-        return $this->finalFields;
+    /**
+     * @return string[]
+     */
+    public function getFieldNames(): array
+    {
+        $this->initializeFields();
+
+        return array_unique(array_merge(parent::getFieldNames(), array_keys($this->fields)));
     }
 
     /**
@@ -109,4 +108,26 @@ public function getMappedClassName(): ?string
     {
         return $this->className;
     }
+
+    private function initializeFields(): void
+    {
+        if ($this->status === MutableInterface::STATUS_PENDING) {
+            throw new RuntimeException(
+                'You must freeze() the MutableObjectType, ' . $this->className . ', before fetching its fields.'
+            );
+        }
+
+        if (isset($this->fields)) {
+            return;
+        }
+
+        $this->fields = [];
+        foreach ($this->fieldsCallables as $fieldsCallable) {
+            $this->fields = FieldDefinition::defineFieldMap($this, $fieldsCallable()) + $this->fields;
+        }
+
+        if (empty($this->fields) && empty(parent::getFieldNames())) {
+            throw NoFieldsException::create($this->name);
+        }
+    }
 }