Initialize directives and arguments in Node with empty NodeList

webonyx · Feb 28, 2023 · fd3540d · fd3540d
1 parent f50040e
commit fd3540d
Show file tree

Hide file tree

Showing 12 changed files with 170 additions and 0 deletions.
diff --git a/src/Language/AST/DirectiveDefinitionNode.php b/src/Language/AST/DirectiveDefinitionNode.php
@@ -17,4 +17,10 @@ class DirectiveDefinitionNode extends Node implements TypeSystemDefinitionNode
 
     /** @var NodeList<NameNode> */
     public NodeList $locations;
+
+    public function __construct(array $vars)
+    {
+        parent::__construct($vars);
+        $this->arguments ??= new NodeList([]);
+    }
 }
diff --git a/src/Language/AST/DirectiveNode.php b/src/Language/AST/DirectiveNode.php
@@ -10,4 +10,10 @@ class DirectiveNode extends Node
 
     /** @var NodeList<ArgumentNode> */
     public NodeList $arguments;
+
+    public function __construct(array $vars)
+    {
+        parent::__construct($vars);
+        $this->arguments ??= new NodeList([]);
+    }
 }
diff --git a/src/Language/AST/EnumTypeDefinitionNode.php b/src/Language/AST/EnumTypeDefinitionNode.php
@@ -20,4 +20,10 @@ public function getName(): NameNode
     {
         return $this->name;
     }
+
+    public function __construct(array $vars)
+    {
+        parent::__construct($vars);
+        $this->directives ??= new NodeList([]);
+    }
 }
diff --git a/src/Language/AST/EnumTypeExtensionNode.php b/src/Language/AST/EnumTypeExtensionNode.php
@@ -14,6 +14,12 @@ class EnumTypeExtensionNode extends Node implements TypeExtensionNode
     /** @var NodeList<EnumValueDefinitionNode> */
     public NodeList $values;
 
+    public function __construct(array $vars)
+    {
+        parent::__construct($vars);
+        $this->directives ??= new NodeList([]);
+    }
+
     public function getName(): NameNode
     {
         return $this->name;

diff --git a/src/Language/AST/FieldNode.php b/src/Language/AST/FieldNode.php
@@ -17,4 +17,11 @@ class FieldNode extends Node implements SelectionNode
     public NodeList $directives;
 
     public ?SelectionSetNode $selectionSet = null;
+
+    public function __construct(array $vars)
+    {
+        parent::__construct($vars);
+        $this->directives ??= new NodeList([]);
+        $this->arguments ??= new NodeList([]);
+    }
 }
diff --git a/src/Language/AST/FragmentDefinitionNode.php b/src/Language/AST/FragmentDefinitionNode.php
@@ -25,6 +25,12 @@ class FragmentDefinitionNode extends Node implements ExecutableDefinitionNode, H
 
     public SelectionSetNode $selectionSet;
 
+    public function __construct(array $vars)
+    {
+        parent::__construct($vars);
+        $this->directives ??= new NodeList([]);
+    }
+
     public function getSelectionSet(): SelectionSetNode
     {
         return $this->selectionSet;

diff --git a/src/Language/AST/FragmentSpreadNode.php b/src/Language/AST/FragmentSpreadNode.php
@@ -10,4 +10,10 @@ class FragmentSpreadNode extends Node implements SelectionNode
 
     /** @var NodeList<DirectiveNode> */
     public NodeList $directives;
+
+    public function __construct(array $vars)
+    {
+        parent::__construct($vars);
+        $this->directives ??= new NodeList([]);
+    }
 }
diff --git a/src/Language/AST/InlineFragmentNode.php b/src/Language/AST/InlineFragmentNode.php
@@ -12,4 +12,10 @@ class InlineFragmentNode extends Node implements SelectionNode
     public NodeList $directives;
 
     public SelectionSetNode $selectionSet;
+
+    public function __construct(array $vars)
+    {
+        parent::__construct($vars);
+        $this->directives ??= new NodeList([]);
+    }
 }
diff --git a/src/Language/AST/InputObjectTypeDefinitionNode.php b/src/Language/AST/InputObjectTypeDefinitionNode.php
@@ -20,4 +20,10 @@ public function getName(): NameNode
     {
         return $this->name;
     }
+
+    public function __construct(array $vars)
+    {
+        parent::__construct($vars);
+        $this->directives ??= new NodeList([]);
+    }
 }
diff --git a/src/Language/AST/OperationDefinitionNode.php b/src/Language/AST/OperationDefinitionNode.php
@@ -24,6 +24,12 @@ class OperationDefinitionNode extends Node implements ExecutableDefinitionNode,
 
     public SelectionSetNode $selectionSet;
 
+    public function __construct(array $vars)
+    {
+        parent::__construct($vars);
+        $this->directives ??= new NodeList([]);
+    }
+
     public function getSelectionSet(): SelectionSetNode
     {
         return $this->selectionSet;

diff --git a/src/Language/AST/VariableDefinitionNode.php b/src/Language/AST/VariableDefinitionNode.php
@@ -16,4 +16,10 @@ class VariableDefinitionNode extends Node implements DefinitionNode
 
     /** @var NodeList<DirectiveNode> */
     public NodeList $directives;
+
+    public function __construct(array $vars)
+    {
+        parent::__construct($vars);
+        $this->directives ??= new NodeList([]);
+    }
 }
diff --git a/tests/Utils/AstFromArrayTest.php b/tests/Utils/AstFromArrayTest.php
@@ -0,0 +1,103 @@
+<?php declare(strict_types=1);
+
+namespace GraphQL\Tests\Utils;
+
+use GraphQL\Language\AST\FieldNode;
+use GraphQL\Language\AST\FragmentDefinitionNode;
+use GraphQL\Language\AST\FragmentSpreadNode;
+use GraphQL\Language\AST\InlineFragmentNode;
+use GraphQL\Language\AST\NodeList;
+use GraphQL\Language\AST\OperationDefinitionNode;
+use GraphQL\Language\AST\VariableDefinitionNode;
+use GraphQL\Utils\AST;
+use PHPUnit\Framework\TestCase;
+
+final class AstFromArrayTest extends TestCase
+{
+    public function testFromArray(): void
+    {
+        $res = AST::fromArray([
+            'kind' => 'VariableDefinition',
+            'directives' => [],
+        ]);
+        assert($res instanceof VariableDefinitionNode);
+        self::assertEquals($res->directives, new NodeList([]));
+
+        $res = AST::fromArray([
+            'kind' => 'OperationDefinition',
+            'directives' => [],
+        ]);
+        assert($res instanceof OperationDefinitionNode);
+        self::assertEquals($res->directives, new NodeList([]));
+
+        $res = AST::fromArray([
+            'kind' => 'Field',
+            'directives' => [],
+            'arguments' => [],
+        ]);
+        assert($res instanceof FieldNode);
+        self::assertEquals($res->directives, new NodeList([]));
+        self::assertEquals($res->arguments, new NodeList([]));
+
+        $res = AST::fromArray([
+            'kind' => 'FragmentSpread',
+            'directives' => [],
+        ]);
+        assert($res instanceof FragmentSpreadNode);
+        self::assertEquals($res->directives, new NodeList([]));
+
+        $res = AST::fromArray([
+            'kind' => 'FragmentDefinition',
+            'directives' => [],
+        ]);
+        assert($res instanceof FragmentDefinitionNode);
+        self::assertEquals($res->directives, new NodeList([]));
+
+        $res = AST::fromArray([
+            'kind' => 'InlineFragment',
+            'directives' => [],
+        ]);
+        assert($res instanceof InlineFragmentNode);
+        self::assertEquals($res->directives, new NodeList([]));
+    }
+
+    public function testFromOptimizedArray(): void
+    {
+        $res = AST::fromArray([
+            'kind' => 'VariableDefinition',
+        ]);
+        assert($res instanceof VariableDefinitionNode);
+        self::assertEquals($res->directives, new NodeList([]));
+
+        $res = AST::fromArray([
+            'kind' => 'OperationDefinition',
+        ]);
+        assert($res instanceof OperationDefinitionNode);
+        self::assertEquals($res->directives, new NodeList([]));
+
+        $res = AST::fromArray([
+            'kind' => 'Field',
+        ]);
+        assert($res instanceof FieldNode);
+        self::assertEquals($res->directives, new NodeList([]));
+        self::assertEquals($res->arguments, new NodeList([]));
+
+        $res = AST::fromArray([
+            'kind' => 'FragmentSpread',
+        ]);
+        assert($res instanceof FragmentSpreadNode);
+        self::assertEquals($res->directives, new NodeList([]));
+
+        $res = AST::fromArray([
+            'kind' => 'FragmentDefinition',
+        ]);
+        assert($res instanceof FragmentDefinitionNode);
+        self::assertEquals($res->directives, new NodeList([]));
+
+        $res = AST::fromArray([
+            'kind' => 'InlineFragment',
+        ]);
+        assert($res instanceof InlineFragmentNode);
+        self::assertEquals($res->directives, new NodeList([]));
+    }
+}