enable get instance by tag

Flutterando · Aug 16, 2023 · 18b497e · 18b497e
1 parent 1e8d95e
commit 18b497e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 19 deletions.
diff --git a/flutter_modular/lib/src/domain/services/bind_service.dart b/flutter_modular/lib/src/domain/services/bind_service.dart
@@ -2,7 +2,7 @@ import 'package:modular_core/modular_core.dart';
 import 'package:result_dart/result_dart.dart';
 
 abstract class BindService {
-  Result<T, ModularError> getBind<T extends Object>();
-  Result<bool, ModularError> disposeBind<T extends Object>();
+  Result<T, ModularError> getBind<T extends Object>({String? tag});
+  Result<bool, ModularError> disposeBind<T extends Object>({String? tag});
   Result<Unit, ModularError> replaceInstance<T>(T instance, [Type? module]);
 }
diff --git a/flutter_modular/lib/src/domain/usecases/dispose_bind.dart b/flutter_modular/lib/src/domain/usecases/dispose_bind.dart
@@ -4,7 +4,7 @@ import 'package:result_dart/result_dart.dart';
 import '../services/bind_service.dart';
 
 abstract class DisposeBind {
-  Result<bool, ModularError> call<T extends Object>();
+  Result<bool, ModularError> call<T extends Object>({String? tag});
 }
 
 class DisposeBindImpl implements DisposeBind {
@@ -13,7 +13,7 @@ class DisposeBindImpl implements DisposeBind {
   DisposeBindImpl(this.bindService);
 
   @override
-  Result<bool, ModularError> call<T extends Object>() {
-    return bindService.disposeBind<T>();
+  Result<bool, ModularError> call<T extends Object>({String? tag}) {
+    return bindService.disposeBind<T>(tag: tag);
   }
 }
diff --git a/flutter_modular/lib/src/domain/usecases/get_bind.dart b/flutter_modular/lib/src/domain/usecases/get_bind.dart
@@ -4,7 +4,7 @@ import 'package:result_dart/result_dart.dart';
 import '../services/bind_service.dart';
 
 abstract class GetBind {
-  Result<T, ModularError> call<T extends Object>();
+  Result<T, ModularError> call<T extends Object>({String? tag});
 }
 
 class GetBindImpl implements GetBind {
@@ -13,7 +13,7 @@ class GetBindImpl implements GetBind {
   GetBindImpl(this.bindService);
 
   @override
-  Result<T, ModularError> call<T extends Object>() {
-    return bindService.getBind<T>();
+  Result<T, ModularError> call<T extends Object>({String? tag}) {
+    return bindService.getBind<T>(tag: tag);
   }
 }
diff --git a/flutter_modular/lib/src/infra/services/bind_service_impl.dart b/flutter_modular/lib/src/infra/services/bind_service_impl.dart
@@ -10,15 +10,19 @@ class BindServiceImpl extends BindService {
   BindServiceImpl(this.injector);
 
   @override
-  Result<bool, ModularError> disposeBind<T extends Object>() {
+  Result<bool, ModularError> disposeBind<T extends Object>({String? tag}) {
+    if (tag?.isNotEmpty ?? false) {
+      injector.disposeSingletonsByTag(tag!);
+      return const Success(true);
+    }
     final result = injector.disposeSingleton<T>();
     return Success(result != null);
   }
 
   @override
-  Result<T, ModularError> getBind<T extends Object>() {
+  Result<T, ModularError> getBind<T extends Object>({String? tag}) {
     try {
-      final result = injector.get<T>();
+      final result = injector.get<T>(tag: tag);
       return Success(result);
     } on AutoInjectorException catch (e, s) {
       return Failure(BindNotFoundException(e.toString(), s));

diff --git a/flutter_modular/lib/src/presenter/modular_base.dart b/flutter_modular/lib/src/presenter/modular_base.dart
@@ -45,12 +45,12 @@ abstract class IModularBase {
   IModularNavigator? navigatorDelegate;
 
   /// Request an instance by [Type]
-  B get<B extends Object>();
+  B get<B extends Object>({String? tag});
 
   /// Request an instance by [Type]
   /// <br>
   /// Return null if not found instance
-  B? tryGet<B extends Object>();
+  B? tryGet<B extends Object>({String? tag});
 
   /// Dispose a bind by [Type]
   bool dispose<B extends Object>();
@@ -132,17 +132,17 @@ class ModularBase implements IModularBase {
   });
 
   @override
-  bool dispose<B extends Object>() =>
-      disposeBind<B>().getOrElse((left) => false);
+  bool dispose<B extends Object>({String? tag}) =>
+      disposeBind<B>(tag: tag).getOrElse((left) => false);
 
   @override
-  B get<B extends Object>() {
-    return getBind<B>().getOrThrow();
+  B get<B extends Object>({String? tag}) {
+    return getBind<B>(tag: tag).getOrThrow();
   }
 
   @override
-  B? tryGet<B extends Object>() {
-    return getBind<B>().getOrNull();
+  B? tryGet<B extends Object>({String? tag}) {
+    return getBind<B>(tag: tag).getOrNull();
   }
 
   @override