Does Firestore migration to 2.0.0 cover this use case?

[Zelfapp]

I'm struggling trying to decipher withConvert and the migration guide and what I need to update in the following code block, which breaks when I upgrade to 2.0.0.

What should I be changing Map<String, dynamic>? data to?

Stream<List<T>> collectionStream<T>({
  required String path,
  required T Function(Map<String, dynamic>? data, String documentID) builder,
  Query? Function(Query query)? queryBuilder,
  int Function(T lhs, T rhs)? sort,
}) {
  Query query = FirebaseFirestore.instance.collection(path);
  if (queryBuilder != null) {
    query = queryBuilder(query)!;
  }
  final Stream<QuerySnapshot> snapshots = query.snapshots();
  return snapshots.map((snapshot) {
    final result = snapshot.docs
        .map((snapshot) => builder(snapshot.data(), snapshot.id))
        .where((value) => value != null)
        .toList();
    if (sort != null) {
      result.sort(sort);
    }
    return result;
  });
}

This is the error I receive when I try to run my app. The issue is not caught before run in AS.

Error: The argument type 'Object?' can't be assigned to the parameter type 'Map<String, dynamic>?'.

• 'Object' is from 'dart:core'.
• 'Map' is from 'dart:core'.
  .map((snapshot) => builder(snapshot.data(), snapshot.id))

[rrousselGit]

You need to do:

- final Stream<QuerySnapshot> snapshots = query.snapshots();
+ final Stream<QuerySnapshot<Map<String, dynamic>>> snapshots = query.snapshots();

[Zelfapp]

Now, I'm getting this error. I tried changing to Stream<QuerySnapshot<Object?>>, but that wrecks all of my functions looking for a Map.

[rrousselGit]

Oh, you need to change the queryBuilder too:

-   Query? Function(Query query)? queryBuilder,
+  Query<Map<String, dynamic>>? Function(Query<Map<String, dynamic>> query)? queryBuilder,

[Zelfapp]

Thanks Remi! I finally figured it out with your help. For the benefit of others here's my migrated code.

Stream<List<T>> collectionStream<T>({
  required String path,
  required T Function(Map<String, dynamic>? data, String documentID) builder,
  Query<Map<String, dynamic>>? Function(Query<Map<String, dynamic>> query)?
      queryBuilder,
  int Function(T lhs, T rhs)? sort,
}) {
  Query<Map<String, dynamic>> query =
      FirebaseFirestore.instance.collection(path);
  if (queryBuilder != null) {
    query = queryBuilder(query)!;
  }
  final Stream<QuerySnapshot<Map<String, dynamic>>> snapshots =
      query.snapshots();
  return snapshots.map((snapshot) {
    final result = snapshot.docs
        .map((snapshot) => builder(snapshot.data(), snapshot.id))
        .where((value) => value != null)
        .toList();
    if (sort != null) {
      result.sort(sort);
    }
    return result;
  });
}