Fix 8407: Allow (weak)map & (weak)set constructor when targeting ES5 using ES6 library (microsoft#8451)

* Move iterabl related stuffs off from es2015.collection

* Move symbol.wellknown stuffs off from es2015.collection

* Add map & set constructor support when targeting ES5

* Address PR: move symbol.iterator to es2015.iterable

* Move Symbol.Iterator into es2015.iterable

* Update baselines

Author: yuit

src/lib/es2015.collection.d.ts

@@ -10,7 +10,7 @@ interface Map<K, V> {
 
 interface MapConstructor {
     new (): Map<any, any>;
-    new <K, V>(): Map<K, V>;
+    new <K, V>(entries?: [K, V][]): Map<K, V>;
     readonly prototype: Map<any, any>;
 }
 declare var Map: MapConstructor;
@@ -26,7 +26,7 @@ interface WeakMap<K, V> {
 
 interface WeakMapConstructor {
     new (): WeakMap<any, any>;
-    new <K, V>(): WeakMap<K, V>;
+    new <K, V>(entries?: [K, V][]): WeakMap<K, V>;
     readonly prototype: WeakMap<any, any>;
 }
 declare var WeakMap: WeakMapConstructor;
@@ -35,20 +35,14 @@ interface Set<T> {
     add(value: T): Set<T>;
     clear(): void;
     delete(value: T): boolean;
-    entries(): IterableIterator<[T, T]>;
     forEach(callbackfn: (value: T, index: T, set: Set<T>) => void, thisArg?: any): void;
     has(value: T): boolean;
-    keys(): IterableIterator<T>;
     readonly size: number;
-    values(): IterableIterator<T>;
-    [Symbol.iterator]():IterableIterator<T>;
-    readonly [Symbol.toStringTag]: "Set";
 }
 
 interface SetConstructor {
     new (): Set<any>;
-    new <T>(): Set<T>;
-    new <T>(iterable: Iterable<T>): Set<T>;
+    new <T>(values?: T[]): Set<T>;
     readonly prototype: Set<any>;
 }
 declare var Set: SetConstructor;
@@ -58,13 +52,12 @@ interface WeakSet<T> {
     clear(): void;
     delete(value: T): boolean;
     has(value: T): boolean;
-    readonly [Symbol.toStringTag]: "WeakSet";
+
 }
 
 interface WeakSetConstructor {
     new (): WeakSet<any>;
-    new <T>(): WeakSet<T>;
-    new <T>(iterable: Iterable<T>): WeakSet<T>;
+    new <T>(values?: T[]): WeakSet<T>;
     readonly prototype: WeakSet<any>;
 }
 declare var WeakSet: WeakSetConstructor;

src/lib/es2015.iterable.d.ts

@@ -1,5 +1,13 @@
 /// <reference path="lib.es2015.symbol.d.ts" />
 
+interface SymbolConstructor {
+    /** 
+      * A method that returns the default iterator for an object. Called by the semantics of the 
+      * for-of statement.
+      */
+    readonly iterator: symbol;
+}
+
 interface IteratorResult<T> {
     done: boolean;
     value: T;
@@ -11,11 +19,18 @@ interface Iterator<T> {
     throw?(e?: any): IteratorResult<T>;
 }
 
-interface Iterable<T> { }
+interface Iterable<T> {
+    [Symbol.iterator](): Iterator<T>;
+}
 
-interface IterableIterator<T> extends Iterator<T> { }
+interface IterableIterator<T> extends Iterator<T> {
+    [Symbol.iterator](): IterableIterator<T>;
+}
 
 interface Array<T> {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<T>;
+
     /** 
       * Returns an array of key, value pairs for every entry in the array
       */
@@ -48,7 +63,13 @@ interface ArrayConstructor {
     from<T>(iterable: Iterable<T>): Array<T>;
 }
 
+interface IArguments {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<any>;
+}
+
 interface Map<K, V> {
+    [Symbol.iterator](): IterableIterator<[K,V]>;
     entries(): IterableIterator<[K, V]>;
     keys(): IterableIterator<K>;
     values(): IterableIterator<V>;
@@ -64,6 +85,23 @@ interface WeakMapConstructor {
     new <K, V>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
 }
 
+interface Set<T> {
+    [Symbol.iterator](): IterableIterator<T>;
+    entries(): IterableIterator<[T, T]>;
+    keys(): IterableIterator<T>;
+    values(): IterableIterator<T>;
+}
+
+interface SetConstructor {
+    new <T>(iterable: Iterable<T>): Set<T>;
+}
+
+interface WeakSet<T> { }
+
+interface WeakSetConstructor {
+    new <T>(iterable: Iterable<T>): WeakSet<T>;
+}
+
 interface Promise<T> { }
 
 interface PromiseConstructor {
@@ -88,11 +126,17 @@ declare namespace Reflect {
     function enumerate(target: any): IterableIterator<any>;
 }
 
+interface String {
+    /** Iterator */
+    [Symbol.iterator](): IterableIterator<string>;
+}
+
 /**
   * A typed array of 8-bit integer values. The contents are initialized to 0. If the requested 
   * number of bytes could not be allocated an exception is raised.
   */
 interface Int8Array {
+    [Symbol.iterator](): IterableIterator<number>;
     /** 
       * Returns an array of key, value pairs for every entry in the array
       */
@@ -124,6 +168,7 @@ interface Int8ArrayConstructor {
   * requested number of bytes could not be allocated an exception is raised.
   */
 interface Uint8Array {
+    [Symbol.iterator](): IterableIterator<number>;
     /** 
       * Returns an array of key, value pairs for every entry in the array
       */
@@ -155,6 +200,7 @@ interface Uint8ArrayConstructor {
   * If the requested number of bytes could not be allocated an exception is raised.
   */
 interface Uint8ClampedArray {
+    [Symbol.iterator](): IterableIterator<number>;
     /** 
       * Returns an array of key, value pairs for every entry in the array
       */
@@ -189,6 +235,7 @@ interface Uint8ClampedArrayConstructor {
   * requested number of bytes could not be allocated an exception is raised.
   */
 interface Int16Array {
+    [Symbol.iterator](): IterableIterator<number>;
     /** 
       * Returns an array of key, value pairs for every entry in the array
       */
@@ -222,6 +269,7 @@ interface Int16ArrayConstructor {
   * requested number of bytes could not be allocated an exception is raised.
   */
 interface Uint16Array {
+    [Symbol.iterator](): IterableIterator<number>;
     /** 
       * Returns an array of key, value pairs for every entry in the array
       */
@@ -253,6 +301,7 @@ interface Uint16ArrayConstructor {
   * requested number of bytes could not be allocated an exception is raised.
   */
 interface Int32Array {
+    [Symbol.iterator](): IterableIterator<number>;
     /** 
       * Returns an array of key, value pairs for every entry in the array
       */
@@ -284,6 +333,7 @@ interface Int32ArrayConstructor {
   * requested number of bytes could not be allocated an exception is raised.
   */
 interface Uint32Array {
+    [Symbol.iterator](): IterableIterator<number>;
     /** 
       * Returns an array of key, value pairs for every entry in the array
       */
@@ -315,6 +365,7 @@ interface Uint32ArrayConstructor {
   * of bytes could not be allocated an exception is raised.
   */
 interface Float32Array {
+    [Symbol.iterator](): IterableIterator<number>;
     /** 
       * Returns an array of key, value pairs for every entry in the array
       */
@@ -346,6 +397,7 @@ interface Float32ArrayConstructor {
   * number of bytes could not be allocated an exception is raised.
   */
 interface Float64Array {
+    [Symbol.iterator](): IterableIterator<number>;
     /** 
       * Returns an array of key, value pairs for every entry in the array
       */

src/lib/es2015.symbol.wellknown.d.ts

@@ -13,12 +13,6 @@ interface SymbolConstructor {
       */
     readonly isConcatSpreadable: symbol;
 
-    /** 
-      * A method that returns the default iterator for an object. Called by the semantics of the 
-      * for-of statement.
-      */
-    readonly iterator: symbol;
-
     /**
       * A regular expression method that matches the regular expression against a string. Called 
       * by the String.prototype.match method. 
@@ -73,9 +67,6 @@ interface Symbol {
 }
 
 interface Array<T> {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<T>;
-
     /**
      * Returns an object whose properties have the value 'true'
      * when they will be absent when used in a 'with' statement.
@@ -116,14 +107,21 @@ interface Date {
 }
 
 interface Map<K, V> {
-    [Symbol.iterator]():IterableIterator<[K,V]>;
     readonly [Symbol.toStringTag]: "Map";
 }
 
 interface WeakMap<K, V>{
     readonly [Symbol.toStringTag]: "WeakMap";
 }
 
+interface Set<T> {
+    readonly [Symbol.toStringTag]: "Set";
+}
+
+interface WeakSet<T> {
+    readonly [Symbol.toStringTag]: "WeakSet";
+}
+
 interface JSON {
     readonly [Symbol.toStringTag]: "JSON";
 }
@@ -143,21 +141,6 @@ interface GeneratorFunction extends Function {
     readonly [Symbol.toStringTag]: "GeneratorFunction";
 }
 
-interface IArguments {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<any>;
-}
-
-interface Iterator<T> { }
-
-interface Iterable<T> {
-    [Symbol.iterator](): Iterator<T>;
-}
-
-interface IterableIterator<T> extends Iterator<T> {
-    [Symbol.iterator](): IterableIterator<T>;
-}
-
 interface Math {
     readonly [Symbol.toStringTag]: "Math";
 }
@@ -223,9 +206,6 @@ interface RegExpConstructor {
 }
 
 interface String {
-    /** Iterator */
-    [Symbol.iterator](): IterableIterator<string>;
-   
     /**
       * Matches a string an object that supports being matched against, and returns an array containing the results of that search.
       * @param matcher An object that supports being matched against.
@@ -279,7 +259,6 @@ interface DataView {
   * number of bytes could not be allocated an exception is raised.
   */
 interface Int8Array {
-    [Symbol.iterator](): IterableIterator<number>;
     readonly [Symbol.toStringTag]: "Int8Array";
 }
 
@@ -288,7 +267,6 @@ interface Int8Array {
   * requested number of bytes could not be allocated an exception is raised.
   */
 interface Uint8Array {
-    [Symbol.iterator](): IterableIterator<number>;
     readonly [Symbol.toStringTag]: "UInt8Array";
 }
 
@@ -297,7 +275,6 @@ interface Uint8Array {
   * If the requested number of bytes could not be allocated an exception is raised.
   */
 interface Uint8ClampedArray {
-    [Symbol.iterator](): IterableIterator<number>;
     readonly [Symbol.toStringTag]: "Uint8ClampedArray";
 }
 
@@ -306,7 +283,6 @@ interface Uint8ClampedArray {
   * requested number of bytes could not be allocated an exception is raised.
   */
 interface Int16Array {
-    [Symbol.iterator](): IterableIterator<number>;
     readonly [Symbol.toStringTag]: "Int16Array";
 }
 
@@ -315,7 +291,6 @@ interface Int16Array {
   * requested number of bytes could not be allocated an exception is raised.
   */
 interface Uint16Array {
-    [Symbol.iterator](): IterableIterator<number>;
     readonly [Symbol.toStringTag]: "Uint16Array";
 }
 
@@ -324,7 +299,6 @@ interface Uint16Array {
   * requested number of bytes could not be allocated an exception is raised.
   */
 interface Int32Array {
-    [Symbol.iterator](): IterableIterator<number>;
     readonly [Symbol.toStringTag]: "Int32Array";
 }
 
@@ -333,7 +307,6 @@ interface Int32Array {
   * requested number of bytes could not be allocated an exception is raised.
   */
 interface Uint32Array {
-    [Symbol.iterator](): IterableIterator<number>;
     readonly [Symbol.toStringTag]: "Uint32Array";
 }
 
@@ -342,7 +315,6 @@ interface Uint32Array {
   * of bytes could not be allocated an exception is raised.
   */
 interface Float32Array {
-    [Symbol.iterator](): IterableIterator<number>;
     readonly [Symbol.toStringTag]: "Float32Array";
 }
 
@@ -351,6 +323,5 @@ interface Float32Array {
   * number of bytes could not be allocated an exception is raised.
   */
 interface Float64Array {
-    [Symbol.iterator](): IterableIterator<number>;
     readonly [Symbol.toStringTag]: "Float64Array";
 }

tests/baselines/reference/argumentsObjectIterator02_ES6.symbols

@@ -9,9 +9,9 @@ function doubleAndReturnAsArray(x: number, y: number, z: number): [number, numbe
     let blah = arguments[Symbol.iterator];
 >blah : Symbol(blah, Decl(argumentsObjectIterator02_ES6.ts, 2, 7))
 >arguments : Symbol(arguments)
->Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>Symbol.iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --))
 >Symbol : Symbol(Symbol, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --))
->iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>iterator : Symbol(SymbolConstructor.iterator, Decl(lib.es2015.iterable.d.ts, --, --))
 
     let result = [];
 >result : Symbol(result, Decl(argumentsObjectIterator02_ES6.ts, 4, 7))

tests/baselines/reference/arrayLiterals2ES6.symbols

@@ -79,7 +79,7 @@ interface myArray2 extends Array<Number|String> { }
 >myArray2 : Symbol(myArray2, Decl(arrayLiterals2ES6.ts, 42, 43))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
->String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
+>String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 
 var d0 = [1, true, ...temp, ];  // has type (string|number|boolean)[]
 >d0 : Symbol(d0, Decl(arrayLiterals2ES6.ts, 44, 3))