Skip to content

Commit f1fcd56

Browse files
weswighamweswigham
committed
More tests, only use computed name emit when all names are visible
1 parent 22c5c89 commit f1fcd56

44 files changed

Lines changed: 828 additions & 168 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/compiler/checker.ts‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7211,29 +7211,25 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
72117211
function indexInfoToObjectComputedNamesOrSignatureDeclaration(indexInfo: IndexInfo, context: NodeBuilderContext, typeNode: TypeNode | undefined): [IndexSignatureDeclaration] | PropertySignature[] {
72127212
if (indexInfo.components) {
72137213
// Index info is derived from object or class computed property names (plus explicit named members) - we can clone those instead of writing out the result computed index signature
7214-
let unusableResult = false;
7215-
const result = map(indexInfo.components, e => {
7216-
if (e.name && isComputedPropertyName(e.name) && isEntityNameExpression(e.name.expression)) {
7217-
trackComputedName(e.name.expression, context.enclosingDeclaration, context);
7218-
}
7219-
else {
7220-
// Computed name didn't take the form `[a.b.c]: something` - bail on using the computed name.
7221-
// TODO: Issue isolated declarations error on this fallback?
7222-
unusableResult = true;
7223-
}
7224-
return setTextRange(
7225-
context,
7226-
factory.createPropertySignature(
7227-
indexInfo.isReadonly ? [factory.createModifier(SyntaxKind.ReadonlyKeyword)] : undefined,
7228-
e.name,
7229-
/*questionToken*/ undefined,
7230-
typeNode || typeToTypeNodeHelper(getTypeOfSymbol(e.symbol), context),
7231-
),
7232-
e,
7233-
);
7214+
const allComponentComputedNamesSerializable = every(indexInfo.components, e => {
7215+
return !!(e.name && isComputedPropertyName(e.name) && isEntityNameExpression(e.name.expression) && context.enclosingDeclaration && isEntityNameVisible(e.name.expression, context.enclosingDeclaration, /*shouldComputeAliasToMakeVisible*/ false)?.accessibility === SymbolAccessibility.Accessible);
72347216
});
7235-
if (!unusableResult) {
7236-
return result;
7217+
if (allComponentComputedNamesSerializable) {
7218+
// Only use computed name serialization form if all components are visible and take the `a.b.c` form
7219+
return map(indexInfo.components, e => {
7220+
// Still need to track visibility even if we've already checked it to paint references as used
7221+
trackComputedName(e.name.expression as EntityNameExpression, context.enclosingDeclaration, context);
7222+
return setTextRange(
7223+
context,
7224+
factory.createPropertySignature(
7225+
indexInfo.isReadonly ? [factory.createModifier(SyntaxKind.ReadonlyKeyword)] : undefined,
7226+
e.name,
7227+
/*questionToken*/ undefined,
7228+
typeNode || typeToTypeNodeHelper(getTypeOfSymbol(e.symbol), context),
7229+
),
7230+
e,
7231+
);
7232+
});
72377233
}
72387234
}
72397235
return [indexInfoToIndexSignatureDeclarationHelper(indexInfo, context, typeNode)];

‎tests/baselines/reference/FunctionDeclaration8_es6.types‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
=== FunctionDeclaration8_es6.ts ===
44
var v = { [yield]: foo }
5-
>v : { [yield]: any; }
6-
> : ^^ ^^^ ^^
7-
>{ [yield]: foo } : { [yield]: any; }
8-
> : ^^ ^^^ ^^
5+
>v : { [x: number]: any; }
6+
> : ^^^^^^^^^^^^^^^^^^^^^
7+
>{ [yield]: foo } : { [x: number]: any; }
8+
> : ^^^^^^^^^^^^^^^^^^^^^
99
>[yield] : any
1010
> : ^^^
1111
>yield : any

‎tests/baselines/reference/asyncFunctionDeclaration8_es2017.types‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
=== asyncFunctionDeclaration8_es2017.ts ===
44
var v = { [await]: foo }
5-
>v : { [await]: any; }
6-
> : ^^ ^^^ ^^
7-
>{ [await]: foo } : { [await]: any; }
8-
> : ^^ ^^^ ^^
5+
>v : { [x: number]: any; }
6+
> : ^^^^^^^^^^^^^^^^^^^^^
7+
>{ [await]: foo } : { [x: number]: any; }
8+
> : ^^^^^^^^^^^^^^^^^^^^^
99
>[await] : any
1010
> : ^^^
1111
>await : any

‎tests/baselines/reference/asyncFunctionDeclaration8_es5.types‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
=== asyncFunctionDeclaration8_es5.ts ===
44
var v = { [await]: foo }
5-
>v : { [await]: any; }
6-
> : ^^ ^^^ ^^
7-
>{ [await]: foo } : { [await]: any; }
8-
> : ^^ ^^^ ^^
5+
>v : { [x: number]: any; }
6+
> : ^^^^^^^^^^^^^^^^^^^^^
7+
>{ [await]: foo } : { [x: number]: any; }
8+
> : ^^^^^^^^^^^^^^^^^^^^^
99
>[await] : any
1010
> : ^^^
1111
>await : any

‎tests/baselines/reference/asyncFunctionDeclaration8_es6.types‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
=== asyncFunctionDeclaration8_es6.ts ===
44
var v = { [await]: foo }
5-
>v : { [await]: any; }
6-
> : ^^ ^^^ ^^
7-
>{ [await]: foo } : { [await]: any; }
8-
> : ^^ ^^^ ^^
5+
>v : { [x: number]: any; }
6+
> : ^^^^^^^^^^^^^^^^^^^^^
7+
>{ [await]: foo } : { [x: number]: any; }
8+
> : ^^^^^^^^^^^^^^^^^^^^^
99
>[await] : any
1010
> : ^^^
1111
>await : any

‎tests/baselines/reference/complicatedPrivacy.types‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ module m1 {
8686
export function f4(arg1:
8787
>f4 : (arg1: { [number]: C1; }) => void
8888
> : ^ ^^ ^^^^^^^^^
89-
>arg1 : { [number]: C1; }
90-
> : ^^ ^^ ^^
89+
>arg1 : { [x: number]: C1; }
90+
> : ^^^^^^^^^^^^^^^^^^^^
9191
{
9292
[number]: C1; // Used to be indexer, now it is a computed property
9393
>[number] : C1

‎tests/baselines/reference/computedPropertyNames51_ES5.types‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ function f<T, K extends keyof T>() {
1414
> : ^
1515

1616
var v = {
17-
>v : { [t]: number; [k]: number; }
18-
> : ^^ ^^^^^^ ^ ^^^^^^ ^^
19-
>{ [t]: 0, [k]: 1 } : { [t]: number; [k]: number; }
20-
> : ^^ ^^^^^^ ^ ^^^^^^ ^^
17+
>v : { [x: string]: number; }
18+
> : ^^^^^^^^^^^^^^^^^^^^^^^^
19+
>{ [t]: 0, [k]: 1 } : { [x: string]: number; }
20+
> : ^^^^^^^^^^^^^^^^^^^^^^^^
2121

2222
[t]: 0,
2323
>[t] : number

‎tests/baselines/reference/computedPropertyNames51_ES6.types‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ function f<T, K extends keyof T>() {
1414
> : ^
1515

1616
var v = {
17-
>v : { [t]: number; [k]: number; }
18-
> : ^^ ^^^^^^ ^ ^^^^^^ ^^
19-
>{ [t]: 0, [k]: 1 } : { [t]: number; [k]: number; }
20-
> : ^^ ^^^^^^ ^ ^^^^^^ ^^
17+
>v : { [x: string]: number; }
18+
> : ^^^^^^^^^^^^^^^^^^^^^^^^
19+
>{ [t]: 0, [k]: 1 } : { [x: string]: number; }
20+
> : ^^^^^^^^^^^^^^^^^^^^^^^^
2121

2222
[t]: 0,
2323
>[t] : number

‎tests/baselines/reference/computedPropertyNames8_ES5.types‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ function f<T, U extends string>() {
1414
> : ^
1515

1616
var v = {
17-
>v : { [t]: number; [u]: number; }
18-
> : ^^ ^^^^^^ ^ ^^^^^^ ^^
19-
>{ [t]: 0, [u]: 1 } : { [t]: number; [u]: number; }
20-
> : ^^ ^^^^^^ ^ ^^^^^^ ^^
17+
>v : { [x: string]: number; }
18+
> : ^^^^^^^^^^^^^^^^^^^^^^^^
19+
>{ [t]: 0, [u]: 1 } : { [x: string]: number; }
20+
> : ^^^^^^^^^^^^^^^^^^^^^^^^
2121

2222
[t]: 0,
2323
>[t] : number

‎tests/baselines/reference/computedPropertyNames8_ES6.types‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ function f<T, U extends string>() {
1414
> : ^
1515

1616
var v = {
17-
>v : { [t]: number; [u]: number; }
18-
> : ^^ ^^^^^^ ^ ^^^^^^ ^^
19-
>{ [t]: 0, [u]: 1 } : { [t]: number; [u]: number; }
20-
> : ^^ ^^^^^^ ^ ^^^^^^ ^^
17+
>v : { [x: string]: number; }
18+
> : ^^^^^^^^^^^^^^^^^^^^^^^^
19+
>{ [t]: 0, [u]: 1 } : { [x: string]: number; }
20+
> : ^^^^^^^^^^^^^^^^^^^^^^^^
2121

2222
[t]: 0,
2323
>[t] : number

0 commit comments

Comments
 (0)