Skip to content

Commit b39d87c

Browse files
authored
fix: Correctly type firestoreJsonConverters as List<JsonConverter> instead of List<Object> (#9236)
Also add missing `FirestoreDocumentReferenceConverter` to `firestoreJsonConverters` fixes #9232
1 parent 6737310 commit b39d87c

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

packages/cloud_firestore_odm/cloud_firestore_odm/example/lib/integration/query.dart

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ part 'query.g.dart';
77
@Collection<DateTimeQuery>('firestore-example-app/42/date-time')
88
final dateTimeQueryRef = DateTimeQueryCollectionReference();
99

10-
@JsonSerializable()
11-
@FirestoreDateTimeConverter()
10+
@JsonSerializable(converters: firestoreJsonConverters)
1211
class DateTimeQuery {
1312
DateTimeQuery(this.time);
1413
final DateTime time;
@@ -26,8 +25,7 @@ class FirestoreDateTimeConverter extends JsonConverter<DateTime, Timestamp> {
2625
@Collection<TimestampQuery>('firestore-example-app/42/timestamp-time')
2726
final timestampQueryRef = TimestampQueryCollectionReference();
2827

29-
@JsonSerializable()
30-
@FirestoreTimestampConverter()
28+
@JsonSerializable(converters: firestoreJsonConverters)
3129
class TimestampQuery {
3230
TimestampQuery(this.time);
3331
final Timestamp time;
@@ -36,8 +34,7 @@ class TimestampQuery {
3634
@Collection<GeoPointQuery>('firestore-example-app/42/geopoint-time')
3735
final geoPointQueryRef = GeoPointQueryCollectionReference();
3836

39-
@JsonSerializable()
40-
@FirestoreGeoPointConverter()
37+
@JsonSerializable(converters: firestoreJsonConverters)
4138
class GeoPointQuery {
4239
GeoPointQuery(this.point);
4340
final GeoPoint point;
@@ -46,8 +43,7 @@ class GeoPointQuery {
4643
@Collection<DocumentReferenceQuery>('firestore-example-app/42/doc-ref')
4744
final documentReferenceRef = DocumentReferenceQueryCollectionReference();
4845

49-
@JsonSerializable()
50-
@FirestoreDocumentReferenceConverter()
46+
@JsonSerializable(converters: firestoreJsonConverters)
5147
class DocumentReferenceQuery {
5248
DocumentReferenceQuery(this.ref);
5349

packages/cloud_firestore_odm/cloud_firestore_odm/lib/cloud_firestore_odm.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ export 'src/firestore_reference.dart'
2222
/// ```dart
2323
/// @JsonSerializable(converters: firestoreJsonConverters)
2424
/// ```
25-
const firestoreJsonConverters = [
25+
const List<JsonConverter<Object?, Object?>> firestoreJsonConverters = [
2626
FirestoreDateTimeConverter(),
2727
FirestoreTimestampConverter(),
2828
FirestoreGeoPointConverter(),
29+
FirestoreDocumentReferenceConverter(),
2930
];
3031

3132
/// A [JsonConverter] that adds support for [Timestamp] objects within ODM models.

0 commit comments

Comments
 (0)