Fix family.overrideWith cast error and include family arguments in th…

…e ref (#2852) fixes #2832 fixes #2851
rrousselGit · Aug 28, 2023 · 41f020d · 41f020d
1 parent 4461140
commit 41f020d
Show file tree

Hide file tree

Showing 45 changed files with 2,647 additions and 341 deletions.
diff --git a/examples/counter/lib/main.g.dart b/examples/counter/lib/main.g.dart
diff --git a/examples/pub/lib/detail.g.dart b/examples/pub/lib/detail.g.dart
diff --git a/examples/pub/lib/search.g.dart b/examples/pub/lib/search.g.dart
diff --git a/packages/riverpod/lib/src/async_notifier/auto_dispose.dart b/packages/riverpod/lib/src/async_notifier/auto_dispose.dart
@@ -87,15 +87,17 @@ class AutoDisposeAsyncNotifierProviderImpl<
 
   @override
   AutoDisposeAsyncNotifierProviderElement<NotifierT, T> createElement() {
-    return AutoDisposeAsyncNotifierProviderElement._(this);
+    return AutoDisposeAsyncNotifierProviderElement(this);
   }
 
   @override
+  @mustBeOverridden
   FutureOr<T> runNotifierBuild(AsyncNotifierBase<T> notifier) {
     return (notifier as AutoDisposeAsyncNotifier<T>).build();
   }
 
   /// {@macro riverpod.overridewith}
+  @mustBeOverridden
   Override overrideWith(NotifierT Function() create) {
     return ProviderOverride(
       origin: this,
@@ -119,5 +121,6 @@ class AutoDisposeAsyncNotifierProviderElement<
     with AutoDisposeProviderElementMixin<AsyncValue<T>>
     implements AutoDisposeAsyncNotifierProviderRef<T> {
   /// The [ProviderElementBase] for [AsyncNotifierProvider]
-  AutoDisposeAsyncNotifierProviderElement._(super._provider) : super._();
+  @internal
+  AutoDisposeAsyncNotifierProviderElement(super._provider) : super();
 }
diff --git a/packages/riverpod/lib/src/async_notifier/auto_dispose_family.dart b/packages/riverpod/lib/src/async_notifier/auto_dispose_family.dart
@@ -70,7 +70,7 @@ class AutoDisposeFamilyAsyncNotifierProviderImpl<
 
   @override
   AutoDisposeAsyncNotifierProviderElement<NotifierT, T> createElement() {
-    return AutoDisposeAsyncNotifierProviderElement._(this);
+    return AutoDisposeAsyncNotifierProviderElement(this);
   }
 
   @override

diff --git a/packages/riverpod/lib/src/async_notifier/base.dart b/packages/riverpod/lib/src/async_notifier/base.dart
@@ -131,15 +131,17 @@ class AsyncNotifierProviderImpl<NotifierT extends AsyncNotifierBase<T>, T>
 
   @override
   AsyncNotifierProviderElement<NotifierT, T> createElement() {
-    return AsyncNotifierProviderElement._(this);
+    return AsyncNotifierProviderElement(this);
   }
 
   @override
+  @mustBeOverridden
   FutureOr<T> runNotifierBuild(AsyncNotifierBase<T> notifier) {
     return (notifier as AsyncNotifier<T>).build();
   }
 
   /// {@macro riverpod.overridewith}
+  @mustBeOverridden
   Override overrideWith(NotifierT Function() create) {
     return ProviderOverride(
       origin: this,
@@ -472,7 +474,9 @@ abstract class AsyncNotifierProviderElementBase<
         NotifierT extends AsyncNotifierBase<T>,
         T> extends ProviderElementBase<AsyncValue<T>>
     with FutureHandlerProviderElementMixin<T> {
-  AsyncNotifierProviderElementBase._(super._provider);
+  /// The element of [AsyncNotifierProvider].
+  @internal
+  AsyncNotifierProviderElementBase(super._provider);
 
   final _notifierNotifier = ProxyElementValueNotifier<NotifierT>();
 
@@ -501,9 +505,11 @@ abstract class AsyncNotifierProviderElementBase<
 class AsyncNotifierProviderElement<NotifierT extends AsyncNotifierBase<T>, T>
     extends AsyncNotifierProviderElementBase<NotifierT, T>
     implements AsyncNotifierProviderRef<T> {
-  AsyncNotifierProviderElement._(
+  /// The element of [AsyncNotifierProvider].
+  @internal
+  AsyncNotifierProviderElement(
     AsyncNotifierProviderBase<NotifierT, T> super._provider,
-  ) : super._();
+  );
 
   @override
   void create({required bool didChangeDependency}) {

diff --git a/packages/riverpod/lib/src/async_notifier/family.dart b/packages/riverpod/lib/src/async_notifier/family.dart
@@ -81,7 +81,7 @@ class FamilyAsyncNotifierProviderImpl<NotifierT extends AsyncNotifierBase<T>, T,
 
   @override
   AsyncNotifierProviderElement<NotifierT, T> createElement() {
-    return AsyncNotifierProviderElement._(this);
+    return AsyncNotifierProviderElement(this);
   }
 
   @override