small cleanups.

Author: gmac

lib/graphql/stitching/client.rb

@@ -25,7 +25,7 @@ def initialize(locations: nil, supergraph: nil, composer_options: {})
           raise ArgumentError, "Cannot provide both locations and a supergraph."
         elsif supergraph && !supergraph.is_a?(Supergraph)
           raise ArgumentError, "Provided supergraph must be a GraphQL::Stitching::Supergraph instance."
-        elsif supergraph && composer_options.any?
+        elsif supergraph && !composer_options.empty?
           raise ArgumentError, "Cannot provide composer options with a pre-built supergraph."
         elsif supergraph
           supergraph
@@ -50,7 +50,7 @@ def execute(raw_query = nil, query: nil, variables: nil, operation_name: nil, co
 
         if validate
           validation_errors = request.validate
-          return error_result(request, validation_errors) if validation_errors.any?
+          return error_result(request, validation_errors) unless validation_errors.empty?
         end
 
         load_plan(request)

lib/graphql/stitching/composer.rb

@@ -423,7 +423,7 @@ def build_merged_arguments(type_name, members_by_location, owner, field_name: ni
             memo[location] = argument.default_value
           end
 
-          if default_values_by_location.any?
+          unless default_values_by_location.empty?
             kwargs[:default_value] = @default_value_merger.call(default_values_by_location, {
               type_name: type_name,
               field_name: field_name,

lib/graphql/stitching/composer/type_resolver_config.rb

@@ -8,7 +8,7 @@ class TypeResolverConfig
 
       class << self
         def extract_directive_assignments(schema, location, assignments)
-          return EMPTY_OBJECT unless assignments && assignments.any?
+          return EMPTY_OBJECT unless assignments && !assignments.empty?
 
           assignments.each_with_object({}) do |kwargs, memo|
             type = kwargs[:parent_type_name] ? schema.get_type(kwargs[:parent_type_name]) : schema.query

lib/graphql/stitching/executor.rb

@@ -79,7 +79,7 @@ def exec!(next_steps)
 
       def exec_task(task)
         next_steps = task.load.tap(&:compact!)
-        exec!(next_steps) if next_steps.any?
+        exec!(next_steps) unless next_steps.empty?
       end
     end
   end

lib/graphql/stitching/executor/root_source.rb

@@ -21,7 +21,7 @@ def fetch(ops)
         @executor.query_count += 1
 
         if result["data"]
-          if op.path.any?
+          unless op.path.empty?
             # Nested root scopes must expand their pathed origin set
             origin_set = op.path.reduce([@executor.data]) do |set, ns|
               set.flat_map { |obj| obj && obj[ns] }.tap(&:compact!)
@@ -73,7 +73,7 @@ def build_document(op, operation_name = nil, operation_directives = nil)
       def format_errors!(errors, path)
         errors.each do |err|
           err.delete("locations")
-          err["path"].unshift(*path) if err["path"] && path.any?
+          err["path"].unshift(*path) if err["path"] && !path.empty?
         end
         errors
       end

lib/graphql/stitching/executor/type_resolver_source.rb

@@ -20,10 +20,10 @@ def fetch(ops)
             origin_set.select! { _1[TypeResolver::TYPENAME_EXPORT_NODE.alias] == op.if_type }
           end
 
-          memo[op] = origin_set if origin_set.any?
+          memo[op] = origin_set unless origin_set.empty?
         end
 
-        if origin_sets_by_operation.any?
+        unless origin_sets_by_operation.empty?
           query_document, variable_names = build_document(
             origin_sets_by_operation,
             @executor.request.operation_name,
@@ -105,7 +105,7 @@ def build_document(origin_sets_by_operation, operation_name = nil, operation_dir
           end
         end
 
-        if variable_defs.any?
+        unless variable_defs.empty?
           doc_buffer << "("
           variable_defs.each_with_index do |(k, v), i|
             doc_buffer << "," unless i.zero?
@@ -135,10 +135,11 @@ def merge_results!(origin_sets_by_operation, raw_result)
             origin_set.map.with_index { |_, index| raw_result["_#{batch_index}_#{index}_result"] }
           end
 
-          next unless results&.any?
+          next if results.nil? || results.empty?
 
           origin_set.each_with_index do |origin_obj, index|
-            origin_obj.merge!(results[index]) if results[index]
+            result = results[index]
+            origin_obj.merge!(result) if result
           end
         end
       end

lib/graphql/stitching/http_executable.rb

@@ -80,7 +80,7 @@ def extract_multipart_form(request, document, variables)
 
         return if files_by_path.none?
 
-        map = {}
+        map = Hash.new { |h, k| h[k] = [] }
         files = files_by_path.values.tap(&:uniq!)
         variables_copy = variables.dup
 
@@ -90,7 +90,6 @@ def extract_multipart_form(request, document, variables)
           path.each_with_index do |key, i|
             if i == path.length - 1
               file_index = files.index(copy[key]).to_s
-              map[file_index] ||= []
               map[file_index] << "variables.#{path.join(".")}"
               copy[key] = nil
             elsif orig[key].object_id == copy[key].object_id

lib/graphql/stitching/planner.rb

@@ -93,7 +93,7 @@ def add_step(
         step = @steps_by_entrypoint[entrypoint]
         next_index = step ? parent_index : @planning_index += 1
 
-        if selections.any?
+        unless selections.empty?
           selections = extract_locale_selections(location, parent_type, next_index, selections, path, variables)
         end
 

lib/graphql/stitching/request.rb

@@ -101,7 +101,7 @@ def operation_name
 
       # @return [String] A string of directives applied to the root operation. These are passed through in all subgraph requests.
       def operation_directives
-        @operation_directives ||= if operation.directives.any?
+        @operation_directives ||= unless operation.directives.empty?
           printer = GraphQL::Language::Printer.new
           operation.directives.map { printer.print(_1) }.join(" ")
         end

lib/graphql/stitching/request/skip_include.rb

@@ -34,7 +34,7 @@ def render_node(parent_node, variables)
               next nil
             end
 
-            node = render_node(node, variables) if node.selections.any?
+            node = render_node(node, variables) unless node.selections.empty?
             changed ||= node.object_id != original_node.object_id
             node
           end
@@ -51,7 +51,7 @@ def render_node(parent_node, variables)
         end
 
         def prune_node(node, variables)
-          return node unless node.directives.any?
+          return node if node.directives.empty?
 
           delete_node = false
           filtered_directives = node.directives.reject do |directive|