Add a check for privateMap's existence

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) {

packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-false/output.js

@@ -1,12 +1,12 @@
+var _privateMethod = new WeakSet();
+
 class X {
   constructor() {
     _privateMethod.add(this);
   }
 
 }
 
-var _privateMethod = new WeakSet();
-
 var _privateMethod2 = function _privateMethod2() {
   return 42;
 };

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;
 };

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");

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");

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");

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");

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();

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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");

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"

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");

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");