Merge pull request rmosolgo#348 from rmosolgo/ctx-middleware-fix

fix(Middleware) add ast_node and irep_node to query context for middlewares

Author: rmosolgo

lib/graphql/query/serial_execution/field_resolution.rb

@@ -61,44 +61,40 @@ def get_finished_value(raw_value)
         # is added to the "errors" key.
         def get_raw_value
           middlewares = execution_context.query.schema.middleware
-          field_resolve_step = FieldResolveStep.new(irep_node)
-          resolve_arguments = [parent_type, target, field, arguments, execution_context.query.context]
-          # only run a middleware chain if there are any middleware
-          if middlewares.any?
-            chain = GraphQL::Schema::MiddlewareChain.new(
-              steps: middlewares + [field_resolve_step],
-              arguments: resolve_arguments
-            )
-            chain.call
-          else
-            field_resolve_step.call(*resolve_arguments)
-          end
-        rescue GraphQL::ExecutionError => err
-          err
+          query_context = execution_context.query.context
+          # setup
+          query_context.ast_node = @irep_node.ast_node
+          query_context.irep_node = @irep_node
+
+          resolve_arguments = [parent_type, target, field, arguments, query_context]
+
+          resolve_value = begin
+              # only run a middleware chain if there are any middleware
+              if middlewares.any?
+                chain = GraphQL::Schema::MiddlewareChain.new(
+                  steps: middlewares + [FieldResolveStep],
+                  arguments: resolve_arguments
+                )
+                chain.call
+              else
+                FieldResolveStep.call(*resolve_arguments)
+              end
+            rescue GraphQL::ExecutionError => err
+              err
+            end
+        ensure
+          # teardown
+          query_context.ast_node = nil
+          query_context.irep_node = nil
+          resolve_value
         end
 
 
         # A `.call`-able suitable to be the last step in a middleware chain
-        class FieldResolveStep
-          def initialize(irep_node)
-            @irep_node = irep_node
-          end
-
+        module FieldResolveStep
           # Execute the field's resolve method
-          def call(_parent_type, parent_object, field_definition, field_args, context, _next = nil)
-            # setup
-            context.ast_node = @irep_node.ast_node
-            context.irep_node = @irep_node
-
-            # resolve
-            value = field_definition.resolve(parent_object, field_args, context)
-
-            # teardown
-            context.ast_node = nil
-            context.irep_node = nil
-
-            # return
-            value
+          def self.call(_parent_type, parent_object, field_definition, field_args, context, _next = nil)
+            field_definition.resolve(parent_object, field_args, context)
           end
         end
       end

spec/graphql/schema/timeout_middleware_spec.rb

@@ -166,7 +166,7 @@
   describe "with a custom block" do
     let(:timeout_middleware) {
       GraphQL::Schema::TimeoutMiddleware.new(max_seconds: max_seconds) do |err, query|
-        raise("Query timed out after 2s: #{query.class.name}")
+        raise("Query timed out after 2s: #{query.class.name} on #{query.context.ast_node.alias}")
       end
     }
     let(:query_string) {%|
@@ -180,7 +180,8 @@
     |}
 
     it "calls the block" do
-      assert_raises(RuntimeError) { result }
+      err = assert_raises(RuntimeError) { result }
+      assert_equal "Query timed out after 2s: GraphQL::Query on d", err.message
     end
   end
 end