Add includes of parent template, even if overriding the query.

Author: pmelab

modules/graphql_twig/src/GraphQLTemplateTrait.php

@@ -19,19 +19,29 @@ public function getGraphQLQuery() {
     $includes = [];
 
     if ($this instanceof \Twig_Template) {
+      /** @var \Twig_Template $parent */
+      $parent = $this->graphqlParent ? $this->loadTemplate($this->graphqlParent) : NULL;
+
       // If there is no query for this template, try to get one from the
       // parent template.
       if ($this->graphqlQuery) {
         $query = $this->graphqlQuery;
       }
-      elseif ($this->graphqlParent) {
-        $query = $this->loadTemplate($this->graphqlParent)->getGraphQLQuery();
+      elseif ($parent) {
+        $query = $parent->getGraphQLQuery();
       }
 
       // Recursively collect all included fragments.
       $includes = array_map(function ($template) {
         return $this->loadTemplate($template)->getGraphQLQuery();
       }, $this->getGraphQLIncludes());
+
+      // Always add includes from parent templates.
+      if ($parent) {
+        $includes += array_map(function ($template) {
+          return $this->loadTemplate($template)->getGraphQLQuery();
+        }, $parent->getGraphQLIncludes());
+      }
     }
 
 

modules/graphql_twig/tests/src/Unit/GraphQLTwigExtensionTest.php

@@ -28,6 +28,7 @@ function setUp() {
       'dynamic_include' => '{% graphql %}a{% endgraphql %}{% include sub_fragment with { foo: "bar" } %}',
       'fragment' => '{% graphql %}b{% endgraphql %}{% include "sub_fragment" %}',
       'sub_fragment' => '{% graphql %}c{% endgraphql %}',
+      'extend_include' => '{% graphql %}a{% endgraphql %}{% extends "fragment" %}'
     ]));
     $this->twig->addExtension(new GraphQLTwigExtension());
   }
@@ -66,4 +67,8 @@ function testDynamicInclude() {
     $this->assertGraphQLQuery('dynamic_include', "a");
   }
 
+  function testExtendInclude() {
+    $this->assertGraphQLQuery('extend_include', "a\nc");
+  }
+
 }