Ensure static private method init run before static property (#12918)

babel · Mar 3, 2021 · ac758f7 · ac758f7
1 parent bdb207c
commit ac758f7
Show file tree

Hide file tree

Showing 21 changed files with 163 additions and 143 deletions.
diff --git a/packages/babel-helper-create-class-features-plugin/src/fields.js b/packages/babel-helper-create-class-features-plugin/src/fields.js
@@ -806,7 +806,7 @@ export function buildFieldsInitNodes(
         break;
       case isStatic && isPrivate && isMethod && !privateFieldsAsProperties:
         needsClassRef = true;
-        staticNodes.push(
+        staticNodes.unshift(
           buildPrivateStaticFieldInitSpec(prop, privateNamesMap),
         );
         staticNodes.unshift(
@@ -819,7 +819,7 @@ export function buildFieldsInitNodes(
         break;
       case isStatic && isPrivate && isMethod && privateFieldsAsProperties:
         needsClassRef = true;
-        staticNodes.push(
+        staticNodes.unshift(
           buildPrivateStaticMethodInitLoose(
             t.cloneNode(ref),
             prop,

diff --git a/...-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/this/output.js b/...-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/this/output.js
@@ -24,14 +24,15 @@ var _getB2 = function _getB2() {
   return this.b;
 };
 
+Object.defineProperty(B, _getB, {
+  value: _getB2
+});
+
 var _getA2 = function _getA2() {
   return A.a;
 };
 
 Object.defineProperty(B, _getA, {
   value: _getA2
 });
-Object.defineProperty(B, _getB, {
-  value: _getB2
-});
 var [getA, getB] = B.extract();
diff --git a/...vate-methods/test/fixtures/private-static-method-privateFieldsAsProperties/this/output.js b/...vate-methods/test/fixtures/private-static-method-privateFieldsAsProperties/this/output.js
@@ -24,14 +24,15 @@ var _getB2 = function _getB2() {
   return this.b;
 };
 
+Object.defineProperty(B, _getB, {
+  value: _getB2
+});
+
 var _getA2 = function _getA2() {
   return babelHelpers.get(babelHelpers.getPrototypeOf(B), "a", this);
 };
 
 Object.defineProperty(B, _getA, {
   value: _getA2
 });
-Object.defineProperty(B, _getB, {
-  value: _getB2
-});
 const [getA, getB] = B.extract();
diff --git a/...al-private-methods/test/fixtures/static-accessors-loose/access-before-declaration/exec.js b/...al-private-methods/test/fixtures/static-accessors-loose/access-before-declaration/exec.js
diff --git a/...e-methods/test/fixtures/static-accessors-loose/access-in-static-field-initializer/exec.js b/...e-methods/test/fixtures/static-accessors-loose/access-in-static-field-initializer/exec.js
@@ -0,0 +1,35 @@
+expect((() => {
+  let r;
+  class C {
+    static #_ = new C;
+    static get #p() { return 0 };
+    constructor() {
+      r = C.#p;
+    }
+  }
+  return r;
+})()).toBe(0);
+
+expect((() => {
+  let r;
+  class C {
+    static #_ = new C;
+    static set #p(v) { r = v; };
+    constructor() {
+      C.#p = 0;
+    }
+  }
+  return r;
+})()).toBe(0);
+
+expect((() => {
+  let r;
+  class C {
+    static #_ = new C;
+    static set #p(v) { r = v; };
+    constructor() {
+      for (C.#p of [0]);
+    }
+  }
+  return r;
+})()).toBe(0);
diff --git a/...abel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/basic/output.js b/...abel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/basic/output.js
@@ -21,11 +21,11 @@ var _get_privateStaticFieldValue = function () {
   return babelHelpers.classPrivateFieldLooseBase(Cl, _PRIVATE_STATIC_FIELD)[_PRIVATE_STATIC_FIELD];
 };
 
-Object.defineProperty(Cl, _PRIVATE_STATIC_FIELD, {
-  writable: true,
-  value: "top secret string"
-});
 Object.defineProperty(Cl, _privateStaticFieldValue, {
   get: _get_privateStaticFieldValue,
   set: _set_privateStaticFieldValue
 });
+Object.defineProperty(Cl, _PRIVATE_STATIC_FIELD, {
+  writable: true,
+  value: "top secret string"
+});
diff --git a/...n-proposal-private-methods/test/fixtures/static-accessors-loose/get-only-setter/output.js b/...n-proposal-private-methods/test/fixtures/static-accessors-loose/get-only-setter/output.js
@@ -13,11 +13,11 @@ var _set_privateStaticFieldValue = function (newValue) {
   babelHelpers.classPrivateFieldLooseBase(Cl, _PRIVATE_STATIC_FIELD)[_PRIVATE_STATIC_FIELD] = newValue;
 };
 
-Object.defineProperty(Cl, _PRIVATE_STATIC_FIELD, {
-  writable: true,
-  value: 0
-});
 Object.defineProperty(Cl, _privateStaticFieldValue, {
   get: void 0,
   set: _set_privateStaticFieldValue
 });
+Object.defineProperty(Cl, _PRIVATE_STATIC_FIELD, {
+  writable: true,
+  value: 0
+});
diff --git a/...n-proposal-private-methods/test/fixtures/static-accessors-loose/set-only-getter/output.js b/...n-proposal-private-methods/test/fixtures/static-accessors-loose/set-only-getter/output.js
@@ -14,12 +14,12 @@ var _get_privateFieldValue = function () {
   return babelHelpers.classPrivateFieldLooseBase(this, _privateField)[_privateField];
 };
 
-Object.defineProperty(Cl, _privateField, {
-  writable: true,
-  value: 0
-});
 Object.defineProperty(Cl, _privateFieldValue, {
   get: _get_privateFieldValue,
   set: void 0
 });
+Object.defineProperty(Cl, _privateField, {
+  writable: true,
+  value: 0
+});
 var cl = new Cl();
diff --git a/...el-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/updates/output.js b/...el-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/updates/output.js
@@ -42,12 +42,12 @@ var _get_privateFieldValue = function () {
   return babelHelpers.classPrivateFieldLooseBase(Cl, _privateField)[_privateField];
 };
 
+Object.defineProperty(Cl, _privateFieldValue, {
+  get: _get_privateFieldValue,
+  set: _set_privateFieldValue
+});
 Object.defineProperty(Cl, _privateField, {
   writable: true,
   value: "top secret string"
 });
 Cl.publicField = "not secret string";
-Object.defineProperty(Cl, _privateFieldValue, {
-  get: _get_privateFieldValue,
-  set: _set_privateFieldValue
-});
diff --git a/...est/fixtures/static-accessors-privateFieldsAsProperties/access-before-declaration/exec.js b/...est/fixtures/static-accessors-privateFieldsAsProperties/access-before-declaration/exec.js
diff --git a/...res/static-accessors-privateFieldsAsProperties/access-in-static-field-initializer/exec.js b/...res/static-accessors-privateFieldsAsProperties/access-in-static-field-initializer/exec.js
@@ -0,0 +1,35 @@
+expect((() => {
+  let r;
+  class C {
+    static #_ = new C;
+    static get #p() { return 0 };
+    constructor() {
+      r = C.#p;
+    }
+  }
+  return r;
+})()).toBe(0);
+
+expect((() => {
+  let r;
+  class C {
+    static #_ = new C;
+    static set #p(v) { r = v; };
+    constructor() {
+      C.#p = 0;
+    }
+  }
+  return r;
+})()).toBe(0);
+
+expect((() => {
+  let r;
+  class C {
+    static #_ = new C;
+    static set #p(v) { r = v; };
+    constructor() {
+      for (C.#p of [0]);
+    }
+  }
+  return r;
+})()).toBe(0);
diff --git a/...-private-methods/test/fixtures/static-accessors-privateFieldsAsProperties/basic/output.js b/...-private-methods/test/fixtures/static-accessors-privateFieldsAsProperties/basic/output.js
@@ -21,11 +21,11 @@ var _get_privateStaticFieldValue = function () {
   return babelHelpers.classPrivateFieldLooseBase(Cl, _PRIVATE_STATIC_FIELD)[_PRIVATE_STATIC_FIELD];
 };
 
-Object.defineProperty(Cl, _PRIVATE_STATIC_FIELD, {
-  writable: true,
-  value: "top secret string"
-});
 Object.defineProperty(Cl, _privateStaticFieldValue, {
   get: _get_privateStaticFieldValue,
   set: _set_privateStaticFieldValue
 });
+Object.defineProperty(Cl, _PRIVATE_STATIC_FIELD, {
+  writable: true,
+  value: "top secret string"
+});
diff --git a/...ethods/test/fixtures/static-accessors-privateFieldsAsProperties/get-only-setter/output.js b/...ethods/test/fixtures/static-accessors-privateFieldsAsProperties/get-only-setter/output.js
@@ -13,11 +13,11 @@ var _set_privateStaticFieldValue = function (newValue) {
   babelHelpers.classPrivateFieldLooseBase(Cl, _PRIVATE_STATIC_FIELD)[_PRIVATE_STATIC_FIELD] = newValue;
 };
 
-Object.defineProperty(Cl, _PRIVATE_STATIC_FIELD, {
-  writable: true,
-  value: 0
-});
 Object.defineProperty(Cl, _privateStaticFieldValue, {
   get: void 0,
   set: _set_privateStaticFieldValue
 });
+Object.defineProperty(Cl, _PRIVATE_STATIC_FIELD, {
+  writable: true,
+  value: 0
+});
diff --git a/...ethods/test/fixtures/static-accessors-privateFieldsAsProperties/set-only-getter/output.js b/...ethods/test/fixtures/static-accessors-privateFieldsAsProperties/set-only-getter/output.js
@@ -14,12 +14,12 @@ var _get_privateFieldValue = function () {
   return babelHelpers.classPrivateFieldLooseBase(this, _privateField)[_privateField];
 };
 
-Object.defineProperty(Cl, _privateField, {
-  writable: true,
-  value: 0
-});
 Object.defineProperty(Cl, _privateFieldValue, {
   get: _get_privateFieldValue,
   set: void 0
 });
+Object.defineProperty(Cl, _privateField, {
+  writable: true,
+  value: 0
+});
 const cl = new Cl();
diff --git a/...rivate-methods/test/fixtures/static-accessors-privateFieldsAsProperties/updates/output.js b/...rivate-methods/test/fixtures/static-accessors-privateFieldsAsProperties/updates/output.js
@@ -42,12 +42,12 @@ var _get_privateFieldValue = function () {
   return babelHelpers.classPrivateFieldLooseBase(Cl, _privateField)[_privateField];
 };
 
+Object.defineProperty(Cl, _privateFieldValue, {
+  get: _get_privateFieldValue,
+  set: _set_privateFieldValue
+});
 Object.defineProperty(Cl, _privateField, {
   writable: true,
   value: "top secret string"
 });
 babelHelpers.defineProperty(Cl, "publicField", "not secret string");
-Object.defineProperty(Cl, _privateFieldValue, {
-  get: _get_privateFieldValue,
-  set: _set_privateFieldValue
-});
diff --git a/...proposal-private-methods/test/fixtures/static-accessors/access-before-declaration/exec.js b/...proposal-private-methods/test/fixtures/static-accessors/access-before-declaration/exec.js
diff --git a/...private-methods/test/fixtures/static-accessors/access-in-static-field-initializer/exec.js b/...private-methods/test/fixtures/static-accessors/access-in-static-field-initializer/exec.js
@@ -0,0 +1,35 @@
+expect((() => {
+  let r;
+  class C {
+    static #_ = new C;
+    static get #p() { return 0 };
+    constructor() {
+      r = C.#p;
+    }
+  }
+  return r;
+})()).toBe(0);
+
+expect((() => {
+  let r;
+  class C {
+    static #_ = new C;
+    static set #p(v) { r = v; };
+    constructor() {
+      C.#p = 0;
+    }
+  }
+  return r;
+})()).toBe(0);
+
+expect((() => {
+  let r;
+  class C {
+    static #_ = new C;
+    static set #p(v) { r = v; };
+    constructor() {
+      for (C.#p of [0]);
+    }
+  }
+  return r;
+})()).toBe(0);