graphql 1.9.0.pre3 → 1.9.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d574e6bf6c3c4644fd85e279ddf56ab3128bef2d
-  data.tar.gz: a6227d0ec2ee59131b2de45ccf87c2541279543d
+  metadata.gz: 1e4a203b440499962202563a6c4c834e14881c5c
+  data.tar.gz: 76c0395eb02e5bea7652869c9c665df092cd54ac
 SHA512:
-  metadata.gz: 3d91a0736831fa204240513b2cff401bf51a8ffb09739662fd95415bf2a91f53f088dcbcb026ff883d43476980260d1ab222d6bd5c969060ce279e9badf7ecb5
-  data.tar.gz: 0eaa0115f08cae059cb4d514fc572cf064956dda38ac87919d841b72103aa67df7f871e761375704ade18b5e77c474c99e5e514dcb098608bba7b3e629a0241d
+  metadata.gz: b689670d32855deefb65dacf51f1ea3e37123e5934b2eb8ca43070ad3ee562405f99ce3c420faee173fa77badde9c11089975238c0de1782a5692ebab1319808
+  data.tar.gz: 3b48af200dccfdd63783f980e8c808f52823c46bb711d1b7f2c63867ae819e1e458e0dc796034ab703d002bac33723a30816b1e2ad17d6536709523b8f07fd03

data/lib/graphql/analysis/ast/visitor.rb

@@ -32,6 +32,11 @@ module GraphQL
         # @return [Array<GraphQL::ObjectType>] Types whose scope we've entered
         attr_reader :object_types
 
+        def visit
+          return unless @document
+          super
+        end
+
         # Visit Helpers
 
         # @return [GraphQL::Query::Arguments] Arguments for this node, merging default values, literal values and query variables

data/lib/graphql/execution/interpreter/hash_response.rb

@@ -21,7 +21,7 @@ module GraphQL
         # Add `value` at `path`.
         # @return [void]
         def write(path, value)
-          if path.size == 0 # faster than #none?
+          if path.empty?
             @result = value
           elsif (write_target = @result)
             i = 0

data/lib/graphql/execution/interpreter/resolve.rb

@@ -4,6 +4,8 @@ module GraphQL
   module Execution
     class Interpreter
       module Resolve
+        # Continue field results in `results` until there's nothing else to continue.
+        # @return [void]
         def self.resolve_all(results)
           while results.any?
             results = resolve(results)

data/lib/graphql/execution/interpreter/runtime.rb

@@ -192,18 +192,27 @@ module GraphQL
               field_ast_nodes.each { |f| next_selections.concat(f.selections) }
             end
 
-            resolve_with_directives(object, ast_node) do
+            field_result = resolve_with_directives(object, ast_node) do
               # Actually call the field resolver and capture the result
               app_result = query.trace("execute_field", {field: field_defn, path: next_path}) do
                 field_defn.resolve(object, kwarg_arguments, context)
               end
-              after_lazy(app_result, field: field_defn, path: next_path, eager: root_operation_type == "mutation") do |inner_result|
+              after_lazy(app_result, field: field_defn, path: next_path) do |inner_result|
                 continue_value = continue_value(next_path, inner_result, field_defn, return_type.non_null?, ast_node)
                 if HALT != continue_value
                   continue_field(next_path, continue_value, field_defn, return_type, ast_node, next_selections, false)
                 end
               end
             end
+
+            # If this field is a root mutation field, immediately resolve
+            # all of its child fields before moving on to the next root mutation field.
+            # (Subselections of this mutation will still be resolved level-by-level.)
+            if root_operation_type == "mutation"
+              Interpreter::Resolve.resolve_all([field_result])
+            else
+              field_result
+            end
           end
         end
 

data/lib/graphql/execution/lookahead.rb

@@ -215,7 +215,7 @@ module GraphQL
         case node
         when GraphQL::Language::Nodes::Field
           if node.name == field_name
-            if arguments.nil? || arguments.none?
+            if arguments.nil? || arguments.empty?
               # No constraint applied
               matches << node
             else

data/lib/graphql/internal_representation/rewrite.rb

@@ -102,13 +102,13 @@ module GraphQL
           @rewrite_skip_nodes.add(node)
         end
 
-        if @rewrite_skip_nodes.none?
+        if @rewrite_skip_nodes.empty?
           @rewrite_scopes_stack.push(@rewrite_scopes_stack.last.enter(context.type_definition))
         end
 
         super
 
-        if @rewrite_skip_nodes.none?
+        if @rewrite_skip_nodes.empty?
           @rewrite_scopes_stack.pop
         end
 
@@ -122,7 +122,7 @@ module GraphQL
           @rewrite_skip_nodes.add(ast_node)
         end
 
-        if @rewrite_skip_nodes.none?
+        if @rewrite_skip_nodes.empty?
           node_name = ast_node.alias || ast_node.name
           parent_nodes = @rewrite_nodes_stack.last
           next_nodes = []
@@ -156,7 +156,7 @@ module GraphQL
 
         super
 
-        if @rewrite_skip_nodes.none?
+        if @rewrite_skip_nodes.empty?
           @rewrite_nodes_stack.pop
           @rewrite_scopes_stack.pop
         end
@@ -167,7 +167,7 @@ module GraphQL
       end
 
       def on_fragment_spread(ast_node, ast_parent)
-        if @rewrite_skip_nodes.none? && !skip?(ast_node)
+        if @rewrite_skip_nodes.empty? && !skip?(ast_node)
           # Register the irep nodes that depend on this AST node:
           @rewrite_spread_parents[ast_node].merge(@rewrite_nodes_stack.last)
           @rewrite_spread_scopes[ast_node] = @rewrite_scopes_stack.last

data/lib/graphql/language/parser.rb

@@ -28,7 +28,7 @@ def parse_document
     end
     # From the tokens, build an AST
     @tracer.trace("parse", {query_string: @query_string}) do
-      if @tokens.none?
+      if @tokens.empty?
         make_node(:Document, definitions: [], filename: @filename)
       else
         do_parse

data/lib/graphql/language/parser.y

@@ -447,7 +447,7 @@ def parse_document
     end
     # From the tokens, build an AST
     @tracer.trace("parse", {query_string: @query_string}) do
-      if @tokens.none?
+      if @tokens.empty?
         make_node(:Document, definitions: [], filename: @filename)
       else
         do_parse

data/lib/graphql/language/printer.rb

@@ -135,7 +135,7 @@ module GraphQL
         if (schema.query.nil? || schema.query == 'Query') &&
            (schema.mutation.nil? || schema.mutation == 'Mutation') &&
            (schema.subscription.nil? || schema.subscription == 'Subscription') &&
-           (schema.directives.none?)
+           (schema.directives.empty?)
           return
         end
 

data/lib/graphql/language/visitor.rb

@@ -96,7 +96,7 @@ module GraphQL
         else
           # Run hooks if there are any
           new_node = node
-          begin_hooks_ok = @visitors.none? || begin_visit(new_node, parent)
+          begin_hooks_ok = @visitors.empty? || begin_visit(new_node, parent)
           if begin_hooks_ok
             node.children.each do |child_node|
               new_child_and_node = on_node_with_modifications(child_node, new_node)

data/lib/graphql/query.rb

@@ -239,7 +239,7 @@ module GraphQL
 
     attr_accessor :analysis_errors
     def valid?
-      validation_pipeline.valid? && analysis_errors.none?
+      validation_pipeline.valid? && analysis_errors.empty?
     end
 
     def warden

data/lib/graphql/query/arguments.rb

@@ -168,7 +168,7 @@ module GraphQL
             memo[key] = unwrap_value(value)
             memo
           end
-        when GraphQL::Query::Arguments
+        when GraphQL::Query::Arguments, GraphQL::Schema::InputObject
           value.to_h
         else
           value

data/lib/graphql/query/arguments_cache.rb

@@ -8,7 +8,7 @@ module GraphQL
         Hash.new do |h1, irep_or_ast_node|
           h1[irep_or_ast_node] = Hash.new do |h2, definition|
             ast_node = irep_or_ast_node.is_a?(GraphQL::InternalRepresentation::Node) ? irep_or_ast_node.ast_node : irep_or_ast_node
-            h2[definition] = if definition.arguments.none?
+            h2[definition] = if definition.arguments.empty?
               GraphQL::Query::Arguments::NO_ARGS
             else
               GraphQL::Query::LiteralInput.from_arguments(

data/lib/graphql/query/validation_pipeline.rb

@@ -76,11 +76,11 @@ module GraphQL
           @validation_errors.concat(validation_result[:errors])
           @internal_representation = validation_result[:irep]
 
-          if @validation_errors.none?
+          if @validation_errors.empty?
             @validation_errors.concat(@query.variables.errors)
           end
 
-          if @validation_errors.none?
+          if @validation_errors.empty?
             @query_analyzers = build_analyzers(
               @schema,
               @max_depth,
@@ -89,7 +89,7 @@ module GraphQL
           end
         end
 
-        @valid = @validation_errors.none?
+        @valid = @validation_errors.empty?
       end
 
       # If there are max_* values, add them,

data/lib/graphql/schema.rb

@@ -184,7 +184,7 @@ module GraphQL
       @context_class = GraphQL::Query::Context
       @introspection_namespace = nil
       @introspection_system = nil
-      @interpeter = false
+      @interpreter = false
       @error_bubbling = false
     end
 

data/lib/graphql/schema/field.rb

@@ -63,6 +63,16 @@ module GraphQL
       # @return [GraphQL::Schema:Field] an instance of `self
       # @see {.initialize} for other options
       def self.from_options(name = nil, type = nil, desc = nil, resolver: nil, mutation: nil, subscription: nil,**kwargs, &block)
+        if kwargs[:field]
+          if kwargs[:field] == GraphQL::Relay::Node.field
+            warn("Legacy-style `GraphQL::Relay::Node.field` is being added to a class-based type. See `GraphQL::Types::Relay::NodeField` for a replacement.")
+            return GraphQL::Types::Relay::NodeField
+          elsif kwargs[:field] == GraphQL::Relay::Node.plural_field
+            warn("Legacy-style `GraphQL::Relay::Node.plural_field` is being added to a class-based type. See `GraphQL::Types::Relay::NodesField` for a replacement.")
+            return GraphQL::Types::Relay::NodesField
+          end
+        end
+
         if (parent_config = resolver || mutation || subscription)
           # Get the parent config, merge in local overrides
           kwargs = parent_config.field_options.merge(kwargs)
@@ -602,7 +612,7 @@ MSG
       # Written iteratively to avoid big stack traces.
       # @return [Object] Whatever the
       def with_extensions(obj, args, ctx)
-        if @extensions.none?
+        if @extensions.empty?
           yield(obj, args)
         else
           # Save these so that the originals can be re-given to `after_resolve` handlers.
@@ -610,17 +620,9 @@ MSG
           original_obj = obj
 
           memos = []
-          @extensions.each do |ext|
-            ext.before_resolve(object: obj, arguments: args, context: ctx) do |extended_obj, extended_args, memo|
-              # update this scope with the yielded value
-              obj = extended_obj
-              args = extended_args
-              # record the memo (or nil if none was yielded)
-              memos << memo
-            end
+          value = run_extensions_before_resolve(memos, obj, args, ctx) do |extended_obj, extended_args|
+            yield(extended_obj, extended_args)
           end
-          # Call the block which actually calls resolve
-          value = yield(obj, args)
 
           ctx.schema.after_lazy(value) do |resolved_value|
             @extensions.each_with_index do |ext, idx|
@@ -632,6 +634,18 @@ MSG
           end
         end
       end
+
+      def run_extensions_before_resolve(memos, obj, args, ctx, idx: 0)
+        extension = @extensions[idx]
+        if extension
+          extension.resolve(object: obj, arguments: args, context: ctx) do |extended_obj, extended_args, memo|
+            memos << memo
+            run_extensions_before_resolve(memos, extended_obj, extended_args, ctx, idx: idx + 1) { |o, a| yield(o, a) }
+          end
+        else
+          yield(obj, args)
+        end
+      end
     end
   end
 end

data/lib/graphql/schema/field/connection_extension.rb

@@ -12,7 +12,7 @@ module GraphQL
         end
 
         # Remove pagination args before passing it to a user method
-        def before_resolve(object:, arguments:, context:)
+        def resolve(object:, arguments:, context:)
           next_args = arguments.dup
           next_args.delete(:first)
           next_args.delete(:last)

data/lib/graphql/schema/field_extension.rb

@@ -33,25 +33,33 @@ module GraphQL
       end
 
       # Called before resolving {#field}. It should either:
+      #
       # - `yield` values to continue execution; OR
       # - return something else to shortcut field execution.
+      #
+      # Whatever this method returns will be used for execution.
+      #
       # @param object [Object] The object the field is being resolved on
       # @param arguments [Hash] Ruby keyword arguments for resolving this field
       # @param context [Query::Context] the context for this query
       # @yieldparam object [Object] The object to continue resolving the field on
       # @yieldparam arguments [Hash] The keyword arguments to continue resolving with
       # @yieldparam memo [Object] Any extension-specific value which will be passed to {#after_resolve} later
-      def before_resolve(object:, arguments:, context:)
+      # @return [Object] The return value for this field.
+      def resolve(object:, arguments:, context:)
         yield(object, arguments, nil)
       end
 
-      # Called after {#field} was resolved, but before the value was added to the GraphQL response.
+      # Called after {#field} was resolved, and after any lazy values (like `Promise`s) were synced,
+      # but before the value was added to the GraphQL response.
+      #
       # Whatever this hook returns will be used as the return value.
+      #
       # @param object [Object] The object the field is being resolved on
       # @param arguments [Hash] Ruby keyword arguments for resolving this field
       # @param context [Query::Context] the context for this query
       # @param value [Object] Whatever the field previously returned
-      # @param memo [Object] The third value yielded by {#before_resolve}, or `nil` if there wasn't one
+      # @param memo [Object] The third value yielded by {#resolve}, or `nil` if there wasn't one
       # @return [Object] The return value for this field.
       def after_resolve(object:, arguments:, context:, value:, memo:)
         value

data/lib/graphql/schema/mutation.rb

@@ -65,7 +65,7 @@ module GraphQL
       class << self
         # Override this method to handle legacy-style usages of `MyMutation.field`
         def field(*args, &block)
-          if args.none?
+          if args.empty?
             raise ArgumentError, "#{name}.field is used for adding fields to this mutation. Use `mutation: #{name}` to attach this mutation instead."
           else
             super

data/lib/graphql/static_validation/base_visitor.rb

@@ -35,7 +35,7 @@ module GraphQL
       # @param rewrite [Boolean] if `false`, don't include rewrite
       # @return [Class] A class for validating `rules` during visitation
       def self.including_rules(rules, rewrite: true)
-        if rules.none?
+        if rules.empty?
           if rewrite
             NoValidateVisitor
           else

data/lib/graphql/static_validation/definition_dependencies.rb

@@ -134,7 +134,7 @@ module GraphQL
           # That way, we can use the remainder to identify cycles
           @defdep_immediate_dependencies.delete(fragment_node)
           fragment_usages = @defdep_dependent_definitions[fragment_node]
-          if fragment_usages.none?
+          if fragment_usages.empty?
             # If we didn't record any usages during the visit,
             # then this fragment is unused.
             dependency_map.unused_dependencies << @defdep_node_paths[fragment_node]
@@ -151,7 +151,7 @@ module GraphQL
               if block_given?
                 yield(definition_node, removed, fragment_node)
               end
-              if remaining.none? && definition_node.is_a?(GraphQL::Language::Nodes::FragmentDefinition)
+              if remaining.empty? && definition_node.is_a?(GraphQL::Language::Nodes::FragmentDefinition)
                 # If all of this definition's dependencies have
                 # been resolved, we can now resolve its
                 # own dependents.
@@ -171,7 +171,7 @@ module GraphQL
               deps.delete(spread)
             end
           end
-          if deps.none?
+          if deps.empty?
             @defdep_immediate_dependencies.delete(defn_node)
           end
         end

data/lib/graphql/static_validation/literal_validator.rb

@@ -87,7 +87,7 @@ module GraphQL
         present_field_names = ast_node.arguments.map(&:name)
         missing_required_field_names = required_field_names - present_field_names
         if @context.schema.error_bubbling
-          missing_required_field_names.none?
+          missing_required_field_names.empty?
         else
           missing_required_field_names.all? do |name|
             validate(GraphQL::Language::Nodes::NullValue.new(name: name), @warden.arguments(type).find { |f| f.name == name }.type )

data/lib/graphql/static_validation/rules/argument_literals_are_compatible.rb

@@ -43,7 +43,7 @@ module GraphQL
               # the same as the node we were checking here.
               matched = if arg_defn.type.kind.list?
                 # for a list we claim an error if the node is contained in our list
-                node.value.include?(err.ast_value)
+                Array(node.value).include?(err.ast_value)
               elsif arg_defn.type.kind.input_object? && node.value.is_a?(GraphQL::Language::Nodes::InputObject)
                 # for an input object we check the arguments
                 node.value.arguments.include?(err.ast_value)

data/lib/graphql/static_validation/rules/fields_have_appropriate_selections.rb

@@ -31,7 +31,7 @@ module GraphQL
           else
             "Selections can't be made on scalars (%{node_name} returns #{resolved_type.name} but has selections [#{ast_node.selections.map(&:name).join(", ")}])"
           end
-        elsif resolved_type.kind.fields? && ast_node.selections.none?
+        elsif resolved_type.kind.fields? && ast_node.selections.empty?
           "Field must have selections (%{node_name} returns #{resolved_type.name} but has no selections. Did you mean '#{ast_node.name} { ... }'?)"
         else
           nil

data/lib/graphql/static_validation/rules/fields_will_merge.rb

@@ -300,7 +300,7 @@ module GraphQL
       NO_SELECTIONS = [{}.freeze, [].freeze].freeze
 
       def fields_and_fragments_from_selection(node, owner_type:, parents:)
-        if node.selections.none?
+        if node.selections.empty?
           NO_SELECTIONS
         else
           fields, fragment_spreads = find_fields_and_fragments(node.selections, owner_type: owner_type, parents: parents, fields: [], fragment_spreads: [])

data/lib/graphql/static_validation/validator.rb

@@ -44,7 +44,7 @@ module GraphQL
           end
 
 
-          irep = if errors.none? && context
+          irep = if errors.empty? && context
             # Only return this if there are no errors and validation was actually run
             context.visitor.rewrite_document
           else