graphql-stitching 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f7587a903fe54feeffe79deb25fdcf341f13af67b46f896003dfdba861cb614
-  data.tar.gz: 191ff2274244d23b16325579792fd07310bf5b3fc3cc1a2b20e7b30305456851
+  metadata.gz: 10489fd6a8670d5a23a7afa132d7941a242848783f3697a4d3ddd519b208a4d8
+  data.tar.gz: 7a2e8dda124bdc6e96da43e1a4ed64bbb4baeaf0065f6d8411edaeba2c52e064
 SHA512:
-  metadata.gz: 7fd408963db10a7bfdfc272987a793353a190a191eb5de264a1a6a0ccd7e80293605bb57e85c70c52f66a3cd646b966930741b938ca231146f527704b524f0a1
-  data.tar.gz: 1857a8492545cc4d7da64c541c897bb14e898c391edf271baf54a5e39369d8f387d80500c40fc591726c2dcb06fcce3f1164a9680f266e9a22494da577076648
+  metadata.gz: 4c9243880e3b41fcede7fddb5947a962f1d4c43882ba07cc0ab63d1ba154527ef4cc8e5cc130bb2524b40fcbe093ecfd2f3b8fb0bafc9a2a7324050c30d2af00
+  data.tar.gz: a2b37c3ab8b98065a0910a458e177b71576c5d8f52c6f6eba0e31d25ae7797f1517a168aeef2f39c7295d27e4f981373b7a90066dc7ab8651670ecbd41fc70d5

data/README.md

@@ -305,13 +305,13 @@ class MyExecutable
 end
 ```
 
-A [Supergraph](./docs/supergraph.md) is composed with executable resource provided for each location. Any location that omits the `executable` option will use the provided `schema` as the default executable:
+A [Supergraph](./docs/supergraph.md) is composed with executable resources provided for each location. Any location that omits the `executable` option will use the provided `schema` as its default executable:
 
 ```ruby
 supergraph = GraphQL::Stitching::Composer.new.perform({
   first: {
     schema: FirstSchema,
-    # executable: ^^^^^ delegates to FirstSchema,
+    # executable:^^^^^^ delegates to FirstSchema,
   },
   second: {
     schema: SecondSchema,

data/lib/graphql/stitching/planner.rb

@@ -53,18 +53,16 @@ module GraphQL
 
         when "mutation"
           parent_type = @supergraph.schema.mutation
-          location_groups = []
 
-          @request.operation.selections.reduce(nil) do |last_location, node|
+          location_groups = @request.operation.selections.each_with_object([]) do |node, memo|
             # root fields currently just delegate to the last location that defined them; this should probably be smarter
             next_location = @supergraph.locations_by_type_and_field[parent_type.graphql_name][node.name].last
 
-            if next_location != last_location
-              location_groups << { location: next_location, selections: [] }
+            if memo.none? || memo.last[:location] != next_location
+              memo << { location: next_location, selections: [] }
             end
 
-            location_groups.last[:selections] << node
-            next_location
+            memo.last[:selections] << node
           end
 
           location_groups.reduce(0) do |after_key, group|
@@ -144,7 +142,7 @@ module GraphQL
         implements_fragments = false
 
         if parent_type.kind.interface?
-          expand_interface_selections(current_location, parent_type, input_selections)
+          input_selections = expand_interface_selections(current_location, parent_type, input_selections)
         end
 
         input_selections.each do |node|
@@ -328,8 +326,8 @@ module GraphQL
         local_interface_fields = @supergraph.fields_by_type_and_location[parent_type.graphql_name][current_location]
 
         expanded_selections = nil
-        input_selections.reject! do |node|
-          if node.is_a?(GraphQL::Language::Nodes::Field) && !local_interface_fields.include?(node.name)
+        input_selections = input_selections.reject do |node|
+          if node.is_a?(GraphQL::Language::Nodes::Field) && node.name != "__typename" && !local_interface_fields.include?(node.name)
             expanded_selections ||= []
             expanded_selections << node
             true
@@ -344,6 +342,8 @@ module GraphQL
             input_selections << GraphQL::Language::Nodes::InlineFragment.new(type: type_name, selections: expanded_selections)
           end
         end
+
+        input_selections
       end
 
       # expand concrete type selections into typed fragments when sending to abstract boundaries

data/lib/graphql/stitching/shaper.rb

@@ -42,15 +42,16 @@ module GraphQL
             return nil if raw_object[field_name].nil? && node_type.non_null?
 
           when GraphQL::Language::Nodes::InlineFragment
-            next unless typename == node.type.name
             fragment_type = @schema.types[node.type.name]
+            next unless fragment_matches_typename?(fragment_type, typename)
+
             result = resolve_object_scope(raw_object, fragment_type, node.selections, typename)
             return nil if result.nil?
 
           when GraphQL::Language::Nodes::FragmentSpread
             fragment = @request.fragment_definitions[node.name]
             fragment_type = @schema.types[fragment.type.name]
-            next unless typename == fragment_type.graphql_name
+            next unless fragment_matches_typename?(fragment_type, typename)
 
             result = resolve_object_scope(raw_object, fragment_type, fragment.selections, typename)
             return nil if result.nil?
@@ -91,6 +92,11 @@ module GraphQL
 
         resolved_list
       end
+
+      def fragment_matches_typename?(fragment_type, typename)
+        return true if fragment_type.graphql_name == typename
+        fragment_type.kind.interface? && @schema.possible_types(fragment_type).any? { _1.graphql_name == typename }
+      end
     end
   end
 end

data/lib/graphql/stitching/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module Stitching
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-stitching
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Greg MacWilliam
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql