Fix super method call in private instance method calling overridden m…

…ethod (#9801) * 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
babel · Mar 31, 2019 · 3c11a4a · 3c11a4a
1 parent ae9b25a
commit 3c11a4a
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 20 deletions.
diff --git a/packages/babel-helper-create-class-features-plugin/src/fields.js b/packages/babel-helper-create-class-features-plugin/src/fields.js
@@ -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();

diff --git a/...es/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/exec.js b/...es/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/exec.js
@@ -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');
diff --git a/...s/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/input.js b/...s/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/input.js
@@ -1,15 +1,19 @@
 class Base {
   superMethod() {
-    return 1017;
+    return 'good';
   }
 }
 
 class Sub extends Base {
+  superMethod() {
+    return 'bad';
+  }
+
   #privateMethod() {
     return super.superMethod();
   }
 
   publicMethod() {
     return this.#privateMethod();
   }
-}
+}
diff --git a/.../babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/output.js b/.../babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/output.js
@@ -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]();
   }

diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/exec.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/exec.js
@@ -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');
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/input.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/input.js
@@ -1,15 +1,19 @@
 class Base {
   superMethod() {
-    return 1017;
+    return 'good';
   }
 }
 
 class Sub extends Base {
+  superMethod() {
+    return 'bad';
+  }
+
   #privateMethod() {
     return super.superMethod();
   }
 
   publicMethod() {
     return this.#privateMethod();
   }
-}
+}
diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/super/output.js
@@ -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);
 };
diff --git a/...l-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/exec.js b/...l-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/exec.js
@@ -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');
diff --git a/...-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/input.js b/...-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/input.js
@@ -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();
   }

diff --git a/...plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/output.js b/...plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/output.js
@@ -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]();
   }

diff --git a/...s/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/exec.js b/...s/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/exec.js
@@ -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');
diff --git a/.../babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/input.js b/.../babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/input.js
@@ -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();
   }

diff --git a/...babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/output.js b/...babel-plugin-proposal-private-methods/test/fixtures/private-static-method/super/output.js
@@ -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);
   }