fix(firestore): increase amount of maximum disjunctions in firebase (#7543)

* Update FirestoreQuery.js
* fix tests
* fix array length
* style(lint): `yarn lint:js` fixes

I do not believe these were altered in the PR at all, perhaps
a transitive dependency update altered the way lint likes things

Either way, it's fully automated with regard to formatting checks
and formatting, so here we are

* test(firestore): adjust tests for 30 conjunction limit

---------

Co-authored-by: Mike Hardy <[email protected]>

Author: precious-void

packages/firestore/e2e/Query/where.and.filter.e2e.js

@@ -176,16 +176,15 @@ describe(' firestore().collection().where(AND Filters)', function () {
       }
     });
 
-    it('throws if in query array length is greater than 10', function () {
+    it('throws if in query array length is greater than 30', function () {
       try {
+        const queryArray = Array.from({ length: 31 }, (_, i) => i + 1);
+
         firebase
           .firestore()
           .collection(COLLECTION)
           .where(
-            Filter.and(
-              Filter('foo.bar', 'in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]),
-              Filter('foo.bar', 'in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]),
-            ),
+            Filter.and(Filter('foo.bar', 'in', queryArray), Filter('foo.bar', 'in', queryArray)),
           );
 
         return Promise.reject(new Error('Did not throw an Error.'));
@@ -831,15 +830,14 @@ describe(' firestore().collection().where(AND Filters)', function () {
       }
     });
 
-    it('throws if in query array length is greater than 10', function () {
+    it('throws if in query array length is greater than 30', function () {
       const { getFirestore, collection, query, and, where } = firestoreModular;
+      const queryArray = Array.from({ length: 31 }, (_, i) => i + 1);
+
       try {
         query(
           collection(getFirestore(), COLLECTION),
-          and(
-            where('foo.bar', 'in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]),
-            where('foo.bar', 'in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]),
-          ),
+          and(where('foo.bar', 'in', queryArray), where('foo.bar', 'in', queryArray)),
         );
 
         return Promise.reject(new Error('Did not throw an Error.'));

packages/firestore/e2e/Query/where.e2e.js

@@ -138,15 +138,14 @@ describe('firestore().collection().where()', function () {
       }
     });
 
-    it('throws if in query array length is greater than 10', function () {
+    it('throws if in query array length is greater than 30', function () {
       try {
-        firebase
-          .firestore()
-          .collection(COLLECTION)
-          .where('foo.bar', 'in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
+        const queryArray = Array.from({ length: 31 }, (_, i) => i + 1);
+
+        firebase.firestore().collection(COLLECTION).where('foo.bar', 'in', queryArray);
         return Promise.reject(new Error('Did not throw an Error.'));
       } catch (error) {
-        error.message.should.containEql('maximum of 10 elements in the value');
+        error.message.should.containEql('maximum of 30 elements in the value');
         return Promise.resolve();
       }
     });
@@ -483,13 +482,14 @@ describe('firestore().collection().where()', function () {
 
     it("should throw error when 'not-in' filter has a list of more than 10 items", async function () {
       const ref = firebase.firestore().collection(COLLECTION);
+      const queryArray = Array.from({ length: 31 }, (_, i) => i + 1);
 
       try {
-        ref.where('test', 'not-in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]);
+        ref.where('test', 'not-in', queryArray);
         return Promise.reject(new Error('Did not throw an Error.'));
       } catch (error) {
         error.message.should.containEql(
-          'filters support a maximum of 10 elements in the value array.',
+          'filters support a maximum of 30 elements in the value array.',
         );
         return Promise.resolve();
       }
@@ -708,16 +708,15 @@ describe('firestore().collection().where()', function () {
       }
     });
 
-    it('throws if in query array length is greater than 10', function () {
+    it('throws if in query array length is greater than 30', function () {
       const { getFirestore, collection, query, where } = firestoreModular;
+      const queryArray = Array.from({ length: 31 }, (_, i) => i + 1);
+
       try {
-        query(
-          collection(getFirestore(), COLLECTION),
-          where('foo.bar', 'in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]),
-        );
+        query(collection(getFirestore(), COLLECTION), where('foo.bar', 'in', queryArray));
         return Promise.reject(new Error('Did not throw an Error.'));
       } catch (error) {
-        error.message.should.containEql('maximum of 10 elements in the value');
+        error.message.should.containEql('maximum of 30 elements in the value');
         return Promise.resolve();
       }
     });
@@ -1086,13 +1085,14 @@ describe('firestore().collection().where()', function () {
     it("should throw error when 'not-in' filter has a list of more than 10 items", async function () {
       const { getFirestore, collection, query, where } = firestoreModular;
       const ref = collection(getFirestore(), COLLECTION);
+      const queryArray = Array.from({ length: 31 }, (_, i) => i + 1);
 
       try {
-        query(ref, where('test', 'not-in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]));
+        query(ref, where('test', 'not-in', queryArray));
         return Promise.reject(new Error('Did not throw an Error.'));
       } catch (error) {
         error.message.should.containEql(
-          'filters support a maximum of 10 elements in the value array.',
+          'filters support a maximum of 30 elements in the value array.',
         );
         return Promise.resolve();
       }

packages/firestore/e2e/Query/where.filter.e2e.js

@@ -157,16 +157,18 @@ describe('firestore().collection().where(Filters)', function () {
     }
   });
 
-  it('throws if in query array length is greater than 10', function () {
+  it('throws if in query array length is greater than 30', function () {
     try {
+      const queryArray = Array.from({ length: 31 }, (_, i) => i + 1);
+
       firebase
         .firestore()
         .collection(COLLECTION)
-        .where(Filter('foo.bar', 'in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]));
+        .where(Filter('foo.bar', 'in', queryArray));
 
       return Promise.reject(new Error('Did not throw an Error.'));
     } catch (error) {
-      error.message.should.containEql('maximum of 10 elements in the value');
+      error.message.should.containEql('maximum of 30 elements in the value');
       return Promise.resolve();
     }
   });
@@ -243,16 +245,15 @@ describe('firestore().collection().where(Filters)', function () {
 
   it("should throw error when 'not-in' filter has a list of more than 10 items", async function () {
     const ref = firebase.firestore().collection(COLLECTION);
+    const queryArray = Array.from({ length: 31 }, (_, i) => i + 1);
 
     try {
-      ref
-        .where(Filter('foo.bar', '==', 1))
-        .where(Filter('foo.bar', 'not-in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]));
+      ref.where(Filter('foo.bar', '==', 1)).where(Filter('foo.bar', 'not-in', queryArray));
 
       return Promise.reject(new Error('Did not throw an Error.'));
     } catch (error) {
       error.message.should.containEql(
-        'filters support a maximum of 10 elements in the value array.',
+        'filters support a maximum of 30 elements in the value array.',
       );
       return Promise.resolve();
     }

packages/firestore/e2e/Query/where.or.filter.e2e.js

@@ -269,21 +269,17 @@ describe('firestore().collection().where(OR Filters)', function () {
       }
     });
 
-    it('throws if in query array length is greater than 10', function () {
+    it('throws if in query array length is greater than 30', function () {
       try {
+        const queryArray = Array.from({ length: 31 }, (_, i) => i + 1);
+
         firebase
           .firestore()
           .collection(COLLECTION)
           .where(
             Filter.or(
-              Filter.and(
-                Filter('foo.bar', 'in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]),
-                Filter('foo.bar', 'in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]),
-              ),
-              Filter.and(
-                Filter('foo.bar', 'in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]),
-                Filter('foo.bar', 'in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]),
-              ),
+              Filter.and(Filter('foo.bar', 'in', queryArray), Filter('foo.bar', 'in', queryArray)),
+              Filter.and(Filter('foo.bar', 'in', queryArray), Filter('foo.bar', 'in', queryArray)),
             ),
           );
 
@@ -1326,20 +1322,16 @@ describe('firestore().collection().where(OR Filters)', function () {
       }
     });
 
-    it('throws if in query array length is greater than 10', function () {
+    it('throws if in query array length is greater than 30', function () {
       const { getFirestore, collection, where, or, and, query } = firestoreModular;
+      const queryArray = Array.from({ length: 31 }, (_, i) => i + 1);
+
       try {
         query(
           collection(getFirestore(), COLLECTION),
           or(
-            and(
-              where('foo.bar', 'in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]),
-              where('foo.bar', 'in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]),
-            ),
-            and(
-              where('foo.bar', 'in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]),
-              where('foo.bar', 'in', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]),
-            ),
+            and(where('foo.bar', 'in', queryArray), where('foo.bar', 'in', queryArray)),
+            and(where('foo.bar', 'in', queryArray), where('foo.bar', 'in', queryArray)),
           ),
         );
 

packages/firestore/lib/FirestoreQuery.js

@@ -471,9 +471,9 @@ export default class FirestoreQuery {
           );
         }
 
-        if (value.length > 10) {
+        if (value.length > 30) {
           throw new Error(
-            `firebase.firestore().collection().where(_, _, *) 'value' is invalid. '${opStr}' filters support a maximum of 10 elements in the value array.`,
+            `firebase.firestore().collection().where(_, _, *) 'value' is invalid. '${opStr}' filters support a maximum of 30 elements in the value array.`,
           );
         }
       }