fixed push named and tracker

Author: jacobaraujo7

flutter_modular/.gitignore

@@ -44,3 +44,7 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+
+# coverage
+coverage/

flutter_modular/CHANGELOG.md

@@ -1,4 +1,9 @@
-## [4.0.0+11] - 2021-09-16
+## [4.0.1] - 2021-09-22
+* Fixed pushNamed.
+* Fixed bug that allowed access to parameters and arguments in other modules.
+* Fixed transitions bug.
+
+## [4.0.0+12] - 2021-09-16
 
 * New documentation is here! [https://modular.flutterando.com.br](https://modular.flutterando.com.br).
 * Modular design now uses Layered Architecture (Clean Architecture) with 100% code coverage.

flutter_modular/lib/src/presenter/navigation/modular_router_delegate.dart

@@ -28,10 +28,7 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
   final ReportPop reportPop;
   List<NavigatorObserver> observers = [];
 
-  ModularRouterDelegate(
-      {required this.parser,
-      required this.navigatorKey,
-      required this.reportPop});
+  ModularRouterDelegate({required this.parser, required this.navigatorKey, required this.reportPop});
 
   @override
   ModularBook? currentConfiguration;
@@ -70,11 +67,8 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
   Future<void> setNewRoutePath(ModularBook book) async {
     final disposableRoutes = <ParallelRoute>[];
 
-    for (var route
-        in currentConfiguration?.routes ?? <ParallelRoute<dynamic>>[]) {
-      if (book.routes
-              .indexWhere((element) => element.uri.path == route.uri.path) ==
-          -1) {
+    for (var route in currentConfiguration?.routes ?? <ParallelRoute<dynamic>>[]) {
+      if (book.routes.indexWhere((element) => element.uri.path == route.uri.path) == -1) {
         disposableRoutes.add(route);
       }
     }
@@ -85,10 +79,6 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
     for (var disposableRoute in disposableRoutes) {
       reportPop.call(disposableRoute);
     }
-
-    final arguments =
-        parser.getArguments().getOrElse((l) => ModularArguments.empty());
-    parser.setArguments(arguments.copyWith(params: {}, data: null));
   }
 
   var _lastClick = DateTime.now();
@@ -116,37 +106,28 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
     final parallel = page.route;
     parallel.popCallback?.call(result);
     currentConfiguration?.routes.remove(parallel);
-    reportPop.call(parallel);
-    final arguments =
-        parser.getArguments().getOrElse((l) => ModularArguments.empty());
+    if (currentConfiguration?.routes.indexWhere((element) => element.uri.toString() == parallel.uri.toString()) == -1) {
+      reportPop.call(parallel);
+    }
+    final arguments = parser.getArguments().getOrElse((l) => ModularArguments.empty());
     parser.setArguments(arguments.copyWith(uri: currentConfiguration!.uri));
     notifyListeners();
 
     return true;
   }
 
   @override
-  Future<T?> pushNamed<T extends Object?>(String routeName,
-      {Object? arguments, bool forRoot = false}) async {
+  Future<T?> pushNamed<T extends Object?>(String routeName, {Object? arguments, bool forRoot = false}) async {
     final popComplete = Completer();
-    var book = await parser.selectBook(routeName,
-        arguments: arguments, popCallback: popComplete.complete);
+    var book = await parser.selectBook(routeName, arguments: arguments, popCallback: popComplete.complete);
     if (forRoot) {
-      book = currentConfiguration!.copyWith(routes: [
-        ...currentConfiguration!.routes,
-        book.routes.last.copyWith(schema: '')
-      ]);
+      book = currentConfiguration!.copyWith(routes: [...currentConfiguration!.routes, book.routes.last.copyWith(schema: '')]);
       await setNewRoutePath(book);
     } else {
       final list = [...currentConfiguration!.routes];
 
       for (var route in book.routes.reversed) {
-        if (list
-                .firstWhere(
-                    (element) => element.uri.toString() == route.uri.toString(),
-                    orElse: () => ParallelRoute.empty())
-                .name ==
-            '') {
+        if (list.firstWhere((element) => element.uri.toString() == route.uri.toString(), orElse: () => ParallelRoute.empty()).name == '') {
           list.add(route);
         }
       }
@@ -162,31 +143,20 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
   }
 
   @override
-  Future<T?> pushReplacementNamed<T extends Object?, TO extends Object?>(
-      String routeName,
-      {TO? result,
-      Object? arguments,
-      bool forRoot = false}) async {
+  Future<T?> pushReplacementNamed<T extends Object?, TO extends Object?>(String routeName, {TO? result, Object? arguments, bool forRoot = false}) async {
     final popComplete = Completer();
-    var book = await parser.selectBook(routeName,
-        arguments: arguments, popCallback: popComplete.complete);
+    var book = await parser.selectBook(routeName, arguments: arguments, popCallback: popComplete.complete);
     final currentRoutes = [...currentConfiguration!.routes];
     if (forRoot) {
       currentRoutes.removeWhere((element) => element.schema != '');
       currentRoutes.removeLast();
-      book = currentConfiguration!.copyWith(
-          routes: [...currentRoutes, book.routes.first.copyWith(schema: '')]);
+      book = currentConfiguration!.copyWith(routes: [...currentRoutes, book.routes.first.copyWith(schema: '')]);
       await setNewRoutePath(book);
     } else {
       final list = [...currentConfiguration!.routes]..removeLast();
 
       for (var route in book.routes.reversed) {
-        if (list
-                .firstWhere(
-                    (element) => element.uri.toString() == route.uri.toString(),
-                    orElse: () => ParallelRoute.empty())
-                .name ==
-            '') {
+        if (list.firstWhere((element) => element.uri.toString() == route.uri.toString(), orElse: () => ParallelRoute.empty()).name == '') {
           list.add(route);
         }
       }
@@ -197,11 +167,7 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
   }
 
   @override
-  Future<T?> popAndPushNamed<T extends Object?, TO extends Object?>(
-      String routeName,
-      {TO? result,
-      Object? arguments,
-      bool forRoot = false}) {
+  Future<T?> popAndPushNamed<T extends Object?, TO extends Object?>(String routeName, {TO? result, Object? arguments, bool forRoot = false}) {
     pop(result);
     return pushNamed(routeName, arguments: arguments);
   }
@@ -210,20 +176,15 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
   bool canPop() => navigatorKey.currentState?.canPop() ?? false;
 
   @override
-  Future<bool> maybePop<T extends Object?>([T? result]) =>
-      navigatorKey.currentState?.maybePop(result) ?? Future.value(false);
+  Future<bool> maybePop<T extends Object?>([T? result]) => navigatorKey.currentState?.maybePop(result) ?? Future.value(false);
 
   @override
-  void pop<T extends Object?>([T? result]) =>
-      navigatorKey.currentState?.pop(result);
+  void pop<T extends Object?>([T? result]) => navigatorKey.currentState?.pop(result);
 
   @override
   void popUntil(bool Function(Route) predicate) {
     var isFoundedPages = currentConfiguration?.routes.where((route) {
-      return predicate(CustomModalRoute(ModularPage(
-          route: route,
-          args: ModularArguments.empty(),
-          flags: ModularFlags())));
+      return predicate(CustomModalRoute(ModularPage(route: route, args: ModularArguments.empty(), flags: ModularFlags())));
     });
 
     isFoundedPages ??= [];
@@ -235,9 +196,7 @@ class ModularRouterDelegate extends RouterDelegate<ModularBook>
   }
 
   @override
-  Future<T?> pushNamedAndRemoveUntil<T extends Object?>(
-      String newRouteName, bool Function(Route) predicate,
-      {Object? arguments, bool forRoot = false}) {
+  Future<T?> pushNamedAndRemoveUntil<T extends Object?>(String newRouteName, bool Function(Route) predicate, {Object? arguments, bool forRoot = false}) {
     popUntil(predicate);
     return pushNamed<T>(newRouteName, arguments: arguments, forRoot: forRoot);
   }
@@ -264,8 +223,7 @@ class CustomModalRoute extends ModalRoute {
   String? get barrierLabel => throw UnimplementedError();
 
   @override
-  Widget buildPage(BuildContext context, Animation<double> animation,
-      Animation<double> secondaryAnimation) {
+  Widget buildPage(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation) {
     throw UnimplementedError();
   }
 

flutter_modular/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_modular
 description: Smart project structure with dependency injection and route management
-version: 4.0.0+11
+version: 4.0.1
 homepage: https://github.com/Flutterando/modular
 
 environment:
@@ -9,7 +9,7 @@ environment:
 dependencies:
   flutter_modular_annotations: ^0.0.2
   triple: ">=1.3.0+2 <2.0.0"
-  modular_core: ">=1.0.3 <=2.0.0"
+  modular_core: ">=1.0.4 <=2.0.0"
   meta: ">=1.3.0 <2.0.0"
   flutter:
     sdk: flutter

modular_core/CHANGELOG.md

@@ -1,5 +1,5 @@
-## 1.0.0+1 - 2021/09/21
-* Fix ordenation routes
+## 1.0.4 - 2021/09/22
+* Rebuild modularArguments after get route
 ## 1.0.0+1 - 2021/09/05
 * Stable version
 

modular_core/lib/src/route/tracker.dart

@@ -24,8 +24,7 @@ class TrackerImpl implements Tracker {
 
   String get currentPath => arguments.uri.toString();
 
-  FutureOr<ModularRoute?> findRoute(String path,
-      {dynamic data, String schema = ''}) async {
+  FutureOr<ModularRoute?> findRoute(String path, {dynamic data, String schema = ''}) async {
     var uri = _resolverPath(path);
     final modularKey = ModularKey(schema: schema, name: uri.path);
 
@@ -41,13 +40,11 @@ class TrackerImpl implements Tracker {
           break;
         }
       }
-      if (uriCandidate.pathSegments.length != uri.pathSegments.length &&
-          !uriCandidate.path.contains('**')) {
+      if (uriCandidate.pathSegments.length != uri.pathSegments.length && !uriCandidate.path.contains('**')) {
         continue;
       }
 
-      if (!(uriCandidate.path.contains(':') ||
-          uriCandidate.path.contains('**'))) {
+      if (!(uriCandidate.path.contains(':') || uriCandidate.path.contains('**'))) {
         continue;
       }
 
@@ -75,7 +72,7 @@ class TrackerImpl implements Tracker {
 
     if (route == null) return null;
 
-    _arguments = arguments.copyWith(data: data, uri: uri, params: params);
+    _arguments = ModularArguments(uri: uri, data: data, params: params);
 
     return route;
   }
@@ -139,6 +136,5 @@ class TrackerImpl implements Tracker {
 }
 
 class TrackerNotInitiated extends ModularError {
-  const TrackerNotInitiated(String message, [StackTrace? stackTrace])
-      : super(message, stackTrace);
+  const TrackerNotInitiated(String message, [StackTrace? stackTrace]) : super(message, stackTrace);
 }

modular_core/pubspec.yaml

@@ -1,6 +1,6 @@
 name: modular_core
 description: Smart project structure with dependency injection and route management
-version: 1.0.3
+version: 1.0.4
 homepage: https://github.com/Flutterando/modular
 
 environment:

modular_core/test/src/route/tracker_test.dart

@@ -35,6 +35,8 @@ void main() {
 
     route = await ModularTracker.findRoute('/product/test') as CustomRoute?;
     expect(route?.uri.path, '/product/test');
+    expect(ModularTracker.currentPath, '/product/test');
+    expect(ModularTracker.arguments.params['id'], isNull);
   });
 
   test('find route with queries', () async {
@@ -53,8 +55,7 @@ void main() {
   });
 
   test('find child route in other module', () async {
-    var route =
-        await ModularTracker.findRoute('/other/details') as CustomRoute?;
+    var route = await ModularTracker.findRoute('/other/details') as CustomRoute?;
     expect(route?.uri.path, '/other/details');
     expect(route?.parent, '/other/');
     expect(route?.data, 'otherWithDetails');
@@ -64,8 +65,7 @@ void main() {
   });
 
   test('find child route in deep module', () async {
-    var route =
-        await ModularTracker.findRoute('/other/internal/') as CustomRoute?;
+    var route = await ModularTracker.findRoute('/other/internal/') as CustomRoute?;
     expect(route, isNotNull);
     ModularTracker.reportPushRoute(route!);
     expect(ModularTracker.injector.isModuleAlive<DeepModule>(), true);
@@ -75,8 +75,7 @@ void main() {
     ModularTracker.reportPopRoute(route);
     expect(ModularTracker.injector.isModuleAlive<DeepModule>(), false);
 
-    route =
-        await ModularTracker.findRoute('/other/internal/deep') as CustomRoute?;
+    route = await ModularTracker.findRoute('/other/internal/deep') as CustomRoute?;
     expect(route, isNotNull);
     ModularTracker.reportPushRoute(route!);
     expect(ModularTracker.injector.isModuleAlive<DeepModule>(), true);
@@ -92,15 +91,13 @@ void main() {
 
   test('find route with schema', () async {
     expect(await ModularTracker.findRoute('/schema'), isNull);
-    final route = await ModularTracker.findRoute('/schema', schema: 'tag')
-        as CustomRoute?;
+    final route = await ModularTracker.findRoute('/schema', schema: 'tag') as CustomRoute?;
     expect(route?.uri.path, '/schema');
     expect(route?.data, 'withSchema');
   });
 
   test('find route with wildcard', () async {
-    final route =
-        await ModularTracker.findRoute('/wildcard/test/2') as CustomRoute?;
+    final route = await ModularTracker.findRoute('/wildcard/test/2') as CustomRoute?;
     expect(route?.uri.path, '/wildcard/test/2');
     expect(route?.data, 'wildcard');
   });