Un‑consolidate and fix WeakMap constructor overloads

src/lib/es2015.collection.d.ts

@@ -30,7 +30,7 @@ interface WeakMap<K extends object, V> {
 }
 
 interface WeakMapConstructor {
-    new <K extends object = object, V = any>(entries?: readonly [K, V][] | null): WeakMap<K, V>;
+    new <K extends object, V>(entries?: readonly [K, V][] | null): WeakMap<K, V>;
     readonly prototype: WeakMap<object, any>;
 }
 declare var WeakMap: WeakMapConstructor;

src/lib/es2015.iterable.d.ts

@@ -143,7 +143,7 @@ interface MapConstructor {
 interface WeakMap<K extends object, V> { }
 
 interface WeakMapConstructor {
-    new <K extends object, V>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
+    new <K extends object, V>(iterable: Iterable<readonly [K, V]>): WeakMap<K, V>;
 }
 
 interface Set<T> {

tests/baselines/reference/extendingSetWithCheckJs.symbols

@@ -1,6 +1,6 @@
-=== tests/cases/compiler/extendingSetWithCheckJs.ts ===
+=== tests/cases/compiler/extendingCollectionsWithCheckJs.js ===
 class MySet extends Set {
->MySet : Symbol(MySet, Decl(extendingSetWithCheckJs.ts, 0, 0))
+>MySet : Symbol(MySet, Decl(extendingCollectionsWithCheckJs.js, 0, 0))
 >Set : Symbol(Set, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     constructor() {
@@ -10,7 +10,7 @@ class MySet extends Set {
 }
 
 class MyWeakSet extends WeakSet {
->MyWeakSet : Symbol(MyWeakSet, Decl(extendingSetWithCheckJs.ts, 4, 1))
+>MyWeakSet : Symbol(MyWeakSet, Decl(extendingCollectionsWithCheckJs.js, 4, 1))
 >WeakSet : Symbol(WeakSet, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     constructor() {
@@ -20,7 +20,7 @@ class MyWeakSet extends WeakSet {
 }
 
 class MyMap extends Map {
->MyMap : Symbol(MyMap, Decl(extendingSetWithCheckJs.ts, 10, 1))
+>MyMap : Symbol(MyMap, Decl(extendingCollectionsWithCheckJs.js, 10, 1))
 >Map : Symbol(Map, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     constructor() {
@@ -30,11 +30,12 @@ class MyMap extends Map {
 }
 
 class MyWeakMap extends WeakMap {
->MyWeakMap : Symbol(MyWeakMap, Decl(extendingSetWithCheckJs.ts, 16, 1))
+>MyWeakMap : Symbol(MyWeakMap, Decl(extendingCollectionsWithCheckJs.js, 16, 1))
 >WeakMap : Symbol(WeakMap, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
     constructor() {
         super();
 >super : Symbol(WeakMapConstructor, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
     }
 }
+

tests/baselines/reference/extendingSetWithCheckJs.types

@@ -1,4 +1,4 @@
-=== tests/cases/compiler/extendingSetWithCheckJs.ts ===
+=== tests/cases/compiler/extendingCollectionsWithCheckJs.js ===
 class MySet extends Set {
 >MySet : MySet
 >Set : Set<any>
@@ -34,11 +34,12 @@ class MyMap extends Map {
 
 class MyWeakMap extends WeakMap {
 >MyWeakMap : MyWeakMap
->WeakMap : WeakMap<object, any>
+>WeakMap : WeakMap<any, any>
 
     constructor() {
         super();
 >super() : void
 >super : WeakMapConstructor
     }
 }
+

tests/baselines/reference/newMap.errors.txt

@@ -1,8 +1,12 @@
 tests/cases/compiler/newMap.ts(1,9): error TS2743: No overload expects 1 type arguments, but overloads do exist that expect either 0 or 2 type arguments.
+tests/cases/compiler/newMap.ts(2,13): error TS2558: Expected 2 type arguments, but got 1.
 
 
-==== tests/cases/compiler/newMap.ts (1 errors) ====
+==== tests/cases/compiler/newMap.ts (2 errors) ====
     new Map<string>();
             ~~~~~~
 !!! error TS2743: No overload expects 1 type arguments, but overloads do exist that expect either 0 or 2 type arguments.
+    new WeakMap<object>();
+                ~~~~~~
+!!! error TS2558: Expected 2 type arguments, but got 1.
 

tests/baselines/reference/newMap.js

@@ -1,6 +1,8 @@
 //// [newMap.ts]
 new Map<string>();
+new WeakMap<object>();
 
 
 //// [newMap.js]
 new Map();
+new WeakMap();

tests/baselines/reference/newMap.symbols

@@ -2,3 +2,6 @@
 new Map<string>();
 >Map : Symbol(Map, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 
+new WeakMap<object>();
+>WeakMap : Symbol(WeakMap, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+

tests/baselines/reference/newMap.types

@@ -3,3 +3,7 @@ new Map<string>();
 >new Map<string>() : Map<string, unknown>
 >Map : MapConstructor
 
+new WeakMap<object>();
+>new WeakMap<object>() : WeakMap<object, unknown>
+>WeakMap : WeakMapConstructor
+

tests/cases/compiler/extendingSetWithCheckJs.ts

@@ -3,6 +3,7 @@
 // @noEmit: true
 // @lib: es2017
 
+// @filename: extendingCollectionsWithCheckJs.js
 class MySet extends Set {
     constructor() {
         super();
@@ -25,4 +26,4 @@ class MyWeakMap extends WeakMap {
     constructor() {
         super();
     }
-}
+}

tests/cases/compiler/newMap.ts

@@ -1,2 +1,3 @@
 // @lib: es6
 new Map<string>();
+new WeakMap<object>();