apollo-federation 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9162a13344ba2374500711c42e7a3ae210bc12ba29747ab421e7b8bb2a8c36e4
-  data.tar.gz: 963f3b9efabca3efb67617598be416b6a0f6aa15bd630b25749093bf40b0bd6e
+  metadata.gz: c06244e9136f28d4a4c15906ab176c9d4d83ea685c1b2a73bcac91d6f1ac8e65
+  data.tar.gz: f9f9eec152182226fe35fc07f97f7e4a787a7ba2cd45442f2725f8c7a593a28e
 SHA512:
-  metadata.gz: 7a6a6ed04335cf873ba2a8589058d6960a4e1be29cc97deafab809c6bce682d7c66256290d56663b2e2f7bd5215e405f3c1a655f723494dfd1e39a9b97ded380
-  data.tar.gz: 0bcceb1c673ecbb8c1d934219f29364433b7bd4208bf6b9a69bfe465f732cb531680637dd7258f7e6f948527f5c8f8cd24b6a75f6f49d75918013db4e9ec929d
+  metadata.gz: 451f1e7582fcbe3a85061755ef537678c819532879994584243c9ce9424883496d4ae9db79926dd25a7b5baab374395438d670e0c1967735ca31cf07519c5058
+  data.tar.gz: b118eda2b44fb44499745b4161cb75fc75dc59b59e29158d434b8152e23ce772b1b51c47820a8e4c9fb5c0275262b0a02d826dc1bfeda56ad3d4fac697fb3ab7

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [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)
 
 

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/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,52 +8,94 @@ 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 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
+
+      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_obj.metadata[:type_class]
+        end
+
+        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
+      end
     end
 
-    module ClassMethods
+    # 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 = federation_query
-
-        if !possible_entities.empty?
-          entity_type = Class.new(Entity) do
-            possible_types(*possible_entities)
-          end
-          # TODO: Should/can we encapsulate all of this inside the module? What's the best/most Ruby
-          # way to split this out?
-          @query_object.define_entities_field(entity_type)
-        end
+        @query_object.define_entities_field(possible_entities)
 
         super
       end
+    end
 
-      def federation_query
-        if query.nil?
-          base = GraphQL::Schema::Object
-        elsif Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('1.10.0')
-          base = query
+    module OneTenMethods
+      include CommonMethods
+
+      def query(new_query_object = nil)
+        if new_query_object
+          @orig_query_object = new_query_object
         else
-          base = query.metadata[:type_class]
-        end
+          if !@federation_query_object
+            @federation_query_object = federation_query(@orig_query_object)
+            @federation_query_object.define_entities_field(schema_entities)
 
-        Class.new(base) do
-          graphql_name 'Query'
+            super(@federation_query_object)
+          end
 
-          include EntitiesField
-          include ServiceField
+          super
         end
       end
 
-      def federation_sdl(context: nil)
-        document_from_schema = FederatedDocumentFromSchemaDefinition.new(self, context: context)
-        GraphQL::Language::Printer.new.print(document_from_schema.document)
+      private
+
+      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)
+
+        # 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

@@ -10,7 +10,8 @@ module ApolloFederation
     field(:_service, Service, null: false)
 
     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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apollo-federation
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Noa Elad
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql