Jonatas

remove bindings heritance from children pages

@@ -48,13 +48,11 @@ class ParseRouteTree { @@ -48,13 +48,11 @@ class ParseRouteTree {
48 final pageMiddlewares = page.middlewares ?? <GetMiddleware>[]; 48 final pageMiddlewares = page.middlewares ?? <GetMiddleware>[];
49 pageMiddlewares.addAll(route.middlewares ?? <GetMiddleware>[]); 49 pageMiddlewares.addAll(route.middlewares ?? <GetMiddleware>[]);
50 result.add(_addChild(page, parentPath, pageMiddlewares)); 50 result.add(_addChild(page, parentPath, pageMiddlewares));
51 - page.bindings.addAll(route.bindings);  
52 51
53 final children = _flattenPage(page); 52 final children = _flattenPage(page);
54 for (var child in children) { 53 for (var child in children) {
55 pageMiddlewares.addAll(child.middlewares ?? <GetMiddleware>[]); 54 pageMiddlewares.addAll(child.middlewares ?? <GetMiddleware>[]);
56 result.add(_addChild(child, parentPath, pageMiddlewares)); 55 result.add(_addChild(child, parentPath, pageMiddlewares));
57 - page.bindings.addAll(route.bindings);  
58 } 56 }
59 } 57 }
60 return result; 58 return result;
@@ -84,17 +82,10 @@ class ParseRouteTree { @@ -84,17 +82,10 @@ class ParseRouteTree {
84 ); 82 );
85 83
86 GetPage _findRoute(String name) { 84 GetPage _findRoute(String name) {
87 - final route = _routes.firstWhere(  
88 - (route) {  
89 - return _match(  
90 - name,  
91 - route.path.regex,  
92 - );  
93 - }, 85 + return _routes.firstWhere(
  86 + (route) => route.path.regex.hasMatch(name),
94 orElse: () => null, 87 orElse: () => null,
95 ); 88 );
96 -  
97 - return route;  
98 } 89 }
99 90
100 Map<String, String> _parseParams(String path, PathDecoded routePath) { 91 Map<String, String> _parseParams(String path, PathDecoded routePath) {
@@ -107,8 +98,4 @@ class ParseRouteTree { @@ -107,8 +98,4 @@ class ParseRouteTree {
107 } 98 }
108 return params; 99 return params;
109 } 100 }
110 -  
111 - bool _match(String name, RegExp path) {  
112 - return path.hasMatch(name);  
113 - }  
114 } 101 }