Fix protoInit call injection timing (babel#16235)

liuxingbaoyu · Mar 5, 2024 · 74dcb8c · 74dcb8c
1 parent 1f64359
commit 74dcb8c
Show file tree

Hide file tree

Showing 82 changed files with 402 additions and 240 deletions.
diff --git a/packages/babel-helper-create-class-features-plugin/src/decorators.ts b/packages/babel-helper-create-class-features-plugin/src/decorators.ts
@@ -1138,20 +1138,20 @@ function transformClass(
         if (element.node) {
           element.node.decorators = null;
         }
+      }
 
-        if (
-          fieldInitializerAssignments.length > 0 &&
-          !isStatic &&
-          (kind === FIELD || kind === ACCESSOR)
-        ) {
-          prependExpressionsToFieldInitializer(
-            fieldInitializerAssignments,
-            element as NodePath<
-              t.ClassProperty | t.ClassPrivateProperty | t.ClassAccessorProperty
-            >,
-          );
-          fieldInitializerAssignments = [];
-        }
+      if (
+        fieldInitializerAssignments.length > 0 &&
+        !isStatic &&
+        (kind === FIELD || kind === ACCESSOR)
+      ) {
+        prependExpressionsToFieldInitializer(
+          fieldInitializerAssignments,
+          element as NodePath<
+            t.ClassProperty | t.ClassPrivateProperty | t.ClassAccessorProperty
+          >,
+        );
+        fieldInitializerAssignments = [];
       }
     }
   }

diff --git a/...bel-plugin-proposal-decorators/test/fixtures/2021-12-getters--to-es2015/private/output.js b/...bel-plugin-proposal-decorators/test/fixtures/2021-12-getters--to-es2015/private/output.js
@@ -7,8 +7,7 @@ class Foo {
       get: _get_a,
       set: void 0
     });
-    babelHelpers.defineProperty(this, "value", 1);
-    _initProto(this);
+    babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   getA() {
     return babelHelpers.classPrivateFieldGet(this, _a);

diff --git a/...abel-plugin-proposal-decorators/test/fixtures/2021-12-getters--to-es2015/public/output.js b/...abel-plugin-proposal-decorators/test/fixtures/2021-12-getters--to-es2015/public/output.js
@@ -2,8 +2,7 @@ var _initProto, _Foo;
 const dec = () => {};
 class Foo {
   constructor() {
-    babelHelpers.defineProperty(this, "value", 1);
-    _initProto(this);
+    babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   get a() {
     return this.value;

diff --git a/...roposal-decorators/test/fixtures/2021-12-getters-and-setters--to-es2015/private/output.js b/...roposal-decorators/test/fixtures/2021-12-getters-and-setters--to-es2015/private/output.js
@@ -7,8 +7,7 @@ class Foo {
       get: _get_a,
       set: _set_a
     });
-    babelHelpers.defineProperty(this, "value", 1);
-    _initProto(this);
+    babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   getA() {
     return babelHelpers.classPrivateFieldGet(this, _a);

diff --git a/...proposal-decorators/test/fixtures/2021-12-getters-and-setters--to-es2015/public/output.js b/...proposal-decorators/test/fixtures/2021-12-getters-and-setters--to-es2015/public/output.js
@@ -2,8 +2,7 @@ var _initProto, _Foo;
 const dec = () => {};
 class Foo {
   constructor() {
-    babelHelpers.defineProperty(this, "value", 1);
-    _initProto(this);
+    babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   get a() {
     return this.value;

diff --git a/...el-plugin-proposal-decorators/test/fixtures/2021-12-getters-and-setters/private/output.js b/...el-plugin-proposal-decorators/test/fixtures/2021-12-getters-and-setters/private/output.js
@@ -8,10 +8,7 @@ class Foo {
       this.value = v;
     }]], []);
   }
-  constructor() {
-    _initProto(this);
-  }
-  value = 1;
+  value = (_initProto(this), 1);
   get #a() {
     return _call_a(this);
   }

diff --git a/...bel-plugin-proposal-decorators/test/fixtures/2021-12-getters-and-setters/public/output.js b/...bel-plugin-proposal-decorators/test/fixtures/2021-12-getters-and-setters/public/output.js
@@ -4,10 +4,7 @@ class Foo {
   static {
     [_initProto] = babelHelpers.applyDecs(this, [[dec, 3, "a"], [dec, 4, "a"], [dec, 3, 'b'], [dec, 4, 'b']], []);
   }
-  constructor() {
-    _initProto(this);
-  }
-  value = 1;
+  value = (_initProto(this), 1);
   get a() {
     return this.value;
   }

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-getters/private/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-getters/private/output.js
@@ -6,10 +6,7 @@ class Foo {
       return this.value;
     }]], []);
   }
-  constructor() {
-    _initProto(this);
-  }
-  value = 1;
+  value = (_initProto(this), 1);
   get #a() {
     return _call_a(this);
   }

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-getters/public/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-getters/public/output.js
@@ -4,10 +4,7 @@ class Foo {
   static {
     [_initProto] = babelHelpers.applyDecs(this, [[dec, 3, "a"], [dec, 3, 'b']], []);
   }
-  constructor() {
-    _initProto(this);
-  }
-  value = 1;
+  value = (_initProto(this), 1);
   get a() {
     return this.value;
   }

diff --git a/...bel-plugin-proposal-decorators/test/fixtures/2021-12-methods--to-es2015/private/output.js b/...bel-plugin-proposal-decorators/test/fixtures/2021-12-methods--to-es2015/private/output.js
@@ -7,8 +7,7 @@ class Foo {
       writable: true,
       value: _call_a
     });
-    babelHelpers.defineProperty(this, "value", 1);
-    _initProto(this);
+    babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   callA() {
     return babelHelpers.classPrivateFieldGet(this, _a).call(this);

diff --git a/...abel-plugin-proposal-decorators/test/fixtures/2021-12-methods--to-es2015/public/output.js b/...abel-plugin-proposal-decorators/test/fixtures/2021-12-methods--to-es2015/public/output.js
@@ -2,8 +2,7 @@ var _initProto, _Foo;
 const dec = () => {};
 class Foo {
   constructor() {
-    babelHelpers.defineProperty(this, "value", 1);
-    _initProto(this);
+    babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   a() {
     return this.value;

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-methods/private/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-methods/private/output.js
@@ -6,11 +6,8 @@ class Foo {
       return this.value;
     }]], []);
   }
-  constructor() {
-    _initProto(this);
-  }
   #a = _call_a;
-  value = 1;
+  value = (_initProto(this), 1);
   callA() {
     return this.#a();
   }

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-methods/public/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-methods/public/output.js
@@ -4,10 +4,7 @@ class Foo {
   static {
     [_initProto] = babelHelpers.applyDecs(this, [[dec, 2, "a"], [dec, 2, 'b']], []);
   }
-  constructor() {
-    _initProto(this);
-  }
-  value = 1;
+  value = (_initProto(this), 1);
   a() {
     return this.value;
   }

diff --git a/...posal-decorators/test/fixtures/2021-12-misc--to-es2015/valid-expression-formats/output.js b/...posal-decorators/test/fixtures/2021-12-misc--to-es2015/valid-expression-formats/output.js
@@ -11,9 +11,8 @@ class Foo {
   constructor() {
     babelHelpers.classPrivateFieldInitSpec(this, _a, {
       writable: true,
-      value: void 0
+      value: void _initProto(this)
     });
-    _initProto(this);
   }
   method() {}
   makeClass() {

diff --git a/...al-decorators/test/fixtures/2021-12-misc/initProto-existing-derived-constructor/output.js b/...al-decorators/test/fixtures/2021-12-misc/initProto-existing-derived-constructor/output.js
@@ -76,12 +76,12 @@
             [_initProto3] = babelHelpers.applyDecs(this, [[dec, 2, "method"]], []);
           }
           constructor() {
-            log.push(_initProto3(super(6)).method());
+            log.push(super(6).method());
           }
           method() {
             return this.a;
           }
-          [_computedKey];
+          [_computedKey] = void _initProto3(this);
         }
         new A();
       }

diff --git a/...-plugin-proposal-decorators/test/fixtures/2021-12-misc/valid-expression-formats/output.js b/...-plugin-proposal-decorators/test/fixtures/2021-12-misc/valid-expression-formats/output.js
@@ -10,10 +10,7 @@ class Foo {
   static {
     [_initProto, _Foo, _initClass] = babelHelpers.applyDecs(this, [[[dec, _dec, _dec2, _dec3, _dec4], 2, "method"]], _classDecs);
   }
-  constructor() {
-    _initProto(this);
-  }
-  #a;
+  #a = void _initProto(this);
   method() {}
   makeClass() {
     var _dec5, _init_bar;

diff --git a/...bel-plugin-proposal-decorators/test/fixtures/2021-12-setters--to-es2015/private/output.js b/...bel-plugin-proposal-decorators/test/fixtures/2021-12-setters--to-es2015/private/output.js
@@ -7,8 +7,7 @@ class Foo {
       get: void 0,
       set: _set_a
     });
-    babelHelpers.defineProperty(this, "value", 1);
-    _initProto(this);
+    babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   setA(v) {
     babelHelpers.classPrivateFieldSet(this, _a, v);

diff --git a/...abel-plugin-proposal-decorators/test/fixtures/2021-12-setters--to-es2015/public/output.js b/...abel-plugin-proposal-decorators/test/fixtures/2021-12-setters--to-es2015/public/output.js
@@ -2,8 +2,7 @@ var _initProto, _Foo;
 const dec = () => {};
 class Foo {
   constructor() {
-    babelHelpers.defineProperty(this, "value", 1);
-    _initProto(this);
+    babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   set a(v) {
     return this.value = v;

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-setters/private/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-setters/private/output.js
@@ -6,10 +6,7 @@ class Foo {
       return this.value = v;
     }]], []);
   }
-  constructor() {
-    _initProto(this);
-  }
-  value = 1;
+  value = (_initProto(this), 1);
   set #a(v) {
     _call_a(this, v);
   }

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-setters/public/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/2021-12-setters/public/output.js
@@ -4,10 +4,7 @@ class Foo {
   static {
     [_initProto] = babelHelpers.applyDecs(this, [[dec, 4, "a"], [dec, 4, 'b']], []);
   }
-  constructor() {
-    _initProto(this);
-  }
-  value = 1;
+  value = (_initProto(this), 1);
   set a(v) {
     return this.value = v;
   }

diff --git a/...bel-plugin-proposal-decorators/test/fixtures/2022-03-getters--to-es2015/private/output.js b/...bel-plugin-proposal-decorators/test/fixtures/2022-03-getters--to-es2015/private/output.js
@@ -7,8 +7,7 @@ class Foo {
       get: _get_a,
       set: void 0
     });
-    babelHelpers.defineProperty(this, "value", 1);
-    _initProto(this);
+    babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   getA() {
     return babelHelpers.classPrivateFieldGet(this, _a);

diff --git a/...abel-plugin-proposal-decorators/test/fixtures/2022-03-getters--to-es2015/public/output.js b/...abel-plugin-proposal-decorators/test/fixtures/2022-03-getters--to-es2015/public/output.js
@@ -2,8 +2,7 @@ var _initProto, _Foo;
 const dec = () => {};
 class Foo {
   constructor() {
-    babelHelpers.defineProperty(this, "value", 1);
-    _initProto(this);
+    babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   get a() {
     return this.value;

diff --git a/...roposal-decorators/test/fixtures/2022-03-getters-and-setters--to-es2015/private/output.js b/...roposal-decorators/test/fixtures/2022-03-getters-and-setters--to-es2015/private/output.js
@@ -7,8 +7,7 @@ class Foo {
       get: _get_a,
       set: _set_a
     });
-    babelHelpers.defineProperty(this, "value", 1);
-    _initProto(this);
+    babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   getA() {
     return babelHelpers.classPrivateFieldGet(this, _a);

diff --git a/...proposal-decorators/test/fixtures/2022-03-getters-and-setters--to-es2015/public/output.js b/...proposal-decorators/test/fixtures/2022-03-getters-and-setters--to-es2015/public/output.js
@@ -2,8 +2,7 @@ var _initProto, _Foo;
 const dec = () => {};
 class Foo {
   constructor() {
-    babelHelpers.defineProperty(this, "value", 1);
-    _initProto(this);
+    babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   get a() {
     return this.value;

diff --git a/...el-plugin-proposal-decorators/test/fixtures/2022-03-getters-and-setters/private/output.js b/...el-plugin-proposal-decorators/test/fixtures/2022-03-getters-and-setters/private/output.js
@@ -8,10 +8,7 @@ class Foo {
       this.value = v;
     }]], []).e;
   }
-  constructor() {
-    _initProto(this);
-  }
-  value = 1;
+  value = (_initProto(this), 1);
   get #a() {
     return _call_a(this);
   }

diff --git a/...bel-plugin-proposal-decorators/test/fixtures/2022-03-getters-and-setters/public/output.js b/...bel-plugin-proposal-decorators/test/fixtures/2022-03-getters-and-setters/public/output.js
@@ -4,10 +4,7 @@ class Foo {
   static {
     [_initProto] = babelHelpers.applyDecs2203R(this, [[dec, 3, "a"], [dec, 4, "a"], [dec, 3, 'b'], [dec, 4, 'b']], []).e;
   }
-  constructor() {
-    _initProto(this);
-  }
-  value = 1;
+  value = (_initProto(this), 1);
   get a() {
     return this.value;
   }

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-getters/private/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-getters/private/output.js
@@ -6,10 +6,7 @@ class Foo {
       return this.value;
     }]], []).e;
   }
-  constructor() {
-    _initProto(this);
-  }
-  value = 1;
+  value = (_initProto(this), 1);
   get #a() {
     return _call_a(this);
   }

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-getters/public/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-getters/public/output.js
@@ -4,10 +4,7 @@ class Foo {
   static {
     [_initProto] = babelHelpers.applyDecs2203R(this, [[dec, 3, "a"], [dec, 3, 'b']], []).e;
   }
-  constructor() {
-    _initProto(this);
-  }
-  value = 1;
+  value = (_initProto(this), 1);
   get a() {
     return this.value;
   }

diff --git a/...bel-plugin-proposal-decorators/test/fixtures/2022-03-methods--to-es2015/private/output.js b/...bel-plugin-proposal-decorators/test/fixtures/2022-03-methods--to-es2015/private/output.js
@@ -7,8 +7,7 @@ class Foo {
       writable: true,
       value: _call_a
     });
-    babelHelpers.defineProperty(this, "value", 1);
-    _initProto(this);
+    babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   callA() {
     return babelHelpers.classPrivateFieldGet(this, _a).call(this);

diff --git a/...abel-plugin-proposal-decorators/test/fixtures/2022-03-methods--to-es2015/public/output.js b/...abel-plugin-proposal-decorators/test/fixtures/2022-03-methods--to-es2015/public/output.js
@@ -2,8 +2,7 @@ var _initProto, _Foo;
 const dec = () => {};
 class Foo {
   constructor() {
-    babelHelpers.defineProperty(this, "value", 1);
-    _initProto(this);
+    babelHelpers.defineProperty(this, "value", (_initProto(this), 1));
   }
   a() {
     return this.value;

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-methods/private/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-methods/private/output.js
@@ -6,11 +6,8 @@ class Foo {
       return this.value;
     }]], []).e;
   }
-  constructor() {
-    _initProto(this);
-  }
   #a = _call_a;
-  value = 1;
+  value = (_initProto(this), 1);
   callA() {
     return this.#a();
   }

diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-methods/public/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/2022-03-methods/public/output.js
@@ -4,10 +4,7 @@ class Foo {
   static {
     [_initProto] = babelHelpers.applyDecs2203R(this, [[dec, 2, "a"], [dec, 2, 'b']], []).e;
   }
-  constructor() {
-    _initProto(this);
-  }
-  value = 1;
+  value = (_initProto(this), 1);
   a() {
     return this.value;
   }

diff --git a/...rs/test/fixtures/2022-03-misc--to-es2015/initProto-existing-derived-constructor/output.js b/...rs/test/fixtures/2022-03-misc--to-es2015/initProto-existing-derived-constructor/output.js
@@ -71,7 +71,7 @@
         _computedKey = babelHelpers.toPropertyKey((key = super(5).method(), log.push(key), key));
         class A extends B {
           constructor() {
-            log.push(_initProto3((super(6), babelHelpers.defineProperty(this, _computedKey, void 0))).method());
+            log.push((super(6), babelHelpers.defineProperty(this, _computedKey, void _initProto3(this))).method());
           }
           method() {
             return this.a;