refactor(StateBuilder): Fetch root state from the StateMatcher, not from a callback.

Author: christopherthielen

src/state/state.ts

@@ -46,7 +46,7 @@ export function $StateProvider($urlRouterProvider, $urlMatcherFactoryProvider: U
   let $state: StateService = <any> function $state() {};
 
   let matcher       = new StateMatcher(states);
-  let builder       = new StateBuilder(() => root, matcher, $urlMatcherFactoryProvider);
+  let builder       = new StateBuilder(matcher, $urlMatcherFactoryProvider);
   let stateQueue    = new StateQueueManager(states, builder, $urlRouterProvider, $state);
   let transQueue    = new Queue<Transition>();
   let treeChangesQueue = new Queue<TreeChanges>();

src/state/stateBuilder.ts

@@ -44,12 +44,15 @@ export class StateBuilder {
   /** An object that contains all the BuilderFunctions registered, key'd by the name of the State property they build */
   private builders: Builders;
 
-  constructor(root: () => State, private matcher: StateMatcher, $urlMatcherFactoryProvider: UrlMatcherFactory) {
+  constructor(private matcher: StateMatcher, $urlMatcherFactoryProvider: UrlMatcherFactory) {
     let self = this;
 
+    const isRoot = (state) => state.name === "";
+    const root = () => matcher.find("");
+
     this.builders = {
       parent: [function (state: State) {
-        if (state === root()) return null;
+        if (isRoot(state)) return null;
         return matcher.find(self.parentName(state)) || root();
       }],
 
@@ -79,7 +82,7 @@ export class StateBuilder {
 
       // Keep track of the closest ancestor state that has a URL (i.e. is navigable)
       navigable: [function (state: State) {
-        return (state !== root()) && state.url ? state : (state.parent ? state.parent.navigable : null);
+        return !isRoot(state) && state.url ? state : (state.parent ? state.parent.navigable : null);
       }],
 
       params: [function (state: State): { [key: string]: Param } {

test/stateSpec.js

@@ -81,14 +81,14 @@ describe('state helpers', function() {
   });
 
   describe('StateBuilder', function() {
-    var builder, root, matcher, urlMatcherFactoryProvider = {
+    var builder, matcher, urlMatcherFactoryProvider = {
       compile: function() {},
       isMatcher: function() {}
     };
 
     beforeEach(function() {
       matcher = new StateMatcher(states);
-      builder = new StateBuilder(function() { return root; }, matcher, urlMatcherFactoryProvider);
+      builder = new StateBuilder(matcher, urlMatcherFactoryProvider);
     });
 
     describe('interface', function() {
@@ -145,7 +145,7 @@ describe('state helpers', function() {
       });
 
       it('should concatenate URLs from root', function() {
-        root = { url: { append: function() {} } }, url = {};
+        var root = states[''] = { url: { append: function() {} } }, url = {};
         spyOn(root.url, 'append').and.returnValue(url);
         spyOn(urlMatcherFactoryProvider, 'isMatcher').and.returnValue(true);
         spyOn(urlMatcherFactoryProvider, 'compile').and.returnValue(url);
@@ -159,6 +159,7 @@ describe('state helpers', function() {
       });
 
       it('should pass through custom UrlMatchers', function() {
+        var root = states[''] = { url: { append: function() {} } };
         var url = new UrlMatcher("/");
         spyOn(urlMatcherFactoryProvider, 'isMatcher').and.returnValue(true);
         spyOn(root.url, 'append').and.returnValue(url);

test/transitionSpec.ts

@@ -44,8 +44,8 @@ describe('transition', function () {
     };
 
     matcher = new StateMatcher(statesMap = {});
-    pathFactory = new PathFactory(function() { return root; });
-    var builder = new StateBuilder(function() { return root; }, matcher, $urlMatcherFactoryProvider);
+    pathFactory = new PathFactory();
+    var builder = new StateBuilder(matcher, $urlMatcherFactoryProvider);
     queue = new StateQueueManager(statesMap, builder, { when: function() {} }, null);
     var root = queue.register({ name: '', url: '^', views: null, 'abstract': true});
     root.navigable = null;

test/viewSpec.ts

@@ -43,7 +43,7 @@ describe('view', function() {
 
     states = {};
     let matcher = new StateMatcher(states);
-    let stateBuilder = new StateBuilder(() => root, matcher, $urlMatcherFactoryProvider);
+    let stateBuilder = new StateBuilder(matcher, $urlMatcherFactoryProvider);
     register = registerState(states, stateBuilder);
     root = register({name: ""});
   }));