Merge pull request #36 from jhgg/clean-up-no-undefined-variables

Clean up no undefined variables

Author: dittos

graphql/core/validation/rules.py

@@ -309,11 +309,12 @@ def collect_fragment_spread_nodes(self):
 
 
 class NoUndefinedVariables(ValidationRule):
+    visit_spread_fragments = True
+
     def __init__(self, context):
         self.operation = None
-        self.visited_fragment_names = {}
-        self.defined_variable_names = {}
-        self.visit_spread_fragments = True
+        self.visited_fragment_names = set()
+        self.defined_variable_names = set()
         super(NoUndefinedVariables, self).__init__(context)
 
     @staticmethod
@@ -328,22 +329,22 @@ def undefined_var_by_op_message(var_name, op_name):
 
     def enter_OperationDefinition(self, node, *args):
         self.operation = node
-        self.visited_fragment_names = {}
-        self.defined_variable_names = {}
+        self.visited_fragment_names = set()
+        self.defined_variable_names = set()
 
     def enter_VariableDefinition(self, node, *args):
-        self.defined_variable_names[node.variable.name.value] = True
+        self.defined_variable_names.add(node.variable.name.value)
 
     def enter_Variable(self, variable, key, parent, path, ancestors):
         var_name = variable.name.value
         if var_name not in self.defined_variable_names:
-            is_fragment = lambda node: isinstance(node, ast.FragmentDefinition)
-            within_fragment = any(is_fragment(node) for node in ancestors)
+            within_fragment = any(isinstance(node, ast.FragmentDefinition) for node in ancestors)
             if within_fragment and self.operation and self.operation.name:
                 return GraphQLError(
                     self.undefined_var_by_op_message(var_name, self.operation.name.value),
                     [variable, self.operation]
                 )
+
             return GraphQLError(
                 self.undefined_var_message(var_name),
                 [variable]
@@ -352,7 +353,8 @@ def enter_Variable(self, variable, key, parent, path, ancestors):
     def enter_FragmentSpread(self, spread_ast, *args):
         if spread_ast.name.value in self.visited_fragment_names:
             return False
-        self.visited_fragment_names[spread_ast.name.value] = True
+
+        self.visited_fragment_names.add(spread_ast.name.value)
 
 
 class NoUnusedVariables(ValidationRule):