B2B-2606: Graphql Parser called at least 3 times per request

Author: joanhe

app/code/Magento/GraphQl/Controller/GraphQl.php

@@ -181,22 +181,25 @@ public function dispatch(RequestInterface $request): ResponseInterface
 
         $statusCode = 200;
         $jsonResult = $this->jsonFactory->create();
+        $data = $this->getDataFromRequest($request);
         $result = [];
 
         $schema = null;
         try {
             /** @var Http $request */
             $this->requestProcessor->validateRequest($request);
-            $data = $this->getDataFromRequest($request);
+            $query = $data['query'] ?? '';
+            $parsedQuery = $this->queryParser->parse($query);
+            $data['parsedQuery'] = $parsedQuery;
 
             // We must extract queried field names to avoid instantiation of unnecessary fields in webonyx schema
             // Temporal coupling is required for performance optimization
-            $this->queryFields->setQuery($data['parsedQuery'], $data['variables'] ?? null);
+            $this->queryFields->setQuery($parsedQuery, $data['variables'] ?? null);
             $schema = $this->schemaGenerator->generate();
 
             $result = $this->queryProcessor->process(
                 $schema,
-                $data['parsedQuery'],
+                $parsedQuery,
                 $this->contextFactory->create(),
                 $data['variables'] ?? []
             );
@@ -237,11 +240,9 @@ private function getDataFromRequest(RequestInterface $request): array
             $data['variables'] = is_array($data['variables']) ?
                 $data['variables'] : null;
         } else {
-            $data = [];
+            return [];
         }
-        $query = $data['query'] ?? '';
-        $parsedQuery = $this->queryParser->parse($query);
-        $data['parsedQuery'] = $parsedQuery;
+
         return $data;
     }
 }

app/code/Magento/GraphQl/Helper/Query/Logger/LogData.php

@@ -133,7 +133,7 @@ private function gatherResponseInformation(HttpResponse $response) : array
      * @throws SyntaxError
      * @throws \Exception
      */
-    private function getFieldCount(DocumentNode|string $query): int
+    private function getFieldCount($query): int
     {
         if (!empty($query)) {
             $totalFieldCount = 0;

lib/internal/Magento/Framework/GraphQl/Query/Fields.php

@@ -43,7 +43,7 @@ public function __construct(QueryParser $queryParser = null)
      *
      * @return void
      */
-    public function setQuery(DocumentNode|string $query, array $variables = null)
+    public function setQuery($query, array $variables = null)
     {
         $queryFields = [];
         try {

lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php

@@ -90,7 +90,7 @@ public function execute(): void
      * @param DocumentNode|string $query
      * @throws GraphQlInputException
      */
-    public function validateFieldCount(DocumentNode|string $query): void
+    public function validateFieldCount($query): void
     {
         if (!empty($query)) {
             $totalFieldCount = 0;

lib/internal/Magento/Framework/GraphQl/Query/QueryProcessor.php

@@ -73,7 +73,7 @@ public function __construct(
      */
     public function process(
         Schema $schema,
-        DocumentNode|string $source,
+        $source,
         ContextInterface $contextValue = null,
         array $variableValues = null,
         string $operationName = null