more tests.

Author: gmac

lib/graphql/stitching/client.rb

@@ -88,15 +88,6 @@ def write_cached_plan(request, plan)
         @on_cache_write.call(request, JSON.generate(plan.as_json)) if @on_cache_write
       end
 
-      def build_graphql_error(request, err)
-        case err
-        when GraphQL::ParseError, GraphQL::ExecutionError
-          err.to_h
-        else
-          { "message" => "An unexpected error occured." }
-        end
-      end
-
       private
 
       def load_plan(request)

lib/graphql/stitching/composer.rb

@@ -11,7 +11,10 @@ module Stitching
     # representing various graph locations and merges them into one 
     # combined Supergraph that is validated for integrity.
     class Composer
-      include Formatter
+      # @api private
+      class DefaultFormatter
+        extend Formatter
+      end
 
       # @api private
       NO_DEFAULT_VALUE = begin
@@ -55,7 +58,7 @@ def initialize(
         @mutation_name = mutation_name
         @subscription_name = subscription_name
         @root_entrypoints = root_entrypoints || {}
-        @formatter = formatter || self
+        @formatter = formatter || DefaultFormatter
 
         @field_map = {}
         @resolver_map = {}
@@ -217,7 +220,7 @@ def build_directive(directive_name, directives_by_location)
 
         Class.new(GraphQL::Schema::Directive) do
           graphql_name(directive_name)
-          description(builder.merge_member_descriptions(directive_name, directives_by_location))
+          description(builder.merge_descriptions(directive_name, directives_by_location))
           repeatable(directives_by_location.values.any?(&:repeatable?))
           locations(*directives_by_location.values.flat_map(&:locations).tap(&:uniq!))
           builder.build_merged_arguments(directive_name, directives_by_location, self, directive_name: directive_name)
@@ -234,7 +237,7 @@ def build_scalar_type(type_name, types_by_location)
 
         Class.new(GraphQL::Stitching::Supergraph::ScalarType) do
           graphql_name(type_name)
-          description(builder.merge_member_descriptions(type_name, types_by_location))
+          description(builder.merge_descriptions(type_name, types_by_location))
           builder.build_merged_directives(type_name, types_by_location, self)
         end
       end
@@ -261,14 +264,14 @@ def build_enum_type(type_name, types_by_location, enum_usage)
 
         Class.new(GraphQL::Stitching::Supergraph::EnumType) do
           graphql_name(type_name)
-          description(builder.merge_member_descriptions(type_name, types_by_location))
+          description(builder.merge_descriptions(type_name, types_by_location))
           builder.build_merged_directives(type_name, types_by_location, self)
 
           enum_values_by_name_location.each do |value_name, enum_values_by_location|
             enum_value = value(value_name,
               value: value_name,
-              description: builder.merge_member_descriptions(type_name, enum_values_by_location, enum_value: value_name),
-              deprecation_reason: builder.merge_member_deprecations(type_name, enum_values_by_location, enum_value: value_name),
+              description: builder.merge_descriptions(type_name, enum_values_by_location, enum_value: value_name),
+              deprecation_reason: builder.merge_deprecations(type_name, enum_values_by_location, enum_value: value_name),
             )
 
             builder.build_merged_directives(type_name, enum_values_by_location, enum_value, enum_value: value_name)
@@ -283,7 +286,7 @@ def build_object_type(type_name, types_by_location)
 
         Class.new(GraphQL::Stitching::Supergraph::ObjectType) do
           graphql_name(type_name)
-          description(builder.merge_member_descriptions(type_name, types_by_location))
+          description(builder.merge_descriptions(type_name, types_by_location))
 
           interface_names = types_by_location.values.flat_map { _1.interfaces.map(&:graphql_name) }
           interface_names.tap(&:uniq!).each do |interface_name|
@@ -303,7 +306,7 @@ def build_interface_type(type_name, types_by_location)
         Module.new do
           include GraphQL::Stitching::Supergraph::InterfaceType
           graphql_name(type_name)
-          description(builder.merge_member_descriptions(type_name, types_by_location))
+          description(builder.merge_descriptions(type_name, types_by_location))
 
           interface_names = types_by_location.values.flat_map { _1.interfaces.map(&:graphql_name) }
           interface_names.tap(&:uniq!).each do |interface_name|
@@ -322,7 +325,7 @@ def build_union_type(type_name, types_by_location)
 
         Class.new(GraphQL::Stitching::Supergraph::UnionType) do
           graphql_name(type_name)
-          description(builder.merge_member_descriptions(type_name, types_by_location))
+          description(builder.merge_descriptions(type_name, types_by_location))
 
           possible_names = types_by_location.values.flat_map { _1.possible_types.map(&:graphql_name) }.tap(&:uniq!)
           possible_types(*possible_names.map { builder.build_type_binding(_1) })
@@ -337,7 +340,7 @@ def build_input_object_type(type_name, types_by_location)
 
         Class.new(GraphQL::Stitching::Supergraph::InputObjectType) do
           graphql_name(type_name)
-          description(builder.merge_member_descriptions(type_name, types_by_location))
+          description(builder.merge_descriptions(type_name, types_by_location))
           builder.build_merged_arguments(type_name, types_by_location, self)
           builder.build_merged_directives(type_name, types_by_location, self)
         end
@@ -370,8 +373,8 @@ def build_merged_fields(type_name, types_by_location, owner)
           type = merge_value_types(type_name, value_types, field_name: field_name)
           schema_field = owner.field(
             field_name,
-            description: merge_member_descriptions(type_name, fields_by_location, field_name: field_name),
-            deprecation_reason: merge_member_deprecations(type_name, fields_by_location, field_name: field_name),
+            description: merge_descriptions(type_name, fields_by_location, field_name: field_name),
+            deprecation_reason: merge_deprecations(type_name, fields_by_location, field_name: field_name),
             type: Util.unwrap_non_null(type),
             null: !type.non_null?,
             connection: false,
@@ -423,8 +426,8 @@ def build_merged_arguments(type_name, members_by_location, owner, field_name: ni
           type = merge_value_types(type_name, value_types, argument_name: argument_name, field_name: field_name)
           schema_argument = owner.argument(
             argument_name,
-            description: merge_member_descriptions(type_name, arguments_by_location, argument_name: argument_name, field_name: field_name),
-            deprecation_reason: merge_member_deprecations(type_name, arguments_by_location, argument_name: argument_name, field_name: field_name),
+            description: merge_descriptions(type_name, arguments_by_location, argument_name: argument_name, field_name: field_name),
+            deprecation_reason: merge_deprecations(type_name, arguments_by_location, argument_name: argument_name, field_name: field_name),
             type: Util.unwrap_non_null(type),
             required: type.non_null?,
             camelize: false,
@@ -469,7 +472,7 @@ def build_merged_directives(type_name, members_by_location, owner, field_name: n
 
             if (profiles = kwarg_values_by_name_location["profiles"])
               @visibility_profiles.merge(profiles.each_value.reduce(&:|))
-              kwarg_formatter = self
+              kwarg_formatter = DefaultFormatter
             end
           end
 
@@ -523,7 +526,7 @@ def merge_value_types(type_name, subgraph_types, field_name: nil, argument_name:
 
       # @!scope class
       # @!visibility private
-      def merge_member_descriptions(type_name, members_by_location, field_name: nil, argument_name: nil, enum_value: nil)
+      def merge_descriptions(type_name, members_by_location, field_name: nil, argument_name: nil, enum_value: nil)
         strings_by_location = members_by_location.each_with_object({}) { |(l, m), memo| memo[l] = m.description }
         @formatter.merge_descriptions(strings_by_location, Formatter::Info.new(
           type_name: type_name,
@@ -535,7 +538,7 @@ def merge_member_descriptions(type_name, members_by_location, field_name: nil, a
 
       # @!scope class
       # @!visibility private
-      def merge_member_deprecations(type_name, members_by_location, field_name: nil, argument_name: nil, enum_value: nil)
+      def merge_deprecations(type_name, members_by_location, field_name: nil, argument_name: nil, enum_value: nil)
         strings_by_location = members_by_location.each_with_object({}) { |(l, m), memo| memo[l] = m.deprecation_reason }
         @formatter.merge_deprecations(strings_by_location, Formatter::Info.new(
           type_name: type_name,

lib/graphql/stitching/formatter.rb

@@ -49,6 +49,15 @@ def merge_kwargs(values_by_location, info)
           merge_values(values_by_location, info)
         end
       end
+
+      def build_graphql_error(request, err)
+        case err
+        when GraphQL::ParseError, GraphQL::ExecutionError
+          err.to_h
+        else
+          { "message" => "An unexpected error occured." }
+        end
+      end
     end
   end
 end

test/graphql/stitching/client_test.rb

@@ -377,4 +377,50 @@ def test_errors_for_composer_options_given_with_precomposed_supergraph
       )
     end
   end
+
+  class MyClient < GraphQL::Stitching::Client
+    def merge_descriptions(values_by_location, _info)
+      values_by_location.values.join("/")
+    end
+  end
+
+  def test_from_definition_builds_with_invocation_class
+    alpha = %|
+      type T { id:ID! a:String }
+      type Query { a(id:ID!):T @stitch(key: "id") }
+    |
+    bravo = %|
+      type T { id:ID! b:String }
+      type Query { b(id:ID!):T @stitch(key: "id") }
+    |
+
+    sdl = compose_definitions({ "alpha" => alpha, "bravo" => bravo }).to_definition
+    client = MyClient.from_definition(sdl, executables: {
+      "alpha" => Proc.new {},
+      "bravo" => Proc.new {},
+    })
+    assert client.is_a?(MyClient)
+  end
+
+  def test_custom_client_acts_as_composition_formatter
+    alpha = %|
+      """
+      a
+      """
+      type Query { a:Boolean }
+    |
+    bravo = %|
+      """
+      b
+      """
+      type Query { b:Boolean }
+    |
+
+    client = MyClient.new(locations: {
+      "alpha" => { schema: GraphQL::Schema.from_definition(alpha) },
+      "bravo" => { schema: GraphQL::Schema.from_definition(bravo) },
+    })
+    
+    assert_equal "a/b", client.supergraph.schema.query.description
+  end
 end

test/test_helper.rb

@@ -7,7 +7,6 @@
   # ignore warnings from auto-generated GraphQL lib code.
   Warning.ignore(/.*mismatched indentations.*/)
   Warning.ignore(/.*lib\/graphql\/language\/nodes.rb:.*/)
-  Warning.ignore(/Using `[^`]+` is deprecated and will be removed.*/)
 end
 
 require 'bundler/setup'