Skip to content

Consolidate overloads in constructors for Map, Set, WeakMap, and WeakSet #25374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/lib/es2015.collection.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ interface Map<K, V> {
}

interface MapConstructor {
new (): Map<any, any>;
new <K, V>(entries?: ReadonlyArray<[K, V]> | null): Map<K, V>;
new <K = any, V = any>(entries?: ReadonlyArray<[K, V]> | null): Map<K, V>;
readonly prototype: Map<any, any>;
}
declare var Map: MapConstructor;
Expand Down Expand Up @@ -45,8 +44,7 @@ interface Set<T> {
}

interface SetConstructor {
new (): Set<any>;
new <T>(values?: ReadonlyArray<T> | null): Set<T>;
new <T = any>(values?: ReadonlyArray<T> | null): Set<T>;
readonly prototype: Set<any>;
}
declare var Set: SetConstructor;
Expand All @@ -64,8 +62,7 @@ interface WeakSet<T extends object> {
}

interface WeakSetConstructor {
new (): WeakSet<object>;
new <T extends object>(values?: ReadonlyArray<T> | null): WeakSet<T>;
new <T extends object = object>(values?: ReadonlyArray<T> | null): WeakSet<T>;
readonly prototype: WeakSet<object>;
}
declare var WeakSet: WeakSetConstructor;
4 changes: 2 additions & 2 deletions src/lib/es2015.iterable.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,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 = object, V = any>(iterable: Iterable<[K, V]>): WeakMap<K, V>;
}

interface Set<T> {
Expand Down Expand Up @@ -183,7 +183,7 @@ interface SetConstructor {
interface WeakSet<T extends object> { }

interface WeakSetConstructor {
new <T extends object>(iterable: Iterable<T>): WeakSet<T>;
new <T extends object = object>(iterable: Iterable<T>): WeakSet<T>;
}

interface Promise<T> { }
Expand Down
2 changes: 1 addition & 1 deletion tests/baselines/reference/ES5For-ofTypeCheck13.types
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const strSet: Set<string> = new Set()
>strSet : Set<string>
>Set : Set<T>
>new Set() : Set<any>
>new Set() : Set<string>
>Set : SetConstructor

strSet.add('Hello')
Expand Down
40 changes: 40 additions & 0 deletions tests/baselines/reference/extendingSetWithCheckJs.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
=== tests/cases/compiler/extendingSetWithCheckJs.ts ===
class MySet extends Set {
>MySet : Symbol(MySet, Decl(extendingSetWithCheckJs.ts, 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() {
super();
>super : Symbol(SetConstructor, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
}
}

class MyWeakSet extends WeakSet {
>MyWeakSet : Symbol(MyWeakSet, Decl(extendingSetWithCheckJs.ts, 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() {
super();
>super : Symbol(WeakSetConstructor, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
}
}

class MyMap extends Map {
>MyMap : Symbol(MyMap, Decl(extendingSetWithCheckJs.ts, 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() {
super();
>super : Symbol(MapConstructor, Decl(lib.es2015.collection.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
}
}

class MyWeakMap extends WeakMap {
>MyWeakMap : Symbol(MyWeakMap, Decl(extendingSetWithCheckJs.ts, 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, --, --))
}
}
44 changes: 44 additions & 0 deletions tests/baselines/reference/extendingSetWithCheckJs.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
=== tests/cases/compiler/extendingSetWithCheckJs.ts ===
class MySet extends Set {
>MySet : MySet
>Set : Set<any>

constructor() {
super();
>super() : void
>super : SetConstructor
}
}

class MyWeakSet extends WeakSet {
>MyWeakSet : MyWeakSet
>WeakSet : WeakSet<object>

constructor() {
super();
>super() : void
>super : WeakSetConstructor
}
}

class MyMap extends Map {
>MyMap : MyMap
>Map : Map<any, any>

constructor() {
super();
>super() : void
>super : MapConstructor
}
}

class MyWeakMap extends WeakMap {
>MyWeakMap : MyWeakMap
>WeakMap : WeakMap<object, any>

constructor() {
super();
>super() : void
>super : WeakMapConstructor
}
}
28 changes: 28 additions & 0 deletions tests/cases/compiler/extendingSetWithCheckJs.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// @allowJs: true
// @checkJs: true
// @noEmit: true
// @lib: es2017

class MySet extends Set {
constructor() {
super();
}
}

class MyWeakSet extends WeakSet {
constructor() {
super();
}
}

class MyMap extends Map {
constructor() {
super();
}
}

class MyWeakMap extends WeakMap {
constructor() {
super();
}
}