apollo-federation 1.0.2 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bba6484dd50766b5b896bc8ba754d3f2332e6dfc8f62776f45f7378316995a4
-  data.tar.gz: eef5867e52e8fcaa45727754f25b64ecc6d1daad69baedebe499ba354c37fe72
+  metadata.gz: 2363ab0739ef4119e0c16d88151e575f664c33d9a66eb2a3c6aa6756770d759c
+  data.tar.gz: 8ed8b3c011adcecdaaed0f5aebe7a159079c56ea2296878c6c18a93a04f257d4
 SHA512:
-  metadata.gz: 87870f073d0957e84c6f3618acdd12cb1348cdcb7dbeba97a27f770b85cc2f29a0a241b0f308e19d231fce153bda5189795298ffa9eb980d1833f9c182c48acf
-  data.tar.gz: d2401b6d42952a41f34fab5657331936dcc415dc06b65d79dd32add7afa26c0a8bba60a3484f033eacaa3ffca87fa76e834c9aed6001311beea645c89cc9d089
+  metadata.gz: 5f54f342bb56723f70550b1b0748de3c14191281f3bc1a8d496cc9b893d2c8bbb278bdf58d11f70141fd59ef1710d48d2a8de5b4b98940124edf253d688bf3fa
+  data.tar.gz: a762847991cda4b9526ca56686991a752fc24d33a5cbeea1a01f2b863ea2667b823fd2f750ac3c40052627c647b1bc70b9395a1e4dae58a25594b0e7f70233ad

data/CHANGELOG.md

@@ -1,3 +1,38 @@
+## [1.1.2](https://github.com/Gusto/apollo-federation-ruby/compare/v1.1.1...v1.1.2) (2020-06-09)
+
+
+### Bug Fixes
+
+* Fix _service field type owner ([#70](https://github.com/Gusto/apollo-federation-ruby/issues/70)) ([364e54f](https://github.com/Gusto/apollo-federation-ruby/commit/364e54fbb333b7cd4fe30f04bf72733b0e18d3f4))
+
+## [1.1.1](https://github.com/Gusto/apollo-federation-ruby/compare/v1.1.0...v1.1.1) (2020-05-29)
+
+
+### Bug Fixes
+
+* **lazy resolve:** Handle problem with sync resolve ([#58](https://github.com/Gusto/apollo-federation-ruby/issues/58)) ([e66c22b](https://github.com/Gusto/apollo-federation-ruby/commit/e66c22ba6fe51a7c282190ee77bd02dbfa514a66))
+
+# [1.1.0](https://github.com/Gusto/apollo-federation-ruby/compare/v1.0.4...v1.1.0) (2020-05-27)
+
+
+### Features
+
+* Add support for interpreter runtime ([#65](https://github.com/Gusto/apollo-federation-ruby/issues/65)) ([1957da0](https://github.com/Gusto/apollo-federation-ruby/commit/1957da0))
+
+## [1.0.4](https://github.com/Gusto/apollo-federation-ruby/compare/v1.0.3...v1.0.4) (2020-04-06)
+
+
+### Bug Fixes
+
+* Fix spec to account for breaking change to graphql-ruby 1.10.0 ([#62](https://github.com/Gusto/apollo-federation-ruby/issues/62)) ([a631441](https://github.com/Gusto/apollo-federation-ruby/commit/a631441))
+
+## [1.0.3](https://github.com/Gusto/apollo-federation-ruby/compare/v1.0.2...v1.0.3) (2020-03-25)
+
+
+### Bug Fixes
+
+* Make the tracer work with the new interpreter runtime ([#59](https://github.com/Gusto/apollo-federation-ruby/issues/59)) ([de4caf0](https://github.com/Gusto/apollo-federation-ruby/commit/de4caf0))
+
 ## [1.0.2](https://github.com/Gusto/apollo-federation-ruby/compare/v1.0.1...v1.0.2) (2020-02-19)
 
 

data/lib/apollo-federation/entities_field.rb

@@ -13,7 +13,14 @@ module ApolloFederation
     module ClassMethods
       extend GraphQL::Schema::Member::HasFields
 
-      def define_entities_field(entity_type)
+      def define_entities_field(possible_entities)
+        # If there are any "entities", define the Entity union and and the Query._entities field
+        return if possible_entities.empty?
+
+        entity_type = Class.new(Entity) do
+          possible_types(*possible_entities)
+        end
+
         field(:_entities, [entity_type, null: true], null: false) do
           argument :representations, [Any], required: true
           extension(EntityTypeResolutionExtension)
@@ -32,8 +39,8 @@ module ApolloFederation
                 ' but no object type of that name was found in the schema'
         end
 
-        # TODO: Handle non-class types?
-        type_class = type.metadata[:type_class]
+        # TODO: What if the type is an interface?
+        type_class = type.is_a?(GraphQL::ObjectType) ? type.metadata[:type_class] : type
         if type_class.respond_to?(:resolve_reference)
           result = type_class.resolve_reference(reference, context)
         else

data/lib/apollo-federation/entity_type_resolution_extension.rb

@@ -2,17 +2,15 @@
 
 class EntityTypeResolutionExtension < GraphQL::Schema::FieldExtension
   def after_resolve(value:, context:, **_rest)
-    synced_value =
-      value.map do |type, result|
-        [type, context.query.schema.sync_lazy(result)]
+    value.map do |type, result|
+      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
-
-    # 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
-    synced_value.each { |type, result| context[result] = type }
-
-    synced_value.map { |_, result| result }
+    end
   end
 end

data/lib/apollo-federation/federated_document_from_schema_definition.rb

@@ -23,17 +23,17 @@ module ApolloFederation
         end
         federation_fields.each { |field| object_node = object_node.delete_child(field) }
       end
-      merge_directives(object_node, object_type.metadata[:federation_directives])
+      merge_directives(object_node, object_type)
     end
 
     def build_interface_type_node(interface_type)
       field_node = super
-      merge_directives(field_node, interface_type.metadata[:federation_directives])
+      merge_directives(field_node, interface_type)
     end
 
     def build_field_node(field_type)
       field_node = super
-      merge_directives(field_node, field_type.metadata[:federation_directives])
+      merge_directives(field_node, field_type)
     end
 
     def build_type_definition_nodes(types)
@@ -53,7 +53,15 @@ module ApolloFederation
       type == warden.root_type_for_operation('query')
     end
 
-    def merge_directives(node, directives)
+    def merge_directives(node, type)
+      if type.is_a?(ApolloFederation::HasDirectives)
+        directives = type.federation_directives
+      elsif type.is_a?(GraphQL::Define::InstanceDefinable)
+        directives = type.metadata[:federation_directives]
+      else
+        directives = []
+      end
+
       (directives || []).each do |directive|
         node = node.merge_directive(
           name: directive[:name],

data/lib/apollo-federation/has_directives.rb

@@ -2,6 +2,8 @@
 
 module ApolloFederation
   module HasDirectives
+    attr_reader :federation_directives
+
     def add_directive(name:, arguments: nil)
       @federation_directives ||= []
       @federation_directives << { name: name, arguments: arguments }

data/lib/apollo-federation/schema.rb

@@ -8,48 +8,97 @@ require 'apollo-federation/federated_document_from_schema_definition.rb'
 module ApolloFederation
   module Schema
     def self.included(klass)
-      klass.extend(ClassMethods)
+      if Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('1.10.0')
+        klass.extend(OneTenMethods)
+      else
+        klass.extend(OneNineMethods)
+      end
     end
 
-    module ClassMethods
-      def to_graphql
-        orig_defn = super
+    module CommonMethods
+      def federation_sdl(context: nil)
+        document_from_schema = FederatedDocumentFromSchemaDefinition.new(self, context: context)
+        GraphQL::Language::Printer.new.print(document_from_schema.document)
+      end
+
+      private
 
-        if query.nil?
+      def federation_query(query_obj)
+        # Build the new query object with the '_service' field
+        if query_obj.nil?
           base = GraphQL::Schema::Object
+        elsif Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('1.10.0')
+          base = query_obj
         else
-          base = query.metadata[:type_class]
+          base = query_obj.metadata[:type_class]
         end
 
-        federation_query = Class.new(base) do
+        klass = Class.new(base) do
+          # TODO: Maybe the name should inherit from the original Query name
+          # Or MAYBE we should just modify the original class?
           graphql_name 'Query'
 
           include EntitiesField
           include ServiceField
         end
 
+        klass.define_service_field
+        klass
+      end
+    end
+
+    # TODO: Remove these once we drop support for graphql 1.9
+    module OneNineMethods
+      include CommonMethods
+
+      def to_graphql
+        orig_defn = super
+        @query_object = federation_query(query)
+
         possible_entities = orig_defn.types.values.select do |type|
           !type.introspection? && !type.default_scalar? && type.is_a?(GraphQL::ObjectType) &&
             type.metadata[:federation_directives]&.any? { |directive| directive[:name] == 'key' }
         end
+        @query_object.define_entities_field(possible_entities)
 
-        if !possible_entities.empty?
-          entity_type = Class.new(Entity) do
-            possible_types(*possible_entities)
+        super
+      end
+    end
+
+    module OneTenMethods
+      include CommonMethods
+
+      def query(new_query_object = nil)
+        if new_query_object
+          @orig_query_object = new_query_object
+        else
+          if !@federation_query_object
+            @federation_query_object = federation_query(@orig_query_object)
+            @federation_query_object.define_entities_field(schema_entities)
+
+            super(@federation_query_object)
           end
-          # TODO: Should/can we encapsulate all of this inside the module? What's the best/most Ruby
-          # way to split this out?
-          federation_query.define_entities_field(entity_type)
+
+          super
         end
+      end
 
-        query(federation_query)
+      private
 
-        super
-      end
+      def schema_entities
+        # Create a temporary schema that inherits from this one to extract the types
+        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)
 
-      def federation_sdl(context: nil)
-        document_from_schema = FederatedDocumentFromSchemaDefinition.new(self, context: context)
-        GraphQL::Language::Printer.new.print(document_from_schema.document)
+        # Walk through all of the types and determine which ones are entities (any type with a
+        # "key" directive)
+        types_schema.types.values.select do |type|
+          # TODO: Interfaces can have a key...
+          !type.introspection? && type.include?(ApolloFederation::Object) &&
+            type.federation_directives&.any? { |directive| directive[:name] == 'key' }
+        end
       end
     end
   end

data/lib/apollo-federation/service_field.rb

@@ -5,12 +5,21 @@ require 'apollo-federation/service'
 
 module ApolloFederation
   module ServiceField
-    extend GraphQL::Schema::Member::HasFields
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      extend GraphQL::Schema::Member::HasFields
 
-    field(:_service, Service, null: false)
+      def define_service_field
+        field(:_service, Service, null: false)
+      end
+    end
 
     def _service
-      { sdl: context.schema.class.federation_sdl(context: context) }
+      schema_class = context.schema.is_a?(GraphQL::Schema) ? context.schema.class : context.schema
+      { sdl: schema_class.federation_sdl(context: context) }
     end
   end
 end

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

@@ -103,7 +103,7 @@ module ApolloFederation
       # because we don't have the error `location` here.
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def self.execute_field(data, &block)
-        context = data.fetch(:context) || data.fetch(:query).context
+        context = data.fetch(:context, nil) || data.fetch(:query).context
         return block.call unless context && context[:tracing_enabled]
 
         start_time_nanos = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
@@ -116,16 +116,17 @@ module ApolloFederation
 
         end_time_nanos = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
 
-        # interpreter runtime
+        # legacy runtime
         if data.include?(:context)
           path = context.path
           field_name = context.field.graphql_name
           field_type = context.field.type.to_s
           parent_type = context.parent_type.graphql_name
-        else # legacy runtime
+        else # interpreter runtime
           path = data.fetch(:path)
-          field_name = data.fetch(:field).graphql_name
-          field_type = data.fetch(:field).type.unwrap.graphql_name
+          field = data.fetch(:field)
+          field_name = field.graphql_name
+          field_type = field.type.to_type_signature
           parent_type = data.fetch(:owner).graphql_name
         end
 
@@ -147,7 +148,7 @@ module ApolloFederation
       # Optional Step 3:
       # Overwrite the end times on the trace node if the resolver was lazy.
       def self.execute_field_lazy(data, &block)
-        context = data.fetch(:context) || data.fetch(:query).context
+        context = data.fetch(:context, nil) || data.fetch(:query).context
         return block.call unless context && context[:tracing_enabled]
 
         begin

data/lib/apollo-federation/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apollo-federation
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.2
 platform: ruby
 authors:
 - Noa Elad
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-19 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.8
 - !ruby/object:Gem::Dependency