Skip to content

Some Browsers were breaking on route due regex grouping #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 13, 2020
Merged

Some Browsers were breaking on route due regex grouping #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e75b361
Adjusts the serchRoute and prepareToRegex to work with browsers that …
pablo-threadable Apr 13, 2020
d602016
Adjusts tests and add a test to check more than 1 parameter rturn
pablo-threadable Apr 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions lib/src/modular_base.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class Modular {
List<String> newUrl = [];
for (var part in url.split('/')) {
var url =
part.contains(":") ? "${part.replaceFirst(':', '(?<')}>.*)" : part;
part.contains(":") ? "(.*?)" : part;
newUrl.add(url);
}

Expand Down Expand Up @@ -184,16 +184,25 @@ class Modular {
caseSensitive: true,
);
var r = regExp.firstMatch(path);

if (r?.groupNames != null) {
if (r != null) {
Map<String, String> params = {};
int count = 1;
for (var key in r?.groupNames) {
routeNamed = routeNamed.replaceFirst(':$key', r?.group(count));
params[key] = r?.group(count);
count++;
int paramPos = 0;
var routeParts = routeNamed.split('/');
var pathParts = path.split('/');

print('Match! Processing ${path} as ${routeNamed}');

for (var routePart in routeParts) {
if (routePart.contains(":")) {
var paramName = routePart.replaceFirst(':', '');
params[paramName] = pathParts[paramPos];
routeNamed = routeNamed.replaceFirst(routePart, params[paramName]);
}
paramPos++;
}

print('Result processed ${path} as ${routeNamed}');

if (routeNamed != path) {
router.params = null;
return false;
Expand All @@ -210,6 +219,7 @@ class Modular {
return routeNamed == path;
}


static RouteGuard _verifyGuard(List<RouteGuard> guards, String path) {
RouteGuard guard;
var realGuards = guards ?? [];
Expand Down
11 changes: 8 additions & 3 deletions test/modular_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ void main() {
});

test('prepare to regex', () {
expect(Modular.prepareToRegex('/home/list/:id'), '/home/list/(?<id>.*)');
expect(Modular.prepareToRegex('/home/list/:id'), '/home/list/(.*?)');
expect(
Modular.prepareToRegex('/home/list/:id/'), '/home/list/(?<id>.*)/');
Modular.prepareToRegex('/home/list/:id/'), '/home/list/(.*?)/');
expect(Modular.prepareToRegex('/home/list/:id/item/:num'),
'/home/list/(?<id>.*)/item/(?<num>.*)');
'/home/list/(.*?)/item/(.*?)');
});

test('search object Router to url', () {
Expand All @@ -42,6 +42,11 @@ void main() {
Modular.searchRoute(router, "/home/list/:id", "/home/list/1"), true);
expect(router.params['id'], "1");

expect(
Modular.searchRoute(router, "/home/list/:id/item/:num", "/home/list/1/item/2"), true);
expect(router.params['id'], "1");
expect(router.params['num'], "2");

expect(
Modular.searchRoute(
Router('/home/list', child: (_, __) => SizedBox.shrink()),
Expand Down