Use DirectiveChecks in SerialExecution

Author: rmosolgo

lib/graphql/execution/deferred_execution.rb

@@ -361,6 +361,14 @@ def resolve_value(scope, thread, frame, value, type_defn)
           case type_defn.kind
           when GraphQL::TypeKinds::SCALAR, GraphQL::TypeKinds::ENUM
             type_defn.coerce_result(value)
+          when GraphQL::TypeKinds::INTERFACE, GraphQL::TypeKinds::UNION
+            resolved_type = type_defn.resolve_type(value, scope)
+
+            if !resolved_type.is_a?(GraphQL::ObjectType)
+              raise GraphQL::ObjectType::UnresolvedTypeError.new(type_defn, value)
+            else
+              resolve_value(scope, thread, frame, value, resolved_type)
+            end
           when GraphQL::TypeKinds::NON_NULL
             wrapped_type = type_defn.of_type
             resolve_value(scope, thread, frame, value, wrapped_type)
@@ -387,14 +395,6 @@ def resolve_value(scope, thread, frame, value, type_defn)
               end
               resolved_values
             end
-          when GraphQL::TypeKinds::INTERFACE, GraphQL::TypeKinds::UNION
-            resolved_type = type_defn.resolve_type(value, scope)
-
-            if !resolved_type.is_a?(GraphQL::ObjectType)
-              raise GraphQL::ObjectType::UnresolvedTypeError.new(type_defn, value)
-            else
-              resolve_value(scope, thread, frame, value, resolved_type)
-            end
           when GraphQL::TypeKinds::OBJECT
             inner_frame = ExecFrame.new(
               node: frame.node,

lib/graphql/execution/directive_checks.rb

@@ -20,6 +20,7 @@ def stream?(ast_node)
         ast_node.directives.any? { |dir| dir.name == STREAM }
       end
 
+      # This covers `@include(if:)` & `@skip(if:)`
       # @return [Boolean] Should this AST node be skipped altogether?
       def skip?(ast_node, query)
         ast_node.directives.each do |ast_directive|

lib/graphql/query/directive_resolution.rb

@@ -41,14 +41,20 @@ def flatten_field(ast_node)
         end
 
         def flatten_inline_fragment(ast_node)
-          return {} unless GraphQL::Query::DirectiveResolution.include_node?(ast_node, execution_context.query)
-          flatten_fragment(ast_node)
+          if GraphQL::Execution::DirectiveChecks.skip?(ast_node, execution_context.query)
+            {}
+          else
+            flatten_fragment(ast_node)
+          end
         end
 
         def flatten_fragment_spread(ast_node)
-          return {} unless GraphQL::Query::DirectiveResolution.include_node?(ast_node, execution_context.query)
-          ast_fragment_defn = execution_context.get_fragment(ast_node.name)
-          flatten_fragment(ast_fragment_defn)
+          if GraphQL::Execution::DirectiveChecks.skip?(ast_node, execution_context.query)
+            {}
+          else
+            ast_fragment_defn = execution_context.get_fragment(ast_node.name)
+            flatten_fragment(ast_fragment_defn)
+          end
         end
 
         def flatten_fragment(ast_fragment)
@@ -89,13 +95,16 @@ def merge_fields(field1, field2)
         end
 
         def resolve_field(ast_node)
-          return {} unless GraphQL::Query::DirectiveResolution.include_node?(ast_node, execution_context.query)
-          execution_context.strategy.field_resolution.new(
-            ast_node,
-            type,
-            target,
-            execution_context
-          ).result
+          if GraphQL::Execution::DirectiveChecks.skip?(ast_node, execution_context.query)
+            {}
+          else
+            execution_context.strategy.field_resolution.new(
+              ast_node,
+              type,
+              target,
+              execution_context
+            ).result
+          end
         end
 
         def merge_into_result(memo, selection)