diff --git a/packages/babel-helper-create-class-features-plugin/src/index.js b/packages/babel-helper-create-class-features-plugin/src/index.js index 57add480d286..fba10a68e8c4 100644 --- a/packages/babel-helper-create-class-features-plugin/src/index.js +++ b/packages/babel-helper-create-class-features-plugin/src/index.js @@ -182,8 +182,8 @@ export function createClassFeaturePlugin({ } path = wrapClass(path); - path.insertBefore(keysNodes); - path.insertAfter([...privateNamesNodes, ...staticNodes]); + path.insertBefore([...privateNamesNodes, ...keysNodes]); + path.insertAfter(staticNodes); }, PrivateName(path) { diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/output.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/output.js index 2a500530b640..97681be69ac2 100644 --- a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/output.js +++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/output.js @@ -1,3 +1,5 @@ +var _privateMethod = new WeakSet(); + class X { constructor() { _privateMethod.add(this); @@ -5,8 +7,6 @@ class X { } -var _privateMethod = new WeakSet(); - var _privateMethod2 = function _privateMethod2() { return 42; }; diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/output.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/output.js index a660b0038d59..eee320382b66 100644 --- a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/output.js +++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/output.js @@ -2,6 +2,8 @@ var id = 0; function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } +var _privateMethod = _classPrivateFieldLooseKey("privateMethod"); + class X { constructor() { Object.defineProperty(this, _privateMethod, { @@ -11,8 +13,6 @@ class X { } -var _privateMethod = _classPrivateFieldLooseKey("privateMethod"); - var _privateMethod2 = function _privateMethod2() { return 42; }; diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/assignment/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/assignment/output.js index 3178119a7657..01d86ae43b48 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/assignment/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/assignment/output.js @@ -1,3 +1,5 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -20,5 +22,3 @@ var Foo = /*#__PURE__*/function () { }]); return Foo; }(); - -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/call/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/call/output.js index 383429548dfd..8dd76aa39841 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/call/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/call/output.js @@ -1,3 +1,5 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -21,5 +23,3 @@ var Foo = /*#__PURE__*/function () { }]); return Foo; }(); - -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/canonical/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/canonical/output.js index 7c153c4e95b0..b0aae3c1542e 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/canonical/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/canonical/output.js @@ -1,3 +1,7 @@ +var _x = babelHelpers.classPrivateFieldLooseKey("x"); + +var _y = babelHelpers.classPrivateFieldLooseKey("y"); + var Point = /*#__PURE__*/function () { "use strict"; @@ -44,7 +48,3 @@ var Point = /*#__PURE__*/function () { }]); return Point; }(); - -var _x = babelHelpers.classPrivateFieldLooseKey("x"); - -var _y = babelHelpers.classPrivateFieldLooseKey("y"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/constructor-collision/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/constructor-collision/output.js index e7583b38361c..be36bc5ade12 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/constructor-collision/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/constructor-collision/output.js @@ -1,5 +1,7 @@ var foo = "bar"; +var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); + var Foo = function Foo() { "use strict"; @@ -10,5 +12,3 @@ var Foo = function Foo() { }); var _foo = "foo"; }; - -var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/declaration-order/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/declaration-order/output.js index 8d162c369bf6..5ac4a570a226 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/declaration-order/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/declaration-order/output.js @@ -1,3 +1,5 @@ +var _x = babelHelpers.classPrivateFieldLooseKey("x"); + var C = function C() { "use strict"; @@ -9,8 +11,6 @@ var C = function C() { }); }; -var _x = babelHelpers.classPrivateFieldLooseKey("x"); - expect(() => { new C(); }).toThrow(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived-multiple-supers/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived-multiple-supers/output.js index bd303bc40a8f..1a333b7beb6c 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived-multiple-supers/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived-multiple-supers/output.js @@ -1,3 +1,5 @@ +var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); + var Foo = /*#__PURE__*/function (_Bar) { "use strict"; @@ -29,5 +31,3 @@ var Foo = /*#__PURE__*/function (_Bar) { return Foo; }(Bar); - -var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived/output.js index e7be19c316d8..2c17edf9f6b1 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/derived/output.js @@ -1,3 +1,5 @@ +var _prop = babelHelpers.classPrivateFieldLooseKey("prop"); + var Foo = function Foo() { "use strict"; @@ -8,7 +10,7 @@ var Foo = function Foo() { }); }; -var _prop = babelHelpers.classPrivateFieldLooseKey("prop"); +var _prop2 = babelHelpers.classPrivateFieldLooseKey("prop"); var Bar = /*#__PURE__*/function (_Foo) { "use strict"; @@ -31,5 +33,3 @@ var Bar = /*#__PURE__*/function (_Foo) { return Bar; }(Foo); - -var _prop2 = babelHelpers.classPrivateFieldLooseKey("prop"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-1/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-1/output.js index 125c49f49cd1..aca9a6ffbd8d 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-1/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-1/output.js @@ -1,3 +1,5 @@ +var _client = babelHelpers.classPrivateFieldLooseKey("client"); + var Foo = function Foo(props) { "use strict"; @@ -9,5 +11,3 @@ var Foo = function Foo(props) { babelHelpers.classPrivateFieldLooseBase(this, _client)[_client] = 1; [this.x = babelHelpers.classPrivateFieldLooseBase(this, _client)[_client], babelHelpers.classPrivateFieldLooseBase(this, _client)[_client], this.y = babelHelpers.classPrivateFieldLooseBase(this, _client)[_client]] = props; }; - -var _client = babelHelpers.classPrivateFieldLooseKey("client"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-2/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-2/output.js index 9b6c4ea89d62..0ad3e87f8443 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-2/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-2/output.js @@ -1,3 +1,5 @@ +var _client = babelHelpers.classPrivateFieldLooseKey("client"); + var Foo = function Foo(props) { "use strict"; @@ -8,5 +10,3 @@ var Foo = function Foo(props) { }); [x, ...babelHelpers.classPrivateFieldLooseBase(this, _client)[_client]] = props; }; - -var _client = babelHelpers.classPrivateFieldLooseKey("client"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-3/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-3/output.js index a784a6b0f3df..5125b8751c56 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-3/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern-3/output.js @@ -1,3 +1,5 @@ +var _client = babelHelpers.classPrivateFieldLooseKey("client"); + var Foo = function Foo(props) { "use strict"; @@ -8,5 +10,3 @@ var Foo = function Foo(props) { }); [babelHelpers.classPrivateFieldLooseBase(this, _client)[_client] = 5] = props; }; - -var _client = babelHelpers.classPrivateFieldLooseKey("client"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern/output.js index 6d27b1b7faf0..77a5dd147edc 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-array-pattern/output.js @@ -1,3 +1,5 @@ +var _client = babelHelpers.classPrivateFieldLooseKey("client"); + var Foo = function Foo(props) { "use strict"; @@ -8,5 +10,3 @@ var Foo = function Foo(props) { }); [babelHelpers.classPrivateFieldLooseBase(this, _client)[_client]] = props; }; - -var _client = babelHelpers.classPrivateFieldLooseKey("client"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-1/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-1/output.js index c4738101c521..548562c808de 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-1/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-1/output.js @@ -1,3 +1,5 @@ +var _client = babelHelpers.classPrivateFieldLooseKey("client"); + var Foo = function Foo(props) { "use strict"; @@ -13,5 +15,3 @@ var Foo = function Foo(props) { z: this.z = babelHelpers.classPrivateFieldLooseBase(this, _client)[_client] } = props); }; - -var _client = babelHelpers.classPrivateFieldLooseKey("client"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2/output.js index 9786b38d6210..50cc27066317 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2/output.js @@ -1,3 +1,5 @@ +var _client = babelHelpers.classPrivateFieldLooseKey("client"); + var Foo = function Foo(props) { "use strict"; @@ -11,5 +13,3 @@ var Foo = function Foo(props) { ...babelHelpers.classPrivateFieldLooseBase(this, _client)[_client] } = props); }; - -var _client = babelHelpers.classPrivateFieldLooseKey("client"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-3/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-3/output.js index e4ed8b749f51..8c5d47987b0b 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-3/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-3/output.js @@ -1,3 +1,5 @@ +var _client = babelHelpers.classPrivateFieldLooseKey("client"); + var Foo = function Foo(props) { "use strict"; @@ -10,5 +12,3 @@ var Foo = function Foo(props) { client: babelHelpers.classPrivateFieldLooseBase(this, _client)[_client] = 5 } = props); }; - -var _client = babelHelpers.classPrivateFieldLooseKey("client"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern/output.js index 989cacb99791..c9d88717a778 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern/output.js @@ -1,3 +1,5 @@ +var _client = babelHelpers.classPrivateFieldLooseKey("client"); + var Foo = function Foo(props) { "use strict"; @@ -10,5 +12,3 @@ var Foo = function Foo(props) { client: babelHelpers.classPrivateFieldLooseBase(this, _client)[_client] } = props); }; - -var _client = babelHelpers.classPrivateFieldLooseKey("client"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/extracted-this/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/extracted-this/output.js index 1dcdbcb1fb3d..3f4ec2bf2955 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/extracted-this/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/extracted-this/output.js @@ -1,5 +1,9 @@ var foo = "bar"; +var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); + +var _baz = babelHelpers.classPrivateFieldLooseKey("baz"); + var Foo = function Foo(_foo) { "use strict"; @@ -13,7 +17,3 @@ var Foo = function Foo(_foo) { value: foo }); }; - -var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); - -var _baz = babelHelpers.classPrivateFieldLooseKey("baz"); 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 index 663e43398a95..c49e0efc1c7d 100644 --- 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 @@ -1,3 +1,5 @@ +var _scopedFunctionWithThis = babelHelpers.classPrivateFieldLooseKey("scopedFunctionWithThis"); + var Child = /*#__PURE__*/function (_Parent) { "use strict"; @@ -21,5 +23,3 @@ var Child = /*#__PURE__*/function (_Parent) { return Child; }(Parent); - -var _scopedFunctionWithThis = babelHelpers.classPrivateFieldLooseKey("scopedFunctionWithThis"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/instance-undefined/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/instance-undefined/output.js index 2a6d4bf2339e..53d2b25da9c0 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/instance-undefined/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/instance-undefined/output.js @@ -1,3 +1,5 @@ +var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); + var Foo = function Foo() { "use strict"; @@ -7,5 +9,3 @@ var Foo = function Foo() { value: void 0 }); }; - -var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/instance/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/instance/output.js index c3c531e93fc9..2b489c2e4ff4 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/instance/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/instance/output.js @@ -1,3 +1,5 @@ +var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); + var Foo = function Foo() { "use strict"; @@ -7,5 +9,3 @@ var Foo = function Foo() { value: "foo" }); }; - -var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/multiple/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/multiple/output.js index e630441e0999..0cbc19abca82 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/multiple/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/multiple/output.js @@ -1,3 +1,7 @@ +var _x = babelHelpers.classPrivateFieldLooseKey("x"); + +var _y = babelHelpers.classPrivateFieldLooseKey("y"); + var Foo = function Foo() { "use strict"; @@ -11,7 +15,3 @@ var Foo = function Foo() { value: babelHelpers.classPrivateFieldLooseBase(this, _x)[_x] }); }; - -var _x = babelHelpers.classPrivateFieldLooseKey("x"); - -var _y = babelHelpers.classPrivateFieldLooseKey("y"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/native-classes/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/native-classes/output.js index fb965472f6d7..ab122fa219c1 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/native-classes/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/native-classes/output.js @@ -1,3 +1,7 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + +var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); + class Foo { constructor() { Object.defineProperty(this, _bar, { @@ -16,10 +20,6 @@ class Foo { } -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); - -var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); - Object.defineProperty(Foo, _foo, { writable: true, value: "foo" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-computed-redeclared/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-computed-redeclared/output.js index f664abf3296a..de5558a0310a 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-computed-redeclared/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-computed-redeclared/output.js @@ -1,3 +1,5 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -14,6 +16,8 @@ var Foo = /*#__PURE__*/function () { value: function test() { var _babelHelpers$classPr; + var _foo2 = babelHelpers.classPrivateFieldLooseKey("foo"); + _babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(this, _foo2)[_foo2]; var Nested = /*#__PURE__*/function () { @@ -32,12 +36,8 @@ var Foo = /*#__PURE__*/function () { return Nested; }(); - var _foo2 = babelHelpers.classPrivateFieldLooseKey("foo"); - babelHelpers.classPrivateFieldLooseBase(this, _foo)[_foo]; } }]); return Foo; }(); - -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-computed/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-computed/output.js index 57c5ed3249d1..547c20ddd42b 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-computed/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-computed/output.js @@ -1,3 +1,5 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -31,5 +33,3 @@ var Foo = /*#__PURE__*/function () { }]); return Foo; }(); - -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-extends-computed-redeclared/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-extends-computed-redeclared/output.js index e5a3d47e0354..3e918afbbcb1 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-extends-computed-redeclared/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-extends-computed-redeclared/output.js @@ -1,3 +1,5 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -12,10 +14,12 @@ var Foo = /*#__PURE__*/function () { babelHelpers.createClass(Foo, [{ key: "test", value: function test() { - var _temp, _foo3; + var _foo3, _temp; var _babelHelpers$classPr; + var _foo2 = babelHelpers.classPrivateFieldLooseKey("foo"); + var Nested = /*#__PURE__*/function (_ref) { babelHelpers.inherits(Nested, _ref); @@ -34,7 +38,7 @@ var Foo = /*#__PURE__*/function () { } return Nested; - }((_temp = (_babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(this, _foo3)[_foo3], /*#__PURE__*/function () { + }((_temp = (_foo3 = babelHelpers.classPrivateFieldLooseKey("foo"), _babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(this, _foo3)[_foo3], /*#__PURE__*/function () { function _class2() { babelHelpers.classCallCheck(this, _class2); Object.defineProperty(this, _foo3, { @@ -45,12 +49,8 @@ var Foo = /*#__PURE__*/function () { } return _class2; - }()), _foo3 = babelHelpers.classPrivateFieldLooseKey("foo"), _temp)); - - var _foo2 = babelHelpers.classPrivateFieldLooseKey("foo"); + }()), _temp)); } }]); return Foo; }(); - -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-extends-computed/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-extends-computed/output.js index 8dd6e4eda055..8966dc48e4e4 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-extends-computed/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-extends-computed/output.js @@ -1,3 +1,5 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -16,6 +18,8 @@ var Foo = /*#__PURE__*/function () { var _babelHelpers$classPr; + var _foo2 = babelHelpers.classPrivateFieldLooseKey("foo"); + var Nested = /*#__PURE__*/function (_ref) { babelHelpers.inherits(Nested, _ref); @@ -42,11 +46,7 @@ var Foo = /*#__PURE__*/function () { return _class2; }()), _temp)); - - var _foo2 = babelHelpers.classPrivateFieldLooseKey("foo"); } }]); return Foo; }(); - -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-other-redeclared/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-other-redeclared/output.js index f906d5562dd1..30185d756acd 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-other-redeclared/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-other-redeclared/output.js @@ -1,3 +1,7 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + +var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -16,6 +20,8 @@ var Foo = /*#__PURE__*/function () { babelHelpers.createClass(Foo, [{ key: "test", value: function test() { + var _bar2 = babelHelpers.classPrivateFieldLooseKey("bar"); + var Nested = /*#__PURE__*/function () { function Nested() { babelHelpers.classCallCheck(this, Nested); @@ -35,15 +41,9 @@ var Foo = /*#__PURE__*/function () { return Nested; }(); - var _bar2 = babelHelpers.classPrivateFieldLooseKey("bar"); - babelHelpers.classPrivateFieldLooseBase(this, _foo)[_foo]; babelHelpers.classPrivateFieldLooseBase(this, _bar)[_bar]; } }]); return Foo; }(); - -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); - -var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-redeclared/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-redeclared/output.js index 055ff8b46505..e1b562b69e50 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-redeclared/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class-redeclared/output.js @@ -1,3 +1,5 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -12,6 +14,8 @@ var Foo = /*#__PURE__*/function () { babelHelpers.createClass(Foo, [{ key: "test", value: function test() { + var _foo2 = babelHelpers.classPrivateFieldLooseKey("foo"); + var Nested = /*#__PURE__*/function () { function Nested() { babelHelpers.classCallCheck(this, Nested); @@ -30,12 +34,8 @@ var Foo = /*#__PURE__*/function () { return Nested; }(); - var _foo2 = babelHelpers.classPrivateFieldLooseKey("foo"); - babelHelpers.classPrivateFieldLooseBase(this, _foo)[_foo]; } }]); return Foo; }(); - -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class/output.js index b12260adcf98..b0c3fc7b6ec1 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/nested-class/output.js @@ -1,3 +1,5 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -31,5 +33,3 @@ var Foo = /*#__PURE__*/function () { }]); return Foo; }(); - -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/non-block-arrow-func/output.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/non-block-arrow-func/output.mjs index ba8c7b5fab6d..94a870cdea32 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/non-block-arrow-func/output.mjs +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/non-block-arrow-func/output.mjs @@ -1,12 +1,12 @@ export default (param => { - var _class, _temp, _props; + var _class, _props, _temp; - return _temp = _class = class App { + return _temp = (_props = babelHelpers.classPrivateFieldLooseKey("props"), _class = class App { getParam() { return param; } - }, _props = babelHelpers.classPrivateFieldLooseKey("props"), Object.defineProperty(_class, _props, { + }), Object.defineProperty(_class, _props, { writable: true, value: { prop1: 'prop1', diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/private-in-derived/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/private-in-derived/output.js index b2e775e1b463..e639dae81d7e 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/private-in-derived/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/private-in-derived/output.js @@ -1,3 +1,5 @@ +var _outer = babelHelpers.classPrivateFieldLooseKey("outer"); + var Outer = function Outer() { "use strict"; @@ -20,5 +22,3 @@ var Outer = function Outer() { return Test; }(babelHelpers.classPrivateFieldLooseBase(this, _outer)[_outer]); }; - -var _outer = babelHelpers.classPrivateFieldLooseKey("outer"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/reevaluated/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/reevaluated/output.js index 2324c4ee3e2d..e94af3d1026c 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/reevaluated/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/reevaluated/output.js @@ -1,7 +1,7 @@ function classFactory() { - var _class, _temp, _foo, _bar; + var _class, _foo, _bar, _temp; - return _temp = _class = class Foo { + return _temp = (_foo = babelHelpers.classPrivateFieldLooseKey("foo"), _bar = babelHelpers.classPrivateFieldLooseKey("bar"), _class = class Foo { constructor() { Object.defineProperty(this, _foo, { writable: true, @@ -25,7 +25,7 @@ function classFactory() { return babelHelpers.classPrivateFieldLooseBase(Foo, _bar)[_bar]; } - }, _foo = babelHelpers.classPrivateFieldLooseKey("foo"), _bar = babelHelpers.classPrivateFieldLooseKey("bar"), Object.defineProperty(_class, _bar, { + }), Object.defineProperty(_class, _bar, { writable: true, value: "bar" }), _temp; diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/reference-in-other-property/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/reference-in-other-property/output.js index 0199c1f064d2..5f3ccaed8b8a 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/reference-in-other-property/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/reference-in-other-property/output.js @@ -1,3 +1,9 @@ +var _two = babelHelpers.classPrivateFieldLooseKey("two"); + +var _private = babelHelpers.classPrivateFieldLooseKey("private"); + +var _four = babelHelpers.classPrivateFieldLooseKey("four"); + var Foo = function Foo() { "use strict"; @@ -17,9 +23,3 @@ var Foo = function Foo() { value: babelHelpers.classPrivateFieldLooseBase(this, _private)[_private] }); }; - -var _two = babelHelpers.classPrivateFieldLooseKey("two"); - -var _private = babelHelpers.classPrivateFieldLooseKey("private"); - -var _four = babelHelpers.classPrivateFieldLooseKey("four"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-call/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-call/output.js index a112202fe5dc..463a51028b8d 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-call/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-call/output.js @@ -1,3 +1,5 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -14,8 +16,6 @@ var Foo = /*#__PURE__*/function () { return Foo; }(); -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); - Object.defineProperty(Foo, _foo, { writable: true, value: function (x) { diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-export/output.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-export/output.mjs index 53baaa40d136..e821a222352d 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-export/output.mjs +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-export/output.mjs @@ -1,15 +1,14 @@ -export class MyClass {} - var _property = babelHelpers.classPrivateFieldLooseKey("property"); +export class MyClass {} Object.defineProperty(MyClass, _property, { writable: true, value: value }); -export default class MyClass2 {} var _property2 = babelHelpers.classPrivateFieldLooseKey("property"); +export default class MyClass2 {} Object.defineProperty(MyClass2, _property2, { writable: true, value: value diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-infer-name/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-infer-name/output.js index 1728effa5292..675806cbd180 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-infer-name/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-infer-name/output.js @@ -1,6 +1,6 @@ -var _class, _temp, _num; +var _class, _num, _temp; -var Foo = (_temp = _class = class Foo {}, _num = babelHelpers.classPrivateFieldLooseKey("num"), Object.defineProperty(_class, _num, { +var Foo = (_temp = (_num = babelHelpers.classPrivateFieldLooseKey("num"), _class = class Foo {}), Object.defineProperty(_class, _num, { writable: true, value: 0 }), _temp); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-inherited/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-inherited/output.js index 0dbe51081fdf..4d5a4ffd89dd 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-inherited/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-inherited/output.js @@ -1,3 +1,5 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + class Base { static getThis() { return babelHelpers.classPrivateFieldLooseBase(this, _foo)[_foo]; @@ -17,13 +19,13 @@ class Base { } -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); - Object.defineProperty(Base, _foo, { writable: true, value: 1 }); +var _foo2 = babelHelpers.classPrivateFieldLooseKey("foo"); + class Sub1 extends Base { static update(val) { return babelHelpers.classPrivateFieldLooseBase(this, _foo2)[_foo2] = val; @@ -31,8 +33,6 @@ class Sub1 extends Base { } -var _foo2 = babelHelpers.classPrivateFieldLooseKey("foo"); - Object.defineProperty(Sub1, _foo2, { writable: true, value: 2 diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-this/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-this/output.js index d0c5da7be84f..85b9da1e5567 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-this/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-this/output.js @@ -1,13 +1,13 @@ +var _self = babelHelpers.classPrivateFieldLooseKey("self"); + +var _getA = babelHelpers.classPrivateFieldLooseKey("getA"); + var A = function A() { "use strict"; babelHelpers.classCallCheck(this, A); }; -var _self = babelHelpers.classPrivateFieldLooseKey("self"); - -var _getA = babelHelpers.classPrivateFieldLooseKey("getA"); - Object.defineProperty(A, _self, { writable: true, value: A diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-undefined/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-undefined/output.js index 7f147ae78e11..19efa1d1eac1 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-undefined/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-undefined/output.js @@ -1,3 +1,5 @@ +var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); + class Foo { static test() { return babelHelpers.classPrivateFieldLooseBase(Foo, _bar)[_bar]; @@ -9,8 +11,6 @@ class Foo { } -var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); - Object.defineProperty(Foo, _bar, { writable: true, value: void 0 diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static/output.js index 18bcaf0c42bb..c60a6e95fa9b 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static/output.js @@ -1,3 +1,5 @@ +var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); + class Foo { static test() { return babelHelpers.classPrivateFieldLooseBase(Foo, _bar)[_bar]; @@ -9,8 +11,6 @@ class Foo { } -var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); - Object.defineProperty(Foo, _bar, { writable: true, value: "foo" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-expression/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-expression/output.js index 168fdba89b9d..285bd459ce51 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-expression/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-expression/output.js @@ -1,3 +1,5 @@ +var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); + var Foo = /*#__PURE__*/function (_Bar) { "use strict"; @@ -18,5 +20,3 @@ var Foo = /*#__PURE__*/function (_Bar) { return Foo; }(Bar); - -var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-statement/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-statement/output.js index 72eee4648134..5a2c2cf37e71 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-statement/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/super-statement/output.js @@ -1,3 +1,5 @@ +var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); + var Foo = /*#__PURE__*/function (_Bar) { "use strict"; @@ -19,5 +21,3 @@ var Foo = /*#__PURE__*/function (_Bar) { return Foo; }(Bar); - -var _bar = babelHelpers.classPrivateFieldLooseKey("bar"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/update/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/update/output.js index 9ee5301378ce..090f88475c2c 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/update/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/update/output.js @@ -1,3 +1,5 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -20,5 +22,3 @@ var Foo = /*#__PURE__*/function () { }]); return Foo; }(); - -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/assignment/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/assignment/output.js index 740304f35183..d26bb1888d5d 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/assignment/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/assignment/output.js @@ -1,3 +1,5 @@ +var _foo = new WeakMap(); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -23,5 +25,3 @@ var Foo = /*#__PURE__*/function () { }]); return Foo; }(); - -var _foo = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/call/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/call/output.js index d5cea713433c..684c86173453 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/call/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/call/output.js @@ -1,3 +1,5 @@ +var _foo = new WeakMap(); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -23,5 +25,3 @@ var Foo = /*#__PURE__*/function () { }]); return Foo; }(); - -var _foo = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/canonical/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/canonical/output.js index ff127b0d68fb..9e56aa262242 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/canonical/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/canonical/output.js @@ -1,3 +1,7 @@ +var _x = new WeakMap(); + +var _y = new WeakMap(); + var Point = /*#__PURE__*/function () { "use strict"; @@ -47,7 +51,3 @@ var Point = /*#__PURE__*/function () { }]); return Point; }(); - -var _x = new WeakMap(); - -var _y = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/constructor-collision/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/constructor-collision/output.js index c77f5b8f7499..feb87b54c3c4 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/constructor-collision/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/constructor-collision/output.js @@ -1,5 +1,7 @@ var foo = "bar"; +var _bar = new WeakMap(); + var Foo = function Foo() { "use strict"; @@ -12,5 +14,3 @@ var Foo = function Foo() { var _foo = "foo"; }; - -var _bar = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/declaration-order/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/declaration-order/output.js index 06b09aad3289..88dbfb0a0cb9 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/declaration-order/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/declaration-order/output.js @@ -1,3 +1,5 @@ +var _x = new WeakMap(); + var C = function C() { "use strict"; @@ -10,8 +12,6 @@ var C = function C() { }); }; -var _x = new WeakMap(); - expect(() => { new C(); }).toThrow(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived-multiple-supers/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived-multiple-supers/output.js index a8c4abcad7dd..d4736d2ad1cc 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived-multiple-supers/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/derived-multiple-supers/output.js @@ -1,3 +1,5 @@ +var _bar = new WeakMap(); + var Foo = /*#__PURE__*/function (_Bar) { "use strict"; @@ -31,5 +33,3 @@ var Foo = /*#__PURE__*/function (_Bar) { return Foo; }(Bar); - -var _bar = new WeakMap(); 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 index 4aaeba669a96..3780e9c2c773 100644 --- 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 @@ -1,3 +1,5 @@ +var _prop = new WeakMap(); + var Foo = function Foo() { "use strict"; @@ -9,7 +11,7 @@ var Foo = function Foo() { }); }; -var _prop = new WeakMap(); +var _prop2 = new WeakMap(); var Bar = /*#__PURE__*/function (_Foo) { "use strict"; @@ -34,5 +36,3 @@ var Bar = /*#__PURE__*/function (_Foo) { return Bar; }(Foo); - -var _prop2 = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-1/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-1/output.js index 50ee938ef1bb..ffaa6687f340 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-1/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-1/output.js @@ -1,3 +1,5 @@ +var _client = new WeakMap(); + var Foo = function Foo(props) { "use strict"; @@ -11,5 +13,3 @@ var Foo = function Foo(props) { babelHelpers.classPrivateFieldSet(this, _client, 1); [this.x = babelHelpers.classPrivateFieldGet(this, _client), babelHelpers.classPrivateFieldDestructureSet(this, _client).value, this.y = babelHelpers.classPrivateFieldGet(this, _client)] = props; }; - -var _client = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-2/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-2/output.js index 6e66641ab3a7..a8a57cb5271b 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-2/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-2/output.js @@ -1,3 +1,5 @@ +var _client = new WeakMap(); + var Foo = function Foo(props) { "use strict"; @@ -10,5 +12,3 @@ var Foo = function Foo(props) { [x, ...babelHelpers.classPrivateFieldDestructureSet(this, _client).value] = props; }; - -var _client = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-3/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-3/output.js index e7426334167a..11db8bd87394 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-3/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern-3/output.js @@ -1,3 +1,5 @@ +var _client = new WeakMap(); + var Foo = function Foo(props) { "use strict"; @@ -10,5 +12,3 @@ var Foo = function Foo(props) { [babelHelpers.classPrivateFieldDestructureSet(this, _client).value = 5] = props; }; - -var _client = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern/output.js index 8cfd77e1e36f..80a791524ce9 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-array-pattern/output.js @@ -1,3 +1,5 @@ +var _client = new WeakMap(); + var Foo = function Foo(props) { "use strict"; @@ -10,5 +12,3 @@ var Foo = function Foo(props) { [babelHelpers.classPrivateFieldDestructureSet(this, _client).value] = props; }; - -var _client = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-1/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-1/output.js index a9623d18db3d..3a5f89bcb00c 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-1/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-1/output.js @@ -1,3 +1,5 @@ +var _client = new WeakMap(); + var Foo = function Foo(props) { "use strict"; @@ -15,5 +17,3 @@ var Foo = function Foo(props) { z: this.z = babelHelpers.classPrivateFieldGet(this, _client) } = props); }; - -var _client = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2/output.js index 22b58fd39617..a34b4cf5166c 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2/output.js @@ -1,3 +1,5 @@ +var _client = new WeakMap(); + var Foo = function Foo(props) { "use strict"; @@ -13,5 +15,3 @@ var Foo = function Foo(props) { ...babelHelpers.classPrivateFieldDestructureSet(this, _client).value } = props); }; - -var _client = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-3/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-3/output.js index 3509915f38a5..f8ed6077b1bf 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-3/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-3/output.js @@ -1,3 +1,5 @@ +var _client = new WeakMap(); + var Foo = function Foo(props) { "use strict"; @@ -12,5 +14,3 @@ var Foo = function Foo(props) { x: babelHelpers.classPrivateFieldDestructureSet(this, _client).value = 5 } = props); }; - -var _client = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern/output.js index e49b06dd952c..bced4d04adab 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern/output.js @@ -1,3 +1,5 @@ +var _client = new WeakMap(); + var Foo = function Foo(props) { "use strict"; @@ -12,5 +14,3 @@ var Foo = function Foo(props) { client: babelHelpers.classPrivateFieldDestructureSet(this, _client).value } = props); }; - -var _client = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/extracted-this/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/extracted-this/output.js index 6d741a859b22..406853af0d50 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/extracted-this/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/extracted-this/output.js @@ -1,5 +1,9 @@ var foo = "bar"; +var _bar = new WeakMap(); + +var _baz = new WeakMap(); + var Foo = function Foo(_foo) { "use strict"; @@ -15,7 +19,3 @@ var Foo = function Foo(_foo) { value: foo }); }; - -var _bar = new WeakMap(); - -var _baz = new WeakMap(); 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 index 39314dc51ca5..bda5c48f85f7 100644 --- 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 @@ -1,3 +1,5 @@ +var _scopedFunctionWithThis = new WeakMap(); + var Child = /*#__PURE__*/function (_Parent) { "use strict"; @@ -23,5 +25,3 @@ var Child = /*#__PURE__*/function (_Parent) { return Child; }(Parent); - -var _scopedFunctionWithThis = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/instance-undefined/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/instance-undefined/output.js index 935e466d2ab1..7a63144830d6 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/instance-undefined/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/instance-undefined/output.js @@ -1,3 +1,5 @@ +var _bar = new WeakMap(); + var Foo = function Foo() { "use strict"; @@ -8,5 +10,3 @@ var Foo = function Foo() { value: void 0 }); }; - -var _bar = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/instance/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/instance/output.js index 2b1562a16ee0..1ca01a02e618 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/instance/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/instance/output.js @@ -1,3 +1,5 @@ +var _bar = new WeakMap(); + var Foo = function Foo() { "use strict"; @@ -8,5 +10,3 @@ var Foo = function Foo() { value: "foo" }); }; - -var _bar = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/multiple/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/multiple/output.js index 4f2428c7172a..166ae183dbaf 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/multiple/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/multiple/output.js @@ -1,3 +1,7 @@ +var _x = new WeakMap(); + +var _y = new WeakMap(); + var Foo = function Foo() { "use strict"; @@ -13,7 +17,3 @@ var Foo = function Foo() { value: babelHelpers.classPrivateFieldGet(this, _x) }); }; - -var _x = new WeakMap(); - -var _y = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/native-classes/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/native-classes/output.js index fc70fa14fb8a..7f35537d1eac 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/native-classes/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/native-classes/output.js @@ -1,3 +1,5 @@ +var _bar = new WeakMap(); + class Foo { constructor() { _bar.set(this, { @@ -16,8 +18,6 @@ class Foo { } -var _bar = new WeakMap(); - var _foo = { writable: true, value: "foo" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-computed-redeclared/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-computed-redeclared/output.js index c7895115ed34..c1bc2d924dd9 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-computed-redeclared/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-computed-redeclared/output.js @@ -1,3 +1,5 @@ +var _foo = new WeakMap(); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -15,6 +17,8 @@ var Foo = /*#__PURE__*/function () { value: function test() { var _babelHelpers$classPr; + var _foo2 = new WeakMap(); + _babelHelpers$classPr = babelHelpers.classPrivateFieldGet(this, _foo2); var Nested = /*#__PURE__*/function () { @@ -34,12 +38,8 @@ var Foo = /*#__PURE__*/function () { return Nested; }(); - var _foo2 = new WeakMap(); - babelHelpers.classPrivateFieldGet(this, _foo); } }]); return Foo; }(); - -var _foo = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-computed/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-computed/output.js index 4d06d8350652..74e8c4a1fafd 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-computed/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-computed/output.js @@ -1,3 +1,5 @@ +var _foo = new WeakMap(); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -32,5 +34,3 @@ var Foo = /*#__PURE__*/function () { }]); return Foo; }(); - -var _foo = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-extends-computed-redeclared/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-extends-computed-redeclared/output.js index 4048382eea90..a825258c2081 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-extends-computed-redeclared/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-extends-computed-redeclared/output.js @@ -1,3 +1,5 @@ +var _foo = new WeakMap(); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -13,10 +15,12 @@ var Foo = /*#__PURE__*/function () { babelHelpers.createClass(Foo, [{ key: "test", value: function test() { - var _temp, _foo3; + var _foo3, _temp; var _babelHelpers$classPr; + var _foo2 = new WeakMap(); + var Nested = /*#__PURE__*/function (_ref) { babelHelpers.inherits(Nested, _ref); @@ -37,7 +41,7 @@ var Foo = /*#__PURE__*/function () { } return Nested; - }((_temp = (_babelHelpers$classPr = babelHelpers.classPrivateFieldGet(this, _foo3), /*#__PURE__*/function () { + }((_temp = (_foo3 = new WeakMap(), _babelHelpers$classPr = babelHelpers.classPrivateFieldGet(this, _foo3), /*#__PURE__*/function () { function _class2() { babelHelpers.classCallCheck(this, _class2); @@ -50,12 +54,8 @@ var Foo = /*#__PURE__*/function () { } return _class2; - }()), _foo3 = new WeakMap(), _temp)); - - var _foo2 = new WeakMap(); + }()), _temp)); } }]); return Foo; }(); - -var _foo = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-extends-computed/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-extends-computed/output.js index 6f17afe6bbd3..f66b7b3e5a96 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-extends-computed/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-extends-computed/output.js @@ -1,3 +1,5 @@ +var _foo = new WeakMap(); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -17,6 +19,8 @@ var Foo = /*#__PURE__*/function () { var _babelHelpers$classPr; + var _foo2 = new WeakMap(); + var Nested = /*#__PURE__*/function (_ref) { babelHelpers.inherits(Nested, _ref); @@ -45,11 +49,7 @@ var Foo = /*#__PURE__*/function () { return _class2; }()), _temp)); - - var _foo2 = new WeakMap(); } }]); return Foo; }(); - -var _foo = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-other-redeclared/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-other-redeclared/output.js index 6d65fc229664..75298ceab616 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-other-redeclared/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-other-redeclared/output.js @@ -1,3 +1,7 @@ +var _foo = new WeakMap(); + +var _bar = new WeakMap(); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -18,6 +22,8 @@ var Foo = /*#__PURE__*/function () { babelHelpers.createClass(Foo, [{ key: "test", value: function test() { + var _bar2 = new WeakMap(); + var Nested = /*#__PURE__*/function () { function Nested() { babelHelpers.classCallCheck(this, Nested); @@ -38,15 +44,9 @@ var Foo = /*#__PURE__*/function () { return Nested; }(); - var _bar2 = new WeakMap(); - babelHelpers.classPrivateFieldGet(this, _foo); babelHelpers.classPrivateFieldGet(this, _bar); } }]); return Foo; }(); - -var _foo = new WeakMap(); - -var _bar = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-redeclared/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-redeclared/output.js index 3f61e520351e..9c42a9cb9ad7 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-redeclared/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class-redeclared/output.js @@ -1,3 +1,5 @@ +var _foo = new WeakMap(); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -13,6 +15,8 @@ var Foo = /*#__PURE__*/function () { babelHelpers.createClass(Foo, [{ key: "test", value: function test() { + var _foo2 = new WeakMap(); + var Nested = /*#__PURE__*/function () { function Nested() { babelHelpers.classCallCheck(this, Nested); @@ -32,12 +36,8 @@ var Foo = /*#__PURE__*/function () { return Nested; }(); - var _foo2 = new WeakMap(); - babelHelpers.classPrivateFieldGet(this, _foo); } }]); return Foo; }(); - -var _foo = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class/output.js index e4d225a4985e..f54285d07ff5 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/nested-class/output.js @@ -1,3 +1,5 @@ +var _foo = new WeakMap(); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -32,5 +34,3 @@ var Foo = /*#__PURE__*/function () { }]); return Foo; }(); - -var _foo = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/private-in-derived/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/private-in-derived/output.js index fe872c14e0b9..f53f26e4e72d 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/private-in-derived/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/private-in-derived/output.js @@ -1,3 +1,5 @@ +var _outer = new WeakMap(); + var Outer = function Outer() { "use strict"; @@ -21,5 +23,3 @@ var Outer = function Outer() { return Test; }(babelHelpers.classPrivateFieldGet(this, _outer)); }; - -var _outer = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/reevaluated/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/reevaluated/output.js index e708fd223663..d5e34a53b7dd 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/reevaluated/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/reevaluated/output.js @@ -1,7 +1,7 @@ function classFactory() { - var _class, _temp, _foo, _bar; + var _class, _foo, _temp, _bar; - return _temp = _class = class Foo { + return _temp = (_foo = new WeakMap(), _class = class Foo { constructor() { _foo.set(this, { writable: true, @@ -25,7 +25,7 @@ function classFactory() { return babelHelpers.classStaticPrivateFieldSpecGet(Foo, _class, _bar); } - }, _foo = new WeakMap(), _bar = { + }), _bar = { writable: true, value: "bar" }, _temp; diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/reference-in-other-property/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/reference-in-other-property/output.js index 74a5672ddd65..8c08e583429b 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/reference-in-other-property/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/reference-in-other-property/output.js @@ -1,3 +1,9 @@ +var _two = new WeakMap(); + +var _private = new WeakMap(); + +var _four = new WeakMap(); + var Foo = function Foo() { "use strict"; @@ -21,9 +27,3 @@ var Foo = function Foo() { value: babelHelpers.classPrivateFieldGet(this, _private) }); }; - -var _two = new WeakMap(); - -var _private = new WeakMap(); - -var _four = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T7364/output.mjs b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T7364/output.mjs index 183240a1c2a0..1d150f3f702d 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T7364/output.mjs +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T7364/output.mjs @@ -1,3 +1,5 @@ +var _myAsyncMethod = new WeakMap(); + class MyClass { constructor() { var _this = this; @@ -18,7 +20,7 @@ class MyClass { } -var _myAsyncMethod = new WeakMap(); +var _myAsyncMethod2 = new WeakMap(); (class MyClass2 { constructor() { @@ -40,7 +42,7 @@ var _myAsyncMethod = new WeakMap(); }); -var _myAsyncMethod2 = new WeakMap(); +var _myAsyncMethod3 = new WeakMap(); export default class MyClass3 { constructor() { @@ -61,5 +63,3 @@ export default class MyClass3 { } } - -var _myAsyncMethod3 = new WeakMap(); 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 index 384e8ba85b5b..bd230ab4b6c9 100644 --- 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 @@ -14,6 +14,8 @@ var A = /*#__PURE__*/function () { return A; }(); +var _foo = new WeakMap(); + var B = /*#__PURE__*/function (_A) { "use strict"; @@ -37,5 +39,3 @@ var B = /*#__PURE__*/function (_A) { return B; }(A); - -var _foo = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-expression/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-expression/output.js index 30481ac4cb3e..d33ffd9deb71 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-expression/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-expression/output.js @@ -1,3 +1,5 @@ +var _bar = new WeakMap(); + var Foo = /*#__PURE__*/function (_Bar) { "use strict"; @@ -18,5 +20,3 @@ var Foo = /*#__PURE__*/function (_Bar) { return Foo; }(Bar); - -var _bar = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-statement/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-statement/output.js index d795323464bf..9fe307cf4c0c 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-statement/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/super-statement/output.js @@ -1,3 +1,5 @@ +var _bar = new WeakMap(); + var Foo = /*#__PURE__*/function (_Bar) { "use strict"; @@ -21,5 +23,3 @@ var Foo = /*#__PURE__*/function (_Bar) { return Foo; }(Bar); - -var _bar = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/update/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/update/output.js index 91b66147c929..e00b6447f870 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/update/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/update/output.js @@ -1,3 +1,5 @@ +var _foo = new WeakMap(); + var Foo = /*#__PURE__*/function () { "use strict"; @@ -23,5 +25,3 @@ var Foo = /*#__PURE__*/function () { }]); return Foo; }(); - -var _foo = new WeakMap(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/output.js index deac2db7fd23..33bb89ed9e87 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/output.js @@ -1,11 +1,11 @@ const classes = []; for (let i = 0; i <= 10; ++i) { - var _class, _temp, _bar; + var _class, _bar, _temp; let _i; - classes.push((_temp = (_i = i, _class = class A { + classes.push((_temp = (_bar = new WeakMap(), _i = i, _class = class A { constructor() { babelHelpers.defineProperty(this, _i, `computed field ${i}`); @@ -19,5 +19,5 @@ for (let i = 0; i <= 10; ++i) { return babelHelpers.classPrivateFieldGet(this, _bar); } - }), _bar = new WeakMap(), babelHelpers.defineProperty(_class, "foo", `static field ${i}`), _temp)); + }), babelHelpers.defineProperty(_class, "foo", `static field ${i}`), _temp)); } diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/basic/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/basic/output.js index d3fad762b400..e450d62cb5e8 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/basic/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/basic/output.js @@ -1,3 +1,7 @@ +var _privateField = babelHelpers.classPrivateFieldLooseKey("privateField"); + +var _privateFieldValue = babelHelpers.classPrivateFieldLooseKey("privateFieldValue"); + class Cl { constructor() { Object.defineProperty(this, _privateFieldValue, { @@ -21,10 +25,6 @@ class Cl { } -var _privateField = babelHelpers.classPrivateFieldLooseKey("privateField"); - -var _privateFieldValue = babelHelpers.classPrivateFieldLooseKey("privateFieldValue"); - var _get_privateFieldValue = function () { return babelHelpers.classPrivateFieldLooseBase(this, _privateField)[_privateField]; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/get-only-setter/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/get-only-setter/output.js index 9d7d52b847b8..b68476be9665 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/get-only-setter/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/get-only-setter/output.js @@ -1,3 +1,7 @@ +var _privateField = babelHelpers.classPrivateFieldLooseKey("privateField"); + +var _privateFieldValue = babelHelpers.classPrivateFieldLooseKey("privateFieldValue"); + class Cl { constructor() { Object.defineProperty(this, _privateFieldValue, { @@ -13,10 +17,6 @@ class Cl { } -var _privateField = babelHelpers.classPrivateFieldLooseKey("privateField"); - -var _privateFieldValue = babelHelpers.classPrivateFieldLooseKey("privateFieldValue"); - var _set_privateFieldValue = function (newValue) { babelHelpers.classPrivateFieldLooseBase(this, _privateField)[_privateField] = newValue; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/set-only-getter/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/set-only-getter/output.js index eb046676cf54..3ae50780168c 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/set-only-getter/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/set-only-getter/output.js @@ -1,3 +1,7 @@ +var _privateField = babelHelpers.classPrivateFieldLooseKey("privateField"); + +var _privateFieldValue = babelHelpers.classPrivateFieldLooseKey("privateFieldValue"); + class Cl { constructor() { Object.defineProperty(this, _privateFieldValue, { @@ -13,10 +17,6 @@ class Cl { } -var _privateField = babelHelpers.classPrivateFieldLooseKey("privateField"); - -var _privateFieldValue = babelHelpers.classPrivateFieldLooseKey("privateFieldValue"); - var _get_privateFieldValue = function () { return babelHelpers.classPrivateFieldLooseBase(this, _privateField)[_privateField]; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/updates/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/updates/output.js index 5dadfcf26954..b9fb372f9ba5 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/updates/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/updates/output.js @@ -1,3 +1,7 @@ +var _privateField = babelHelpers.classPrivateFieldLooseKey("privateField"); + +var _privateFieldValue = babelHelpers.classPrivateFieldLooseKey("privateFieldValue"); + class Cl { constructor() { Object.defineProperty(this, _privateFieldValue, { @@ -42,10 +46,6 @@ class Cl { } -var _privateField = babelHelpers.classPrivateFieldLooseKey("privateField"); - -var _privateFieldValue = babelHelpers.classPrivateFieldLooseKey("privateFieldValue"); - var _get_privateFieldValue = function () { return babelHelpers.classPrivateFieldLooseBase(this, _privateField)[_privateField]; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/basic/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/basic/output.js index 650c5727ed77..8671d4a51d7c 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/basic/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/basic/output.js @@ -1,3 +1,7 @@ +var _privateField = new WeakMap(); + +var _privateFieldValue = new WeakMap(); + class Cl { constructor() { _privateFieldValue.set(this, { @@ -23,10 +27,6 @@ class Cl { } -var _privateField = new WeakMap(); - -var _privateFieldValue = new WeakMap(); - var _get_privateFieldValue = function () { return babelHelpers.classPrivateFieldGet(this, _privateField); }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/get-only-setter/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/get-only-setter/output.js index 15691ee34a50..96984c5b888f 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/get-only-setter/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/get-only-setter/output.js @@ -1,3 +1,7 @@ +var _privateField = new WeakMap(); + +var _privateFieldValue = new WeakMap(); + class Cl { constructor() { _privateFieldValue.set(this, { @@ -15,10 +19,6 @@ class Cl { } -var _privateField = new WeakMap(); - -var _privateFieldValue = new WeakMap(); - var _set_privateFieldValue = function (newValue) { babelHelpers.classPrivateFieldSet(this, _privateField, newValue); }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/set-only-getter/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/set-only-getter/output.js index e301c07805de..f6bb09d910fb 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/set-only-getter/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/set-only-getter/output.js @@ -1,3 +1,7 @@ +var _privateField = new WeakMap(); + +var _privateFieldValue = new WeakMap(); + class Cl { constructor() { _privateFieldValue.set(this, { @@ -15,10 +19,6 @@ class Cl { } -var _privateField = new WeakMap(); - -var _privateFieldValue = new WeakMap(); - var _get_privateFieldValue = function () { return babelHelpers.classPrivateFieldGet(this, _privateField); }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/updates/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/updates/output.js index 5d32aa28543a..11206cd9ee7f 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/updates/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/updates/output.js @@ -1,3 +1,7 @@ +var _privateField = new WeakMap(); + +var _privateFieldValue = new WeakMap(); + class Cl { constructor() { _privateFieldValue.set(this, { @@ -46,10 +50,6 @@ class Cl { } -var _privateField = new WeakMap(); - -var _privateFieldValue = new WeakMap(); - var _get_privateFieldValue = function () { return babelHelpers.classPrivateFieldGet(this, _privateField); }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-set/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-set/output.js index baa69fd20e52..bd17b6c85bda 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-set/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/get-set/output.js @@ -1,3 +1,7 @@ +var _privateField = new WeakMap(); + +var _getSet = new WeakMap(); + class Cl { constructor() { _getSet.set(this, { @@ -13,10 +17,6 @@ class Cl { } -var _privateField = new WeakMap(); - -var _getSet = new WeakMap(); - var _get_getSet = function () { return babelHelpers.classPrivateFieldGet(this, _privateField); }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-get/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-get/output.js index 305f1a49d769..5574379b9935 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-get/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/set-get/output.js @@ -1,3 +1,7 @@ +var _privateField = new WeakMap(); + +var _getSet = new WeakMap(); + class Cl { constructor() { _getSet.set(this, { @@ -13,10 +17,6 @@ class Cl { } -var _privateField = new WeakMap(); - -var _getSet = new WeakMap(); - var _set_getSet = function (newValue) { babelHelpers.classPrivateFieldSet(this, _privateField, newValue); }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/assignment/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/assignment/output.js index 2dfef83ea5f7..e85cf49ca0e1 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/assignment/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/assignment/output.js @@ -1,3 +1,5 @@ +var _privateMethod = babelHelpers.classPrivateFieldLooseKey("privateMethod"); + class Foo { constructor() { Object.defineProperty(this, _privateMethod, { @@ -8,8 +10,6 @@ class Foo { } -var _privateMethod = babelHelpers.classPrivateFieldLooseKey("privateMethod"); - var _privateMethod2 = function _privateMethod2() { return 42; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/output.js index eeda4b58890a..2b437a303f1a 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/output.js @@ -1,3 +1,5 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + class Cl { constructor() { Object.defineProperty(this, _foo, { @@ -11,8 +13,6 @@ class Cl { } -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); - var _foo2 = async function _foo2() { return 2; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/before-fields/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/before-fields/output.js index aed2cf961923..289e9d87b514 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/before-fields/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/before-fields/output.js @@ -1,3 +1,7 @@ +var _priv = babelHelpers.classPrivateFieldLooseKey("priv"); + +var _method = babelHelpers.classPrivateFieldLooseKey("method"); + class Cl { constructor() { Object.defineProperty(this, _method, { @@ -16,10 +20,6 @@ class Cl { } -var _priv = babelHelpers.classPrivateFieldLooseKey("priv"); - -var _method = babelHelpers.classPrivateFieldLooseKey("method"); - var _method2 = function _method2(x) { return x; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/context/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/context/output.js index 1945a52af19b..8cfe20d838d7 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/context/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/context/output.js @@ -1,3 +1,5 @@ +var _getStatus = babelHelpers.classPrivateFieldLooseKey("getStatus"); + class Foo { constructor(status) { Object.defineProperty(this, _getStatus, { @@ -33,8 +35,6 @@ class Foo { } -var _getStatus = babelHelpers.classPrivateFieldLooseKey("getStatus"); - var _getStatus2 = function _getStatus2() { return this.status; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/exfiltrated/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/exfiltrated/output.js index 831162dfa625..533735a6fc09 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/exfiltrated/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/exfiltrated/output.js @@ -1,5 +1,7 @@ var exfiltrated; +var _privateMethod = babelHelpers.classPrivateFieldLooseKey("privateMethod"); + class Foo { constructor() { Object.defineProperty(this, _privateMethod, { @@ -13,6 +15,4 @@ class Foo { } -var _privateMethod = babelHelpers.classPrivateFieldLooseKey("privateMethod"); - var _privateMethod2 = function _privateMethod2() {}; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/output.js index a65255f8cf0c..ead1fffcb593 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/output.js @@ -1,3 +1,5 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + class Cl { constructor() { Object.defineProperty(this, _foo, { @@ -11,8 +13,6 @@ class Cl { } -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); - var _foo2 = function* _foo2() { yield 2; return 3; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/output.js index f12c62348ca4..41de8ee02a4d 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/super/output.js @@ -5,6 +5,8 @@ class Base { } +var _privateMethod = babelHelpers.classPrivateFieldLooseKey("privateMethod"); + class Sub extends Base { constructor(...args) { super(...args); @@ -23,8 +25,6 @@ class Sub extends Base { } -var _privateMethod = babelHelpers.classPrivateFieldLooseKey("privateMethod"); - var _privateMethod2 = function _privateMethod2() { return Base.prototype.superMethod.call(this); }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/assignment/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/assignment/output.js index 2cc1c0b861d2..9d2267d3a120 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/assignment/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/assignment/output.js @@ -1,3 +1,5 @@ +var _privateMethod = new WeakSet(); + class Foo { constructor() { _privateMethod.add(this); @@ -7,8 +9,6 @@ class Foo { } -var _privateMethod = new WeakSet(); - var _privateMethod2 = function _privateMethod2() { return 42; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/output.js index 7f6889735cb5..fac63df8053f 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/output.js @@ -1,3 +1,5 @@ +var _foo = new WeakSet(); + class Cl { constructor() { _foo.add(this); @@ -9,8 +11,6 @@ class Cl { } -var _foo = new WeakSet(); - var _foo2 = async function _foo2() { return 2; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/before-fields/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/before-fields/output.js index 834c4512d080..d5b9f3f508ef 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/before-fields/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/before-fields/output.js @@ -1,3 +1,7 @@ +var _priv = new WeakMap(); + +var _method = new WeakSet(); + class Cl { constructor() { _method.add(this); @@ -16,10 +20,6 @@ class Cl { } -var _priv = new WeakMap(); - -var _method = new WeakSet(); - var _method2 = function _method2(x) { return x; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/context/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/context/output.js index 02b0f4f7269f..1bb1b7ce2598 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/context/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/context/output.js @@ -1,3 +1,5 @@ +var _getStatus = new WeakSet(); + class Foo { constructor(status) { _getStatus.add(this); @@ -31,8 +33,6 @@ class Foo { } -var _getStatus = new WeakSet(); - var _getStatus2 = function _getStatus2() { return this.status; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/exfiltrated/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/exfiltrated/output.js index ed6b8b538e8b..0bf21759eafd 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/exfiltrated/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/exfiltrated/output.js @@ -1,5 +1,7 @@ var exfiltrated; +var _privateMethod = new WeakSet(); + class Foo { constructor() { _privateMethod.add(this); @@ -11,6 +13,4 @@ class Foo { } -var _privateMethod = new WeakSet(); - var _privateMethod2 = function _privateMethod2() {}; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/output.js index be02820a8505..45680cfbe2ff 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/output.js @@ -1,3 +1,5 @@ +var _foo = new WeakSet(); + class Cl { constructor() { _foo.add(this); @@ -9,8 +11,6 @@ class Cl { } -var _foo = new WeakSet(); - var _foo2 = function* _foo2() { yield 2; return 3; 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 index d934fb365e2f..ebd62c2a5a83 100644 --- 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 @@ -5,6 +5,8 @@ class Base { } +var _privateMethod = new WeakSet(); + class Sub extends Base { constructor(...args) { super(...args); @@ -22,8 +24,6 @@ class Sub extends Base { } -var _privateMethod = new WeakSet(); - var _privateMethod2 = function _privateMethod2() { return babelHelpers.get(babelHelpers.getPrototypeOf(Sub.prototype), "superMethod", this).call(this); }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/basic/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/basic/output.js index a6fe9f8e28fa..c62177365e9a 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/basic/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/basic/output.js @@ -1,3 +1,5 @@ +var _privateStaticMethod = babelHelpers.classPrivateFieldLooseKey("privateStaticMethod"); + class Cl { static staticMethod2() { return babelHelpers.classPrivateFieldLooseBase(Cl, _privateStaticMethod)[_privateStaticMethod](); @@ -21,8 +23,6 @@ class Cl { } -var _privateStaticMethod = babelHelpers.classPrivateFieldLooseKey("privateStaticMethod"); - var _privateStaticMethod2 = function _privateStaticMethod2() { return 1017; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/class-check/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/class-check/output.js index b93f1e9d252e..353da8ad4fac 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/class-check/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/class-check/output.js @@ -1,3 +1,5 @@ +var _privateStaticMethod = babelHelpers.classPrivateFieldLooseKey("privateStaticMethod"); + class Cl { publicMethod(checked) { return babelHelpers.classPrivateFieldLooseBase(checked, _privateStaticMethod)[_privateStaticMethod](); @@ -5,8 +7,6 @@ class Cl { } -var _privateStaticMethod = babelHelpers.classPrivateFieldLooseKey("privateStaticMethod"); - var _privateStaticMethod2 = function _privateStaticMethod2() {}; Object.defineProperty(Cl, _privateStaticMethod, { diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/exfiltrated/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/exfiltrated/output.js index ebdf256588dd..1216761ab5c4 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/exfiltrated/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/exfiltrated/output.js @@ -1,5 +1,7 @@ var exfiltrated; +var _privateStaticMethod = babelHelpers.classPrivateFieldLooseKey("privateStaticMethod"); + class Cl { constructor() { if (exfiltrated === undefined) { @@ -9,8 +11,6 @@ class Cl { } -var _privateStaticMethod = babelHelpers.classPrivateFieldLooseKey("privateStaticMethod"); - var _privateStaticMethod2 = function _privateStaticMethod2() { return 1017; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/generator/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/generator/output.js index 2f1d02594715..464971ea7944 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/generator/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/generator/output.js @@ -1,3 +1,5 @@ +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); + class Cl { test() { return babelHelpers.classPrivateFieldLooseBase(Cl, _foo)[_foo](); @@ -5,8 +7,6 @@ class Cl { } -var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); - var _foo2 = function* _foo2() { yield 2; return 3; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/reassignment/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/reassignment/output.js index 1be439447ff4..5b3fae07d026 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/reassignment/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/reassignment/output.js @@ -1,3 +1,5 @@ +var _privateStaticMethod = babelHelpers.classPrivateFieldLooseKey("privateStaticMethod"); + class Cl { constructor() { babelHelpers.classPrivateFieldLooseBase(Cl, _privateStaticMethod)[_privateStaticMethod] = null; @@ -5,8 +7,6 @@ class Cl { } -var _privateStaticMethod = babelHelpers.classPrivateFieldLooseKey("privateStaticMethod"); - var _privateStaticMethod2 = function _privateStaticMethod2() {}; Object.defineProperty(Cl, _privateStaticMethod, { diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/output.js index 98be96809ba9..7c93e1917f76 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/super/output.js @@ -5,6 +5,8 @@ class Base { } +var _subStaticPrivateMethod = babelHelpers.classPrivateFieldLooseKey("subStaticPrivateMethod"); + class Sub extends Base { static basePublicStaticMethod() { return 'bad'; @@ -16,8 +18,6 @@ class Sub extends Base { } -var _subStaticPrivateMethod = babelHelpers.classPrivateFieldLooseKey("subStaticPrivateMethod"); - var _subStaticPrivateMethod2 = function _subStaticPrivateMethod2() { return Base.basePublicStaticMethod.call(this); }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/this/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/this/output.js index 0bccfda42bec..0ca80e687afd 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/this/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/this/output.js @@ -5,6 +5,10 @@ class A { } +var _getA = babelHelpers.classPrivateFieldLooseKey("getA"); + +var _getB = babelHelpers.classPrivateFieldLooseKey("getB"); + class B extends A { static get b() { return 2; @@ -16,10 +20,6 @@ class B extends A { } -var _getA = babelHelpers.classPrivateFieldLooseKey("getA"); - -var _getB = babelHelpers.classPrivateFieldLooseKey("getB"); - var _getB2 = function _getB2() { return this.b; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/basic/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/basic/output.js index 83619d5323e6..f9b15a52fad0 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/basic/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/basic/output.js @@ -1,3 +1,7 @@ +var _PRIVATE_STATIC_FIELD = babelHelpers.classPrivateFieldLooseKey("PRIVATE_STATIC_FIELD"); + +var _privateStaticFieldValue = babelHelpers.classPrivateFieldLooseKey("privateStaticFieldValue"); + class Cl { static getValue() { return babelHelpers.classPrivateFieldLooseBase(Cl, _privateStaticFieldValue)[_privateStaticFieldValue]; @@ -9,10 +13,6 @@ class Cl { } -var _PRIVATE_STATIC_FIELD = babelHelpers.classPrivateFieldLooseKey("PRIVATE_STATIC_FIELD"); - -var _privateStaticFieldValue = babelHelpers.classPrivateFieldLooseKey("privateStaticFieldValue"); - var _set_privateStaticFieldValue = function (newValue) { babelHelpers.classPrivateFieldLooseBase(Cl, _PRIVATE_STATIC_FIELD)[_PRIVATE_STATIC_FIELD] = `Updated: ${newValue}`; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/get-only-setter/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/get-only-setter/output.js index adb85a9ead8c..9fc34593fd65 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/get-only-setter/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/get-only-setter/output.js @@ -1,3 +1,7 @@ +var _PRIVATE_STATIC_FIELD = babelHelpers.classPrivateFieldLooseKey("PRIVATE_STATIC_FIELD"); + +var _privateStaticFieldValue = babelHelpers.classPrivateFieldLooseKey("privateStaticFieldValue"); + class Cl { static getPrivateStaticFieldValue() { return babelHelpers.classPrivateFieldLooseBase(Cl, _privateStaticFieldValue)[_privateStaticFieldValue]; @@ -5,10 +9,6 @@ class Cl { } -var _PRIVATE_STATIC_FIELD = babelHelpers.classPrivateFieldLooseKey("PRIVATE_STATIC_FIELD"); - -var _privateStaticFieldValue = babelHelpers.classPrivateFieldLooseKey("privateStaticFieldValue"); - var _set_privateStaticFieldValue = function (newValue) { babelHelpers.classPrivateFieldLooseBase(Cl, _PRIVATE_STATIC_FIELD)[_PRIVATE_STATIC_FIELD] = newValue; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/set-only-getter/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/set-only-getter/output.js index 73e658037394..2dfa44c30302 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/set-only-getter/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/set-only-getter/output.js @@ -1,3 +1,7 @@ +var _PRIVATE_STATIC_FIELD = babelHelpers.classPrivateFieldLooseKey("PRIVATE_STATIC_FIELD"); + +var _privateStaticFieldValue = babelHelpers.classPrivateFieldLooseKey("privateStaticFieldValue"); + class Cl { static setPrivateStaticFieldValue() { babelHelpers.classPrivateFieldLooseBase(Cl, _privateStaticFieldValue)[_privateStaticFieldValue] = 1; @@ -5,10 +9,6 @@ class Cl { } -var _PRIVATE_STATIC_FIELD = babelHelpers.classPrivateFieldLooseKey("PRIVATE_STATIC_FIELD"); - -var _privateStaticFieldValue = babelHelpers.classPrivateFieldLooseKey("privateStaticFieldValue"); - var _get_privateStaticFieldValue = function () { return babelHelpers.classPrivateFieldLooseBase(Cl, _PRIVATE_STATIC_FIELD)[_PRIVATE_STATIC_FIELD]; }; diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/updates/output.js b/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/updates/output.js index b75fa4a4d18c..b583424f9551 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/updates/output.js +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/updates/output.js @@ -1,3 +1,7 @@ +var _privateField = babelHelpers.classPrivateFieldLooseKey("privateField"); + +var _privateFieldValue = babelHelpers.classPrivateFieldLooseKey("privateFieldValue"); + class Cl { static publicGetPrivateField() { return babelHelpers.classPrivateFieldLooseBase(Cl, _privateFieldValue)[_privateFieldValue]; @@ -30,10 +34,6 @@ class Cl { } -var _privateField = babelHelpers.classPrivateFieldLooseKey("privateField"); - -var _privateFieldValue = babelHelpers.classPrivateFieldLooseKey("privateFieldValue"); - var _set_privateFieldValue = function (newValue) { babelHelpers.classPrivateFieldLooseBase(Cl, _privateField)[_privateField] = newValue; };