Skip to content

Commit 255ff27

Browse files
rbucktonrbuckton
committed
Emit dynamic names for object literal types
1 parent 64fd857 commit 255ff27

12 files changed

+99
-75
lines changed

Diff for: ‎src/compiler/checker.ts

+23-6
Original file line numberDiff line numberDiff line change
@@ -2897,9 +2897,9 @@ namespace ts {
28972897
}
28982898

28992899
function getNameOfSymbol(symbol: Symbol): string {
2900-
if (symbol.flags & SymbolFlags.Dynamic) {
2901-
return `"${escapeString(unescapeIdentifier(symbol.name))}"`;
2902-
}
2900+
// if (symbol.flags & SymbolFlags.Dynamic) {
2901+
// return `"${escapeString(unescapeIdentifier(symbol.name))}"`;
2902+
// }
29032903
if (symbol.declarations && symbol.declarations.length) {
29042904
const declaration = symbol.declarations[0];
29052905
if (declaration.name) {
@@ -3258,6 +3258,10 @@ namespace ts {
32583258
writeKeyword(writer, SyntaxKind.ReadonlyKeyword);
32593259
writeSpace(writer);
32603260
}
3261+
if (prop.flags & SymbolFlags.Dynamic && (<TransientSymbol>prop).dynamicSource) {
3262+
const accessibilityResult = isSymbolAccessible((<TransientSymbol>prop).dynamicSource, enclosingDeclaration, SymbolFlags.Value, /*shouldComputeAliasesToMakeVisible*/ false);
3263+
writer.reportInaccessibleSymbolError(accessibilityResult);
3264+
}
32613265
buildSymbolDisplay(prop, writer);
32623266
if (prop.flags & SymbolFlags.Optional) {
32633267
writePunctuation(writer, SyntaxKind.QuestionToken);
@@ -5193,7 +5197,7 @@ namespace ts {
51935197
resolveDynamicMembersOfNode(node, (<ClassLikeDeclaration | InterfaceDeclaration | TypeLiteralNode>node).members, symbolTable);
51945198
break;
51955199
case SyntaxKind.ObjectLiteralExpression:
5196-
resolveDynamicMembersOfNode(node, (<ObjectLiteralExpression>node).properties, symbolTable);
5200+
resolveDynamicMembersOfNode(node, (<ObjectLiteralExpression>node).properties, symbolTable);
51975201
break;
51985202
}
51995203
}
@@ -13191,7 +13195,20 @@ namespace ts {
1319113195
}
1319213196

1319313197
typeFlags |= type.flags;
13194-
const prop = createSymbol(SymbolFlags.Property | member.flags, member.name);
13198+
13199+
let prop: TransientSymbol;
13200+
if (hasDynamicName(memberDecl) && isEntityNameExpression((<ComputedPropertyName>memberDecl.name).expression)) {
13201+
const nameType = checkComputedPropertyName(<ComputedPropertyName>memberDecl.name);
13202+
if (nameType && nameType.flags & TypeFlags.StringOrNumberLiteral) {
13203+
prop = createSymbol(SymbolFlags.Property | SymbolFlags.Dynamic | member.flags, (<LiteralType>nameType).text);
13204+
prop.dynamicSource = resolveEntityName(<EntityNameExpression>(<ComputedPropertyName>memberDecl.name).expression, SymbolFlags.Value);
13205+
}
13206+
}
13207+
13208+
if (!prop) {
13209+
prop = createSymbol(SymbolFlags.Property | member.flags, member.name);
13210+
}
13211+
1319513212
if (inDestructuringPattern) {
1319613213
// If object literal is an assignment pattern and if the assignment pattern specifies a default value
1319713214
// for the property, make the property optional.
@@ -13259,7 +13276,7 @@ namespace ts {
1325913276
checkNodeDeferred(memberDecl);
1326013277
}
1326113278

13262-
if (hasDynamicName(memberDecl)) {
13279+
if (hasDynamicName(memberDecl) && !(member && member.flags & SymbolFlags.Dynamic)) {
1326313280
if (isNumericName(memberDecl.name)) {
1326413281
hasComputedNumberProperty = true;
1326513282
}

Diff for: ‎src/compiler/declarationEmitter.ts

+4-8
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ namespace ts {
191191
writer.trackSymbol = trackSymbol;
192192
writer.reportInaccessibleThisError = reportInaccessibleThisError;
193193
writer.reportIllegalExtends = reportIllegalExtends;
194+
writer.reportInaccessibleSymbolError = handleSymbolAccessibilityError;
194195
writer.writeKeyword = writer.write;
195196
writer.writeOperator = writer.write;
196197
writer.writePunctuation = writer.write;
@@ -1297,14 +1298,9 @@ namespace ts {
12971298
function emitDynamicName(entityName: EntityNameExpression) {
12981299
writer.getSymbolAccessibilityDiagnostic = getVariableDeclarationTypeVisibilityError;
12991300
const visibilityResult = resolver.isEntityNameVisible(entityName, enclosingDeclaration);
1300-
if (visibilityResult.accessibility !== SymbolAccessibility.Accessible) {
1301-
resolver.writeTypeOfExpression(entityName, enclosingDeclaration, TypeFormatFlags.None, writer);
1302-
}
1303-
else {
1304-
handleSymbolAccessibilityError(visibilityResult);
1305-
recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForEntityName(entityName));
1306-
writeTextOfNode(currentText, node.name);
1307-
}
1301+
handleSymbolAccessibilityError(visibilityResult);
1302+
recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForEntityName(entityName));
1303+
writeTextOfNode(currentText, node.name);
13081304
}
13091305

13101306
function emitBindingPattern(bindingPattern: BindingPattern) {

Diff for: ‎src/compiler/types.ts

+4
Original file line numberDiff line numberDiff line change
@@ -2609,7 +2609,10 @@ namespace ts {
26092609
// with import statements it previously saw (but chose not to emit).
26102610
trackSymbol(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): void;
26112611
reportInaccessibleThisError(): void;
2612+
/* @internal */
2613+
reportInaccessibleSymbolError(symbolAccessibilityResult: SymbolAccessibilityResult): void;
26122614
reportIllegalExtends(): void;
2615+
26132616
}
26142617

26152618
export const enum TypeFormatFlags {
@@ -2880,6 +2883,7 @@ namespace ts {
28802883
exportsSomeValue?: boolean; // True if module exports some value (not just types)
28812884
dynamicMembers?: SymbolTable; // Dynamic members with literal names resolved during check
28822885
resolvedMembers?: SymbolTable;
2886+
dynamicSource?: Symbol;
28832887
}
28842888

28852889
/* @internal */

Diff for: ‎src/compiler/utilities.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ namespace ts {
6868
clear: () => str = "",
6969
trackSymbol: noop,
7070
reportInaccessibleThisError: noop,
71-
reportIllegalExtends: noop
71+
reportInaccessibleSymbolError: noop,
72+
reportIllegalExtends: noop,
7273
};
7374
}
7475

Diff for: ‎src/services/utilities.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,8 @@ namespace ts {
11741174
clear: resetWriter,
11751175
trackSymbol: noop,
11761176
reportInaccessibleThisError: noop,
1177-
reportIllegalExtends: noop
1177+
reportInaccessibleSymbolError: noop,
1178+
reportIllegalExtends: noop,
11781179
};
11791180

11801181
function writeIndent() {

Diff for: ‎tests/baselines/reference/dynamicNames.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
//// [module.ts]
44
export const c0 = "a";
55
export const c1 = 1;
6-
const c2 = "a";
76
export interface T0 {
87
[c0]: number;
98
[c1]: string;
@@ -15,7 +14,7 @@ export declare class T1 implements T2 {
1514
export declare class T2 extends T1 {
1615
}
1716
export declare type T3 = {
18-
[c2]: number;
17+
[c0]: number;
1918
[c1]: string;
2019
};
2120

@@ -107,7 +106,6 @@ t0 = t12, t0 = t13, t0 = t14, t0 = t15, t12 = t0, t13 = t0, t14 = t0, t15 = t0;
107106
Object.defineProperty(exports, "__esModule", { value: true });
108107
exports.c0 = "a";
109108
exports.c1 = 1;
110-
const c2 = "a";
111109
//// [main.js]
112110
"use strict";
113111
Object.defineProperty(exports, "__esModule", { value: true });
@@ -158,7 +156,7 @@ export declare class T1 implements T2 {
158156
export declare class T2 extends T1 {
159157
}
160158
export declare type T3 = {
161-
"a": number;
159+
[c0]: number;
162160
[c1]: string;
163161
};
164162
//// [main.d.ts]

Diff for: ‎tests/baselines/reference/dynamicNames.symbols

+12-15
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@ export const c0 = "a";
55
export const c1 = 1;
66
>c1 : Symbol(c1, Decl(module.ts, 1, 12))
77

8-
const c2 = "a";
9-
>c2 : Symbol(c2, Decl(module.ts, 2, 5))
10-
118
export interface T0 {
12-
>T0 : Symbol(T0, Decl(module.ts, 2, 15))
9+
>T0 : Symbol(T0, Decl(module.ts, 1, 20))
1310

1411
[c0]: number;
1512
>c0 : Symbol(c0, Decl(module.ts, 0, 12))
@@ -18,8 +15,8 @@ export interface T0 {
1815
>c1 : Symbol(c1, Decl(module.ts, 1, 12))
1916
}
2017
export declare class T1 implements T2 {
21-
>T1 : Symbol(T1, Decl(module.ts, 6, 1))
22-
>T2 : Symbol(T2, Decl(module.ts, 10, 1))
18+
>T1 : Symbol(T1, Decl(module.ts, 5, 1))
19+
>T2 : Symbol(T2, Decl(module.ts, 9, 1))
2320

2421
[c0]: number;
2522
>c0 : Symbol(c0, Decl(module.ts, 0, 12))
@@ -28,14 +25,14 @@ export declare class T1 implements T2 {
2825
>c1 : Symbol(c1, Decl(module.ts, 1, 12))
2926
}
3027
export declare class T2 extends T1 {
31-
>T2 : Symbol(T2, Decl(module.ts, 10, 1))
32-
>T1 : Symbol(T1, Decl(module.ts, 6, 1))
28+
>T2 : Symbol(T2, Decl(module.ts, 9, 1))
29+
>T1 : Symbol(T1, Decl(module.ts, 5, 1))
3330
}
3431
export declare type T3 = {
35-
>T3 : Symbol(T3, Decl(module.ts, 12, 1))
32+
>T3 : Symbol(T3, Decl(module.ts, 11, 1))
3633

37-
[c2]: number;
38-
>c2 : Symbol(c2, Decl(module.ts, 2, 5))
34+
[c0]: number;
35+
>c0 : Symbol(c0, Decl(module.ts, 0, 12))
3936

4037
[c1]: string;
4138
>c1 : Symbol(c1, Decl(module.ts, 1, 12))
@@ -199,22 +196,22 @@ let t3: T3;
199196
let t0_1: M.T0;
200197
>t0_1 : Symbol(t0_1, Decl(main.ts, 60, 3))
201198
>M : Symbol(M, Decl(main.ts, 1, 6))
202-
>T0 : Symbol(T0, Decl(module.ts, 2, 15))
199+
>T0 : Symbol(T0, Decl(module.ts, 1, 20))
203200

204201
let t1_1: M.T1;
205202
>t1_1 : Symbol(t1_1, Decl(main.ts, 61, 3))
206203
>M : Symbol(M, Decl(main.ts, 1, 6))
207-
>T1 : Symbol(T1, Decl(module.ts, 6, 1))
204+
>T1 : Symbol(T1, Decl(module.ts, 5, 1))
208205

209206
let t2_1: M.T2;
210207
>t2_1 : Symbol(t2_1, Decl(main.ts, 62, 3))
211208
>M : Symbol(M, Decl(main.ts, 1, 6))
212-
>T2 : Symbol(T2, Decl(module.ts, 10, 1))
209+
>T2 : Symbol(T2, Decl(module.ts, 9, 1))
213210

214211
let t3_1: M.T3;
215212
>t3_1 : Symbol(t3_1, Decl(main.ts, 63, 3))
216213
>M : Symbol(M, Decl(main.ts, 1, 6))
217-
>T3 : Symbol(T3, Decl(module.ts, 12, 1))
214+
>T3 : Symbol(T3, Decl(module.ts, 11, 1))
218215

219216
let t4: N.T4;
220217
>t4 : Symbol(t4, Decl(main.ts, 64, 3))

Diff for: ‎tests/baselines/reference/dynamicNames.types

+20-24
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ export const c1 = 1;
77
>c1 : 1
88
>1 : 1
99

10-
const c2 = "a";
11-
>c2 : "a"
12-
>"a" : "a"
13-
1410
export interface T0 {
1511
>T0 : T0
1612

@@ -37,8 +33,8 @@ export declare class T2 extends T1 {
3733
export declare type T3 = {
3834
>T3 : T3
3935

40-
[c2]: number;
41-
>c2 : "a"
36+
[c0]: number;
37+
>c0 : "a"
4238

4339
[c1]: string;
4440
>c1 : 1
@@ -100,7 +96,7 @@ namespace N {
10096
>T5 : T5
10197
}
10298
export declare type T7 = {
103-
>T7 : { "a": number; "1": string; }
99+
>T7 : { [N.c2]: number; [N.c3]: string; }
104100

105101
[N.c2]: number;
106102
>N.c2 : "a"
@@ -147,7 +143,7 @@ declare class T10 extends T9 {
147143
>T9 : T9
148144
}
149145
declare type T11 = {
150-
>T11 : { "a": number; "1": string; }
146+
>T11 : { [c4]: number; [c5]: string; }
151147

152148
[c4]: number;
153149
>c4 : "a"
@@ -239,9 +235,9 @@ let t6: N.T6;
239235
>T6 : N.T6
240236

241237
let t7: N.T7;
242-
>t7 : { "a": number; "1": string; }
238+
>t7 : { [N.c2]: number; [N.c3]: string; }
243239
>N : any
244-
>T7 : { "a": number; "1": string; }
240+
>T7 : { [N.c2]: number; [N.c3]: string; }
245241

246242
let t8: T8;
247243
>t8 : T8
@@ -256,8 +252,8 @@ let t10: T10;
256252
>T10 : T10
257253

258254
let t11: T11;
259-
>t11 : { "a": number; "1": string; }
260-
>T11 : { "a": number; "1": string; }
255+
>t11 : { [c4]: number; [c5]: string; }
256+
>T11 : { [c4]: number; [c5]: string; }
261257

262258
let t12: T12;
263259
>t12 : T12
@@ -329,49 +325,49 @@ t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4, t6 = t5, t6 = t7,
329325
>t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4, t6 = t5, t6 = t7, t7 = t4, t7 = t5, t7 = t6 : N.T6
330326
>t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4, t6 = t5, t6 = t7, t7 = t4, t7 = t5 : N.T5
331327
>t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4, t6 = t5, t6 = t7, t7 = t4 : N.T4
332-
>t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4, t6 = t5, t6 = t7 : { "a": number; "1": string; }
328+
>t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4, t6 = t5, t6 = t7 : { [N.c2]: number; [N.c3]: string; }
333329
>t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4, t6 = t5 : N.T5
334330
>t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7, t6 = t4 : N.T4
335-
>t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7 : { "a": number; "1": string; }
331+
>t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6, t5 = t7 : { [N.c2]: number; [N.c3]: string; }
336332
>t4 = t5, t4 = t6, t4 = t7, t5 = t4, t5 = t6 : N.T6
337333
>t4 = t5, t4 = t6, t4 = t7, t5 = t4 : N.T4
338-
>t4 = t5, t4 = t6, t4 = t7 : { "a": number; "1": string; }
334+
>t4 = t5, t4 = t6, t4 = t7 : { [N.c2]: number; [N.c3]: string; }
339335
>t4 = t5, t4 = t6 : N.T6
340336
>t4 = t5 : N.T5
341337
>t4 : N.T4
342338
>t5 : N.T5
343339
>t4 = t6 : N.T6
344340
>t4 : N.T4
345341
>t6 : N.T6
346-
>t4 = t7 : { "a": number; "1": string; }
342+
>t4 = t7 : { [N.c2]: number; [N.c3]: string; }
347343
>t4 : N.T4
348-
>t7 : { "a": number; "1": string; }
344+
>t7 : { [N.c2]: number; [N.c3]: string; }
349345
>t5 = t4 : N.T4
350346
>t5 : N.T5
351347
>t4 : N.T4
352348
>t5 = t6 : N.T6
353349
>t5 : N.T5
354350
>t6 : N.T6
355-
>t5 = t7 : { "a": number; "1": string; }
351+
>t5 = t7 : { [N.c2]: number; [N.c3]: string; }
356352
>t5 : N.T5
357-
>t7 : { "a": number; "1": string; }
353+
>t7 : { [N.c2]: number; [N.c3]: string; }
358354
>t6 = t4 : N.T4
359355
>t6 : N.T6
360356
>t4 : N.T4
361357
>t6 = t5 : N.T5
362358
>t6 : N.T6
363359
>t5 : N.T5
364-
>t6 = t7 : { "a": number; "1": string; }
360+
>t6 = t7 : { [N.c2]: number; [N.c3]: string; }
365361
>t6 : N.T6
366-
>t7 : { "a": number; "1": string; }
362+
>t7 : { [N.c2]: number; [N.c3]: string; }
367363
>t7 = t4 : N.T4
368-
>t7 : { "a": number; "1": string; }
364+
>t7 : { [N.c2]: number; [N.c3]: string; }
369365
>t4 : N.T4
370366
>t7 = t5 : N.T5
371-
>t7 : { "a": number; "1": string; }
367+
>t7 : { [N.c2]: number; [N.c3]: string; }
372368
>t5 : N.T5
373369
>t7 = t6 : N.T6
374-
>t7 : { "a": number; "1": string; }
370+
>t7 : { [N.c2]: number; [N.c3]: string; }
375371
>t6 : N.T6
376372

377373
t0 = t12, t0 = t13, t0 = t14, t0 = t15, t12 = t0, t13 = t0, t14 = t0, t15 = t0;

0 commit comments

Comments
 (0)