Skip to content

Commit 72aeb3c

Browse files
committed
Merge pull request #3547 from Microsoft/updateMapDeclaration
Add a non-generic construct signature to Map, Set, and WeakMap
2 parents c556749 + 7c50c7c commit 72aeb3c

File tree

9 files changed

+180
-176
lines changed

9 files changed

+180
-176
lines changed

src/lib/es6.d.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -694,6 +694,7 @@ interface Map<K, V> {
694694
}
695695

696696
interface MapConstructor {
697+
new (): Map<any, any>;
697698
new <K, V>(): Map<K, V>;
698699
new <K, V>(iterable: Iterable<[K, V]>): Map<K, V>;
699700
prototype: Map<any, any>;
@@ -710,6 +711,7 @@ interface WeakMap<K, V> {
710711
}
711712

712713
interface WeakMapConstructor {
714+
new (): WeakMap<any, any>;
713715
new <K, V>(): WeakMap<K, V>;
714716
new <K, V>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
715717
prototype: WeakMap<any, any>;
@@ -731,6 +733,7 @@ interface Set<T> {
731733
}
732734

733735
interface SetConstructor {
736+
new (): Set<any>;
734737
new <T>(): Set<T>;
735738
new <T>(iterable: Iterable<T>): Set<T>;
736739
prototype: Set<any>;
@@ -746,6 +749,7 @@ interface WeakSet<T> {
746749
}
747750

748751
interface WeakSetConstructor {
752+
new (): WeakSet<any>;
749753
new <T>(): WeakSet<T>;
750754
new <T>(iterable: Iterable<T>): WeakSet<T>;
751755
prototype: WeakSet<any>;

tests/baselines/reference/for-of37.symbols

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=== tests/cases/conformance/es6/for-ofStatements/for-of37.ts ===
22
var map = new Map([["", true]]);
33
>map : Symbol(map, Decl(for-of37.ts, 0, 3))
4-
>Map : Symbol(Map, Decl(lib.d.ts, 1864, 1), Decl(lib.d.ts, 1886, 11))
4+
>Map : Symbol(Map, Decl(lib.d.ts, 1864, 1), Decl(lib.d.ts, 1887, 11))
55

66
for (var v of map) {
77
>v : Symbol(v, Decl(for-of37.ts, 1, 8))

tests/baselines/reference/for-of38.symbols

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=== tests/cases/conformance/es6/for-ofStatements/for-of38.ts ===
22
var map = new Map([["", true]]);
33
>map : Symbol(map, Decl(for-of38.ts, 0, 3))
4-
>Map : Symbol(Map, Decl(lib.d.ts, 1864, 1), Decl(lib.d.ts, 1886, 11))
4+
>Map : Symbol(Map, Decl(lib.d.ts, 1864, 1), Decl(lib.d.ts, 1887, 11))
55

66
for (var [k, v] of map) {
77
>k : Symbol(k, Decl(for-of38.ts, 1, 10))

tests/baselines/reference/for-of40.symbols

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=== tests/cases/conformance/es6/for-ofStatements/for-of40.ts ===
22
var map = new Map([["", true]]);
33
>map : Symbol(map, Decl(for-of40.ts, 0, 3))
4-
>Map : Symbol(Map, Decl(lib.d.ts, 1864, 1), Decl(lib.d.ts, 1886, 11))
4+
>Map : Symbol(Map, Decl(lib.d.ts, 1864, 1), Decl(lib.d.ts, 1887, 11))
55

66
for (var [k = "", v = false] of map) {
77
>k : Symbol(k, Decl(for-of40.ts, 1, 10))

tests/baselines/reference/for-of45.symbols

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var k: string, v: boolean;
55

66
var map = new Map([["", true]]);
77
>map : Symbol(map, Decl(for-of45.ts, 1, 3))
8-
>Map : Symbol(Map, Decl(lib.d.ts, 1864, 1), Decl(lib.d.ts, 1886, 11))
8+
>Map : Symbol(Map, Decl(lib.d.ts, 1864, 1), Decl(lib.d.ts, 1887, 11))
99

1010
for ([k = "", v = false] of map) {
1111
>k : Symbol(k, Decl(for-of45.ts, 0, 3))

tests/baselines/reference/for-of50.symbols

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=== tests/cases/conformance/es6/for-ofStatements/for-of50.ts ===
22
var map = new Map([["", true]]);
33
>map : Symbol(map, Decl(for-of50.ts, 0, 3))
4-
>Map : Symbol(Map, Decl(lib.d.ts, 1864, 1), Decl(lib.d.ts, 1886, 11))
4+
>Map : Symbol(Map, Decl(lib.d.ts, 1864, 1), Decl(lib.d.ts, 1887, 11))
55

66
for (const [k, v] of map) {
77
>k : Symbol(k, Decl(for-of50.ts, 1, 12))

tests/baselines/reference/iterableArrayPattern30.symbols

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ const [[k1, v1], [k2, v2]] = new Map([["", true], ["hello", true]])
44
>v1 : Symbol(v1, Decl(iterableArrayPattern30.ts, 0, 11))
55
>k2 : Symbol(k2, Decl(iterableArrayPattern30.ts, 0, 18))
66
>v2 : Symbol(v2, Decl(iterableArrayPattern30.ts, 0, 21))
7-
>Map : Symbol(Map, Decl(lib.d.ts, 1864, 1), Decl(lib.d.ts, 1886, 11))
7+
>Map : Symbol(Map, Decl(lib.d.ts, 1864, 1), Decl(lib.d.ts, 1887, 11))
88

tests/baselines/reference/promiseVoidErrorCallback.symbols

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ interface T3 {
2222

2323
function f1(): Promise<T1> {
2424
>f1 : Symbol(f1, Decl(promiseVoidErrorCallback.ts, 10, 1))
25-
>Promise : Symbol(Promise, Decl(lib.d.ts, 4766, 1), Decl(lib.d.ts, 4851, 11))
25+
>Promise : Symbol(Promise, Decl(lib.d.ts, 4770, 1), Decl(lib.d.ts, 4855, 11))
2626
>T1 : Symbol(T1, Decl(promiseVoidErrorCallback.ts, 0, 0))
2727

2828
return Promise.resolve({ __t1: "foo_t1" });
29-
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.d.ts, 4833, 39), Decl(lib.d.ts, 4840, 54))
30-
>Promise : Symbol(Promise, Decl(lib.d.ts, 4766, 1), Decl(lib.d.ts, 4851, 11))
31-
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.d.ts, 4833, 39), Decl(lib.d.ts, 4840, 54))
29+
>Promise.resolve : Symbol(PromiseConstructor.resolve, Decl(lib.d.ts, 4837, 39), Decl(lib.d.ts, 4844, 54))
30+
>Promise : Symbol(Promise, Decl(lib.d.ts, 4770, 1), Decl(lib.d.ts, 4855, 11))
31+
>resolve : Symbol(PromiseConstructor.resolve, Decl(lib.d.ts, 4837, 39), Decl(lib.d.ts, 4844, 54))
3232
>__t1 : Symbol(__t1, Decl(promiseVoidErrorCallback.ts, 13, 28))
3333
}
3434

@@ -47,12 +47,12 @@ function f2(x: T1): T2 {
4747

4848
var x3 = f1()
4949
>x3 : Symbol(x3, Decl(promiseVoidErrorCallback.ts, 20, 3))
50-
>f1() .then(f2, (e: Error) => { throw e;}) .then : Symbol(Promise.then, Decl(lib.d.ts, 4771, 22), Decl(lib.d.ts, 4778, 158))
51-
>f1() .then : Symbol(Promise.then, Decl(lib.d.ts, 4771, 22), Decl(lib.d.ts, 4778, 158))
50+
>f1() .then(f2, (e: Error) => { throw e;}) .then : Symbol(Promise.then, Decl(lib.d.ts, 4775, 22), Decl(lib.d.ts, 4782, 158))
51+
>f1() .then : Symbol(Promise.then, Decl(lib.d.ts, 4775, 22), Decl(lib.d.ts, 4782, 158))
5252
>f1 : Symbol(f1, Decl(promiseVoidErrorCallback.ts, 10, 1))
5353

5454
.then(f2, (e: Error) => {
55-
>then : Symbol(Promise.then, Decl(lib.d.ts, 4771, 22), Decl(lib.d.ts, 4778, 158))
55+
>then : Symbol(Promise.then, Decl(lib.d.ts, 4775, 22), Decl(lib.d.ts, 4782, 158))
5656
>f2 : Symbol(f2, Decl(promiseVoidErrorCallback.ts, 14, 1))
5757
>e : Symbol(e, Decl(promiseVoidErrorCallback.ts, 21, 15))
5858
>Error : Symbol(Error, Decl(lib.d.ts, 876, 38), Decl(lib.d.ts, 889, 11))
@@ -62,7 +62,7 @@ var x3 = f1()
6262

6363
})
6464
.then((x: T2) => {
65-
>then : Symbol(Promise.then, Decl(lib.d.ts, 4771, 22), Decl(lib.d.ts, 4778, 158))
65+
>then : Symbol(Promise.then, Decl(lib.d.ts, 4775, 22), Decl(lib.d.ts, 4782, 158))
6666
>x : Symbol(x, Decl(promiseVoidErrorCallback.ts, 24, 11))
6767
>T2 : Symbol(T2, Decl(promiseVoidErrorCallback.ts, 2, 1))
6868

0 commit comments

Comments
 (0)