Relaxing in restrictions.

packages/firestore/src/lite-api/query.ts

@@ -1076,20 +1076,14 @@ function conflictingOps(op: Operator): Operator[] {
     case Operator.NOT_EQUAL:
       return [Operator.NOT_EQUAL, Operator.NOT_IN];
     case Operator.ARRAY_CONTAINS:
-      return [
-        Operator.ARRAY_CONTAINS,
-        Operator.ARRAY_CONTAINS_ANY,
-        Operator.NOT_IN
-      ];
-    case Operator.IN:
-      return [Operator.ARRAY_CONTAINS_ANY, Operator.IN, Operator.NOT_IN];
     case Operator.ARRAY_CONTAINS_ANY:
       return [
         Operator.ARRAY_CONTAINS,
         Operator.ARRAY_CONTAINS_ANY,
-        Operator.IN,
         Operator.NOT_IN
       ];
+    case Operator.IN:
+      return [Operator.NOT_IN];
     case Operator.NOT_IN:
       return [
         Operator.ARRAY_CONTAINS,
@@ -1218,6 +1212,7 @@ export function validateQueryFilterConstraint(
   ) {
     throw new FirestoreError(
       Code.INVALID_ARGUMENT,
+
       `Function ${functionName}() requires AppliableConstraints created with a call to 'where(...)', 'or(...)', or 'and(...)'.`
     );
   }

packages/firestore/test/integration/api/query.test.ts

@@ -1574,6 +1574,246 @@ apiDescribe('Queries', (persistence: boolean) => {
         );
       });
     });
+
+    // TODO(orquery): Enable this test when prod supports OR queries.
+    // eslint-disable-next-line no-restricted-properties
+    it('supports multiple in ops', () => {
+      const testDocs = {
+        doc1: { a: 1, b: 0 },
+        doc2: { b: 1 },
+        doc3: { a: 3, b: 2 },
+        doc4: { a: 1, b: 3 },
+        doc5: { a: 1 },
+        doc6: { a: 2 }
+      };
+
+      return withTestCollection(persistence, testDocs, async coll => {
+        // Two IN operations on different fields with disjunction.
+        await checkOnlineAndOfflineResultsMatch(
+          query(
+            coll,
+            or(where('a', 'in', [2, 3]), where('b', 'in', [0, 2])),
+            orderBy('a')
+          ),
+          'doc1',
+          'doc6',
+          'doc3'
+        );
+
+        // Two IN operations on different fields with conjunction.
+        await checkOnlineAndOfflineResultsMatch(
+          query(
+            coll,
+            and(where('a', 'in', [2, 3]), where('b', 'in', [0, 2])),
+            orderBy('a')
+          ),
+          'doc3'
+        );
+
+        // Two IN operations on the same field.
+        // a IN [1,2,3] && a IN [0,1,4] should result in "a==1".
+        await checkOnlineAndOfflineResultsMatch(
+          query(
+            coll,
+            and(where('a', 'in', [1, 2, 3]), where('a', 'in', [0, 1, 4]))
+          ),
+          'doc1',
+          'doc4',
+          'doc5'
+        );
+
+        // a IN [2,3] && a IN [0,1,4] is never true and so the result should be an
+        // empty set.
+        await checkOnlineAndOfflineResultsMatch(
+          query(coll, and(where('a', 'in', [2, 3]), where('a', 'in', [0, 1, 4])))
+        );
+
+        // a IN [0,3] || a IN [0,2] should union them (similar to: a IN [0,2,3]).
+        await checkOnlineAndOfflineResultsMatch(
+          query(coll, or(where('a', 'in', [0, 3]), where('a', 'in', [0, 2]))),
+          'doc3',
+          'doc6'
+        );
+
+        // Nested composite filter on the same field.
+        await checkOnlineAndOfflineResultsMatch(
+          query(
+            coll,
+            and(
+              where('a', 'in', [1, 3]),
+              or(
+                where('a', 'in', [0, 2]),
+                and(where('b', '>=', 1), where('a', 'in', [1, 3]))
+              )
+            )
+          ),
+          'doc3',
+          'doc4'
+        );
+
+        // Nested composite filter on the different fields.
+        await checkOnlineAndOfflineResultsMatch(
+          query(
+            coll,
+            and(
+              where('b', 'in', [0, 3]),
+              or(
+                where('b', 'in', [1]),
+                and(where('b', 'in', [2, 3]), where('a', 'in', [1, 3]))
+              )
+            )
+          ),
+          'doc4'
+        );
+      });
+    });
+
+    // TODO(orquery): Enable this test when prod supports OR queries.
+    // eslint-disable-next-line no-restricted-properties
+    it.skip('supports using in with array contains any', () => {
+      const testDocs = {
+        doc1: { a: 1, b: [0] },
+        doc2: { b: [1] },
+        doc3: { a: 3, b: [2, 7], c: 10 },
+        doc4: { a: 1, b: [3, 7] },
+        doc5: { a: 1 },
+        doc6: { a: 2, c: 20 }
+      };
+
+      return withTestCollection(persistence, testDocs, async coll => {
+        await checkOnlineAndOfflineResultsMatch(
+          query(
+            coll,
+            or(where('a', 'in', [2, 3]), where('b', 'array-contains-any', [0, 7]))
+          ),
+          'doc1',
+          'doc3',
+          'doc4',
+          'doc6'
+        );
+
+        await checkOnlineAndOfflineResultsMatch(
+          query(
+            coll,
+            and(
+              where('a', 'in', [2, 3]),
+              where('b', 'array-contains-any', [0, 7])
+            )
+          ),
+          'doc3'
+        );
+
+        await checkOnlineAndOfflineResultsMatch(
+          query(
+            coll,
+            or(
+              and(where('a', 'in', [2, 3]), where('c', '==', 10)),
+              where('b', 'array-contains-any', [0, 7])
+            )
+          ),
+          'doc1',
+          'doc3',
+          'doc4'
+        );
+
+        await checkOnlineAndOfflineResultsMatch(
+          query(
+            coll,
+            and(
+              where('a', 'in', [2, 3]),
+              or(where('b', 'array-contains-any', [0, 7]), where('c', '==', 20))
+            )
+          ),
+          'doc3',
+          'doc6'
+        );
+      });
+    });
+
+    // TODO(orquery): Enable this test when prod supports OR queries.
+    // eslint-disable-next-line no-restricted-properties
+    it.skip('supports using in with array contains', () => {
+      const testDocs = {
+        doc1: { a: 1, b: [0] },
+        doc2: { b: [1] },
+        doc3: { a: 3, b: [2, 7] },
+        doc4: { a: 1, b: [3, 7] },
+        doc5: { a: 1 },
+        doc6: { a: 2 }
+      };
+
+      return withTestCollection(persistence, testDocs, async coll => {
+        await checkOnlineAndOfflineResultsMatch(
+          query(
+            coll,
+            or(where('a', 'in', [2, 3]), where('b', 'array-contains', 3))
+          ),
+          'doc3',
+          'doc4',
+          'doc6'
+        );
+
+        await checkOnlineAndOfflineResultsMatch(
+          query(
+            coll,
+            and(where('a', 'in', [2, 3]), where('b', 'array-contains', 7))
+          ),
+          'doc3'
+        );
+
+        await checkOnlineAndOfflineResultsMatch(
+          query(
+            coll,
+            or(
+              where('a', 'in', [2, 3]),
+              and(where('b', 'array-contains', 3), where('a', '==', 1))
+            )
+          ),
+          'doc3',
+          'doc4',
+          'doc6'
+        );
+
+        await checkOnlineAndOfflineResultsMatch(
+          query(
+            coll,
+            and(
+              where('a', 'in', [2, 3]),
+              or(where('b', 'array-contains', 7), where('a', '==', 1))
+            )
+          ),
+          'doc3'
+        );
+      });
+    });
+
+    // TODO(orquery): Enable this test when prod supports OR queries.
+    // eslint-disable-next-line no-restricted-properties
+    it.skip('supports order by equality', () => {
+      const testDocs = {
+        doc1: {a: 1, b: [0]},
+        doc2: {b: [1]},
+        doc3: {a: 3, b: [2, 7], c: 10},
+        doc4: {a: 1, b: [3, 7]},
+        doc5: {a: 1},
+        doc6: {a: 2, c: 20}
+      };
+
+      return withTestCollection(persistence, testDocs, async coll => {
+        await checkOnlineAndOfflineResultsMatch(
+          query(coll, where('a', '==', 1), orderBy('a')),
+          'doc1',
+          'doc4',
+          'doc5'
+        );
+
+        await checkOnlineAndOfflineResultsMatch(
+          query(coll, where('a', 'in', [2, 3]), orderBy('a')),
+          'doc6',
+          'doc3'
+        );
+      });
+    });
   });
 
   // Reproduces https://github.com/firebase/firebase-js-sdk/issues/5873
@@ -1612,6 +1852,7 @@ apiDescribe('Queries', (persistence: boolean) => {
         expect(snapshot2.metadata.fromCache).to.be.true;
         expect(toDataArray(snapshot2)).to.deep.equal([]);
       });
+>>>>>>> master
     });
   });
 });