Updated dependencies

composer.json

@@ -14,16 +14,15 @@
   "require": {
     "php": ">=8.1",
     "ext-json": "*",
-    "infinityloop-dev/graphpinator-parser": "^1.1",
-    "infinityloop-dev/graphpinator-common": "^1.2",
-    "infinityloop-dev/utils": "^2.2",
-    "nette/utils": "^3.2",
-    "psr/http-message": "^1.1 || ^2.0",
+    "infinityloop-dev/graphpinator-parser": "^1.2",
+    "infinityloop-dev/graphpinator-common": "^2.0",
+    "infinityloop-dev/utils": "^2.3",
+    "psr/http-message": "^2.0",
     "psr/log": "^3.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^10.0",
-    "infection/infection": "^0.26 || ^0.27",
+    "phpunit/phpunit": "^10.4",
+    "infection/infection": "^0.27",
     "phpstan/phpstan": "^1.10",
     "infinityloop-dev/coding-standard": "^0.2"
   },

src/Exception/Value/InvalidValue.php

@@ -10,9 +10,7 @@ final class InvalidValue extends \Graphpinator\Exception\Value\ValueError
 
     public function __construct(string $type, mixed $rawValue, bool $outputable)
     {
-        $this->messageArgs = [$type, $this->printValue($rawValue)];
-
-        parent::__construct($outputable);
+        parent::__construct($outputable, [$type, $this->printValue($rawValue)]);
     }
 
     private function printValue(mixed $rawValue) : string

src/Exception/Value/ValueError.php

@@ -8,9 +8,10 @@ abstract class ValueError extends \Graphpinator\Exception\GraphpinatorBase
 {
     public function __construct(
         protected bool $outputable,
+        array $messageArgs = [],
     )
     {
-        parent::__construct();
+        parent::__construct($messageArgs);
     }
 
     public function isOutputable() : bool

src/Graphpinator.php

@@ -6,8 +6,6 @@
 
 final class Graphpinator implements \Psr\Log\LoggerAwareInterface
 {
-    use \Nette\SmartObject;
-
     /**
      * Whether Graphpinator should perform schema integrity checks. Disable in production to avoid unnecessary overhead.
      */
@@ -93,9 +91,9 @@ public function run(\Graphpinator\Request\RequestFactory $requestFactory) : \Gra
             $this->logger->log(self::getLogLevel($exception), self::getLogMessage($exception));
 
             return new \Graphpinator\Result(null, [
-                $exception instanceof \Graphpinator\Exception\GraphpinatorBase
-                    ? $exception
-                    : \Graphpinator\Exception\GraphpinatorBase::notOutputableResponse(),
+                $exception instanceof \Graphpinator\Exception\ClientAware
+                    ? self::serializeError($exception)
+                    : self::notOutputableResponse(),
             ]);
         }
     }
@@ -120,4 +118,36 @@ private static function getLogLevel(\Throwable $exception) : string
 
         return \Psr\Log\LogLevel::EMERGENCY;
     }
+
+    private static function serializeError(\Graphpinator\Exception\ClientAware $exception) : array
+    {
+        if (!$exception->isOutputable()) {
+            return self::notOutputableResponse();
+        }
+
+        $result = [
+            'message' => $exception->getMessage(),
+        ];
+
+        if ($exception->getLocation() instanceof \Graphpinator\Common\Location) {
+            $result['locations'] = [$exception->getLocation()];
+        }
+
+        if ($exception->getPath() instanceof \Graphpinator\Common\Path) {
+            $result['path'] = $exception->getPath();
+        }
+
+        if (\is_array($exception->getExtensions())) {
+            $result['extensions'] = $exception->getExtensions();
+        }
+
+        return $result;
+    }
+
+    private static function notOutputableResponse() : array
+    {
+        return [
+            'message' => 'Server responded with unknown error.',
+        ];
+    }
 }

src/Introspection/TypeKindVisitor.php

@@ -6,8 +6,6 @@
 
 final class TypeKindVisitor implements \Graphpinator\Typesystem\Contract\TypeVisitor
 {
-    use \Nette\SmartObject;
-
     public function visitType(\Graphpinator\Typesystem\Type $type) : string
     {
         return TypeKind::OBJECT;

src/Normalizer/Directive/Directive.php

@@ -6,8 +6,6 @@
 
 final class Directive
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private \Graphpinator\Typesystem\Contract\ExecutableDirective $directive,
         private \Graphpinator\Value\ArgumentValueSet $arguments,

src/Normalizer/Exception/DirectiveIncorrectLocation.php

@@ -10,8 +10,6 @@ final class DirectiveIncorrectLocation extends \Graphpinator\Normalizer\Exceptio
 
     public function __construct(string $name)
     {
-        $this->messageArgs = [$name];
-
-        parent::__construct();
+        parent::__construct([$name]);
     }
 }

src/Normalizer/Exception/DirectiveIncorrectUsage.php

@@ -10,8 +10,6 @@ final class DirectiveIncorrectUsage extends \Graphpinator\Normalizer\Exception\N
 
     public function __construct(string $name)
     {
-        $this->messageArgs = [$name];
-
-        parent::__construct();
+        parent::__construct([$name]);
     }
 }

src/Normalizer/Exception/DirectiveNotExecutable.php

@@ -10,8 +10,6 @@ final class DirectiveNotExecutable extends \Graphpinator\Normalizer\Exception\No
 
     public function __construct(string $name)
     {
-        $this->messageArgs = [$name];
-
-        parent::__construct();
+        parent::__construct([$name]);
     }
 }

src/Normalizer/Exception/DuplicatedDirective.php

@@ -10,8 +10,6 @@ final class DuplicatedDirective extends \Graphpinator\Normalizer\Exception\Norma
 
     public function __construct(string $name)
     {
-        $this->messageArgs = [$name];
-
-        parent::__construct();
+        parent::__construct([$name]);
     }
 }

src/Normalizer/Exception/InvalidFragmentType.php

@@ -10,8 +10,6 @@ final class InvalidFragmentType extends \Graphpinator\Normalizer\Exception\Norma
 
     public function __construct(string $childType, string $parentType)
     {
-        $this->messageArgs = [$childType, $parentType];
-
-        parent::__construct();
+        parent::__construct([$childType, $parentType]);
     }
 }

src/Normalizer/Exception/OperationNotSupported.php

@@ -10,8 +10,6 @@ final class OperationNotSupported extends \Graphpinator\Normalizer\Exception\Nor
 
     public function __construct(string $operation)
     {
-        $this->messageArgs = [$operation];
-
-        parent::__construct();
+        parent::__construct([$operation]);
     }
 }

src/Normalizer/Exception/UnknownArgument.php

@@ -10,8 +10,6 @@ final class UnknownArgument extends \Graphpinator\Normalizer\Exception\Normalize
 
     public function __construct(string $argument)
     {
-        $this->messageArgs = [$argument];
-
-        parent::__construct();
+        parent::__construct([$argument]);
     }
 }

src/Normalizer/Exception/UnknownDirective.php

@@ -10,8 +10,6 @@ final class UnknownDirective extends \Graphpinator\Normalizer\Exception\Normaliz
 
     public function __construct(string $name)
     {
-        $this->messageArgs = [$name];
-
-        parent::__construct();
+        parent::__construct([$name]);
     }
 }

src/Normalizer/Exception/UnknownField.php

@@ -10,8 +10,6 @@ final class UnknownField extends \Graphpinator\Normalizer\Exception\NormalizerEr
 
     public function __construct(string $field, string $type)
     {
-        $this->messageArgs = [$field, $type];
-
-        parent::__construct();
+        parent::__construct([$field, $type]);
     }
 }

src/Normalizer/Exception/UnknownFragment.php

@@ -10,8 +10,6 @@ final class UnknownFragment extends \Graphpinator\Normalizer\Exception\Normalize
 
     public function __construct(string $fragmentName)
     {
-        $this->messageArgs = [$fragmentName];
-
-        parent::__construct();
+        parent::__construct([$fragmentName]);
     }
 }

src/Normalizer/Exception/UnknownType.php

@@ -10,8 +10,6 @@ final class UnknownType extends \Graphpinator\Normalizer\Exception\NormalizerErr
 
     public function __construct(string $type)
     {
-        $this->messageArgs = [$type];
-
-        parent::__construct();
+        parent::__construct([$type]);
     }
 }

src/Normalizer/Exception/UnknownVariable.php

@@ -10,8 +10,6 @@ final class UnknownVariable extends \Graphpinator\Normalizer\Exception\Normalize
 
     public function __construct(string $varName)
     {
-        $this->messageArgs = [$varName];
-
-        parent::__construct();
+        parent::__construct([$varName]);
     }
 }

src/Normalizer/Exception/VariableTypeInputable.php

@@ -10,8 +10,6 @@ final class VariableTypeInputable extends \Graphpinator\Normalizer\Exception\Nor
 
     public function __construct(string $name)
     {
-        $this->messageArgs = [$name];
-
-        parent::__construct();
+        parent::__construct([$name]);
     }
 }

src/Normalizer/FinalizedRequest.php

@@ -6,8 +6,6 @@
 
 final class FinalizedRequest
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private \Graphpinator\Normalizer\Operation\Operation $operation,
     )

src/Normalizer/Finalizer.php

@@ -6,8 +6,6 @@
 
 final class Finalizer
 {
-    use \Nette\SmartObject;
-
     private \Graphpinator\Common\Path $path;
 
     public function finalize(NormalizedRequest $normalizedRequest, \stdClass $variables, ?string $operationName) : FinalizedRequest

src/Normalizer/FragmentCycleValidator.php

@@ -6,8 +6,6 @@
 
 final class FragmentCycleValidator
 {
-    use \Nette\SmartObject;
-
     private array $stack = [];
     private array $validated = [];
 

src/Normalizer/GetFieldVisitor.php

@@ -36,7 +36,7 @@ public function visitUnion(\Graphpinator\Typesystem\UnionType $union) : Field
 
     public function visitInput(\Graphpinator\Typesystem\InputType $input) : mixed
     {
-        throw new \Nette\InvalidStateException();
+        throw new \LogicException();
     }
 
     public function visitScalar(\Graphpinator\Typesystem\ScalarType $scalar) : Field

src/Normalizer/NormalizedRequest.php

@@ -6,8 +6,6 @@
 
 final class NormalizedRequest
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private \Graphpinator\Normalizer\Operation\OperationSet $operations,
     )

src/Normalizer/Normalizer.php

@@ -4,15 +4,13 @@
 
 namespace Graphpinator\Normalizer;
 
-use \Graphpinator\Typesystem\Location\ExecutableDirectiveLocation;
+use \Graphpinator\Normalizer\Directive\DirectiveSet;
 use \Graphpinator\Normalizer\Variable\Variable;
 use \Graphpinator\Normalizer\Variable\VariableSet;
-use \Graphpinator\Normalizer\Directive\DirectiveSet;
+use \Graphpinator\Typesystem\Location\ExecutableDirectiveLocation;
 
 final class Normalizer
 {
-    use \Nette\SmartObject;
-
     private \Graphpinator\Common\Path $path;
     private \SplStack $scopeStack;
     private \Graphpinator\Parser\Fragment\FragmentSet $fragmentDefinitions;
@@ -62,9 +60,9 @@ private function normalizeOperation(
     ) : \Graphpinator\Normalizer\Operation\Operation
     {
         $rootObject = match ($operation->getType()) {
-            \Graphpinator\Tokenizer\OperationType::QUERY => $this->schema->getQuery(),
-            \Graphpinator\Tokenizer\OperationType::MUTATION => $this->schema->getMutation(),
-            \Graphpinator\Tokenizer\OperationType::SUBSCRIPTION => $this->schema->getSubscription(),
+            \Graphpinator\Tokenizer\TokenType::QUERY->value => $this->schema->getQuery(),
+            \Graphpinator\Tokenizer\TokenType::MUTATION->value => $this->schema->getMutation(),
+            \Graphpinator\Tokenizer\TokenType::SUBSCRIPTION->value => $this->schema->getSubscription(),
         };
 
         if (!$rootObject instanceof \Graphpinator\Typesystem\Type) {
@@ -321,7 +319,7 @@ private function normalizeFragmentSpread(
             \Graphpinator\Parser\FragmentSpread\InlineFragmentSpread::class =>
                 $this->normalizeInlineFragmentSpread($fragmentSpread),
             default =>
-                throw new \Nette\InvalidStateException(),
+                throw new \LogicException(),
         };
     }
 
@@ -389,7 +387,7 @@ private function normalizeTypeRef(
             \Graphpinator\Parser\TypeRef\NotNullRef::class =>
                 new \Graphpinator\Typesystem\NotNullType($this->normalizeTypeRef($typeRef->getInnerRef())),
             default =>
-                throw new \Nette\InvalidStateException(),
+                throw new \LogicException(),
         };
     }
 

src/Normalizer/Operation/Operation.php

@@ -6,8 +6,6 @@
 
 final class Operation
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private string $type,
         private ?string $name,

src/Normalizer/RefinerModule/DuplicateFieldModule.php

@@ -6,8 +6,6 @@
 
 final class DuplicateFieldModule implements RefinerModule, \Graphpinator\Normalizer\Selection\SelectionVisitor
 {
-    use \Nette\SmartObject;
-
     private array $fieldForName;
     private int $index;
 

src/Normalizer/RefinerModule/DuplicateFragmentSpreadModule.php

@@ -6,8 +6,6 @@
 
 final class DuplicateFragmentSpreadModule implements RefinerModule, \Graphpinator\Normalizer\Selection\SelectionVisitor
 {
-    use \Nette\SmartObject;
-
     private array $visitedFragments;
     private int $index;
 

src/Normalizer/RefinerModule/EmptyFragmentModule.php

@@ -6,8 +6,6 @@
 
 final class EmptyFragmentModule implements RefinerModule, \Graphpinator\Normalizer\Selection\SelectionVisitor
 {
-    use \Nette\SmartObject;
-
     private int $index;
 
     public function __construct(

src/Normalizer/Selection/Field.php

@@ -6,8 +6,6 @@
 
 final class Field implements Selection
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private \Graphpinator\Typesystem\Field\Field $field,
         private string $outputName,