apollo-federation 3.6.5 → 3.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 692e5c372afac970c9f5a9e591cf9ad1857a5ff40d2e40b746dccc05a0ce9bd4
-  data.tar.gz: 18bb8ee23a572b5e6f64c4ec9cda084ccedaa5b43832887f04872e1c1344b903
+  metadata.gz: 37bac5e46b177feadaa9327163e07d68e25789f9bccf0ba6cb112204cab77ccc
+  data.tar.gz: 19a02cf54f5fe7648f77631c564190951944cd68a4a8687e50ee1001559286f9
 SHA512:
-  metadata.gz: 4473e76ef48a7d9051b276943a006f82c6dc5383ec8aeab8bdb29459644e24d3f7ad15cf93495f190740c8f2975d629ffcf270e2585a8ac7c2517c75804f7b12
-  data.tar.gz: 4de1d6d1da82d76b85577e2da70c4301607ab4854d6cb7076f1dd88550fb7ca342930a0a3d5dd91999c6652c5551b22efac532fd301cbe81925ed2f0d5dce54e
+  metadata.gz: fe67ad551e2af8730ed54f7eda506f3d6d3af0b66ca7f1ec3de48a9ddb5c6809b7483b5144511cd62f4ee1c2e788a3e360c1a2d58bf83e38f1e613a581b341ec
+  data.tar.gz: f73c5f3551333026d1ede990f2800a0e406d5b21f23b59d91f06ddc1227ba8ef6ba7db4008f1173a0d46aef8df77c079970c29f3f3446ff49b9eb11f26c4f5ff

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [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)
+
+
+### Bug Fixes
+
+* ApolloFederation::Tracing.should_add_traces() looks for correct headers ([#240](https://github.com/Gusto/apollo-federation-ruby/issues/240)) ([d609977](https://github.com/Gusto/apollo-federation-ruby/commit/d609977869721c168b33e50e3823cd97a7f81ae5))
+
 ## [3.6.5](https://github.com/Gusto/apollo-federation-ruby/compare/v3.6.4...v3.6.5) (2023-04-25)
 
 

data/README.md

@@ -333,7 +333,9 @@ To support [federated tracing](https://www.apollographql.com/docs/apollo-server/
    def execute
      # ...
      context = {
-       tracing_enabled: ApolloFederation::Tracing.should_add_traces(headers)
+       # Pass in the headers from your web framework. For Rails this will be request.headers
+       # but for other frameworks you can pass the Rack env.
+       tracing_enabled: ApolloFederation::Tracing.should_add_traces(request.headers)
      }
      # ...
    end

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/tracing.rb

@@ -2,6 +2,7 @@
 
 module ApolloFederation
   module Tracing
+    HEADER_NAME = 'HTTP_APOLLO_FEDERATION_INCLUDE_TRACE'
     KEY = :ftv1
     DEBUG_KEY = "#{KEY}_debug".to_sym
 
@@ -12,7 +13,7 @@ module ApolloFederation
     end
 
     def should_add_traces(headers)
-      headers && headers['apollo-federation-include-trace'] == KEY.to_s
+      headers && headers[HEADER_NAME] == KEY.to_s
     end
 
     # @deprecated There is no need to call this method. Traces are added to the result automatically

data/lib/apollo-federation/version.rb

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

metadata

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