optimize Tokenizer for efficient location stripping

optimize Executor and Values helper for fast directive checking

Author: joonlabs

src/Execution/Executor.php

@@ -200,6 +200,7 @@ private function doesFragmentConditionMatch(ExecutionContext $executionContext,
      * @param ExecutionContext $executionContext
      * @param $node
      * @return bool
+     * @throws GraphQLError
      */
     private function shouldIncludeNode(ExecutionContext $executionContext, $node): bool
     {
@@ -255,10 +256,6 @@ public function executeFields(ExecutionContext $executionContext, GraphQLObjectT
                 $fieldPath
             );
 
-            /*if ($result === null) {
-                return $results;
-            }*/
-
             $results[$responseName] = $result;
             return $results;
         }, $initial);
@@ -643,6 +640,7 @@ private function buildResolveInfo(ExecutionContext $executionContext, GraphQLTyp
      * @param GraphQLObjectType $parentType
      * @param string $fieldName
      * @return mixed|null
+     * @throws \GraphQL\Errors\BadImplementationError
      */
     private function getFieldDef(Schema $schema, GraphQLObjectType $parentType, string $fieldName)
     {

src/Execution/Values.php

@@ -96,6 +96,10 @@ public static function coerceVariableValues(Schema $schema, array $variableDefin
      */
     public static function getDirectiveValues(GraphQLDirective $directiveDef, $node, $variableValues): ?array
     {
+        // skip check for directives if no directives wanted
+        if(empty($node["directives"]))
+            return null;
+
         $directiveNode = array_filter($node["directives"], function ($directive) use ($directiveDef) {
                 return $directive["name"]["value"] == $directiveDef->getName();
             })[0] ?? null;

src/Parser/Tokenizer.php

@@ -2,6 +2,7 @@
 
 namespace GraphQL\Parser;
 
+use GraphQL\Errors\GraphQLError;
 use GraphQL\Errors\UnexpectedTokenError;
 
 /**
@@ -13,9 +14,17 @@ class Tokenizer
     private $string = "";
     private $cursor = 0;
 
+    private $location = [
+        "line" => 1,
+        "column" => 1
+    ];
     private $locationHistory = [];
 
     private $spec = [
+        // --------------------------------------------
+        // New-Line(s):
+        ['/^\n+/', "NL"],
+
         // --------------------------------------------
         // Whitespace(s):
         ['/^\s+/', null],
@@ -120,8 +129,16 @@ public function getNextToken(): ?array
                 continue;
             }
 
-            // this token can be skipped, e.g. whitespace
+            // this token can be skipped (newline)
+            if ($tokenType === "NL") {
+                $this->location["line"] += strlen($tokenValue);
+                $this->location["column"] = 1;
+                return $this->getNextToken();
+            }
+
+            // this token can be skipped, e.g. whitespace or comment
             if ($tokenType === null) {
+                $this->location["column"] += strlen($tokenValue);
                 return $this->getNextToken();
             }
 
@@ -165,6 +182,7 @@ public function match(string $regexp, string $string)
         }
 
         $this->cursor += strlen($matches[0]); // add matched length to cursor
+
         return $matches[0];
     }
 
@@ -175,20 +193,7 @@ public function match(string $regexp, string $string)
      */
     public function getLocation(): array
     {
-        $location = [
-            "line" => 1,
-            "column" => 1,
-        ];
-        for ($i = 0; $i < $this->cursor; $i++) {
-            if ($this->string[$i] === "\n") {
-                $location["line"]++;
-                $location["column"] = 1;
-            } else {
-                $location["column"]++;
-            }
-        }
-
-        return $location;
+        return $this->location;
     }
 
     /**
@@ -199,7 +204,8 @@ public function getLocation(): array
     public function getLastLocation()
     {
         $historyLength = count($this->locationHistory);
-        if ($historyLength <= 1) return $this->getLocation();
+        if ($historyLength <= 1)
+            return $this->getLocation();
         return $this->locationHistory[$historyLength - 1];
     }