Change id to NSArray<id> for IN queries (#4182)

Author: Brian Chen

Firestore/Example/Tests/Integration/API/FIRValidationTests.mm

@@ -414,10 +414,6 @@ - (void)testNonEqualityQueriesOnNullOrNaNFail {
                   @"Invalid Query. Null supports only equality comparisons.");
   FSTAssertThrows([[self collectionRef] queryWhereField:@"a" arrayContains:[NSNull null]],
                   @"Invalid Query. Null supports only equality comparisons.");
-  FSTAssertThrows([[self collectionRef] queryWhereField:@"a" arrayContainsAny:[NSNull null]],
-                  @"Invalid Query. A non-empty array is required for 'arrayContainsAny' filters.");
-  FSTAssertThrows([[self collectionRef] queryWhereField:@"a" arrayContainsAny:[NSNull null]],
-                  @"Invalid Query. A non-empty array is required for 'arrayContainsAny' filters.");
 
   FSTAssertThrows([[self collectionRef] queryWhereField:@"a" isGreaterThan:@(NAN)],
                   @"Invalid Query. NaN supports only equality comparisons.");
@@ -558,12 +554,6 @@ - (void)testQueriesFilteredByDocumentIdMustUseStringsOrDocumentReferences {
        "are not arrays.";
   FSTAssertThrows([collection queryWhereFieldPath:[FIRFieldPath documentID] arrayContains:@1],
                   reason);
-
-  reason = @"Invalid query. You can't perform arrayContainsAny queries on document ID since "
-           @"document IDs "
-            "are not arrays.";
-  FSTAssertThrows([collection queryWhereFieldPath:[FIRFieldPath documentID] arrayContainsAny:@1],
-                  reason);
 }
 
 - (void)testQueriesUsingInAndDocumentIdMustHaveProperDocumentReferencesInArray {

Firestore/Source/API/FIRQuery+Internal.h

@@ -56,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN
  * @return The created `FIRQuery`.
  */
 // TODO(b/138855186): Expose to public once backend is ready.
-- (FIRQuery *)queryWhereField:(NSString *)field arrayContainsAny:(id)value;
+- (FIRQuery *)queryWhereField:(NSString *)field arrayContainsAny:(NSArray<id> *)value;
 
 /**
  * Creates and returns a new `FIRQuery` with the additional filter that documents must contain
@@ -72,7 +72,7 @@ NS_ASSUME_NONNULL_BEGIN
  * @return The created `FIRQuery`.
  */
 // TODO(b/138855186): Expose to public once backend is ready.
-- (FIRQuery *)queryWhereFieldPath:(FIRFieldPath *)path arrayContainsAny:(id)value;
+- (FIRQuery *)queryWhereFieldPath:(FIRFieldPath *)path arrayContainsAny:(NSArray<id> *)value;
 
 /**
  * Creates and returns a new `FIRQuery` with the additional filter that documents must contain
@@ -86,7 +86,7 @@ NS_ASSUME_NONNULL_BEGIN
  * @return The created `FIRQuery`.
  */
 // TODO(b/138855186): Expose to public once backend is ready.
-- (FIRQuery *)queryWhereField:(NSString *)field in:(id)value;
+- (FIRQuery *)queryWhereField:(NSString *)field in:(NSArray<id> *)value;
 
 /**
  * Creates and returns a new `FIRQuery` with the additional filter that documents must contain
@@ -100,7 +100,7 @@ NS_ASSUME_NONNULL_BEGIN
  * @return The created `FIRQuery`.
  */
 // TODO(b/138855186): Expose to public once backend is ready.
-- (FIRQuery *)queryWhereFieldPath:(FIRFieldPath *)path in:(id)value;
+- (FIRQuery *)queryWhereFieldPath:(FIRFieldPath *)path in:(NSArray<id> *)value;
 
 @end
 

Firestore/Source/API/FIRQuery.mm

@@ -546,21 +546,21 @@ - (Bound)boundFromFieldValues:(NSArray<id> *)fieldValues isBefore:(BOOL)isBefore
 
 @implementation FIRQuery (Internal)
 
-- (FIRQuery *)queryWhereField:(NSString *)field arrayContainsAny:(id)value {
+- (FIRQuery *)queryWhereField:(NSString *)field arrayContainsAny:(NSArray<id> *)value {
   return [self queryWithFilterOperator:Filter::Operator::ArrayContainsAny field:field value:value];
 }
 
-- (FIRQuery *)queryWhereFieldPath:(FIRFieldPath *)path arrayContainsAny:(id)value {
+- (FIRQuery *)queryWhereFieldPath:(FIRFieldPath *)path arrayContainsAny:(NSArray<id> *)value {
   return [self queryWithFilterOperator:Filter::Operator::ArrayContainsAny
                                   path:path.internalValue
                                  value:value];
 }
 
-- (FIRQuery *)queryWhereField:(NSString *)field in:(id)value {
+- (FIRQuery *)queryWhereField:(NSString *)field in:(NSArray<id> *)value {
   return [self queryWithFilterOperator:Filter::Operator::In field:field value:value];
 }
 
-- (FIRQuery *)queryWhereFieldPath:(FIRFieldPath *)path in:(id)value {
+- (FIRQuery *)queryWhereFieldPath:(FIRFieldPath *)path in:(NSArray<id> *)value {
   return [self queryWithFilterOperator:Filter::Operator::In path:path.internalValue value:value];
 }
 

Firestore/core/src/firebase/firestore/api/query_core.mm

@@ -326,8 +326,10 @@ QuerySnapshot result(firestore_, query_, std::move(snapshot),
 
 void Query::ValidateDisjunctiveFilterElements(
     const model::FieldValue& field_value, core::Filter::Operator op) const {
-  if (field_value.type() != FieldValue::Type::Array ||
-      field_value.array_value().size() == 0) {
+  HARD_ASSERT(
+      field_value.type() == FieldValue::Type::Array,
+      "A FieldValue of Array type is required for disjunctive filters.");
+  if (field_value.array_value().size() == 0) {
     ThrowInvalidArgument("Invalid Query. A non-empty array is required for '%s'"
                          " filters.",
                          Describe(op));