feat(RouteSet): Refactored route set to expose query params

lib/route-set.ts

@@ -11,6 +11,7 @@ import 'rxjs/add/operator/observeOn';
 import { Observable } from 'rxjs/Observable';
 import { queue } from 'rxjs/scheduler/queue';
 import { provide, Provider, Injector, OpaqueToken } from 'angular2/core';
+import { parse as parseQueryString } from 'query-string';
 
 import { compose } from './util';
 import { Location, LocationChange } from './location';
@@ -27,6 +28,7 @@ export const useRouteSetMiddleware = provideMiddlewareForToken(ROUTE_SET_MIDDLEW
 export interface NextRoute {
   routes: Routes;
   params: any;
+  query: any;
   url: string;
 }
 
@@ -35,7 +37,6 @@ export class RouteSet extends Observable<NextRoute>{ }
 
 
 function createRouteSet(
-  routes: Routes,
   location$: Location,
   traverser: RouteTraverser,
   locationMiddleware: Middleware[],
@@ -45,12 +46,15 @@ function createRouteSet(
     .observeOn(queue)
     .distinctUntilChanged((prev, next) => prev.url === next.url)
     .let<LocationChange>(compose(...locationMiddleware))
-    .switchMap(change => {
-      return traverser.matchRoutes(routes, change.url)
+    .switchMap(() => {
+      const [ pathname, queryString ] = location$.path().split('?');
+
+      return traverser.find(pathname)
         .map<NextRoute>(set => {
           return {
-            url: change.url,
+            url: location$.path(),
             routes: set.routes,
+            query: parseQueryString(queryString),
             params: set.params
           };
         });
@@ -64,7 +68,7 @@ function createRouteSet(
 
 export const ROUTE_SET_PROVIDERS = [
   provide(RouteSet, {
-    deps: [ ROUTES, Location, RouteTraverser, LOCATION_MIDDLEWARE, ROUTE_SET_MIDDLEWARE ],
+    deps: [ Location, RouteTraverser, LOCATION_MIDDLEWARE, ROUTE_SET_MIDDLEWARE ],
     useFactory: createRouteSet
   }),
   useLocationMiddleware(identity),

lib/route-view.ts

@@ -40,7 +40,8 @@ export class RouteView implements OnDestroy, OnInit{
       return {
         url: set.url,
         routes: [ ...set.routes ].slice(1),
-        params: set.params
+        params: set.params,
+        query: set.query
       }
     })
   });

spec/redirect.spec.ts

@@ -15,7 +15,8 @@ describe('Redirect Middleware', function() {
     routeSet$.next({
       routes: [ { redirectTo: to } ],
       params,
-      url: from
+      url: from,
+      query: {}
     });
   }
 
@@ -38,7 +39,8 @@ describe('Redirect Middleware', function() {
     const nextRoute: NextRoute = {
       routes: [ { path: '/first' } ],
       params: {},
-      url: '/first'
+      url: '/first',
+      query: {}
     };
 
     redirect(routeSet$).subscribe(value => {
@@ -55,7 +57,8 @@ describe('Redirect Middleware', function() {
     routeSet$.next({
       routes: [ { redirectTo: '/test' }],
       params: {},
-      url: '/go'
+      url: '/go',
+      query: {}
     });
 
     expect(observer.next).not.toHaveBeenCalled();
@@ -68,7 +71,8 @@ describe('Redirect Middleware', function() {
     routeSet$.next({
       routes: [ { redirectTo: '/posts/:id' } ],
       params: { id: '543' },
-      url: '/blog/543'
+      url: '/blog/543',
+      query: {}
     });
 
     expect(observer.next).not.toHaveBeenCalled();
@@ -81,7 +85,8 @@ describe('Redirect Middleware', function() {
     routeSet$.next({
       routes: [ { path: '/first' }, { path: 'second', redirectTo: '/home' } ],
       params: {},
-      url: '/first/second'
+      url: '/first/second',
+      query: {}
     });
 
     expect(observer.next).not.toHaveBeenCalled();
@@ -94,7 +99,8 @@ describe('Redirect Middleware', function() {
     routeSet$.next({
       routes: [ { path: '/blog' }, { path: ':id', redirectTo: '/posts/:id' } ],
       params: { id: '543' },
-      url: '/blog/543'
+      url: '/blog/543',
+      query: {}
     });
 
     expect(observer.next).not.toHaveBeenCalled();

spec/route-params.spec.ts

@@ -31,7 +31,7 @@ describe('RouteParams Service', function() {
       done();
     });
 
-    routeSet$.next({ routes: [], params, url: '' });
+    routeSet$.next({ routes: [], params, url: '', query: {} });
   });
 
   it('should let you select a single param to observe', function(done) {
@@ -43,12 +43,12 @@ describe('RouteParams Service', function() {
       done();
     });
 
-    routeSet$.next({ params, routes: [], url: '' });
+    routeSet$.next({ params, routes: [], url: '', query: {} });
   });
 
   it('should replay the previous param value when you subscribe', function(done) {
     const params = { id: 456 };
-    routeSet$.next({ params, routes: [], url: '' });
+    routeSet$.next({ params, routes: [], url: '', query: {} });
 
     params$.subscribe(value => {
       expect(value).toBe(params);