diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts index 3399babc9d5..1098fa06a0a 100644 --- a/src/compiler/transformers/module/module.ts +++ b/src/compiler/transformers/module/module.ts @@ -736,9 +736,6 @@ namespace ts { addExportMemberAssignments(statements, classDecl.name); - if (statements.length > 1) { - Debug.assert(!!classDecl.decorators, "Expression statements should only have an export member assignment when decorated.") - } return statements; } } diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.js b/tests/baselines/reference/decoratorOnClassConstructor2.js new file mode 100644 index 00000000000..59659c32f7a --- /dev/null +++ b/tests/baselines/reference/decoratorOnClassConstructor2.js @@ -0,0 +1,56 @@ +//// [tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor2.ts] //// + +//// [0.ts] + +export class base { } +export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { } + +//// [2.ts] +import {base} from "./0.ts" +import {foo} from "./0.ts" +export class C extends base{ + constructor(@foo prop: any) { + super(); + } +} + +//// [0.js] +"use strict"; +var base = (function () { + function base() { + } + return base; +}()); +exports.base = base; +function foo(target, propertyKey, parameterIndex) { } +exports.foo = foo; +//// [2.js] +"use strict"; +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + 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; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var __param = (this && this.__param) || function (paramIndex, decorator) { + return function (target, key) { decorator(target, key, paramIndex); } +}; +var _0_ts_1 = require("./0.ts"); +var _0_ts_2 = require("./0.ts"); +var C = (function (_super) { + __extends(C, _super); + function C(prop) { + _super.call(this); + } + return C; +}(_0_ts_1.base)); +exports.C = C; +C = __decorate([ + __param(0, _0_ts_2.foo) +], C); +exports.C = C; diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.symbols b/tests/baselines/reference/decoratorOnClassConstructor2.symbols new file mode 100644 index 00000000000..2135ddd866a --- /dev/null +++ b/tests/baselines/reference/decoratorOnClassConstructor2.symbols @@ -0,0 +1,31 @@ +=== tests/cases/conformance/decorators/class/constructor/0.ts === + +export class base { } +>base : Symbol(base, Decl(0.ts, 0, 0)) + +export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { } +>foo : Symbol(foo, Decl(0.ts, 1, 21)) +>target : Symbol(target, Decl(0.ts, 2, 20)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>propertyKey : Symbol(propertyKey, Decl(0.ts, 2, 35)) +>parameterIndex : Symbol(parameterIndex, Decl(0.ts, 2, 65)) + +=== tests/cases/conformance/decorators/class/constructor/2.ts === +import {base} from "./0.ts" +>base : Symbol(base, Decl(2.ts, 0, 8)) + +import {foo} from "./0.ts" +>foo : Symbol(foo, Decl(2.ts, 1, 8)) + +export class C extends base{ +>C : Symbol(C, Decl(2.ts, 1, 26)) +>base : Symbol(base, Decl(2.ts, 0, 8)) + + constructor(@foo prop: any) { +>foo : Symbol(foo, Decl(2.ts, 1, 8)) +>prop : Symbol(prop, Decl(2.ts, 3, 16)) + + super(); +>super : Symbol(base, Decl(0.ts, 0, 0)) + } +} diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.types b/tests/baselines/reference/decoratorOnClassConstructor2.types new file mode 100644 index 00000000000..c2e7a08499a --- /dev/null +++ b/tests/baselines/reference/decoratorOnClassConstructor2.types @@ -0,0 +1,32 @@ +=== tests/cases/conformance/decorators/class/constructor/0.ts === + +export class base { } +>base : base + +export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { } +>foo : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void +>target : Object +>Object : Object +>propertyKey : string | symbol +>parameterIndex : number + +=== tests/cases/conformance/decorators/class/constructor/2.ts === +import {base} from "./0.ts" +>base : typeof base + +import {foo} from "./0.ts" +>foo : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void + +export class C extends base{ +>C : C +>base : base + + constructor(@foo prop: any) { +>foo : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void +>prop : any + + super(); +>super() : void +>super : typeof base + } +} diff --git a/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor2.ts b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor2.ts new file mode 100644 index 00000000000..dece1cc992c --- /dev/null +++ b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor2.ts @@ -0,0 +1,16 @@ +// @target: es5 +// @module: commonjs +// @experimentaldecorators: true + +// @Filename: 0.ts +export class base { } +export function foo(target: Object, propertyKey: string | symbol, parameterIndex: number) { } + +// @Filename: 2.ts +import {base} from "./0.ts" +import {foo} from "./0.ts" +export class C extends base{ + constructor(@foo prop: any) { + super(); + } +} \ No newline at end of file