fix/25 (#26)

* fix/25

* refactor: logic

* chore: add test

* chore: update code

* chore: revert dispose

---------

Co-authored-by: Manuel Plavsic <55398763+manuel-plavsic@users.noreply.github.com>

Author: nank1ro

packages/disco/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.3
+
+- **FIX**: Disposal of provider with arguments.
+
 ## 1.0.2
 
 - **FIX**: A bug prevented users to inject providers with arguments from a `ProviderScope` which was placed inside a `ProviderScopePortal`.

packages/disco/lib/src/widgets/provider_scope.dart

@@ -206,16 +206,15 @@ class ProviderScopeState extends State<ProviderScope> {
 
       for (final instantiableArgProvider in instantiableArgProviders) {
         final id = instantiableArgProvider._argProvider;
-        allArgProvidersInScope[id] = instantiableArgProvider._argProvider
-            ._generateIntermediateProvider(instantiableArgProvider._arg);
-
+        final provider =
+            instantiableArgProvider._argProvider._generateIntermediateProvider(
+          instantiableArgProvider._arg,
+        );
+        allArgProvidersInScope[id] = provider;
         // create non lazy providers.
         if (!instantiableArgProvider._argProvider._lazy) {
-          // the intermediate ID is a reference to the associated generated
-          // intermediate provider
-          final intermediateId = allArgProvidersInScope[id]!;
           // create and store the provider
-          createdProviderValues[intermediateId] =
+          createdProviderValues[provider] =
               allArgProvidersInScope[id]!._createValue(context);
         }
       }
@@ -296,7 +295,7 @@ class ProviderScopeState extends State<ProviderScope> {
   void dispose() {
     // dispose all the created providers
     createdProviderValues.forEach((key, value) {
-      allProvidersInScope[key]?._safeDisposeValue(value);
+      key._safeDisposeValue(value);
     });
 
     allArgProvidersInScope.clear();

packages/disco/pubspec.yaml

@@ -1,6 +1,6 @@
 name: disco
 description: A Flutter library bringing a new concept of scoped providers for dependency injection, which are independent of any specific state management solution.
-version: 1.0.2
+version: 1.0.3
 repository: https://github.com/our-creativity/disco
 homepage: https://disco.mariuti.com
 documentation: https://disco.mariuti.com

packages/disco/test/disco_test.dart

@@ -273,6 +273,8 @@ void main() {
   testWidgets('Test provider injection', (tester) async {
     final NameContainer nameContainer = MockNameContainer('Ale');
 
+    var fullNameContainerProviderDisposed = false;
+
     final numberContainer1Provider = Provider(
       (_) => const NumberContainer(1),
       lazy: false,
@@ -285,6 +287,12 @@ void main() {
       (_) => nameContainer,
       dispose: (provider) => provider.dispose(),
     );
+    final fullNameContainerProvider = Provider.withArgument(
+      (_, String surname) => MockNameContainer('John $surname'),
+      dispose: (provider) {
+        fullNameContainerProviderDisposed = true;
+      },
+    );
 
     await tester.pumpWidget(
       MaterialApp(
@@ -294,32 +302,39 @@ void main() {
               nameContainerProvider,
               numberContainer1Provider,
               numberContainer2Provider,
+              fullNameContainerProvider('Smith'),
             ],
             child: Builder(
               builder: (context) {
                 final nameContainer = nameContainerProvider.of(context);
                 final numberContainer1 = numberContainer1Provider.of(context);
                 final numberContainer2 = numberContainer2Provider.of(context);
+                final fullNameContainer = fullNameContainerProvider.of(context);
                 return Text(
-                  '''${nameContainer.name} ${numberContainer1.number} ${numberContainer2.number}''',
+                  '''${nameContainer.name} ${numberContainer1.number} ${numberContainer2.number} ${fullNameContainer.name}''',
                 );
               },
             ),
           ),
         ),
       ),
     );
-    Finder providerFinder(String value1, int value2, int value3) =>
-        find.text('$value1 $value2 $value3');
+    Finder providerFinder(
+            String value1, int value2, int value3, String value4) =>
+        find.text('$value1 $value2 $value3 $value4');
 
-    expect(providerFinder('Ale', 1, 100), findsOneWidget);
+    expect(providerFinder('Ale', 1, 100, 'John Smith'), findsOneWidget);
 
     // mock NameProvider dispose method
     when(nameContainer.dispose()).thenReturn(null);
+    // Check that the dispose method in the provider with argument is not called
+    expect(fullNameContainerProviderDisposed, false);
     // Push a different widget
     await tester.pumpWidget(Container());
     // check dispose has been called on NameProvider
     verify(nameContainer.dispose()).called(1);
+    // check that the dispose method in the provider with argument is called
+    expect(fullNameContainerProviderDisposed, true);
   });
 
   testWidgets('Test ProviderScopePortal works', (tester) async {