fix($transition) get a single transition to run.

- add Path.reverse to reverse a path inline (like Array.reverse)
- add "State X is already defined" to StateQueueManager.register() and flush()
- hook up Transition.run() in $state.transitionTo
- copied state.to/state.from to toState/fromState.  meh
- fix bug in entering-states code
- init _fromPath in $transition.init()
- fix transitionSpec to not try to clobber the root state ('')

Author: christopherthielen

src/resolve.js

@@ -236,6 +236,10 @@ function $Resolve(  $q,    $injector) {
       slice: function(start, end) {
         return new Path(elements.slice(start, end));
       },
+      reverse: function() {
+        elements.reverse();
+        return self;
+      },
       states: function() {
         return pluck(elements, "state");
       },

src/state.js

@@ -50,15 +50,16 @@ function StateQueueManager(states, builder, $urlRouterProvider) {
   extend(this, {
     register: function(config, pre) {
       // Wrap a new object around the state so we can store our private details easily.
-      state = inherit(config, {
+      var state = inherit(config, {
 //        name: builder.name(config),
         self: config,
         resolve: config.resolve || {},
         toString: function() { return this.name; }
       });
 
       if (!isString(state.name)) throw new Error("State must have a valid name");
-      // if (registered.hasOwnProperty(name)) throw new Error("State '" + name + "'' is already defined");
+      if (states[state.name] || pluck(queue, 'name').indexOf(state.name) !== -1)
+        throw new Error("State '" + state.name + "' is already defined");
       if (pre)
         queue.unshift(state);
       else
@@ -75,6 +76,8 @@ function StateQueueManager(states, builder, $urlRouterProvider) {
         orphanIdx = orphans.indexOf(state);
 
         if (result) {
+          if (states[state.name] !== undefined)
+            throw new Error("State '" + name + "' is already defined");
           states[state.name] = state;
           this.attachRoute(state);
           if (orphanIdx >= 0) orphans.splice(orphanIdx, 1);
@@ -918,7 +921,7 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactoryProvider) {
       // and return a promise for the new state. We also keep track of what the
       // current promise is, so that we can detect overlapping transitions and
       // keep only the outcome of the last transition.
-      var current = transition.run()
+      var current = transition.runAsync()
         .then(function(data) {
           console.log("hur", data);
           transitionSuccess();

src/transition.js

@@ -77,20 +77,20 @@ function $TransitionProvider() {
      * @returns {Object} New `Transition` object
      */
     function Transition(fromState, fromParams, toState, toParams, options) {
-      var transition = this;
-      var keep = 0, state, retained, entering, exiting;
-      var hasRun = false, hasCalculated = false;
-
+      var transition = this; // Transition() object
       // grab $transition's current path
-      var toPath, fromPath = _fromPath;
+      var toPath, fromPath = _fromPath; // Path() objects
+      var retained, entering, exiting; // Path() objects
+      var keep = 0, state, hasRun = false, hasCalculated = false;
 
       var states = {
         to: stateMatcher(toState, options),
         from: stateMatcher(fromState, options)
       };
+      toState = states.to; fromState = states.from;
 
       function isTargetStateValid() {
-        var state = stateMatcher(toState, options);
+        var state = states.to;
 
         if (!isDefined(state)) {
           if (!options || !options.relative) return "No such state " + angular.toJson(toState);
@@ -148,9 +148,8 @@ function $TransitionProvider() {
         // - resolve PathElement lazy resolvables
         // - then, invokeAsync onEnter
 
-        var exitingElements = transition.exiting().slice(0);
-        exitingElements.reverse();
-        var enteringElements = transition.entering();
+        var exitingElements = transition.exiting().slice(0).reverse().elements;
+        var enteringElements = transition.entering().elements;
         var promiseChain = $q.when(true);
         forEach(exitingElements, function(elem) {
           if (elem.state.onExit) {
@@ -159,7 +158,7 @@ function $TransitionProvider() {
           }
         });
         forEach(enteringElements, function(elem) {
-          var resolveContext = fromPath.resolveContext(elem);
+          var resolveContext = toPath.resolveContext(elem);
           promiseChain.then(function() { return elem.resolve(resolveContext, { policy: "lazy" }); });
           if (elem.state.onEnter) {
             var nextStep = transitionStep(elem.state.onEnter, resolveContext);
@@ -310,7 +309,8 @@ function $TransitionProvider() {
           return (toState === fromState && !options.reload);
         },
         runAsync: function() {
-          var pathContext = new PathContext(toPath);
+          calculateTreeChanges();
+          var pathContext = new ResolveContext(toPath);
           return toPath.resolve(pathContext, { policy: "eager" })
             .then( buildTransitionSteps );
         },
@@ -346,6 +346,7 @@ function $TransitionProvider() {
 
 
     $transition.init = function init(state, params, matcher) {
+      _fromPath = new Path(state.path);
       from = { state: state, params: params };
       to = { state: null, params: null };
       stateMatcher = matcher;

test/transitionSpec.js

@@ -52,16 +52,14 @@ describe('$transition:', function () {
       var substates = omit.apply(null, [state].concat(stateProps));
 
       thisState.name = name;
-//      if (parent && parent.name) {
-//        thisState.name = parent.name + "." + name;
-//      }
-      thisState.parent = parent;
+      thisState.parent = parent.name;
       thisState.data = { children: [] };
 
       angular.forEach(substates, function (value, key) {
         thisState.data.children.push(loadStates(thisState, value, key));
       });
-      statesMap[name] = thisState;
+      if (name)
+        statesMap[name] = thisState;
       return thisState;
     }