Code cleanup

Author: rmosolgo

lib/graphql/static_validation/base_visitor.rb

@@ -24,6 +24,33 @@ def path
         @path.dup
       end
 
+      # Build a class to visit the AST and perform validation,
+      # or use a pre-built class if rules is `ALL_RULES` or empty.
+      # @param rules [Array<Module, Class>]
+      # @return [Class] A class for validating `rules` during visitation
+      def self.including_rules(rules)
+        if rules.none?
+          NoValidateVisitor
+        elsif rules == ALL_RULES
+          DefaultVisitor
+        else
+          visitor_class = Class.new(self) do
+            include(GraphQL::StaticValidation::DefinitionDependencies)
+          end
+
+          rules.reverse_each do |r|
+            # If it's a class, it gets attached later.
+            if !r.is_a?(Class)
+              visitor_class.include(r)
+            end
+          end
+
+          visitor_class.include(GraphQL::InternalRepresentation::Rewrite)
+          visitor_class.include(ContextMethods)
+          visitor_class
+        end
+      end
+
       module ContextMethods
         def on_operation_definition(node, parent)
           object_type = @schema.root_type_for_operation(node.operation_type)

lib/graphql/static_validation/default_visitor.rb

@@ -9,7 +9,7 @@ class DefaultVisitor < BaseVisitor
       end
 
       include(GraphQL::InternalRepresentation::Rewrite)
-      prepend(ContextMethods)
+      include(ContextMethods)
     end
   end
 end

lib/graphql/static_validation/no_validate_visitor.rb

@@ -4,7 +4,7 @@ module StaticValidation
     class NoValidateVisitor < StaticValidation::BaseVisitor
       include(GraphQL::InternalRepresentation::Rewrite)
       include(GraphQL::StaticValidation::DefinitionDependencies)
-      prepend(ContextMethods)
+      include(ContextMethods)
     end
   end
 end

lib/graphql/static_validation/rules/arguments_are_defined.rb

@@ -24,7 +24,7 @@ def on_argument(node, parent)
           raise "Unexpected argument parent: #{parent.class} (##{parent})"
         end
 
-        if parent_defn && (argument_defn = context.warden.arguments(parent_defn).find { |arg| arg.name == node.name })
+        if parent_defn && context.warden.arguments(parent_defn).any? { |arg| arg.name == node.name }
           super
         elsif parent_defn
           kind_of_node = node_type(parent)

lib/graphql/static_validation/rules/variables_are_used_and_defined.rb

@@ -53,7 +53,6 @@ def on_fragment_definition(node, parent)
         @variable_context_stack.pop
       end
 
-
       # For FragmentSpreads:
       #  - find the context on the stack
       #  - mark the context as containing this spread

lib/graphql/static_validation/validator.rb

@@ -24,38 +24,15 @@ def initialize(schema:, rules: GraphQL::StaticValidation::ALL_RULES)
       def validate(query, validate: true)
         query.trace("validate", { validate: validate, query: query }) do
 
-          visitor_class = if validate == false
-            # This visitor tracks context info, but doesn't apply any rules
-            StaticValidation::NoValidateVisitor
-          elsif @rules == ALL_RULES
-            # This visitor applies the default rules
-            StaticValidation::DefaultVisitor
-          else
-            # Create a visitor on the fly
-            custom_class = Class.new(StaticValidation::BaseVisitor) do
-              include DefinitionDependencies
-            end
-
-            @rules.reverse_each do |r|
-              if !r.is_a?(Class)
-                custom_class.include(r)
-              end
-            end
-            custom_class.include(GraphQL::InternalRepresentation::Rewrite)
-            custom_class.prepend(StaticValidation::BaseVisitor::ContextMethods)
-            custom_class
-          end
+          rules_to_use = validate ? @rules : []
+          visitor_class = BaseVisitor.including_rules(rules_to_use)
 
           context = GraphQL::StaticValidation::ValidationContext.new(query, visitor_class)
-          visitor = context.visitor
 
-          # If the caller opted out of validation, don't attach these
-          if validate
-            # Attach legacy-style rules
-            @rules.each do |rule_class_or_module|
-              if rule_class_or_module.method_defined?(:validate)
-                rule_class_or_module.new.validate(context)
-              end
+          # Attach legacy-style rules
+          rules_to_use.each do |rule_class_or_module|
+            if rule_class_or_module.method_defined?(:validate)
+              rule_class_or_module.new.validate(context)
             end
           end