diff --git a/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/integration.g.dart b/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/integration.g.dart
index 8ab6ea0355dd..cb4f903ca5f0 100644
--- a/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/integration.g.dart
+++ b/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/integration.g.dart
@@ -9,7 +9,7 @@ part of 'integration.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
+// 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
 
 class _Sentinel {
   const _Sentinel();
@@ -173,7 +173,7 @@ class _$ManualJsonDocumentReference
     Object? value = _sentinel,
   }) async {
     final json = {
-      if (value != _sentinel) "value": value as String,
+      if (value != _sentinel) 'value': value as String,
     };
 
     return reference.update(json);
@@ -550,7 +550,7 @@ class _$ManualJsonQuery
     return _$ManualJsonQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        "value",
+        'value',
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -649,7 +649,7 @@ class _$ManualJsonQuery
     ManualJsonDocumentSnapshot? startAfterDocument,
   }) {
     final query =
-        $referenceWithoutCursor.orderBy("value", descending: descending);
+        $referenceWithoutCursor.orderBy('value', descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -917,9 +917,9 @@ class _$AdvancedJsonDocumentReference extends FirestoreDocumentReference<
     Object? hashCode = _sentinel,
   }) async {
     final json = {
-      if (firstName != _sentinel) "firstName": firstName as String?,
-      if (lastName != _sentinel) "lastName": lastName as String?,
-      if (hashCode != _sentinel) "hashCode": hashCode as int,
+      if (firstName != _sentinel) 'firstName': firstName as String?,
+      if (lastName != _sentinel) 'lastName': lastName as String?,
+      if (hashCode != _sentinel) 'hashCode': hashCode as int,
     };
 
     return reference.update(json);
@@ -1343,7 +1343,7 @@ class _$AdvancedJsonQuery
     return _$AdvancedJsonQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$AdvancedJsonFieldMap["firstName"]!,
+        _$AdvancedJsonFieldMap['firstName']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -1372,7 +1372,7 @@ class _$AdvancedJsonQuery
     return _$AdvancedJsonQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$AdvancedJsonFieldMap["lastName"]!,
+        _$AdvancedJsonFieldMap['lastName']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -1401,7 +1401,7 @@ class _$AdvancedJsonQuery
     return _$AdvancedJsonQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$AdvancedJsonFieldMap["hashCode"]!,
+        _$AdvancedJsonFieldMap['hashCode']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -1500,7 +1500,7 @@ class _$AdvancedJsonQuery
     AdvancedJsonDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$AdvancedJsonFieldMap["firstName"]!, descending: descending);
+        .orderBy(_$AdvancedJsonFieldMap['firstName']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -1572,7 +1572,7 @@ class _$AdvancedJsonQuery
     AdvancedJsonDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$AdvancedJsonFieldMap["lastName"]!, descending: descending);
+        .orderBy(_$AdvancedJsonFieldMap['lastName']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -1644,7 +1644,7 @@ class _$AdvancedJsonQuery
     AdvancedJsonDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$AdvancedJsonFieldMap["hashCode"]!, descending: descending);
+        .orderBy(_$AdvancedJsonFieldMap['hashCode']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -1921,9 +1921,9 @@ class _$_PrivateAdvancedJsonDocumentReference
     Object? hashCode = _sentinel,
   }) async {
     final json = {
-      if (firstName != _sentinel) "firstName": firstName as String?,
-      if (lastName != _sentinel) "lastName": lastName as String?,
-      if (hashCode != _sentinel) "hashCode": hashCode as int,
+      if (firstName != _sentinel) 'firstName': firstName as String?,
+      if (lastName != _sentinel) 'lastName': lastName as String?,
+      if (hashCode != _sentinel) 'hashCode': hashCode as int,
     };
 
     return reference.update(json);
@@ -2350,7 +2350,7 @@ class _$_PrivateAdvancedJsonQuery extends QueryReference<_PrivateAdvancedJson,
     return _$_PrivateAdvancedJsonQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$PrivateAdvancedJsonFieldMap["firstName"]!,
+        _$PrivateAdvancedJsonFieldMap['firstName']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -2379,7 +2379,7 @@ class _$_PrivateAdvancedJsonQuery extends QueryReference<_PrivateAdvancedJson,
     return _$_PrivateAdvancedJsonQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$PrivateAdvancedJsonFieldMap["lastName"]!,
+        _$PrivateAdvancedJsonFieldMap['lastName']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -2408,7 +2408,7 @@ class _$_PrivateAdvancedJsonQuery extends QueryReference<_PrivateAdvancedJson,
     return _$_PrivateAdvancedJsonQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$PrivateAdvancedJsonFieldMap["hashCode"]!,
+        _$PrivateAdvancedJsonFieldMap['hashCode']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -2507,7 +2507,7 @@ class _$_PrivateAdvancedJsonQuery extends QueryReference<_PrivateAdvancedJson,
     _PrivateAdvancedJsonDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor.orderBy(
-        _$PrivateAdvancedJsonFieldMap["firstName"]!,
+        _$PrivateAdvancedJsonFieldMap['firstName']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -2580,7 +2580,7 @@ class _$_PrivateAdvancedJsonQuery extends QueryReference<_PrivateAdvancedJson,
     _PrivateAdvancedJsonDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor.orderBy(
-        _$PrivateAdvancedJsonFieldMap["lastName"]!,
+        _$PrivateAdvancedJsonFieldMap['lastName']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -2653,7 +2653,7 @@ class _$_PrivateAdvancedJsonQuery extends QueryReference<_PrivateAdvancedJson,
     _PrivateAdvancedJsonDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor.orderBy(
-        _$PrivateAdvancedJsonFieldMap["hashCode"]!,
+        _$PrivateAdvancedJsonFieldMap['hashCode']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
diff --git a/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/integration/freezed.g.dart b/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/integration/freezed.g.dart
index 5e4a37333ede..d2434f3f7b81 100644
--- a/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/integration/freezed.g.dart
+++ b/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/integration/freezed.g.dart
@@ -9,7 +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
+// 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
 
 class _Sentinel {
   const _Sentinel();
@@ -175,8 +175,8 @@ class _$PersonDocumentReference
     Object? lastName = _sentinel,
   }) async {
     final json = {
-      if (firstName != _sentinel) "firstName": firstName as String,
-      if (lastName != _sentinel) "lastName": lastName as String,
+      if (firstName != _sentinel) 'firstName': firstName as String,
+      if (lastName != _sentinel) 'lastName': lastName as String,
     };
 
     return reference.update(json);
@@ -575,7 +575,7 @@ class _$PersonQuery extends QueryReference<Person, PersonQuerySnapshot>
     return _$PersonQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$$_PersonFieldMap["firstName"]!,
+        _$$_PersonFieldMap['firstName']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -604,7 +604,7 @@ class _$PersonQuery extends QueryReference<Person, PersonQuerySnapshot>
     return _$PersonQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$$_PersonFieldMap["lastName"]!,
+        _$$_PersonFieldMap['lastName']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -703,7 +703,7 @@ class _$PersonQuery extends QueryReference<Person, PersonQuerySnapshot>
     PersonDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$$_PersonFieldMap["firstName"]!, descending: descending);
+        .orderBy(_$$_PersonFieldMap['firstName']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -775,7 +775,7 @@ class _$PersonQuery extends QueryReference<Person, PersonQuerySnapshot>
     PersonDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$$_PersonFieldMap["lastName"]!, descending: descending);
+        .orderBy(_$$_PersonFieldMap['lastName']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -1041,7 +1041,7 @@ class _$PublicRedirectedDocumentReference extends FirestoreDocumentReference<
     Object? value = _sentinel,
   }) async {
     final json = {
-      if (value != _sentinel) "value": value as String,
+      if (value != _sentinel) 'value': value as String,
     };
 
     return reference.update(json);
@@ -1419,7 +1419,7 @@ class _$PublicRedirectedQuery
     return _$PublicRedirectedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$$PublicRedirected2FieldMap["value"]!,
+        _$$PublicRedirected2FieldMap['value']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -1518,7 +1518,7 @@ class _$PublicRedirectedQuery
     PublicRedirectedDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor.orderBy(
-        _$$PublicRedirected2FieldMap["value"]!,
+        _$$PublicRedirected2FieldMap['value']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
diff --git a/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/integration/query.g.dart b/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/integration/query.g.dart
index 2b9e0d43152c..3bd41978fdd2 100644
--- a/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/integration/query.g.dart
+++ b/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/integration/query.g.dart
@@ -9,7 +9,7 @@ part of 'query.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
+// 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
 
 class _Sentinel {
   const _Sentinel();
@@ -178,7 +178,7 @@ class _$DateTimeQueryDocumentReference extends FirestoreDocumentReference<
     Object? time = _sentinel,
   }) async {
     final json = {
-      if (time != _sentinel) "time": time as DateTime,
+      if (time != _sentinel) 'time': time as DateTime,
     };
 
     return reference.update(json);
@@ -556,7 +556,7 @@ class _$DateTimeQueryQuery
     return _$DateTimeQueryQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$DateTimeQueryFieldMap["time"]!,
+        _$DateTimeQueryFieldMap['time']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -655,7 +655,7 @@ class _$DateTimeQueryQuery
     DateTimeQueryDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$DateTimeQueryFieldMap["time"]!, descending: descending);
+        .orderBy(_$DateTimeQueryFieldMap['time']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -923,7 +923,7 @@ class _$TimestampQueryDocumentReference extends FirestoreDocumentReference<
     Object? time = _sentinel,
   }) async {
     final json = {
-      if (time != _sentinel) "time": time as Timestamp,
+      if (time != _sentinel) 'time': time as Timestamp,
     };
 
     return reference.update(json);
@@ -1301,7 +1301,7 @@ class _$TimestampQueryQuery
     return _$TimestampQueryQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$TimestampQueryFieldMap["time"]!,
+        _$TimestampQueryFieldMap['time']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -1400,7 +1400,7 @@ class _$TimestampQueryQuery
     TimestampQueryDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$TimestampQueryFieldMap["time"]!, descending: descending);
+        .orderBy(_$TimestampQueryFieldMap['time']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -1669,7 +1669,7 @@ class _$GeoPointQueryDocumentReference extends FirestoreDocumentReference<
     Object? point = _sentinel,
   }) async {
     final json = {
-      if (point != _sentinel) "point": point as GeoPoint,
+      if (point != _sentinel) 'point': point as GeoPoint,
     };
 
     return reference.update(json);
@@ -2047,7 +2047,7 @@ class _$GeoPointQueryQuery
     return _$GeoPointQueryQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$GeoPointQueryFieldMap["point"]!,
+        _$GeoPointQueryFieldMap['point']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -2146,7 +2146,7 @@ class _$GeoPointQueryQuery
     GeoPointQueryDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$GeoPointQueryFieldMap["point"]!, descending: descending);
+        .orderBy(_$GeoPointQueryFieldMap['point']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -2419,7 +2419,7 @@ class _$DocumentReferenceQueryDocumentReference
   }) async {
     final json = {
       if (ref != _sentinel)
-        "ref": ref as DocumentReference<Map<String, dynamic>>,
+        'ref': ref as DocumentReference<Map<String, dynamic>>,
     };
 
     return reference.update(json);
@@ -2801,7 +2801,7 @@ class _$DocumentReferenceQueryQuery extends QueryReference<
     return _$DocumentReferenceQueryQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$DocumentReferenceQueryFieldMap["ref"]!,
+        _$DocumentReferenceQueryFieldMap['ref']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -2900,7 +2900,7 @@ class _$DocumentReferenceQueryQuery extends QueryReference<
     DocumentReferenceQueryDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor.orderBy(
-        _$DocumentReferenceQueryFieldMap["ref"]!,
+        _$DocumentReferenceQueryFieldMap['ref']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
diff --git a/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/movie.g.dart b/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/movie.g.dart
index 97c82bc40243..7f4beef8ed68 100644
--- a/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/movie.g.dart
+++ b/packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/movie.g.dart
@@ -9,7 +9,7 @@ part of 'movie.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
+// 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
 
 class _Sentinel {
   const _Sentinel();
@@ -193,13 +193,13 @@ class _$MovieDocumentReference
     Object? genre = _sentinel,
   }) async {
     final json = {
-      if (poster != _sentinel) "poster": poster as String,
-      if (likes != _sentinel) "likes": likes as int,
-      if (title != _sentinel) "title": title as String,
-      if (year != _sentinel) "year": year as int,
-      if (runtime != _sentinel) "runtime": runtime as String,
-      if (rated != _sentinel) "rated": rated as String,
-      if (genre != _sentinel) "genre": genre as List<String>?,
+      if (poster != _sentinel) 'poster': poster as String,
+      if (likes != _sentinel) 'likes': likes as int,
+      if (title != _sentinel) 'title': title as String,
+      if (year != _sentinel) 'year': year as int,
+      if (runtime != _sentinel) 'runtime': runtime as String,
+      if (rated != _sentinel) 'rated': rated as String,
+      if (genre != _sentinel) 'genre': genre as List<String>?,
     };
 
     return reference.update(json);
@@ -712,7 +712,7 @@ class _$MovieQuery extends QueryReference<Movie, MovieQuerySnapshot>
     return _$MovieQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$MovieFieldMap["poster"]!,
+        _$MovieFieldMap['poster']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -741,7 +741,7 @@ class _$MovieQuery extends QueryReference<Movie, MovieQuerySnapshot>
     return _$MovieQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$MovieFieldMap["likes"]!,
+        _$MovieFieldMap['likes']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -770,7 +770,7 @@ class _$MovieQuery extends QueryReference<Movie, MovieQuerySnapshot>
     return _$MovieQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$MovieFieldMap["title"]!,
+        _$MovieFieldMap['title']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -799,7 +799,7 @@ class _$MovieQuery extends QueryReference<Movie, MovieQuerySnapshot>
     return _$MovieQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$MovieFieldMap["year"]!,
+        _$MovieFieldMap['year']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -828,7 +828,7 @@ class _$MovieQuery extends QueryReference<Movie, MovieQuerySnapshot>
     return _$MovieQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$MovieFieldMap["runtime"]!,
+        _$MovieFieldMap['runtime']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -857,7 +857,7 @@ class _$MovieQuery extends QueryReference<Movie, MovieQuerySnapshot>
     return _$MovieQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$MovieFieldMap["rated"]!,
+        _$MovieFieldMap['rated']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -886,7 +886,7 @@ class _$MovieQuery extends QueryReference<Movie, MovieQuerySnapshot>
     return _$MovieQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$MovieFieldMap["genre"]!,
+        _$MovieFieldMap['genre']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -984,7 +984,7 @@ class _$MovieQuery extends QueryReference<Movie, MovieQuerySnapshot>
     MovieDocumentSnapshot? endBeforeDocument,
     MovieDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$MovieFieldMap["poster"]!,
+    final query = $referenceWithoutCursor.orderBy(_$MovieFieldMap['poster']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -1056,7 +1056,7 @@ class _$MovieQuery extends QueryReference<Movie, MovieQuerySnapshot>
     MovieDocumentSnapshot? endBeforeDocument,
     MovieDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$MovieFieldMap["likes"]!,
+    final query = $referenceWithoutCursor.orderBy(_$MovieFieldMap['likes']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -1128,7 +1128,7 @@ class _$MovieQuery extends QueryReference<Movie, MovieQuerySnapshot>
     MovieDocumentSnapshot? endBeforeDocument,
     MovieDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$MovieFieldMap["title"]!,
+    final query = $referenceWithoutCursor.orderBy(_$MovieFieldMap['title']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -1200,7 +1200,7 @@ class _$MovieQuery extends QueryReference<Movie, MovieQuerySnapshot>
     MovieDocumentSnapshot? endBeforeDocument,
     MovieDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$MovieFieldMap["year"]!,
+    final query = $referenceWithoutCursor.orderBy(_$MovieFieldMap['year']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -1272,7 +1272,7 @@ class _$MovieQuery extends QueryReference<Movie, MovieQuerySnapshot>
     MovieDocumentSnapshot? endBeforeDocument,
     MovieDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$MovieFieldMap["runtime"]!,
+    final query = $referenceWithoutCursor.orderBy(_$MovieFieldMap['runtime']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -1344,7 +1344,7 @@ class _$MovieQuery extends QueryReference<Movie, MovieQuerySnapshot>
     MovieDocumentSnapshot? endBeforeDocument,
     MovieDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$MovieFieldMap["rated"]!,
+    final query = $referenceWithoutCursor.orderBy(_$MovieFieldMap['rated']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -1416,7 +1416,7 @@ class _$MovieQuery extends QueryReference<Movie, MovieQuerySnapshot>
     MovieDocumentSnapshot? endBeforeDocument,
     MovieDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$MovieFieldMap["genre"]!,
+    final query = $referenceWithoutCursor.orderBy(_$MovieFieldMap['genre']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -1697,8 +1697,8 @@ class _$CommentDocumentReference
     Object? message = _sentinel,
   }) async {
     final json = {
-      if (authorName != _sentinel) "authorName": authorName as String,
-      if (message != _sentinel) "message": message as String,
+      if (authorName != _sentinel) 'authorName': authorName as String,
+      if (message != _sentinel) 'message': message as String,
     };
 
     return reference.update(json);
@@ -2097,7 +2097,7 @@ class _$CommentQuery extends QueryReference<Comment, CommentQuerySnapshot>
     return _$CommentQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$CommentFieldMap["authorName"]!,
+        _$CommentFieldMap['authorName']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -2126,7 +2126,7 @@ class _$CommentQuery extends QueryReference<Comment, CommentQuerySnapshot>
     return _$CommentQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$CommentFieldMap["message"]!,
+        _$CommentFieldMap['message']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -2225,7 +2225,7 @@ class _$CommentQuery extends QueryReference<Comment, CommentQuerySnapshot>
     CommentDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$CommentFieldMap["authorName"]!, descending: descending);
+        .orderBy(_$CommentFieldMap['authorName']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -2296,7 +2296,7 @@ class _$CommentQuery extends QueryReference<Comment, CommentQuerySnapshot>
     CommentDocumentSnapshot? endBeforeDocument,
     CommentDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$CommentFieldMap["message"]!,
+    final query = $referenceWithoutCursor.orderBy(_$CommentFieldMap['message']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -2407,8 +2407,8 @@ class CommentQueryDocumentSnapshot
 // **************************************************************************
 
 void _$assertMovie(Movie instance) {
-  const Min(0).validate(instance.likes, "likes");
-  const Min(0).validate(instance.year, "year");
+  const Min(0).validate(instance.likes, 'likes');
+  const Min(0).validate(instance.year, 'year');
 }
 
 // **************************************************************************
diff --git a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/cloud_firestore_odm_generator_integration_test/lib/freezed.dart b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/cloud_firestore_odm_generator_integration_test/lib/freezed.dart
index c1077d339c24..aadf534b39a0 100644
--- a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/cloud_firestore_odm_generator_integration_test/lib/freezed.dart
+++ b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/cloud_firestore_odm_generator_integration_test/lib/freezed.dart
@@ -1,5 +1,6 @@
 // ignore_for_file: invalid_annotation_target
 
+import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:cloud_firestore_odm/cloud_firestore_odm.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
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 72e923396907..269d10752b8b 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
@@ -7,7 +7,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
+// 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
 
 class _Sentinel {
   const _Sentinel();
@@ -173,8 +173,8 @@ class _$PersonDocumentReference
     Object? lastName = _sentinel,
   }) async {
     final json = {
-      if (firstName != _sentinel) "firstName": firstName as String,
-      if (lastName != _sentinel) "lastName": lastName as String,
+      if (firstName != _sentinel) 'firstName': firstName as String,
+      if (lastName != _sentinel) 'lastName': lastName as String,
     };
 
     return reference.update(json);
@@ -573,7 +573,7 @@ class _$PersonQuery extends QueryReference<Person, PersonQuerySnapshot>
     return _$PersonQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$$_PersonFieldMap["firstName"]!,
+        _$$_PersonFieldMap['firstName']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -602,7 +602,7 @@ class _$PersonQuery extends QueryReference<Person, PersonQuerySnapshot>
     return _$PersonQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$$_PersonFieldMap["lastName"]!,
+        _$$_PersonFieldMap['lastName']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -701,7 +701,7 @@ class _$PersonQuery extends QueryReference<Person, PersonQuerySnapshot>
     PersonDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$$_PersonFieldMap["firstName"]!, descending: descending);
+        .orderBy(_$$_PersonFieldMap['firstName']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -773,7 +773,7 @@ class _$PersonQuery extends QueryReference<Person, PersonQuerySnapshot>
     PersonDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$$_PersonFieldMap["lastName"]!, descending: descending);
+        .orderBy(_$$_PersonFieldMap['lastName']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -1039,7 +1039,7 @@ class _$PublicRedirectedDocumentReference extends FirestoreDocumentReference<
     Object? value = _sentinel,
   }) async {
     final json = {
-      if (value != _sentinel) "value": value as String,
+      if (value != _sentinel) 'value': value as String,
     };
 
     return reference.update(json);
@@ -1417,7 +1417,7 @@ class _$PublicRedirectedQuery
     return _$PublicRedirectedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$$PublicRedirected2FieldMap["value"]!,
+        _$$PublicRedirected2FieldMap['value']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -1516,7 +1516,7 @@ class _$PublicRedirectedQuery
     PublicRedirectedDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor.orderBy(
-        _$$PublicRedirected2FieldMap["value"]!,
+        _$$PublicRedirected2FieldMap['value']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
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 dc113e5dfaa6..0b7859babc74 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
@@ -7,7 +7,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
+// 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
 
 class _Sentinel {
   const _Sentinel();
@@ -171,7 +171,7 @@ class _$ModelDocumentReference
     Object? value = _sentinel,
   }) async {
     final json = {
-      if (value != _sentinel) "value": value as String,
+      if (value != _sentinel) 'value': value as String,
     };
 
     return reference.update(json);
@@ -546,7 +546,7 @@ class _$ModelQuery extends QueryReference<Model, ModelQuerySnapshot>
     return _$ModelQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$ModelFieldMap["value"]!,
+        _$ModelFieldMap['value']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -644,7 +644,7 @@ class _$ModelQuery extends QueryReference<Model, ModelQuerySnapshot>
     ModelDocumentSnapshot? endBeforeDocument,
     ModelDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$ModelFieldMap["value"]!,
+    final query = $referenceWithoutCursor.orderBy(_$ModelFieldMap['value']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -915,13 +915,13 @@ class _$NestedDocumentReference
     Object? dynamicList = _sentinel,
   }) async {
     final json = {
-      if (simple != _sentinel) "simple": simple as int?,
-      if (boolList != _sentinel) "boolList": boolList as List<bool>?,
-      if (stringList != _sentinel) "stringList": stringList as List<String>?,
-      if (numList != _sentinel) "numList": numList as List<num>?,
-      if (objectList != _sentinel) "objectList": objectList as List<Object?>?,
+      if (simple != _sentinel) 'simple': simple as int?,
+      if (boolList != _sentinel) 'boolList': boolList as List<bool>?,
+      if (stringList != _sentinel) 'stringList': stringList as List<String>?,
+      if (numList != _sentinel) 'numList': numList as List<num>?,
+      if (objectList != _sentinel) 'objectList': objectList as List<Object?>?,
       if (dynamicList != _sentinel)
-        "dynamicList": dynamicList as List<dynamic>?,
+        'dynamicList': dynamicList as List<dynamic>?,
     };
 
     return reference.update(json);
@@ -1412,7 +1412,7 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
     return _$NestedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$NestedFieldMap["simple"]!,
+        _$NestedFieldMap['simple']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -1441,7 +1441,7 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
     return _$NestedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$NestedFieldMap["boolList"]!,
+        _$NestedFieldMap['boolList']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -1470,7 +1470,7 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
     return _$NestedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$NestedFieldMap["stringList"]!,
+        _$NestedFieldMap['stringList']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -1499,7 +1499,7 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
     return _$NestedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$NestedFieldMap["numList"]!,
+        _$NestedFieldMap['numList']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -1528,7 +1528,7 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
     return _$NestedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$NestedFieldMap["objectList"]!,
+        _$NestedFieldMap['objectList']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -1557,7 +1557,7 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
     return _$NestedQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$NestedFieldMap["dynamicList"]!,
+        _$NestedFieldMap['dynamicList']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -1655,7 +1655,7 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
     NestedDocumentSnapshot? endBeforeDocument,
     NestedDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$NestedFieldMap["simple"]!,
+    final query = $referenceWithoutCursor.orderBy(_$NestedFieldMap['simple']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -1727,7 +1727,7 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
     NestedDocumentSnapshot? endBeforeDocument,
     NestedDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$NestedFieldMap["boolList"]!,
+    final query = $referenceWithoutCursor.orderBy(_$NestedFieldMap['boolList']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -1800,7 +1800,7 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
     NestedDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$NestedFieldMap["stringList"]!, descending: descending);
+        .orderBy(_$NestedFieldMap['stringList']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -1871,7 +1871,7 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
     NestedDocumentSnapshot? endBeforeDocument,
     NestedDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$NestedFieldMap["numList"]!,
+    final query = $referenceWithoutCursor.orderBy(_$NestedFieldMap['numList']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -1944,7 +1944,7 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
     NestedDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$NestedFieldMap["objectList"]!, descending: descending);
+        .orderBy(_$NestedFieldMap['objectList']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -2016,7 +2016,7 @@ class _$NestedQuery extends QueryReference<Nested, NestedQuerySnapshot>
     NestedDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$NestedFieldMap["dynamicList"]!, descending: descending);
+        .orderBy(_$NestedFieldMap['dynamicList']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -3484,7 +3484,7 @@ class _$OptionalJsonDocumentReference extends FirestoreDocumentReference<
     Object? value = _sentinel,
   }) async {
     final json = {
-      if (value != _sentinel) "value": value as int,
+      if (value != _sentinel) 'value': value as int,
     };
 
     return reference.update(json);
@@ -3862,7 +3862,7 @@ class _$OptionalJsonQuery
     return _$OptionalJsonQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$OptionalJsonFieldMap["value"]!,
+        _$OptionalJsonFieldMap['value']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -3961,7 +3961,7 @@ class _$OptionalJsonQuery
     OptionalJsonDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$OptionalJsonFieldMap["value"]!, descending: descending);
+        .orderBy(_$OptionalJsonFieldMap['value']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -4222,7 +4222,7 @@ class _$MixedJsonDocumentReference
     Object? value = _sentinel,
   }) async {
     final json = {
-      if (value != _sentinel) "value": value as int,
+      if (value != _sentinel) 'value': value as int,
     };
 
     return reference.update(json);
@@ -4598,7 +4598,7 @@ class _$MixedJsonQuery extends QueryReference<MixedJson, MixedJsonQuerySnapshot>
     return _$MixedJsonQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$MixedJsonFieldMap["value"]!,
+        _$MixedJsonFieldMap['value']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -4696,7 +4696,7 @@ class _$MixedJsonQuery extends QueryReference<MixedJson, MixedJsonQuerySnapshot>
     MixedJsonDocumentSnapshot? endBeforeDocument,
     MixedJsonDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$MixedJsonFieldMap["value"]!,
+    final query = $referenceWithoutCursor.orderBy(_$MixedJsonFieldMap['value']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -4998,8 +4998,8 @@ class _$RootDocumentReference
     Object? nullable = _sentinel,
   }) async {
     final json = {
-      if (nonNullable != _sentinel) "nonNullable": nonNullable as String,
-      if (nullable != _sentinel) "nullable": nullable as int?,
+      if (nonNullable != _sentinel) 'nonNullable': nonNullable as String,
+      if (nullable != _sentinel) 'nullable': nullable as int?,
     };
 
     return reference.update(json);
@@ -5397,7 +5397,7 @@ class _$RootQuery extends QueryReference<Root, RootQuerySnapshot>
     return _$RootQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$RootFieldMap["nonNullable"]!,
+        _$RootFieldMap['nonNullable']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -5426,7 +5426,7 @@ class _$RootQuery extends QueryReference<Root, RootQuerySnapshot>
     return _$RootQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$RootFieldMap["nullable"]!,
+        _$RootFieldMap['nullable']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -5525,7 +5525,7 @@ class _$RootQuery extends QueryReference<Root, RootQuerySnapshot>
     RootDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$RootFieldMap["nonNullable"]!, descending: descending);
+        .orderBy(_$RootFieldMap['nonNullable']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -5596,7 +5596,7 @@ class _$RootQuery extends QueryReference<Root, RootQuerySnapshot>
     RootDocumentSnapshot? endBeforeDocument,
     RootDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$RootFieldMap["nullable"]!,
+    final query = $referenceWithoutCursor.orderBy(_$RootFieldMap['nullable']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -5875,8 +5875,8 @@ class _$SubDocumentReference
     Object? nullable = _sentinel,
   }) async {
     final json = {
-      if (nonNullable != _sentinel) "nonNullable": nonNullable as String,
-      if (nullable != _sentinel) "nullable": nullable as int?,
+      if (nonNullable != _sentinel) 'nonNullable': nonNullable as String,
+      if (nullable != _sentinel) 'nullable': nullable as int?,
     };
 
     return reference.update(json);
@@ -6274,7 +6274,7 @@ class _$SubQuery extends QueryReference<Sub, SubQuerySnapshot>
     return _$SubQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$SubFieldMap["nonNullable"]!,
+        _$SubFieldMap['nonNullable']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -6303,7 +6303,7 @@ class _$SubQuery extends QueryReference<Sub, SubQuerySnapshot>
     return _$SubQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$SubFieldMap["nullable"]!,
+        _$SubFieldMap['nullable']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -6401,7 +6401,7 @@ class _$SubQuery extends QueryReference<Sub, SubQuerySnapshot>
     SubDocumentSnapshot? endBeforeDocument,
     SubDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$SubFieldMap["nonNullable"]!,
+    final query = $referenceWithoutCursor.orderBy(_$SubFieldMap['nonNullable']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -6473,7 +6473,7 @@ class _$SubQuery extends QueryReference<Sub, SubQuerySnapshot>
     SubDocumentSnapshot? endBeforeDocument,
     SubDocumentSnapshot? startAfterDocument,
   }) {
-    final query = $referenceWithoutCursor.orderBy(_$SubFieldMap["nullable"]!,
+    final query = $referenceWithoutCursor.orderBy(_$SubFieldMap['nullable']!,
         descending: descending);
     var queryCursor = $queryCursor;
 
@@ -6755,7 +6755,7 @@ class _$AsCamelCaseDocumentReference
     Object? value = _sentinel,
   }) async {
     final json = {
-      if (value != _sentinel) "value": value as num,
+      if (value != _sentinel) 'value': value as num,
     };
 
     return reference.update(json);
@@ -7133,7 +7133,7 @@ class _$AsCamelCaseQuery
     return _$AsCamelCaseQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$AsCamelCaseFieldMap["value"]!,
+        _$AsCamelCaseFieldMap['value']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -7232,7 +7232,7 @@ class _$AsCamelCaseQuery
     AsCamelCaseDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$AsCamelCaseFieldMap["value"]!, descending: descending);
+        .orderBy(_$AsCamelCaseFieldMap['value']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -7516,7 +7516,7 @@ class _$CustomSubNameDocumentReference extends FirestoreDocumentReference<
     Object? value = _sentinel,
   }) async {
     final json = {
-      if (value != _sentinel) "value": value as num,
+      if (value != _sentinel) 'value': value as num,
     };
 
     return reference.update(json);
@@ -7894,7 +7894,7 @@ class _$CustomSubNameQuery
     return _$CustomSubNameQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$CustomSubNameFieldMap["value"]!,
+        _$CustomSubNameFieldMap['value']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -7993,7 +7993,7 @@ class _$CustomSubNameQuery
     CustomSubNameDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$CustomSubNameFieldMap["value"]!, descending: descending);
+        .orderBy(_$CustomSubNameFieldMap['value']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -8278,7 +8278,7 @@ class _$ThisIsACustomPrefixDocumentReference extends FirestoreDocumentReference<
     Object? value = _sentinel,
   }) async {
     final json = {
-      if (value != _sentinel) "value": value as num,
+      if (value != _sentinel) 'value': value as num,
     };
 
     return reference.update(json);
@@ -8659,7 +8659,7 @@ class _$ThisIsACustomPrefixQuery
     return _$ThisIsACustomPrefixQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$CustomClassPrefixFieldMap["value"]!,
+        _$CustomClassPrefixFieldMap['value']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -8758,7 +8758,7 @@ class _$ThisIsACustomPrefixQuery
     ThisIsACustomPrefixDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$CustomClassPrefixFieldMap["value"]!, descending: descending);
+        .orderBy(_$CustomClassPrefixFieldMap['value']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -9033,7 +9033,7 @@ class _$ExplicitPathDocumentReference extends FirestoreDocumentReference<
     Object? value = _sentinel,
   }) async {
     final json = {
-      if (value != _sentinel) "value": value as num,
+      if (value != _sentinel) 'value': value as num,
     };
 
     return reference.update(json);
@@ -9411,7 +9411,7 @@ class _$ExplicitPathQuery
     return _$ExplicitPathQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$ExplicitPathFieldMap["value"]!,
+        _$ExplicitPathFieldMap['value']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -9510,7 +9510,7 @@ class _$ExplicitPathQuery
     ExplicitPathDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$ExplicitPathFieldMap["value"]!, descending: descending);
+        .orderBy(_$ExplicitPathFieldMap['value']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -9794,7 +9794,7 @@ class _$ExplicitSubPathDocumentReference extends FirestoreDocumentReference<
     Object? value = _sentinel,
   }) async {
     final json = {
-      if (value != _sentinel) "value": value as num,
+      if (value != _sentinel) 'value': value as num,
     };
 
     return reference.update(json);
@@ -10172,7 +10172,7 @@ class _$ExplicitSubPathQuery
     return _$ExplicitSubPathQuery(
       _collection,
       $referenceWithoutCursor: $referenceWithoutCursor.where(
-        _$ExplicitSubPathFieldMap["value"]!,
+        _$ExplicitSubPathFieldMap['value']!,
         isEqualTo: isEqualTo,
         isNotEqualTo: isNotEqualTo,
         isLessThan: isLessThan,
@@ -10271,7 +10271,7 @@ class _$ExplicitSubPathQuery
     ExplicitSubPathDocumentSnapshot? startAfterDocument,
   }) {
     final query = $referenceWithoutCursor
-        .orderBy(_$ExplicitSubPathFieldMap["value"]!, descending: descending);
+        .orderBy(_$ExplicitSubPathFieldMap['value']!, descending: descending);
     var queryCursor = $queryCursor;
 
     if (startAtDocument != null) {
@@ -10382,10 +10382,10 @@ class ExplicitSubPathQueryDocumentSnapshot
 // **************************************************************************
 
 void _$assertMinValidation(MinValidation instance) {
-  const Min(0).validate(instance.intNbr, "intNbr");
-  const Max(42).validate(instance.intNbr, "intNbr");
-  const Min(10).validate(instance.doubleNbr, "doubleNbr");
-  const Min(-10).validate(instance.numNbr, "numNbr");
+  const Min(0).validate(instance.intNbr, 'intNbr');
+  const Max(42).validate(instance.intNbr, 'intNbr');
+  const Min(10).validate(instance.doubleNbr, 'doubleNbr');
+  const Min(-10).validate(instance.numNbr, 'numNbr');
 }
 
 // **************************************************************************
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 e456896c2206..c66d53311efc 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
@@ -385,7 +385,7 @@ class CollectionGenerator
             .where((f) => !f.isJsonIgnored())
             .map(
           (e) {
-            var key = '"${e.name}"';
+            var key = "'${e.name}'";
 
             if (hasFreezed) {
               key =
@@ -442,7 +442,7 @@ class CollectionGenerator
   Iterable<Object> generateForAll(void globalData) sync* {
     yield '''
 // 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
+// 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
     ''';
 
     yield '''
diff --git a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/templates/document_reference.dart b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/templates/document_reference.dart
index 8b2bc27f523c..c1849c916bce 100644
--- a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/templates/document_reference.dart
+++ b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/templates/document_reference.dart
@@ -99,10 +99,10 @@ class _\$${data.documentReferenceName}
     // TODO support nested objects
     final json = [
       for (final field in data.updatableFields)
-        '''
+        """
         if (${field.name} != _sentinel)
-          "${field.name}": ${field.name} as ${field.type},
-        '''
+          '${field.name}': ${field.name} as ${field.type},
+        """
     ];
 
     return '''
diff --git a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/validator_generator.dart b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/validator_generator.dart
index 35ad7bbbcd3b..17a4ff54ddb0 100644
--- a/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/validator_generator.dart
+++ b/packages/cloud_firestore_odm/cloud_firestore_odm_generator/lib/src/validator_generator.dart
@@ -14,7 +14,7 @@ class ValidatorGenerator extends Generator {
         final validators = field.metadata.where(isValidatorAnnotation);
 
         for (final validator in validators) {
-          yield '${validator.toSource().replaceFirst('@', 'const ')}.validate(instance.${field.name}, "${field.name}");';
+          yield "${validator.toSource().replaceFirst('@', 'const ')}.validate(instance.${field.name}, '${field.name}');";
         }
       }).toList();