Skip to content

Commit d79a474

Browse files
weswighamweswigham
authored
Handle parentless nodes in nodeIsDecorated (microsoft#20314)
1 parent 433bfc5 commit d79a474

5 files changed

Lines changed: 78 additions & 25 deletions

File tree

‎src/compiler/checker.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13048,7 +13048,7 @@ namespace ts {
1304813048
// must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
1304913049
// behavior of class names in ES6.
1305013050
if (declaration.kind === SyntaxKind.ClassDeclaration
13051-
&& nodeIsDecorated(declaration)) {
13051+
&& nodeIsDecorated(declaration as ClassDeclaration)) {
1305213052
let container = getContainingClass(node);
1305313053
while (container !== undefined) {
1305413054
if (container === declaration && container.name !== node) {
@@ -20697,7 +20697,7 @@ namespace ts {
2069720697

2069820698
// skip this check for nodes that cannot have decorators. These should have already had an error reported by
2069920699
// checkGrammarDecorators.
20700-
if (!nodeCanBeDecorated(node)) {
20700+
if (!nodeCanBeDecorated(node, node.parent, node.parent.parent)) {
2070120701
return;
2070220702
}
2070320703

@@ -25203,7 +25203,7 @@ namespace ts {
2520325203
if (!node.decorators) {
2520425204
return false;
2520525205
}
25206-
if (!nodeCanBeDecorated(node)) {
25206+
if (!nodeCanBeDecorated(node, node.parent, node.parent.parent)) {
2520725207
if (node.kind === SyntaxKind.MethodDeclaration && !nodeIsPresent((<MethodDeclaration>node).body)) {
2520825208
return grammarErrorOnFirstToken(node, Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload);
2520925209
}

‎src/compiler/transformers/ts.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@ namespace ts {
12611261
* the class.
12621262
*/
12631263
function getDecoratedClassElements(node: ClassExpression | ClassDeclaration, isStatic: boolean): ReadonlyArray<ClassElement> {
1264-
return filter(node.members, isStatic ? isStaticDecoratedClassElement : isInstanceDecoratedClassElement);
1264+
return filter(node.members, isStatic ? m => isStaticDecoratedClassElement(m, node) : m => isInstanceDecoratedClassElement(m, node));
12651265
}
12661266

12671267
/**
@@ -1270,8 +1270,8 @@ namespace ts {
12701270
*
12711271
* @param member The class member.
12721272
*/
1273-
function isStaticDecoratedClassElement(member: ClassElement) {
1274-
return isDecoratedClassElement(member, /*isStatic*/ true);
1273+
function isStaticDecoratedClassElement(member: ClassElement, parent: ClassLikeDeclaration) {
1274+
return isDecoratedClassElement(member, /*isStatic*/ true, parent);
12751275
}
12761276

12771277
/**
@@ -1280,8 +1280,8 @@ namespace ts {
12801280
*
12811281
* @param member The class member.
12821282
*/
1283-
function isInstanceDecoratedClassElement(member: ClassElement) {
1284-
return isDecoratedClassElement(member, /*isStatic*/ false);
1283+
function isInstanceDecoratedClassElement(member: ClassElement, parent: ClassLikeDeclaration) {
1284+
return isDecoratedClassElement(member, /*isStatic*/ false, parent);
12851285
}
12861286

12871287
/**
@@ -1290,8 +1290,8 @@ namespace ts {
12901290
*
12911291
* @param member The class member.
12921292
*/
1293-
function isDecoratedClassElement(member: ClassElement, isStatic: boolean) {
1294-
return nodeOrChildIsDecorated(member)
1293+
function isDecoratedClassElement(member: ClassElement, isStatic: boolean, parent: ClassLikeDeclaration) {
1294+
return nodeOrChildIsDecorated(member, parent)
12951295
&& isStatic === hasModifier(member, ModifierFlags.Static);
12961296
}
12971297

‎src/compiler/utilities.ts‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,51 +1205,62 @@ namespace ts {
12051205
return (<CallExpression | Decorator>node).expression;
12061206
}
12071207

1208-
export function nodeCanBeDecorated(node: Node): boolean {
1208+
export function nodeCanBeDecorated(node: ClassDeclaration): true;
1209+
export function nodeCanBeDecorated(node: ClassElement, parent: Node): boolean;
1210+
export function nodeCanBeDecorated(node: Node, parent: Node, grandparent: Node): boolean;
1211+
export function nodeCanBeDecorated(node: Node, parent?: Node, grandparent?: Node): boolean {
12091212
switch (node.kind) {
12101213
case SyntaxKind.ClassDeclaration:
12111214
// classes are valid targets
12121215
return true;
12131216

12141217
case SyntaxKind.PropertyDeclaration:
12151218
// property declarations are valid if their parent is a class declaration.
1216-
return node.parent.kind === SyntaxKind.ClassDeclaration;
1219+
return parent.kind === SyntaxKind.ClassDeclaration;
12171220

12181221
case SyntaxKind.GetAccessor:
12191222
case SyntaxKind.SetAccessor:
12201223
case SyntaxKind.MethodDeclaration:
12211224
// if this method has a body and its parent is a class declaration, this is a valid target.
12221225
return (<FunctionLikeDeclaration>node).body !== undefined
1223-
&& node.parent.kind === SyntaxKind.ClassDeclaration;
1226+
&& parent.kind === SyntaxKind.ClassDeclaration;
12241227

12251228
case SyntaxKind.Parameter:
12261229
// if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
1227-
return (<FunctionLikeDeclaration>node.parent).body !== undefined
1228-
&& (node.parent.kind === SyntaxKind.Constructor
1229-
|| node.parent.kind === SyntaxKind.MethodDeclaration
1230-
|| node.parent.kind === SyntaxKind.SetAccessor)
1231-
&& node.parent.parent.kind === SyntaxKind.ClassDeclaration;
1230+
return (<FunctionLikeDeclaration>parent).body !== undefined
1231+
&& (parent.kind === SyntaxKind.Constructor
1232+
|| parent.kind === SyntaxKind.MethodDeclaration
1233+
|| parent.kind === SyntaxKind.SetAccessor)
1234+
&& grandparent.kind === SyntaxKind.ClassDeclaration;
12321235
}
12331236

12341237
return false;
12351238
}
12361239

1237-
export function nodeIsDecorated(node: Node): boolean {
1240+
export function nodeIsDecorated(node: ClassDeclaration): boolean;
1241+
export function nodeIsDecorated(node: ClassElement, parent: Node): boolean;
1242+
export function nodeIsDecorated(node: Node, parent: Node, grandparent: Node): boolean;
1243+
export function nodeIsDecorated(node: Node, parent?: Node, grandparent?: Node): boolean {
12381244
return node.decorators !== undefined
1239-
&& nodeCanBeDecorated(node);
1245+
&& nodeCanBeDecorated(node, parent, grandparent);
12401246
}
12411247

1242-
export function nodeOrChildIsDecorated(node: Node): boolean {
1243-
return nodeIsDecorated(node) || childIsDecorated(node);
1248+
export function nodeOrChildIsDecorated(node: ClassDeclaration): boolean;
1249+
export function nodeOrChildIsDecorated(node: ClassElement, parent: Node): boolean;
1250+
export function nodeOrChildIsDecorated(node: Node, parent: Node, grandparent: Node): boolean;
1251+
export function nodeOrChildIsDecorated(node: Node, parent?: Node, grandparent?: Node): boolean {
1252+
return nodeIsDecorated(node, parent, grandparent) || childIsDecorated(node, parent);
12441253
}
12451254

1246-
export function childIsDecorated(node: Node): boolean {
1255+
export function childIsDecorated(node: ClassDeclaration): boolean;
1256+
export function childIsDecorated(node: Node, parent: Node): boolean;
1257+
export function childIsDecorated(node: Node, parent?: Node): boolean {
12471258
switch (node.kind) {
12481259
case SyntaxKind.ClassDeclaration:
1249-
return forEach((<ClassDeclaration>node).members, nodeOrChildIsDecorated);
1260+
return forEach((<ClassDeclaration>node).members, m => nodeOrChildIsDecorated(m, node, parent));
12501261
case SyntaxKind.MethodDeclaration:
12511262
case SyntaxKind.SetAccessor:
1252-
return forEach((<FunctionLikeDeclaration>node).parameters, nodeIsDecorated);
1263+
return forEach((<FunctionLikeDeclaration>node).parameters, p => nodeIsDecorated(p, node, parent));
12531264
}
12541265
}
12551266

‎src/harness/unittests/transform.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,32 @@ namespace ts {
224224
}
225225
}
226226
});
227+
228+
// https://github.com/Microsoft/TypeScript/issues/17384
229+
testBaseline("transformAddDecoratedNode", () => {
230+
return ts.transpileModule("", {
231+
transformers: {
232+
before: [transformAddDecoratedNode],
233+
},
234+
compilerOptions: {
235+
target: ts.ScriptTarget.ES5,
236+
newLine: NewLineKind.CarriageReturnLineFeed,
237+
}
238+
}).outputText;
239+
240+
function transformAddDecoratedNode(_context: ts.TransformationContext) {
241+
return (sourceFile: ts.SourceFile): ts.SourceFile => {
242+
return visitNode(sourceFile);
243+
};
244+
function visitNode(sf: ts.SourceFile) {
245+
// produce `class Foo { @Bar baz() {} }`;
246+
const classDecl = ts.createClassDeclaration([], [], "Foo", /*typeParameters*/ undefined, /*heritageClauses*/ undefined, [
247+
ts.createMethod([ts.createDecorator(ts.createIdentifier("Bar"))], [], /**/ undefined, "baz", /**/ undefined, /**/ undefined, [], /**/ undefined, ts.createBlock([]))
248+
]);
249+
return ts.updateSourceFileNode(sf, [classDecl]);
250+
}
251+
}
252+
});
227253
});
228254
}
229255

‎tests/baselines/reference/transformApi/transformsCorrectly.transformAddDecoratedNode.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
2+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
3+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
4+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
5+
return c > 3 && r && Object.defineProperty(target, key, r), r;
6+
};
7+
var Foo = /** @class */ (function () {
8+
function Foo() {
9+
}
10+
Foo.prototype.baz = function () { };
11+
__decorate([
12+
Bar
13+
], Foo.prototype, "baz", null);
14+
Foo = __decorate([], Foo);
15+
return Foo;
16+
}());

0 commit comments

Comments
 (0)