fix(stark-core): avoid circular dependencies by moving state names in…

… a constants file
NationalBankBelgium · Jan 7, 2019 · abe7fe2 · abe7fe2
1 parent 8ee3938
commit abe7fe2
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 50 deletions.
diff --git a/packages/stark-core/src/modules/routing/services/routing.service.ts b/packages/stark-core/src/modules/routing/services/routing.service.ts
@@ -41,7 +41,7 @@ import { StarkRoutingTransitionHook } from "./routing-transition-hook.constants"
 import { StarkStateConfigWithParams } from "./state-config-with-params.intf";
 import { StarkCoreApplicationState } from "../../../common/store";
 import { StarkConfigurationUtil } from "../../../util/configuration.util";
-import { starkAppExitStateName, starkAppInitStateName } from "../../session/routes";
+import { starkAppExitStateName, starkAppInitStateName } from "../../session/constants";
 
 /**
  * @ignore

diff --git a/packages/stark-core/src/modules/session.ts b/packages/stark-core/src/modules/session.ts
@@ -1,5 +1,6 @@
 export * from "./session/actions";
 export * from "./session/components";
+export * from "./session/constants";
 export * from "./session/entities";
 export * from "./session/reducers";
 export * from "./session/services";

diff --git a/packages/stark-core/src/modules/session/components/app-container.component.ts b/packages/stark-core/src/modules/session/components/app-container.component.ts
@@ -1,7 +1,7 @@
 import { Component, Inject, OnInit, ViewEncapsulation } from "@angular/core";
 import { STARK_LOGGING_SERVICE, StarkLoggingService } from "../../logging/services";
 import { STARK_ROUTING_SERVICE, StarkRoutingService } from "../../routing/services";
-import { starkAppExitStateName, starkAppInitStateName } from "../routes";
+import { starkAppExitStateName, starkAppInitStateName } from "../constants";
 
 /**
  * Name of the component

diff --git a/packages/stark-core/src/modules/session/constants.ts b/packages/stark-core/src/modules/session/constants.ts
@@ -0,0 +1,44 @@
+/**
+ * Name of the initialization states of the application
+ */
+export const starkAppInitStateName: string = "starkAppInit";
+/**
+ * Name of the exit states of the application
+ */
+export const starkAppExitStateName: string = "starkAppExit";
+
+/**
+ * Name of the login state of the application
+ */
+export const starkLoginStateName: string = starkAppInitStateName + ".starkLogin";
+/**
+ * URL of the login state of the application
+ */
+export const starkLoginStateUrl: string = "/starkLogin";
+
+/**
+ * Name of the Preloading state of the application
+ */
+export const starkPreloadingStateName: string = starkAppInitStateName + ".starkPreloading";
+/**
+ * URL of the Preloading state of the application
+ */
+export const starkPreloadingStateUrl: string = "/starkPreloading";
+
+/**
+ * Name of the SessionExpired state of the application
+ */
+export const starkSessionExpiredStateName: string = starkAppExitStateName + ".starkSessionExpired";
+/**
+ * URL of the SessionExpired state of the application
+ */
+export const starkSessionExpiredStateUrl: string = "/starkSessionExpired";
+
+/**
+ * Name of the SessionLogout state of the application
+ */
+export const starkSessionLogoutStateName: string = starkAppExitStateName + ".starkSessionLogout";
+/**
+ * URL of the SessionLogout state of the application
+ */
+export const starkSessionLogoutStateUrl: string = "/starkSessionLogout";
diff --git a/packages/stark-core/src/modules/session/routes.ts b/packages/stark-core/src/modules/session/routes.ts
@@ -4,51 +4,7 @@ import { loadNgModule, Ng2StateDeclaration, NgModuleToLoad } from "@uirouter/ang
 import { from, Observable, of } from "rxjs";
 import { map } from "rxjs/operators";
 import { STARK_ROUTING_SERVICE, StarkRoutingService, StarkStateConfigWithParams } from "../routing/services";
-
-/**
- * Name of the initialization states of the application
- */
-export const starkAppInitStateName: string = "starkAppInit";
-/**
- * Name of the exit states of the application
- */
-export const starkAppExitStateName: string = "starkAppExit";
-
-/**
- * Name of the login state of the application
- */
-export const starkLoginStateName: string = starkAppInitStateName + ".starkLogin";
-/**
- * URL of the login state of the application
- */
-export const starkLoginStateUrl: string = "/starkLogin";
-
-/**
- * Name of the Preloading state of the application
- */
-export const starkPreloadingStateName: string = starkAppInitStateName + ".starkPreloading";
-/**
- * URL of the Preloading state of the application
- */
-export const starkPreloadingStateUrl: string = "/starkPreloading";
-
-/**
- * Name of the SessionExpired state of the application
- */
-export const starkSessionExpiredStateName: string = starkAppExitStateName + ".starkSessionExpired";
-/**
- * URL of the SessionExpired state of the application
- */
-export const starkSessionExpiredStateUrl: string = "/starkSessionExpired";
-
-/**
- * Name of the SessionLogout state of the application
- */
-export const starkSessionLogoutStateName: string = starkAppExitStateName + ".starkSessionLogout";
-/**
- * URL of the SessionLogout state of the application
- */
-export const starkSessionLogoutStateUrl: string = "/starkSessionLogout";
+import { starkAppExitStateName, starkAppInitStateName } from "./constants";
 
 /**
  * Configuration of the route state of the application

diff --git a/packages/stark-core/src/modules/session/services/session.service.spec.ts b/packages/stark-core/src/modules/session/services/session.service.spec.ts
@@ -36,7 +36,7 @@ import { MockStarkRoutingService } from "../../routing/testing";
 import { StarkCoreApplicationState } from "../../../common/store";
 import Spy = jasmine.Spy;
 import SpyObj = jasmine.SpyObj;
-import { starkAppExitStateName, starkAppInitStateName, starkSessionExpiredStateName } from "../routes";
+import { starkAppExitStateName, starkAppInitStateName, starkSessionExpiredStateName } from "../constants";
 
 describe("Service: StarkSessionService", () => {
 	let mockStore: SpyObj<Store<StarkCoreApplicationState>>;

diff --git a/packages/stark-core/src/modules/session/services/session.service.ts b/packages/stark-core/src/modules/session/services/session.service.ts
@@ -37,7 +37,7 @@ import { StarkCoreApplicationState } from "../../../common/store";
 import { selectStarkSession } from "../reducers";
 import { StarkConfigurationUtil } from "../../../util/configuration.util";
 import { StarkValidationErrorsUtil } from "../../../util";
-import { starkAppExitStateName, starkAppInitStateName, starkSessionExpiredStateName } from "../routes";
+import { starkAppExitStateName, starkAppInitStateName, starkSessionExpiredStateName } from "../constants";
 
 /**
  * @ignore

diff --git a/packages/stark-core/src/modules/session/session.module.ts b/packages/stark-core/src/modules/session/session.module.ts
@@ -9,7 +9,8 @@ import { starkSessionReducers } from "./reducers";
 import { StarkSessionConfig, STARK_SESSION_CONFIG } from "./entities";
 import { STARK_SESSION_SERVICE, StarkSessionServiceImpl } from "./services";
 import { STARK_ROUTING_SERVICE, StarkRoutingService } from "../routing/services";
-import { SESSION_STATES, starkLoginStateName, starkPreloadingStateName } from "./routes";
+import { SESSION_STATES } from "./routes";
+import { starkLoginStateName, starkPreloadingStateName } from "./constants";
 import { StarkAppContainerComponent } from "./components";
 
 @NgModule({