fix(Path): Pre-resolve $stateParams and $transition$ on toPath

fix(HookBuilder): Remove transitionLocals in favor of pre-resolved data on Path

Author: christopherthielen

src/path/pathFactory.ts

@@ -14,6 +14,7 @@ import ResolveContext from "../resolve/resolveContext";
 
 import {ViewConfig} from "../view/view";
 import ResolveInjector from "../resolve/resolveInjector";
+import {Transition} from "../transition/transition";
 
 /**
  * This class contains functions which convert TargetStates, Nodes and paths from one type to another.
@@ -92,8 +93,7 @@ export default class PathFactory {
     resolvePath.forEach((node: Node) => {
       node.resolveContext = resolveContext.isolateRootTo(node.state);
       node.resolveInjector = new ResolveInjector(node.resolveContext, node.state);
-      // node.paramValues = paramValues.$isolateRootTo(node.state.name);
-      node.resolves["$stateParams"] = new Resolvable("$stateParams", () => node.values, node.state);
+      node.resolves.$stateParams = new Resolvable("$stateParams", () => node.values, node.state, node.values);
     });
 
     return resolvePath;
@@ -138,4 +138,9 @@ export default class PathFactory {
 
     return { from, to, retained, exiting, entering };
   }
+
+  static bindTransitionResolve(treeChanges: ITreeChanges, transition: Transition) {
+    let rootNode = treeChanges.to[0];
+    rootNode.resolves.$transition$ = new Resolvable('$transition$', () => transition, rootNode.state, transition);
+  }
 }

src/resolve/resolvable.ts

@@ -22,11 +22,12 @@ import ResolveContext from "./resolveContext"
  * parameter to those fns.
  */
 export default class Resolvable {
-  constructor(name: string, resolveFn: Function, state: State) {
+  constructor(name: string, resolveFn: Function, state: State, preResolvedData?: any) {
     this.name = name;
     this.resolveFn = resolveFn;
     this.state = state;
     this.deps = runtime.$injector.annotate(resolveFn);
+    this.data = preResolvedData;
   }
 
   name: string;

src/transition/hookBuilder.ts

@@ -43,14 +43,12 @@ export default class HookBuilder {
   toState: State;
   fromState: State;
 
-  transitionLocals: { [key: string]: any };
 
   constructor(private $transitions: ITransitionService, private transition: Transition, private baseHookOptions: ITransitionHookOptions) {
     this.treeChanges        = transition.treeChanges();
     this.toState            = tail(this.treeChanges.to).state;
     this.fromState          = tail(this.treeChanges.from).state;
     this.transitionOptions  = transition.options();
-    this.transitionLocals   = { $transition$: transition };
   }
 
   // TODO: These get* methods are returning different cardinalities of hooks
@@ -109,11 +107,9 @@ export default class HookBuilder {
   }
 
   /** Given a node and a callback function, builds a TransitionHook */
-  buildHook(node: Node, fn: IInjectable, moreLocals?, options: ITransitionHookOptions = {}): TransitionHook {
-    let locals = extend({}, this.transitionLocals, moreLocals);
+  buildHook(node: Node, fn: IInjectable, locals?, options: ITransitionHookOptions = {}): TransitionHook {
     let _options = extend({}, this.baseHookOptions, options);
-
-    return new TransitionHook(node.state, fn, locals, node.resolveContext, _options);
+    return new TransitionHook(node.state, fn, extend({}, locals), node.resolveContext, _options);
   }
 
 

src/transition/transition.ts

@@ -76,6 +76,7 @@ export class Transition implements IHookRegistry {
     this.$id = transitionCount++;
     let toPath = PathFactory.buildToPath(fromPath, targetState);
     this._treeChanges = PathFactory.treeChanges(fromPath, toPath, this._options.reloadState);
+    PathFactory.bindTransitionResolve(this._treeChanges, this);
   }
 
   $from() {