fix: skip computed key when renaming (#16756)

* fix * review
babel · Aug 21, 2024 · 2b289fb · 2b289fb
1 parent 575863c
commit 2b289fb
Show file tree

Hide file tree

Showing 2 changed files with 101 additions and 3 deletions.
diff --git a/packages/babel-traverse/src/scope/lib/renamer.ts b/packages/babel-traverse/src/scope/lib/renamer.ts
@@ -162,15 +162,32 @@ export default class Renamer {
     const blockToTraverse = process.env.BABEL_8_BREAKING
       ? scope.block
       : (arguments[0] as t.Pattern | t.Scopable) || scope.block;
+
+    // When blockToTraverse is a SwitchStatement, the discriminant
+    // is not part of the current scope and thus should be skipped.
+
+    // const foo = {
+    //   get [x]() {
+    //     return x;
+    //   },
+    // };
+    const skipKeys: Record<string, true> = { discriminant: true };
+    if (t.isMethod(blockToTraverse)) {
+      if (blockToTraverse.computed) {
+        skipKeys.key = true;
+      }
+      if (!t.isObjectMethod(blockToTraverse)) {
+        skipKeys.decorators = true;
+      }
+    }
+
     traverseNode(
       blockToTraverse,
       explode(renameVisitor),
       scope,
       this,
       scope.path,
-      // When blockToTraverse is a SwitchStatement, the discriminant
-      // is not part of the current scope and thus should be skipped.
-      { discriminant: true },
+      skipKeys,
     );
 
     if (process.env.BABEL_8_BREAKING) {

diff --git a/packages/babel-traverse/test/scope.js b/packages/babel-traverse/test/scope.js
@@ -1137,6 +1137,87 @@ describe("scope", () => {
         }"
       `);
     });
+
+    it(`computed key should not be renamed`, () => {
+      const program = getPath(`
+        let x = 1
+        const foo = {
+          get [x]() {
+            return x
+          },
+        }`);
+      program.traverse({
+        Function(path) {
+          const bodyPath = path.get("body");
+          // create a declaration that shadows parent variable
+          bodyPath.scope.push({
+            id: t.identifier("x"),
+            kind: "const",
+            init: t.nullLiteral(),
+          });
+          // rename the new "local" declaration
+          bodyPath.scope.rename("x", "y");
+        },
+      });
+      expect(program + "").toMatchInlineSnapshot(`
+        "let x = 1;
+        const foo = {
+          get [x]() {
+            const y = null;
+            return y;
+          }
+        };"
+      `);
+    });
+
+    it(`decorators should not be renamed`, () => {
+      const program = getPath(
+        `
+        let x;
+        class Foo {
+          @x
+          [x]() {
+            return x;
+          }
+          @x
+          #method() {
+            return x;
+          }
+        }`,
+        {
+          plugins: [["decorators"]],
+        },
+      );
+
+      program.traverse({
+        Function(path) {
+          const bodyPath = path.get("body");
+          // create a declaration that shadows parent variable
+          bodyPath.scope.push({
+            id: t.identifier("x"),
+            kind: "const",
+            init: t.nullLiteral(),
+          });
+          // rename the new "local" declaration
+          bodyPath.scope.rename("x", "y");
+        },
+      });
+      expect(program + "").toMatchInlineSnapshot(`
+        "let x;
+        class Foo {
+          @x
+          [x]() {
+            const y = null;
+            return y;
+          }
+          @x
+          #method() {
+            const y = null;
+            return y;
+          }
+        }"
+      `);
+    });
   });
 
   describe("constantViolations", () => {