feat(router-store) Add base router selectors

- remove unnecessary type from model
- add additional unit tests
- correct documentation wording

modules/router-store/spec/router_selectors.spec.ts

@@ -105,7 +105,7 @@ describe('Router State Selectors', () => {
       router: RouterReducerState<any>;
     }
 
-    let selectors: RouterStateSelectors<any, State>;
+    let selectors: RouterStateSelectors<State>;
     let state: State;
 
     beforeEach(() => {
@@ -115,6 +115,25 @@ describe('Router State Selectors', () => {
 
       selectors = getSelectors((state: State) => state.router);
     });
+    it('should create selectCurrentRoute selector for selecting the current route', () => {
+      const result = selectors.selectCurrentRoute(state);
+
+      expect(result).toEqual(state.router.state.root.firstChild.firstChild);
+    });
+    it('should return undefined from selectCurrentRoute if routerState does not exist', () => {
+      interface State {
+        router: any;
+      }
+      let state: State;
+      state = {
+        router: undefined,
+      };
+      selectors = getSelectors((state: State) => state.router);
+
+      const result = selectors.selectCurrentRoute(state);
+
+      expect(result).toEqual(undefined);
+    });
     it('should create a selector for selecting the query params', () => {
       const result = selectors.selectQueryParams(state);
 

modules/router-store/src/models.ts

@@ -1,6 +1,6 @@
 import { Data, Params } from '@angular/router';
 
-export interface RouterStateSelectors<T, V> {
+export interface RouterStateSelectors<V> {
   selectCurrentRoute: (state: V) => any;
   selectQueryParams: (state: V) => Params;
   selectRouteParams: (state: V) => Params;

modules/router-store/src/router_selectors.ts

@@ -2,23 +2,22 @@ import { RouterReducerState } from '@ngrx/router-store';
 import { createSelector } from '@ngrx/store';
 import { RouterStateSelectors } from './models';
 
-export function getSelectors(): RouterStateSelectors<
-  any,
-  RouterReducerState<any>
->;
+// export function getSelectors(): RouterStateSelectors<
+//   RouterReducerState<any>
+// >;
 export function getSelectors<V>(
   selectState: (state: V) => RouterReducerState<any>
-): RouterStateSelectors<any, V>;
-export function getSelectors<T>(
-  selectState = (state: any) => state.state
-): RouterStateSelectors<T, any> {
+): RouterStateSelectors<V>;
+export function getSelectors<V>(
+  selectState: (state: V) => RouterReducerState<any>
+): RouterStateSelectors<V> {
   const selectRouterState = createSelector(
     selectState,
     router => router && router.state
   );
   const selectCurrentRoute = createSelector(selectRouterState, routerState => {
     if (!routerState) {
-      return false;
+      return undefined;
     }
     let route = routerState.root;
     while (route.firstChild) {

projects/ngrx.io/content/guide/router-store/selectors.md

@@ -5,7 +5,7 @@ The `getSelectors` method supplied within `@ngrx/router-store` provides function
 The `getSelectors` method takes a selector function as its only argument to select the piece of state where the router state is being stored.
 The example below shows how to provide a selector for the top level `router` key in your state object.
 
-**Note:** The `getSelectors` method works with the `routerReducer` provided by `@ngrx/router-store`. If you use a [custom serializer](guide/router-store/configuration#custom-router-state-serializer), you'll need to provide your own selectors if they do not adhere to `RouterReducerState`.
+**Note:** The `getSelectors` method works with the `routerReducer` provided by `@ngrx/router-store`. If you use a [custom serializer](guide/router-store/configuration#custom-router-state-serializer), you'll need to provide your own selectors.
 
 Usage: