fix: handle shadowed binding in for using of body (#17319)

JLHwung · web-flow · commit 80c9a3acbec8 · 2025-05-23T11:41:30.000+02:00
diff --git a/packages/babel-plugin-proposal-explicit-resource-management/package.json b/packages/babel-plugin-proposal-explicit-resource-management/package.json
@@ -17,7 +17,8 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "@babel/helper-plugin-utils": "workspace:^"
+    "@babel/helper-plugin-utils": "workspace:^",
+    "@babel/plugin-transform-destructuring": "workspace:^"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0-0"
diff --git a/packages/babel-plugin-proposal-explicit-resource-management/src/index.ts b/packages/babel-plugin-proposal-explicit-resource-management/src/index.ts
@@ -1,4 +1,5 @@
 import { declare } from "@babel/helper-plugin-utils";
+import { unshiftForXStatementBody } from "@babel/plugin-transform-destructuring";
 import { types as t, template, traverse } from "@babel/core";
 import type { NodePath, Visitor, PluginPass } from "@babel/core";
 
@@ -51,11 +52,11 @@ export default declare(api => {
       left.kind = "const";
 
       path.ensureBlock();
-      path.node.body.body.unshift(
+      unshiftForXStatementBody(path, [
         t.variableDeclaration("using", [
           t.variableDeclarator(id, t.cloneNode(tmpId)),
         ]),
-      );
+      ]);
     },
     "BlockStatement|StaticBlock"(
       path: NodePath<t.BlockStatement | t.StaticBlock>,
diff --git a/packages/babel-plugin-proposal-explicit-resource-management/test/fixtures/exec-sync/for-head-shadow.js b/packages/babel-plugin-proposal-explicit-resource-management/test/fixtures/exec-sync/for-head-shadow.js
@@ -0,0 +1,9 @@
+let log = [];
+{
+  for (using x of [null]) {
+    const x = undefined;
+    log.push(x);
+  }
+}
+
+expect(log).toEqual([undefined]);
diff --git a/packages/babel-plugin-proposal-explicit-resource-management/test/fixtures/transform-sync/for-head-shadow/input.js b/packages/babel-plugin-proposal-explicit-resource-management/test/fixtures/transform-sync/for-head-shadow/input.js
@@ -0,0 +1,7 @@
+let log = [];
+{
+  for (using x of [null]) {
+    const x = undefined;
+    log.push(x);
+  }
+}
diff --git a/packages/babel-plugin-proposal-explicit-resource-management/test/fixtures/transform-sync/for-head-shadow/output.js b/packages/babel-plugin-proposal-explicit-resource-management/test/fixtures/transform-sync/for-head-shadow/output.js
@@ -0,0 +1,15 @@
+let log = [];
+{
+  for (const _x of [null]) try {
+    var _usingCtx = babelHelpers.usingCtx();
+    const x = _usingCtx.u(_x);
+    {
+      const x = undefined;
+      log.push(x);
+    }
+  } catch (_) {
+    _usingCtx.e = _;
+  } finally {
+    _usingCtx.d();
+  }
+}
diff --git a/packages/babel-plugin-proposal-explicit-resource-management/tsconfig.json b/packages/babel-plugin-proposal-explicit-resource-management/tsconfig.json
@@ -14,6 +14,9 @@
     {
       "path": "../../packages/babel-helper-plugin-utils"
     },
+    {
+      "path": "../../packages/babel-plugin-transform-destructuring"
+    },
     {
       "path": "../../packages/babel-core"
     }
diff --git a/yarn.lock b/yarn.lock
@@ -1470,6 +1470,7 @@ __metadata:
     "@babel/core": "workspace:^"
     "@babel/helper-plugin-test-runner": "workspace:^"
     "@babel/helper-plugin-utils": "workspace:^"
+    "@babel/plugin-transform-destructuring": "workspace:^"
   peerDependencies:
     "@babel/core": ^7.0.0-0
   languageName: unknown

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@`
`14`	`14`	`{`
`15`	`15`	`"path": "../../packages/babel-helper-plugin-utils"`
`16`	`16`	`},`
	`17`	`+ {`
	`18`	`+ "path": "../../packages/babel-plugin-transform-destructuring"`
	`19`	`+ },`
`17`	`20`	`{`
`18`	`21`	`"path": "../../packages/babel-core"`
`19`	`22`	`}`