Remove redundant 'reduce' overloads

Andy Hanson · Andy Hanson · commit ebc4a6db2169 · 2018-07-05T08:58:56.000-07:00
diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts
@@ -517,7 +517,7 @@ interface TemplateStringsArray extends ReadonlyArray<string> {
 
 /**
  * The type of `import.meta`.
- * 
+ *
  * If you need to declare that a given property exists on `import.meta`,
  * this type may be augmented via interface merging.
  */
@@ -1081,7 +1081,6 @@ interface ReadonlyArray<T> {
       * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => T): T;
-    reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => T, initialValue: T): T;
     /**
       * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
       * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
@@ -1094,7 +1093,6 @@ interface ReadonlyArray<T> {
       * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => T): T;
-    reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: ReadonlyArray<T>) => T, initialValue: T): T;
     /**
       * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
       * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array.
@@ -1240,7 +1238,6 @@ interface Array<T> {
       * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T): T;
-    reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue: T): T;
     /**
       * Calls the specified callback function for all the elements in an array. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
       * @param callbackfn A function that accepts up to four arguments. The reduce method calls the callbackfn function one time for each element in the array.
@@ -1253,7 +1250,6 @@ interface Array<T> {
       * @param initialValue If initialValue is specified, it is used as the initial value to start the accumulation. The first call to the callbackfn function provides this value as an argument instead of an array value.
       */
     reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T): T;
-    reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue: T): T;
     /**
       * Calls the specified callback function for all the elements in an array, in descending order. The return value of the callback function is the accumulated result, and is provided as an argument in the next call to the callback function.
       * @param callbackfn A function that accepts up to four arguments. The reduceRight method calls the callbackfn function one time for each element in the array.
@@ -1721,7 +1717,6 @@ interface Int8Array {
       * instead of an array value.
       */
     reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int8Array) => number): number;
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int8Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array. The return value of
@@ -1746,7 +1741,6 @@ interface Int8Array {
       * argument instead of an array value.
       */
     reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int8Array) => number): number;
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int8Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array, in descending order.
@@ -1990,7 +1984,6 @@ interface Uint8Array {
       * instead of an array value.
       */
     reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8Array) => number): number;
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array. The return value of
@@ -2015,7 +2008,6 @@ interface Uint8Array {
       * argument instead of an array value.
       */
     reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8Array) => number): number;
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array, in descending order.
@@ -2259,7 +2251,6 @@ interface Uint8ClampedArray {
       * instead of an array value.
       */
     reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => number): number;
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array. The return value of
@@ -2284,7 +2275,6 @@ interface Uint8ClampedArray {
       * argument instead of an array value.
       */
     reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => number): number;
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint8ClampedArray) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array, in descending order.
@@ -2526,7 +2516,6 @@ interface Int16Array {
       * instead of an array value.
       */
     reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int16Array) => number): number;
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int16Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array. The return value of
@@ -2551,7 +2540,6 @@ interface Int16Array {
       * argument instead of an array value.
       */
     reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int16Array) => number): number;
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int16Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array, in descending order.
@@ -2796,7 +2784,6 @@ interface Uint16Array {
       * instead of an array value.
       */
     reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint16Array) => number): number;
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint16Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array. The return value of
@@ -2821,7 +2808,6 @@ interface Uint16Array {
       * argument instead of an array value.
       */
     reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint16Array) => number): number;
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint16Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array, in descending order.
@@ -3065,7 +3051,6 @@ interface Int32Array {
       * instead of an array value.
       */
     reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int32Array) => number): number;
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int32Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array. The return value of
@@ -3090,7 +3075,6 @@ interface Int32Array {
       * argument instead of an array value.
       */
     reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int32Array) => number): number;
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Int32Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array, in descending order.
@@ -3333,7 +3317,6 @@ interface Uint32Array {
       * instead of an array value.
       */
     reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint32Array) => number): number;
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint32Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array. The return value of
@@ -3358,7 +3341,6 @@ interface Uint32Array {
       * argument instead of an array value.
       */
     reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint32Array) => number): number;
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Uint32Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array, in descending order.
@@ -3602,7 +3584,6 @@ interface Float32Array {
       * instead of an array value.
       */
     reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float32Array) => number): number;
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float32Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array. The return value of
@@ -3627,7 +3608,6 @@ interface Float32Array {
       * argument instead of an array value.
       */
     reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float32Array) => number): number;
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float32Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array, in descending order.
@@ -3872,7 +3852,6 @@ interface Float64Array {
       * instead of an array value.
       */
     reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float64Array) => number): number;
-    reduce(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float64Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array. The return value of
@@ -3897,7 +3876,6 @@ interface Float64Array {
       * argument instead of an array value.
       */
     reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float64Array) => number): number;
-    reduceRight(callbackfn: (previousValue: number, currentValue: number, currentIndex: number, array: Float64Array) => number, initialValue: number): number;
 
     /**
       * Calls the specified callback function for all the elements in an array, in descending order.
diff --git a/tests/baselines/reference/arrayReduce.js b/tests/baselines/reference/arrayReduce.js
@@ -0,0 +1,16 @@
+//// [arrayReduce.ts]
+function toStrings(arr: ReadonlyArray<object>): string[] {
+	return arr.reduce((acc, obj) => {
+		acc.push(obj.toString());
+		return acc;
+	}, [] as string[]);
+}
+
+
+//// [arrayReduce.js]
+function toStrings(arr) {
+    return arr.reduce(function (acc, obj) {
+        acc.push(obj.toString());
+        return acc;
+    }, []);
+}
diff --git a/tests/baselines/reference/arrayReduce.symbols b/tests/baselines/reference/arrayReduce.symbols
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/arrayReduce.ts ===
+function toStrings(arr: ReadonlyArray<object>): string[] {
+>toStrings : Symbol(toStrings, Decl(arrayReduce.ts, 0, 0))
+>arr : Symbol(arr, Decl(arrayReduce.ts, 0, 19))
+>ReadonlyArray : Symbol(ReadonlyArray, Decl(lib.es5.d.ts, --, --))
+
+	return arr.reduce((acc, obj) => {
+>arr.reduce : Symbol(ReadonlyArray.reduce, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>arr : Symbol(arr, Decl(arrayReduce.ts, 0, 19))
+>reduce : Symbol(ReadonlyArray.reduce, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>acc : Symbol(acc, Decl(arrayReduce.ts, 1, 20))
+>obj : Symbol(obj, Decl(arrayReduce.ts, 1, 24))
+
+		acc.push(obj.toString());
+>acc.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
+>acc : Symbol(acc, Decl(arrayReduce.ts, 1, 20))
+>push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --))
+>obj.toString : Symbol(Object.toString, Decl(lib.es5.d.ts, --, --))
+>obj : Symbol(obj, Decl(arrayReduce.ts, 1, 24))
+>toString : Symbol(Object.toString, Decl(lib.es5.d.ts, --, --))
+
+		return acc;
+>acc : Symbol(acc, Decl(arrayReduce.ts, 1, 20))
+
+	}, [] as string[]);
+}
+
diff --git a/tests/baselines/reference/arrayReduce.types b/tests/baselines/reference/arrayReduce.types
@@ -0,0 +1,33 @@
+=== tests/cases/compiler/arrayReduce.ts ===
+function toStrings(arr: ReadonlyArray<object>): string[] {
+>toStrings : (arr: ReadonlyArray<object>) => string[]
+>arr : ReadonlyArray<object>
+>ReadonlyArray : ReadonlyArray<T>
+
+	return arr.reduce((acc, obj) => {
+>arr.reduce((acc, obj) => {		acc.push(obj.toString());		return acc;	}, [] as string[]) : string[]
+>arr.reduce : { (callbackfn: (previousValue: object, currentValue: object, currentIndex: number, array: ReadonlyArray<object>) => object): object; <U>(callbackfn: (previousValue: U, currentValue: object, currentIndex: number, array: ReadonlyArray<object>) => U, initialValue: U): U; }
+>arr : ReadonlyArray<object>
+>reduce : { (callbackfn: (previousValue: object, currentValue: object, currentIndex: number, array: ReadonlyArray<object>) => object): object; <U>(callbackfn: (previousValue: U, currentValue: object, currentIndex: number, array: ReadonlyArray<object>) => U, initialValue: U): U; }
+>(acc, obj) => {		acc.push(obj.toString());		return acc;	} : (acc: string[], obj: object) => string[]
+>acc : string[]
+>obj : object
+
+		acc.push(obj.toString());
+>acc.push(obj.toString()) : number
+>acc.push : (...items: string[]) => number
+>acc : string[]
+>push : (...items: string[]) => number
+>obj.toString() : string
+>obj.toString : () => string
+>obj : object
+>toString : () => string
+
+		return acc;
+>acc : string[]
+
+	}, [] as string[]);
+>[] as string[] : string[]
+>[] : undefined[]
+}
+
diff --git a/tests/baselines/reference/genericReduce.symbols b/tests/baselines/reference/genericReduce.symbols
@@ -14,19 +14,19 @@ var b = a.map(s => s.length);
 
 var n1 = b.reduce((x, y) => x + y);
 >n1 : Symbol(n1, Decl(genericReduce.ts, 2, 3))
->b.reduce : Symbol(Array.reduce, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>b.reduce : Symbol(Array.reduce, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >b : Symbol(b, Decl(genericReduce.ts, 1, 3))
->reduce : Symbol(Array.reduce, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>reduce : Symbol(Array.reduce, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(genericReduce.ts, 2, 19))
 >y : Symbol(y, Decl(genericReduce.ts, 2, 21))
 >x : Symbol(x, Decl(genericReduce.ts, 2, 19))
 >y : Symbol(y, Decl(genericReduce.ts, 2, 21))
 
 var n2 = b.reduceRight((x, y) => x + y);
 >n2 : Symbol(n2, Decl(genericReduce.ts, 3, 3))
->b.reduceRight : Symbol(Array.reduceRight, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>b.reduceRight : Symbol(Array.reduceRight, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >b : Symbol(b, Decl(genericReduce.ts, 1, 3))
->reduceRight : Symbol(Array.reduceRight, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>reduceRight : Symbol(Array.reduceRight, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(genericReduce.ts, 3, 24))
 >y : Symbol(y, Decl(genericReduce.ts, 3, 26))
 >x : Symbol(x, Decl(genericReduce.ts, 3, 24))
@@ -50,9 +50,9 @@ n2.toExponential(2); // should not error if 'n2' is correctly number.
 
 var n3 = b.reduce<string>( (x, y) => x + y, ""); // Initial value is of type string
 >n3 : Symbol(n3, Decl(genericReduce.ts, 10, 3))
->b.reduce : Symbol(Array.reduce, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>b.reduce : Symbol(Array.reduce, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >b : Symbol(b, Decl(genericReduce.ts, 1, 3))
->reduce : Symbol(Array.reduce, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>reduce : Symbol(Array.reduce, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >x : Symbol(x, Decl(genericReduce.ts, 10, 28))
 >y : Symbol(y, Decl(genericReduce.ts, 10, 30))
 >x : Symbol(x, Decl(genericReduce.ts, 10, 28))
diff --git a/tests/baselines/reference/genericReduce.types b/tests/baselines/reference/genericReduce.types
diff --git a/tests/cases/compiler/arrayReduce.ts b/tests/cases/compiler/arrayReduce.ts
