Sep 26, 2019 · Sep 12, 2019 · Sep 13, 2019 · Sep 13, 2019 · Sep 13, 2019 · Sep 16, 2019
diff --git a/src/compiler/transformers/classFields.ts b/src/compiler/transformers/classFields.ts
                // [x] = 1 => Object.defineProperty(this, x, ...)
                // -vs-
                // [x] = 1 -> this[x] = 1
                // TODO: Unininitialised properties need to be emitted too.
                || !options.legacyClassFields && options.target === ScriptTarget.ESNext) {
                return node;
            }

        function createObjectDefineProperty(target: Expression, name: PropertyName, initializer: Expression) {
            const e = isComputedPropertyName(name) ? name.expression
                : isIdentifier(name) ? createStringLiteral(unescapeLeadingUnderscores(name.escapedText)) : name;
                : isIdentifier(name) ? createStringLiteral(unescapeLeadingUnderscores(name.escapedText))
                : name;
            return createCall(
                createPropertyAccess(createIdentifier("Object"), createIdentifier("defineProperty")),
                undefined,
 /*typeArguments*/undefined,
                [target, e, createObjectLiteral([createPropertyAssignment("value", initializer)])]);
        }

diff --git a/tests/baselines/reference/accessorsOverrideProperty.js b/tests/baselines/reference/accessorsOverrideProperty.js

 //// [accessorsOverrideProperty.js]
 class A {
    constructor() {
        this.p = 'yep';
    }
    p = 'yep';
 }
 class B extends A {
    get p() { return 'oh no'; } // error
 }
 class C {
    constructor() {
        this.p = 101;
    }
    p = 101;
 }
 class D extends C {
    constructor() {
        super(...arguments);
        this._secret = 11;
    }
    _secret = 11;
    get p() { return this._secret; } // error
    set p(value) { this._secret = value; } // error
 }
diff --git a/tests/baselines/reference/accessorsOverrideProperty2.js b/tests/baselines/reference/accessorsOverrideProperty2.js

 //// [accessorsOverrideProperty2.js]
 class Base {
    constructor() {
        this.x = 1;
    }
    x = 1;
 }
 class Derived extends Base {
    get x() { return 2; } // should be an error
diff --git a/tests/baselines/reference/accessorsOverrideProperty3.js b/tests/baselines/reference/accessorsOverrideProperty3.js

 //// [accessorsOverrideProperty3.js]
 class Lion extends Animal {
    constructor() {
        super(...arguments);
        this._sound = 'grrr';
    }
    _sound = 'grrr';
    get sound() { return this._sound; } // error here
    set sound(val) { this._sound = val; }
 }
diff --git a/tests/baselines/reference/accessorsOverrideProperty4.js b/tests/baselines/reference/accessorsOverrideProperty4.js

 //// [accessorsOverrideProperty4.js]
 class Lion extends Animal {
    constructor() {
        super(...arguments);
        this._sound = 'roar';
    }
    _sound = 'roar';
    get sound() { return this._sound; }
    set sound(val) { this._sound = val; }
 }
diff --git a/tests/baselines/reference/derivedClassOverridesPrivates.js b/tests/baselines/reference/derivedClassOverridesPrivates.js
 })();
 var Base = /** @class */ (function () {
    function Base() {
        Object.defineProperty(this, "x", { value: void 0 });
    }
    return Base;
 }());
 var Derived = /** @class */ (function (_super) {
    __extends(Derived, _super);
    function Derived() {
        return _super !== null && _super.apply(this, arguments) || this;
        var _this = _super !== null && _super.apply(this, arguments) || this;
        Object.defineProperty(_this, "x", { value: void 0 }); // error
        return _this;
    }
    return Derived;
 }(Base));
diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers.js
 var y;
 var Base = /** @class */ (function () {
    function Base(a) {
        Object.defineProperty(this, "a", { value: void 0 });
        Object.defineProperty(this, "d", { value: void 0 });
    }
    Base.prototype.b = function (a) { };
    Object.defineProperty(Base.prototype, "c", {
 var Derived = /** @class */ (function (_super) {
    __extends(Derived, _super);
    function Derived(a) {
        return _super.call(this, x) || this;
        var _this = _super.call(this, x) || this;
        Object.defineProperty(_this, "a", { value: void 0 });
        Object.defineProperty(_this, "d", { value: void 0 });
        return _this;
    }
    Derived.prototype.b = function (a) { };
    Object.defineProperty(Derived.prototype, "c", {
diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers2.js
 var y;
 var Base = /** @class */ (function () {
    function Base(a) {
        Object.defineProperty(this, "a", { value: void 0 });
        Object.defineProperty(this, "d", { value: void 0 });
    }
    Base.prototype.b = function (a) { };
    Object.defineProperty(Base.prototype, "c", {
 var Derived = /** @class */ (function (_super) {
    __extends(Derived, _super);
    function Derived(a) {
        return _super.call(this, a) || this;
        var _this = _super.call(this, a) || this;
        Object.defineProperty(_this, "a", { value: void 0 });
        Object.defineProperty(_this, "d", { value: void 0 });
        return _this;
    }
    Derived.prototype.b = function (a) { };
    Object.defineProperty(Derived.prototype, "c", {
diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers3.js
 var y;
 var Base = /** @class */ (function () {
    function Base(a) {
        Object.defineProperty(this, "a", { value: void 0 });
        Object.defineProperty(this, "d", { value: void 0 });
    }
    Base.prototype.b = function (a) { };
    Object.defineProperty(Base.prototype, "c", {
 var Derived1 = /** @class */ (function (_super) {
    __extends(Derived1, _super);
    function Derived1(a) {
        return _super.call(this, a) || this;
        var _this = _super.call(this, a) || this;
        Object.defineProperty(_this, "a", { value: void 0 });
        return _this;
    }
    return Derived1;
 }(Base));
 var Derived5 = /** @class */ (function (_super) {
    __extends(Derived5, _super);
    function Derived5(a) {
        return _super.call(this, a) || this;
        var _this = _super.call(this, a) || this;
        Object.defineProperty(_this, "d", { value: void 0 });
        return _this;
    }
    return Derived5;
 }(Base));
diff --git a/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js b/tests/baselines/reference/derivedClassOverridesProtectedMembers4.js
 var y;
 var Base = /** @class */ (function () {
    function Base() {
        Object.defineProperty(this, "a", { value: void 0 });
    }
    return Base;
 }());
 var Derived1 = /** @class */ (function (_super) {
    __extends(Derived1, _super);
    function Derived1() {
        return _super !== null && _super.apply(this, arguments) || this;
        var _this = _super !== null && _super.apply(this, arguments) || this;
        Object.defineProperty(_this, "a", { value: void 0 });
        return _this;
    }
    return Derived1;
 }(Base));
 var Derived2 = /** @class */ (function (_super) {
    __extends(Derived2, _super);
    function Derived2() {
        return _super !== null && _super.apply(this, arguments) || this;
        var _this = _super !== null && _super.apply(this, arguments) || this;
        Object.defineProperty(_this, "a", { value: void 0 }); // Error, parent was public
        return _this;
    }
    return Derived2;
 }(Derived1));
diff --git a/tests/baselines/reference/derivedClassOverridesPublicMembers.js b/tests/baselines/reference/derivedClassOverridesPublicMembers.js
 var y;
 var Base = /** @class */ (function () {
    function Base(a) {
        Object.defineProperty(this, "a", { value: void 0 });
        Object.defineProperty(this, "d", { value: void 0 });
    }
    Base.prototype.b = function (a) { };
    Object.defineProperty(Base.prototype, "c", {
 var Derived = /** @class */ (function (_super) {
    __extends(Derived, _super);
    function Derived(a) {
        return _super.call(this, x) || this;
        var _this = _super.call(this, x) || this;
        Object.defineProperty(_this, "a", { value: void 0 });
        Object.defineProperty(_this, "d", { value: void 0 });
        return _this;
    }
    Derived.prototype.b = function (a) { };
    Object.defineProperty(Derived.prototype, "c", {
diff --git a/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js b/tests/baselines/reference/derivedClassOverridesWithoutSubtype.js
 })();
 var Base = /** @class */ (function () {
    function Base() {
        Object.defineProperty(this, "x", { value: void 0 });
    }
    return Base;
 }());
 var Derived = /** @class */ (function (_super) {
    __extends(Derived, _super);
    function Derived() {
        return _super !== null && _super.apply(this, arguments) || this;
        var _this = _super !== null && _super.apply(this, arguments) || this;
        Object.defineProperty(_this, "x", { value: void 0 });
        return _this;
    }
    return Derived;
 }(Base));
diff --git a/tests/baselines/reference/mixingApparentTypeOverrides.js b/tests/baselines/reference/mixingApparentTypeOverrides.js
                args[_i] = arguments[_i];
            }
            var _this = _super.apply(this, args) || this;
            Object.defineProperty(_this, "_tag", { value: void 0 });
            _this._tag = "";
            return _this;
        }
diff --git a/tests/baselines/reference/propertyOverridesAccessors2.js b/tests/baselines/reference/propertyOverridesAccessors2.js
    set x(value) { console.log(`x was set to ${value}`); }
 }
 class Derived extends Base {
    constructor() {
        super(...arguments);
        this.x = 1;
    }
    x = 1;
 }
 const obj = new Derived(); // prints 'x was set to 1'
 console.log(obj.x); // 2
diff --git a/tests/baselines/reference/propertyOverridesAccessors3.js b/tests/baselines/reference/propertyOverridesAccessors3.js

 //// [propertyOverridesAccessors3.js]
 class Animal {
    constructor() {
        this._sound = 'rustling noise in the bushes';
    }
    _sound = 'rustling noise in the bushes';
    get sound() { return this._sound; }
    set sound(val) {
        this._sound = val;
 const a = new Animal;
 a.makeSound(); // 'rustling noise in the bushes'
 class Lion extends Animal {
    constructor() {
        super(...arguments);
        this.sound = 'RAWR!'; // error here
    }
    sound = 'RAWR!'; // error here
 }
 const lion = new Lion;
 lion.makeSound(); // with [[Define]]: Expected "RAWR!" but got "rustling noise in the bushes"
diff --git a/tests/baselines/reference/propertyOverridesAccessors5.errors.txt b/tests/baselines/reference/propertyOverridesAccessors5.errors.txt
 tests/cases/conformance/classes/propertyMemberDeclarations/propertyOverridesAccessors5.ts(5,24): error TS2610: Class 'A' defines instance member accessor 'p', but extended class 'B' defines it as instance member property.


 ==== tests/cases/conformance/classes/propertyMemberDeclarations/propertyOverridesAccessors5.ts (1 errors) ====
    class A {
        get p() { return 'oh no' }
    }
    class B extends A {
        constructor(public p: string) {
                           ~
 !!! error TS2610: Class 'A' defines instance member accessor 'p', but extended class 'B' defines it as instance member property.
            super()
        }
    }

diff --git a/tests/baselines/reference/propertyOverridesAccessors5.js b/tests/baselines/reference/propertyOverridesAccessors5.js
 //// [propertyOverridesAccessors5.ts]
 class A {
    get p() { return 'oh no' }
 }
 class B extends A {
    constructor(public p: string) {
        super()
    }
 }


 //// [propertyOverridesAccessors5.js]
 class A {
    get p() { return 'oh no'; }
 }
 class B extends A {
    p;
    constructor(p) {
        super();
        this.p = p;
    }
 }
diff --git a/tests/baselines/reference/propertyOverridesAccessors5.symbols b/tests/baselines/reference/propertyOverridesAccessors5.symbols
 === tests/cases/conformance/classes/propertyMemberDeclarations/propertyOverridesAccessors5.ts ===
 class A {
 >A : Symbol(A, Decl(propertyOverridesAccessors5.ts, 0, 0))

    get p() { return 'oh no' }
 >p : Symbol(A.p, Decl(propertyOverridesAccessors5.ts, 0, 9))
 }
 class B extends A {
 >B : Symbol(B, Decl(propertyOverridesAccessors5.ts, 2, 1))
 >A : Symbol(A, Decl(propertyOverridesAccessors5.ts, 0, 0))

    constructor(public p: string) {
 >p : Symbol(B.p, Decl(propertyOverridesAccessors5.ts, 4, 16))

        super()
 >super : Symbol(A, Decl(propertyOverridesAccessors5.ts, 0, 0))
    }
 }

diff --git a/tests/baselines/reference/propertyOverridesAccessors5.types b/tests/baselines/reference/propertyOverridesAccessors5.types
 === tests/cases/conformance/classes/propertyMemberDeclarations/propertyOverridesAccessors5.ts ===
 class A {
 >A : A

    get p() { return 'oh no' }
 >p : string
 >'oh no' : "oh no"
 }
 class B extends A {
 >B : B
 >A : A

    constructor(public p: string) {
 >p : string

        super()
 >super() : void
 >super : typeof A
    }
 }

diff --git a/tests/baselines/reference/propertyOverridesMethod.js b/tests/baselines/reference/propertyOverridesMethod.js
    m() { }
 }
 class B extends A {
    constructor() {
        super(...arguments);
        this.m = () => 1;
    }
    m = () => 1;
 }
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/propertyOverridesAccessors5.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/propertyOverridesAccessors5.ts
 // @target: esnext
 class A {
    get p() { return 'oh no' }
 }
 class B extends A {
    constructor(public p: string) {
        super()
    }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,7 +51,6 @@ namespace ts {
		// [x] = 1 => Object.defineProperty(this, x, ...)
		// -vs-
		// [x] = 1 -> this[x] = 1
		// TODO: Unininitialised properties need to be emitted too.
		\|\| !options.legacyClassFields && options.target === ScriptTarget.ESNext) {
		return node;
		}
Expand DownExpand Up		@@ -439,10 +438,11 @@ namespace ts {

		function createObjectDefineProperty(target: Expression, name: PropertyName, initializer: Expression) {
		const e = isComputedPropertyName(name) ? name.expression
		: isIdentifier(name) ? createStringLiteral(unescapeLeadingUnderscores(name.escapedText)) : name;
		: isIdentifier(name) ? createStringLiteral(unescapeLeadingUnderscores(name.escapedText))
		: name;
		return createCall(
		createPropertyAccess(createIdentifier("Object"), createIdentifier("defineProperty")),
		undefined,
		/typeArguments/undefined,
		[target, e, createObjectLiteral([createPropertyAssignment("value", initializer)])]);
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,23 +17,16 @@ class D extends C {

		//// [accessorsOverrideProperty.js]
		class A {
		constructor() {
		this.p = 'yep';
		}
		p = 'yep';
		}
		class B extends A {
		get p() { return 'oh no'; } // error
		}
		class C {
		constructor() {
		this.p = 101;
		}
		p = 101;
		}
		class D extends C {
		constructor() {
		super(...arguments);
		this._secret = 11;
		}
		_secret = 11;
		get p() { return this._secret; } // error
		set p(value) { this._secret = value; } // error
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,9 +14,7 @@ console.log(obj.x); // 1

		//// [accessorsOverrideProperty2.js]
		class Base {
		constructor() {
		this.x = 1;
		}
		x = 1;
		}
		class Derived extends Base {
		get x() { return 2; } // should be an error
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,10 +11,7 @@ class Lion extends Animal {

		//// [accessorsOverrideProperty3.js]
		class Lion extends Animal {
		constructor() {
		super(...arguments);
		this._sound = 'grrr';
		}
		_sound = 'grrr';
		get sound() { return this._sound; } // error here
		set sound(val) { this._sound = val; }
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,10 +11,7 @@ class Lion extends Animal {

		//// [accessorsOverrideProperty4.js]
		class Lion extends Animal {
		constructor() {
		super(...arguments);
		this._sound = 'roar';
		}
		_sound = 'roar';
		get sound() { return this._sound; }
		set sound(val) { this._sound = val; }
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,13 +31,16 @@ var __extends = (this && this.__extends) \|\| (function () {
		})();
		var Base = /** @class */ (function () {
		function Base() {
		Object.defineProperty(this, "x", { value: void 0 });
		}
		return Base;
		}());
		var Derived = /** @class */ (function (_super) {
		__extends(Derived, _super);
		function Derived() {
		return _super !== null && _super.apply(this, arguments) \|\| this;
		var _this = _super !== null && _super.apply(this, arguments) \|\| this;
		Object.defineProperty(_this, "x", { value: void 0 }); // error
		return _this;
		}
		return Derived;
		}(Base));
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,6 +53,8 @@ var x;
		var y;
		var Base = /** @class */ (function () {
		function Base(a) {
		Object.defineProperty(this, "a", { value: void 0 });
		Object.defineProperty(this, "d", { value: void 0 });
		}
		Base.prototype.b = function (a) { };
		Object.defineProperty(Base.prototype, "c", {
Expand All		@@ -73,7 +75,10 @@ var Base = /** @class */ (function () {
		var Derived = /** @class */ (function (_super) {
		__extends(Derived, _super);
		function Derived(a) {
		return _super.call(this, x) \|\| this;
		var _this = _super.call(this, x) \|\| this;
		Object.defineProperty(_this, "a", { value: void 0 });
		Object.defineProperty(_this, "d", { value: void 0 });
		return _this;
		}
		Derived.prototype.b = function (a) { };
		Object.defineProperty(Derived.prototype, "c", {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,6 +81,8 @@ var x;
		var y;
		var Base = /** @class */ (function () {
		function Base(a) {
		Object.defineProperty(this, "a", { value: void 0 });
		Object.defineProperty(this, "d", { value: void 0 });
		}
		Base.prototype.b = function (a) { };
		Object.defineProperty(Base.prototype, "c", {
Expand All		@@ -102,7 +104,10 @@ var Base = /** @class */ (function () {
		var Derived = /** @class */ (function (_super) {
		__extends(Derived, _super);
		function Derived(a) {
		return _super.call(this, a) \|\| this;
		var _this = _super.call(this, a) \|\| this;
		Object.defineProperty(_this, "a", { value: void 0 });
		Object.defineProperty(_this, "d", { value: void 0 });
		return _this;
		}
		Derived.prototype.b = function (a) { };
		Object.defineProperty(Derived.prototype, "c", {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -88,6 +88,8 @@ var x;
		var y;
		var Base = /** @class */ (function () {
		function Base(a) {
		Object.defineProperty(this, "a", { value: void 0 });
		Object.defineProperty(this, "d", { value: void 0 });
		}
		Base.prototype.b = function (a) { };
		Object.defineProperty(Base.prototype, "c", {
Expand All		@@ -110,7 +112,9 @@ var Base = /** @class */ (function () {
		var Derived1 = /** @class */ (function (_super) {
		__extends(Derived1, _super);
		function Derived1(a) {
		return _super.call(this, a) \|\| this;
		var _this = _super.call(this, a) \|\| this;
		Object.defineProperty(_this, "a", { value: void 0 });
		return _this;
		}
		return Derived1;
		}(Base));
Expand DownExpand Up		@@ -149,7 +153,9 @@ var Derived4 = /** @class */ (function (_super) {
		var Derived5 = /** @class */ (function (_super) {
		__extends(Derived5, _super);
		function Derived5(a) {
		return _super.call(this, a) \|\| this;
		var _this = _super.call(this, a) \|\| this;
		Object.defineProperty(_this, "d", { value: void 0 });
		return _this;
		}
		return Derived5;
		}(Base));
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,20 +32,25 @@ var x;
		var y;
		var Base = /** @class */ (function () {
		function Base() {
		Object.defineProperty(this, "a", { value: void 0 });
		}
		return Base;
		}());
		var Derived1 = /** @class */ (function (_super) {
		__extends(Derived1, _super);
		function Derived1() {
		return _super !== null && _super.apply(this, arguments) \|\| this;
		var _this = _super !== null && _super.apply(this, arguments) \|\| this;
		Object.defineProperty(_this, "a", { value: void 0 });
		return _this;
		}
		return Derived1;
		}(Base));
		var Derived2 = /** @class */ (function (_super) {
		__extends(Derived2, _super);
		function Derived2() {
		return _super !== null && _super.apply(this, arguments) \|\| this;
		var _this = _super !== null && _super.apply(this, arguments) \|\| this;
		Object.defineProperty(_this, "a", { value: void 0 }); // Error, parent was public
		return _this;
		}
		return Derived2;
		}(Derived1));