refactor: move all utility functions into the utils dir

modules/@angular/router/src/utils/collection.ts

@@ -0,0 +1,55 @@
+export function shallowEqual(a: {[x:string]:any}, b: {[x:string]:any}): boolean {
+  var k1 = Object.keys(a);
+  var k2 = Object.keys(b);
+  if (k1.length != k2.length) {
+    return false;
+  }
+  var key;
+  for (var i = 0; i < k1.length; i++) {
+    key = k1[i];
+    if (a[key] !== b[key]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+export function flatten<T>(a: T[][]): T[] {
+  const target = [];
+  for (let i = 0; i < a.length; ++i) {
+    for (let j = 0; j < a[i].length; ++j) {
+      target.push(a[i][j]);
+    }
+  }
+  return target;
+}
+
+export function first<T>(a: T[]): T | null {
+  return a.length > 0 ? a[0] : null;
+}
+
+export function merge<V>(m1: {[key: string]: V}, m2: {[key: string]: V}): {[key: string]: V} {
+  var m: {[key: string]: V} = {};
+
+  for (var attr in m1) {
+    if (m1.hasOwnProperty(attr)) {
+      m[attr] = m1[attr];
+    }
+  }
+
+  for (var attr in m2) {
+    if (m2.hasOwnProperty(attr)) {
+      m[attr] = m2[attr];
+    }
+  }
+
+  return m;
+}
+
+export function forEach<K, V>(map: {[key: string]: V}, callback: /*(V, K) => void*/ Function): void {
+  for (var prop in map) {
+    if (map.hasOwnProperty(prop)) {
+      callback(map[prop], prop);
+    }
+  }
+}

modules/@angular/router/src/utils/tree.ts

@@ -0,0 +1,77 @@
+export class Tree<T> {
+  /** @internal */
+  _root: TreeNode<T>;
+
+  constructor(root: TreeNode<T>) { this._root = root; }
+
+  get root(): T { return this._root.value; }
+
+  parent(t: T): T | null {
+    const p = this.pathFromRoot(t);
+    return p.length > 1 ? p[p.length - 2] : null;
+  }
+
+  children(t: T): T[] {
+    const n = findNode(t, this._root);
+    return n ? n.children.map(t => t.value) : [];
+  }
+
+  firstChild(t: T): T | null {
+    const n = findNode(t, this._root);
+    return n && n.children.length > 0 ? n.children[0].value : null;
+  }
+
+  siblings(t: T): T[] {
+    const p = findPath(t, this._root, []);
+    if (p.length < 2) return [];
+
+    const c = p[p.length - 2].children.map(c => c.value);
+    return c.filter(cc => cc !== t);
+  }
+
+  pathFromRoot(t: T): T[] { return findPath(t, this._root, []).map(s => s.value); }
+
+  contains(tree: Tree<T>): boolean { return contains(this._root, tree._root); }
+}
+
+export function rootNode<T>(tree: Tree<T>): TreeNode<T> {
+  return tree._root;
+}
+
+function findNode<T>(expected: T, c: TreeNode<T>): TreeNode<T> | null {
+  if (expected === c.value) return c;
+  for (let cc of c.children) {
+    const r = findNode(expected, cc);
+    if (r) return r;
+  }
+  return null;
+}
+
+function findPath<T>(expected: T, c: TreeNode<T>, collected: TreeNode<T>[]): TreeNode<T>[] {
+  collected.push(c);
+  if (expected === c.value) return collected;
+
+  for (let cc of c.children) {
+    const cloned = collected.slice(0);
+    const r = findPath(expected, cc, cloned);
+    if (r) return r;
+  }
+
+  return [];
+}
+
+function contains<T>(tree: TreeNode<T>, subtree: TreeNode<T>): boolean {
+  if (tree.value !== subtree.value) return false;
+
+  for (let subtreeNode of subtree.children) {
+    const s = tree.children.filter(child => child.value === subtreeNode.value);
+    if (s.length === 0) return false;
+    if (!contains(s[0], subtreeNode)) return false;
+  }
+
+  return true;
+}
+
+export class TreeNode<T> {
+  constructor(public value: T, public children: TreeNode<T>[]) {}
+}