From e913d9954dabaeb3500118e720da603f127252a3 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Fri, 24 Jun 2016 15:37:46 -0700
Subject: [PATCH] chore(typings): restrict Angular to es5+collections+promise

---
 .../@angular/router/src/apply_redirects.ts    | 15 +++--
 .../router/src/create_router_state.ts         | 11 ++--
 modules/es6-subset.d.ts                       | 65 +++++++++++++++++++
 modules/tsconfig.json                         |  3 +-
 modules/types.d.ts                            |  1 +
 5 files changed, 81 insertions(+), 14 deletions(-)
 create mode 100644 modules/es6-subset.d.ts

diff --git a/modules/@angular/router/src/apply_redirects.ts b/modules/@angular/router/src/apply_redirects.ts
index cb9bf62104..f1df9542a2 100644
--- a/modules/@angular/router/src/apply_redirects.ts
+++ b/modules/@angular/router/src/apply_redirects.ts
@@ -214,14 +214,15 @@ function findPosParam(
 }
 
 function findOrCreatePath(part: string, paths: UrlPathWithParams[]): UrlPathWithParams {
-  const matchingIndex = paths.findIndex(s => s.path === part);
-  if (matchingIndex > -1) {
-    const r = paths[matchingIndex];
-    paths.splice(matchingIndex);
-    return r;
-  } else {
-    return new UrlPathWithParams(part, {});
+  let idx = 0;
+  for (const s of paths) {
+    if (s.path === part) {
+      paths.splice(idx);
+      return s;
+    }
+    idx++;
   }
+  return new UrlPathWithParams(part, {});
 }
 
 
diff --git a/modules/@angular/router/src/create_router_state.ts b/modules/@angular/router/src/create_router_state.ts
index 9a5ca27b65..dad66c1c63 100644
--- a/modules/@angular/router/src/create_router_state.ts
+++ b/modules/@angular/router/src/create_router_state.ts
@@ -37,13 +37,12 @@ function createNode(curr: TreeNode<ActivatedRouteSnapshot>, prevState?: TreeNode
 function createOrReuseChildren(
     curr: TreeNode<ActivatedRouteSnapshot>, prevState: TreeNode<ActivatedRoute>) {
   return curr.children.map(child => {
-    const index =
-        prevState.children.findIndex(p => equalRouteSnapshots(p.value.snapshot, child.value));
-    if (index >= 0) {
-      return createNode(child, prevState.children[index]);
-    } else {
-      return createNode(child);
+    for (const p of prevState.children) {
+      if (equalRouteSnapshots(p.value.snapshot, child.value)) {
+        return createNode(child, p);
+      }
     }
+    return createNode(child);
   });
 }
 
diff --git a/modules/es6-subset.d.ts b/modules/es6-subset.d.ts
new file mode 100644
index 0000000000..96398c9c4c
--- /dev/null
+++ b/modules/es6-subset.d.ts
@@ -0,0 +1,65 @@
+
+/**
+ * Subset of lib.es2015.core.d.ts typings.
+ * Angular should not require use of ES6 runtime but some API usages are already present.
+ * See https://github.com/angular/angular/issues/5242
+ * TODO(alexeagle): remove methods below which may not be present in targeted browser
+ */
+
+interface String {
+  /**
+   * Returns true if the sequence of elements of searchString converted to a String is the
+   * same as the corresponding elements of this object (converted to a String) starting at
+   * position. Otherwise returns false.
+   */
+  startsWith(searchString: string, position?: number): boolean;
+
+  /**
+   * Returns true if the sequence of elements of searchString converted to a String is the
+   * same as the corresponding elements of this object (converted to a String) starting at
+   * endPosition – length(this). Otherwise returns false.
+   */
+  endsWith(searchString: string, endPosition?: number): boolean;
+}
+
+interface Array<T> {
+  /**
+   * Returns the value of the first element in the array where predicate is true, and undefined
+   * otherwise.
+   * @param predicate find calls predicate once for each element of the array, in ascending
+   * order, until it finds one where predicate returns true. If such an element is found, find
+   * immediately returns that element value. Otherwise, find returns undefined.
+   * @param thisArg If provided, it will be used as the this value for each invocation of
+   * predicate. If it is not provided, undefined is used instead.
+   */
+  find(predicate: (value: T, index: number, obj: Array<T>) => boolean, thisArg?: any): T;
+  /**
+   * Returns the this object after filling the section identified by start and end with value
+   * @param value value to fill array section with
+   * @param start index to start filling the array at. If start is negative, it is treated as
+   * length+start where length is the length of the array.
+   * @param end index to stop filling the array at. If end is negative, it is treated as
+   * length+end.
+   */
+  fill(value: T, start?: number, end?: number): T[];
+}
+
+interface NumberConstructor {
+  /**
+   * Returns true if the value passed is an integer, false otherwise.
+   * @param number A numeric value.
+   */
+  isInteger(number: number): boolean;
+}
+
+// Workaround https://github.com/Microsoft/TypeScript/issues/9193
+interface PromiseConstructor {
+  all<T>(values: (T | PromiseLike<T>)[]): Promise<T[]>;
+}
+
+interface Function {
+    /**
+      * Returns the name of the function. Function names are read-only and can not be changed.
+      */
+    readonly name: string;
+}
diff --git a/modules/tsconfig.json b/modules/tsconfig.json
index db141373bd..24b9b97e02 100644
--- a/modules/tsconfig.json
+++ b/modules/tsconfig.json
@@ -16,7 +16,8 @@
     },
     "rootDir": ".",
     "inlineSourceMap": true,
-    "lib": ["es6", "dom"],
+    "lib": ["es5", "dom", "es2015.promise", "es2015.collection", "es2015.iterable"],
+    "skipDefaultLibCheck": true,
     "target": "es5"
   },
   "exclude": [
diff --git a/modules/types.d.ts b/modules/types.d.ts
index 40ddda5627..58dd2c2eb0 100644
--- a/modules/types.d.ts
+++ b/modules/types.d.ts
@@ -14,3 +14,4 @@
 /// <reference path="../node_modules/@types/node/index.d.ts" />
 /// <reference path="../node_modules/@types/protractor/index.d.ts" />
 /// <reference path="../node_modules/@types/selenium-webdriver/index.d.ts" />
+/// <reference path="./es6-subset.d.ts" />