Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix decorator emit crash (#60224)

Browse Source
This commit is contained in:
Ron Buckton
2024-10-14 17:45:23 -04:00
committed by GitHub
parent e99e6e2e87
commit 40caf34319
6 changed files with 105 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/transformers/esDecorators.ts
+1 -1
View File
@@ -686,7 +686,7 @@ export function transformESDecorators(context: TransformationContext): (x: Sourc
let shouldTransformPrivateStaticElementsInClass = false;
// 1. Class decorators are evaluated outside of the private name scope of the class.
const classDecorators = transformAllDecoratorsOfDeclaration(getAllDecoratorsOfClass(node));
const classDecorators = transformAllDecoratorsOfDeclaration(getAllDecoratorsOfClass(node, /*useLegacyDecorators*/ false));
if (classDecorators) {
// - Since class decorators don't have privileged access to private names defined inside the class,
// they must be evaluated outside of the class body.
src/compiler/transformers/legacyDecorators.ts
+1 -1
View File
@@ -679,7 +679,7 @@ export function transformLegacyDecorators(context: TransformationContext): (x: S
* @param node The class node.
*/
function generateConstructorDecorationExpression(node: ClassExpression | ClassDeclaration) {
const allDecorators = getAllDecoratorsOfClass(node);
const allDecorators = getAllDecoratorsOfClass(node, /*useLegacyDecorators*/ true);
const decoratorExpressions = transformAllDecoratorsOfDeclaration(allDecorators);
if (!decoratorExpressions) {
return undefined;
src/compiler/transformers/utilities.ts
+9 -9
View File
@@ -679,9 +679,9 @@ function getDecoratorsOfParameters(node: FunctionLikeDeclaration | undefined) {
*
* @internal
*/
export function getAllDecoratorsOfClass(node: ClassLikeDeclaration): AllDecorators | undefined {
export function getAllDecoratorsOfClass(node: ClassLikeDeclaration, useLegacyDecorators: boolean): AllDecorators | undefined {
const decorators = getDecorators(node);
const parameters = getDecoratorsOfParameters(getFirstConstructorWithBody(node));
const parameters = useLegacyDecorators ? getDecoratorsOfParameters(getFirstConstructorWithBody(node)) : undefined;
if (!some(decorators) && !some(parameters)) {
return undefined;
}
@@ -705,12 +705,12 @@ export function getAllDecoratorsOfClassElement(member: ClassElement, parent: Cla
case SyntaxKind.GetAccessor:
case SyntaxKind.SetAccessor:
if (!useLegacyDecorators) {
return getAllDecoratorsOfMethod(member as AccessorDeclaration);
return getAllDecoratorsOfMethod(member as AccessorDeclaration, /*useLegacyDecorators*/ false);
}
return getAllDecoratorsOfAccessors(member as AccessorDeclaration, parent);
return getAllDecoratorsOfAccessors(member as AccessorDeclaration, parent, /*useLegacyDecorators*/ true);
case SyntaxKind.MethodDeclaration:
return getAllDecoratorsOfMethod(member as MethodDeclaration);
return getAllDecoratorsOfMethod(member as MethodDeclaration, useLegacyDecorators);
case SyntaxKind.PropertyDeclaration:
return getAllDecoratorsOfProperty(member as PropertyDeclaration);
@@ -726,7 +726,7 @@ export function getAllDecoratorsOfClassElement(member: ClassElement, parent: Cla
* @param parent The class node that contains the accessor.
* @param accessor The class accessor member.
*/
function getAllDecoratorsOfAccessors(accessor: AccessorDeclaration, parent: ClassExpression | ClassDeclaration): AllDecorators | undefined {
function getAllDecoratorsOfAccessors(accessor: AccessorDeclaration, parent: ClassExpression | ClassDeclaration, useLegacyDecorators: boolean): AllDecorators | undefined {
if (!accessor.body) {
return undefined;
}
@@ -741,7 +741,7 @@ function getAllDecoratorsOfAccessors(accessor: AccessorDeclaration, parent: Clas
}
const decorators = getDecorators(firstAccessorWithDecorators);
const parameters = getDecoratorsOfParameters(setAccessor);
const parameters = useLegacyDecorators ? getDecoratorsOfParameters(setAccessor) : undefined;
if (!some(decorators) && !some(parameters)) {
return undefined;
}
@@ -759,13 +759,13 @@ function getAllDecoratorsOfAccessors(accessor: AccessorDeclaration, parent: Clas
*
* @param method The class method member.
*/
function getAllDecoratorsOfMethod(method: MethodDeclaration | AccessorDeclaration): AllDecorators | undefined {
function getAllDecoratorsOfMethod(method: MethodDeclaration | AccessorDeclaration, useLegacyDecorators: boolean): AllDecorators | undefined {
if (!method.body) {
return undefined;
}
const decorators = getDecorators(method);
const parameters = getDecoratorsOfParameters(method);
const parameters = useLegacyDecorators ? getDecoratorsOfParameters(method) : undefined;
if (!some(decorators) && !some(parameters)) {
return undefined;
}