refactor(Resolvable): nuke 'state' property

Author: christopherthielen

src/path/node.ts

@@ -26,7 +26,7 @@ export default class Node {
     const getParamVal = (paramDef: Param) => [ paramDef.id, paramDef.value(params[paramDef.id]) ];
     this.values = this.schema.reduce((memo, pDef) => applyPairs(memo, getParamVal(pDef)), {});
 
-    this.resolves = extend(map(state.resolve, (fn: Function, name: string) => new Resolvable(name, fn, state)), resolves);
+    this.resolves = extend(map(state.resolve, (fn: Function, name: string) => new Resolvable(name, fn)), resolves);
 
     const makeViewConfig = (viewDeclarationObj, rawViewName) =>
         new ViewConfig({ rawViewName, viewDeclarationObj, context: state, params});

src/path/pathFactory.ts

@@ -93,7 +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.resolves.$stateParams = new Resolvable("$stateParams", () => node.values, node.state, node.values);
+      node.resolves.$stateParams = new Resolvable("$stateParams", () => node.values, node.values);
     });
 
     return resolvePath;
@@ -141,6 +141,6 @@ export default class PathFactory {
 
   static bindTransitionResolve(treeChanges: ITreeChanges, transition: Transition) {
     let rootNode = treeChanges.to[0];
-    rootNode.resolves.$transition$ = new Resolvable('$transition$', () => transition, rootNode.state, transition);
+    rootNode.resolves.$transition$ = new Resolvable('$transition$', () => transition, transition);
   }
 }

src/resolve/resolvable.ts

@@ -22,17 +22,15 @@ import ResolveContext from "./resolveContext"
  * parameter to those fns.
  */
 export default class Resolvable {
-  constructor(name: string, resolveFn: Function, state: State, preResolvedData?: any) {
+  constructor(name: string, resolveFn: Function, preResolvedData?: any) {
     this.name = name;
     this.resolveFn = resolveFn;
-    this.state = state;
     this.deps = runtime.$injector.annotate(resolveFn);
     this.data = preResolvedData;
   }
 
   name: string;
   resolveFn: Function;
-  state: State;
   deps: string[];
 
   promise: IPromise<any> = undefined;
@@ -50,7 +48,7 @@ export default class Resolvable {
   // - store unwrapped data
   // - resolve the Resolvable's promise
   resolveResolvable(resolveContext: ResolveContext, options: IOptions1 = {}) {
-    let {state, name, deps, resolveFn} = this;
+    let {name, deps, resolveFn} = this;
 
     trace.traceResolveResolvable(this, options);
     // First, set up an overall deferred/promise for this Resolvable
@@ -72,7 +70,7 @@ export default class Resolvable {
     // dependencies as locals, then unwraps the resulting promise's data.
     return runtime.$q.all(depPromises).then(locals => {
       try {
-        var result = runtime.$injector.invoke(resolveFn, state, locals);
+        var result = runtime.$injector.invoke(resolveFn, null, locals);
         deferred.resolve(result);
       } catch (error) {
         deferred.reject(error);

src/transition/transitionHook.ts

@@ -74,7 +74,7 @@ export default class TransitionHook {
     if (keys.length)
       throw new Error(`Invalid resolve key/value: ${keys[0]}/${invalid[keys[0]]}`);
 
-    const makeResolvable = (fn, name) => new Resolvable(name, fn, this.state);
+    const makeResolvable = (fn, name) => new Resolvable(name, fn);
     return map(resolves, makeResolvable);
   }