diff --git a/packages/cloud_firestore/cloud_firestore/example/integration_test/query_e2e.dart b/packages/cloud_firestore/cloud_firestore/example/integration_test/query_e2e.dart
index c77337882813..4356bf3a54bf 100644
--- a/packages/cloud_firestore/cloud_firestore/example/integration_test/query_e2e.dart
+++ b/packages/cloud_firestore/cloud_firestore/example/integration_test/query_e2e.dart
@@ -1813,6 +1813,56 @@ void runQueryTests() {
         expect(snapshot.docs.length, equals(1));
         expect(snapshot.docs[0].get('foo'), equals(ref));
       });
+
+      testWidgets('pass `null` to `isEqualTo`', (_) async {
+        CollectionReference<Map<String, dynamic>> collection =
+            await initializeTest('where-null-isEqualTo');
+
+        await Future.wait([
+          collection.add({
+            'foo': 1,
+          }),
+          collection.add({'foo': 2}),
+          collection.add({
+            'foo': null,
+          }),
+          collection.add({
+            'foo': null,
+          }),
+        ]);
+
+        QuerySnapshot<Map<String, dynamic>> snapshot =
+            await collection.where('foo', isEqualTo: null).get();
+
+        expect(snapshot.docs.length, equals(2));
+        expect(snapshot.docs[0].get('foo'), equals(null));
+        expect(snapshot.docs[1].get('foo'), equals(null));
+      });
+
+      testWidgets('pass `null` to `isNotEqualTo`', (_) async {
+        CollectionReference<Map<String, dynamic>> collection =
+            await initializeTest('where-null-isNotEqualTo');
+
+        await Future.wait([
+          collection.add({
+            'foo': 11,
+          }),
+          collection.add({'foo': 11}),
+          collection.add({
+            'foo': null,
+          }),
+          collection.add({
+            'foo': null,
+          }),
+        ]);
+
+        QuerySnapshot<Map<String, dynamic>> snapshot =
+            await collection.where('foo', isNotEqualTo: null).get();
+
+        expect(snapshot.docs.length, equals(2));
+        expect(snapshot.docs[0].get('foo'), equals(11));
+        expect(snapshot.docs[1].get('foo'), equals(11));
+      });
     });
 
     group('Query.where() with Filter class', () {
diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/query.dart b/packages/cloud_firestore/cloud_firestore/lib/src/query.dart
index 0ea4d95cfb6a..583cea034327 100644
--- a/packages/cloud_firestore/cloud_firestore/lib/src/query.dart
+++ b/packages/cloud_firestore/cloud_firestore/lib/src/query.dart
@@ -4,6 +4,10 @@
 
 part of cloud_firestore;
 
+/// Sentinel value to check whether user passed values explicitly through .where() method
+@internal
+const notSetQueryParam = Object();
+
 /// Represents a [Query] over the data at a particular location.
 ///
 /// Can construct refined [Query] objects by adding filters and ordering.
@@ -595,13 +599,13 @@ class _JsonQuery implements Query<Map<String, dynamic>> {
   @override
   Query<Map<String, dynamic>> where(
     Object fieldOrFilter, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     Iterable<Object?>? arrayContainsAny,
     Iterable<Object?>? whereIn,
     Iterable<Object?>? whereNotIn,
@@ -611,13 +615,13 @@ class _JsonQuery implements Query<Map<String, dynamic>> {
 
     if (fieldOrFilter is Filter) {
       assert(
-        isEqualTo == null &&
-            isNotEqualTo == null &&
-            isLessThan == null &&
-            isLessThanOrEqualTo == null &&
-            isGreaterThan == null &&
-            isGreaterThanOrEqualTo == null &&
-            arrayContains == null &&
+        identical(isEqualTo, notSetQueryParam) &&
+            identical(isNotEqualTo, notSetQueryParam) &&
+            identical(isLessThan, notSetQueryParam) &&
+            identical(isLessThanOrEqualTo, notSetQueryParam) &&
+            identical(isGreaterThan, notSetQueryParam) &&
+            identical(isGreaterThanOrEqualTo, notSetQueryParam) &&
+            identical(arrayContains, notSetQueryParam) &&
             arrayContainsAny == null &&
             whereIn == null &&
             whereNotIn == null &&
@@ -655,17 +659,29 @@ class _JsonQuery implements Query<Map<String, dynamic>> {
       conditions.add(condition);
     }
 
-    if (isEqualTo != null) addCondition(field, '==', isEqualTo);
-    if (isNotEqualTo != null) addCondition(field, '!=', isNotEqualTo);
-    if (isLessThan != null) addCondition(field, '<', isLessThan);
-    if (isLessThanOrEqualTo != null) {
+    if (!identical(isEqualTo, notSetQueryParam)) {
+      addCondition(field, '==', isEqualTo);
+    }
+
+    if (!identical(isNotEqualTo, notSetQueryParam)) {
+      addCondition(field, '!=', isNotEqualTo);
+    }
+
+    if (!identical(isLessThan, notSetQueryParam)) {
+      addCondition(field, '<', isLessThan);
+    }
+
+    if (!identical(isLessThanOrEqualTo, notSetQueryParam)) {
       addCondition(field, '<=', isLessThanOrEqualTo);
     }
-    if (isGreaterThan != null) addCondition(field, '>', isGreaterThan);
-    if (isGreaterThanOrEqualTo != null) {
+    if (!identical(isGreaterThan, notSetQueryParam)) {
+      addCondition(field, '>', isGreaterThan);
+    }
+
+    if (!identical(isGreaterThanOrEqualTo, notSetQueryParam)) {
       addCondition(field, '>=', isGreaterThanOrEqualTo);
     }
-    if (arrayContains != null) {
+    if (!identical(arrayContains, notSetQueryParam)) {
       addCondition(field, 'array-contains', arrayContains);
     }
     if (arrayContainsAny != null) {
@@ -952,13 +968,13 @@ class _WithConverterQuery<T extends Object?> implements Query<T> {
   @override
   Query<T> where(
     Object field, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     Iterable<Object?>? arrayContainsAny,
     Iterable<Object?>? whereIn,
     Iterable<Object?>? whereNotIn,
diff --git a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/cloud_firestore_odm_generator_integration_test/lib/freezed.g.dart b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/cloud_firestore_odm_generator_integration_test/lib/freezed.g.dart
index 60cd17095cdc..fbe20f189b5a 100644
--- a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/cloud_firestore_odm_generator_integration_test/lib/freezed.g.dart
+++ b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/cloud_firestore_odm_generator_integration_test/lib/freezed.g.dart
@@ -9,6 +9,7 @@ part of 'freezed.dart';
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, require_trailing_commas, prefer_single_quotes, prefer_double_quotes, use_super_parameters, duplicate_ignore
 // ignore_for_file: type=lint
+// ignore_for_file: invalid_use_of_internal_member
 
 class _Sentinel {
   const _Sentinel();
@@ -506,13 +507,13 @@ class _$PersonQuery extends QueryReference<Person, PersonQuerySnapshot>
 
   PersonQuery whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -539,12 +540,12 @@ class _$PersonQuery extends QueryReference<Person, PersonQuerySnapshot>
   }
 
   PersonQuery whereDocumentId({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -568,12 +569,12 @@ class _$PersonQuery extends QueryReference<Person, PersonQuerySnapshot>
   }
 
   PersonQuery whereFirstName({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -582,24 +583,26 @@ class _$PersonQuery extends QueryReference<Person, PersonQuerySnapshot>
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$$PersonImplFieldMap['firstName']!,
-        isEqualTo: isEqualTo != null
-            ? _$$PersonImplPerFieldToJson.firstName(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$$PersonImplPerFieldToJson.firstName(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$$PersonImplPerFieldToJson.firstName(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$$PersonImplPerFieldToJson.firstName(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$$PersonImplPerFieldToJson.firstName(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$$PersonImplPerFieldToJson.firstName(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$$PersonImplPerFieldToJson.firstName(isEqualTo as String)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$$PersonImplPerFieldToJson.firstName(isNotEqualTo as String)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$$PersonImplPerFieldToJson.firstName(isLessThan as String)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$$PersonImplPerFieldToJson
+                .firstName(isLessThanOrEqualTo as String)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$$PersonImplPerFieldToJson.firstName(isGreaterThan as String)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$$PersonImplPerFieldToJson
+                .firstName(isGreaterThanOrEqualTo as String)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$$PersonImplPerFieldToJson.firstName(e)),
         whereNotIn:
@@ -610,12 +613,12 @@ class _$PersonQuery extends QueryReference<Person, PersonQuerySnapshot>
   }
 
   PersonQuery whereLastName({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -624,24 +627,26 @@ class _$PersonQuery extends QueryReference<Person, PersonQuerySnapshot>
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$$PersonImplFieldMap['lastName']!,
-        isEqualTo: isEqualTo != null
-            ? _$$PersonImplPerFieldToJson.lastName(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$$PersonImplPerFieldToJson.lastName(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$$PersonImplPerFieldToJson.lastName(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$$PersonImplPerFieldToJson.lastName(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$$PersonImplPerFieldToJson.lastName(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$$PersonImplPerFieldToJson.lastName(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$$PersonImplPerFieldToJson.lastName(isEqualTo as String)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$$PersonImplPerFieldToJson.lastName(isNotEqualTo as String)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$$PersonImplPerFieldToJson.lastName(isLessThan as String)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$$PersonImplPerFieldToJson
+                .lastName(isLessThanOrEqualTo as String)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$$PersonImplPerFieldToJson.lastName(isGreaterThan as String)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$$PersonImplPerFieldToJson
+                .lastName(isGreaterThanOrEqualTo as String)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$$PersonImplPerFieldToJson.lastName(e)),
         whereNotIn:
@@ -1413,13 +1418,13 @@ class _$PublicRedirectedQuery
 
   PublicRedirectedQuery whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -1446,12 +1451,12 @@ class _$PublicRedirectedQuery
   }
 
   PublicRedirectedQuery whereDocumentId({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -1475,12 +1480,12 @@ class _$PublicRedirectedQuery
   }
 
   PublicRedirectedQuery whereValue({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -1489,25 +1494,28 @@ class _$PublicRedirectedQuery
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$$PublicRedirected2ImplFieldMap['value']!,
-        isEqualTo: isEqualTo != null
-            ? _$$PublicRedirected2ImplPerFieldToJson.value(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$$PublicRedirected2ImplPerFieldToJson.value(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$$PublicRedirected2ImplPerFieldToJson.value(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$$PublicRedirected2ImplPerFieldToJson.value(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$$PublicRedirected2ImplPerFieldToJson.value(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$$PublicRedirected2ImplPerFieldToJson.value(isEqualTo as String)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$$PublicRedirected2ImplPerFieldToJson
+                .value(isNotEqualTo as String)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$$PublicRedirected2ImplPerFieldToJson.value(isLessThan as String)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$$PublicRedirected2ImplPerFieldToJson
+                .value(isLessThanOrEqualTo as String)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$$PublicRedirected2ImplPerFieldToJson
+                .value(isGreaterThan as String)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
             ? _$$PublicRedirected2ImplPerFieldToJson
-                .value(isGreaterThanOrEqualTo)
-            : null,
+                .value(isGreaterThanOrEqualTo as String)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn
             ?.map((e) => _$$PublicRedirected2ImplPerFieldToJson.value(e)),
diff --git a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/cloud_firestore_odm_generator_integration_test/lib/simple.g.dart b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/cloud_firestore_odm_generator_integration_test/lib/simple.g.dart
index 7345e6d79c60..e86e5212557c 100644
--- a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/cloud_firestore_odm_generator_integration_test/lib/simple.g.dart
+++ b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/cloud_firestore_odm_generator_integration_test/lib/simple.g.dart
@@ -9,6 +9,7 @@ part of 'simple.dart';
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, require_trailing_commas, prefer_single_quotes, prefer_double_quotes, use_super_parameters, duplicate_ignore
 // ignore_for_file: type=lint
+// ignore_for_file: invalid_use_of_internal_member
 
 class _Sentinel {
   const _Sentinel();
@@ -468,13 +469,13 @@ class _$IgnoredGetterQuery
 
   IgnoredGetterQuery whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -501,12 +502,12 @@ class _$IgnoredGetterQuery
   }
 
   IgnoredGetterQuery whereDocumentId({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -530,12 +531,12 @@ class _$IgnoredGetterQuery
   }
 
   IgnoredGetterQuery whereValue({
-    int? isEqualTo,
-    int? isNotEqualTo,
-    int? isLessThan,
-    int? isLessThanOrEqualTo,
-    int? isGreaterThan,
-    int? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<int>? whereIn,
     List<int>? whereNotIn,
@@ -544,24 +545,24 @@ class _$IgnoredGetterQuery
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$IgnoredGetterFieldMap['value']!,
-        isEqualTo: isEqualTo != null
-            ? _$IgnoredGetterPerFieldToJson.value(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$IgnoredGetterPerFieldToJson.value(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$IgnoredGetterPerFieldToJson.value(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$IgnoredGetterPerFieldToJson.value(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$IgnoredGetterPerFieldToJson.value(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$IgnoredGetterPerFieldToJson.value(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$IgnoredGetterPerFieldToJson.value(isEqualTo as int)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$IgnoredGetterPerFieldToJson.value(isNotEqualTo as int)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$IgnoredGetterPerFieldToJson.value(isLessThan as int)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$IgnoredGetterPerFieldToJson.value(isLessThanOrEqualTo as int)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$IgnoredGetterPerFieldToJson.value(isGreaterThan as int)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$IgnoredGetterPerFieldToJson.value(isGreaterThanOrEqualTo as int)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$IgnoredGetterPerFieldToJson.value(e)),
         whereNotIn:
@@ -1247,13 +1248,13 @@ class _$ModelQuery extends QueryReference<Model, ModelQuerySnapshot>
 
   ModelQuery whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -1280,12 +1281,12 @@ class _$ModelQuery extends QueryReference<Model, ModelQuerySnapshot>
   }
 
   ModelQuery whereDocumentId({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -1309,12 +1310,12 @@ class _$ModelQuery extends QueryReference<Model, ModelQuerySnapshot>
   }
 
   ModelQuery whereValue({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -1323,22 +1324,24 @@ class _$ModelQuery extends QueryReference<Model, ModelQuerySnapshot>
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$ModelFieldMap['value']!,
-        isEqualTo:
-            isEqualTo != null ? _$ModelPerFieldToJson.value(isEqualTo) : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$ModelPerFieldToJson.value(isNotEqualTo)
-            : null,
-        isLessThan:
-            isLessThan != null ? _$ModelPerFieldToJson.value(isLessThan) : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$ModelPerFieldToJson.value(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$ModelPerFieldToJson.value(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$ModelPerFieldToJson.value(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$ModelPerFieldToJson.value(isEqualTo as String)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$ModelPerFieldToJson.value(isNotEqualTo as String)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$ModelPerFieldToJson.value(isLessThan as String)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$ModelPerFieldToJson.value(isLessThanOrEqualTo as String)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$ModelPerFieldToJson.value(isGreaterThan as String)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$ModelPerFieldToJson.value(isGreaterThanOrEqualTo as String)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$ModelPerFieldToJson.value(e)),
         whereNotIn: whereNotIn?.map((e) => _$ModelPerFieldToJson.value(e)),
@@ -2611,13 +2614,13 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
 
   NestedQuery whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -2644,12 +2647,12 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
   }
 
   NestedQuery whereDocumentId({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -2673,12 +2676,12 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
   }
 
   NestedQuery whereValue({
-    Nested? isEqualTo,
-    Nested? isNotEqualTo,
-    Nested? isLessThan,
-    Nested? isLessThanOrEqualTo,
-    Nested? isGreaterThan,
-    Nested? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<Nested?>? whereIn,
     List<Nested?>? whereNotIn,
@@ -2687,23 +2690,24 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$NestedFieldMap['value']!,
-        isEqualTo:
-            isEqualTo != null ? _$NestedPerFieldToJson.value(isEqualTo) : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$NestedPerFieldToJson.value(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$NestedPerFieldToJson.value(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.value(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$NestedPerFieldToJson.value(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.value(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.value(isEqualTo as Nested?)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.value(isNotEqualTo as Nested?)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.value(isLessThan as Nested?)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.value(isLessThanOrEqualTo as Nested?)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.value(isGreaterThan as Nested?)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.value(isGreaterThanOrEqualTo as Nested?)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$NestedPerFieldToJson.value(e)),
         whereNotIn: whereNotIn?.map((e) => _$NestedPerFieldToJson.value(e)),
@@ -2713,12 +2717,12 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
   }
 
   NestedQuery whereSimple({
-    int? isEqualTo,
-    int? isNotEqualTo,
-    int? isLessThan,
-    int? isLessThanOrEqualTo,
-    int? isGreaterThan,
-    int? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<int?>? whereIn,
     List<int?>? whereNotIn,
@@ -2727,23 +2731,24 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$NestedFieldMap['simple']!,
-        isEqualTo:
-            isEqualTo != null ? _$NestedPerFieldToJson.simple(isEqualTo) : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$NestedPerFieldToJson.simple(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$NestedPerFieldToJson.simple(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.simple(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$NestedPerFieldToJson.simple(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.simple(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.simple(isEqualTo as int?)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.simple(isNotEqualTo as int?)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.simple(isLessThan as int?)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.simple(isLessThanOrEqualTo as int?)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.simple(isGreaterThan as int?)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.simple(isGreaterThanOrEqualTo as int?)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$NestedPerFieldToJson.simple(e)),
         whereNotIn: whereNotIn?.map((e) => _$NestedPerFieldToJson.simple(e)),
@@ -2753,43 +2758,46 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
   }
 
   NestedQuery whereValueList({
-    List<Nested>? isEqualTo,
-    List<Nested>? isNotEqualTo,
-    List<Nested>? isLessThan,
-    List<Nested>? isLessThanOrEqualTo,
-    List<Nested>? isGreaterThan,
-    List<Nested>? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
-    Nested? arrayContains,
+    Object? arrayContains = notSetQueryParam,
     List<Nested>? arrayContainsAny,
   }) {
     return _$NestedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$NestedFieldMap['valueList']!,
-        isEqualTo: isEqualTo != null
-            ? _$NestedPerFieldToJson.valueList(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$NestedPerFieldToJson.valueList(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$NestedPerFieldToJson.valueList(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.valueList(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$NestedPerFieldToJson.valueList(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.valueList(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.valueList(isEqualTo as List<Nested>?)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.valueList(isNotEqualTo as List<Nested>?)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.valueList(isLessThan as List<Nested>?)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .valueList(isLessThanOrEqualTo as List<Nested>?)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.valueList(isGreaterThan as List<Nested>?)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .valueList(isGreaterThanOrEqualTo as List<Nested>?)
+            : notSetQueryParam,
         isNull: isNull,
-        arrayContains: arrayContains != null
-            ? (_$NestedPerFieldToJson.valueList([arrayContains]) as List?)!
+        arrayContains: arrayContains != notSetQueryParam
+            ? (_$NestedPerFieldToJson.valueList([arrayContains as Nested])
+                    as List?)!
                 .single
-            : null,
+            : notSetQueryParam,
         arrayContainsAny: arrayContainsAny != null
             ? _$NestedPerFieldToJson.valueList(arrayContainsAny)
                 as Iterable<Object>?
@@ -2800,43 +2808,46 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
   }
 
   NestedQuery whereBoolList({
-    List<bool>? isEqualTo,
-    List<bool>? isNotEqualTo,
-    List<bool>? isLessThan,
-    List<bool>? isLessThanOrEqualTo,
-    List<bool>? isGreaterThan,
-    List<bool>? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
-    bool? arrayContains,
+    Object? arrayContains = notSetQueryParam,
     List<bool>? arrayContainsAny,
   }) {
     return _$NestedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$NestedFieldMap['boolList']!,
-        isEqualTo: isEqualTo != null
-            ? _$NestedPerFieldToJson.boolList(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$NestedPerFieldToJson.boolList(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$NestedPerFieldToJson.boolList(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.boolList(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$NestedPerFieldToJson.boolList(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.boolList(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.boolList(isEqualTo as List<bool>?)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.boolList(isNotEqualTo as List<bool>?)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.boolList(isLessThan as List<bool>?)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .boolList(isLessThanOrEqualTo as List<bool>?)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.boolList(isGreaterThan as List<bool>?)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .boolList(isGreaterThanOrEqualTo as List<bool>?)
+            : notSetQueryParam,
         isNull: isNull,
-        arrayContains: arrayContains != null
-            ? (_$NestedPerFieldToJson.boolList([arrayContains]) as List?)!
+        arrayContains: arrayContains != notSetQueryParam
+            ? (_$NestedPerFieldToJson.boolList([arrayContains as bool])
+                    as List?)!
                 .single
-            : null,
+            : notSetQueryParam,
         arrayContainsAny: arrayContainsAny != null
             ? _$NestedPerFieldToJson.boolList(arrayContainsAny)
                 as Iterable<Object>?
@@ -2847,43 +2858,46 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
   }
 
   NestedQuery whereStringList({
-    List<String>? isEqualTo,
-    List<String>? isNotEqualTo,
-    List<String>? isLessThan,
-    List<String>? isLessThanOrEqualTo,
-    List<String>? isGreaterThan,
-    List<String>? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
-    String? arrayContains,
+    Object? arrayContains = notSetQueryParam,
     List<String>? arrayContainsAny,
   }) {
     return _$NestedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$NestedFieldMap['stringList']!,
-        isEqualTo: isEqualTo != null
-            ? _$NestedPerFieldToJson.stringList(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$NestedPerFieldToJson.stringList(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$NestedPerFieldToJson.stringList(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.stringList(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$NestedPerFieldToJson.stringList(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.stringList(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.stringList(isEqualTo as List<String>?)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.stringList(isNotEqualTo as List<String>?)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.stringList(isLessThan as List<String>?)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .stringList(isLessThanOrEqualTo as List<String>?)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.stringList(isGreaterThan as List<String>?)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .stringList(isGreaterThanOrEqualTo as List<String>?)
+            : notSetQueryParam,
         isNull: isNull,
-        arrayContains: arrayContains != null
-            ? (_$NestedPerFieldToJson.stringList([arrayContains]) as List?)!
+        arrayContains: arrayContains != notSetQueryParam
+            ? (_$NestedPerFieldToJson.stringList([arrayContains as String])
+                    as List?)!
                 .single
-            : null,
+            : notSetQueryParam,
         arrayContainsAny: arrayContainsAny != null
             ? _$NestedPerFieldToJson.stringList(arrayContainsAny)
                 as Iterable<Object>?
@@ -2894,42 +2908,44 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
   }
 
   NestedQuery whereNumList({
-    List<num>? isEqualTo,
-    List<num>? isNotEqualTo,
-    List<num>? isLessThan,
-    List<num>? isLessThanOrEqualTo,
-    List<num>? isGreaterThan,
-    List<num>? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
-    num? arrayContains,
+    Object? arrayContains = notSetQueryParam,
     List<num>? arrayContainsAny,
   }) {
     return _$NestedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$NestedFieldMap['numList']!,
-        isEqualTo: isEqualTo != null
-            ? _$NestedPerFieldToJson.numList(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$NestedPerFieldToJson.numList(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$NestedPerFieldToJson.numList(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.numList(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$NestedPerFieldToJson.numList(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.numList(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.numList(isEqualTo as List<num>?)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.numList(isNotEqualTo as List<num>?)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.numList(isLessThan as List<num>?)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.numList(isLessThanOrEqualTo as List<num>?)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.numList(isGreaterThan as List<num>?)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .numList(isGreaterThanOrEqualTo as List<num>?)
+            : notSetQueryParam,
         isNull: isNull,
-        arrayContains: arrayContains != null
-            ? (_$NestedPerFieldToJson.numList([arrayContains]) as List?)!.single
-            : null,
+        arrayContains: arrayContains != notSetQueryParam
+            ? (_$NestedPerFieldToJson.numList([arrayContains as num]) as List?)!
+                .single
+            : notSetQueryParam,
         arrayContainsAny: arrayContainsAny != null
             ? _$NestedPerFieldToJson.numList(arrayContainsAny)
                 as Iterable<Object>?
@@ -2940,43 +2956,45 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
   }
 
   NestedQuery whereObjectList({
-    List<Object?>? isEqualTo,
-    List<Object?>? isNotEqualTo,
-    List<Object?>? isLessThan,
-    List<Object?>? isLessThanOrEqualTo,
-    List<Object?>? isGreaterThan,
-    List<Object?>? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
-    Object? arrayContains,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
   }) {
     return _$NestedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$NestedFieldMap['objectList']!,
-        isEqualTo: isEqualTo != null
-            ? _$NestedPerFieldToJson.objectList(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$NestedPerFieldToJson.objectList(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$NestedPerFieldToJson.objectList(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.objectList(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$NestedPerFieldToJson.objectList(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.objectList(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.objectList(isEqualTo as List<Object?>?)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.objectList(isNotEqualTo as List<Object?>?)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.objectList(isLessThan as List<Object?>?)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .objectList(isLessThanOrEqualTo as List<Object?>?)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.objectList(isGreaterThan as List<Object?>?)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .objectList(isGreaterThanOrEqualTo as List<Object?>?)
+            : notSetQueryParam,
         isNull: isNull,
-        arrayContains: arrayContains != null
+        arrayContains: arrayContains != notSetQueryParam
             ? (_$NestedPerFieldToJson.objectList([arrayContains]) as List?)!
                 .single
-            : null,
+            : notSetQueryParam,
         arrayContainsAny: arrayContainsAny != null
             ? _$NestedPerFieldToJson.objectList(arrayContainsAny)
                 as Iterable<Object>?
@@ -2987,43 +3005,47 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
   }
 
   NestedQuery whereDynamicList({
-    List<dynamic>? isEqualTo,
-    List<dynamic>? isNotEqualTo,
-    List<dynamic>? isLessThan,
-    List<dynamic>? isLessThanOrEqualTo,
-    List<dynamic>? isGreaterThan,
-    List<dynamic>? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
-    dynamic arrayContains,
+    Object? arrayContains = notSetQueryParam,
     List<dynamic>? arrayContainsAny,
   }) {
     return _$NestedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$NestedFieldMap['dynamicList']!,
-        isEqualTo: isEqualTo != null
-            ? _$NestedPerFieldToJson.dynamicList(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$NestedPerFieldToJson.dynamicList(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$NestedPerFieldToJson.dynamicList(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.dynamicList(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$NestedPerFieldToJson.dynamicList(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.dynamicList(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.dynamicList(isEqualTo as List<dynamic>?)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.dynamicList(isNotEqualTo as List<dynamic>?)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.dynamicList(isLessThan as List<dynamic>?)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .dynamicList(isLessThanOrEqualTo as List<dynamic>?)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .dynamicList(isGreaterThan as List<dynamic>?)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .dynamicList(isGreaterThanOrEqualTo as List<dynamic>?)
+            : notSetQueryParam,
         isNull: isNull,
-        arrayContains: arrayContains != null
-            ? (_$NestedPerFieldToJson.dynamicList([arrayContains]) as List?)!
+        arrayContains: arrayContains != notSetQueryParam
+            ? (_$NestedPerFieldToJson.dynamicList([arrayContains as dynamic])
+                    as List?)!
                 .single
-            : null,
+            : notSetQueryParam,
         arrayContainsAny: arrayContainsAny != null
             ? _$NestedPerFieldToJson.dynamicList(arrayContainsAny)
                 as Iterable<Object>?
@@ -3034,42 +3056,45 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
   }
 
   NestedQuery whereBoolSet({
-    Set<bool>? isEqualTo,
-    Set<bool>? isNotEqualTo,
-    Set<bool>? isLessThan,
-    Set<bool>? isLessThanOrEqualTo,
-    Set<bool>? isGreaterThan,
-    Set<bool>? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
-    bool? arrayContains,
+    Object? arrayContains = notSetQueryParam,
     Set<bool>? arrayContainsAny,
   }) {
     return _$NestedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$NestedFieldMap['boolSet']!,
-        isEqualTo: isEqualTo != null
-            ? _$NestedPerFieldToJson.boolSet(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$NestedPerFieldToJson.boolSet(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$NestedPerFieldToJson.boolSet(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.boolSet(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$NestedPerFieldToJson.boolSet(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.boolSet(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.boolSet(isEqualTo as Set<bool>?)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.boolSet(isNotEqualTo as Set<bool>?)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.boolSet(isLessThan as Set<bool>?)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.boolSet(isLessThanOrEqualTo as Set<bool>?)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.boolSet(isGreaterThan as Set<bool>?)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .boolSet(isGreaterThanOrEqualTo as Set<bool>?)
+            : notSetQueryParam,
         isNull: isNull,
-        arrayContains: arrayContains != null
-            ? (_$NestedPerFieldToJson.boolSet({arrayContains}) as List?)!.single
-            : null,
+        arrayContains: arrayContains != notSetQueryParam
+            ? (_$NestedPerFieldToJson.boolSet({arrayContains as bool})
+                    as List?)!
+                .single
+            : notSetQueryParam,
         arrayContainsAny: arrayContainsAny != null
             ? _$NestedPerFieldToJson.boolSet(arrayContainsAny)
                 as Iterable<Object>?
@@ -3080,12 +3105,12 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
   }
 
   NestedQuery whereEnumValue({
-    TestEnum? isEqualTo,
-    TestEnum? isNotEqualTo,
-    TestEnum? isLessThan,
-    TestEnum? isLessThanOrEqualTo,
-    TestEnum? isGreaterThan,
-    TestEnum? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<TestEnum>? whereIn,
     List<TestEnum>? whereNotIn,
@@ -3094,24 +3119,25 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$NestedFieldMap['enumValue']!,
-        isEqualTo: isEqualTo != null
-            ? _$NestedPerFieldToJson.enumValue(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$NestedPerFieldToJson.enumValue(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$NestedPerFieldToJson.enumValue(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.enumValue(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$NestedPerFieldToJson.enumValue(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.enumValue(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.enumValue(isEqualTo as TestEnum)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.enumValue(isNotEqualTo as TestEnum)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.enumValue(isLessThan as TestEnum)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.enumValue(isLessThanOrEqualTo as TestEnum)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.enumValue(isGreaterThan as TestEnum)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .enumValue(isGreaterThanOrEqualTo as TestEnum)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$NestedPerFieldToJson.enumValue(e)),
         whereNotIn: whereNotIn?.map((e) => _$NestedPerFieldToJson.enumValue(e)),
@@ -3121,12 +3147,12 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
   }
 
   NestedQuery whereNullableEnumValue({
-    TestEnum? isEqualTo,
-    TestEnum? isNotEqualTo,
-    TestEnum? isLessThan,
-    TestEnum? isLessThanOrEqualTo,
-    TestEnum? isGreaterThan,
-    TestEnum? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<TestEnum?>? whereIn,
     List<TestEnum?>? whereNotIn,
@@ -3135,24 +3161,28 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$NestedFieldMap['nullableEnumValue']!,
-        isEqualTo: isEqualTo != null
-            ? _$NestedPerFieldToJson.nullableEnumValue(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$NestedPerFieldToJson.nullableEnumValue(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$NestedPerFieldToJson.nullableEnumValue(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.nullableEnumValue(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$NestedPerFieldToJson.nullableEnumValue(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.nullableEnumValue(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.nullableEnumValue(isEqualTo as TestEnum?)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .nullableEnumValue(isNotEqualTo as TestEnum?)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.nullableEnumValue(isLessThan as TestEnum?)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .nullableEnumValue(isLessThanOrEqualTo as TestEnum?)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .nullableEnumValue(isGreaterThan as TestEnum?)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .nullableEnumValue(isGreaterThanOrEqualTo as TestEnum?)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn:
             whereIn?.map((e) => _$NestedPerFieldToJson.nullableEnumValue(e)),
@@ -3164,43 +3194,46 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
   }
 
   NestedQuery whereEnumList({
-    List<TestEnum>? isEqualTo,
-    List<TestEnum>? isNotEqualTo,
-    List<TestEnum>? isLessThan,
-    List<TestEnum>? isLessThanOrEqualTo,
-    List<TestEnum>? isGreaterThan,
-    List<TestEnum>? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
-    TestEnum? arrayContains,
+    Object? arrayContains = notSetQueryParam,
     List<TestEnum>? arrayContainsAny,
   }) {
     return _$NestedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$NestedFieldMap['enumList']!,
-        isEqualTo: isEqualTo != null
-            ? _$NestedPerFieldToJson.enumList(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$NestedPerFieldToJson.enumList(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$NestedPerFieldToJson.enumList(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.enumList(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$NestedPerFieldToJson.enumList(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.enumList(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.enumList(isEqualTo as List<TestEnum>)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson.enumList(isNotEqualTo as List<TestEnum>)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.enumList(isLessThan as List<TestEnum>)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .enumList(isLessThanOrEqualTo as List<TestEnum>)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$NestedPerFieldToJson.enumList(isGreaterThan as List<TestEnum>)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .enumList(isGreaterThanOrEqualTo as List<TestEnum>)
+            : notSetQueryParam,
         isNull: isNull,
-        arrayContains: arrayContains != null
-            ? (_$NestedPerFieldToJson.enumList([arrayContains]) as List?)!
+        arrayContains: arrayContains != notSetQueryParam
+            ? (_$NestedPerFieldToJson.enumList([arrayContains as TestEnum])
+                    as List?)!
                 .single
-            : null,
+            : notSetQueryParam,
         arrayContainsAny: arrayContainsAny != null
             ? _$NestedPerFieldToJson.enumList(arrayContainsAny)
                 as Iterable<Object>?
@@ -3211,44 +3244,50 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
   }
 
   NestedQuery whereNullableEnumList({
-    List<TestEnum>? isEqualTo,
-    List<TestEnum>? isNotEqualTo,
-    List<TestEnum>? isLessThan,
-    List<TestEnum>? isLessThanOrEqualTo,
-    List<TestEnum>? isGreaterThan,
-    List<TestEnum>? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
-    TestEnum? arrayContains,
+    Object? arrayContains = notSetQueryParam,
     List<TestEnum>? arrayContainsAny,
   }) {
     return _$NestedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$NestedFieldMap['nullableEnumList']!,
-        isEqualTo: isEqualTo != null
-            ? _$NestedPerFieldToJson.nullableEnumList(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$NestedPerFieldToJson.nullableEnumList(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$NestedPerFieldToJson.nullableEnumList(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.nullableEnumList(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$NestedPerFieldToJson.nullableEnumList(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$NestedPerFieldToJson.nullableEnumList(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .nullableEnumList(isEqualTo as List<TestEnum>?)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .nullableEnumList(isNotEqualTo as List<TestEnum>?)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .nullableEnumList(isLessThan as List<TestEnum>?)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .nullableEnumList(isLessThanOrEqualTo as List<TestEnum>?)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .nullableEnumList(isGreaterThan as List<TestEnum>?)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$NestedPerFieldToJson
+                .nullableEnumList(isGreaterThanOrEqualTo as List<TestEnum>?)
+            : notSetQueryParam,
         isNull: isNull,
-        arrayContains: arrayContains != null
-            ? (_$NestedPerFieldToJson.nullableEnumList([arrayContains])
-                    as List?)!
+        arrayContains: arrayContains != notSetQueryParam
+            ? (_$NestedPerFieldToJson
+                    .nullableEnumList([arrayContains as TestEnum]) as List?)!
                 .single
-            : null,
+            : notSetQueryParam,
         arrayContainsAny: arrayContainsAny != null
             ? _$NestedPerFieldToJson.nullableEnumList(arrayContainsAny)
                 as Iterable<Object>?
@@ -4726,13 +4765,13 @@ class _$EmptyModelQuery
 
   EmptyModelQuery whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -4759,12 +4798,12 @@ class _$EmptyModelQuery
   }
 
   EmptyModelQuery whereDocumentId({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -5402,13 +5441,13 @@ class _$OptionalJsonQuery
 
   OptionalJsonQuery whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -5435,12 +5474,12 @@ class _$OptionalJsonQuery
   }
 
   OptionalJsonQuery whereDocumentId({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -5464,12 +5503,12 @@ class _$OptionalJsonQuery
   }
 
   OptionalJsonQuery whereValue({
-    int? isEqualTo,
-    int? isNotEqualTo,
-    int? isLessThan,
-    int? isLessThanOrEqualTo,
-    int? isGreaterThan,
-    int? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<int>? whereIn,
     List<int>? whereNotIn,
@@ -5478,24 +5517,24 @@ class _$OptionalJsonQuery
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$OptionalJsonFieldMap['value']!,
-        isEqualTo: isEqualTo != null
-            ? _$OptionalJsonPerFieldToJson.value(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$OptionalJsonPerFieldToJson.value(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$OptionalJsonPerFieldToJson.value(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$OptionalJsonPerFieldToJson.value(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$OptionalJsonPerFieldToJson.value(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$OptionalJsonPerFieldToJson.value(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$OptionalJsonPerFieldToJson.value(isEqualTo as int)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$OptionalJsonPerFieldToJson.value(isNotEqualTo as int)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$OptionalJsonPerFieldToJson.value(isLessThan as int)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$OptionalJsonPerFieldToJson.value(isLessThanOrEqualTo as int)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$OptionalJsonPerFieldToJson.value(isGreaterThan as int)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$OptionalJsonPerFieldToJson.value(isGreaterThanOrEqualTo as int)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$OptionalJsonPerFieldToJson.value(e)),
         whereNotIn:
@@ -6188,13 +6227,13 @@ class _$MixedJsonQuery extends QueryReference<MixedJson, MixedJsonQuerySnapshot>
 
   MixedJsonQuery whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -6221,12 +6260,12 @@ class _$MixedJsonQuery extends QueryReference<MixedJson, MixedJsonQuerySnapshot>
   }
 
   MixedJsonQuery whereDocumentId({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -6250,12 +6289,12 @@ class _$MixedJsonQuery extends QueryReference<MixedJson, MixedJsonQuerySnapshot>
   }
 
   MixedJsonQuery whereValue({
-    int? isEqualTo,
-    int? isNotEqualTo,
-    int? isLessThan,
-    int? isLessThanOrEqualTo,
-    int? isGreaterThan,
-    int? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<int>? whereIn,
     List<int>? whereNotIn,
@@ -6264,24 +6303,24 @@ class _$MixedJsonQuery extends QueryReference<MixedJson, MixedJsonQuerySnapshot>
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$MixedJsonFieldMap['value']!,
-        isEqualTo: isEqualTo != null
-            ? _$MixedJsonPerFieldToJson.value(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$MixedJsonPerFieldToJson.value(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$MixedJsonPerFieldToJson.value(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$MixedJsonPerFieldToJson.value(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$MixedJsonPerFieldToJson.value(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$MixedJsonPerFieldToJson.value(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$MixedJsonPerFieldToJson.value(isEqualTo as int)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$MixedJsonPerFieldToJson.value(isNotEqualTo as int)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$MixedJsonPerFieldToJson.value(isLessThan as int)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$MixedJsonPerFieldToJson.value(isLessThanOrEqualTo as int)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$MixedJsonPerFieldToJson.value(isGreaterThan as int)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$MixedJsonPerFieldToJson.value(isGreaterThanOrEqualTo as int)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$MixedJsonPerFieldToJson.value(e)),
         whereNotIn: whereNotIn?.map((e) => _$MixedJsonPerFieldToJson.value(e)),
@@ -7055,13 +7094,13 @@ class _$RootQuery extends QueryReference<Root, RootQuerySnapshot>
 
   RootQuery whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -7088,12 +7127,12 @@ class _$RootQuery extends QueryReference<Root, RootQuerySnapshot>
   }
 
   RootQuery whereDocumentId({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -7117,12 +7156,12 @@ class _$RootQuery extends QueryReference<Root, RootQuerySnapshot>
   }
 
   RootQuery whereNonNullable({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -7131,24 +7170,24 @@ class _$RootQuery extends QueryReference<Root, RootQuerySnapshot>
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$RootFieldMap['nonNullable']!,
-        isEqualTo: isEqualTo != null
-            ? _$RootPerFieldToJson.nonNullable(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$RootPerFieldToJson.nonNullable(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$RootPerFieldToJson.nonNullable(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$RootPerFieldToJson.nonNullable(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$RootPerFieldToJson.nonNullable(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$RootPerFieldToJson.nonNullable(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$RootPerFieldToJson.nonNullable(isEqualTo as String)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$RootPerFieldToJson.nonNullable(isNotEqualTo as String)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$RootPerFieldToJson.nonNullable(isLessThan as String)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$RootPerFieldToJson.nonNullable(isLessThanOrEqualTo as String)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$RootPerFieldToJson.nonNullable(isGreaterThan as String)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$RootPerFieldToJson.nonNullable(isGreaterThanOrEqualTo as String)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$RootPerFieldToJson.nonNullable(e)),
         whereNotIn: whereNotIn?.map((e) => _$RootPerFieldToJson.nonNullable(e)),
@@ -7158,12 +7197,12 @@ class _$RootQuery extends QueryReference<Root, RootQuerySnapshot>
   }
 
   RootQuery whereNullable({
-    int? isEqualTo,
-    int? isNotEqualTo,
-    int? isLessThan,
-    int? isLessThanOrEqualTo,
-    int? isGreaterThan,
-    int? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<int?>? whereIn,
     List<int?>? whereNotIn,
@@ -7172,23 +7211,24 @@ class _$RootQuery extends QueryReference<Root, RootQuerySnapshot>
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$RootFieldMap['nullable']!,
-        isEqualTo:
-            isEqualTo != null ? _$RootPerFieldToJson.nullable(isEqualTo) : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$RootPerFieldToJson.nullable(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$RootPerFieldToJson.nullable(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$RootPerFieldToJson.nullable(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$RootPerFieldToJson.nullable(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$RootPerFieldToJson.nullable(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$RootPerFieldToJson.nullable(isEqualTo as int?)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$RootPerFieldToJson.nullable(isNotEqualTo as int?)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$RootPerFieldToJson.nullable(isLessThan as int?)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$RootPerFieldToJson.nullable(isLessThanOrEqualTo as int?)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$RootPerFieldToJson.nullable(isGreaterThan as int?)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$RootPerFieldToJson.nullable(isGreaterThanOrEqualTo as int?)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$RootPerFieldToJson.nullable(e)),
         whereNotIn: whereNotIn?.map((e) => _$RootPerFieldToJson.nullable(e)),
@@ -8010,13 +8050,13 @@ class _$SubQuery extends QueryReference<Sub, SubQuerySnapshot>
 
   SubQuery whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -8043,12 +8083,12 @@ class _$SubQuery extends QueryReference<Sub, SubQuerySnapshot>
   }
 
   SubQuery whereDocumentId({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -8072,12 +8112,12 @@ class _$SubQuery extends QueryReference<Sub, SubQuerySnapshot>
   }
 
   SubQuery whereNonNullable({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -8086,24 +8126,24 @@ class _$SubQuery extends QueryReference<Sub, SubQuerySnapshot>
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$SubFieldMap['nonNullable']!,
-        isEqualTo: isEqualTo != null
-            ? _$SubPerFieldToJson.nonNullable(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$SubPerFieldToJson.nonNullable(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$SubPerFieldToJson.nonNullable(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$SubPerFieldToJson.nonNullable(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$SubPerFieldToJson.nonNullable(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$SubPerFieldToJson.nonNullable(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$SubPerFieldToJson.nonNullable(isEqualTo as String)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$SubPerFieldToJson.nonNullable(isNotEqualTo as String)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$SubPerFieldToJson.nonNullable(isLessThan as String)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$SubPerFieldToJson.nonNullable(isLessThanOrEqualTo as String)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$SubPerFieldToJson.nonNullable(isGreaterThan as String)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$SubPerFieldToJson.nonNullable(isGreaterThanOrEqualTo as String)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$SubPerFieldToJson.nonNullable(e)),
         whereNotIn: whereNotIn?.map((e) => _$SubPerFieldToJson.nonNullable(e)),
@@ -8113,12 +8153,12 @@ class _$SubQuery extends QueryReference<Sub, SubQuerySnapshot>
   }
 
   SubQuery whereNullable({
-    int? isEqualTo,
-    int? isNotEqualTo,
-    int? isLessThan,
-    int? isLessThanOrEqualTo,
-    int? isGreaterThan,
-    int? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<int?>? whereIn,
     List<int?>? whereNotIn,
@@ -8127,23 +8167,24 @@ class _$SubQuery extends QueryReference<Sub, SubQuerySnapshot>
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$SubFieldMap['nullable']!,
-        isEqualTo:
-            isEqualTo != null ? _$SubPerFieldToJson.nullable(isEqualTo) : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$SubPerFieldToJson.nullable(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$SubPerFieldToJson.nullable(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$SubPerFieldToJson.nullable(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$SubPerFieldToJson.nullable(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$SubPerFieldToJson.nullable(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$SubPerFieldToJson.nullable(isEqualTo as int?)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$SubPerFieldToJson.nullable(isNotEqualTo as int?)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$SubPerFieldToJson.nullable(isLessThan as int?)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$SubPerFieldToJson.nullable(isLessThanOrEqualTo as int?)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$SubPerFieldToJson.nullable(isGreaterThan as int?)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$SubPerFieldToJson.nullable(isGreaterThanOrEqualTo as int?)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$SubPerFieldToJson.nullable(e)),
         whereNotIn: whereNotIn?.map((e) => _$SubPerFieldToJson.nullable(e)),
@@ -8927,13 +8968,13 @@ class _$AsCamelCaseQuery
 
   AsCamelCaseQuery whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -8960,12 +9001,12 @@ class _$AsCamelCaseQuery
   }
 
   AsCamelCaseQuery whereDocumentId({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -8989,12 +9030,12 @@ class _$AsCamelCaseQuery
   }
 
   AsCamelCaseQuery whereValue({
-    num? isEqualTo,
-    num? isNotEqualTo,
-    num? isLessThan,
-    num? isLessThanOrEqualTo,
-    num? isGreaterThan,
-    num? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<num>? whereIn,
     List<num>? whereNotIn,
@@ -9003,24 +9044,24 @@ class _$AsCamelCaseQuery
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$AsCamelCaseFieldMap['value']!,
-        isEqualTo: isEqualTo != null
-            ? _$AsCamelCasePerFieldToJson.value(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$AsCamelCasePerFieldToJson.value(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$AsCamelCasePerFieldToJson.value(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$AsCamelCasePerFieldToJson.value(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$AsCamelCasePerFieldToJson.value(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$AsCamelCasePerFieldToJson.value(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$AsCamelCasePerFieldToJson.value(isEqualTo as num)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$AsCamelCasePerFieldToJson.value(isNotEqualTo as num)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$AsCamelCasePerFieldToJson.value(isLessThan as num)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$AsCamelCasePerFieldToJson.value(isLessThanOrEqualTo as num)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$AsCamelCasePerFieldToJson.value(isGreaterThan as num)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$AsCamelCasePerFieldToJson.value(isGreaterThanOrEqualTo as num)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$AsCamelCasePerFieldToJson.value(e)),
         whereNotIn:
@@ -9739,13 +9780,13 @@ class _$CustomSubNameQuery
 
   CustomSubNameQuery whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -9772,12 +9813,12 @@ class _$CustomSubNameQuery
   }
 
   CustomSubNameQuery whereDocumentId({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -9801,12 +9842,12 @@ class _$CustomSubNameQuery
   }
 
   CustomSubNameQuery whereValue({
-    num? isEqualTo,
-    num? isNotEqualTo,
-    num? isLessThan,
-    num? isLessThanOrEqualTo,
-    num? isGreaterThan,
-    num? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<num>? whereIn,
     List<num>? whereNotIn,
@@ -9815,24 +9856,24 @@ class _$CustomSubNameQuery
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$CustomSubNameFieldMap['value']!,
-        isEqualTo: isEqualTo != null
-            ? _$CustomSubNamePerFieldToJson.value(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$CustomSubNamePerFieldToJson.value(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$CustomSubNamePerFieldToJson.value(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$CustomSubNamePerFieldToJson.value(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$CustomSubNamePerFieldToJson.value(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$CustomSubNamePerFieldToJson.value(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$CustomSubNamePerFieldToJson.value(isEqualTo as num)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$CustomSubNamePerFieldToJson.value(isNotEqualTo as num)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$CustomSubNamePerFieldToJson.value(isLessThan as num)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$CustomSubNamePerFieldToJson.value(isLessThanOrEqualTo as num)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$CustomSubNamePerFieldToJson.value(isGreaterThan as num)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$CustomSubNamePerFieldToJson.value(isGreaterThanOrEqualTo as num)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$CustomSubNamePerFieldToJson.value(e)),
         whereNotIn:
@@ -10557,13 +10598,13 @@ class _$ThisIsACustomPrefixQuery
 
   ThisIsACustomPrefixQuery whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -10590,12 +10631,12 @@ class _$ThisIsACustomPrefixQuery
   }
 
   ThisIsACustomPrefixQuery whereDocumentId({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -10619,12 +10660,12 @@ class _$ThisIsACustomPrefixQuery
   }
 
   ThisIsACustomPrefixQuery whereValue({
-    num? isEqualTo,
-    num? isNotEqualTo,
-    num? isLessThan,
-    num? isLessThanOrEqualTo,
-    num? isGreaterThan,
-    num? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<num>? whereIn,
     List<num>? whereNotIn,
@@ -10633,24 +10674,26 @@ class _$ThisIsACustomPrefixQuery
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$CustomClassPrefixFieldMap['value']!,
-        isEqualTo: isEqualTo != null
-            ? _$CustomClassPrefixPerFieldToJson.value(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$CustomClassPrefixPerFieldToJson.value(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$CustomClassPrefixPerFieldToJson.value(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$CustomClassPrefixPerFieldToJson.value(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$CustomClassPrefixPerFieldToJson.value(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$CustomClassPrefixPerFieldToJson.value(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$CustomClassPrefixPerFieldToJson.value(isEqualTo as num)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$CustomClassPrefixPerFieldToJson.value(isNotEqualTo as num)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$CustomClassPrefixPerFieldToJson.value(isLessThan as num)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$CustomClassPrefixPerFieldToJson
+                .value(isLessThanOrEqualTo as num)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$CustomClassPrefixPerFieldToJson.value(isGreaterThan as num)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$CustomClassPrefixPerFieldToJson
+                .value(isGreaterThanOrEqualTo as num)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn:
             whereIn?.map((e) => _$CustomClassPrefixPerFieldToJson.value(e)),
@@ -11363,13 +11406,13 @@ class _$ExplicitPathQuery
 
   ExplicitPathQuery whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -11396,12 +11439,12 @@ class _$ExplicitPathQuery
   }
 
   ExplicitPathQuery whereDocumentId({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -11425,12 +11468,12 @@ class _$ExplicitPathQuery
   }
 
   ExplicitPathQuery whereValue({
-    num? isEqualTo,
-    num? isNotEqualTo,
-    num? isLessThan,
-    num? isLessThanOrEqualTo,
-    num? isGreaterThan,
-    num? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<num>? whereIn,
     List<num>? whereNotIn,
@@ -11439,24 +11482,24 @@ class _$ExplicitPathQuery
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$ExplicitPathFieldMap['value']!,
-        isEqualTo: isEqualTo != null
-            ? _$ExplicitPathPerFieldToJson.value(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$ExplicitPathPerFieldToJson.value(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$ExplicitPathPerFieldToJson.value(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$ExplicitPathPerFieldToJson.value(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$ExplicitPathPerFieldToJson.value(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$ExplicitPathPerFieldToJson.value(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$ExplicitPathPerFieldToJson.value(isEqualTo as num)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$ExplicitPathPerFieldToJson.value(isNotEqualTo as num)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$ExplicitPathPerFieldToJson.value(isLessThan as num)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$ExplicitPathPerFieldToJson.value(isLessThanOrEqualTo as num)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$ExplicitPathPerFieldToJson.value(isGreaterThan as num)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$ExplicitPathPerFieldToJson.value(isGreaterThanOrEqualTo as num)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$ExplicitPathPerFieldToJson.value(e)),
         whereNotIn:
@@ -12176,13 +12219,13 @@ class _$ExplicitSubPathQuery
 
   ExplicitSubPathQuery whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -12209,12 +12252,12 @@ class _$ExplicitSubPathQuery
   }
 
   ExplicitSubPathQuery whereDocumentId({
-    String? isEqualTo,
-    String? isNotEqualTo,
-    String? isLessThan,
-    String? isLessThanOrEqualTo,
-    String? isGreaterThan,
-    String? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<String>? whereIn,
     List<String>? whereNotIn,
@@ -12238,12 +12281,12 @@ class _$ExplicitSubPathQuery
   }
 
   ExplicitSubPathQuery whereValue({
-    num? isEqualTo,
-    num? isNotEqualTo,
-    num? isLessThan,
-    num? isLessThanOrEqualTo,
-    num? isGreaterThan,
-    num? isGreaterThanOrEqualTo,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
     bool? isNull,
     List<num>? whereIn,
     List<num>? whereNotIn,
@@ -12252,24 +12295,25 @@ class _$ExplicitSubPathQuery
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
         _$ExplicitSubPathFieldMap['value']!,
-        isEqualTo: isEqualTo != null
-            ? _$ExplicitSubPathPerFieldToJson.value(isEqualTo)
-            : null,
-        isNotEqualTo: isNotEqualTo != null
-            ? _$ExplicitSubPathPerFieldToJson.value(isNotEqualTo)
-            : null,
-        isLessThan: isLessThan != null
-            ? _$ExplicitSubPathPerFieldToJson.value(isLessThan)
-            : null,
-        isLessThanOrEqualTo: isLessThanOrEqualTo != null
-            ? _$ExplicitSubPathPerFieldToJson.value(isLessThanOrEqualTo)
-            : null,
-        isGreaterThan: isGreaterThan != null
-            ? _$ExplicitSubPathPerFieldToJson.value(isGreaterThan)
-            : null,
-        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != null
-            ? _$ExplicitSubPathPerFieldToJson.value(isGreaterThanOrEqualTo)
-            : null,
+        isEqualTo: isEqualTo != notSetQueryParam
+            ? _$ExplicitSubPathPerFieldToJson.value(isEqualTo as num)
+            : notSetQueryParam,
+        isNotEqualTo: isNotEqualTo != notSetQueryParam
+            ? _$ExplicitSubPathPerFieldToJson.value(isNotEqualTo as num)
+            : notSetQueryParam,
+        isLessThan: isLessThan != notSetQueryParam
+            ? _$ExplicitSubPathPerFieldToJson.value(isLessThan as num)
+            : notSetQueryParam,
+        isLessThanOrEqualTo: isLessThanOrEqualTo != notSetQueryParam
+            ? _$ExplicitSubPathPerFieldToJson.value(isLessThanOrEqualTo as num)
+            : notSetQueryParam,
+        isGreaterThan: isGreaterThan != notSetQueryParam
+            ? _$ExplicitSubPathPerFieldToJson.value(isGreaterThan as num)
+            : notSetQueryParam,
+        isGreaterThanOrEqualTo: isGreaterThanOrEqualTo != notSetQueryParam
+            ? _$ExplicitSubPathPerFieldToJson
+                .value(isGreaterThanOrEqualTo as num)
+            : notSetQueryParam,
         isNull: isNull,
         whereIn: whereIn?.map((e) => _$ExplicitSubPathPerFieldToJson.value(e)),
         whereNotIn:
diff --git a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/collection_generator.dart b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/collection_generator.dart
index 4b0b1de64b25..20b0580c4d0c 100644
--- a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/collection_generator.dart
+++ b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/collection_generator.dart
@@ -120,6 +120,7 @@ class CollectionGenerator
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, require_trailing_commas, prefer_single_quotes, prefer_double_quotes, use_super_parameters, duplicate_ignore
 // ignore_for_file: type=lint
+// ignore_for_file: invalid_use_of_internal_member
     ''';
 
     yield '''
diff --git a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/templates/query_reference.dart b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/templates/query_reference.dart
index 48312ece0d44..0814c2472fc8 100644
--- a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/templates/query_reference.dart
+++ b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/templates/query_reference.dart
@@ -8,6 +8,13 @@ import 'package:analyzer/dart/element/type_provider.dart';
 
 import '../collection_data.dart';
 
+class _WhereType {
+  _WhereType(this.type, [this.defaultValue]);
+
+  final String type;
+  final String? defaultValue;
+}
+
 class QueryTemplate {
   QueryTemplate(this.data);
 
@@ -208,13 +215,13 @@ class ${data.queryReferenceImplName}
 
   ${data.queryReferenceInterfaceName} whereFieldPath(
     FieldPath fieldPath, {
-    Object? isEqualTo,
-    Object? isNotEqualTo,
-    Object? isLessThan,
-    Object? isLessThanOrEqualTo,
-    Object? isGreaterThan,
-    Object? isGreaterThanOrEqualTo,
-    Object? arrayContains,
+    Object? isEqualTo = notSetQueryParam,
+    Object? isNotEqualTo = notSetQueryParam,
+    Object? isLessThan = notSetQueryParam,
+    Object? isLessThanOrEqualTo = notSetQueryParam,
+    Object? isGreaterThan = notSetQueryParam,
+    Object? isGreaterThanOrEqualTo = notSetQueryParam,
+    Object? arrayContains = notSetQueryParam,
     List<Object?>? arrayContainsAny,
     List<Object?>? whereIn,
     List<Object?>? whereNotIn,
@@ -380,26 +387,49 @@ class ${data.queryReferenceImplName}
               ? '${field.type}'
               : '${field.type}?';
 
-      final operators = {
-        'isEqualTo': nullableType,
-        'isNotEqualTo': nullableType,
-        'isLessThan': nullableType,
-        'isLessThanOrEqualTo': nullableType,
-        'isGreaterThan': nullableType,
-        'isGreaterThanOrEqualTo': nullableType,
-        'isNull': 'bool?',
+      final operators = <String, _WhereType>{
+        'isEqualTo': isAbstract
+            ? _WhereType(nullableType)
+            : _WhereType('Object?', 'notSetQueryParam'),
+        'isNotEqualTo': isAbstract
+            ? _WhereType(nullableType)
+            : _WhereType('Object?', 'notSetQueryParam'),
+        'isLessThan': isAbstract
+            ? _WhereType(nullableType)
+            : _WhereType('Object?', 'notSetQueryParam'),
+        'isLessThanOrEqualTo': isAbstract
+            ? _WhereType(nullableType)
+            : _WhereType('Object?', 'notSetQueryParam'),
+        'isGreaterThan': isAbstract
+            ? _WhereType(nullableType)
+            : _WhereType('Object?', 'notSetQueryParam'),
+        'isGreaterThanOrEqualTo': isAbstract
+            ? _WhereType(nullableType)
+            : _WhereType('Object?', 'notSetQueryParam'),
+        'isNull': _WhereType('bool?'),
         if (field.type.isSupportedIterable) ...{
-          'arrayContains': data.libraryElement.typeProvider
-              .asNullable((field.type as InterfaceType).typeArguments.first),
-          'arrayContainsAny': nullableType,
+          'arrayContains': isAbstract
+              ? _WhereType(
+                  data.libraryElement.typeProvider
+                      .asNullable(
+                        (field.type as InterfaceType).typeArguments.first,
+                      )
+                      .toString(),
+                )
+              : _WhereType('Object?', 'notSetQueryParam'),
+          'arrayContainsAny': _WhereType(nullableType),
         } else ...{
-          'whereIn': 'List<${field.type}>?',
-          'whereNotIn': 'List<${field.type}>?',
+          'whereIn': _WhereType('List<${field.type}>?'),
+          'whereNotIn': _WhereType('List<${field.type}>?'),
         },
       };
 
-      final prototype =
-          operators.entries.map((e) => '${e.value} ${e.key},').join();
+      final prototype = operators.entries.map((e) {
+        if (e.value.defaultValue != null) {
+          return '${e.value.type} ${e.key} = ${e.value.defaultValue},';
+        }
+        return '${e.value.type} ${e.key},';
+      }).join();
 
       final perFieldToJson = data.perFieldToJson(field.name);
 
@@ -411,19 +441,22 @@ class ${data.queryReferenceImplName}
         } else if (e == 'arrayContainsAny') {
           return '$e: $e != null ? $perFieldToJson($e) as Iterable<Object>? : null,';
         } else if (e == 'arrayContains') {
-          var transform = '$e: $e != null ? ($perFieldToJson(';
+          final itemType =
+              (field.type as InterfaceType).typeArguments.first.toString();
+          final cast = itemType != 'Object?' ? ' as $itemType' : '';
+
+          var transform = '$e: $e != notSetQueryParam ? ($perFieldToJson(';
           if (field.type.isSet) {
-            transform += '{$e}';
+            transform += '{$e$cast}';
           } else {
-            transform += '[$e]';
+            transform += '[$e$cast]';
           }
-          return '$transform) as List?)!.single : null,';
+          return '$transform) as List?)!.single : notSetQueryParam,';
         } else {
-          return '$e: $e != null ? $perFieldToJson($e) : null,';
+          return '$e: $e != notSetQueryParam ? $perFieldToJson($e as ${field.type}) : notSetQueryParam,';
         }
       }).join();
 
-      // TODO support whereX(isEqual: null);
       // TODO handle JsonSerializable case change and JsonKey(name: ...)
 
       if (isAbstract) {
diff --git a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/pubspec.yaml b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/pubspec.yaml
index 7d0cd1be39fd..2a83946c3907 100644
--- a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/pubspec.yaml
+++ b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
   collection: ^1.15.0
   freezed_annotation: '>=1.0.0 <3.0.0'
   # Can be removed once this is fixed https://github.com/dart-lang/graphs/issues/86
-  graphs: '>=2.0.0 <2.3.0'
+  graphs: ^2.0.0
   json_annotation: ^4.8.1
   meta: ^1.8.0
   recase: ^4.0.0