Skip to content

Commit 839dde3

Browse files
sheetalkamatsheetalkamat
committed
Mark as referenced aliases in Union that will get emitted as part of decorator metadaa
Fixes microsoft#13449
1 parent b345a78 commit 839dde3

7 files changed

Lines changed: 197 additions & 6 deletions

File tree

‎src/compiler/checker.ts‎

Lines changed: 68 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16732,7 +16732,10 @@ namespace ts {
1673216732
* marked as referenced to prevent import elision.
1673316733
*/
1673416734
function markTypeNodeAsReferenced(node: TypeNode) {
16735-
const typeName = node && getEntityNameFromTypeNode(node);
16735+
markEntityNameOrEntityExpressionAsReference(node && getEntityNameFromTypeNode(node));
16736+
}
16737+
16738+
function markEntityNameOrEntityExpressionAsReference(typeName: EntityNameOrEntityNameExpression) {
1673616739
const rootName = typeName && getFirstIdentifier(typeName);
1673716740
const rootSymbol = rootName && resolveName(rootName, rootName.text, (typeName.kind === SyntaxKind.Identifier ? SymbolFlags.Type : SymbolFlags.Namespace) | SymbolFlags.Alias, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
1673816741
if (rootSymbol
@@ -16743,6 +16746,65 @@ namespace ts {
1674316746
}
1674416747
}
1674516748

16749+
function markDecoratorMedataDataTypeNodeAsReferenced(node: TypeNode): void {
16750+
const entityNameOrToken = getEntityNameForDecoratoryMetadata(node);
16751+
if (entityNameOrToken && isEntityName(entityNameOrToken)) {
16752+
markEntityNameOrEntityExpressionAsReference(entityNameOrToken);
16753+
}
16754+
}
16755+
16756+
type voidUndefinedNullOrNeverTypeNode = Token<SyntaxKind.VoidKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.NullKeyword | SyntaxKind.NeverKeyword>;
16757+
16758+
function getEntityNameForDecoratoryMetadata(node: TypeNode): EntityName | voidUndefinedNullOrNeverTypeNode {
16759+
if (node) {
16760+
switch (node.kind) {
16761+
case SyntaxKind.IntersectionType:
16762+
case SyntaxKind.UnionType:
16763+
let commonEntityName: EntityName | voidUndefinedNullOrNeverTypeNode;
16764+
for (const typeNode of (<UnionOrIntersectionTypeNode>node).types) {
16765+
const individualEntityName = getEntityNameForDecoratoryMetadata(typeNode);
16766+
if (!individualEntityName) {
16767+
// Individual is something like string number
16768+
// So it would be serialized to either that type or object
16769+
// Safe to return here
16770+
return undefined;
16771+
}
16772+
16773+
const isCommonEntityName = commonEntityName && isEntityName(commonEntityName);
16774+
const isIndividualEntityName = isEntityName(individualEntityName);
16775+
if (isCommonEntityName && isIndividualEntityName) {
16776+
// Note this is in sync with the transformation that happens for type node.
16777+
// Keep this in sync with serializeUnionOrIntersectionType
16778+
// Verify if they refer to same entity and is identifier
16779+
// return undefined if they dont match because we would emit object
16780+
if (!isIdentifier(commonEntityName) ||
16781+
!isIdentifier(individualEntityName) ||
16782+
commonEntityName.text !== individualEntityName.text) {
16783+
return undefined;
16784+
}
16785+
}
16786+
else if (!isCommonEntityName) {
16787+
commonEntityName = individualEntityName;
16788+
}
16789+
}
16790+
return commonEntityName;
16791+
16792+
case SyntaxKind.ParenthesizedType:
16793+
return getEntityNameForDecoratoryMetadata((<ParenthesizedTypeNode>node).type);
16794+
16795+
case SyntaxKind.TypeReference:
16796+
return (<TypeReferenceNode>node).typeName;
16797+
16798+
case SyntaxKind.VoidKeyword:
16799+
case SyntaxKind.UndefinedKeyword:
16800+
case SyntaxKind.NullKeyword:
16801+
case SyntaxKind.NeverKeyword:
16802+
return <voidUndefinedNullOrNeverTypeNode>node;
16803+
16804+
}
16805+
}
16806+
}
16807+
1674616808
function getParameterTypeNodeForDecoratorCheck(node: ParameterDeclaration): TypeNode {
1674716809
return node.dotDotDotToken ? getRestParameterElementType(node.type) : node.type;
1674816810
}
@@ -16778,7 +16840,7 @@ namespace ts {
1677816840
const constructor = getFirstConstructorWithBody(<ClassDeclaration>node);
1677916841
if (constructor) {
1678016842
for (const parameter of constructor.parameters) {
16781-
markTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
16843+
markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
1678216844
}
1678316845
}
1678416846
break;
@@ -16787,17 +16849,17 @@ namespace ts {
1678716849
case SyntaxKind.GetAccessor:
1678816850
case SyntaxKind.SetAccessor:
1678916851
for (const parameter of (<FunctionLikeDeclaration>node).parameters) {
16790-
markTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
16852+
markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
1679116853
}
1679216854

16793-
markTypeNodeAsReferenced((<FunctionLikeDeclaration>node).type);
16855+
markDecoratorMedataDataTypeNodeAsReferenced((<FunctionLikeDeclaration>node).type);
1679416856
break;
1679516857

1679616858
case SyntaxKind.PropertyDeclaration:
16797-
markTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(<ParameterDeclaration>node));
16859+
markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(<ParameterDeclaration>node));
1679816860
break;
1679916861
case SyntaxKind.Parameter:
16800-
markTypeNodeAsReferenced((<PropertyDeclaration>node).type);
16862+
markDecoratorMedataDataTypeNodeAsReferenced((<PropertyDeclaration>node).type);
1680116863
break;
1680216864
}
1680316865
}

‎src/compiler/transformers/ts.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1739,6 +1739,8 @@ namespace ts {
17391739
}
17401740

17411741
function serializeUnionOrIntersectionType(node: UnionOrIntersectionTypeNode): SerializedTypeNode {
1742+
// Note when updating logic here also update getEntityNameForDecoratoryMetadata
1743+
// so that aliases can be marked as referenced
17421744
let serializedUnion: SerializedTypeNode;
17431745
for (const typeNode of node.types) {
17441746
const serializedIndividual = serializeTypeNode(typeNode);

‎tests/baselines/reference/metadataOfClassFromAlias.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
3434
var __metadata = (this && this.__metadata) || function (k, v) {
3535
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
3636
};
37+
var auxiliry_1 = require("./auxiliry");
3738
function annotation() {
3839
return function (target) { };
3940
}

‎tests/baselines/reference/metadataOfClassFromAlias2.js‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
//// [tests/cases/compiler/metadataOfClassFromAlias2.ts] ////
2+
3+
//// [auxiliry.ts]
4+
5+
export class SomeClass {
6+
field: string;
7+
}
8+
9+
//// [test.ts]
10+
import { SomeClass } from './auxiliry';
11+
function annotation(): PropertyDecorator {
12+
return (target: any): void => { };
13+
}
14+
export class ClassA {
15+
@annotation() array: SomeClass | null | string;
16+
}
17+
18+
//// [auxiliry.js]
19+
"use strict";
20+
var SomeClass = (function () {
21+
function SomeClass() {
22+
}
23+
return SomeClass;
24+
}());
25+
exports.SomeClass = SomeClass;
26+
//// [test.js]
27+
"use strict";
28+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
29+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
30+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
31+
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;
32+
return c > 3 && r && Object.defineProperty(target, key, r), r;
33+
};
34+
var __metadata = (this && this.__metadata) || function (k, v) {
35+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
36+
};
37+
function annotation() {
38+
return function (target) { };
39+
}
40+
var ClassA = (function () {
41+
function ClassA() {
42+
}
43+
return ClassA;
44+
}());
45+
__decorate([
46+
annotation(),
47+
__metadata("design:type", Object)
48+
], ClassA.prototype, "array", void 0);
49+
exports.ClassA = ClassA;

‎tests/baselines/reference/metadataOfClassFromAlias2.symbols‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
=== tests/cases/compiler/auxiliry.ts ===
2+
3+
export class SomeClass {
4+
>SomeClass : Symbol(SomeClass, Decl(auxiliry.ts, 0, 0))
5+
6+
field: string;
7+
>field : Symbol(SomeClass.field, Decl(auxiliry.ts, 1, 24))
8+
}
9+
10+
=== tests/cases/compiler/test.ts ===
11+
import { SomeClass } from './auxiliry';
12+
>SomeClass : Symbol(SomeClass, Decl(test.ts, 0, 8))
13+
14+
function annotation(): PropertyDecorator {
15+
>annotation : Symbol(annotation, Decl(test.ts, 0, 39))
16+
>PropertyDecorator : Symbol(PropertyDecorator, Decl(lib.d.ts, --, --))
17+
18+
return (target: any): void => { };
19+
>target : Symbol(target, Decl(test.ts, 2, 12))
20+
}
21+
export class ClassA {
22+
>ClassA : Symbol(ClassA, Decl(test.ts, 3, 1))
23+
24+
@annotation() array: SomeClass | null | string;
25+
>annotation : Symbol(annotation, Decl(test.ts, 0, 39))
26+
>array : Symbol(ClassA.array, Decl(test.ts, 4, 21))
27+
>SomeClass : Symbol(SomeClass, Decl(test.ts, 0, 8))
28+
}

‎tests/baselines/reference/metadataOfClassFromAlias2.types‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
=== tests/cases/compiler/auxiliry.ts ===
2+
3+
export class SomeClass {
4+
>SomeClass : SomeClass
5+
6+
field: string;
7+
>field : string
8+
}
9+
10+
=== tests/cases/compiler/test.ts ===
11+
import { SomeClass } from './auxiliry';
12+
>SomeClass : typeof SomeClass
13+
14+
function annotation(): PropertyDecorator {
15+
>annotation : () => PropertyDecorator
16+
>PropertyDecorator : PropertyDecorator
17+
18+
return (target: any): void => { };
19+
>(target: any): void => { } : (target: any) => void
20+
>target : any
21+
}
22+
export class ClassA {
23+
>ClassA : ClassA
24+
25+
@annotation() array: SomeClass | null | string;
26+
>annotation() : PropertyDecorator
27+
>annotation : () => PropertyDecorator
28+
>array : string | SomeClass
29+
>SomeClass : SomeClass
30+
>null : null
31+
}

‎tests/cases/compiler/metadataOfClassFromAlias2.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// @experimentalDecorators: true
2+
// @emitDecoratorMetadata: true
3+
// @target: es5
4+
// @module: commonjs
5+
6+
// @filename: auxiliry.ts
7+
export class SomeClass {
8+
field: string;
9+
}
10+
11+
//@filename: test.ts
12+
import { SomeClass } from './auxiliry';
13+
function annotation(): PropertyDecorator {
14+
return (target: any): void => { };
15+
}
16+
export class ClassA {
17+
@annotation() array: SomeClass | null | string;
18+
}

0 commit comments

Comments
 (0)