Merge pull request flutter#342 from nikitadol/master

fix types, use Pattern

Author: slovnicki

package/lib/src/beam_guard.dart

@@ -38,7 +38,7 @@ class BeamGuard {
   /// For example, `RegExp('/books/')` will match '/books/1', '/books/2/genres', etc.
   /// but will not match '/books'. To match '/books' and everything after it,
   /// use `RegExp('/books')`
-  final List<dynamic> pathBlueprints;
+  final List<Pattern> pathBlueprints;
 
   /// What check should be performed on a given [location],
   /// the one to which beaming has been requested.
@@ -83,7 +83,7 @@ class BeamGuard {
   /// Else, the path (i.e. the pre-query substring) of the location's uri
   /// must be equal to the pathBlueprint.
   bool _hasMatch(BeamLocation location) {
-    for (var pathBlueprint in pathBlueprints) {
+    for (final pathBlueprint in pathBlueprints) {
       if (pathBlueprint is String) {
         final asteriskIndex = pathBlueprint.indexOf('*');
         if (asteriskIndex != -1) {

package/lib/src/beam_location.dart

@@ -23,6 +23,7 @@ abstract class BeamLocation<T extends BeamState> extends ChangeNotifier {
   /// Upon beaming, it will be populated by all necessary attributes.
   /// See [BeamState].
   T get state => _state;
+
   set state(T state) => _state = state..configure();
 
   /// How to create state from generic [BeamState], that is produced
@@ -82,7 +83,7 @@ abstract class BeamLocation<T extends BeamState> extends ChangeNotifier {
   /// whether there is a browser.
   ///
   /// For example: '/books/:id' or using regex `RegExp('/test/(?<test>[a-z]+){0,1}')`
-  List<dynamic> get pathBlueprints;
+  List<Pattern> get pathBlueprints;
 
   /// Creates and returns the list of pages to be built by the [Navigator]
   /// when this [BeamLocation] is beamed to or internally inferred.
@@ -145,7 +146,7 @@ class SimpleBeamLocation extends BeamLocation {
   }) : super(state);
 
   /// Map of all routes this location handles.
-  Map<dynamic, dynamic Function(BuildContext, BeamState)> routes;
+  Map<Pattern, dynamic Function(BuildContext, BeamState)> routes;
 
   /// A wrapper used as [BeamLocation.builder].
   Widget Function(BuildContext context, Widget navigator)? navBuilder;
@@ -165,12 +166,12 @@ class SimpleBeamLocation extends BeamLocation {
   }
 
   @override
-  List<dynamic> get pathBlueprints => routes.keys.toList();
+  List<Pattern> get pathBlueprints => routes.keys.toList();
 
   @override
   List<BeamPage> buildPages(BuildContext context, BeamState state) {
-    var filteredRoutes = chooseRoutes(state, routes.keys);
-    final activeRoutes = Map.from(routes)
+    final filteredRoutes = chooseRoutes(state, routes.keys);
+    final activeRoutes = Map.of(routes)
       ..removeWhere((key, value) => !filteredRoutes.containsKey(key));
     final sortedRoutes = activeRoutes.keys.toList()
       ..sort((a, b) => _compareKeys(a, b));
@@ -191,13 +192,13 @@ class SimpleBeamLocation extends BeamLocation {
   ///
   /// If none of the routes _matches_ [state.uri], nothing will be selected
   /// and [BeamerDelegate] will declare that the location is [NotFound].
-  static Map<dynamic, String> chooseRoutes(
-      BeamState state, Iterable<dynamic> routes) {
-    var matched = <dynamic, String>{};
+  static Map<Pattern, String> chooseRoutes(
+      BeamState state, Iterable<Pattern> routes) {
+    final matched = <Pattern, String>{};
     bool overrideNotFound = false;
-    for (var route in routes) {
+    for (final route in routes) {
       if (route is String) {
-        final uriPathSegments = List.from(state.uri.pathSegments);
+        final uriPathSegments = state.uri.pathSegments.toList();
         final routePathSegments = Uri.parse(route).pathSegments;
 
         if (uriPathSegments.length < routePathSegments.length) {

package/lib/src/beam_state.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
@@ -13,7 +15,10 @@ class BeamState {
     this.pathParameters = const <String, String>{},
     this.queryParameters = const <String, String>{},
     this.data = const <String, dynamic>{},
-  }) {
+  }) : assert(() {
+          json.encode(data);
+          return true;
+        }()) {
     configure();
   }
 
@@ -126,7 +131,7 @@ class BeamState {
       path: '/' + pathBlueprintSegments.join('/'),
       queryParameters: queryParameters.isEmpty ? null : queryParameters,
     );
-    final pathSegments = List<String>.from(pathBlueprintSegments);
+    final pathSegments = pathBlueprintSegments.toList();
     for (int i = 0; i < pathSegments.length; i++) {
       if (pathSegments[i].isNotEmpty && pathSegments[i][0] == ':') {
         final key = pathSegments[i].substring(1);

package/lib/src/beamer_delegate.dart

@@ -684,7 +684,7 @@ class BeamerDelegate<T extends BeamState> extends RouterDelegate<BeamState>
     BuildContext context,
     BeamLocation location,
   ) {
-    for (var guard in guards + location.guards) {
+    for (final guard in guards + location.guards) {
       if (guard.shouldGuard(location) && !guard.check(context, location)) {
         guard.onCheckFailed?.call(context, location);
         return guard;

package/lib/src/beamer_location_builder.dart

@@ -28,13 +28,13 @@ class SimpleLocationBuilder {
   SimpleLocationBuilder({required this.routes, this.builder});
 
   /// List of all routes this builder handles.
-  final Map<dynamic, dynamic Function(BuildContext, BeamState)> routes;
+  final Map<Pattern, dynamic Function(BuildContext, BeamState)> routes;
 
   /// Used as a [BeamLocation.builder].
   Widget Function(BuildContext context, Widget navigator)? builder;
 
   BeamLocation call(BeamState state) {
-    var matched = SimpleBeamLocation.chooseRoutes(state, routes.keys);
+    final matched = SimpleBeamLocation.chooseRoutes(state, routes.keys);
     if (matched.isNotEmpty) {
       return SimpleBeamLocation(
         state: state,

package/lib/src/utils.dart

@@ -15,7 +15,7 @@ abstract class Utils {
     List<BeamLocation> beamLocations, {
     Map<String, dynamic> data = const <String, dynamic>{},
   }) {
-    for (var beamLocation in beamLocations) {
+    for (final beamLocation in beamLocations) {
       if (canBeamLocationHandleUri(beamLocation, uri)) {
         return beamLocation
           ..state = beamLocation.createState(
@@ -34,12 +34,12 @@ abstract class Utils {
   ///
   /// Used in [BeamLocation.canHandle] and [chooseBeamLocation].
   static bool canBeamLocationHandleUri(BeamLocation beamLocation, Uri uri) {
-    for (var pathBlueprint in beamLocation.pathBlueprints) {
+    for (final pathBlueprint in beamLocation.pathBlueprints) {
       if (pathBlueprint is String) {
         if (pathBlueprint == uri.path || pathBlueprint == '/*') {
           return true;
         }
-        final uriPathSegments = List.from(uri.pathSegments);
+        final uriPathSegments = uri.pathSegments.toList();
         if (uriPathSegments.length > 1 && uriPathSegments.last == '') {
           uriPathSegments.removeLast();
         }
@@ -82,7 +82,7 @@ abstract class Utils {
   }) {
     if (beamLocation != null) {
       // TODO: abstract this and reuse in canBeamLocationHandleUri
-      for (var pathBlueprint in beamLocation.pathBlueprints) {
+      for (final pathBlueprint in beamLocation.pathBlueprints) {
         if (pathBlueprint is String) {
           if (pathBlueprint == uri.path || pathBlueprint == '/*') {
             BeamState(
@@ -91,14 +91,14 @@ abstract class Utils {
               data: data,
             );
           }
-          final uriPathSegments = List.from(uri.pathSegments);
+          final uriPathSegments = uri.pathSegments.toList();
           if (uriPathSegments.length > 1 && uriPathSegments.last == '') {
             uriPathSegments.removeLast();
           }
           final beamLocationPathBlueprintSegments =
               Uri.parse(pathBlueprint).pathSegments;
           var pathSegments = <String>[];
-          var pathParameters = <String, String>{};
+          final pathParameters = <String, String>{};
           if (uriPathSegments.length >
                   beamLocationPathBlueprintSegments.length &&
               !beamLocationPathBlueprintSegments.contains('*')) {
@@ -107,7 +107,7 @@ abstract class Utils {
           var checksPassed = true;
           for (int i = 0; i < uriPathSegments.length; i++) {
             if (beamLocationPathBlueprintSegments[i] == '*') {
-              pathSegments = List<String>.from(uriPathSegments);
+              pathSegments = uriPathSegments.toList();
               checksPassed = true;
               break;
             }
@@ -133,12 +133,12 @@ abstract class Utils {
           }
         } else {
           final regexp = tryCastToRegExp(pathBlueprint);
-          var pathParameters = <String, String>{};
+          final pathParameters = <String, String>{};
           final url = uri.toString();
 
           if (regexp.hasMatch(url)) {
             regexp.allMatches(url).forEach((match) {
-              for (String groupName in match.groupNames) {
+              for (final groupName in match.groupNames) {
                 pathParameters[groupName] = match.namedGroup(groupName) ?? '';
               }
             });
@@ -159,10 +159,10 @@ abstract class Utils {
     );
   }
 
-  static bool urisMatch(dynamic blueprint, Uri exact) {
+  static bool urisMatch(Pattern blueprint, Uri exact) {
     if (blueprint is String) {
-      blueprint = Uri.parse(blueprint);
-      final blueprintSegments = blueprint.pathSegments;
+      final uriBlueprint = Uri.parse(blueprint);
+      final blueprintSegments = uriBlueprint.pathSegments;
       final exactSegment = exact.pathSegments;
       if (blueprintSegments.length != exactSegment.length) {
         return false;
@@ -177,14 +177,14 @@ abstract class Utils {
       }
       return true;
     } else {
-      blueprint = tryCastToRegExp(blueprint);
-      return blueprint.hasMatch(exact.toString());
+      final regExpBlueprint = tryCastToRegExp(blueprint);
+      return regExpBlueprint.hasMatch(exact.toString());
     }
   }
 
   /// Wraps the casting of pathBlueprint to RegExp inside a try-catch
   /// and throws a nice FlutterError.
-  static RegExp tryCastToRegExp(dynamic pathBlueprint) {
+  static RegExp tryCastToRegExp(Pattern pathBlueprint) {
     try {
       return pathBlueprint as RegExp;
     } on TypeError catch (_) {

package/test/test_locations.dart

@@ -133,7 +133,7 @@ class RegExpLocation extends BeamLocation {
   RegExpLocation([BeamState? state]) : super(state);
 
   @override
-  List get pathBlueprints => [RegExp('/reg')];
+  List<Pattern> get pathBlueprints => [RegExp('/reg')];
 
   @override
   List<BeamPage> buildPages(BuildContext context, BeamState state) => [
@@ -148,7 +148,7 @@ class AsteriskLocation extends BeamLocation {
   AsteriskLocation([BeamState? state]) : super(state);
 
   @override
-  List get pathBlueprints => ['/anything/*'];
+  List<Pattern> get pathBlueprints => ['/anything/*'];
 
   @override
   List<BeamPage> buildPages(BuildContext context, BeamState state) => [