fix(Resolvable): Make resolveResolvable use a subset of the overall resolve Path (from path root to the resolve's state), so it injects the proper objects.

This fixes a problem where a resolve at a parent state injects a resolve overridden in a child state.

Another scenario this fixes is when a parent resolve defines a resolve which is named the same as a service it depends on (it's in the sample app). To properly inject the service, we need to exclude the resolve/service name when getting the available resolvables from the path context.  This happens by filtering the resolve's own name from the *last* path element, so if the path is incorrectly provided, the name is also filtered incorrectly.

Author: christopherthielen

src/resolve/resolvable.ts

@@ -5,6 +5,7 @@ import trace  from "../common/trace";
 import {IPromise} from "angular";
 import {IState} from "../state/interface";
 import {runtime} from "../common/angular1"
+import Path from "./path"
 
 /**
  * The basic building block for the resolve system.
@@ -45,13 +46,13 @@ export default class Resolvable {
   // - wait for resolveFn promise to resolve
   // - store unwrapped data
   // - resolve the Resolvable's promise
-  resolveResolvable(pathContext, options) {
+  resolveResolvable(path: Path, options) {
     options = options || {};
     if (options.trace) trace.traceResolveResolvable(this, options);
     // First, set up an overall deferred/promise for this Resolvable
     var deferred = runtime.$q.defer();
     this.promise = deferred.promise;
-
+    var pathContext = path.pathFromRoot(path.elementForState(this.state));
     // Load a map of all resolvables for this state from the context path
     // Omit the current Resolvable from the result, so we don't try to inject this into this
     var ancestorsByName = pathContext.getResolvables({  omitOwnLocals: [ this.name ] });

test/resolveSpec.js

@@ -15,11 +15,12 @@ var resolve = uiRouter.resolve,
 
 var statesTree, statesMap = {};
 var emptyPath;
-var counts, expectCounts;
+var vals, counts, expectCounts;
 var asyncCount;
 
 beforeEach(function () {
-  counts = { _J: 0, _J2: 0, _K: 0, _L: 0, _M: 0};
+  counts = { _J: 0, _J2: 0, _K: 0, _L: 0, _M: 0, _Q: 0 };
+  vals = { _Q: null };
   expectCounts = angular.copy(counts);
   states = {
     A: { resolve: { _A: function () { return "A"; }, _A2: function() { return "A2"; }},
@@ -47,7 +48,9 @@ beforeEach(function () {
         resolvePolicy: { _N: "eager", _N2: "lazy", _N3: "jit" }
       }
     },
-    O: { resolve: { _O: function(_O2) { return _O2 + "O"; }, _O2: function(_O) { return _O + "O2"; } }
+    O: { resolve: { _O: function(_O2) { return _O2 + "O"; }, _O2: function(_O) { return _O + "O2"; } } },
+    P: { resolve: { $state: function($state) { return $state } },
+      Q: { resolve: { _Q: function($state) { counts._Q++; vals._Q = $state; return "foo"; }}}
     }
   };
 
@@ -180,6 +183,21 @@ describe('Resolvables system:', function () {
         asyncCount++;
       });
 
+      $q.flush();
+      expect(asyncCount).toBe(1);
+    }));
+
+    it('should provide each resolveResolvable with a path context, starting from the root to the resolves PathElement', inject(function($q, $state) {
+      "use strict";
+      var path = makePath(["P", "Q"]);
+      var promise = path.resolvePath({ resolvePolicy: "jit" });
+
+      promise.then(function () {
+        expect(getResolvedData(path)).toEqualData({ $state: $state, _Q: "foo" });
+        asyncCount++;
+      });
+
+
       $q.flush();
       expect(asyncCount).toBe(1);
     }));