Validation: improving overlapping fields quality. Commit: graphql/graphql-js@4afb263#diff-325ff93247e6e817d761b030604b95c0L369

Author: markusdap

graphql/pyutils/pair_set.py

@@ -2,19 +2,44 @@ class PairSet(object):
     __slots__ = '_data',
 
     def __init__(self):
-        self._data = set()
+        self._data = {}
 
     def __contains__(self, item):
-        return item in self._data
+        return self.has(item[0], item[1], item[2])
 
-    def has(self, a, b):
-        return (a, b) in self._data
+    def __str__(self):
+        return str(self._data)
 
-    def add(self, a, b):
-        self._data.add((a, b))
-        self._data.add((b, a))
+    def __repr__(self):
+        return str(self._data)
+
+    def has(self, a, b, are_mutually_exclusive):
+        first = self._data.get(a)
+        print(first)
+        result = first and first.get(b)
+        print(result)
+        if result is None:
+            return False
+
+        # are_mutually_exclusive being false is a superset of being true,
+        # hence if we want to know if this PairSet "has" these two with no
+        # exclusivity, we have to ensure it was added as such.
+        if not are_mutually_exclusive:
+            return not result
+
+        return True
+
+    def add(self, a, b, are_mutually_exclusive):
+        _pair_set_add(self._data, a, b, are_mutually_exclusive)
+        _pair_set_add(self._data, b, a, are_mutually_exclusive)
         return self
 
-    def remove(self, a, b):
-        self._data.discard((a, b))
-        self._data.discard((b, a))
+
+def _pair_set_add(data, a, b, are_mutually_exclusive):
+    sub_dict = data.get(a)
+
+    if not sub_dict:
+        sub_dict = {}
+        data[a] = sub_dict
+
+    sub_dict[b] = are_mutually_exclusive

graphql/pyutils/tests/test_pair_set.py

@@ -3,25 +3,39 @@
 
 def test_pair_set():
     ps = PairSet()
+    are_mutually_exclusive = True
 
-    ps.add(1, 2)
-    ps.add(2, 4)
+    ps.add(1, 2, are_mutually_exclusive)
+    ps.add(2, 4, are_mutually_exclusive)
 
-    assert ps.has(1, 2)
-    assert ps.has(2, 1)
-    assert (1, 2) in ps
-    assert (2, 1) in ps
-    assert ps.has(4, 2)
-    assert ps.has(2, 4)
+    assert ps.has(1, 2, are_mutually_exclusive)
+    assert ps.has(2, 1, are_mutually_exclusive)
+    assert not ps.has(1, 2, not are_mutually_exclusive)
+    assert not ps.has(2, 1, not are_mutually_exclusive)
 
-    assert not ps.has(2, 3)
-    assert not ps.has(1, 3)
+    assert (1, 2, are_mutually_exclusive) in ps
+    assert (2, 1, are_mutually_exclusive) in ps
+    assert (1, 2, (not are_mutually_exclusive)) not in ps
+    assert (2, 1, (not are_mutually_exclusive)) not in ps
 
-    ps.remove(1, 2)
-    assert not ps.has(1, 2)
-    assert not ps.has(2, 1)
-    assert (1, 2) not in ps
-    assert (2, 1) not in ps
+    assert ps.has(4, 2, are_mutually_exclusive)
+    assert ps.has(2, 4, are_mutually_exclusive)
 
-    assert ps.has(4, 2)
-    assert ps.has(2, 4)
+    assert not ps.has(2, 3, are_mutually_exclusive)
+    assert not ps.has(1, 3, are_mutually_exclusive)
+
+    assert ps.has(4, 2, are_mutually_exclusive)
+    assert ps.has(2, 4, are_mutually_exclusive)
+
+
+def test_pair_set_not_mutually_exclusive():
+    ps = PairSet()
+    are_mutually_exclusive = False
+
+    ps.add(1, 2, are_mutually_exclusive)
+
+    assert ps.has(1, 2, are_mutually_exclusive)
+    assert ps.has(2, 1, are_mutually_exclusive)
+
+    assert ps.has(1, 2, not are_mutually_exclusive)
+    assert ps.has(2, 1, not are_mutually_exclusive)