Final implementation of relative state targeting.

Author: nateabele

src/state.js

@@ -108,18 +108,27 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory,           $
 
   function findState(stateOrName, base) {
     var isStr = isString(stateOrName),
-        name = isStr ? stateOrName : stateOrName.name,
-        path = isStr ? name.match(/^((?:(?:\^)(?:\.)?){1,})(.+)/) : null;
+        name  = isStr ? stateOrName : stateOrName.name,
+        path  = name.indexOf(".") === 0 || name.indexOf("^") === 0;
 
-    if (path && path.length) {
-      if (!base) throw new Error("No reference point given for path '"  + stateOrName + "'");
-      var rel = path[1].split("."), i = 0, pathLength = rel.length - 1, current = base;
+    if (path) {
+      if (!base) throw new Error("No reference point given for path '"  + name + "'");
+      var rel = name.split("."), i = 0, pathLength = rel.length, current = base;
 
       for (; i < pathLength; i++) {
-        if (rel[i] === "^") current = current.parent;
-        if (!current) throw new Error("Path '" + name + "' not valid for state '" + base.name + "'");
+        if (rel[i] === "" && i === 0) {
+          current = base;
+          continue;
+        }
+        if (rel[i] === "^") {
+          if (!current.parent) throw new Error("Path '" + name + "' not valid for state '" + base.name + "'");
+          current = current.parent;
+          continue;
+        }
+        break;
       }
-      name = current.name + "." + path[2];
+      rel = rel.slice(i).join(".");
+      name = current.name + (current.name && rel ? "." : "") + rel;
     }
     var state = states[name];
 

test/stateSpec.js

@@ -212,18 +212,42 @@ describe('state', function () {
 
   describe('.go()', function() {
     it('transitions to a relative state', inject(function ($state, $q) {
-      $state.transitionTo('about.person.item', { id: 5 });
-      $q.flush();
-      $state.go('^.^.sidebar');
-      $q.flush();
+      $state.transitionTo('about.person.item', { id: 5 }); $q.flush();
+      $state.go('^.^.sidebar'); $q.flush();
+      expect($state.$current.name).toBe('about.sidebar');
+
+      // Transitions to absolute state
+      $state.go("home"); $q.flush();
+      expect($state.$current.name).toBe('home');
+
+
+      // Transition to a child state
+      $state.go(".item", { id: 5 }); $q.flush();
+      expect($state.$current.name).toBe('home.item');
+
+      // Transition to grandparent's sibling through root
+      // (Equivalent to absolute transition, assuming the root is known).
+      $state.go("^.^.about"); $q.flush();
+      expect($state.$current.name).toBe('about');
+
+      // Transition to grandchild
+      $state.go(".person.item", { person: "bob", id: 13 }); $q.flush();
+      expect($state.$current.name).toBe('about.person.item');
+
+      // Transition to immediate parent
+      $state.go("^"); $q.flush();
+      expect($state.$current.name).toBe('about.person');
+
+      // Transition to parent's sibling
+      $state.go("^.sidebar"); $q.flush();
       expect($state.$current.name).toBe('about.sidebar');
     }));
 
     it('keeps parameters from common ancestor states', inject(function ($state, $stateParams, $q) {
       $state.transitionTo('about.person', { person: 'bob' });
       $q.flush();
 
-      $state.go('^item', { id: 5 });
+      $state.go('.item', { id: 5 });
       $q.flush();
 
       expect($state.$current.name).toBe('about.person.item');