Fix 8482: Add Object.values and Object.entries #8538

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.

Sign up for GitHub

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
Yui (yuit) merged 9 commits into from
May 10, 2016
Merged

Fix 8482: Add Object.values and Object.entries #8538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2b796ad
Add es2017.Object library file
May 9, 2016
3cd8b3a
Add tests and baselines
May 9, 2016
f3de1ec
Fix unittest
May 9, 2016
5184bea
Add es2017 lib flag
May 10, 2016
cc18e6a
Update baselines
May 10, 2016
fbd017d
Add tests and baselines
May 10, 2016
01b94cb
Address PR: add tests
May 10, 2016
191980e
Address PR: add tests
May 10, 2016
90264db
Merge branch 'fix8482' of https://github.com/Microsoft/TypeScript int…
May 10, 2016
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: 8 additions & 1 deletion Jakefile.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,12 @@ var es2016LibrarySourceMap = es2016LibrarySource.map(function(source) {
return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var es2017LibrarySource = ["es2017.object.d.ts"];

var es2017LibrarySourceMap = es2017LibrarySource.map(function(source) {
return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var hostsLibrarySources = ["dom.generated.d.ts", "webworker.importscripts.d.ts", "scripthost.d.ts"]

var librarySourceMap = [
Expand All@@ -200,11 +206,12 @@ var librarySourceMap = [
{ target: "lib.es5.d.ts", sources: ["header.d.ts", "es5.d.ts"] },
{ target: "lib.es2015.d.ts", sources: ["header.d.ts", "es2015.d.ts"] },
{ target: "lib.es2016.d.ts", sources: ["header.d.ts", "es2016.d.ts"] },
{ target: "lib.es2017.d.ts", sources: ["header.d.ts", "es2017.d.ts"] },

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

var libraryTargets = librarySourceMap.map(function (f) {
return path.join(builtLocalDirectory, f.target);
Expand Down
4 changes: 3 additions & 1 deletion src/compiler/commandLineParser.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,7 @@ namespace ts {
"es2015": "lib.es2015.d.ts",
"es7": "lib.es2016.d.ts",
"es2016": "lib.es2016.d.ts",
"es2017": "lib.es2017.d.ts",
// Host only
"dom": "lib.dom.d.ts",
"webworker": "lib.webworker.d.ts",
Expand All@@ -389,7 +390,8 @@ namespace ts {
"es2015.reflect": "lib.es2015.reflect.d.ts",
"es2015.symbol": "lib.es2015.symbol.d.ts",
"es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
"es2016.array.include": "lib.es2016.array.include.d.ts"
"es2016.array.include": "lib.es2016.array.include.d.ts",
"es2017.object": "lib.es2017.object.d.ts"
},
},
description: Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
Expand Down
2 changes: 2 additions & 0 deletions src/lib/es2017.d.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
/// <reference path="lib.es2016.d.ts" />
/// <reference path="lib.es2017.object.d.ts" />
14 changes: 14 additions & 0 deletions src/lib/es2017.object.d.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
interface ObjectConstructor {
/**
* Returns an array of values of the enumerable properties of an object
* @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.
*/
values<T>(o: { [s: string]: T }): T[];
values(o: any): any[];
/**
* Returns an array of key/values of the enumerable properties of an object
* @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.
*/
entries<T>(o: { [s: string]: T }): [string, T][];
entries(o: any): [string, any][];
}
19 changes: 19 additions & 0 deletions tests/baselines/reference/useObjectValuesAndEntries1.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
//// [useObjectValuesAndEntries1.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

//// [useObjectValuesAndEntries1.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
var x = _a[_i];
var y = x;
}
var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]
32 changes: 32 additions & 0 deletions tests/baselines/reference/useObjectValuesAndEntries1.symbols
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries1.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries1.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries1.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries1.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : Symbol(entries1, Decl(useObjectValuesAndEntries1.ts, 8, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))

39 changes: 39 additions & 0 deletions tests/baselines/reference/useObjectValuesAndEntries1.types
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : [string, any][]
>Object.entries(1) : [string, any][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>1 : number

17 changes: 17 additions & 0 deletions tests/baselines/reference/useObjectValuesAndEntries2.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts (2 errors) ====

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
let y = x;
}

var entries = Object.entries(o);
~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.
17 changes: 17 additions & 0 deletions tests/baselines/reference/useObjectValuesAndEntries2.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
//// [useObjectValuesAndEntries2.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries2.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
var x = _a[_i];
var y = x;
}
var entries = Object.entries(o);
17 changes: 17 additions & 0 deletions tests/baselines/reference/useObjectValuesAndEntries3.errors.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts (2 errors) ====

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
let y = x;
}

var entries = Object.entries(o);
~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.
16 changes: 16 additions & 0 deletions tests/baselines/reference/useObjectValuesAndEntries3.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries3.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries3.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
let y = x;
}
var entries = Object.entries(o);
16 changes: 16 additions & 0 deletions tests/baselines/reference/useObjectValuesAndEntries4.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries4.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries4.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
let y = x;
}
var entries = Object.entries(o);
26 changes: 26 additions & 0 deletions tests/baselines/reference/useObjectValuesAndEntries4.symbols
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries4.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries4.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))

let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries4.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries4.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))

31 changes: 31 additions & 0 deletions tests/baselines/reference/useObjectValuesAndEntries4.types
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }

11 changes: 11 additions & 0 deletions tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// @target: es5
// @lib: es5,es2017.object

var o = { a: 1, b: 2 };

@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you have an example of a mixed-type object that uses the any-based overload as well? Something like

varo2={a: 'first',b: 2};varentries=Object.entries(o);// <-- entries: [string, any][]


for (var x of Object.values(o)) {
let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]
10 changes: 10 additions & 0 deletions tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es5
// @lib: es5

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
let y = x;
}

var entries = Object.entries(o);
9 changes: 9 additions & 0 deletions tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
// @target: es6

@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// @lib: ess6,es2017.object would make this file compile without errors, right?

@yuitYui (yuit)May 10, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep!


var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
let y = x;
}

var entries = Object.entries(o);
10 changes: 10 additions & 0 deletions tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es6
// @lib: es2017

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
let y = x;
}

var entries = Object.entries(o);
8 changes: 4 additions & 4 deletions tests/cases/unittests/commandLineParsing.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ namespace ts {
assertParseResult(["--lib", "es5,invalidOption", "0.ts"],
{
errors: [{
messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand DownExpand Up@@ -217,7 +217,7 @@ namespace ts {
start: undefined,
length: undefined,
}, {
messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -237,7 +237,7 @@ namespace ts {
assertParseResult(["--lib", "es5,", "es7", "0.ts"],
{
errors: [{
messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -257,7 +257,7 @@ namespace ts {
assertParseResult(["--lib", "es5, ", "es7", "0.ts"],
{
errors: [{
messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix 8482: Add Object.values and Object.entries #8538

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.

 Sign up for GitHub

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

Yui (yuit)
merged 9 commits into

from

May 10, 2016
 Merged


Fix 8482: Add Object.values and Object.entries #8538
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
2b796ad

Add es2017.Object library file

May 9, 2016
3cd8b3a

Add tests and baselines

May 9, 2016
f3de1ec

Fix unittest

May 9, 2016
5184bea

Add es2017 lib flag

May 10, 2016
cc18e6a

Update baselines

May 10, 2016
fbd017d

Add tests and baselines

May 10, 2016
01b94cb

Address PR: add tests

May 10, 2016
191980e

Address PR: add tests

May 10, 2016
90264db

Merge branch 'fix8482' of https://github.com/Microsoft/TypeScript int…

May 10, 2016

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: 8 additions & 1 deletion
Jakefile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,12 @@ var es2016LibrarySourceMap = es2016LibrarySource.map(function(source) {
 return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var es2017LibrarySource = ["es2017.object.d.ts"];

var es2017LibrarySourceMap = es2017LibrarySource.map(function(source) {
 return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var hostsLibrarySources = ["dom.generated.d.ts", "webworker.importscripts.d.ts", "scripthost.d.ts"]

var librarySourceMap = [
Expand All@@ -200,11 +206,12 @@ var librarySourceMap = [
 { target: "lib.es5.d.ts", sources: ["header.d.ts", "es5.d.ts"] },
 { target: "lib.es2015.d.ts", sources: ["header.d.ts", "es2015.d.ts"] },
 { target: "lib.es2016.d.ts", sources: ["header.d.ts", "es2016.d.ts"] },
 { target: "lib.es2017.d.ts", sources: ["header.d.ts", "es2017.d.ts"] },

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

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

4 changes: 3 additions & 1 deletion
src/compiler/commandLineParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,7 @@ namespace ts {
 "es2015": "lib.es2015.d.ts",
 "es7": "lib.es2016.d.ts",
 "es2016": "lib.es2016.d.ts",
 "es2017": "lib.es2017.d.ts",
 // Host only
 "dom": "lib.dom.d.ts",
 "webworker": "lib.webworker.d.ts",
Expand All@@ -389,7 +390,8 @@ namespace ts {
 "es2015.reflect": "lib.es2015.reflect.d.ts",
 "es2015.symbol": "lib.es2015.symbol.d.ts",
 "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
 "es2016.array.include": "lib.es2016.array.include.d.ts"
 "es2016.array.include": "lib.es2016.array.include.d.ts",
 "es2017.object": "lib.es2017.object.d.ts"
 },
 },
 description: Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
Expand Down

2 changes: 2 additions & 0 deletions
src/lib/es2017.d.ts

View file


Open in desktop

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

14 changes: 14 additions & 0 deletions
src/lib/es2017.object.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
interface ObjectConstructor {
 /**
 * Returns an array of values of the enumerable properties of an object
 * @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.
 */
 values<T>(o: { [s: string]: T }): T[];
 values(o: any): any[];
 /**
 * Returns an array of key/values of the enumerable properties of an object
 * @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.
 */
 entries<T>(o: { [s: string]: T }): [string, T][];
 entries(o: any): [string, any][];
}

19 changes: 19 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
//// [useObjectValuesAndEntries1.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

//// [useObjectValuesAndEntries1.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
 var x = _a[_i];
 var y = x;
}
var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

32 changes: 32 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries1.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries1.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

 let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries1.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries1.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : Symbol(entries1, Decl(useObjectValuesAndEntries1.ts, 8, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))


39 changes: 39 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

 let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : [string, any][]
>Object.entries(1) : [string, any][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>1 : number


17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries2.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts (2 errors) ====

 var o = { a: 1, b: 2 };

 for (var x of Object.values(o)) {
 ~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
 let y = x;
 }

 var entries = Object.entries(o);
 ~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries2.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
//// [useObjectValuesAndEntries2.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries2.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
 var x = _a[_i];
 var y = x;
}
var entries = Object.entries(o);

17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries3.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts (2 errors) ====

 var o = { a: 1, b: 2 };

 for (var x of Object.values(o)) {
 ~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
 let y = x;
 }

 var entries = Object.entries(o);
 ~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

16 changes: 16 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries3.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries3.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries3.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
 let y = x;
}
var entries = Object.entries(o);

16 changes: 16 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries4.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries4.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
 let y = x;
}
var entries = Object.entries(o);

26 changes: 26 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries4.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries4.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))

 let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries4.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries4.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))


31 changes: 31 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

 let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }


11 changes: 11 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// @target: es5
// @lib: es5,es2017.object

var o = { a: 1, b: 2 };
@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you have an example of a mixed-type object that uses the any-based overload as well? Something like
varo2={a: 'first',b: 2};varentries=Object.entries(o);// <-- entries: [string, any][]

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

10 changes: 10 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es5
// @lib: es5

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

9 changes: 9 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
// @target: es6
@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// @lib: ess6,es2017.object would make this file compile without errors, right?
@yuitYui (yuit)May 10, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep!

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

10 changes: 10 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es6
// @lib: es2017

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

8 changes: 4 additions & 4 deletions
tests/cases/unittests/commandLineParsing.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ namespace ts {
 assertParseResult(["--lib", "es5,invalidOption", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand DownExpand Up@@ -217,7 +217,7 @@ namespace ts {
 start: undefined,
 length: undefined,
 }, {
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -237,7 +237,7 @@ namespace ts {
 assertParseResult(["--lib", "es5,", "es7", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -257,7 +257,7 @@ namespace ts {
 assertParseResult(["--lib", "es5, ", "es7", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix 8482: Add Object.values and Object.entries #8538

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.

 Sign up for GitHub

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

Yui (yuit)
merged 9 commits into

from

May 10, 2016
 Merged


Fix 8482: Add Object.values and Object.entries #8538
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
2b796ad

Add es2017.Object library file

May 9, 2016
3cd8b3a

Add tests and baselines

May 9, 2016
f3de1ec

Fix unittest

May 9, 2016
5184bea

Add es2017 lib flag

May 10, 2016
cc18e6a

Update baselines

May 10, 2016
fbd017d

Add tests and baselines

May 10, 2016
01b94cb

Address PR: add tests

May 10, 2016
191980e

Address PR: add tests

May 10, 2016
90264db

Merge branch 'fix8482' of https://github.com/Microsoft/TypeScript int…

May 10, 2016

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: 8 additions & 1 deletion
Jakefile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,12 @@ var es2016LibrarySourceMap = es2016LibrarySource.map(function(source) {
 return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var es2017LibrarySource = ["es2017.object.d.ts"];

var es2017LibrarySourceMap = es2017LibrarySource.map(function(source) {
 return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var hostsLibrarySources = ["dom.generated.d.ts", "webworker.importscripts.d.ts", "scripthost.d.ts"]

var librarySourceMap = [
Expand All@@ -200,11 +206,12 @@ var librarySourceMap = [
 { target: "lib.es5.d.ts", sources: ["header.d.ts", "es5.d.ts"] },
 { target: "lib.es2015.d.ts", sources: ["header.d.ts", "es2015.d.ts"] },
 { target: "lib.es2016.d.ts", sources: ["header.d.ts", "es2016.d.ts"] },
 { target: "lib.es2017.d.ts", sources: ["header.d.ts", "es2017.d.ts"] },

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

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

4 changes: 3 additions & 1 deletion
src/compiler/commandLineParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,7 @@ namespace ts {
 "es2015": "lib.es2015.d.ts",
 "es7": "lib.es2016.d.ts",
 "es2016": "lib.es2016.d.ts",
 "es2017": "lib.es2017.d.ts",
 // Host only
 "dom": "lib.dom.d.ts",
 "webworker": "lib.webworker.d.ts",
Expand All@@ -389,7 +390,8 @@ namespace ts {
 "es2015.reflect": "lib.es2015.reflect.d.ts",
 "es2015.symbol": "lib.es2015.symbol.d.ts",
 "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
 "es2016.array.include": "lib.es2016.array.include.d.ts"
 "es2016.array.include": "lib.es2016.array.include.d.ts",
 "es2017.object": "lib.es2017.object.d.ts"
 },
 },
 description: Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
Expand Down

2 changes: 2 additions & 0 deletions
src/lib/es2017.d.ts

View file


Open in desktop

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

14 changes: 14 additions & 0 deletions
src/lib/es2017.object.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
interface ObjectConstructor {
 /**
 * Returns an array of values of the enumerable properties of an object
 * @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.
 */
 values<T>(o: { [s: string]: T }): T[];
 values(o: any): any[];
 /**
 * Returns an array of key/values of the enumerable properties of an object
 * @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.
 */
 entries<T>(o: { [s: string]: T }): [string, T][];
 entries(o: any): [string, any][];
}

19 changes: 19 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
//// [useObjectValuesAndEntries1.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

//// [useObjectValuesAndEntries1.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
 var x = _a[_i];
 var y = x;
}
var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

32 changes: 32 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries1.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries1.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

 let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries1.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries1.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : Symbol(entries1, Decl(useObjectValuesAndEntries1.ts, 8, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))


39 changes: 39 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

 let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : [string, any][]
>Object.entries(1) : [string, any][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>1 : number


17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries2.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts (2 errors) ====

 var o = { a: 1, b: 2 };

 for (var x of Object.values(o)) {
 ~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
 let y = x;
 }

 var entries = Object.entries(o);
 ~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries2.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
//// [useObjectValuesAndEntries2.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries2.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
 var x = _a[_i];
 var y = x;
}
var entries = Object.entries(o);

17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries3.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts (2 errors) ====

 var o = { a: 1, b: 2 };

 for (var x of Object.values(o)) {
 ~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
 let y = x;
 }

 var entries = Object.entries(o);
 ~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

16 changes: 16 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries3.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries3.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries3.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
 let y = x;
}
var entries = Object.entries(o);

16 changes: 16 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries4.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries4.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
 let y = x;
}
var entries = Object.entries(o);

26 changes: 26 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries4.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries4.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))

 let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries4.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries4.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))


31 changes: 31 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

 let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }


11 changes: 11 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// @target: es5
// @lib: es5,es2017.object

var o = { a: 1, b: 2 };
@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you have an example of a mixed-type object that uses the any-based overload as well? Something like
varo2={a: 'first',b: 2};varentries=Object.entries(o);// <-- entries: [string, any][]

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

10 changes: 10 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es5
// @lib: es5

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

9 changes: 9 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
// @target: es6
@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// @lib: ess6,es2017.object would make this file compile without errors, right?
@yuitYui (yuit)May 10, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep!

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

10 changes: 10 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es6
// @lib: es2017

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

8 changes: 4 additions & 4 deletions
tests/cases/unittests/commandLineParsing.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ namespace ts {
 assertParseResult(["--lib", "es5,invalidOption", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand DownExpand Up@@ -217,7 +217,7 @@ namespace ts {
 start: undefined,
 length: undefined,
 }, {
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -237,7 +237,7 @@ namespace ts {
 assertParseResult(["--lib", "es5,", "es7", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -257,7 +257,7 @@ namespace ts {
 assertParseResult(["--lib", "es5, ", "es7", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix 8482: Add Object.values and Object.entries #8538

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.

 Sign up for GitHub

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

Yui (yuit)
merged 9 commits into

from

May 10, 2016
 Merged


Fix 8482: Add Object.values and Object.entries #8538
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
2b796ad

Add es2017.Object library file

May 9, 2016
3cd8b3a

Add tests and baselines

May 9, 2016
f3de1ec

Fix unittest

May 9, 2016
5184bea

Add es2017 lib flag

May 10, 2016
cc18e6a

Update baselines

May 10, 2016
fbd017d

Add tests and baselines

May 10, 2016
01b94cb

Address PR: add tests

May 10, 2016
191980e

Address PR: add tests

May 10, 2016
90264db

Merge branch 'fix8482' of https://github.com/Microsoft/TypeScript int…

May 10, 2016

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: 8 additions & 1 deletion
Jakefile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,12 @@ var es2016LibrarySourceMap = es2016LibrarySource.map(function(source) {
 return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var es2017LibrarySource = ["es2017.object.d.ts"];

var es2017LibrarySourceMap = es2017LibrarySource.map(function(source) {
 return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var hostsLibrarySources = ["dom.generated.d.ts", "webworker.importscripts.d.ts", "scripthost.d.ts"]

var librarySourceMap = [
Expand All@@ -200,11 +206,12 @@ var librarySourceMap = [
 { target: "lib.es5.d.ts", sources: ["header.d.ts", "es5.d.ts"] },
 { target: "lib.es2015.d.ts", sources: ["header.d.ts", "es2015.d.ts"] },
 { target: "lib.es2016.d.ts", sources: ["header.d.ts", "es2016.d.ts"] },
 { target: "lib.es2017.d.ts", sources: ["header.d.ts", "es2017.d.ts"] },

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

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

4 changes: 3 additions & 1 deletion
src/compiler/commandLineParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,7 @@ namespace ts {
 "es2015": "lib.es2015.d.ts",
 "es7": "lib.es2016.d.ts",
 "es2016": "lib.es2016.d.ts",
 "es2017": "lib.es2017.d.ts",
 // Host only
 "dom": "lib.dom.d.ts",
 "webworker": "lib.webworker.d.ts",
Expand All@@ -389,7 +390,8 @@ namespace ts {
 "es2015.reflect": "lib.es2015.reflect.d.ts",
 "es2015.symbol": "lib.es2015.symbol.d.ts",
 "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
 "es2016.array.include": "lib.es2016.array.include.d.ts"
 "es2016.array.include": "lib.es2016.array.include.d.ts",
 "es2017.object": "lib.es2017.object.d.ts"
 },
 },
 description: Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
Expand Down

2 changes: 2 additions & 0 deletions
src/lib/es2017.d.ts

View file


Open in desktop

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

14 changes: 14 additions & 0 deletions
src/lib/es2017.object.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
interface ObjectConstructor {
 /**
 * Returns an array of values of the enumerable properties of an object
 * @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.
 */
 values<T>(o: { [s: string]: T }): T[];
 values(o: any): any[];
 /**
 * Returns an array of key/values of the enumerable properties of an object
 * @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.
 */
 entries<T>(o: { [s: string]: T }): [string, T][];
 entries(o: any): [string, any][];
}

19 changes: 19 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
//// [useObjectValuesAndEntries1.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

//// [useObjectValuesAndEntries1.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
 var x = _a[_i];
 var y = x;
}
var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

32 changes: 32 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries1.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries1.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

 let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries1.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries1.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : Symbol(entries1, Decl(useObjectValuesAndEntries1.ts, 8, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))


39 changes: 39 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

 let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : [string, any][]
>Object.entries(1) : [string, any][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>1 : number


17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries2.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts (2 errors) ====

 var o = { a: 1, b: 2 };

 for (var x of Object.values(o)) {
 ~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
 let y = x;
 }

 var entries = Object.entries(o);
 ~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries2.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
//// [useObjectValuesAndEntries2.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries2.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
 var x = _a[_i];
 var y = x;
}
var entries = Object.entries(o);

17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries3.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts (2 errors) ====

 var o = { a: 1, b: 2 };

 for (var x of Object.values(o)) {
 ~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
 let y = x;
 }

 var entries = Object.entries(o);
 ~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

16 changes: 16 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries3.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries3.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries3.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
 let y = x;
}
var entries = Object.entries(o);

16 changes: 16 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries4.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries4.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
 let y = x;
}
var entries = Object.entries(o);

26 changes: 26 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries4.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries4.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))

 let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries4.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries4.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))


31 changes: 31 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

 let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }


11 changes: 11 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// @target: es5
// @lib: es5,es2017.object

var o = { a: 1, b: 2 };
@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you have an example of a mixed-type object that uses the any-based overload as well? Something like
varo2={a: 'first',b: 2};varentries=Object.entries(o);// <-- entries: [string, any][]

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

10 changes: 10 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es5
// @lib: es5

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

9 changes: 9 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
// @target: es6
@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// @lib: ess6,es2017.object would make this file compile without errors, right?
@yuitYui (yuit)May 10, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep!

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

10 changes: 10 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es6
// @lib: es2017

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

8 changes: 4 additions & 4 deletions
tests/cases/unittests/commandLineParsing.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ namespace ts {
 assertParseResult(["--lib", "es5,invalidOption", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand DownExpand Up@@ -217,7 +217,7 @@ namespace ts {
 start: undefined,
 length: undefined,
 }, {
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -237,7 +237,7 @@ namespace ts {
 assertParseResult(["--lib", "es5,", "es7", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -257,7 +257,7 @@ namespace ts {
 assertParseResult(["--lib", "es5, ", "es7", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix 8482: Add Object.values and Object.entries #8538

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.

 Sign up for GitHub

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

Yui (yuit)
merged 9 commits into

from

May 10, 2016
 Merged


Fix 8482: Add Object.values and Object.entries #8538
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
2b796ad

Add es2017.Object library file

May 9, 2016
3cd8b3a

Add tests and baselines

May 9, 2016
f3de1ec

Fix unittest

May 9, 2016
5184bea

Add es2017 lib flag

May 10, 2016
cc18e6a

Update baselines

May 10, 2016
fbd017d

Add tests and baselines

May 10, 2016
01b94cb

Address PR: add tests

May 10, 2016
191980e

Address PR: add tests

May 10, 2016
90264db

Merge branch 'fix8482' of https://github.com/Microsoft/TypeScript int…

May 10, 2016

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: 8 additions & 1 deletion
Jakefile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,12 @@ var es2016LibrarySourceMap = es2016LibrarySource.map(function(source) {
 return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var es2017LibrarySource = ["es2017.object.d.ts"];

var es2017LibrarySourceMap = es2017LibrarySource.map(function(source) {
 return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var hostsLibrarySources = ["dom.generated.d.ts", "webworker.importscripts.d.ts", "scripthost.d.ts"]

var librarySourceMap = [
Expand All@@ -200,11 +206,12 @@ var librarySourceMap = [
 { target: "lib.es5.d.ts", sources: ["header.d.ts", "es5.d.ts"] },
 { target: "lib.es2015.d.ts", sources: ["header.d.ts", "es2015.d.ts"] },
 { target: "lib.es2016.d.ts", sources: ["header.d.ts", "es2016.d.ts"] },
 { target: "lib.es2017.d.ts", sources: ["header.d.ts", "es2017.d.ts"] },

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

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

4 changes: 3 additions & 1 deletion
src/compiler/commandLineParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,7 @@ namespace ts {
 "es2015": "lib.es2015.d.ts",
 "es7": "lib.es2016.d.ts",
 "es2016": "lib.es2016.d.ts",
 "es2017": "lib.es2017.d.ts",
 // Host only
 "dom": "lib.dom.d.ts",
 "webworker": "lib.webworker.d.ts",
Expand All@@ -389,7 +390,8 @@ namespace ts {
 "es2015.reflect": "lib.es2015.reflect.d.ts",
 "es2015.symbol": "lib.es2015.symbol.d.ts",
 "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
 "es2016.array.include": "lib.es2016.array.include.d.ts"
 "es2016.array.include": "lib.es2016.array.include.d.ts",
 "es2017.object": "lib.es2017.object.d.ts"
 },
 },
 description: Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
Expand Down

2 changes: 2 additions & 0 deletions
src/lib/es2017.d.ts

View file


Open in desktop

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

14 changes: 14 additions & 0 deletions
src/lib/es2017.object.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
interface ObjectConstructor {
 /**
 * Returns an array of values of the enumerable properties of an object
 * @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.
 */
 values<T>(o: { [s: string]: T }): T[];
 values(o: any): any[];
 /**
 * Returns an array of key/values of the enumerable properties of an object
 * @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.
 */
 entries<T>(o: { [s: string]: T }): [string, T][];
 entries(o: any): [string, any][];
}

19 changes: 19 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
//// [useObjectValuesAndEntries1.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

//// [useObjectValuesAndEntries1.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
 var x = _a[_i];
 var y = x;
}
var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

32 changes: 32 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries1.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries1.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

 let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries1.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries1.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : Symbol(entries1, Decl(useObjectValuesAndEntries1.ts, 8, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))


39 changes: 39 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

 let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : [string, any][]
>Object.entries(1) : [string, any][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>1 : number


17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries2.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts (2 errors) ====

 var o = { a: 1, b: 2 };

 for (var x of Object.values(o)) {
 ~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
 let y = x;
 }

 var entries = Object.entries(o);
 ~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries2.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
//// [useObjectValuesAndEntries2.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries2.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
 var x = _a[_i];
 var y = x;
}
var entries = Object.entries(o);

17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries3.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts (2 errors) ====

 var o = { a: 1, b: 2 };

 for (var x of Object.values(o)) {
 ~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
 let y = x;
 }

 var entries = Object.entries(o);
 ~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

16 changes: 16 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries3.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries3.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries3.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
 let y = x;
}
var entries = Object.entries(o);

16 changes: 16 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries4.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries4.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
 let y = x;
}
var entries = Object.entries(o);

26 changes: 26 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries4.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries4.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))

 let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries4.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries4.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))


31 changes: 31 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

 let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }


11 changes: 11 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// @target: es5
// @lib: es5,es2017.object

var o = { a: 1, b: 2 };
@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you have an example of a mixed-type object that uses the any-based overload as well? Something like
varo2={a: 'first',b: 2};varentries=Object.entries(o);// <-- entries: [string, any][]

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

10 changes: 10 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es5
// @lib: es5

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

9 changes: 9 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
// @target: es6
@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// @lib: ess6,es2017.object would make this file compile without errors, right?
@yuitYui (yuit)May 10, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep!

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

10 changes: 10 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es6
// @lib: es2017

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

8 changes: 4 additions & 4 deletions
tests/cases/unittests/commandLineParsing.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ namespace ts {
 assertParseResult(["--lib", "es5,invalidOption", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand DownExpand Up@@ -217,7 +217,7 @@ namespace ts {
 start: undefined,
 length: undefined,
 }, {
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -237,7 +237,7 @@ namespace ts {
 assertParseResult(["--lib", "es5,", "es7", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -257,7 +257,7 @@ namespace ts {
 assertParseResult(["--lib", "es5, ", "es7", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix 8482: Add Object.values and Object.entries #8538

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.

 Sign up for GitHub

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

Yui (yuit)
merged 9 commits into

from

May 10, 2016
 Merged


Fix 8482: Add Object.values and Object.entries #8538
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
2b796ad

Add es2017.Object library file

May 9, 2016
3cd8b3a

Add tests and baselines

May 9, 2016
f3de1ec

Fix unittest

May 9, 2016
5184bea

Add es2017 lib flag

May 10, 2016
cc18e6a

Update baselines

May 10, 2016
fbd017d

Add tests and baselines

May 10, 2016
01b94cb

Address PR: add tests

May 10, 2016
191980e

Address PR: add tests

May 10, 2016
90264db

Merge branch 'fix8482' of https://github.com/Microsoft/TypeScript int…

May 10, 2016

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: 8 additions & 1 deletion
Jakefile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,12 @@ var es2016LibrarySourceMap = es2016LibrarySource.map(function(source) {
 return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var es2017LibrarySource = ["es2017.object.d.ts"];

var es2017LibrarySourceMap = es2017LibrarySource.map(function(source) {
 return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var hostsLibrarySources = ["dom.generated.d.ts", "webworker.importscripts.d.ts", "scripthost.d.ts"]

var librarySourceMap = [
Expand All@@ -200,11 +206,12 @@ var librarySourceMap = [
 { target: "lib.es5.d.ts", sources: ["header.d.ts", "es5.d.ts"] },
 { target: "lib.es2015.d.ts", sources: ["header.d.ts", "es2015.d.ts"] },
 { target: "lib.es2016.d.ts", sources: ["header.d.ts", "es2016.d.ts"] },
 { target: "lib.es2017.d.ts", sources: ["header.d.ts", "es2017.d.ts"] },

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

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

4 changes: 3 additions & 1 deletion
src/compiler/commandLineParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,7 @@ namespace ts {
 "es2015": "lib.es2015.d.ts",
 "es7": "lib.es2016.d.ts",
 "es2016": "lib.es2016.d.ts",
 "es2017": "lib.es2017.d.ts",
 // Host only
 "dom": "lib.dom.d.ts",
 "webworker": "lib.webworker.d.ts",
Expand All@@ -389,7 +390,8 @@ namespace ts {
 "es2015.reflect": "lib.es2015.reflect.d.ts",
 "es2015.symbol": "lib.es2015.symbol.d.ts",
 "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
 "es2016.array.include": "lib.es2016.array.include.d.ts"
 "es2016.array.include": "lib.es2016.array.include.d.ts",
 "es2017.object": "lib.es2017.object.d.ts"
 },
 },
 description: Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
Expand Down

2 changes: 2 additions & 0 deletions
src/lib/es2017.d.ts

View file


Open in desktop

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

14 changes: 14 additions & 0 deletions
src/lib/es2017.object.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
interface ObjectConstructor {
 /**
 * Returns an array of values of the enumerable properties of an object
 * @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.
 */
 values<T>(o: { [s: string]: T }): T[];
 values(o: any): any[];
 /**
 * Returns an array of key/values of the enumerable properties of an object
 * @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.
 */
 entries<T>(o: { [s: string]: T }): [string, T][];
 entries(o: any): [string, any][];
}

19 changes: 19 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
//// [useObjectValuesAndEntries1.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

//// [useObjectValuesAndEntries1.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
 var x = _a[_i];
 var y = x;
}
var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

32 changes: 32 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries1.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries1.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

 let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries1.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries1.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : Symbol(entries1, Decl(useObjectValuesAndEntries1.ts, 8, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))


39 changes: 39 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

 let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : [string, any][]
>Object.entries(1) : [string, any][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>1 : number


17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries2.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts (2 errors) ====

 var o = { a: 1, b: 2 };

 for (var x of Object.values(o)) {
 ~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
 let y = x;
 }

 var entries = Object.entries(o);
 ~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries2.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
//// [useObjectValuesAndEntries2.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries2.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
 var x = _a[_i];
 var y = x;
}
var entries = Object.entries(o);

17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries3.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts (2 errors) ====

 var o = { a: 1, b: 2 };

 for (var x of Object.values(o)) {
 ~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
 let y = x;
 }

 var entries = Object.entries(o);
 ~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

16 changes: 16 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries3.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries3.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries3.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
 let y = x;
}
var entries = Object.entries(o);

16 changes: 16 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries4.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries4.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
 let y = x;
}
var entries = Object.entries(o);

26 changes: 26 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries4.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries4.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))

 let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries4.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries4.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))


31 changes: 31 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

 let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }


11 changes: 11 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// @target: es5
// @lib: es5,es2017.object

var o = { a: 1, b: 2 };
@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you have an example of a mixed-type object that uses the any-based overload as well? Something like
varo2={a: 'first',b: 2};varentries=Object.entries(o);// <-- entries: [string, any][]

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

10 changes: 10 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es5
// @lib: es5

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

9 changes: 9 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
// @target: es6
@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// @lib: ess6,es2017.object would make this file compile without errors, right?
@yuitYui (yuit)May 10, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep!

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

10 changes: 10 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es6
// @lib: es2017

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

8 changes: 4 additions & 4 deletions
tests/cases/unittests/commandLineParsing.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ namespace ts {
 assertParseResult(["--lib", "es5,invalidOption", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand DownExpand Up@@ -217,7 +217,7 @@ namespace ts {
 start: undefined,
 length: undefined,
 }, {
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -237,7 +237,7 @@ namespace ts {
 assertParseResult(["--lib", "es5,", "es7", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -257,7 +257,7 @@ namespace ts {
 assertParseResult(["--lib", "es5, ", "es7", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix 8482: Add Object.values and Object.entries #8538

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.

 Sign up for GitHub

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

Yui (yuit)
merged 9 commits into

from

May 10, 2016
 Merged


Fix 8482: Add Object.values and Object.entries #8538
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
2b796ad

Add es2017.Object library file

May 9, 2016
3cd8b3a

Add tests and baselines

May 9, 2016
f3de1ec

Fix unittest

May 9, 2016
5184bea

Add es2017 lib flag

May 10, 2016
cc18e6a

Update baselines

May 10, 2016
fbd017d

Add tests and baselines

May 10, 2016
01b94cb

Address PR: add tests

May 10, 2016
191980e

Address PR: add tests

May 10, 2016
90264db

Merge branch 'fix8482' of https://github.com/Microsoft/TypeScript int…

May 10, 2016

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: 8 additions & 1 deletion
Jakefile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,12 @@ var es2016LibrarySourceMap = es2016LibrarySource.map(function(source) {
 return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var es2017LibrarySource = ["es2017.object.d.ts"];

var es2017LibrarySourceMap = es2017LibrarySource.map(function(source) {
 return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var hostsLibrarySources = ["dom.generated.d.ts", "webworker.importscripts.d.ts", "scripthost.d.ts"]

var librarySourceMap = [
Expand All@@ -200,11 +206,12 @@ var librarySourceMap = [
 { target: "lib.es5.d.ts", sources: ["header.d.ts", "es5.d.ts"] },
 { target: "lib.es2015.d.ts", sources: ["header.d.ts", "es2015.d.ts"] },
 { target: "lib.es2016.d.ts", sources: ["header.d.ts", "es2016.d.ts"] },
 { target: "lib.es2017.d.ts", sources: ["header.d.ts", "es2017.d.ts"] },

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

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

4 changes: 3 additions & 1 deletion
src/compiler/commandLineParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,7 @@ namespace ts {
 "es2015": "lib.es2015.d.ts",
 "es7": "lib.es2016.d.ts",
 "es2016": "lib.es2016.d.ts",
 "es2017": "lib.es2017.d.ts",
 // Host only
 "dom": "lib.dom.d.ts",
 "webworker": "lib.webworker.d.ts",
Expand All@@ -389,7 +390,8 @@ namespace ts {
 "es2015.reflect": "lib.es2015.reflect.d.ts",
 "es2015.symbol": "lib.es2015.symbol.d.ts",
 "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
 "es2016.array.include": "lib.es2016.array.include.d.ts"
 "es2016.array.include": "lib.es2016.array.include.d.ts",
 "es2017.object": "lib.es2017.object.d.ts"
 },
 },
 description: Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
Expand Down

2 changes: 2 additions & 0 deletions
src/lib/es2017.d.ts

View file


Open in desktop

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

14 changes: 14 additions & 0 deletions
src/lib/es2017.object.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
interface ObjectConstructor {
 /**
 * Returns an array of values of the enumerable properties of an object
 * @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.
 */
 values<T>(o: { [s: string]: T }): T[];
 values(o: any): any[];
 /**
 * Returns an array of key/values of the enumerable properties of an object
 * @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.
 */
 entries<T>(o: { [s: string]: T }): [string, T][];
 entries(o: any): [string, any][];
}

19 changes: 19 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
//// [useObjectValuesAndEntries1.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

//// [useObjectValuesAndEntries1.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
 var x = _a[_i];
 var y = x;
}
var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

32 changes: 32 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries1.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries1.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

 let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries1.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries1.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : Symbol(entries1, Decl(useObjectValuesAndEntries1.ts, 8, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))


39 changes: 39 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

 let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : [string, any][]
>Object.entries(1) : [string, any][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>1 : number


17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries2.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts (2 errors) ====

 var o = { a: 1, b: 2 };

 for (var x of Object.values(o)) {
 ~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
 let y = x;
 }

 var entries = Object.entries(o);
 ~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries2.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
//// [useObjectValuesAndEntries2.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries2.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
 var x = _a[_i];
 var y = x;
}
var entries = Object.entries(o);

17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries3.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts (2 errors) ====

 var o = { a: 1, b: 2 };

 for (var x of Object.values(o)) {
 ~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
 let y = x;
 }

 var entries = Object.entries(o);
 ~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

16 changes: 16 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries3.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries3.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries3.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
 let y = x;
}
var entries = Object.entries(o);

16 changes: 16 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries4.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries4.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
 let y = x;
}
var entries = Object.entries(o);

26 changes: 26 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries4.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries4.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))

 let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries4.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries4.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))


31 changes: 31 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

 let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }


11 changes: 11 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// @target: es5
// @lib: es5,es2017.object

var o = { a: 1, b: 2 };
@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you have an example of a mixed-type object that uses the any-based overload as well? Something like
varo2={a: 'first',b: 2};varentries=Object.entries(o);// <-- entries: [string, any][]

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

10 changes: 10 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es5
// @lib: es5

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

9 changes: 9 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
// @target: es6
@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// @lib: ess6,es2017.object would make this file compile without errors, right?
@yuitYui (yuit)May 10, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep!

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

10 changes: 10 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es6
// @lib: es2017

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

8 changes: 4 additions & 4 deletions
tests/cases/unittests/commandLineParsing.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ namespace ts {
 assertParseResult(["--lib", "es5,invalidOption", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand DownExpand Up@@ -217,7 +217,7 @@ namespace ts {
 start: undefined,
 length: undefined,
 }, {
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -237,7 +237,7 @@ namespace ts {
 assertParseResult(["--lib", "es5,", "es7", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -257,7 +257,7 @@ namespace ts {
 assertParseResult(["--lib", "es5, ", "es7", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix 8482: Add Object.values and Object.entries #8538

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.

 Sign up for GitHub

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

Yui (yuit)
merged 9 commits into

from

May 10, 2016
 Merged


Fix 8482: Add Object.values and Object.entries #8538
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
2b796ad

Add es2017.Object library file

May 9, 2016
3cd8b3a

Add tests and baselines

May 9, 2016
f3de1ec

Fix unittest

May 9, 2016
5184bea

Add es2017 lib flag

May 10, 2016
cc18e6a

Update baselines

May 10, 2016
fbd017d

Add tests and baselines

May 10, 2016
01b94cb

Address PR: add tests

May 10, 2016
191980e

Address PR: add tests

May 10, 2016
90264db

Merge branch 'fix8482' of https://github.com/Microsoft/TypeScript int…

May 10, 2016

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: 8 additions & 1 deletion
Jakefile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -187,6 +187,12 @@ var es2016LibrarySourceMap = es2016LibrarySource.map(function(source) {
 return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var es2017LibrarySource = ["es2017.object.d.ts"];

var es2017LibrarySourceMap = es2017LibrarySource.map(function(source) {
 return { target: "lib." + source, sources: ["header.d.ts", source] };
})

var hostsLibrarySources = ["dom.generated.d.ts", "webworker.importscripts.d.ts", "scripthost.d.ts"]

var librarySourceMap = [
Expand All@@ -200,11 +206,12 @@ var librarySourceMap = [
 { target: "lib.es5.d.ts", sources: ["header.d.ts", "es5.d.ts"] },
 { target: "lib.es2015.d.ts", sources: ["header.d.ts", "es2015.d.ts"] },
 { target: "lib.es2016.d.ts", sources: ["header.d.ts", "es2016.d.ts"] },
 { target: "lib.es2017.d.ts", sources: ["header.d.ts", "es2017.d.ts"] },

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

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

4 changes: 3 additions & 1 deletion
src/compiler/commandLineParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,7 @@ namespace ts {
 "es2015": "lib.es2015.d.ts",
 "es7": "lib.es2016.d.ts",
 "es2016": "lib.es2016.d.ts",
 "es2017": "lib.es2017.d.ts",
 // Host only
 "dom": "lib.dom.d.ts",
 "webworker": "lib.webworker.d.ts",
Expand All@@ -389,7 +390,8 @@ namespace ts {
 "es2015.reflect": "lib.es2015.reflect.d.ts",
 "es2015.symbol": "lib.es2015.symbol.d.ts",
 "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
 "es2016.array.include": "lib.es2016.array.include.d.ts"
 "es2016.array.include": "lib.es2016.array.include.d.ts",
 "es2017.object": "lib.es2017.object.d.ts"
 },
 },
 description: Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
Expand Down

2 changes: 2 additions & 0 deletions
src/lib/es2017.d.ts

View file


Open in desktop

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

14 changes: 14 additions & 0 deletions
src/lib/es2017.object.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
interface ObjectConstructor {
 /**
 * Returns an array of values of the enumerable properties of an object
 * @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.
 */
 values<T>(o: { [s: string]: T }): T[];
 values(o: any): any[];
 /**
 * Returns an array of key/values of the enumerable properties of an object
 * @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.
 */
 entries<T>(o: { [s: string]: T }): [string, T][];
 entries(o: any): [string, any][];
}

19 changes: 19 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
//// [useObjectValuesAndEntries1.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

//// [useObjectValuesAndEntries1.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
 var x = _a[_i];
 var y = x;
}
var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

32 changes: 32 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries1.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries1.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

 let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries1.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries1.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries1.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries1.ts, 1, 3))

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : Symbol(entries1, Decl(useObjectValuesAndEntries1.ts, 8, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))


39 changes: 39 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries1.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

 let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }

var entries1 = Object.entries(1); // <-- entries: [string, any][]
>entries1 : [string, any][]
>Object.entries(1) : [string, any][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>1 : number


17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries2.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts (2 errors) ====

 var o = { a: 1, b: 2 };

 for (var x of Object.values(o)) {
 ~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
 let y = x;
 }

 var entries = Object.entries(o);
 ~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries2.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
//// [useObjectValuesAndEntries2.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries2.js]
var o = { a: 1, b: 2 };
for (var _i = 0, _a = Object.values(o); _i < _a.length; _i++) {
 var x = _a[_i];
 var y = x;
}
var entries = Object.entries(o);

17 changes: 17 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries3.errors.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(4,22): error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts(8,22): error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.


==== tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts (2 errors) ====

 var o = { a: 1, b: 2 };

 for (var x of Object.values(o)) {
 ~~~~~~
!!! error TS2339: Property 'values' does not exist on type 'ObjectConstructor'.
 let y = x;
 }

 var entries = Object.entries(o);
 ~~~~~~~
!!! error TS2339: Property 'entries' does not exist on type 'ObjectConstructor'.

16 changes: 16 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries3.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries3.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries3.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
 let y = x;
}
var entries = Object.entries(o);

16 changes: 16 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
//// [useObjectValuesAndEntries4.ts]

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

//// [useObjectValuesAndEntries4.js]
var o = { a: 1, b: 2 };
for (var x of Object.values(o)) {
 let y = x;
}
var entries = Object.entries(o);

26 changes: 26 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.symbols

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))
>a : Symbol(a, Decl(useObjectValuesAndEntries4.ts, 1, 9))
>b : Symbol(b, Decl(useObjectValuesAndEntries4.ts, 1, 15))

for (var x of Object.values(o)) {
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
>Object.values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>values : Symbol(ObjectConstructor.values, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))

 let y = x;
>y : Symbol(y, Decl(useObjectValuesAndEntries4.ts, 4, 7))
>x : Symbol(x, Decl(useObjectValuesAndEntries4.ts, 3, 8))
}

var entries = Object.entries(o);
>entries : Symbol(entries, Decl(useObjectValuesAndEntries4.ts, 7, 3))
>Object.entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
>entries : Symbol(ObjectConstructor.entries, Decl(lib.es2017.object.d.ts, --, --), Decl(lib.es2017.object.d.ts, --, --))
>o : Symbol(o, Decl(useObjectValuesAndEntries4.ts, 1, 3))


31 changes: 31 additions & 0 deletions
tests/baselines/reference/useObjectValuesAndEntries4.types

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
=== tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts ===

var o = { a: 1, b: 2 };
>o : { a: number; b: number; }
>{ a: 1, b: 2 } : { a: number; b: number; }
>a : number
>1 : number
>b : number
>2 : number

for (var x of Object.values(o)) {
>x : number
>Object.values(o) : number[]
>Object.values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>Object : ObjectConstructor
>values : { <T>(o: { [s: string]: T; }): T[]; (o: any): any[]; }
>o : { a: number; b: number; }

 let y = x;
>y : number
>x : number
}

var entries = Object.entries(o);
>entries : [string, number][]
>Object.entries(o) : [string, number][]
>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>Object : ObjectConstructor
>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
>o : { a: number; b: number; }


11 changes: 11 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries1.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
// @target: es5
// @lib: es5,es2017.object

var o = { a: 1, b: 2 };
@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you have an example of a mixed-type object that uses the any-based overload as well? Something like
varo2={a: 'first',b: 2};varentries=Object.entries(o);// <-- entries: [string, any][]

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);
var entries1 = Object.entries(1); // <-- entries: [string, any][]

10 changes: 10 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries2.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es5
// @lib: es5

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

9 changes: 9 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries3.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
// @target: es6
@sandersnNathan Shively-Sanders (sandersn)May 10, 2016

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// @lib: ess6,es2017.object would make this file compile without errors, right?
@yuitYui (yuit)May 10, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep!

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

10 changes: 10 additions & 0 deletions
tests/cases/conformance/es2017/useObjectValuesAndEntries4.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
// @target: es6
// @lib: es2017

var o = { a: 1, b: 2 };

for (var x of Object.values(o)) {
 let y = x;
}

var entries = Object.entries(o);

8 changes: 4 additions & 4 deletions
tests/cases/unittests/commandLineParsing.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,7 +60,7 @@ namespace ts {
 assertParseResult(["--lib", "es5,invalidOption", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand DownExpand Up@@ -217,7 +217,7 @@ namespace ts {
 start: undefined,
 length: undefined,
 }, {
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -237,7 +237,7 @@ namespace ts {
 assertParseResult(["--lib", "es5,", "es7", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand All@@ -257,7 +257,7 @@ namespace ts {
 assertParseResult(["--lib", "es5, ", "es7", "0.ts"],
 {
 errors: [{
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include'",
 messageText: "Argument for '--lib' option must be: 'es5', 'es6', 'es2015', 'es7', 'es2016', 'es2017', 'dom', 'webworker', 'scripthost', 'es2015.core', 'es2015.collection', 'es2015.generator', 'es2015.iterable', 'es2015.promise', 'es2015.proxy', 'es2015.reflect', 'es2015.symbol', 'es2015.symbol.wellknown', 'es2016.array.include', 'es2017.object'",
 category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
 code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code,

Expand Down
Loading