Skip to content

Commit b68e939

Browse files
yuityuit
committed
Fix 8482: Add Object.values and Object.entries (#8538)
* Add es2017.Object library file * Add tests and baselines * Fix unittest * Add es2017 lib flag * Update baselines * Add tests and baselines * Address PR: add tests * Address PR: add tests
1 parent 0120d7b commit b68e939

20 files changed

+305
-10
lines changed

‎Jakefile.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,12 @@ var es2016LibrarySourceMap = es2016LibrarySource.map(function(source) {
187187
return { target: "lib." + source, sources: ["header.d.ts", source] };
188188
})
189189

190+
var es2017LibrarySource = ["es2017.object.d.ts"];
191+
192+
var es2017LibrarySourceMap = es2017LibrarySource.map(function(source) {
193+
return { target: "lib." + source, sources: ["header.d.ts", source] };
194+
})
195+
190196
var hostsLibrarySources = ["dom.generated.d.ts", "webworker.importscripts.d.ts", "scripthost.d.ts"]
191197

192198
var librarySourceMap = [
@@ -200,11 +206,12 @@ var librarySourceMap = [
200206
{ target: "lib.es5.d.ts", sources: ["header.d.ts", "es5.d.ts"] },
201207
{ target: "lib.es2015.d.ts", sources: ["header.d.ts", "es2015.d.ts"] },
202208
{ target: "lib.es2016.d.ts", sources: ["header.d.ts", "es2016.d.ts"] },
209+
{ target: "lib.es2017.d.ts", sources: ["header.d.ts", "es2017.d.ts"] },
203210

204211
// JavaScript + all host library
205212
{ target: "lib.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(hostsLibrarySources), },
206213
{ target: "lib.es6.d.ts", sources: ["header.d.ts", "es5.d.ts"].concat(es2015LibrarySources, hostsLibrarySources, "dom.iterable.d.ts"), },
207-
].concat(es2015LibrarySourceMap, es2016LibrarySourceMap);
214+
].concat(es2015LibrarySourceMap, es2016LibrarySourceMap, es2017LibrarySourceMap);
208215

209216
var libraryTargets = librarySourceMap.map(function (f) {
210217
return path.join(builtLocalDirectory, f.target);

‎src/compiler/commandLineParser.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ namespace ts {
375375
"es2015": "lib.es2015.d.ts",
376376
"es7": "lib.es2016.d.ts",
377377
"es2016": "lib.es2016.d.ts",
378+
"es2017": "lib.es2017.d.ts",
378379
// Host only
379380
"dom": "lib.dom.d.ts",
380381
"webworker": "lib.webworker.d.ts",
@@ -389,7 +390,8 @@ namespace ts {
389390
"es2015.reflect": "lib.es2015.reflect.d.ts",
390391
"es2015.symbol": "lib.es2015.symbol.d.ts",
391392
"es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
392-
"es2016.array.include": "lib.es2016.array.include.d.ts"
393+
"es2016.array.include": "lib.es2016.array.include.d.ts",
394+
"es2017.object": "lib.es2017.object.d.ts"
393395
},
394396
},
395397
description: Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon

‎src/lib/es2017.d.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/// <reference path="lib.es2016.d.ts" />
2+
/// <reference path="lib.es2017.object.d.ts" />

‎src/lib/es2017.object.d.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
interface ObjectConstructor {
2+
/**
3+
* Returns an array of values of the enumerable properties of an object
4+
* @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.
5+
*/
6+
values<T>(o: { [s: string]: T }): T[];
7+
values(o: any): any[];
8+
/**
9+
* Returns an array of key/values of the enumerable properties of an object
10+
* @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.
11+
*/
12+
entries<T>(o: { [s: string]: T }): [string, T][];
13+
entries(o: any): [string, any][];
14+
}

‎tests/baselines/reference/useObjectValuesAndEntries1.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//// [useObjectValuesAndEntries1.ts]
2+
3+
var o = { a: 1, b: 2 };
4+
5+
for (var x of Object.values(o)) {
6+
let y = x;
7+
}
8+
9+
var entries = Object.entries(o);
10+
var entries1 = Object.entries(1); // <-- entries: [string, any][]
11+
12+
//// [useObjectValuesAndEntries1.js]
13+
var o = { a: 1, b: 2 };
14+
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
15+
var x = _a[_i];
16+
var y = x;
17+
}
18+
var entries = Object.entries(o);
19+
var entries1 = Object.entries(1); // <-- entries: [string, any][]

‎tests/baselines/reference/useObjectValuesAndEntries1.symbols‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===
2+
3+
var o = { a: 1, b: 2 };
4+
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))
5+
>a : Symbol(a, Decl(useObjectValuesAndEntries1.ts, 1, 9))
6+
>b : Symbol(b, Decl(useObjectValuesAndEntries1.ts, 1, 15))
7+
8+
for (var x of Object.values(o)) {
9+
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
10+
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
11+
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
12+
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
13+
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))
14+
15+
let y = x;
16+
>y : Symbol(y, Decl(useObjectValuesAndEntries1.ts, 4, 7))
17+
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
18+
}
19+
20+
var entries = Object.entries(o);
21+
>entries : Symbol(entries, Decl(useObjectValuesAndEntries1.ts, 7, 3))
22+
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
23+
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
24+
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
25+
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))
26+
27+
var entries1 = Object.entries(1); // <-- entries: [string, any][]
28+
>entries1 : Symbol(entries1, Decl(useObjectValuesAndEntries1.ts, 8, 3))
29+
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
30+
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
31+
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
32+

‎tests/baselines/reference/useObjectValuesAndEntries1.types‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===
2+
3+
var o = { a: 1, b: 2 };
4+
>o : { a: number; b: number; }
5+
>{ a: 1, b: 2 } : { a: number; b: number; }
6+
>a : number
7+
>1 : number
8+
>b : number
9+
>2 : number
10+
11+
for (var x of Object.values(o)) {
12+
>x : number
13+
>Object.values(o) : number[]
14+
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
15+
>Object : ObjectConstructor
16+
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
17+
>o : { a: number; b: number; }
18+
19+
let y = x;
20+
>y : number
21+
>x : number
22+
}
23+
24+
var entries = Object.entries(o);
25+
>entries : [string, number][]
26+
>Object.entries(o) : [string, number][]
27+
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
28+
>Object : ObjectConstructor
29+
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
30+
>o : { a: number; b: number; }
31+
32+
var entries1 = Object.entries(1); // <-- entries: [string, any][]
33+
>entries1 : [string, any][]
34+
>Object.entries(1) : [string, any][]
35+
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
36+
>Object : ObjectConstructor
37+
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
38+
>1 : number
39+

‎tests/baselines/reference/useObjectValuesAndEntries2.errors.txt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
2+
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.
3+
4+
5+
==== tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts (2 errors) ====
6+
7+
var o = { a: 1, b: 2 };
8+
9+
for (var x of Object.values(o)) {
10+
~~~~~~
11+
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
12+
let y = x;
13+
}
14+
15+
var entries = Object.entries(o);
16+
~~~~~~~
17+
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

‎tests/baselines/reference/useObjectValuesAndEntries2.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
//// [useObjectValuesAndEntries2.ts]
2+
3+
var o = { a: 1, b: 2 };
4+
5+
for (var x of Object.values(o)) {
6+
let y = x;
7+
}
8+
9+
var entries = Object.entries(o);
10+
11+
//// [useObjectValuesAndEntries2.js]
12+
var o = { a: 1, b: 2 };
13+
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
14+
var x = _a[_i];
15+
var y = x;
16+
}
17+
var entries = Object.entries(o);

‎tests/baselines/reference/useObjectValuesAndEntries3.errors.txt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
2+
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.
3+
4+
5+
==== tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts (2 errors) ====
6+
7+
var o = { a: 1, b: 2 };
8+
9+
for (var x of Object.values(o)) {
10+
~~~~~~
11+
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
12+
let y = x;
13+
}
14+
15+
var entries = Object.entries(o);
16+
~~~~~~~
17+
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

0 commit comments

Comments
 (0)