Factor out instance methods to normal methods. Commit: graphql/graphql-js@3a01fac

Author: markusdap

graphql/validation/rules/overlapping_fields_can_be_merged.py

@@ -114,45 +114,17 @@ def find_conflict(self, parent_fields_are_mutually_exclusive, response_name, fie
                 [ast2]
             )
 
-        subfield_map = self.get_subfield_map(ast1, type1, ast2, type2)
+        subfield_map = _get_subfield_map(self.context, ast1, type1, ast2, type2)
         if subfield_map:
             conflicts = self.find_conflicts(fields_are_mutually_exclusive, subfield_map)
-            return self.subfield_conflicts(conflicts, response_name, ast1, ast2)
-
-    def get_subfield_map(self, ast1, type1, ast2, type2):
-        selection_set1 = ast1.selection_set
-        selection_set2 = ast2.selection_set
-
-        if selection_set1 and selection_set2:
-            visited_fragment_names = set()
-
-            subfield_map = self.collect_field_asts_and_defs(
-                get_named_type(type1),
-                selection_set1,
-                visited_fragment_names
-            )
-
-            subfield_map = self.collect_field_asts_and_defs(
-                get_named_type(type2),
-                selection_set2,
-                visited_fragment_names,
-                subfield_map
-            )
-            return subfield_map
-
-    def subfield_conflicts(self, conflicts, response_name, ast1, ast2):
-        if conflicts:
-            return (
-                (response_name, [conflict[0] for conflict in conflicts]),
-                tuple(itertools.chain([ast1], *[conflict[1] for conflict in conflicts])),
-                tuple(itertools.chain([ast2], *[conflict[2] for conflict in conflicts]))
-            )
+            return _subfield_conflicts(conflicts, response_name, ast1, ast2)
 
     def leave_SelectionSet(self, node, key, parent, path, ancestors):
         # Note: we validate on the reverse traversal so deeper conflicts will be
         # caught first, for correct calculation of mutual exclusivity and for
         # clearer error messages.
-        field_map = self.collect_field_asts_and_defs(
+        field_map = _collect_field_asts_and_defs(
+            self.context,
             self.context.get_parent_type(),
             node
         )
@@ -199,62 +171,6 @@ def same_arguments(cls, arguments1, arguments2):
 
         return True
 
-    def collect_field_asts_and_defs(self, parent_type, selection_set, visited_fragment_names=None, ast_and_defs=None):
-        if visited_fragment_names is None:
-            visited_fragment_names = set()
-
-        if ast_and_defs is None:
-            # An ordered dictionary is required, otherwise the error message will be out of order.
-            # We need to preserve the order that the item was inserted into the dict, as that will dictate
-            # in which order the reasons in the error message should show.
-            # Otherwise, the error messages will be inconsistently ordered for the same AST.
-            # And this can make it so that tests fail half the time, and fool a user into thinking that
-            # the errors are different, when in-fact they are the same, just that the ordering of the reasons differ.
-            ast_and_defs = DefaultOrderedDict(list)
-
-        for selection in selection_set.selections:
-            if isinstance(selection, ast.Field):
-                field_name = selection.name.value
-                field_def = None
-                if isinstance(parent_type, (GraphQLObjectType, GraphQLInterfaceType)):
-                    field_def = parent_type.get_fields().get(field_name)
-
-                response_name = selection.alias.value if selection.alias else field_name
-                ast_and_defs[response_name].append((parent_type, selection, field_def))
-
-            elif isinstance(selection, ast.InlineFragment):
-                type_condition = selection.type_condition
-                inline_fragment_type = \
-                    type_from_ast(self.context.get_schema(), type_condition) \
-                    if type_condition else parent_type
-
-                self.collect_field_asts_and_defs(
-                    inline_fragment_type,
-                    selection.selection_set,
-                    visited_fragment_names,
-                    ast_and_defs
-                )
-
-            elif isinstance(selection, ast.FragmentSpread):
-                fragment_name = selection.name.value
-                if fragment_name in visited_fragment_names:
-                    continue
-
-                visited_fragment_names.add(fragment_name)
-                fragment = self.context.get_fragment(fragment_name)
-
-                if not fragment:
-                    continue
-
-                self.collect_field_asts_and_defs(
-                    type_from_ast(self.context.get_schema(), fragment.type_condition),
-                    fragment.selection_set,
-                    visited_fragment_names,
-                    ast_and_defs
-                )
-
-        return ast_and_defs
-
     @classmethod
     def fields_conflict_message(cls, reason_name, reason):
         return (
@@ -272,6 +188,98 @@ def reason_message(cls, reason):
         return reason
 
 
+def _collect_field_asts_and_defs(context, parent_type, selection_set, visited_fragment_names=None, ast_and_defs=None):
+    if visited_fragment_names is None:
+        visited_fragment_names = set()
+
+    if ast_and_defs is None:
+        # An ordered dictionary is required, otherwise the error message will be out of order.
+        # We need to preserve the order that the item was inserted into the dict, as that will dictate
+        # in which order the reasons in the error message should show.
+        # Otherwise, the error messages will be inconsistently ordered for the same AST.
+        # And this can make it so that tests fail half the time, and fool a user into thinking that
+        # the errors are different, when in-fact they are the same, just that the ordering of the reasons differ.
+        ast_and_defs = DefaultOrderedDict(list)
+
+    for selection in selection_set.selections:
+        if isinstance(selection, ast.Field):
+            field_name = selection.name.value
+            field_def = None
+            if isinstance(parent_type, (GraphQLObjectType, GraphQLInterfaceType)):
+                field_def = parent_type.get_fields().get(field_name)
+
+            response_name = selection.alias.value if selection.alias else field_name
+            ast_and_defs[response_name].append((parent_type, selection, field_def))
+
+        elif isinstance(selection, ast.InlineFragment):
+            type_condition = selection.type_condition
+            inline_fragment_type = \
+                type_from_ast(context.get_schema(), type_condition) \
+                if type_condition else parent_type
+
+            _collect_field_asts_and_defs(
+                context,
+                inline_fragment_type,
+                selection.selection_set,
+                visited_fragment_names,
+                ast_and_defs
+            )
+
+        elif isinstance(selection, ast.FragmentSpread):
+            fragment_name = selection.name.value
+            if fragment_name in visited_fragment_names:
+                continue
+
+            visited_fragment_names.add(fragment_name)
+            fragment = context.get_fragment(fragment_name)
+
+            if not fragment:
+                continue
+
+            _collect_field_asts_and_defs(
+                context,
+                type_from_ast(context.get_schema(), fragment.type_condition),
+                fragment.selection_set,
+                visited_fragment_names,
+                ast_and_defs
+            )
+
+    return ast_and_defs
+
+
+def _get_subfield_map(context, ast1, type1, ast2, type2):
+    selection_set1 = ast1.selection_set
+    selection_set2 = ast2.selection_set
+
+    if selection_set1 and selection_set2:
+        visited_fragment_names = set()
+
+        subfield_map = _collect_field_asts_and_defs(
+            context,
+            get_named_type(type1),
+            selection_set1,
+            visited_fragment_names
+        )
+
+        subfield_map = _collect_field_asts_and_defs(
+            context,
+            get_named_type(type2),
+            selection_set2,
+            visited_fragment_names,
+            subfield_map
+        )
+        return subfield_map
+
+
+def _subfield_conflicts(conflicts, response_name, ast1, ast2):
+    if conflicts:
+        return (
+            (response_name, [conflict[0] for conflict in conflicts]),
+            tuple(itertools.chain([ast1], *[conflict[1] for conflict in conflicts])),
+            tuple(itertools.chain([ast2], *[conflict[2] for conflict in conflicts]))
+        )
+
+
 def do_types_conflict(type1, type2):
     if isinstance(type1, GraphQLList):
         if isinstance(type2, GraphQLList):