cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix super method call in private instance method calling overridden method (#9801)

Browse Source 
* Fix super method call in private instance method calling overridden method

* Change return value in test fixtures

* Update tests to verify that overridden method is not called
This commit is contained in:
Mattias Buelens 2019-04-01 00:50:29 +02:00 committed by Justin Ridgewell
parent ae9b25ac69
commit 3c11a4a930
13 changed files with 78 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/babel-helper-create-class-features-plugin/src/fields.js
View File

@ -501,7 +501,9 @@ function replaceThisContext(path, ref, superRef, file, loose) {
file,
getObjectRef() {
state.needsClassRef = true;
return path.node.static ? ref : t.thisExpression();
return path.node.static
? ref
: t.memberExpression(ref, t.identifier("prototype"));
},
});
replacer.replace();

8
packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/exec.js vendored
View File

@ -1,10 +1,14 @@
class Base {
superMethod() {
return 1017;
return 'good';
}
}
class Sub extends Base {
superMethod() {
return 'bad';
}
#privateMethod() {
return super.superMethod();
}
@ -14,4 +18,4 @@ class Sub extends Base {
}
}
expect((new Sub()).publicMethod()).toEqual(1017);
expect((new Sub()).publicMethod()).toEqual('good');

8
packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/input.js vendored
View File

@ -1,10 +1,14 @@
class Base {
superMethod() {
return 1017;
return 'good';
}
}
class Sub extends Base {
superMethod() {
return 'bad';
}
#privateMethod() {
return super.superMethod();
}
@ -12,4 +16,4 @@ class Sub extends Base {
publicMethod() {
return this.#privateMethod();
}
}
}

6
packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/output.js vendored
View File

@ -1,6 +1,6 @@
class Base {
superMethod() {
return 1017;
return 'good';
}
}
@ -13,6 +13,10 @@ class Sub extends Base {
});
}
superMethod() {
return 'bad';
}
publicMethod() {
return babelHelpers.classPrivateFieldLooseBase(this, _privateMethod)[_privateMethod]();
}

8
packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/exec.js vendored
View File

@ -1,10 +1,14 @@
class Base {
superMethod() {
return 1017;
return 'good';
}
}
class Sub extends Base {
superMethod() {
return 'bad';
}
#privateMethod() {
return super.superMethod();
}
@ -14,4 +18,4 @@ class Sub extends Base {
}
}
expect((new Sub()).publicMethod()).toEqual(1017);
expect((new Sub()).publicMethod()).toEqual('good');

8
packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/input.js vendored
View File

@ -1,10 +1,14 @@
class Base {
superMethod() {
return 1017;
return 'good';
}
}
class Sub extends Base {
superMethod() {
return 'bad';
}
#privateMethod() {
return super.superMethod();
}
@ -12,4 +16,4 @@ class Sub extends Base {
publicMethod() {
return this.#privateMethod();
}
}
}

8
packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/output.js vendored
View File

@ -1,6 +1,6 @@
class Base {
superMethod() {
return 1017;
return 'good';
}
}
@ -12,6 +12,10 @@ class Sub extends Base {
_privateMethod.add(this);
}
superMethod() {
return 'bad';
}
publicMethod() {
return babelHelpers.classPrivateMethodGet(this, _privateMethod, _privateMethod2).call(this);
}
@ -21,5 +25,5 @@ class Sub extends Base {
var _privateMethod = new WeakSet();
var _privateMethod2 = function _privateMethod2() {
return babelHelpers.get(babelHelpers.getPrototypeOf(this), "superMethod", this).call(this);
return babelHelpers.get(babelHelpers.getPrototypeOf(Sub.prototype), "superMethod", this).call(this);
};

10
packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/exec.js vendored
View File

@ -1,8 +1,14 @@
class Base {
static basePublicStaticMethod() { return 1017; }
static basePublicStaticMethod() {
return 'good';
}
}
class Sub extends Base {
static basePublicStaticMethod() {
return 'bad';
}
static #subStaticPrivateMethod() {
return super.basePublicStaticMethod();
}
@ -12,4 +18,4 @@ class Sub extends Base {
}
}
expect(Sub.check()).toEqual(1017);
expect(Sub.check()).toEqual('good');

8
packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/input.js vendored
View File

@ -1,8 +1,14 @@
class Base {
static basePublicStaticMethod() { return 1017; }
static basePublicStaticMethod() {
return 'good';
}
}
class Sub extends Base {
static basePublicStaticMethod() {
return 'bad';
}
static #subStaticPrivateMethod() {
return super.basePublicStaticMethod();
}

6
packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/output.js vendored
View File

@ -1,11 +1,15 @@
class Base {
static basePublicStaticMethod() {
return 1017;
return 'good';
}
}
class Sub extends Base {
static basePublicStaticMethod() {
return 'bad';
}
static check() {
babelHelpers.classPrivateFieldLooseBase(Sub, _subStaticPrivateMethod)[_subStaticPrivateMethod]();
}

10
packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/exec.js vendored
View File

@ -1,8 +1,14 @@
class Base {
static basePublicStaticMethod() { return 1017; }
static basePublicStaticMethod() {
return 'good';
}
}
class Sub extends Base {
static basePublicStaticMethod() {
return 'bad';
}
static #subStaticPrivateMethod() {
return super.basePublicStaticMethod();
}
@ -12,4 +18,4 @@ class Sub extends Base {
}
}
expect(Sub.check()).toEqual(1017);
expect(Sub.check()).toEqual('good');

8
packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/input.js vendored
View File

@ -1,8 +1,14 @@
class Base {
static basePublicStaticMethod() { return 1017; }
static basePublicStaticMethod() {
return 'good';
}
}
class Sub extends Base {
static basePublicStaticMethod() {
return 'bad';
}
static #subStaticPrivateMethod() {
return super.basePublicStaticMethod();
}

6
packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/output.js vendored
View File

@ -1,11 +1,15 @@
class Base {
static basePublicStaticMethod() {
return 1017;
return 'good';
}
}
class Sub extends Base {
static basePublicStaticMethod() {
return 'bad';
}
static check() {
babelHelpers.classStaticPrivateMethodGet(Sub, Sub, _subStaticPrivateMethod).call(Sub);
}