Updated dependencies, improved parsing of type references

graphpql · Nov 10, 2023 · 445f216 · 445f216
1 parent f328eb0
commit 445f216
Show file tree

Hide file tree

Showing 27 changed files with 399 additions and 636 deletions.
diff --git a/composer.json b/composer.json
@@ -13,15 +13,14 @@
   ],
   "require": {
     "php": ">=8.0",
-    "infinityloop-dev/graphpinator-tokenizer": "^1.1.1",
-    "infinityloop-dev/graphpinator-common": "^1.1",
-    "infinityloop-dev/utils": "^2.0",
-    "nette/utils": "^3.0"
+    "infinityloop-dev/graphpinator-tokenizer": "^1.2",
+    "infinityloop-dev/graphpinator-common": "^2.0",
+    "infinityloop-dev/utils": "^2.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.3",
-    "infection/infection": "^0.26",
-    "phpstan/phpstan": "^1.0",
+    "phpunit/phpunit": "^10.4",
+    "infection/infection": "^0.27",
+    "phpstan/phpstan": "^1.10",
     "infinityloop-dev/coding-standard": "^0.2"
   },
   "scripts": {

diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage>
     <report>
       <clover outputFile="./build/phpunit.clover.xml"/>
       <html outputDirectory="./build/html" lowUpperBound="50" highLowerBound="90"/>
@@ -18,4 +15,9 @@
   <logging>
     <junit outputFile="./build/logfile.xml"/>
   </logging>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/src/Directive/Directive.php b/src/Directive/Directive.php
@@ -6,8 +6,6 @@
 
 final class Directive
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private string $name,
         private ?\Graphpinator\Parser\Value\ArgumentValueSet $arguments,

diff --git a/src/Exception/DuplicateArgument.php b/src/Exception/DuplicateArgument.php
@@ -10,8 +10,6 @@ final class DuplicateArgument extends \Graphpinator\Parser\Exception\ParserError
 
     public function __construct(string $name, \Graphpinator\Common\Location $location)
     {
-        $this->messageArgs = [$name];
-
-        parent::__construct($location);
+        parent::__construct($location, [$name]);
     }
 }
diff --git a/src/Exception/ExpectedError.php b/src/Exception/ExpectedError.php
@@ -6,10 +6,8 @@
 
 abstract class ExpectedError extends \Graphpinator\Parser\Exception\ParserError
 {
-    final public function __construct(\Graphpinator\Common\Location $location, string $token)
+    final public function __construct(\Graphpinator\Common\Location $location, \Graphpinator\Tokenizer\TokenType $token)
     {
-        $this->messageArgs[] = $token;
-
-        parent::__construct($location);
+        parent::__construct($location, [$token->value]);
     }
 }
diff --git a/src/Exception/ParserError.php b/src/Exception/ParserError.php
@@ -6,11 +6,11 @@
 
 abstract class ParserError extends \Graphpinator\Exception\GraphpinatorBase
 {
-    public function __construct(\Graphpinator\Common\Location $location)
+    public function __construct(\Graphpinator\Common\Location $location, array $messageArgs = [])
     {
-        parent::__construct();
+        parent::__construct($messageArgs);
 
-        $this->location = $location;
+        $this->setLocation($location);
     }
 
     final public function isOutputable() : bool

diff --git a/src/Field/Field.php b/src/Field/Field.php
@@ -6,8 +6,6 @@
 
 final class Field
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private string $name,
         private ?string $alias = null,

diff --git a/src/Fragment/Fragment.php b/src/Fragment/Fragment.php
@@ -6,8 +6,6 @@
 
 final class Fragment
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private string $name,
         private \Graphpinator\Parser\TypeRef\NamedTypeRef $typeCond,

diff --git a/src/FragmentSpread/InlineFragmentSpread.php b/src/FragmentSpread/InlineFragmentSpread.php
@@ -6,8 +6,6 @@
 
 final class InlineFragmentSpread implements \Graphpinator\Parser\FragmentSpread\FragmentSpread
 {
-    use \Nette\SmartObject;
-
     private \Graphpinator\Parser\Directive\DirectiveSet $directives;
 
     public function __construct(

diff --git a/src/FragmentSpread/NamedFragmentSpread.php b/src/FragmentSpread/NamedFragmentSpread.php
@@ -6,8 +6,6 @@
 
 final class NamedFragmentSpread implements \Graphpinator\Parser\FragmentSpread\FragmentSpread
 {
-    use \Nette\SmartObject;
-
     private \Graphpinator\Parser\Directive\DirectiveSet $directives;
 
     public function __construct(

diff --git a/src/Operation/Operation.php b/src/Operation/Operation.php
@@ -6,8 +6,6 @@
 
 final class Operation
 {
-    use \Nette\SmartObject;
-
     private ?\Graphpinator\Parser\Variable\VariableSet $variables;
     private ?\Graphpinator\Parser\Directive\DirectiveSet $directives;
 

diff --git a/src/ParsedRequest.php b/src/ParsedRequest.php
@@ -6,8 +6,6 @@
 
 final class ParsedRequest
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private \Graphpinator\Parser\Operation\OperationSet $operations,
         private \Graphpinator\Parser\Fragment\FragmentSet $fragments,

diff --git a/src/Parser.php b/src/Parser.php
@@ -8,8 +8,6 @@
 
 final class Parser
 {
-    use \Nette\SmartObject;
-
     private \Graphpinator\Parser\TokenContainer $tokenizer;
 
     /**
@@ -43,7 +41,7 @@ public function parse(\Graphpinator\Source\Source $source) : ParsedRequest
                 // query shorthand
                 case TokenType::CUR_O:
                     $operation = new \Graphpinator\Parser\Operation\Operation(
-                        \Graphpinator\Tokenizer\OperationType::QUERY,
+                        \Graphpinator\Tokenizer\TokenType::QUERY->value,
                         null,
                         new \Graphpinator\Parser\Variable\VariableSet(),
                         new \Graphpinator\Parser\Directive\DirectiveSet(),
@@ -57,14 +55,14 @@ public function parse(\Graphpinator\Source\Source $source) : ParsedRequest
                     break;
                 case TokenType::NAME:
                     switch ($this->tokenizer->getCurrent()->getValue()) {
-                        case TokenType::FRAGMENT:
+                        case TokenType::FRAGMENT->value:
                             $fragment = $this->parseFragmentDefinition();
                             $fragments[$fragment->getName()] = $fragment;
 
                             break;
-                        case TokenType::QUERY:
-                        case TokenType::MUTATION:
-                        case TokenType::SUBSCRIPTION:
+                        case TokenType::QUERY->value:
+                        case TokenType::MUTATION->value:
+                        case TokenType::SUBSCRIPTION->value:
                             $operationType = $this->tokenizer->getCurrent()->getValue();
                             $this->tokenizer->getNext();
 
@@ -125,12 +123,12 @@ private function parseFragmentDefinition() : \Graphpinator\Parser\Fragment\Fragm
     {
         $fragmentName = $this->tokenizer->assertNext(TokenType::NAME, \Graphpinator\Parser\Exception\ExpectedFragmentName::class)->getValue();
 
-        if ($fragmentName === TokenType::ON) {
+        if ($fragmentName === TokenType::ON->value) {
             throw new \Graphpinator\Parser\Exception\DisallowedFragmentName($this->tokenizer->getPrev()->getLocation());
         }
 
-        $this->tokenizer->assertNextValue(TokenType::NAME, TokenType::ON, \Graphpinator\Parser\Exception\ExpectedTypeCondition::class);
-        $typeCond = $this->parseType(true);
+        $this->tokenizer->assertNextValue(TokenType::NAME, TokenType::ON->value, \Graphpinator\Parser\Exception\ExpectedTypeCondition::class);
+        $typeCond = $this->parseNamedType();
         $directives = $this->parseDirectives();
         $this->tokenizer->assertNext(TokenType::CUR_O, \Graphpinator\Parser\Exception\ExpectedSelectionSet::class);
 
@@ -276,8 +274,8 @@ private function parseFragmentSpread() : \Graphpinator\Parser\FragmentSpread\Fra
     {
         switch ($this->tokenizer->getNext()->getType()) {
             case TokenType::NAME:
-                if ($this->tokenizer->getCurrent()->getValue() === TokenType::ON) {
-                    $typeCond = $this->parseType(true);
+                if ($this->tokenizer->getCurrent()->getValue() === TokenType::ON->value) {
+                    $typeCond = $this->parseNamedType();
                     $directives = $this->parseDirectives();
                     $this->tokenizer->assertNext(TokenType::CUR_O, \Graphpinator\Parser\Exception\ExpectedSelectionSet::class);
 
@@ -435,9 +433,9 @@ private function parseValue(bool $literalOnly) : \Graphpinator\Parser\Value\Valu
                 return new \Graphpinator\Parser\Value\VariableRef($this->tokenizer->getCurrent()->getValue());
             case TokenType::NAME:
                 return match ($this->tokenizer->getCurrent()->getValue()) {
-                    TokenType::TRUE => new \Graphpinator\Parser\Value\Literal(true),
-                    TokenType::FALSE => new \Graphpinator\Parser\Value\Literal(false),
-                    TokenType::NULL => new \Graphpinator\Parser\Value\Literal(null),
+                    TokenType::TRUE->value => new \Graphpinator\Parser\Value\Literal(true),
+                    TokenType::FALSE->value => new \Graphpinator\Parser\Value\Literal(false),
+                    TokenType::NULL->value => new \Graphpinator\Parser\Value\Literal(null),
                     default => new \Graphpinator\Parser\Value\EnumLiteral($this->tokenizer->getCurrent()->getValue()),
                 };
             case TokenType::STRING:
@@ -477,14 +475,13 @@ private function parseValue(bool $literalOnly) : \Graphpinator\Parser\Value\Valu
     }
 
     /**
-     * Parses type reference.
+     * Parses type reference with modifiers.
      *
      * Expects iterator on previous token
      * Leaves iterator to last used token - last token in type definition
      *
-     * @param bool $namedOnly
      */
-    private function parseType(bool $namedOnly) : \Graphpinator\Parser\TypeRef\TypeRef
+    private function parseType() : \Graphpinator\Parser\TypeRef\TypeRef
     {
         switch ($this->tokenizer->getNext()->getType()) {
             case TokenType::NAME:
@@ -509,13 +506,25 @@ private function parseType(bool $namedOnly) : \Graphpinator\Parser\TypeRef\TypeR
             $type = new \Graphpinator\Parser\TypeRef\NotNullRef($type);
         }
 
-        if ($namedOnly && !$type instanceof \Graphpinator\Parser\TypeRef\NamedTypeRef) {
+        return $type;
+    }
+
+    /**
+     * Parses type reference without modifiers
+     *
+     * Expects iterator on previous token
+     * Leaves iterator to last used token - last token in type definition
+     *
+     */
+    private function parseNamedType() : \Graphpinator\Parser\TypeRef\NamedTypeRef
+    {
+        if ($this->tokenizer->getNext()->getType() !== TokenType::NAME) {
             throw new \Graphpinator\Parser\Exception\ExpectedNamedType(
                 $this->tokenizer->getCurrent()->getLocation(),
-                $type->print(),
+                $this->tokenizer->getCurrent()->getType(),
             );
         }
 
-        return $type;
+        return new \Graphpinator\Parser\TypeRef\NamedTypeRef($this->tokenizer->getCurrent()->getValue());
     }
 }
diff --git a/src/TokenContainer.php b/src/TokenContainer.php
@@ -4,10 +4,10 @@
 
 namespace Graphpinator\Parser;
 
+use \Graphpinator\Tokenizer\Token;
+
 final class TokenContainer implements \IteratorAggregate
 {
-    use \Nette\SmartObject;
-
     private array $tokens = [];
     private int $currentIndex = 0;
 
@@ -30,12 +30,12 @@ public function isEmpty() : bool
         return \count($this->tokens) === 0;
     }
 
-    public function getCurrent() : \Graphpinator\Tokenizer\Token
+    public function getCurrent() : Token
     {
         return $this->tokens[$this->currentIndex];
     }
 
-    public function getPrev() : \Graphpinator\Tokenizer\Token
+    public function getPrev() : Token
     {
         \assert(\array_key_exists($this->currentIndex - 1, $this->tokens));
 
@@ -44,7 +44,7 @@ public function getPrev() : \Graphpinator\Tokenizer\Token
         return $this->tokens[$this->currentIndex];
     }
 
-    public function getNext() : \Graphpinator\Tokenizer\Token
+    public function getNext() : Token
     {
         if (!$this->hasNext()) {
             throw new \Graphpinator\Parser\Exception\UnexpectedEnd($this->getCurrent()->getLocation());
@@ -55,7 +55,7 @@ public function getNext() : \Graphpinator\Tokenizer\Token
         return $this->tokens[$this->currentIndex];
     }
 
-    public function peekNext() : \Graphpinator\Tokenizer\Token
+    public function peekNext() : Token
     {
         if (!$this->hasNext()) {
             throw new \Graphpinator\Parser\Exception\UnexpectedEnd($this->getCurrent()->getLocation());
@@ -64,7 +64,7 @@ public function peekNext() : \Graphpinator\Tokenizer\Token
         return $this->tokens[$this->currentIndex + 1];
     }
 
-    public function assertNext(string $tokenType, string $exceptionClass) : \Graphpinator\Tokenizer\Token
+    public function assertNext(\Graphpinator\Tokenizer\TokenType $tokenType, string $exceptionClass) : Token
     {
         $token = $this->getNext();
 
@@ -75,7 +75,7 @@ public function assertNext(string $tokenType, string $exceptionClass) : \Graphpi
         throw new $exceptionClass($token->getLocation(), $token->getType());
     }
 
-    public function assertNextValue(string $tokenType, string $value, string $exceptionClass) : \Graphpinator\Tokenizer\Token
+    public function assertNextValue(\Graphpinator\Tokenizer\TokenType $tokenType, string $value, string $exceptionClass) : Token
     {
         $token = $this->getNext();
 

diff --git a/src/TypeRef/ListTypeRef.php b/src/TypeRef/ListTypeRef.php
@@ -6,8 +6,6 @@
 
 final class ListTypeRef implements \Graphpinator\Parser\TypeRef\TypeRef
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private TypeRef $innerRef,
     )

diff --git a/src/TypeRef/NamedTypeRef.php b/src/TypeRef/NamedTypeRef.php
@@ -6,8 +6,6 @@
 
 final class NamedTypeRef implements \Graphpinator\Parser\TypeRef\TypeRef
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private string $name,
     )

diff --git a/src/TypeRef/NotNullRef.php b/src/TypeRef/NotNullRef.php
@@ -6,8 +6,6 @@
 
 final class NotNullRef implements \Graphpinator\Parser\TypeRef\TypeRef
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private TypeRef $innerRef,
     )

diff --git a/src/Value/ArgumentValue.php b/src/Value/ArgumentValue.php
@@ -6,8 +6,6 @@
 
 final class ArgumentValue
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private \Graphpinator\Parser\Value\Value $value,
         private string $name,

diff --git a/src/Value/EnumLiteral.php b/src/Value/EnumLiteral.php
@@ -6,8 +6,6 @@
 
 final class EnumLiteral implements \Graphpinator\Parser\Value\Value
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private string $value,
     )

diff --git a/src/Value/ListVal.php b/src/Value/ListVal.php
@@ -6,8 +6,6 @@
 
 final class ListVal implements \Graphpinator\Parser\Value\Value
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private array $value,
     )

diff --git a/src/Value/Literal.php b/src/Value/Literal.php
@@ -6,8 +6,6 @@
 
 final class Literal implements \Graphpinator\Parser\Value\Value
 {
-    use \Nette\SmartObject;
-
     public function __construct(
         private string|int|float|bool|null $value,
     )