fix(router-store): remove circular dependency in serializers (#1904)

Closes #1902
ngrx · Jun 1, 2019 · 0407c5b · 0407c5b
1 parent 75987a6
commit 0407c5b
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 29 deletions.
diff --git a/modules/router-store/src/actions.ts b/modules/router-store/src/actions.ts
@@ -6,10 +6,8 @@ import {
   RoutesRecognized,
 } from '@angular/router';
 
-import {
-  BaseRouterStoreState,
-  SerializedRouterStateSnapshot,
-} from './serializers';
+import { BaseRouterStoreState } from './serializers/base';
+import { SerializedRouterStateSnapshot } from './serializers/default_serializer';
 
 /**
  * An action dispatched when a router navigation request is fired.

diff --git a/modules/router-store/src/index.ts b/modules/router-store/src/index.ts
@@ -28,11 +28,15 @@ export {
 } from './router_store_module';
 export {
   RouterStateSerializer,
+  BaseRouterStoreState,
+} from './serializers/base';
+export {
   DefaultRouterStateSerializer,
   SerializedRouterStateSnapshot,
-  BaseRouterStoreState,
+} from './serializers/default_serializer';
+export {
   MinimalActivatedRouteSnapshot,
   MinimalRouterStateSnapshot,
   MinimalRouterStateSerializer,
-} from './serializers';
+} from './serializers/minimal_serializer';
 export { getSelectors } from './router_selectors';
diff --git a/modules/router-store/src/reducer.ts b/modules/router-store/src/reducer.ts
@@ -5,10 +5,8 @@ import {
   ROUTER_NAVIGATION,
   RouterAction,
 } from './actions';
-import {
-  BaseRouterStoreState,
-  SerializedRouterStateSnapshot,
-} from './serializers';
+import { BaseRouterStoreState } from './serializers/base';
+import { SerializedRouterStateSnapshot } from './serializers/default_serializer';
 
 export type RouterReducerState<
   T extends BaseRouterStoreState = SerializedRouterStateSnapshot

diff --git a/modules/router-store/src/router_selectors.ts b/modules/router-store/src/router_selectors.ts
@@ -1,6 +1,6 @@
-import { RouterReducerState } from '@ngrx/router-store';
 import { createSelector } from '@ngrx/store';
 import { RouterStateSelectors } from './models';
+import { RouterReducerState } from './reducer';
 
 export function getSelectors<V>(
   selectState: (state: V) => RouterReducerState<any>

diff --git a/modules/router-store/src/router_store_module.ts b/modules/router-store/src/router_store_module.ts
@@ -27,12 +27,14 @@ import {
 } from './actions';
 import { RouterReducerState } from './reducer';
 import {
-  DefaultRouterStateSerializer,
   RouterStateSerializer,
-  SerializedRouterStateSnapshot,
   BaseRouterStoreState,
-  MinimalRouterStateSerializer,
-} from './serializers';
+} from './serializers/base';
+import {
+  DefaultRouterStateSerializer,
+  SerializedRouterStateSnapshot,
+} from './serializers/default_serializer';
+import { MinimalRouterStateSerializer } from './serializers/minimal_serializer';
 
 export type StateKeyOrSelector<
   T extends BaseRouterStoreState = SerializedRouterStateSnapshot

diff --git a/...es/router-store/src/serializers/shared.ts → modules/router-store/src/serializers/base.ts b/...es/router-store/src/serializers/shared.ts → modules/router-store/src/serializers/base.ts
diff --git a/modules/router-store/src/serializers/default_serializer.ts b/modules/router-store/src/serializers/default_serializer.ts
@@ -1,5 +1,5 @@
 import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { BaseRouterStoreState, RouterStateSerializer } from './shared';
+import { BaseRouterStoreState, RouterStateSerializer } from './base';
 
 export interface SerializedRouterStateSnapshot extends BaseRouterStoreState {
   root: ActivatedRouteSnapshot;

diff --git a/modules/router-store/src/serializers/index.ts b/modules/router-store/src/serializers/index.ts
diff --git a/modules/router-store/src/serializers/minimal_serializer.ts b/modules/router-store/src/serializers/minimal_serializer.ts
@@ -1,5 +1,5 @@
 import { RouterStateSnapshot, ActivatedRouteSnapshot } from '@angular/router';
-import { BaseRouterStoreState, RouterStateSerializer } from './shared';
+import { BaseRouterStoreState, RouterStateSerializer } from './base';
 
 export interface MinimalActivatedRouteSnapshot {
   routeConfig: ActivatedRouteSnapshot['routeConfig'];