[JS IR] Fix generating property accessors
TL;DR, before we were emitting this JS code:
Object.defineProperty(Base.prototype, 'bar', {
configurable: true,
get: Base.prototype._get_bar__0_k$,
set: Base.prototype._set_bar__a4enbm_k$
});
Now we emit this code instead:
Object.defineProperty(Base.prototype, 'bar', {
configurable: true,
get: function () {
return this._get_bar__0_k$();
},
set: function (value) {
this._set_bar__a4enbm_k$(value);
}
});
This fixes the issue where if we had a @JsExport'ed base class with a
public property overridden in a non-exported derived class, we couldn't
access that property from JS if we were given an instance of
the derived class.
#KT-41912 Fixed
This commit is contained in:
committed by
TeamCityServer
parent
841f5a583e
commit
f0f60907e2
@@ -0,0 +1,174 @@
|
||||
// RUN_PLAIN_BOX_FUNCTION
|
||||
// INFER_MAIN_MODULE
|
||||
// SKIP_MINIFICATION
|
||||
// SKIP_DCE_DRIVEN
|
||||
// SKIP_NODE_JS
|
||||
|
||||
// MODULE: exportedBaseClass
|
||||
// FILE: lib.kt
|
||||
@JsExport
|
||||
abstract class ExportedBase {
|
||||
abstract val foo: String
|
||||
abstract var bar: String
|
||||
|
||||
val fooFinal: String
|
||||
get() = foo
|
||||
}
|
||||
|
||||
@JsExport
|
||||
class ExportedDerived1 : ExportedBase() {
|
||||
override val foo: String
|
||||
get() = "ExportedDerived1.foo"
|
||||
|
||||
private var _bar = "ExportedDerived1.bar"
|
||||
|
||||
override var bar: String
|
||||
get() = _bar
|
||||
set(value) { _bar = value }
|
||||
}
|
||||
|
||||
abstract class NonExportedBase {
|
||||
abstract val foo: String
|
||||
abstract var bar: String
|
||||
}
|
||||
|
||||
@JsExport
|
||||
class ExportedDerived2 : NonExportedBase() {
|
||||
override val foo: String
|
||||
get() = "ExportedDerived2.foo"
|
||||
|
||||
private var _bar = "ExportedDerived2.bar"
|
||||
|
||||
override var bar: String
|
||||
get() = _bar
|
||||
set(value) { _bar = value }
|
||||
}
|
||||
|
||||
// Non-exported
|
||||
open class Derived1 : ExportedBase() {
|
||||
override val foo: String
|
||||
get() = "1"
|
||||
|
||||
private var _bar = "1"
|
||||
|
||||
override var bar: String
|
||||
get() = _bar
|
||||
set(value) { _bar = value }
|
||||
}
|
||||
|
||||
class Derived2 : Derived1() {
|
||||
override val foo: String
|
||||
get() = "2"
|
||||
|
||||
private var _bar = "2"
|
||||
|
||||
override var bar: String
|
||||
get() = _bar
|
||||
set(value) { _bar = value }
|
||||
}
|
||||
|
||||
@JsExport
|
||||
fun getDerived1(): ExportedBase = Derived1()
|
||||
|
||||
@JsExport
|
||||
fun getDerived2(): ExportedBase = Derived2()
|
||||
|
||||
@JsExport
|
||||
fun isLegacyBackend() = testUtils.isLegacyBackend()
|
||||
|
||||
// FILE: test.js
|
||||
function assertEquals(expected, actual, msg) {
|
||||
if (expected !== actual) {
|
||||
throw "Unexpected value: expected = '" + expected + "', actual = '" + actual + "' — " + msg;
|
||||
}
|
||||
}
|
||||
|
||||
function box() {
|
||||
|
||||
var d = exportedBaseClass;
|
||||
|
||||
if (!d.isLegacyBackend()) {
|
||||
assertEquals(
|
||||
true,
|
||||
d.ExportedBase.prototype.hasOwnProperty('foo'),
|
||||
'Property foo should be defined for ExportedBase.prototype'
|
||||
);
|
||||
assertEquals(
|
||||
true,
|
||||
d.ExportedBase.prototype.hasOwnProperty('bar'),
|
||||
'Property bar should be defined for ExportedBase.prototype'
|
||||
);
|
||||
}
|
||||
|
||||
assertEquals(
|
||||
true,
|
||||
d.ExportedBase.prototype.hasOwnProperty('fooFinal'),
|
||||
'Property fooFinal should be defined for ExportedBase.prototype'
|
||||
);
|
||||
|
||||
var derived1 = d.getDerived1();
|
||||
assertEquals('1', derived1.foo, "derived1.foo");
|
||||
assertEquals('1', derived1.fooFinal, "derived1.fooFinal");
|
||||
assertEquals('1', derived1.bar, "derived1.bar initial value");
|
||||
derived1.bar = '11';
|
||||
assertEquals('11', derived1.bar, "derived1.bar after write");
|
||||
if (!d.isLegacyBackend()) {
|
||||
assertEquals(
|
||||
false,
|
||||
Object.getPrototypeOf(derived1).hasOwnProperty('foo'),
|
||||
'Property foo of Derived1 should be inherited from ExportedBase.prototype'
|
||||
);
|
||||
assertEquals(
|
||||
false,
|
||||
Object.getPrototypeOf(derived1).hasOwnProperty('bar'),
|
||||
'Property bar should of Derived1 be inherited from ExportedBase.prototype'
|
||||
);
|
||||
}
|
||||
|
||||
var derived2 = d.getDerived2();
|
||||
assertEquals('2', derived2.foo, "derived2.foo");
|
||||
assertEquals('2', derived2.fooFinal, "derived2.fooFinal");
|
||||
assertEquals('2', derived2.bar, "derived2.bar initial value");
|
||||
derived2.bar = '22';
|
||||
assertEquals('22', derived2.bar, "derived2.bar after write");
|
||||
if (!d.isLegacyBackend()) {
|
||||
assertEquals(
|
||||
false,
|
||||
Object.getPrototypeOf(derived2).hasOwnProperty('foo'),
|
||||
'Property foo of Derived2 should be inherited from ExportedBase.prototype'
|
||||
);
|
||||
assertEquals(
|
||||
false,
|
||||
Object.getPrototypeOf(derived2).hasOwnProperty('bar'),
|
||||
'Property bar of Derived2 should be inherited from ExportedBase.prototype'
|
||||
);
|
||||
}
|
||||
|
||||
var exportedDerived1 = new d.ExportedDerived1();
|
||||
assertEquals('ExportedDerived1.foo', exportedDerived1.foo, "exportedDerived1.foo");
|
||||
assertEquals('ExportedDerived1.bar', exportedDerived1.bar, "exportedDerived1.bar initial value");
|
||||
exportedDerived1.bar = 'ExportedDerived1.bar (updated)';
|
||||
assertEquals('ExportedDerived1.bar (updated)', exportedDerived1.bar, "exportedDerived1.bar after write");
|
||||
if (!d.isLegacyBackend()) {
|
||||
assertEquals(
|
||||
false,
|
||||
d.ExportedDerived1.prototype.hasOwnProperty('foo'),
|
||||
'Property foo of ExportedDerived1 should be inherited from ExportedBase.prototype'
|
||||
);
|
||||
assertEquals(
|
||||
false,
|
||||
d.ExportedDerived1.prototype.hasOwnProperty('bar'),
|
||||
'Property bar of ExportedDerived1 should be inherited from ExportedBase.prototype'
|
||||
);
|
||||
}
|
||||
|
||||
var exportedDerived2 = new d.ExportedDerived2();
|
||||
assertEquals('ExportedDerived2.foo', exportedDerived2.foo, "exportedDerived2.foo");
|
||||
assertEquals('ExportedDerived2.bar', exportedDerived2.bar, "exportedDerived2.bar initial value");
|
||||
exportedDerived2.bar = 'ExportedDerived2.bar (updated)';
|
||||
assertEquals('ExportedDerived2.bar (updated)', exportedDerived2.bar, "exportedDerived2.bar after write");
|
||||
assertEquals(true, d.ExportedDerived2.prototype.hasOwnProperty('foo'), 'Property foo should be defined for ExportedDerived2.prototype');
|
||||
assertEquals(true, d.ExportedDerived2.prototype.hasOwnProperty('bar'), 'Property bar should be defined for ExportedDerived2.prototype');
|
||||
|
||||
return 'OK';
|
||||
}
|
||||
Reference in New Issue
Block a user