apollo-federation 3.10.1 → 3.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f380edb23cd987294131a8517dc4d08331ebbbde711192baf759598c2d5ad733
-  data.tar.gz: ffee0d8e1d99f79ac7ba82f5f50a0d107e5b3a775ef8a9d6aff8e74f0896b221
+  metadata.gz: 0b6e50afd09ae68365aa079f13a4e53ad681628d8a537166985d4da3eb6ef6ce
+  data.tar.gz: 8af107ff7dd73927fd241ad852916924ffe131db58da81facb37c8f75c88c95d
 SHA512:
-  metadata.gz: 70e9f855c9a6284d23e69e27c85f8b4d9d85a2e93ac328a134260f3eb7328f9f3629bed1fd0acc6965d9272cadb3d7b59fbf30f1039359ddcb074074d1a0c599
-  data.tar.gz: 5d8bf20436400d80fa0f83f05aa37c3eb82d8525364ecc31e51b71ee16184cb5c8e3524ff236c001fd005191b5615ed38cbc2b2bb9ed10522c0892be99f6f5d8
+  metadata.gz: 742d3beea298bcac5bad03cd49181f587735d1a42e08d4fd1fb31b2ddcb5d948c30be2c6cbd24d453d8922e5992d9a225f314fb96ad6c5260369a86d84adb5ac
+  data.tar.gz: bc802e2a591d2c902c972f566362904b156054af8afe1800c1b861c1d2d062fbe552940f69d6814950c481fe06a839ed0e787c8edc49867dab90c1b288a0b28f

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+## [3.10.3](https://github.com/Gusto/apollo-federation-ruby/compare/v3.10.2...v3.10.3) (2025-10-20)
+
+
+### Bug Fixes
+
+* random update to README.md to trigger semantic-release ([#310](https://github.com/Gusto/apollo-federation-ruby/issues/310)) ([bfaa10e](https://github.com/Gusto/apollo-federation-ruby/commit/bfaa10e85a7e85781f2ae0373d656b0fc66d13eb))
+
+
+### Reverts
+
+* Revert "chore(release): 3.10.2 [skip ci]" (#309) ([a3937c6](https://github.com/Gusto/apollo-federation-ruby/commit/a3937c64f0ce9648edc10f74a80a4e825e01b4d4)), closes [#309](https://github.com/Gusto/apollo-federation-ruby/issues/309)
+
+## [3.10.5](https://github.com/Gusto/apollo-federation-ruby/compare/v3.10.4...v3.10.5) (2026-10-01)
+
+
+### Bug Fixes
+
+* add environment: release to the Publish Gem job ([#323](https://github.com/Gusto/apollo-federation-ruby/issues/323)) ([abbe9c6](https://github.com/Gusto/apollo-federation-ruby/commit/abbe9c652bf4fcfd5a23c238981a91bc5ad47da1))
+
+## [3.10.4](https://github.com/Gusto/apollo-federation-ruby/compare/v3.10.3...v3.10.4) (2026-09-30)
+
+
+### Bug Fixes
+
+* authenticate release-please-action with a GitHub App token, not GITHUB_TOKEN ([#320](https://github.com/Gusto/apollo-federation-ruby/issues/320)) ([0231a15](https://github.com/Gusto/apollo-federation-ruby/commit/0231a1573253739573fa2a8b17aeb9a124e73728))
+* Query._entities crashing under GraphQL::Execution::Next ([#317](https://github.com/Gusto/apollo-federation-ruby/issues/317)) ([4b869ba](https://github.com/Gusto/apollo-federation-ruby/commit/4b869ba7b4e5377cef0a08c8967386f38b6b7b97))
+* regenerate Gemfile.lock on the release PR after version bumps ([#322](https://github.com/Gusto/apollo-federation-ruby/issues/322)) ([c6122dc](https://github.com/Gusto/apollo-federation-ruby/commit/c6122dcccb8d246642bc799f5b4e7fb8b749b84c))
+* restore environment: release on the release-please job ([#321](https://github.com/Gusto/apollo-federation-ruby/issues/321)) ([61904d8](https://github.com/Gusto/apollo-federation-ruby/commit/61904d86023f14f6fbd661417e60ecc7ce166ec4))
+
 ## [3.10.1](https://github.com/Gusto/apollo-federation-ruby/compare/v3.10.0...v3.10.1) (2025-04-02)
 
 

data/README.md

@@ -1,9 +1,10 @@
 # apollo-federation
 
-[![CircleCI](https://circleci.com/gh/Gusto/apollo-federation-ruby/tree/main.svg?style=svg)](https://circleci.com/gh/Gusto/apollo-federation-ruby/tree/main)
+[![CI](https://github.com/Gusto/apollo-federation-ruby/actions/workflows/ci.yml/badge.svg)](https://github.com/Gusto/apollo-federation-ruby/actions/workflows/ci.yml)
 
 This gem extends the [GraphQL Ruby](http://graphql-ruby.org/) gem to add support for creating an [Apollo Federation](https://www.apollographql.com/docs/apollo-server/federation/introduction/) schema.
 
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -144,7 +145,9 @@ This will start up the gateway and serve it at http://localhost:5000.
 
 ## Usage
 
-The API is designed to mimic the API of [Apollo's federation library](https://www.apollographql.com/docs/apollo-server/federation/introduction/). It's best to read and understand the way federation works, in general, before attempting to use this library.
+The API is designed to mimic the API of [Apollo's federation library](https://www.apollographql.com/docs/apollo-server/federation/introduction/).
+
+It's best to read and understand the way federation works, in general, before attempting to use this library.
 
 ### Extending a type
 

data/lib/apollo-federation/entities_field.rb

@@ -2,6 +2,7 @@
 
 require 'graphql'
 require 'apollo-federation/any'
+require 'apollo-federation/next_execution_support'
 
 module ApolloFederation
   module EntitiesField
@@ -20,80 +21,102 @@ module ApolloFederation
           possible_types(*possible_entities)
         end
 
-        field(:_entities, [entity_type, null: true], null: false) do
+        # resolve_static so Next dispatches to resolve_entities_for_next, not root_value; a
+        # separate method from _entities since Next needs a fully-synced Array, not a Lazy.
+        if ApolloFederation::RESOLVE_STATIC_SUPPORTED
+          entities_field_options = { resolve_static: :resolve_entities_for_next }
+        else
+          entities_field_options = {}
+        end
+        field(:_entities, [entity_type, null: true], null: false, **entities_field_options) do
           argument :representations, [Any], required: true
         end
       end
-    end
 
-    def _entities(representations:)
-      final_result = Array.new(representations.size)
-      grouped_references_with_indices =
-        representations
-        .map
-        .with_index { |r, i| [r, i] }
-        .group_by { |(r, _i)| r[:__typename] }
-
-      maybe_lazies = grouped_references_with_indices.map do |typename, references_with_indices|
-        references = references_with_indices.map(&:first)
-        indices = references_with_indices.map(&:last)
-
-        # TODO: Use warden or schema?
-        type = context.warden.get_type(typename)
-        if type.nil? || type.kind != GraphQL::TypeKinds::OBJECT
-          # TODO: Raise a specific error class?
-          raise "The _entities resolver tried to load an entity for type \"#{typename}\"," \
-                ' but no object type of that name was found in the schema'
-        end
+      def _entities(context, representations:)
+        build_entities(context, representations)
+      end
 
-        # TODO: What if the type is an interface?
-        type_class = class_of_type(type)
+      def resolve_entities_for_next(context, representations:)
+        final_result = build_entities(context, representations).value
+        # Resolving the outer Lazy doesn't resolve each entry: a per-reference resolve_reference
+        # lazy value comes back wrapped in its own Lazy from the after_lazy call in build_entities.
+        final_result.map { |entry| entry.is_a?(GraphQL::Execution::Lazy) ? entry.value : entry }
+      end
+
+      private
+
+      def build_entities(context, representations)
+        final_result = Array.new(representations.size)
+        grouped_references_with_indices =
+          representations
+          .map
+          .with_index { |r, i| [r, i] }
+          .group_by { |(r, _i)| r[:__typename] }
+
+        maybe_lazies = grouped_references_with_indices.map do |typename, references_with_indices|
+          references = references_with_indices.map(&:first)
+          indices = references_with_indices.map(&:last)
+
+          # TODO: Use warden or schema?
+          type = context.warden.get_type(typename)
+          if type.nil? || type.kind != GraphQL::TypeKinds::OBJECT
+            # TODO: Raise a specific error class?
+            raise "The _entities resolver tried to load an entity for type \"#{typename}\"," \
+                  ' but no object type of that name was found in the schema'
+          end
 
-        if type_class.underscore_reference_keys
-          references.map! do |reference|
-            reference.transform_keys do |key|
-              GraphQL::Schema::Member::BuildType.underscore(key.to_s).to_sym
+          # TODO: What if the type is an interface?
+          type_class = class_of_type(type)
+
+          if type_class.underscore_reference_keys
+            references.map! do |reference|
+              reference.transform_keys do |key|
+                GraphQL::Schema::Member::BuildType.underscore(key.to_s).to_sym
+              end
             end
           end
-        end
 
-        if type_class.respond_to?(:resolve_references)
-          results = type_class.resolve_references(references, context)
-        elsif type_class.respond_to?(:resolve_reference)
-          results = references.map { |reference| type_class.resolve_reference(reference, context) }
-        else
-          results = references
-        end
+          if type_class.respond_to?(:resolve_references)
+            results = type_class.resolve_references(references, context)
+          elsif type_class.respond_to?(:resolve_reference)
+            results = references.map { |reference| type_class.resolve_reference(reference, context) }
+          else
+            results = references
+          end
 
-        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
+          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
+
+        # 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
 
-      # 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
+      def class_of_type(type)
+        if defined?(GraphQL::ObjectType) && type.is_a?(GraphQL::ObjectType)
+          type.metadata[:type_class]
+        else
+          type
+        end
       end
     end
 
-    private
-
-    def class_of_type(type)
-      if defined?(GraphQL::ObjectType) && type.is_a?(GraphQL::ObjectType)
-        type.metadata[:type_class]
-      else
-        type
-      end
+    def _entities(representations:)
+      self.class._entities(context, representations: representations)
     end
   end
 end

data/lib/apollo-federation/next_execution_support.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'graphql'
+
+module ApolloFederation
+  # `resolve_static:` (and GraphQL::Execution::Next generally) doesn't exist on every
+  # graphql-ruby version this gem supports, so detect it via a capability the Next-era
+  # GraphQL::Schema::Field always defines, rather than assuming a minimum graphql-ruby version.
+  # Checking Field#initialize's own parameter list (an earlier version of this check) breaks
+  # under graphql-pro, which prepends a `(*args, streamable:, **kwargs)`-shaped `initialize` onto
+  # Field -- `instance_method(:initialize)` then reports *that* signature, not the one
+  # underneath, so the check silently reads as unsupported. `execution_mode` is a plain
+  # `attr_reader`, untouched by that prepend either way. Shared by any field this gem defines
+  # directly on the Query type (currently _entities and _service), since those are resolved
+  # against the wrapped Query object under classic but the (nil, by default) Query root_value
+  # under Next's default :direct_send -- resolve_static is what makes them agree.
+  RESOLVE_STATIC_SUPPORTED = GraphQL::Schema::Field.method_defined?(:execution_mode)
+end

data/lib/apollo-federation/service.rb

@@ -9,6 +9,7 @@ module ApolloFederation
       'directives, removes federation types, and includes rest of full schema after schema ' \
       'directives have been applied'
 
-    field(:sdl, String, null: true)
+    # hash_key: so Next reads the { sdl: ... } Hash (see ServiceField#_service) directly.
+    field(:sdl, String, null: true, hash_key: :sdl)
   end
 end

data/lib/apollo-federation/service_field.rb

@@ -2,6 +2,7 @@
 
 require 'graphql'
 require 'apollo-federation/service'
+require 'apollo-federation/next_execution_support'
 
 module ApolloFederation
   module ServiceField
@@ -13,13 +14,19 @@ module ApolloFederation
       extend GraphQL::Schema::Member::HasFields
 
       def define_service_field
-        field(:_service, Service, null: false)
+        # resolve_static so Next dispatches to the class method below, not root_value.
+        service_field_options = ApolloFederation::RESOLVE_STATIC_SUPPORTED ? { resolve_static: true } : {}
+        field(:_service, Service, null: false, **service_field_options)
+      end
+
+      def _service(context)
+        schema_class = context.schema.is_a?(GraphQL::Schema) ? context.schema.class : context.schema
+        { sdl: schema_class.federation_sdl(context: context.to_h) }
       end
     end
 
     def _service
-      schema_class = context.schema.is_a?(GraphQL::Schema) ? context.schema.class : context.schema
-      { sdl: schema_class.federation_sdl(context: context.to_h) }
+      self.class._service(context)
     end
   end
 end

data/lib/apollo-federation/tracing/tracer.rb

@@ -26,8 +26,10 @@
 #
 #   </execute_query_lazy>
 #
-#   # `execute_query_lazy` *always* fires, so it's a
-#   # safe place to capture ending times of the full query.
+#   # In graphql-ruby < 2.5.12, `execute_query_lazy` *always* fires.
+#   # In graphql-ruby >= 2.5.12, `execute_query_lazy` only fires when there are lazy values.
+#   # We record end times in both `execute_multiplex` (as a fallback) and `execute_query_lazy`
+#   # (to capture the full execution time including lazy resolution when present).
 #
 # </execute_multiplex>
 
@@ -96,6 +98,12 @@ module ApolloFederation
 
         results = block.call
 
+        # Step 4.5:
+        # Record end times for all queries.
+        # This acts as a fallback for queries without lazy values.
+        # execute_query_lazy will overwrite these times if lazy values are present.
+        data.fetch(:multiplex).queries.each { |query| record_trace_end_time(query) }
+
         # Step 5
         # Attach the trace to the 'extensions' key of each result
         results.map { |result| attach_trace_to_result(result) }

data/lib/apollo-federation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apollo-federation
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.10.5
 platform: ruby
 authors:
 - Noa Elad
 - Rylan Collins
 bindir: bin
 cert_chain: []
-date: 2025-04-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -232,6 +232,7 @@ files:
 - lib/apollo-federation/has_directives.rb
 - lib/apollo-federation/input_object.rb
 - lib/apollo-federation/interface.rb
+- lib/apollo-federation/next_execution_support.rb
 - lib/apollo-federation/object.rb
 - lib/apollo-federation/scalar.rb
 - lib/apollo-federation/schema.rb
@@ -267,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A Ruby implementation of Apollo Federation
 test_files: []