Add isRequired to TypedAttributes

When type is set in an attribute, it will overrule both type as well as
if it is required. IsRequired can be set with the new option `isRequired`

Author: jerowork

src/Attribute/Arg.php

@@ -13,6 +13,7 @@ public function __construct(
         public ?string $name = null,
         public ?string $description = null,
         public ?string $type = null,
+        public bool $isRequired = true,
     ) {}
 
     public function getName(): ?string
@@ -29,4 +30,9 @@ public function getType(): ?string
     {
         return $this->type;
     }
+
+    public function isRequired(): bool
+    {
+        return $this->isRequired;
+    }
 }

src/Attribute/Field.php

@@ -13,6 +13,7 @@ public function __construct(
         public ?string $name = null,
         public ?string $description = null,
         public ?string $type = null,
+        public bool $isRequired = true,
     ) {}
 
     public function getName(): ?string
@@ -29,4 +30,9 @@ public function getType(): ?string
     {
         return $this->type;
     }
+
+    public function isRequired(): bool
+    {
+        return $this->isRequired;
+    }
 }

src/Attribute/Mutation.php

@@ -13,6 +13,7 @@ public function __construct(
         public ?string $name = null,
         public ?string $description = null,
         public ?string $type = null,
+        public bool $isRequired = true,
     ) {}
 
     public function getName(): ?string
@@ -29,4 +30,9 @@ public function getType(): ?string
     {
         return $this->type;
     }
+
+    public function isRequired(): bool
+    {
+        return $this->isRequired;
+    }
 }

src/Attribute/Query.php

@@ -13,6 +13,7 @@ public function __construct(
         public ?string $name = null,
         public ?string $description = null,
         public ?string $type = null,
+        public bool $isRequired = true,
     ) {}
 
     public function getName(): ?string
@@ -29,4 +30,9 @@ public function getType(): ?string
     {
         return $this->type;
     }
+
+    public function isRequired(): bool
+    {
+        return $this->isRequired;
+    }
 }

src/Attribute/TypedAttribute.php

@@ -7,4 +7,6 @@
 interface TypedAttribute
 {
     public function getType(): ?string;
+
+    public function isRequired(): bool;
 }

src/Parser/NodeParser/Child/ClassFieldNodesParser.php

@@ -8,6 +8,7 @@
 use Jerowork\GraphqlAttributeSchema\Parser\Node\FieldNode;
 use Jerowork\GraphqlAttributeSchema\Parser\Node\FieldNodeType;
 use Jerowork\GraphqlAttributeSchema\Parser\NodeParser\GetTypeTrait;
+use Jerowork\GraphqlAttributeSchema\Parser\NodeParser\IsRequiredTrait;
 use Jerowork\GraphqlAttributeSchema\Parser\NodeParser\ParseException;
 use Jerowork\GraphqlAttributeSchema\Parser\NodeParser\RetrieveNameForFieldTrait;
 use ReflectionClass;
@@ -19,6 +20,7 @@
 {
     use RetrieveNameForFieldTrait;
     use GetTypeTrait;
+    use IsRequiredTrait;
 
     private const array RESERVED_METHOD_NAMES = ['__construct'];
     private const string RETURN_TYPE_VOID = 'void';
@@ -53,7 +55,7 @@ public function parse(ReflectionClass $class): array
                 $this->getType($propertyType, $fieldAttribute),
                 $fieldAttribute->name ?? $property->getName(),
                 $fieldAttribute->description,
-                !$propertyType->allowsNull(),
+                $this->isRequired($propertyType, $fieldAttribute),
                 [],
                 FieldNodeType::Property,
                 null,
@@ -80,7 +82,7 @@ public function parse(ReflectionClass $class): array
                 $this->getType($returnType, $fieldAttribute),
                 $this->retrieveNameForField($method, $fieldAttribute),
                 $fieldAttribute->description,
-                !$returnType->allowsNull(),
+                $this->isRequired($returnType, $fieldAttribute),
                 $this->methodArgNodesParser->parse($method),
                 FieldNodeType::Method,
                 $method->getName(),

src/Parser/NodeParser/Child/MethodArgNodesParser.php

@@ -7,6 +7,7 @@
 use Jerowork\GraphqlAttributeSchema\Attribute\Arg;
 use Jerowork\GraphqlAttributeSchema\Parser\Node\ArgNode;
 use Jerowork\GraphqlAttributeSchema\Parser\NodeParser\GetTypeTrait;
+use Jerowork\GraphqlAttributeSchema\Parser\NodeParser\IsRequiredTrait;
 use Jerowork\GraphqlAttributeSchema\Parser\NodeParser\ParseException;
 use ReflectionMethod;
 use ReflectionParameter;
@@ -15,6 +16,7 @@
 final readonly class MethodArgNodesParser
 {
     use GetTypeTrait;
+    use IsRequiredTrait;
 
     /**
      * @throws ParseException
@@ -37,7 +39,7 @@ public function parse(ReflectionMethod $method): array
                 $this->getType($parameterType, $argAttribute),
                 $argAttribute->name ?? $parameter->getName(),
                 $argAttribute?->description,
-                !$parameterType->allowsNull(),
+                $this->isRequired($parameterType, $argAttribute),
                 $parameter->getName(),
             );
         }

src/Parser/NodeParser/IsRequiredTrait.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Jerowork\GraphqlAttributeSchema\Parser\NodeParser;
+
+use Jerowork\GraphqlAttributeSchema\Attribute\TypedAttribute;
+use ReflectionNamedType;
+
+trait IsRequiredTrait
+{
+    public function isRequired(ReflectionNamedType $type, ?TypedAttribute $attribute): bool
+    {
+        // Retrieve from attribute if set
+        if ($attribute?->getType() !== null) {
+            return $attribute->isRequired();
+        }
+
+        // Retrieve from class
+        return !$type->allowsNull();
+    }
+}

src/Parser/NodeParser/MutationNodeParser.php

@@ -18,6 +18,7 @@
     use RetrieveNameForResolverTrait;
     use GetMethodFromClassTrait;
     use GetTypeTrait;
+    use IsRequiredTrait;
     use GetClassAttributeTrait;
 
     private const string RESOLVER_SUFFIX = 'Mutation';
@@ -55,7 +56,7 @@ public function parse(ReflectionClass $class): Node
             $attribute->getDescription(),
             $this->methodArgNodesParser->parse($method),
             $this->getType($returnType, $attribute),
-            !$returnType->allowsNull(),
+            $this->isRequired($returnType, $attribute),
             $method->getName(),
         );
     }

src/Parser/NodeParser/QueryNodeParser.php

@@ -18,6 +18,7 @@
     use RetrieveNameForResolverTrait;
     use GetMethodFromClassTrait;
     use GetTypeTrait;
+    use IsRequiredTrait;
     use GetClassAttributeTrait;
 
     private const string RESOLVER_SUFFIX = 'Query';
@@ -55,7 +56,7 @@ public function parse(ReflectionClass $class): Node
             $attribute->getDescription(),
             $this->methodArgNodesParser->parse($method),
             $this->getType($returnType, $attribute),
-            !$returnType->allowsNull(),
+            $this->isRequired($returnType, $attribute),
             $method->getName(),
         );
     }