apollo-federation 3.6.6 → 3.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f68278723526fb35e83d13b471c1fb75461ddf8e292910acf9d864c1a4b8a6e
-  data.tar.gz: e381e8472bfde3eedd714a66d1f10c546b871c7670c4519c692a0b59e5322e23
+  metadata.gz: 26437191f63f4ce0a56dff61e303ffa903ff80df46db23d5840ded158cdef18c
+  data.tar.gz: c19bf4aeb4d78298d0d210ad2078b08d01a8e2fd4de75f5f5d2caccadbaa315d
 SHA512:
-  metadata.gz: 148083333795ac56d528a90a6e508095af5261b5a63621f26b6446e7d8edfc8ac2f81ce779ab913e07977681a2125e145efd86fb4cedbb030dd779a692921bab
-  data.tar.gz: f25fd810613dd4042b39e314cf58fc1919f1065c2aacdde50a33057ba93a53f5f7ed950be800c94c2fb9e07a24ffa78399cd7951e777f6345aeb2b539a12a7cd
+  metadata.gz: '079095e454e865dfceacb37c16e3ce64a23d59f5d937aa8668f7264b8f89ade841df7104b547ced1e4c353f3f81457e793882087b30baaad7d82ffb7c2ce8524'
+  data.tar.gz: 79e15b6604c5f127e0948f4641c8530e4c538a5a587c6fb944a9b5ad874cb3564baf077dba26f1321fbe0580e61d0a157743cbbebfd1874e682c15a250e2dc8b

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.6.8](https://github.com/Gusto/apollo-federation-ruby/compare/v3.6.7...v3.6.8) (2023-05-22)
+
+
+### Bug Fixes
+
+* include inherited types in generated _Entity union ([#247](https://github.com/Gusto/apollo-federation-ruby/issues/247)) ([c377785](https://github.com/Gusto/apollo-federation-ruby/commit/c377785466736114d17beda8b6e27c2e0a56eb75))
+
+## [3.6.7](https://github.com/Gusto/apollo-federation-ruby/compare/v3.6.6...v3.6.7) (2023-05-18)
+
+
+### Bug Fixes
+
+* call `resolve_references` once per `__typename` ([#244](https://github.com/Gusto/apollo-federation-ruby/issues/244)) ([c21715d](https://github.com/Gusto/apollo-federation-ruby/commit/c21715d28b67764a078b4daefdfe490f50171817))
+
 ## [3.6.6](https://github.com/Gusto/apollo-federation-ruby/compare/v3.6.5...v3.6.6) (2023-04-26)
 
 

data/lib/apollo-federation/entities_field.rb

@@ -27,9 +27,17 @@ module ApolloFederation
     end
 
     def _entities(representations:)
-      chunked_references = representations.chunk { |r| r[:__typename] }
+      final_result = Array.new(representations.size)
+      grouped_references_with_indices =
+        representations
+        .map
+        .with_index { |r, i| [r, i] }
+        .group_by { |(r, _i)| r[:__typename] }
+
+      grouped_references_with_indices.each do |typename, references_with_indices|
+        references = references_with_indices.map(&:first)
+        indices = references_with_indices.map(&:last)
 
-      chunked_references.flat_map do |typename, references|
         # TODO: Use warden or schema?
         type = context.warden.get_type(typename)
         if type.nil? || type.kind != GraphQL::TypeKinds::OBJECT
@@ -49,8 +57,10 @@ module ApolloFederation
           results = references
         end
 
-        results.map do |result|
-          context.schema.after_lazy(result) do |resolved_value|
+        results_with_indices = results.zip(indices)
+
+        results_with_indices.each do |result, i|
+          final_result[i] = context.schema.after_lazy(result) do |resolved_value|
             # TODO: This isn't 100% correct: if (for some reason) 2 different resolve_reference
             # calls return the same object, it might not have the right type
             # Right now, apollo-federation just adds a __typename property to the result,
@@ -60,6 +70,8 @@ module ApolloFederation
           end
         end
       end
+
+      final_result
     end
 
     private

data/lib/apollo-federation/schema.rb

@@ -77,7 +77,7 @@ module ApolloFederation
         types_schema = Class.new(self)
         # Add the original query objects to the types. We have to use orphan_types here to avoid
         # infinite recursion
-        types_schema.orphan_types(@orig_query_object)
+        types_schema.orphan_types(original_query)
 
         # Walk through all of the types and determine which ones are entities (any type with a
         # "key" directive)

data/lib/apollo-federation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ApolloFederation
-  VERSION = '3.6.6'
+  VERSION = '3.6.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apollo-federation
 version: !ruby/object:Gem::Version
-  version: 3.6.6
+  version: 3.6.8
 platform: ruby
 authors:
 - Noa Elad
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-26 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql