Remove Node from child nodes (arg and field)

These nodes do not behave the same as the root nodes and have different use of Type. Therefore, remove the direct link.
jerowork · Jan 6, 2025 · 967bd93 · 967bd93
1 parent f8057e8
commit 967bd93
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 22 deletions.
diff --git a/src/Parser/Node/Child/ArgNode.php b/src/Parser/Node/Child/ArgNode.php
@@ -4,10 +4,9 @@
 
 namespace Jerowork\GraphqlAttributeSchema\Parser\Node\Child;
 
-use Jerowork\GraphqlAttributeSchema\Parser\Node\Node;
 use Jerowork\GraphqlAttributeSchema\Parser\Node\Type;
 
-final readonly class ArgNode implements Node
+final readonly class ArgNode
 {
     public function __construct(
         public Type $type,
@@ -16,9 +15,4 @@ public function __construct(
         public bool $isRequired,
         public string $propertyName,
     ) {}
-
-    public function getType(): Type
-    {
-        return $this->type;
-    }
 }
diff --git a/src/Parser/Node/Child/FieldNode.php b/src/Parser/Node/Child/FieldNode.php
@@ -4,10 +4,9 @@
 
 namespace Jerowork\GraphqlAttributeSchema\Parser\Node\Child;
 
-use Jerowork\GraphqlAttributeSchema\Parser\Node\Node;
 use Jerowork\GraphqlAttributeSchema\Parser\Node\Type;
 
-final readonly class FieldNode implements Node
+final readonly class FieldNode
 {
     /**
      * @param list<ArgNode> $argNodes
@@ -22,9 +21,4 @@ public function __construct(
         public ?string $methodName,
         public ?string $propertyName,
     ) {}
-
-    public function getType(): Type
-    {
-        return $this->type;
-    }
 }
diff --git a/src/TypeBuilder/Object/BuildArgsTrait.php b/src/TypeBuilder/Object/BuildArgsTrait.php
@@ -25,7 +25,7 @@ public function buildArgs(FieldNode $fieldNode, TypeBuilder $typeBuilder, Ast $a
             $args[] = [
                 'name' => $argNode->name,
                 'type' => $typeBuilder->build(
-                    $argNode->getType(),
+                    $argNode->type,
                     $argNode->isRequired,
                     $ast,
                 ),

diff --git a/src/TypeBuilder/Object/InputTypeObjectTypeBuilder.php b/src/TypeBuilder/Object/InputTypeObjectTypeBuilder.php
@@ -58,7 +58,7 @@ private function buildFields(InputTypeNode $node, TypeBuilder $typeBuilder, Ast
         $fields = [];
 
         foreach ($node->fieldNodes as $fieldNode) {
-            $type = $typeBuilder->build($fieldNode->getType(), $fieldNode->isRequired, $ast);
+            $type = $typeBuilder->build($fieldNode->type, $fieldNode->isRequired, $ast);
 
             if (!$type instanceof InputType) {
                 throw BuildException::invalidTypeForField($fieldNode->name, $type::class);

diff --git a/src/TypeBuilder/Object/TypeObjectTypeBuilder.php b/src/TypeBuilder/Object/TypeObjectTypeBuilder.php
@@ -59,7 +59,7 @@ private function buildFields(TypeNode $node, TypeBuilder $typeBuilder, Ast $ast)
         foreach ($node->fieldNodes as $fieldNode) {
             $fields[] = [
                 'name' => $fieldNode->name,
-                'type' => $typeBuilder->build($fieldNode->getType(), $fieldNode->isRequired, $ast),
+                'type' => $typeBuilder->build($fieldNode->type, $fieldNode->isRequired, $ast),
                 'description' => $fieldNode->description,
                 'args' => $this->buildArgs($fieldNode, $typeBuilder, $ast),
                 'resolve' => $this->typeResolver->resolve($fieldNode, $ast),

diff --git a/src/TypeBuilder/RootTypeBuilder.php b/src/TypeBuilder/RootTypeBuilder.php
@@ -35,7 +35,7 @@ public function build(QueryNode|MutationNode $node, Ast $ast): array
         foreach ($node->argNodes as $argNode) {
             $args[] = [
                 'name' => $argNode->name,
-                'type' => $this->typeBuilder->build($argNode->getType(), $argNode->isRequired, $ast),
+                'type' => $this->typeBuilder->build($argNode->type, $argNode->isRequired, $ast),
                 'description' => $argNode->description,
             ];
         }

diff --git a/src/TypeResolver/FieldResolver.php b/src/TypeResolver/FieldResolver.php
@@ -43,7 +43,7 @@ private function resolveChild(FieldNode $field, callable $fieldCallback, Ast $as
             return $fieldCallback();
         }
 
-        $node = $ast->getNodeByType($field->getType());
+        $node = $ast->getNodeByType($field->type);
 
         if ($node instanceof EnumNode) {
             /** @var BackedEnum $enum */

diff --git a/src/TypeResolver/RootTypeResolver.php b/src/TypeResolver/RootTypeResolver.php
@@ -51,10 +51,10 @@ public function resolveChild(ArgNode|FieldNode $child, array $args, Ast $ast): m
             return $args[$child->name];
         }
 
-        $node = $ast->getNodeByType($child->getType());
+        $node = $ast->getNodeByType($child->type);
 
         if ($node === null) {
-            throw ResolveException::logicError(sprintf('Node not found for typeId %s', $child->getType()->id));
+            throw ResolveException::logicError(sprintf('Node not found for typeId %s', $child->type->id));
         }
 
         if ($node instanceof EnumNode) {
@@ -69,7 +69,7 @@ public function resolveChild(ArgNode|FieldNode $child, array $args, Ast $ast): m
         if ($node instanceof InputTypeNode) {
             /** @var array<string, mixed> $childArgs */
             $childArgs = $args[$child->name];
-            $type = $child->getType()->id;
+            $type = $child->type->id;
 
             return new $type(...array_map(
                 fn($fieldNode) => $this->resolveChild($fieldNode, $childArgs, $ast),