diff --git a/packages/route/lib/src/router.dart b/packages/route/lib/src/router.dart index 0456283c..208253b6 100644 --- a/packages/route/lib/src/router.dart +++ b/packages/route/lib/src/router.dart @@ -86,8 +86,8 @@ class Router { /// by the resulting router. /// /// The resulting router can be chained, too. - _ChainedRouter chain(Iterable middleware) { - var piped = _ChainedRouter(this, middleware); + ChainedRouter chain(Iterable middleware) { + var piped = ChainedRouter(this, middleware); var route = SymlinkRoute('/', piped); _routes.add(route); return piped; @@ -412,13 +412,13 @@ class Router { } } -class _ChainedRouter extends Router { +class ChainedRouter extends Router { final List _handlers = []; Router _root; - _ChainedRouter.empty() : _root = Router(); + ChainedRouter.empty() : _root = Router(); - _ChainedRouter(this._root, Iterable middleware) { + ChainedRouter(this._root, Iterable middleware) { _handlers.addAll(middleware); } @@ -434,7 +434,7 @@ class _ChainedRouter extends Router { @override SymlinkRoute group(String path, void Function(Router router) callback, {Iterable middleware = const [], String? name}) { - final router = _ChainedRouter(_root, [..._handlers, ...middleware]); + final router = ChainedRouter(_root, [..._handlers, ...middleware]); callback(router); return mount(path, router)..name = name; } @@ -443,7 +443,7 @@ class _ChainedRouter extends Router { Future> groupAsync( String path, FutureOr Function(Router router) callback, {Iterable middleware = const [], String? name}) async { - final router = _ChainedRouter(_root, [..._handlers, ...middleware]); + final router = ChainedRouter(_root, [..._handlers, ...middleware]); await callback(router); return mount(path, router)..name = name; } @@ -457,8 +457,8 @@ class _ChainedRouter extends Router { } @override - _ChainedRouter chain(Iterable middleware) { - final piped = _ChainedRouter.empty().._root = _root; + ChainedRouter chain(Iterable middleware) { + final piped = ChainedRouter.empty().._root = _root; piped._handlers.addAll([..._handlers, ...middleware]); var route = SymlinkRoute('/', piped); _routes.add(route); diff --git a/packages/route/test/uri_decode_test.dart b/packages/route/test/uri_decode_test.dart index e973230a..f48122ce 100644 --- a/packages/route/test/uri_decode_test.dart +++ b/packages/route/test/uri_decode_test.dart @@ -6,7 +6,7 @@ void main() { var router = Router()..get('/a/:a/b/:b', ''); var encoded = - '/a/' + Uri.encodeComponent('<<<') + '/b/' + Uri.encodeComponent('???'); + '/a/${Uri.encodeComponent('<<<')}/b/${Uri.encodeComponent('???')}'; print(encoded); var result = router.resolveAbsolute(encoded).first; print(result.allParams);