fix(40617): handle uninitialized class member with computed key

a-tarasyuk · a-tarasyuk · commit 7dc42e83c011 · 2021-09-20T21:38:32.000+03:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -889,7 +889,7 @@ namespace ts {
             return isDottedName(expr)
                 || (isPropertyAccessExpression(expr) || isNonNullExpression(expr) || isParenthesizedExpression(expr)) && isNarrowableReference(expr.expression)
                 || isBinaryExpression(expr) && expr.operatorToken.kind === SyntaxKind.CommaToken && isNarrowableReference(expr.right)
-                || isElementAccessExpression(expr) && isStringOrNumericLiteralLike(expr.argumentExpression) && isNarrowableReference(expr.expression)
+                || isElementAccessExpression(expr) && (isStringOrNumericLiteralLike(expr.argumentExpression) || isIdentifier(expr.argumentExpression)) && isNarrowableReference(expr.expression)
                 || isAssignmentExpression(expr) && isNarrowableReference(expr.left);
         }
 
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -38383,7 +38383,7 @@ namespace ts {
                 }
                 if (!isStatic(member) && isPropertyWithoutInitializer(member)) {
                     const propName = (member as PropertyDeclaration).name;
-                    if (isIdentifier(propName) || isPrivateIdentifier(propName)) {
+                    if (isIdentifier(propName) || isPrivateIdentifier(propName) || isComputedPropertyName(propName)) {
                         const type = getTypeOfSymbol(getSymbolOfNode(member));
                         if (!(type.flags & TypeFlags.AnyOrUnknown || getFalsyFlags(type) & TypeFlags.Undefined)) {
                             if (!constructor || !isPropertyInitializedInConstructor(propName, type, constructor)) {
@@ -38419,8 +38419,10 @@ namespace ts {
             return false;
         }
 
-        function isPropertyInitializedInConstructor(propName: Identifier | PrivateIdentifier, propType: Type, constructor: ConstructorDeclaration) {
-            const reference = factory.createPropertyAccessExpression(factory.createThis(), propName);
+        function isPropertyInitializedInConstructor(propName: Identifier | PrivateIdentifier | ComputedPropertyName, propType: Type, constructor: ConstructorDeclaration) {
+            const reference = isComputedPropertyName(propName)
+                ? factory.createElementAccessExpression(factory.createThis(), propName.expression)
+                : factory.createPropertyAccessExpression(factory.createThis(), propName);
             setParent(reference.expression, reference);
             setParent(reference, constructor);
             reference.flowNode = constructor.returnFlowNode;
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -2684,7 +2684,7 @@ namespace ts {
         function getPropFromRaw<T>(prop: "files" | "include" | "exclude" | "references", validateElement: (value: unknown) => boolean, elementTypeName: string): PropOfRaw<T> {
             if (hasProperty(raw, prop) && !isNullOrUndefined(raw[prop])) {
                 if (isArray(raw[prop])) {
-                    const result = raw[prop];
+                    const result = raw[prop] as T[];
                     if (!sourceFile && !every(result, validateElement)) {
                         errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, prop, elementTypeName));
                     }
diff --git a/tests/baselines/reference/controlFlowOptionalChain.errors.txt b/tests/baselines/reference/controlFlowOptionalChain.errors.txt
@@ -59,9 +59,10 @@ tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(501,13): error T
 tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(515,13): error TS2532: Object is possibly 'undefined'.
 tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(518,13): error TS2532: Object is possibly 'undefined'.
 tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(567,21): error TS2532: Object is possibly 'undefined'.
+tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(586,9): error TS2367: This condition will always return 'false' since the types '"left"' and '"right"' have no overlap.
 
 
-==== tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts (61 errors) ====
+==== tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts (62 errors) ====
     // assignments in shortcutting chain
     declare const o: undefined | {
         [key: string]: any;
@@ -770,6 +771,8 @@ tests/cases/conformance/controlFlow/controlFlowOptionalChain.ts(567,21): error T
     while (arr[i]?.tag === "left") {
         i += 1;
         if (arr[i]?.tag === "right") {
+            ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2367: This condition will always return 'false' since the types '"left"' and '"right"' have no overlap.
             console.log("I should ALSO be reachable");
         }
     }
diff --git a/tests/baselines/reference/controlFlowOptionalChain.types b/tests/baselines/reference/controlFlowOptionalChain.types
@@ -2057,11 +2057,11 @@ while (arr[i]?.tag === "left") {
 
     if (arr[i]?.tag === "right") {
 >arr[i]?.tag === "right" : boolean
->arr[i]?.tag : "left" | "right"
+>arr[i]?.tag : "left"
 >arr[i] : { tag: "left" | "right"; }
 >arr : { tag: "left" | "right"; }[]
 >i : number
->tag : "left" | "right"
+>tag : "left"
 >"right" : "right"
 
         console.log("I should ALSO be reachable");
diff --git a/tests/baselines/reference/incrementOnNullAssertion.types b/tests/baselines/reference/incrementOnNullAssertion.types
@@ -27,21 +27,21 @@ if (foo[x] === undefined) {
 }
 else {
     let nu = foo[x]
->nu : number | undefined
->foo[x] : number | undefined
+>nu : number
+>foo[x] : number
 >foo : Dictionary<number>
 >x : "bar"
 
     let n = foo[x]
->n : number | undefined
->foo[x] : number | undefined
+>n : number
+>foo[x] : number
 >foo : Dictionary<number>
 >x : "bar"
 
     foo[x]!++
 >foo[x]!++ : number
 >foo[x]! : number
->foo[x] : number | undefined
+>foo[x] : number
 >foo : Dictionary<number>
 >x : "bar"
 }
diff --git a/tests/baselines/reference/noUncheckedIndexedAccess.errors.txt b/tests/baselines/reference/noUncheckedIndexedAccess.errors.txt
@@ -32,8 +32,7 @@ tests/cases/conformance/pedantic/noUncheckedIndexedAccess.ts(90,7): error TS2322
   Type 'undefined' is not assignable to type 'string'.
 tests/cases/conformance/pedantic/noUncheckedIndexedAccess.ts(98,5): error TS2322: Type 'undefined' is not assignable to type '{ [key: string]: string; a: string; b: string; }[Key]'.
   Type 'undefined' is not assignable to type 'string'.
-tests/cases/conformance/pedantic/noUncheckedIndexedAccess.ts(99,11): error TS2322: Type 'string | undefined' is not assignable to type 'string'.
-  Type 'undefined' is not assignable to type 'string'.
+tests/cases/conformance/pedantic/noUncheckedIndexedAccess.ts(99,11): error TS2322: Type 'undefined' is not assignable to type 'string'.
 
 
 ==== tests/cases/conformance/pedantic/noUncheckedIndexedAccess.ts (31 errors) ====
@@ -201,8 +200,7 @@ tests/cases/conformance/pedantic/noUncheckedIndexedAccess.ts(99,11): error TS232
 !!! error TS2322:   Type 'undefined' is not assignable to type 'string'.
         const v: string = myRecord2[key]; // Should error
               ~
-!!! error TS2322: Type 'string | undefined' is not assignable to type 'string'.
-!!! error TS2322:   Type 'undefined' is not assignable to type 'string'.
+!!! error TS2322: Type 'undefined' is not assignable to type 'string'.
     };
     
     
diff --git a/tests/baselines/reference/noUncheckedIndexedAccess.types b/tests/baselines/reference/noUncheckedIndexedAccess.types
@@ -412,7 +412,7 @@ const fn3 = <Key extends keyof typeof myRecord2>(key: Key) => {
 
     const v: string = myRecord2[key]; // Should error
 >v : string
->myRecord2[key] : string | undefined
+>myRecord2[key] : undefined
 >myRecord2 : { [key: string]: string; a: string; b: string; }
 >key : Key
 
diff --git a/tests/baselines/reference/strictPropertyInitialization.errors.txt b/tests/baselines/reference/strictPropertyInitialization.errors.txt
@@ -164,4 +164,19 @@ tests/cases/conformance/classes/propertyMemberDeclarations/strictPropertyInitial
             this.#b = someValue();
         }
     }
+    
+    const a = 'a';
+    const b = Symbol();
+    
+    class C12 {
+        [a]: number;
+        [b]: number;
+        ['c']: number;
+    
+        constructor() {
+            this[a] = 1;
+            this[b] = 1;
+            this['c'] = 1;
+        }
+    }
     
diff --git a/tests/baselines/reference/strictPropertyInitialization.js b/tests/baselines/reference/strictPropertyInitialization.js
@@ -132,6 +132,21 @@ class C11 {
         this.#b = someValue();
     }
 }
+
+const a = 'a';
+const b = Symbol();
+
+class C12 {
+    [a]: number;
+    [b]: number;
+    ['c']: number;
+
+    constructor() {
+        this[a] = 1;
+        this[b] = 1;
+        this['c'] = 1;
+    }
+}
 
 
 //// [strictPropertyInitialization.js]
@@ -235,6 +250,15 @@ class C11 {
     }
 }
 _C11_b = new WeakMap();
+const a = 'a';
+const b = Symbol();
+class C12 {
+    constructor() {
+        this[a] = 1;
+        this[b] = 1;
+        this['c'] = 1;
+    }
+}
 
 
 //// [strictPropertyInitialization.d.ts]
@@ -303,3 +327,11 @@ declare class C11 {
     a: number;
     constructor();
 }
+declare const a = "a";
+declare const b: unique symbol;
+declare class C12 {
+    [a]: number;
+    [b]: number;
+    ['c']: number;
+    constructor();
+}
diff --git a/tests/baselines/reference/strictPropertyInitialization.symbols b/tests/baselines/reference/strictPropertyInitialization.symbols
@@ -311,3 +311,40 @@ class C11 {
     }
 }
 
+const a = 'a';
+>a : Symbol(a, Decl(strictPropertyInitialization.ts, 134, 5))
+
+const b = Symbol();
+>b : Symbol(b, Decl(strictPropertyInitialization.ts, 135, 5))
+>Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+
+class C12 {
+>C12 : Symbol(C12, Decl(strictPropertyInitialization.ts, 135, 19))
+
+    [a]: number;
+>[a] : Symbol(C12[a], Decl(strictPropertyInitialization.ts, 137, 11))
+>a : Symbol(a, Decl(strictPropertyInitialization.ts, 134, 5))
+
+    [b]: number;
+>[b] : Symbol(C12[b], Decl(strictPropertyInitialization.ts, 138, 16))
+>b : Symbol(b, Decl(strictPropertyInitialization.ts, 135, 5))
+
+    ['c']: number;
+>['c'] : Symbol(C12['c'], Decl(strictPropertyInitialization.ts, 139, 16))
+>'c' : Symbol(C12['c'], Decl(strictPropertyInitialization.ts, 139, 16))
+
+    constructor() {
+        this[a] = 1;
+>this : Symbol(C12, Decl(strictPropertyInitialization.ts, 135, 19))
+>a : Symbol(a, Decl(strictPropertyInitialization.ts, 134, 5))
+
+        this[b] = 1;
+>this : Symbol(C12, Decl(strictPropertyInitialization.ts, 135, 19))
+>b : Symbol(b, Decl(strictPropertyInitialization.ts, 135, 5))
+
+        this['c'] = 1;
+>this : Symbol(C12, Decl(strictPropertyInitialization.ts, 135, 19))
+>'c' : Symbol(C12['c'], Decl(strictPropertyInitialization.ts, 139, 16))
+    }
+}
+
diff --git a/tests/baselines/reference/strictPropertyInitialization.types b/tests/baselines/reference/strictPropertyInitialization.types
@@ -347,3 +347,51 @@ class C11 {
     }
 }
 
+const a = 'a';
+>a : "a"
+>'a' : "a"
+
+const b = Symbol();
+>b : unique symbol
+>Symbol() : unique symbol
+>Symbol : SymbolConstructor
+
+class C12 {
+>C12 : C12
+
+    [a]: number;
+>[a] : number
+>a : "a"
+
+    [b]: number;
+>[b] : number
+>b : unique symbol
+
+    ['c']: number;
+>['c'] : number
+>'c' : "c"
+
+    constructor() {
+        this[a] = 1;
+>this[a] = 1 : 1
+>this[a] : number
+>this : this
+>a : "a"
+>1 : 1
+
+        this[b] = 1;
+>this[b] = 1 : 1
+>this[b] : number
+>this : this
+>b : unique symbol
+>1 : 1
+
+        this['c'] = 1;
+>this['c'] = 1 : 1
+>this['c'] : number
+>this : this
+>'c' : "c"
+>1 : 1
+    }
+}
+
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/strictPropertyInitialization.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/strictPropertyInitialization.ts
@@ -1,5 +1,5 @@
 // @strict: true
-// @target:es2015
+// @target: es2015
 // @declaration: true
 
 // Properties with non-undefined types require initialization
@@ -135,3 +135,18 @@ class C11 {
         this.#b = someValue();
     }
 }
+
+const a = 'a';
+const b = Symbol();
+
+class C12 {
+    [a]: number;
+    [b]: number;
+    ['c']: number;
+
+    constructor() {
+        this[a] = 1;
+        this[b] = 1;
+        this['c'] = 1;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -889,7 +889,7 @@ namespace ts {`
`889`	`889`	`return isDottedName(expr)`
`890`	`890`	`\|\| (isPropertyAccessExpression(expr) \|\| isNonNullExpression(expr) \|\| isParenthesizedExpression(expr)) && isNarrowableReference(expr.expression)`
`891`	`891`	`\|\| isBinaryExpression(expr) && expr.operatorToken.kind === SyntaxKind.CommaToken && isNarrowableReference(expr.right)`
`892`		`- \|\| isElementAccessExpression(expr) && isStringOrNumericLiteralLike(expr.argumentExpression) && isNarrowableReference(expr.expression)`
	`892`	`+ \|\| isElementAccessExpression(expr) && (isStringOrNumericLiteralLike(expr.argumentExpression) \|\| isIdentifier(expr.argumentExpression)) && isNarrowableReference(expr.expression)`
`893`	`893`	`\|\| isAssignmentExpression(expr) && isNarrowableReference(expr.left);`
`894`	`894`	`}`
`895`	`895`
Original file line number	Diff line number	Diff line change
`@@ -2684,7 +2684,7 @@ namespace ts {`
`2684`	`2684`	`function getPropFromRaw<T>(prop: "files" \| "include" \| "exclude" \| "references", validateElement: (value: unknown) => boolean, elementTypeName: string): PropOfRaw<T> {`
`2685`	`2685`	`if (hasProperty(raw, prop) && !isNullOrUndefined(raw[prop])) {`
`2686`	`2686`	`if (isArray(raw[prop])) {`
`2687`		`- const result = raw[prop];`
	`2687`	`+ const result = raw[prop] as T[];`
`2688`	`2688`	`if (!sourceFile && !every(result, validateElement)) {`
`2689`	`2689`	`errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, prop, elementTypeName));`
`2690`	`2690`	`}`