refactor(state): remove dependency from stateRegistry to StateService

Author: christopherthielen

src/router.ts

@@ -35,7 +35,7 @@ export class UIRouter {
 
   viewService = new ViewService(this.templateFactory);
 
-  stateRegistry: StateRegistry = new StateRegistry(this.urlMatcherFactory, this.urlRouterProvider, () => this.stateService.$current);
+  stateRegistry: StateRegistry = new StateRegistry(this.urlMatcherFactory, this.urlRouterProvider);
 
   // TODO: move this to ng1.ts
   stateProvider = new StateProvider(this.stateRegistry);

src/state/stateRegistry.ts

@@ -17,7 +17,7 @@ export class StateRegistry {
   private builder: StateBuilder;
   stateQueue: StateQueueManager;
 
-  constructor(urlMatcherFactory: UrlMatcherFactory, urlRouterProvider, private currentState: () => State) {
+  constructor(urlMatcherFactory: UrlMatcherFactory, urlRouterProvider) {
     this.matcher = new StateMatcher(this.states);
     this.builder = new StateBuilder(this.matcher, urlMatcherFactory);
     this.stateQueue = new StateQueueManager(this.states, this.builder, urlRouterProvider);
@@ -44,9 +44,12 @@ export class StateRegistry {
     return this.stateQueue.register(stateDefinition);
   }
 
-  get(stateOrName: StateOrName, base: StateOrName): (StateDeclaration|StateDeclaration[]) {
-    if (arguments.length === 0) return Object.keys(this.states).map(name => this.states[name].self);
-    let found = this.matcher.find(stateOrName, base || this.currentState());
+  get(): StateDeclaration[];
+  get(stateOrName: StateOrName, base: StateOrName): StateDeclaration;
+  get(stateOrName?: StateOrName, base?: StateOrName): (StateDeclaration|StateDeclaration[]) {
+    if (arguments.length === 0) 
+      return <StateDeclaration[]> Object.keys(this.states).map(name => this.states[name].self);
+    let found = this.matcher.find(stateOrName, base);
     return found && found.self || null;
   }
 

src/state/stateService.ts

@@ -472,7 +472,10 @@ export class StateService {
    * @param {string|object=} base When stateOrName is a relative state reference, the state will be retrieved relative to context.
    * @returns {Object|Array} State configuration object or array of all objects.
    */
-  get(stateOrName: StateOrName, base: StateOrName) {
-    return this.stateRegistry.get.apply(this.stateRegistry, arguments);
+  get(): StateDeclaration[];
+  get(stateOrName: StateOrName, base: StateOrName): StateDeclaration;
+  get(stateOrName?: StateOrName, base?: StateOrName): (StateDeclaration|StateDeclaration[]) {
+    if (arguments.length === 0) return this.stateRegistry.get();
+    return this.stateRegistry.get(stateOrName, base || this.$current);
   }
 }