fix(transition): when redirecting, do not migrate $stateParams or $transition$ resolve values

Author: christopherthielen

src/common/common.ts

@@ -253,8 +253,8 @@ export function pluck(collection, propName): any {
  * - array: only the elements which passed the callback predicate
  * - object: only the properties that passed the callback predicate
  */
-export function filter<T>(collection: T[], callback: Predicate<T>): T[];
-export function filter<T>(collection: TypedMap<T>, callback: Predicate<T>): TypedMap<T>;
+export function filter<T>(collection: T[], callback: (T, key?) => boolean): T[];
+export function filter<T>(collection: TypedMap<T>, callback: (T, key?) => boolean): TypedMap<T>;
 export function filter<T>(collection: T, callback: Function): T {
   let arr = isArray(collection), result: any = arr ? [] : {};
   let accept = arr ? x => result.push(x) : (x, key) => result[key] = x;

src/path/node.ts

@@ -47,8 +47,8 @@ export default class Node {
   }
 
   /**
-   * Returns a new path which is a subpath of this path. The new path starts from root and contains any nodes
-   * that match the nodes in the second path. Nodes are compared using their state properties.
+   * Returns a new path which is a subpath of the first path. The new path starts from root and contains any nodes
+   * that match the nodes in the second path. Nodes are compared using their state property.
    * @param first {Node[]}
    * @param second {Node[]}
    * @returns {Node[]}

src/transition/transition.ts

@@ -22,7 +22,7 @@ import Param from "../params/param";
 import {ViewConfig} from "../view/view";
 
 import {
-  map, find, extend, mergeR, flatten, unnest, tail, forEach, identity,
+  map, find, extend, filter, mergeR, flatten, unnest, tail, forEach, identity,
   omit, isObject, not, prop, propEq, toJson, val, abstractKey, arrayTuples, allTrueR
 } from "../common/common";
 
@@ -251,8 +251,9 @@ export class Transition implements IHookRegistry {
     // add those resolvables to the redirected transition.  Allows you to define a resolve at a parent level, wait for
     // the resolve, then redirect to a child state based on the result, and not have to re-fetch the resolve.
     let redirectedPath = this.treeChanges().to;
-    let matching = Node.matching(redirectTo.treeChanges().to, redirectedPath);
-    matching.forEach((node, idx) => node.resolves = redirectedPath[idx].resolves);
+    let matching: Node[] = Node.matching(redirectTo.treeChanges().to, redirectedPath);
+    const includeResolve = (resolve, key) => ['$stateParams', '$transition$'].indexOf(key) === -1;
+    matching.forEach((node, idx) => extend(node.resolves, filter(redirectedPath[idx].resolves, includeResolve)));
 
     return redirectTo;
   }