Skip to content

Commit 397ff84

Browse files
sandersnsandersn
authored
Merge pull request #18317 from Microsoft/object-literal-enum-property-names
Object literals computed property names allow literal-typed expressions
2 parents 1b5a0ae + 3c5b2a5 commit 397ff84

15 files changed

+511
-23
lines changed

‎src/compiler/checker.ts

+10-3
Original file line numberDiff line numberDiff line change
@@ -13532,6 +13532,7 @@ namespace ts {
1353213532
for (let i = 0; i < node.properties.length; i++) {
1353313533
const memberDecl = node.properties[i];
1353413534
let member = memberDecl.symbol;
13535+
let literalName: __String | undefined;
1353513536
if (memberDecl.kind === SyntaxKind.PropertyAssignment ||
1353613537
memberDecl.kind === SyntaxKind.ShorthandPropertyAssignment ||
1353713538
isObjectLiteralMethod(memberDecl)) {
@@ -13542,6 +13543,12 @@ namespace ts {
1354213543

1354313544
let type: Type;
1354413545
if (memberDecl.kind === SyntaxKind.PropertyAssignment) {
13546+
if (memberDecl.name.kind === SyntaxKind.ComputedPropertyName) {
13547+
const t = checkComputedPropertyName(<ComputedPropertyName>memberDecl.name);
13548+
if (t.flags & TypeFlags.Literal) {
13549+
literalName = escapeLeadingUnderscores("" + (t as LiteralType).value);
13550+
}
13551+
}
1354513552
type = checkPropertyAssignment(<PropertyAssignment>memberDecl, checkMode);
1354613553
}
1354713554
else if (memberDecl.kind === SyntaxKind.MethodDeclaration) {
@@ -13558,7 +13565,7 @@ namespace ts {
1355813565
}
1355913566

1356013567
typeFlags |= type.flags;
13561-
const prop = createSymbol(SymbolFlags.Property | member.flags, member.escapedName);
13568+
const prop = createSymbol(SymbolFlags.Property | member.flags, literalName || member.escapedName);
1356213569
if (inDestructuringPattern) {
1356313570
// If object literal is an assignment pattern and if the assignment pattern specifies a default value
1356413571
// for the property, make the property optional.
@@ -13568,7 +13575,7 @@ namespace ts {
1356813575
if (isOptional) {
1356913576
prop.flags |= SymbolFlags.Optional;
1357013577
}
13571-
if (hasDynamicName(memberDecl)) {
13578+
if (!literalName && hasDynamicName(memberDecl)) {
1357213579
patternWithComputedProperties = true;
1357313580
}
1357413581
}
@@ -13626,7 +13633,7 @@ namespace ts {
1362613633
checkNodeDeferred(memberDecl);
1362713634
}
1362813635

13629-
if (hasDynamicName(memberDecl)) {
13636+
if (!literalName && hasDynamicName(memberDecl)) {
1363013637
if (isNumericName(memberDecl.name)) {
1363113638
hasComputedNumberProperty = true;
1363213639
}

‎tests/baselines/reference/computedPropertyNames46_ES5.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=== tests/cases/conformance/es6/computedProperties/computedPropertyNames46_ES5.ts ===
22
var o = {
3-
>o : { [x: number]: number; }
4-
>{ ["" || 0]: 0} : { [x: number]: number; }
3+
>o : { ["" || 0]: number; }
4+
>{ ["" || 0]: 0} : { ["" || 0]: number; }
55

66
["" || 0]: 0
77
>"" || 0 : 0

‎tests/baselines/reference/computedPropertyNames46_ES6.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=== tests/cases/conformance/es6/computedProperties/computedPropertyNames46_ES6.ts ===
22
var o = {
3-
>o : { [x: number]: number; }
4-
>{ ["" || 0]: 0} : { [x: number]: number; }
3+
>o : { ["" || 0]: number; }
4+
>{ ["" || 0]: 0} : { ["" || 0]: number; }
55

66
["" || 0]: 0
77
>"" || 0 : 0

‎tests/baselines/reference/computedPropertyNames47_ES5.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ enum E2 { x }
88
>x : E2
99

1010
var o = {
11-
>o : { [x: number]: number; }
12-
>{ [E1.x || E2.x]: 0} : { [x: number]: number; }
11+
>o : { [E1.x || E2.x]: number; }
12+
>{ [E1.x || E2.x]: 0} : { [E1.x || E2.x]: number; }
1313

1414
[E1.x || E2.x]: 0
1515
>E1.x || E2.x : E2

‎tests/baselines/reference/computedPropertyNames47_ES6.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ enum E2 { x }
88
>x : E2
99

1010
var o = {
11-
>o : { [x: number]: number; }
12-
>{ [E1.x || E2.x]: 0} : { [x: number]: number; }
11+
>o : { [E1.x || E2.x]: number; }
12+
>{ [E1.x || E2.x]: 0} : { [E1.x || E2.x]: number; }
1313

1414
[E1.x || E2.x]: 0
1515
>E1.x || E2.x : E2

‎tests/baselines/reference/computedPropertyNames48_ES5.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ extractIndexer({
2828
extractIndexer({
2929
>extractIndexer({ [E.x]: ""}) : string
3030
>extractIndexer : <T>(p: { [n: number]: T; }) => T
31-
>{ [E.x]: ""} : { [x: number]: string; }
31+
>{ [E.x]: ""} : { [E.x]: string; }
3232

3333
[E.x]: ""
3434
>E.x : E
@@ -41,7 +41,7 @@ extractIndexer({
4141
extractIndexer({
4242
>extractIndexer({ ["" || 0]: ""}) : string
4343
>extractIndexer : <T>(p: { [n: number]: T; }) => T
44-
>{ ["" || 0]: ""} : { [x: number]: string; }
44+
>{ ["" || 0]: ""} : { ["" || 0]: string; }
4545

4646
["" || 0]: ""
4747
>"" || 0 : 0

‎tests/baselines/reference/computedPropertyNames48_ES6.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ extractIndexer({
2828
extractIndexer({
2929
>extractIndexer({ [E.x]: ""}) : string
3030
>extractIndexer : <T>(p: { [n: number]: T; }) => T
31-
>{ [E.x]: ""} : { [x: number]: string; }
31+
>{ [E.x]: ""} : { [E.x]: string; }
3232

3333
[E.x]: ""
3434
>E.x : E
@@ -41,7 +41,7 @@ extractIndexer({
4141
extractIndexer({
4242
>extractIndexer({ ["" || 0]: ""}) : string
4343
>extractIndexer : <T>(p: { [n: number]: T; }) => T
44-
>{ ["" || 0]: ""} : { [x: number]: string; }
44+
>{ ["" || 0]: ""} : { ["" || 0]: string; }
4545

4646
["" || 0]: ""
4747
>"" || 0 : 0

‎tests/baselines/reference/computedPropertyNames4_ES5.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ var a: any;
99
>a : any
1010

1111
var v = {
12-
>v : { [x: string]: string | number; [x: number]: string | number; [""]: number; [0]: number; }
13-
>{ [s]: 0, [n]: n, [s + s]: 1, [s + n]: 2, [+s]: s, [""]: 0, [0]: 0, [a]: 1, [<any>true]: 0, [`hello bye`]: 0, [`hello ${a} bye`]: 0} : { [x: string]: string | number; [x: number]: string | number; [""]: number; [0]: number; }
12+
>v : { [x: string]: string | number; [x: number]: string | number; [""]: number; [0]: number; [`hello bye`]: number; }
13+
>{ [s]: 0, [n]: n, [s + s]: 1, [s + n]: 2, [+s]: s, [""]: 0, [0]: 0, [a]: 1, [<any>true]: 0, [`hello bye`]: 0, [`hello ${a} bye`]: 0} : { [x: string]: string | number; [x: number]: string | number; [""]: number; [0]: number; [`hello bye`]: number; }
1414

1515
[s]: 0,
1616
>s : string

‎tests/baselines/reference/computedPropertyNames4_ES6.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ var a: any;
99
>a : any
1010

1111
var v = {
12-
>v : { [x: string]: string | number; [x: number]: string | number; [""]: number; [0]: number; }
13-
>{ [s]: 0, [n]: n, [s + s]: 1, [s + n]: 2, [+s]: s, [""]: 0, [0]: 0, [a]: 1, [<any>true]: 0, [`hello bye`]: 0, [`hello ${a} bye`]: 0} : { [x: string]: string | number; [x: number]: string | number; [""]: number; [0]: number; }
12+
>v : { [x: string]: string | number; [x: number]: string | number; [""]: number; [0]: number; [`hello bye`]: number; }
13+
>{ [s]: 0, [n]: n, [s + s]: 1, [s + n]: 2, [+s]: s, [""]: 0, [0]: 0, [a]: 1, [<any>true]: 0, [`hello bye`]: 0, [`hello ${a} bye`]: 0} : { [x: string]: string | number; [x: number]: string | number; [""]: number; [0]: number; [`hello bye`]: number; }
1414

1515
[s]: 0,
1616
>s : string

‎tests/baselines/reference/computedPropertyNames7_ES5.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ enum E {
66
>member : E
77
}
88
var v = {
9-
>v : { [x: number]: number; }
10-
>{ [E.member]: 0} : { [x: number]: number; }
9+
>v : { [E.member]: number; }
10+
>{ [E.member]: 0} : { [E.member]: number; }
1111

1212
[E.member]: 0
1313
>E.member : E

‎tests/baselines/reference/computedPropertyNames7_ES6.types

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ enum E {
66
>member : E
77
}
88
var v = {
9-
>v : { [x: number]: number; }
10-
>{ [E.member]: 0} : { [x: number]: number; }
9+
>v : { [E.member]: number; }
10+
>{ [E.member]: 0} : { [E.member]: number; }
1111

1212
[E.member]: 0
1313
>E.member : E

‎tests/baselines/reference/objectLiteralEnumPropertyNames.js

+108
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
//// [objectLiteralEnumPropertyNames.ts]
2+
// Fixes #16887
3+
enum Strs {
4+
A = 'a',
5+
B = 'b'
6+
}
7+
type TestStrs = { [key in Strs]: string }
8+
const x: TestStrs = {
9+
[Strs.A]: 'xo',
10+
[Strs.B]: 'xe'
11+
}
12+
const ux = {
13+
[Strs.A]: 'xo',
14+
[Strs.B]: 'xe'
15+
}
16+
const y: TestStrs = {
17+
['a']: 'yo',
18+
['b']: 'ye'
19+
}
20+
const a = 'a';
21+
const b = 'b';
22+
const z: TestStrs = {
23+
[a]: 'zo',
24+
[b]: 'ze'
25+
}
26+
const uz = {
27+
[a]: 'zo',
28+
[b]: 'ze'
29+
}
30+
31+
enum Nums {
32+
A,
33+
B
34+
}
35+
type TestNums = { 0: number, 1: number }
36+
const n: TestNums = {
37+
[Nums.A]: 1,
38+
[Nums.B]: 2
39+
}
40+
const un = {
41+
[Nums.A]: 3,
42+
[Nums.B]: 4
43+
}
44+
const an = 0;
45+
const bn = 1;
46+
const m: TestNums = {
47+
[an]: 5,
48+
[bn]: 6
49+
}
50+
const um = {
51+
[an]: 7,
52+
[bn]: 8
53+
}
54+
55+
56+
//// [objectLiteralEnumPropertyNames.js]
57+
// Fixes #16887
58+
var Strs;
59+
(function (Strs) {
60+
Strs["A"] = "a";
61+
Strs["B"] = "b";
62+
})(Strs || (Strs = {}));
63+
var x = (_a = {},
64+
_a[Strs.A] = 'xo',
65+
_a[Strs.B] = 'xe',
66+
_a);
67+
var ux = (_b = {},
68+
_b[Strs.A] = 'xo',
69+
_b[Strs.B] = 'xe',
70+
_b);
71+
var y = (_c = {},
72+
_c['a'] = 'yo',
73+
_c['b'] = 'ye',
74+
_c);
75+
var a = 'a';
76+
var b = 'b';
77+
var z = (_d = {},
78+
_d[a] = 'zo',
79+
_d[b] = 'ze',
80+
_d);
81+
var uz = (_e = {},
82+
_e[a] = 'zo',
83+
_e[b] = 'ze',
84+
_e);
85+
var Nums;
86+
(function (Nums) {
87+
Nums[Nums["A"] = 0] = "A";
88+
Nums[Nums["B"] = 1] = "B";
89+
})(Nums || (Nums = {}));
90+
var n = (_f = {},
91+
_f[Nums.A] = 1,
92+
_f[Nums.B] = 2,
93+
_f);
94+
var un = (_g = {},
95+
_g[Nums.A] = 3,
96+
_g[Nums.B] = 4,
97+
_g);
98+
var an = 0;
99+
var bn = 1;
100+
var m = (_h = {},
101+
_h[an] = 5,
102+
_h[bn] = 6,
103+
_h);
104+
var um = (_j = {},
105+
_j[an] = 7,
106+
_j[bn] = 8,
107+
_j);
108+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;

0 commit comments

Comments
 (0)