add formal fomatter class.

Author: gmac

lib/graphql/stitching.rb

@@ -71,6 +71,7 @@ def supports_visibility?
   end
 end
 
+require_relative "stitching/formatter"
 require_relative "stitching/directives"
 require_relative "stitching/supergraph"
 require_relative "stitching/client"

lib/graphql/stitching/composer.rb

@@ -21,10 +21,20 @@ class Composer
       end
 
       # @api private
-      BASIC_VALUE_MERGER = ->(values_by_location, _info) { values_by_location.values.find { !_1.nil? } }
+      BASIC_VALUE_MERGER = ->(values_by_location, _info) { values_by_location.each_value.find { !_1.nil? } }
 
       # @api private
-      VISIBILITY_PROFILES_MERGER = ->(values_by_location, _info) { values_by_location.values.reduce(:&) }
+      VISIBILITY_PROFILES_MERGER = ->(values_by_location, _info) { values_by_location.each_value.reduce(:&) }
+
+      # @api private
+      # VISIBILITY_PROFILES_MERGER = begin
+      #   f = Class.new(Formatter) do
+      #     def merge_kwargs(values_by_location, _info)
+      #       values_by_location.each_value.reduce(:&)
+      #     end
+      #   end
+      #   f.new
+      # end
 
       # @api private
       COMPOSITION_VALIDATORS = [
@@ -52,22 +62,22 @@ def initialize(
         mutation_name: "Mutation",
         subscription_name: "Subscription",
         visibility_profiles: [],
-        description_merger: nil,
         deprecation_merger: nil,
         default_value_merger: nil,
         directive_kwarg_merger: nil,
         root_field_location_selector: nil,
-        root_entrypoints: nil
+        root_entrypoints: nil,
+        formatter: nil
       )
         @query_name = query_name
         @mutation_name = mutation_name
         @subscription_name = subscription_name
-        @description_merger = description_merger || BASIC_VALUE_MERGER
         @deprecation_merger = deprecation_merger || BASIC_VALUE_MERGER
         @default_value_merger = default_value_merger || BASIC_VALUE_MERGER
         @directive_kwarg_merger = directive_kwarg_merger || BASIC_VALUE_MERGER
         @root_field_location_selector = root_field_location_selector
         @root_entrypoints = root_entrypoints || {}
+        @formatter = formatter || Formatter.new
 
         @field_map = {}
         @resolver_map = {}
@@ -537,12 +547,12 @@ def merge_value_types(type_name, subgraph_types, field_name: nil, argument_name:
       # @!visibility private
       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 }
-        @description_merger.call(strings_by_location, {
+        @formatter.merge_descriptions(strings_by_location, Formatter::Info.new(
           type_name: type_name,
           field_name: field_name,
           argument_name: argument_name,
           enum_value: enum_value,
-        }.tap(&:compact!))
+        ))
       end
 
       # @!scope class

lib/graphql/stitching/formatter.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require_relative "type_resolver/arguments"
+require_relative "type_resolver/keys"
+
+module GraphQL
+  module Stitching
+    class Formatter
+      class Info
+        attr_reader :type_name, :field_name, :argument_name, :enum_value, :directive_name, :kwarg_name
+
+        def initialize(
+          type_name:,
+          field_name: nil,
+          argument_name: nil,
+          enum_value: nil,
+          directive_name: nil,
+          kwarg_name: nil
+        )
+          @type_name = type_name
+          @field_name = field_name
+          @argument_name = argument_name
+          @enum_value = enum_value
+          @directive_name = directive_name
+          @kwarg_name = kwarg_name
+        end
+      end
+
+      def merge_values(values_by_location, _info)
+        values_by_location.each_value.find { !_1.nil? }
+      end
+
+      def merge_descriptions(values_by_location, info)
+        merge_values(values_by_location, info)
+      end
+
+      def merge_deprecations(values_by_location, info)
+        merge_values(values_by_location, info)
+      end
+
+      def merge_default_values(values_by_location, info)
+        merge_values(values_by_location, info)
+      end
+
+      def merge_kwargs(values_by_location, info)
+        merge_values(values_by_location, info)
+      end
+    end
+  end
+end

test/graphql/stitching/composer/merge_arguments_test.rb

@@ -90,7 +90,7 @@ def test_merges_argument_descriptions
     b = %|input Test { """b""" arg:String } type Query { test("""b""" arg:Test):String }|
 
     supergraph = compose_definitions({ "a" => a, "b" => b }, {
-      description_merger: ->(str_by_location, _info) { str_by_location.values.join("/") }
+      formatter: JoinFormatter.new,
     })
 
     assert_equal "a/b", supergraph.schema.types["Test"].arguments["arg"].description

test/graphql/stitching/composer/merge_directive_test.rb

@@ -19,7 +19,7 @@ def test_merges_directive_definitions
     |
 
     supergraph = compose_definitions({ "a" => a, "b" => b }, {
-      description_merger: ->(str_by_location, _info) { str_by_location.values.join("/") }
+      formatter: JoinFormatter.new,
     })
 
     directive_definition = supergraph.schema.directives["fizzbuzz"]

test/graphql/stitching/composer/merge_enum_test.rb

@@ -9,7 +9,7 @@ def test_merges_enum_and_value_descriptions
     b = %|"""b""" enum Status { """b""" YES } type Query { status:Status }|
 
     supergraph = compose_definitions({ "a" => a, "b" => b }, {
-      description_merger: ->(str_by_location, _info) { str_by_location.values.join("/") }
+      formatter: JoinFormatter.new,
     })
 
     assert_equal "a/b", supergraph.schema.types["Status"].description

test/graphql/stitching/composer/merge_fields_test.rb

@@ -9,7 +9,7 @@ def test_merges_field_descriptions
     b = %{type Test { """b""" field: String } type Query { test:Test }}
 
     supergraph = compose_definitions({ "a" => a, "b" => b }, {
-      description_merger: ->(str_by_location, _info) { str_by_location.values.join("/") }
+      formatter: JoinFormatter.new,
     })
 
     assert_equal "a/b", supergraph.schema.types["Test"].fields["field"].description

test/graphql/stitching/composer/merge_input_object_test.rb

@@ -9,7 +9,7 @@ def test_merges_input_object_descriptions
     b = %{"""b""" input Test { field:String } type Query { get(test:Test):String }}
 
     info = compose_definitions({ "a" => a, "b" => b }, {
-      description_merger: ->(str_by_location, _info) { str_by_location.values.join("/") }
+      formatter: JoinFormatter.new,
     })
 
     assert_equal "a/b", info.schema.types["Test"].description

test/graphql/stitching/composer/merge_interface_test.rb

@@ -9,7 +9,7 @@ def test_merges_interface_descriptions
     b = %{"""b""" interface Test { field: String } type Query { test:Test }}
 
     supergraph = compose_definitions({ "a" => a, "b" => b }, {
-      description_merger: ->(str_by_location, _info) { str_by_location.values.join("/") }
+      formatter: JoinFormatter.new,
     })
 
     assert_equal "a/b", supergraph.schema.types["Test"].description

test/graphql/stitching/composer/merge_object_test.rb

@@ -9,7 +9,7 @@ def test_merges_object_descriptions
     b = %{"""b""" type Test { field: String } type Query { test:Test }}
 
     supergraph = compose_definitions({ "a" => a, "b" => b }, {
-      description_merger: ->(str_by_location, _info) { str_by_location.values.join("/") }
+      formatter: JoinFormatter.new,
     })
 
     assert_equal "a/b", supergraph.schema.types["Test"].description