Fix error repathing for object namespaces (#118)

Author: gmac

lib/graphql/stitching/executor/boundary_source.rb

@@ -183,9 +183,7 @@ def repath_errors!(pathed_errors_by_object_id, forward_path, current_path=[], ro
           end
 
         elsif forward_path.any?
-          current_path << index
           repath_errors!(pathed_errors_by_object_id, forward_path, current_path, scope)
-          current_path.pop
 
         elsif scope.is_a?(Array)
           scope.each_with_index do |element, index|

lib/graphql/stitching/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module Stitching
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

test/graphql/stitching/integration/errors_test.rb

@@ -9,22 +9,18 @@ def setup
       "a" => Schemas::Errors::ElementsA,
       "b" => Schemas::Errors::ElementsB,
     })
+  end
 
-    @query = %|
-      query($ids: [ID!]!) {
-        elementsA(ids: $ids) {
+  def test_repaths_root_errors
+    result = plan_and_execute(@supergraph, %|
+      query {
+        elementsA(ids: ["10", "18", "36"]) {
           name
           code
           year
         }
       }
-    |
-  end
-
-  def test_queries_merged_interfaces
-    result = plan_and_execute(@supergraph, @query, {
-      "ids" => ["10", "18", "36"]
-    })
+    |)
 
     expected_data = {
       "elementsA" => [
@@ -50,4 +46,79 @@ def test_queries_merged_interfaces
     assert_equal expected_data, result["data"]
     assert_equal expected_errors, result["errors"]
   end
+
+  def test_repaths_nested_errors_onto_list_source
+    result = plan_and_execute(@supergraph, %|
+      query {
+        elementsA(ids: ["10", "36"]) {
+          name
+          isotopes {
+            name
+            halflife
+          }
+          isotope {
+            name
+            halflife
+          }
+        }
+      }
+    |)
+
+    expected_data = {
+      "elementsA" => [
+        {
+          "name" => "neon",
+          "isotope" => nil,
+          "isotopes" => [nil],
+        },
+        {
+          "name" => "krypton",
+          "isotope" => { "name" => "Kr79", "halflife" => "35d" },
+          "isotopes" => [{ "name" => "Kr79", "halflife" => "35d" }],
+        },
+      ],
+    }
+
+    expected_errors = [
+      { "message" => "Not found", "path" => ["elementsA", 0, "isotopes", 0] },
+      { "message" => "Not found", "path" => ["elementsA", 0, "isotope"] },
+    ]
+
+    assert_equal expected_data, result["data"]
+    assert_equal expected_errors, result["errors"]
+  end
+
+  def test_repaths_nested_errors_onto_object_source
+    result = plan_and_execute(@supergraph, %|
+      query {
+        elementA(id: "10") {
+          name
+          isotopes {
+            name
+            halflife
+          }
+          isotope {
+            name
+            halflife
+          }
+        }
+      }
+    |)
+
+    expected_data = {
+      "elementA" => {
+        "name" => "neon",
+        "isotope" => nil,
+        "isotopes" => [nil],
+      },
+    }
+
+    expected_errors = [
+      { "message" => "Not found", "path" => ["elementA", "isotopes", 0] },
+      { "message" => "Not found", "path" => ["elementA", "isotope"] },
+    ]
+
+    assert_equal expected_data, result["data"]
+    assert_equal expected_errors, result["errors"]
+  end
 end

test/schemas/errors.rb

@@ -9,9 +9,18 @@ class Boundary < GraphQL::Schema::Directive
       repeatable true
     end
 
+    ISOTOPES_A = [
+      { id: '1', name: 'Ne20' },
+      { id: '2', name: 'Kr79' },
+    ].freeze
+
+    ISOTOPES_B = [
+      { id: '2', halflife: '35d' },
+    ].freeze
+
     ELEMENTS_A = [
-      { id: '10', name: 'neon' },
-      { id: '36', name: 'krypton' },
+      { id: '10', name: 'neon', isotopes: [ISOTOPES_A[0]], isotope: ISOTOPES_A[0] },
+      { id: '36', name: 'krypton', isotopes: [ISOTOPES_A[1]], isotope: ISOTOPES_A[1] },
     ].freeze
 
     ELEMENTS_B = [
@@ -20,9 +29,16 @@ class Boundary < GraphQL::Schema::Directive
     ].freeze
 
     class ElementsA < GraphQL::Schema
+      class Isotope < GraphQL::Schema::Object
+        field :id, ID, null: false
+        field :name, String, null: false
+      end
+
       class Element < GraphQL::Schema::Object
         field :id, ID, null: false
         field :name, String, null: false
+        field :isotopes, [Isotope, null: true], null: false
+        field :isotope, Isotope, null: true
       end
 
       class Query < GraphQL::Schema::Object
@@ -36,12 +52,34 @@ def elements_a(ids:)
             ELEMENTS_A.find { _1[:id] == id } || GraphQL::ExecutionError.new("Not found")
           end
         end
+
+        field :element_a, Element, null: true do
+          argument :id, ID, required: true
+        end
+
+        def element_a(id:)
+          ELEMENTS_A.find { _1[:id] == id } || GraphQL::ExecutionError.new("Not found")
+        end
+
+        field :isotope_a, Isotope, null: true do
+          directive Boundary, key: "id"
+          argument :id, ID, required: true
+        end
+
+        def isotope_a(id:)
+          ISOTOPES_A.find { _1[:id] == id } || GraphQL::ExecutionError.new("Not found")
+        end
       end
 
       query Query
     end
 
     class ElementsB < GraphQL::Schema
+      class Isotope < GraphQL::Schema::Object
+        field :id, ID, null: false
+        field :halflife, String, null: false
+      end
+
       class Element < GraphQL::Schema::Object
         field :id, ID, null: false
         field :code, String, null: true
@@ -59,6 +97,15 @@ def elements_b(ids:)
             ELEMENTS_B.find { _1[:id] == id } || GraphQL::ExecutionError.new("Not found")
           end
         end
+
+        field :isotope_b, Isotope, null: true do
+          directive Boundary, key: "id"
+          argument :id, ID, required: true
+        end
+
+        def isotope_b(id:)
+          ISOTOPES_B.find { _1[:id] == id } || GraphQL::ExecutionError.new("Not found")
+        end
       end
 
       query Query