More

src/compiler/transformers/legacyDecorators.ts

@@ -327,11 +327,7 @@ export function transformLegacyDecorators(context: TransformationContext): (x: S
         const location = moveRangePastModifiers(node);
         const classAlias = getClassAliasIfNeeded(node);
 
-        // When we transform to ES5/3 this will be moved inside an IIFE and should reference the name
-        // without any block-scoped variable collision handling
-        const declName = languageVersion < ScriptTarget.ES2015 ?
-            factory.getInternalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true) :
-            factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+        const declName = factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
 
         //  ... = class ${name} ${heritageClauses} {
         //      ${members}
@@ -687,11 +683,7 @@ export function transformLegacyDecorators(context: TransformationContext): (x: S
 
         const classAlias = classAliases && classAliases[getOriginalNodeId(node)];
 
-        // When we transform to ES5/3 this will be moved inside an IIFE and should reference the name
-        // without any block-scoped variable collision handling
-        const localName = languageVersion < ScriptTarget.ES2015 ?
-            factory.getInternalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true) :
-            factory.getDeclarationName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+        const localName = factory.getDeclarationName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
         const decorate = emitHelpers().createDecorateHelper(decoratorExpressions, localName);
         const expression = factory.createAssignment(localName, classAlias ? factory.createAssignment(classAlias, decorate) : decorate);
         setEmitFlags(expression, EmitFlags.NoComments);

tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js

@@ -95,7 +95,7 @@ let ClassA = (() => {
         __metadata("design:paramtypes", [aux1_1.SomeClass1]),
         __metadata("design:returntype", void 0)
     ], ClassA.prototype, "foo", null);
-    ClassA = __decorate([
+    exports.ClassA = ClassA = __decorate([
         annotation(),
         __metadata("design:paramtypes", [aux_1.SomeClass])
     ], ClassA);

tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js

@@ -47,7 +47,7 @@ let MyClass = (() => {
             this.db.doSomething();
         }
     };
-    MyClass = __decorate([
+    exports.MyClass = MyClass = __decorate([
         someDecorator,
         __metadata("design:paramtypes", [db_1.db])
     ], MyClass);

tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js

@@ -47,7 +47,7 @@ let MyClass = (() => {
             this.db.doSomething();
         }
     };
-    MyClass = __decorate([
+    exports.MyClass = MyClass = __decorate([
         someDecorator,
         __metadata("design:paramtypes", [db_1.db])
     ], MyClass);

tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js

@@ -47,7 +47,7 @@ let MyClass = (() => {
             this.db.doSomething();
         }
     };
-    MyClass = __decorate([
+    exports.MyClass = MyClass = __decorate([
         someDecorator,
         __metadata("design:paramtypes", [db.db])
     ], MyClass);

tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js

@@ -48,7 +48,7 @@ let MyClass = (() => {
             this.db.doSomething();
         }
     };
-    MyClass = __decorate([
+    exports.MyClass = MyClass = __decorate([
         someDecorator,
         __metadata("design:paramtypes", [typeof (_a = typeof db_1.default !== "undefined" && db_1.default.db) === "function" ? _a : Object])
     ], MyClass);

tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js

@@ -46,7 +46,7 @@ let MyClass = (() => {
             this.db.doSomething();
         }
     };
-    MyClass = __decorate([
+    exports.MyClass = MyClass = __decorate([
         someDecorator,
         __metadata("design:paramtypes", [db_1.default])
     ], MyClass);

tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js

@@ -46,7 +46,7 @@ let MyClass = (() => {
             this.db.doSomething();
         }
     };
-    MyClass = __decorate([
+    exports.MyClass = MyClass = __decorate([
         someDecorator,
         __metadata("design:paramtypes", [db_1.default])
     ], MyClass);

tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js

@@ -47,7 +47,7 @@ let MyClass = (() => {
             this.db.doSomething();
         }
     };
-    MyClass = __decorate([
+    exports.MyClass = MyClass = __decorate([
         someDecorator,
         __metadata("design:paramtypes", [typeof (_a = typeof db_1.default !== "undefined" && db_1.default.db) === "function" ? _a : Object])
     ], MyClass);

tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js

@@ -47,7 +47,7 @@ let MyClass = (() => {
             this.db.doSomething();
         }
     };
-    MyClass = __decorate([
+    exports.MyClass = MyClass = __decorate([
         someDecorator,
         __metadata("design:paramtypes", [database.db])
     ], MyClass);

tests/baselines/reference/decoratorOnClass2.js

@@ -20,7 +20,7 @@ exports.C = void 0;
 let C = (() => {
     let C = class C {
     };
-    C = __decorate([
+    exports.C = C = __decorate([
         dec
     ], C);
     return C;

tests/baselines/reference/decoratorOnClass3.js

@@ -21,7 +21,7 @@ exports.C = void 0;
 let C = (() => {
     let C = class C {
     };
-    C = __decorate([
+    exports.C = C = __decorate([
         dec
     ], C);
     return C;

tests/baselines/reference/decoratorOnClassConstructor2.js

@@ -43,7 +43,7 @@ let C = (() => {
             super();
         }
     };
-    C = __decorate([
+    exports.C = C = __decorate([
         __param(0, _0_ts_2.foo)
     ], C);
     return C;

tests/baselines/reference/decoratorOnClassConstructor3.js

@@ -46,7 +46,7 @@ let C = (() => {
             super();
         }
     };
-    C = __decorate([
+    exports.C = C = __decorate([
         __param(0, _0_2.foo)
     ], C);
     return C;

tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js

@@ -18,7 +18,7 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
                 this._elementRef = _elementRef;
             }
         };
-        MyClass1 = __decorate([
+        exports.MyClass1 = MyClass1 = __decorate([
             foo,
             __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
         ], MyClass1);

tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js

@@ -18,7 +18,7 @@ let MyClass1 = (() => {
             this._elementRef = _elementRef;
         }
     };
-    MyClass1 = __decorate([
+    exports.MyClass1 = MyClass1 = __decorate([
         foo,
         __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
     ], MyClass1);

tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js

@@ -18,7 +18,7 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
                 this._elementRef = _elementRef;
             }
         };
-        MyClass1 = __decorate([
+        exports.MyClass1 = MyClass1 = __decorate([
             foo,
             __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
         ], MyClass1);

tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js

@@ -18,7 +18,7 @@ let MyClass1 = (() => {
             this._elementRef = _elementRef;
         }
     };
-    MyClass1 = __decorate([
+    exports.MyClass1 = MyClass1 = __decorate([
         foo,
         __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
     ], MyClass1);

tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js

@@ -18,7 +18,7 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
                 this._elementRef = _elementRef;
             }
         };
-        MyClass1 = __decorate([
+        exports.MyClass1 = MyClass1 = __decorate([
             foo,
             __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
         ], MyClass1);

tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js

@@ -18,7 +18,7 @@ let MyClass1 = (() => {
             this._elementRef = _elementRef;
         }
     };
-    MyClass1 = __decorate([
+    exports.MyClass1 = MyClass1 = __decorate([
         foo,
         __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
     ], MyClass1);

tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js

@@ -18,7 +18,7 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
                 this._elementRef = _elementRef;
             }
         };
-        MyClass1 = __decorate([
+        exports.MyClass1 = MyClass1 = __decorate([
             foo,
             __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
         ], MyClass1);

tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js

@@ -18,7 +18,7 @@ let MyClass1 = (() => {
             this._elementRef = _elementRef;
         }
     };
-    MyClass1 = __decorate([
+    exports.MyClass1 = MyClass1 = __decorate([
         foo,
         __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
     ], MyClass1);

tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js

@@ -18,7 +18,7 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
                 this._elementRef = _elementRef;
             }
         };
-        MyClass1 = __decorate([
+        exports.MyClass1 = MyClass1 = __decorate([
             foo,
             __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
         ], MyClass1);

tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js

@@ -18,7 +18,7 @@ let MyClass1 = (() => {
             this._elementRef = _elementRef;
         }
     };
-    MyClass1 = __decorate([
+    exports.MyClass1 = MyClass1 = __decorate([
         foo,
         __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
     ], MyClass1);

tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).js

@@ -13,7 +13,7 @@ let MyClass = (() => {
             this.db.doSomething();
         }
     };
-    MyClass = __decorate([
+    exports.MyClass = MyClass = __decorate([
         someDecorator,
         __metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
     ], MyClass);

tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).oldTranspile.js

@@ -13,7 +13,7 @@ let MyClass = (() => {
             this.db.doSomething();
         }
     };
-    MyClass = __decorate([
+    exports.MyClass = MyClass = __decorate([
         someDecorator,
         __metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
     ], MyClass);

tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js

@@ -13,7 +13,7 @@ let MyClass = (() => {
             this.db.doSomething();
         }
     };
-    MyClass = __decorate([
+    exports.MyClass = MyClass = __decorate([
         someDecorator,
         __metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
     ], MyClass);

tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.oldTranspile.js

@@ -13,7 +13,7 @@ let MyClass = (() => {
             this.db.doSomething();
         }
     };
-    MyClass = __decorate([
+    exports.MyClass = MyClass = __decorate([
         someDecorator,
         __metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
     ], MyClass);

tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).js

@@ -21,7 +21,7 @@ exports.C = void 0;
 let C = (() => {
     let C = class C {
     };
-    C = __decorate([
+    exports.C = C = __decorate([
         dec
     ], C);
     return C;

tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).js

@@ -25,9 +25,9 @@ System.register([], function (exports_1, context_1) {
             C = (() => {
                 let C = class C {
                 };
-                C = __decorate([
+                exports_1("C", C = __decorate([
                     dec
-                ], C);
+                ], C));
                 return C;
             })();
             exports_1("C", C);

tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).js

@@ -21,7 +21,7 @@ exports.D = void 0;
 let C = (() => {
     let C = class C {
     };
-    C = __decorate([
+    exports.D = C = __decorate([
         dec
     ], C);
     return C;

tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).js

@@ -25,9 +25,9 @@ System.register([], function (exports_1, context_1) {
             C = (() => {
                 let C = class C {
                 };
-                C = __decorate([
+                exports_1("D", C = __decorate([
                     dec
-                ], C);
+                ], C));
                 return C;
             })();
             exports_1("D", C);

tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).js

@@ -23,7 +23,7 @@ try {
     exports.C = C = (() => {
         let C = class C {
         };
-        C = __decorate([
+        exports.C = C = __decorate([
             dec
         ], C);
         return C;

tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).js

@@ -26,9 +26,9 @@ System.register([], function (exports_1, context_1) {
                 exports_1("C", C = (() => {
                     let C = class C {
                     };
-                    C = __decorate([
+                    exports_1("C", C = __decorate([
                         dec
-                    ], C);
+                    ], C));
                     return C;
                 })());
             }

tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).js

@@ -24,7 +24,7 @@ try {
     exports.C = C = (() => {
         let C = class C {
         };
-        C = __decorate([
+        exports.C = C = __decorate([
             dec
         ], C);
         return C;

tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).js

@@ -27,9 +27,9 @@ System.register([], function (exports_1, context_1) {
                 exports_1("C", C = (() => {
                     let C = class C {
                     };
-                    C = __decorate([
+                    exports_1("C", C = __decorate([
                         dec
-                    ], C);
+                    ], C));
                     return C;
                 })());
             }

tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).js

@@ -24,7 +24,7 @@ try {
     exports.D = C = (() => {
         let C = class C {
         };
-        C = __decorate([
+        exports.D = C = __decorate([
             dec
         ], C);
         return C;

tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).js

@@ -27,9 +27,9 @@ System.register([], function (exports_1, context_1) {
                 exports_1("D", C = (() => {
                     let C = class C {
                     };
-                    C = __decorate([
+                    exports_1("D", C = __decorate([
                         dec
-                    ], C);
+                    ], C));
                     return C;
                 })());
             }

tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).js

@@ -19,7 +19,7 @@ exports.C = void 0;
 let C = (() => {
     let C = class C {
     };
-    C = __decorate([
+    exports.C = C = __decorate([
         dec
     ], C);
     return C;

tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).js

@@ -23,9 +23,9 @@ System.register([], function (exports_1, context_1) {
             C = (() => {
                 let C = class C {
                 };
-                C = __decorate([
+                exports_1("C", C = __decorate([
                     dec
-                ], C);
+                ], C));
                 return C;
             })();
             exports_1("C", C);