refactor($stateParams): Inject $stateParams using Resolvable instead of locals

Author: christopherthielen

src/path/pathFactory.ts

@@ -48,8 +48,8 @@ export default class PathFactory {
   /** Given an IParamsNode, make an IResolveNode by creating resolvables for resolves on the state's declaration */
   static makeResolveNode(node: IParamsNode): IResolveNode {
     const makeResolvable = (_node: INode) => (resolveFn: Function, name: string) => new Resolvable(name, resolveFn, _node.state);
-    let resolvables = {ownResolvables:  map(node.state.resolve || {}, makeResolvable(node)) };
-    return extend({}, node, resolvables);
+    let ownResolvables = map(node.state.resolve || {}, makeResolvable(node));
+    return extend({}, node, {ownResolvables});
   }
 
   /** Given a fromPath: ITransPath and a TargetState, builds a toPath: IParamsPath */
@@ -120,11 +120,12 @@ export default class PathFactory {
     // Attach bound resolveContext and paramValues to each node
     // Attach views to each node
     transPath.nodes().forEach((node: ITransNode) => {
-          node.resolveContext = resolveContext.isolateRootTo(node.state);
-          node.resolveInjector = new ResolveInjector(node.resolveContext, node.state);
-          node.paramValues = paramValues.$isolateRootTo(node.state.name);
-          node.views = makeViews(node);
-        }
+        node.resolveContext = resolveContext.isolateRootTo(node.state);
+        node.resolveInjector = new ResolveInjector(node.resolveContext, node.state);
+        node.paramValues = paramValues.$isolateRootTo(node.state.name);
+        node.ownResolvables["$stateParams"] = new Resolvable("$stateParams", () => node.paramValues, node.state);
+        node.views = makeViews(node);
+      }
     );
 
     return transPath;

src/transition/hookBuilder.ts

@@ -135,8 +135,7 @@ export default class HookBuilder {
 
   /** Given a node and a callback function, builds a TransitionHook */
   buildHook(node: ITransNode, fn: IInjectable, moreLocals?, options: ITransitionHookOptions = {}): TransitionHook {
-    let nodeLocals = { $stateParams: node.paramValues };
-    let locals = extend({}, this.transitionLocals, nodeLocals, moreLocals);
+    let locals = extend({}, this.transitionLocals, moreLocals);
     let _options = extend({}, this.baseHookOptions, options);
 
     return new TransitionHook(node.state, fn, locals, node.resolveContext, _options);

src/view/templateFactory.ts

@@ -97,13 +97,12 @@ function $TemplateFactory(  $http,   $templateCache) {
    * Creates a template by invoking an injectable provider function.
    *
    * @param {Function} provider Function to invoke via `locals`
-   * @param {Object} params Parameters for the template.
    * @param {Function} injectFn a function used to invoke the template provider
    * @return {string|Promise.<string>} The template html as a string, or a promise 
    * for that string.
    */
   this.fromProvider = function (provider, params, injectFn) {
-    return injectFn(provider, { $stateParams: params });
+    return injectFn(provider);
   };
 }
 

src/view/viewDirective.ts

@@ -287,7 +287,7 @@ function $ViewDirectiveFill (  $compile,   $controller,   $interpolate,   $injec
 
         if (controller) {
           let locals = data.$locals;
-          let controllerInstance = $controller(controller, extend(locals, { $scope: scope })); // $stateParams?
+          let controllerInstance = $controller(controller, extend(locals, { $scope: scope }));
           if (controllerAs) scope[controllerAs] = controllerInstance;
           $element.data('$ngControllerController', controllerInstance);
           $element.children().data('$ngControllerController', controllerInstance);

test/resolveSpec.ts

@@ -159,7 +159,7 @@ describe('Resolvables system:', function () {
       let ctx = new ResolveContext(path);
       let resolvableLocals = ctx.getResolvables(statesMap["C"]);
       let keys = Object.keys(resolvableLocals).sort();
-      expect(keys).toEqual( ["_A", "_A2", "_B", "_B2", "_C", "_C2" ] );
+      expect(keys).toEqual( ["$stateParams", "_A", "_A2", "_B", "_B2", "_C", "_C2" ] );
     }));
   });
 

test/transitionSpec.js

@@ -80,7 +80,7 @@ describe('transition', function () {
     queue.flush($state);
     makeTransition = function makeTransition(from, to, options) {
       var paramsPath = PathFactory.makeParamsPath(targetState(from));
-      var fromPath = PathFactory.bindTransNodesToPath(paramsPath);
+      var fromPath = PathFactory.bindTransNodesToPath(paramsPath.adapt(PathFactory.makeResolveNode));
       return $transitions.create(fromPath, targetState(to, null, options));
     };
   }));

test/viewSpec.ts

@@ -55,7 +55,7 @@ describe('view', function() {
     beforeEach(() => {
       state = register({ name: "foo" });
       var nodes = [root, state].map(_state => ({ state: _state, ownParams: {}}));
-      var path = PathFactory.bindTransNodesToPath(<any> new Path(nodes));
+      var path = PathFactory.bindTransNodesToPath(<any> new Path(nodes).adapt(PathFactory.makeResolveNode));
       ctx = new ResolveContext(path);
     });