apollo-federation 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a3acf99a330df8e02ac0217773a9443b400d97a1ad47ed518a2f5631499711f
-  data.tar.gz: f9482d80b73b9ba0396fc51676a1ab28a12910c6a7fc3b7666421efff705a1ef
+  metadata.gz: f4104a6574a535d062fe70d793bfa1b3c9099adfc8a1ecc5eeed79d296f1386b
+  data.tar.gz: d459803bca66e82aa00dc93c86efd63740a5e5531b33b18419bb246846d10a52
 SHA512:
-  metadata.gz: 10f57a06a03f32dec83f3fbbd293c695a8019914b577b5ae25e6fedd86fa0d0e27be640ccc9261a5fed2f22154535e39d9d9408bfd16cce016ff2bd9cea7beda
-  data.tar.gz: c7bc892658495ae8576159aa0c14be88837744bfde4dbcd30acb15b443eb817b17400e49f8cd46c59e161ac5975374e84f5405bb30eb8f0280fd80dc2a646f51
+  metadata.gz: 64ae19c9756916d3157158866f3a44cfc75644bba283aa9143237ba644c9ea2ffd6e0c91ca17dc558414a61867d04bbe8f379fee3d0a28f1f0b66298d1fb6e5d
+  data.tar.gz: 8c7789e315d9e68bf0c3fb1711c9a6463611bb335cfd970be5eb989a7c6ebf92c15ece86464670301e43c6978d7cb5eae3161a9841f40f0e278e0a7cba234f1f

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [3.7.1](https://github.com/Gusto/apollo-federation-ruby/compare/v3.7.0...v3.7.1) (2023-06-01)
+
+
+### Bug Fixes
+
+* handle lazy `resolve_references` return values ([#250](https://github.com/Gusto/apollo-federation-ruby/issues/250)) ([e29b155](https://github.com/Gusto/apollo-federation-ruby/commit/e29b15550d48093c6ed5b73dabb8206a3e9463b0))
+* handle lazy `resolve_references` return values ([#250](https://github.com/Gusto/apollo-federation-ruby/issues/250)) ([1614440](https://github.com/Gusto/apollo-federation-ruby/commit/16144402d32de3d5016023b87fc2b949364761f5))
+* handle lazy resolve_references return values ([#250](https://github.com/Gusto/apollo-federation-ruby/issues/250)) ([fa72465](https://github.com/Gusto/apollo-federation-ruby/commit/fa72465bd5f1d38f3556b748b905f16f932829ac))
+
 # [3.7.0](https://github.com/Gusto/apollo-federation-ruby/compare/v3.6.9...v3.7.0) (2023-05-26)
 
 

data/lib/apollo-federation/entities_field.rb

@@ -34,7 +34,7 @@ module ApolloFederation
         .with_index { |r, i| [r, i] }
         .group_by { |(r, _i)| r[:__typename] }
 
-      grouped_references_with_indices.each do |typename, references_with_indices|
+      maybe_lazies = grouped_references_with_indices.map do |typename, references_with_indices|
         references = references_with_indices.map(&:first)
         indices = references_with_indices.map(&:last)
 
@@ -57,21 +57,25 @@ module ApolloFederation
           results = references
         end
 
-        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,
-            # but I don't really like the idea of modifying the resolved object
-            context[resolved_value] = type
-            resolved_value
+        context.schema.after_lazy(results) do |resolved_results|
+          resolved_results.zip(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,
+              # but I don't really like the idea of modifying the resolved object
+              context[resolved_value] = type
+              resolved_value
+            end
           end
         end
       end
 
-      final_result
+      # Make sure we've resolved the outer level of lazies so we can return an array with a possibly lazy
+      # entry for each requested entity
+      GraphQL::Execution::Lazy.all(maybe_lazies).then do
+        final_result
+      end
     end
 
     private

data/lib/apollo-federation/version.rb

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

metadata

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