microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-04-13 09:12:52 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

🤖 Pick PR #63310 (Mark class property initializers as...) into release-6.0 (#63327)

Browse Source 
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: RyanCavanaugh <6685088+RyanCavanaugh@users.noreply.github.com>
This commit is contained in:
TypeScript Bot
2026-04-06 10:44:55 -07:00
committed by GitHub
parent 607a22a90d
commit 0725fb4664
5 changed files with 264 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/binder.ts
View File

@@ -3869,6 +3869,9 @@ export function getContainerFlags(node: Node): ContainerFlags {
case SyntaxKind.ModuleBlock:
return ContainerFlags.IsControlFlowContainer;
case SyntaxKind.PropertyDeclaration:
return (node as PropertyDeclaration).initializer ? ContainerFlags.IsControlFlowContainer : ContainerFlags.None;
case SyntaxKind.CatchClause:
case SyntaxKind.ForStatement:
case SyntaxKind.ForInStatement:

55
tests/baselines/reference/classPropertyInferenceFromBroaderTypeConst.js Normal file
View File

@@ -0,0 +1,55 @@
//// [tests/cases/compiler/classPropertyInferenceFromBroaderTypeConst.ts] ////
//// [classPropertyInferenceFromBroaderTypeConst.ts]
// Repro from GH#62264
// Class property should infer the wider declared type (AB), not the narrowed literal type ("A")
type AB = 'A' | 'B';
const DEFAULT: AB = 'A';
class C {
D = DEFAULT;
method() {
switch (this.D) {
case 'A': break;
case 'B': break; // should not error
}
}
}
// D should be AB, not "A"
declare const c: C;
declare function expectAB(x: AB): void;
expectAB(c.D); // ok
c.D = 'B'; // ok
// Static property should work the same way
class D {
static SD = DEFAULT;
}
D.SD = 'B'; // ok
//// [classPropertyInferenceFromBroaderTypeConst.js]
"use strict";
// Repro from GH#62264
// Class property should infer the wider declared type (AB), not the narrowed literal type ("A")
const DEFAULT = 'A';
class C {
D = DEFAULT;
method() {
switch (this.D) {
case 'A': break;
case 'B': break; // should not error
}
}
}
expectAB(c.D); // ok
c.D = 'B'; // ok
// Static property should work the same way
class D {
static SD = DEFAULT;
}
D.SD = 'B'; // ok

68
tests/baselines/reference/classPropertyInferenceFromBroaderTypeConst.symbols Normal file
View File

@@ -0,0 +1,68 @@
//// [tests/cases/compiler/classPropertyInferenceFromBroaderTypeConst.ts] ////
=== classPropertyInferenceFromBroaderTypeConst.ts ===
// Repro from GH#62264
// Class property should infer the wider declared type (AB), not the narrowed literal type ("A")
type AB = 'A' | 'B';
>AB : Symbol(AB, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 0, 0))
const DEFAULT: AB = 'A';
>DEFAULT : Symbol(DEFAULT, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 5, 5))
>AB : Symbol(AB, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 0, 0))
class C {
>C : Symbol(C, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 5, 24))
D = DEFAULT;
>D : Symbol(C.D, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 7, 9))
>DEFAULT : Symbol(DEFAULT, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 5, 5))
method() {
>method : Symbol(C.method, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 8, 16))
switch (this.D) {
>this.D : Symbol(C.D, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 7, 9))
>this : Symbol(C, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 5, 24))
>D : Symbol(C.D, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 7, 9))
case 'A': break;
case 'B': break; // should not error
}
}
}
// D should be AB, not "A"
declare const c: C;
>c : Symbol(c, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 19, 13))
>C : Symbol(C, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 5, 24))
declare function expectAB(x: AB): void;
>expectAB : Symbol(expectAB, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 19, 19))
>x : Symbol(x, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 20, 26))
>AB : Symbol(AB, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 0, 0))
expectAB(c.D); // ok
>expectAB : Symbol(expectAB, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 19, 19))
>c.D : Symbol(C.D, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 7, 9))
>c : Symbol(c, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 19, 13))
>D : Symbol(C.D, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 7, 9))
c.D = 'B'; // ok
>c.D : Symbol(C.D, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 7, 9))
>c : Symbol(c, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 19, 13))
>D : Symbol(C.D, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 7, 9))
// Static property should work the same way
class D {
>D : Symbol(D, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 22, 10))
static SD = DEFAULT;
>SD : Symbol(D.SD, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 25, 9))
>DEFAULT : Symbol(DEFAULT, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 5, 5))
}
D.SD = 'B'; // ok
>D.SD : Symbol(D.SD, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 25, 9))
>D : Symbol(D, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 22, 10))
>SD : Symbol(D.SD, Decl(classPropertyInferenceFromBroaderTypeConst.ts, 25, 9))

107
tests/baselines/reference/classPropertyInferenceFromBroaderTypeConst.types Normal file
View File

@@ -0,0 +1,107 @@
//// [tests/cases/compiler/classPropertyInferenceFromBroaderTypeConst.ts] ////
=== classPropertyInferenceFromBroaderTypeConst.ts ===
// Repro from GH#62264
// Class property should infer the wider declared type (AB), not the narrowed literal type ("A")
type AB = 'A' | 'B';
>AB : AB
> : ^^
const DEFAULT: AB = 'A';
>DEFAULT : AB
> : ^^
>'A' : "A"
> : ^^^
class C {
>C : C
> : ^
D = DEFAULT;
>D : AB
> : ^^
>DEFAULT : AB
> : ^^
method() {
>method : () => void
> : ^^^^^^^^^^
switch (this.D) {
>this.D : AB
> : ^^
>this : this
> : ^^^^
>D : AB
> : ^^
case 'A': break;
>'A' : "A"
> : ^^^
case 'B': break; // should not error
>'B' : "B"
> : ^^^
}
}
}
// D should be AB, not "A"
declare const c: C;
>c : C
> : ^
declare function expectAB(x: AB): void;
>expectAB : (x: AB) => void
> : ^ ^^ ^^^^^
>x : AB
> : ^^
expectAB(c.D); // ok
>expectAB(c.D) : void
> : ^^^^
>expectAB : (x: AB) => void
> : ^ ^^ ^^^^^
>c.D : AB
> : ^^
>c : C
> : ^
>D : AB
> : ^^
c.D = 'B'; // ok
>c.D = 'B' : "B"
> : ^^^
>c.D : AB
> : ^^
>c : C
> : ^
>D : AB
> : ^^
>'B' : "B"
> : ^^^
// Static property should work the same way
class D {
>D : D
> : ^
static SD = DEFAULT;
>SD : AB
> : ^^
>DEFAULT : AB
> : ^^
}
D.SD = 'B'; // ok
>D.SD = 'B' : "B"
> : ^^^
>D.SD : AB
> : ^^
>D : typeof D
> : ^^^^^^^^
>SD : AB
> : ^^
>'B' : "B"
> : ^^^

31
tests/cases/compiler/classPropertyInferenceFromBroaderTypeConst.ts Normal file
View File

@@ -0,0 +1,31 @@
// @strict: true
// Repro from GH#62264
// Class property should infer the wider declared type (AB), not the narrowed literal type ("A")
type AB = 'A' | 'B';
const DEFAULT: AB = 'A';
class C {
D = DEFAULT;
method() {
switch (this.D) {
case 'A': break;
case 'B': break; // should not error
}
}
}
// D should be AB, not "A"
declare const c: C;
declare function expectAB(x: AB): void;
expectAB(c.D); // ok
c.D = 'B'; // ok
// Static property should work the same way
class D {
static SD = DEFAULT;
}
D.SD = 'B'; // ok