chore(trace): add id to viewconfig and viewconfig id to trace

fix(views): Make sure the ViewConfigs get the correct PathNode[] so they can access correct resolve data.

src/common/trace.ts

@@ -46,7 +46,7 @@ function uiViewString (viewData) {
 
 /** @hidden */
 const viewConfigString = (viewConfig: ViewConfig) =>
-    `[ViewConfig from '${viewConfig.viewDecl.$context.name || '(root)'}' state]: target ui-view: '${viewConfig.viewDecl.$uiViewName}@${viewConfig.viewDecl.$uiViewContextAnchor}'`;
+    `[ViewConfig#${viewConfig.$id} from '${viewConfig.viewDecl.$context.name || '(root)'}' state]: target ui-view: '${viewConfig.viewDecl.$uiViewName}@${viewConfig.viewDecl.$uiViewContextAnchor}'`;
 
 /** @hidden */
 function normalizedCat(input: Category): string {

src/ng1/statebuilders/views.ts

@@ -99,7 +99,9 @@ function getComponentInputs($injector, name) {
   return cmpDefs.map(getBindings).reduce(unnestR, []);
 }
 
+let id = 0;
 export class Ng1ViewConfig implements ViewConfig {
+  $id = id++;
   loaded: boolean = false;
   controller: Function;
   template: string;

src/ng2/statebuilders/views.ts

@@ -36,7 +36,9 @@ export function ng2ViewsBuilder(state: State) {
   return views;
 }
 
+let id = 0;
 export class Ng2ViewConfig implements ViewConfig {
+  $id: number = id++;
   loaded: boolean = true;
 
   constructor(public path: PathNode[], public viewDecl: Ng2ViewDeclaration) { }

src/path/pathFactory.ts

@@ -1,6 +1,6 @@
 /** @module path */ /** for typedoc */
 
-import {extend, find, pick, omit, tail, mergeR, values, unnestR, Predicate} from "../common/common";
+import {extend, find, pick, omit, tail, mergeR, values, unnestR, Predicate, inArray} from "../common/common";
 import {prop, propEq, not} from "../common/hof";
 
 import {RawParams} from "../params/interface";
@@ -11,7 +11,6 @@ import {_ViewDeclaration} from "../state/interface";
 import {State} from "../state/stateObject";
 import {TargetState} from "../state/targetState";
 import {PathNode} from "../path/node";
-import {ResolveContext} from "../resolve/resolveContext";
 import {ViewService} from "../view/view";
 
 /**
@@ -46,13 +45,13 @@ export class PathFactory {
    *
    * On each [[PathNode]], creates ViewConfig objects from the views: property of the node's state
    */
-  static applyViewConfigs($view: ViewService, path: PathNode[]) {
-    return path.map(node => {
-      let subPath = PathFactory.subPath(path, n => n === node);
+  static applyViewConfigs($view: ViewService, path: PathNode[], states: State[]) {
+    // Only apply the viewConfigs to the nodes for the given states
+    path.filter(node => inArray(states, node.state)).forEach(node => {
       let viewDecls: _ViewDeclaration[] = values(node.state.views || {});
+      let subPath = PathFactory.subPath(path, n => n === node);
       let viewConfigs: ViewConfig[][] = viewDecls.map(view => $view.createViewConfig(subPath, view));
       node.views = viewConfigs.reduce(unnestR, []);
-      return node;
     });
   }
 

src/transition/transition.ts

@@ -150,7 +150,8 @@ export class Transition implements IHookRegistry {
     this.$id = transitionCount++;
     let toPath = PathFactory.buildToPath(fromPath, targetState);
     this._treeChanges = PathFactory.treeChanges(fromPath, toPath, this._options.reloadState);
-    PathFactory.applyViewConfigs(_transitionService.$view, this._treeChanges.to);
+    let enteringStates = this._treeChanges.entering.map(node => node.state)
+    PathFactory.applyViewConfigs(_transitionService.$view, this._treeChanges.to, enteringStates);
 
     let rootResolvables: Resolvable[] = [
       new Resolvable(Transition, () => this, [], this),

src/view/interface.ts

@@ -42,6 +42,8 @@ export interface ActiveUIView {
  * the `uiViewName` address.
  */
 export interface ViewConfig {
+  /* The unique id for the ViewConfig instance */
+  $id: number;
   /** The normalized view declaration from [[State.views]] */
   viewDecl: _ViewDeclaration;