fix: loop handling in block scoping transform (#15398)

fix

packages/babel-plugin-transform-block-scoping/src/index.ts

@@ -84,10 +84,7 @@ export default declare((api, opts: Options) => {
               const { usages, capturedInClosure, hasConstantViolations } =
                 getUsageInBody(binding, path);
 
-              if (capturedInClosure) {
-                markNeedsBodyWrap();
-                captured.push(name);
-              } else if (
+              if (
                 headScope.parent.hasBinding(name) ||
                 headScope.parent.hasGlobal(name)
               ) {
@@ -100,6 +97,11 @@ export default declare((api, opts: Options) => {
                 name = newName;
               }
 
+              if (capturedInClosure) {
+                markNeedsBodyWrap();
+                captured.push(name);
+              }
+
               if (isForStatement && hasConstantViolations) {
                 updatedBindingsUsages.set(name, usages);
               }

packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-15308-for-variable-shadow-and-capture/output.js

@@ -1,7 +1,7 @@
 var i;
-var _loop = function (i) {
+var _loop = function (_i) {
   (function () {
-    return i;
+    return _i;
   });
 };
 for (var _i = 4; _i < 6; _i++) {

packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-973/output.js

@@ -1,8 +1,8 @@
 var arr = [];
 for (var i = 0; i < 10; i++) {
-  var _loop = function (i) {
+  var _loop = function (_i) {
     arr.push(function () {
-      return i;
+      return _i;
     });
   };
   for (var _i = 0; _i < 10; _i++) {

packages/babel-plugin-transform-block-scoping/test/fixtures/general/wrap-closure-shadow-variables/output.js

@@ -1,7 +1,7 @@
 var a = 1;
-var _loop = function (a) {
+var _loop = function (_a) {
   items.forEach(function (item) {
-    return a;
+    return _a;
   });
 };
 for (var _a = 1; _a < 100; _a++) {

packages/babel-plugin-transform-block-scoping/test/fixtures/regression/rename-with-global-ids/options.json

@@ -0,0 +1,3 @@
+{
+  "plugins": ["./plugin.cjs", "transform-block-scoping"]
+}

packages/babel-plugin-transform-block-scoping/test/fixtures/regression/wrap-closure-updated-shadow-variables/input.js

@@ -0,0 +1,7 @@
+// https://github.com/babel/babel/issues/15397
+
+var i;
+for (let i = 0; i < 1; ) {
+  i++
+  () => i;
+}

packages/babel-plugin-transform-block-scoping/test/fixtures/regression/wrap-closure-updated-shadow-variables/options.json

@@ -0,0 +1,3 @@
+{
+  "plugins": ["transform-block-scoping"]
+}

packages/babel-plugin-transform-block-scoping/test/fixtures/regression/wrap-closure-updated-shadow-variables/output.js

@@ -0,0 +1,11 @@
+// https://github.com/babel/babel/issues/15397
+
+var i;
+var _loop = function (_i2) {
+  _i2++;
+  () => _i2;
+  _i = _i2;
+};
+for (var _i = 0; _i < 1;) {
+  _loop(_i);
+}