Skip to content

Fix importHelpers incorrectly requiring tslib for native #private class members (#63728) #64064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Youssef Mansour (YoussefMansour9) wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −4
Open

Fix importHelpers incorrectly requiring tslib for native #private class members (#63728) #64064

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions tsc/internal/checker/checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10147,7 +10147,9 @@ func (c *Checker) getFirstTransformableStaticClassElement(node *ast.Node) *ast.N
willTransformStaticElementsOfDecoratedClass := !c.legacyDecorators &&
c.languageVersion < LanguageFeatureMinimumTarget.ClassAndClassElementDecorators &&
ast.ClassOrConstructorParameterIsDecorated(false, node)
willTransformPrivateElementsOrClassStaticBlocks := c.languageVersion < LanguageFeatureMinimumTarget.PrivateNamesAndClassStaticBlocks || c.languageVersion < LanguageFeatureMinimumTarget.ClassAndClassElementDecorators
// Private elements and class static blocks only need transformation before ES2022.
// Decorators (ClassAndClassElementDecorators) are a separate feature and should not gate private element transformation.
willTransformPrivateElementsOrClassStaticBlocks := c.languageVersion < LanguageFeatureMinimumTarget.PrivateNamesAndClassStaticBlocks
willTransformInitializers := !c.emitStandardClassFields
if willTransformStaticElementsOfDecoratedClass || willTransformPrivateElementsOrClassStaticBlocks {
for _, member := range node.Members() {
Expand Down Expand Up @@ -10618,8 +10620,11 @@ func (c *Checker) needCollisionCheckForIdentifier(node *ast.Node, identifier *as

func (c *Checker) setNodeLinksForPrivateIdentifierScope(node *ast.Node) {
if name := node.Name(); ast.IsPrivateIdentifier(name) {
// Private field helper is only needed when:
// 1. Target is before ES2022 (when native private fields were introduced)
// 2. useDefineForClassFields is false (legacy class field semantics)
// Decorators (ClassAndClassElementDecorators) are a separate feature and should not gate private field helpers.
if c.languageVersion < LanguageFeatureMinimumTarget.PrivateNamesAndClassStaticBlocks ||
c.languageVersion < LanguageFeatureMinimumTarget.ClassAndClassElementDecorators ||
!c.compilerOptions.GetUseDefineForClassFields() {
for lexicalScope := ast.GetEnclosingBlockScopeContainer(node); lexicalScope != nil; lexicalScope = ast.GetEnclosingBlockScopeContainer(lexicalScope) {
c.nodeLinks.Get(lexicalScope).flags |= NodeCheckFlagsContainsClassWithPrivateIdentifiers
Expand Down Expand Up @@ -11358,8 +11363,11 @@ func (c *Checker) checkPropertyAccessExpressionOrQualifiedName(node *ast.Node, l
isAnyLike := IsTypeAny(apparentType) || apparentType == c.silentNeverType
var prop *ast.Symbol
if ast.IsPrivateIdentifier(right) {
// Private field helper is only needed when:
// 1. Target is before ES2022 (when native private fields were introduced)
// 2. useDefineForClassFields is false (legacy class field semantics)
// Decorators (ClassAndClassElementDecorators) are a separate feature and should not gate private field helpers.
if c.languageVersion < LanguageFeatureMinimumTarget.PrivateNamesAndClassStaticBlocks ||
c.languageVersion < LanguageFeatureMinimumTarget.ClassAndClassElementDecorators ||
!c.compilerOptions.GetUseDefineForClassFields() {
Comment on lines 11370 to 11371
if assignmentKind != AssignmentKindNone {
c.checkExternalEmitHelpers(node, ExternalEmitHelpersClassPrivateFieldSet)
Expand Down Expand Up @@ -13173,8 +13181,11 @@ func (c *Checker) checkInExpression(left *ast.Expression, right *ast.Expression,
return c.silentNeverType
}
if ast.IsPrivateIdentifier(left) {
// Private field helper is only needed when:
// 1. Target is before ES2022 (when native private fields were introduced)
// 2. useDefineForClassFields is false (legacy class field semantics)
// Decorators (ClassAndClassElementDecorators) are a separate feature and should not gate private field helpers.
if c.languageVersion < LanguageFeatureMinimumTarget.PrivateNamesAndClassStaticBlocks ||
c.languageVersion < LanguageFeatureMinimumTarget.ClassAndClassElementDecorators ||
!c.compilerOptions.GetUseDefineForClassFields() {
c.checkExternalEmitHelpers(left, ExternalEmitHelpersClassPrivateFieldIn)
}
Expand Down