Allow extending untranspiled classes

babel · Mar 5, 2020 · 53ff542 · 53ff542
1 parent a12001a
commit 53ff542
Show file tree

Hide file tree

Showing 152 changed files with 1,013 additions and 265 deletions.
diff --git a/packages/babel-core/test/fixtures/transformation/misc/regression-1155/options.json b/packages/babel-core/test/fixtures/transformation/misc/regression-1155/options.json
@@ -1,7 +1,7 @@
 {
   "plugins": [
     "transform-classes",
-    "external-helpers",
+    ["external-helpers", { "helperVersion": "7.100.0" }],
     "transform-block-scoping"
   ]
 }
diff --git a/packages/babel-core/test/fixtures/transformation/misc/regression-1155/output.js b/packages/babel-core/test/fixtures/transformation/misc/regression-1155/output.js
@@ -3,6 +3,8 @@ var Foo = /*#__PURE__*/function (_Bar) {
 
   babelHelpers.inherits(Foo, _Bar);
 
+  var _super = babelHelpers.createSuper(Foo);
+
   function Foo(options) {
     babelHelpers.classCallCheck(this, Foo);
     var parentOptions = {};
@@ -11,7 +13,7 @@ var Foo = /*#__PURE__*/function (_Bar) {
       this;
     };
 
-    return babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this, parentOptions));
+    return _super.call(this, parentOptions);
   }
 
   return Foo;

diff --git a/packages/babel-helpers/src/helpers.js b/packages/babel-helpers/src/helpers.js
@@ -502,10 +502,8 @@ helpers.setPrototypeOf = helper("7.0.0-beta.0")`
   }
 `;
 
-helpers.construct = helper("7.0.0-beta.0")`
-  import setPrototypeOf from "setPrototypeOf";
-
-  function isNativeReflectConstruct() {
+helpers.isNativeReflectConstruct = helper("7.9.0")`
+  export default function _isNativeReflectConstruct() {
     if (typeof Reflect === "undefined" || !Reflect.construct) return false;
 
     // core-js@3
@@ -529,6 +527,11 @@ helpers.construct = helper("7.0.0-beta.0")`
       return false;
     }
   }
+`;
+
+helpers.construct = helper("7.0.0-beta.0")`
+  import setPrototypeOf from "setPrototypeOf";
+  import isNativeReflectConstruct from "isNativeReflectConstruct";
 
   export default function _construct(Parent, args, Class) {
     if (isNativeReflectConstruct()) {
@@ -732,6 +735,26 @@ helpers.possibleConstructorReturn = helper("7.0.0-beta.0")`
   }
 `;
 
+helpers.createSuper = helper("7.9.0")`
+  import getPrototypeOf from "getPrototypeOf";
+  import isNativeReflectConstruct from "isNativeReflectConstruct";
+  import possibleConstructorReturn from "possibleConstructorReturn";
+
+  export default function _createSuper(Derived) {
+    return function () {
+      var Super = getPrototypeOf(Derived), result;
+      if (isNativeReflectConstruct()) {
+        // NOTE: This doesn't work if this.__proto__.constructor has been modified.
+        var NewTarget = getPrototypeOf(this).constructor;
+        result = Reflect.construct(Super, arguments, NewTarget);
+      } else {
+        result = Super.apply(this, arguments);
+      }
+      return possibleConstructorReturn(this, result);
+    }
+  }
+ `;
+
 helpers.superPropBase = helper("7.0.0-beta.0")`
   import getPrototypeOf from "getPrototypeOf";
 

diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/options.json
@@ -1,6 +1,6 @@
 {
   "plugins": [
-    "external-helpers",
+    ["external-helpers", { "helperVersion": "7.100.0" }],
     "proposal-class-properties",
     "transform-classes"
   ]

diff --git a/...l-plugin-proposal-class-properties/test/fixtures/nested-class/super-call-in-key/output.js b/...l-plugin-proposal-class-properties/test/fixtures/nested-class/super-call-in-key/output.js
@@ -13,13 +13,15 @@ let Hello = function Hello() {
 let Outer = /*#__PURE__*/function (_Hello) {
   babelHelpers.inherits(Outer, _Hello);
 
+  var _super = babelHelpers.createSuper(Outer);
+
   function Outer() {
     let _this2;
 
     var _this;
 
     babelHelpers.classCallCheck(this, Outer);
-    _this2 = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Outer).call(this));
+    _this2 = _this = _super.call(this);
 
     let Inner = function Inner() {
       babelHelpers.classCallCheck(this, Inner);

diff --git a/...ugin-proposal-class-properties/test/fixtures/nested-class/super-property-in-key/output.js b/...ugin-proposal-class-properties/test/fixtures/nested-class/super-property-in-key/output.js
@@ -17,13 +17,15 @@ let Hello = /*#__PURE__*/function () {
 let Outer = /*#__PURE__*/function (_Hello) {
   babelHelpers.inherits(Outer, _Hello);
 
+  var _super = babelHelpers.createSuper(Outer);
+
   function Outer() {
     let _babelHelpers$get$cal;
 
     var _this;
 
     babelHelpers.classCallCheck(this, Outer);
-    _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Outer).call(this));
+    _this = _super.call(this);
     _babelHelpers$get$cal = babelHelpers.get(babelHelpers.getPrototypeOf(Outer.prototype), "toString", babelHelpers.assertThisInitialized(_this)).call(babelHelpers.assertThisInitialized(_this));
 
     let Inner = function Inner() {

diff --git a/...n-proposal-class-properties/test/fixtures/private-loose/derived-multiple-supers/output.js b/...n-proposal-class-properties/test/fixtures/private-loose/derived-multiple-supers/output.js
@@ -3,19 +3,21 @@ var Foo = /*#__PURE__*/function (_Bar) {
 
   babelHelpers.inherits(Foo, _Bar);
 
+  var _super = babelHelpers.createSuper(Foo);
+
   function Foo() {
     var _this;
 
     babelHelpers.classCallCheck(this, Foo);
 
     if (condition) {
-      _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
+      _this = _super.call(this);
       Object.defineProperty(babelHelpers.assertThisInitialized(_this), _bar, {
         writable: true,
         value: "foo"
       });
     } else {
-      _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
+      _this = _super.call(this);
       Object.defineProperty(babelHelpers.assertThisInitialized(_this), _bar, {
         writable: true,
         value: "foo"

diff --git a/...ages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived/output.js b/...ages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived/output.js
@@ -15,11 +15,13 @@ var Bar = /*#__PURE__*/function (_Foo) {
 
   babelHelpers.inherits(Bar, _Foo);
 
+  var _super = babelHelpers.createSuper(Bar);
+
   function Bar(...args) {
     var _this;
 
     babelHelpers.classCallCheck(this, Bar);
-    _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Bar).call(this, ...args));
+    _this = _super.call(this, ...args);
     Object.defineProperty(babelHelpers.assertThisInitialized(_this), _prop2, {
       writable: true,
       value: "bar"

diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/foobar/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/foobar/output.js
@@ -3,11 +3,13 @@ var Child = /*#__PURE__*/function (_Parent) {
 
   babelHelpers.inherits(Child, _Parent);
 
+  var _super = babelHelpers.createSuper(Child);
+
   function Child() {
     var _this;
 
     babelHelpers.classCallCheck(this, Child);
-    _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Child).call(this));
+    _this = _super.call(this);
     Object.defineProperty(babelHelpers.assertThisInitialized(_this), _scopedFunctionWithThis, {
       writable: true,
       value: function value() {

diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/options.json
@@ -1,11 +1,6 @@
 {
   "plugins": [
-    [
-      "external-helpers",
-      {
-        "helperVersion": "7.0.2"
-      }
-    ],
+    ["external-helpers", { "helperVersion": "7.100.0" }],
     ["proposal-class-properties", { "loose": true }],
     "transform-classes",
     "transform-block-scoping",

diff --git a/...plugin-proposal-class-properties/test/fixtures/private-loose/private-in-derived/output.js b/...plugin-proposal-class-properties/test/fixtures/private-loose/private-in-derived/output.js
@@ -10,9 +10,11 @@ var Outer = function Outer() {
   var Test = /*#__PURE__*/function (_babelHelpers$classPr) {
     babelHelpers.inherits(Test, _babelHelpers$classPr);
 
+    var _super = babelHelpers.createSuper(Test);
+
     function Test() {
       babelHelpers.classCallCheck(this, Test);
-      return babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Test).apply(this, arguments));
+      return _super.apply(this, arguments);
     }
 
     return Test;

diff --git a/...l-plugin-proposal-class-properties/test/fixtures/private-loose/super-expression/output.js b/...l-plugin-proposal-class-properties/test/fixtures/private-loose/super-expression/output.js
@@ -3,11 +3,13 @@ var Foo = /*#__PURE__*/function (_Bar) {
 
   babelHelpers.inherits(Foo, _Bar);
 
+  var _super = babelHelpers.createSuper(Foo);
+
   function Foo() {
     var _temp, _this;
 
     babelHelpers.classCallCheck(this, Foo);
-    foo((_temp = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this)), Object.defineProperty(babelHelpers.assertThisInitialized(_this), _bar, {
+    foo((_temp = _this = _super.call(this), Object.defineProperty(babelHelpers.assertThisInitialized(_this), _bar, {
       writable: true,
       value: "foo"
     }), _temp));

diff --git a/...el-plugin-proposal-class-properties/test/fixtures/private-loose/super-statement/output.js b/...el-plugin-proposal-class-properties/test/fixtures/private-loose/super-statement/output.js
@@ -3,11 +3,13 @@ var Foo = /*#__PURE__*/function (_Bar) {
 
   babelHelpers.inherits(Foo, _Bar);
 
+  var _super = babelHelpers.createSuper(Foo);
+
   function Foo() {
     var _this;
 
     babelHelpers.classCallCheck(this, Foo);
-    _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
+    _this = _super.call(this);
     Object.defineProperty(babelHelpers.assertThisInitialized(_this), _bar, {
       writable: true,
       value: "foo"

diff --git a/...-plugin-proposal-class-properties/test/fixtures/private/derived-multiple-supers/output.js b/...-plugin-proposal-class-properties/test/fixtures/private/derived-multiple-supers/output.js
@@ -3,20 +3,22 @@ var Foo = /*#__PURE__*/function (_Bar) {
 
   babelHelpers.inherits(Foo, _Bar);
 
+  var _super = babelHelpers.createSuper(Foo);
+
   function Foo() {
     var _this;
 
     babelHelpers.classCallCheck(this, Foo);
 
     if (condition) {
-      _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
+      _this = _super.call(this);
 
       _bar.set(babelHelpers.assertThisInitialized(_this), {
         writable: true,
         value: "foo"
       });
     } else {
-      _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
+      _this = _super.call(this);
 
       _bar.set(babelHelpers.assertThisInitialized(_this), {
         writable: true,

diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived/output.js
@@ -16,11 +16,13 @@ var Bar = /*#__PURE__*/function (_Foo) {
 
   babelHelpers.inherits(Bar, _Foo);
 
+  var _super = babelHelpers.createSuper(Bar);
+
   function Bar(...args) {
     var _this;
 
     babelHelpers.classCallCheck(this, Bar);
-    _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Bar).call(this, ...args));
+    _this = _super.call(this, ...args);
 
     _prop2.set(babelHelpers.assertThisInitialized(_this), {
       writable: true,

diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/foobar/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/foobar/output.js
@@ -3,11 +3,13 @@ var Child = /*#__PURE__*/function (_Parent) {
 
   babelHelpers.inherits(Child, _Parent);
 
+  var _super = babelHelpers.createSuper(Child);
+
   function Child() {
     var _this;
 
     babelHelpers.classCallCheck(this, Child);
-    _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Child).call(this));
+    _this = _super.call(this);
 
     _scopedFunctionWithThis.set(babelHelpers.assertThisInitialized(_this), {
       writable: true,

diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/options.json
@@ -1,11 +1,6 @@
 {
   "plugins": [
-    [
-      "external-helpers",
-      {
-        "helperVersion": "7.4.4"
-      }
-    ],
+    ["external-helpers", { "helperVersion": "7.100.0" }],
     "proposal-class-properties",
     "transform-classes",
     "transform-block-scoping",

diff --git a/...babel-plugin-proposal-class-properties/test/fixtures/private/private-in-derived/output.js b/...babel-plugin-proposal-class-properties/test/fixtures/private/private-in-derived/output.js
@@ -11,9 +11,11 @@ var Outer = function Outer() {
   var Test = /*#__PURE__*/function (_babelHelpers$classPr) {
     babelHelpers.inherits(Test, _babelHelpers$classPr);
 
+    var _super = babelHelpers.createSuper(Test);
+
     function Test() {
       babelHelpers.classCallCheck(this, Test);
-      return babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Test).apply(this, arguments));
+      return _super.apply(this, arguments);
     }
 
     return Test;

diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-call/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-call/output.js
@@ -19,11 +19,13 @@ var B = /*#__PURE__*/function (_A) {
 
   babelHelpers.inherits(B, _A);
 
+  var _super = babelHelpers.createSuper(B);
+
   function B(...args) {
     var _this;
 
     babelHelpers.classCallCheck(this, B);
-    _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(B).call(this, ...args));
+    _this = _super.call(this, ...args);
 
     _foo.set(babelHelpers.assertThisInitialized(_this), {
       writable: true,

diff --git a/...s/babel-plugin-proposal-class-properties/test/fixtures/private/super-expression/output.js b/...s/babel-plugin-proposal-class-properties/test/fixtures/private/super-expression/output.js
@@ -3,11 +3,13 @@ var Foo = /*#__PURE__*/function (_Bar) {
 
   babelHelpers.inherits(Foo, _Bar);
 
+  var _super = babelHelpers.createSuper(Foo);
+
   function Foo() {
     var _temp, _this;
 
     babelHelpers.classCallCheck(this, Foo);
-    foo((_temp = _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this)), _bar.set(babelHelpers.assertThisInitialized(_this), {
+    foo((_temp = _this = _super.call(this), _bar.set(babelHelpers.assertThisInitialized(_this), {
       writable: true,
       value: "foo"
     }), _temp));

diff --git a/...es/babel-plugin-proposal-class-properties/test/fixtures/private/super-statement/output.js b/...es/babel-plugin-proposal-class-properties/test/fixtures/private/super-statement/output.js
@@ -3,11 +3,13 @@ var Foo = /*#__PURE__*/function (_Bar) {
 
   babelHelpers.inherits(Foo, _Bar);
 
+  var _super = babelHelpers.createSuper(Foo);
+
   function Foo() {
     var _this;
 
     babelHelpers.classCallCheck(this, Foo);
-    _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this));
+    _this = _super.call(this);
 
     _bar.set(babelHelpers.assertThisInitialized(_this), {
       writable: true,

diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/derived/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/derived/output.js
@@ -3,11 +3,13 @@ var Foo = /*#__PURE__*/function (_Bar) {
 
   babelHelpers.inherits(Foo, _Bar);
 
+  var _super = babelHelpers.createSuper(Foo);
+
   function Foo(...args) {
     var _this;
 
     babelHelpers.classCallCheck(this, Foo);
-    _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Foo).call(this, ...args));
+    _this = _super.call(this, ...args);
     _this.bar = "foo";
     return _this;
   }

diff --git a/...ges/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/options.json b/...ges/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/options.json
@@ -1,6 +1,6 @@
 {
   "plugins": [
-    "external-helpers",
+    ["external-helpers", { "helperVersion": "7.100.0" }],
     ["proposal-class-properties", { "loose": true }]
   ],
   "presets": ["env"]

diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/output.js
@@ -3,11 +3,13 @@ var Child = /*#__PURE__*/function (_Parent) {
 
   babelHelpers.inherits(Child, _Parent);
 
+  var _super = babelHelpers.createSuper(Child);
+
   function Child() {
     var _this;
 
     babelHelpers.classCallCheck(this, Child);
-    _this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Child).call(this));
+    _this = _super.call(this);
 
     _this.scopedFunctionWithThis = function () {
       _this.name = {};