fix: conflict detection of unreferenced binding and assignments

j4k0xb · Feb 17, 2024 · c8f4452 · c8f4452
1 parent 270d05a
commit c8f4452
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/packages/webcrack/src/ast-utils/rename.ts b/packages/webcrack/src/ast-utils/rename.ts
@@ -62,9 +62,10 @@ export function renameFast(binding: Binding, newName: string): void {
  */
 export function renameCarefully(binding: Binding, newName: string): void {
   const hasConflicts = () =>
-    binding.referencePaths.some((referencePath) =>
-      referencePath.scope.hasBinding(newName),
-    );
+    binding.scope.hasBinding(newName) ||
+    binding.referencePaths.some((ref) => ref.scope.hasBinding(newName)) ||
+    binding.constantViolations.some((ref) => ref.scope.hasBinding(newName));
+
   if (!t.isValidIdentifier(newName) || hasConflicts()) {
     newName = binding.scope.generateUid(newName);
   }

diff --git a/packages/webcrack/src/unminify/test/rename-destructuring.test.ts b/packages/webcrack/src/unminify/test/rename-destructuring.test.ts
@@ -24,30 +24,32 @@ test('rename object destructuring', () =>
 test('rename object destructuring with conflict', () =>
   expectJS(`
     const gql = 1;
+    const {
+      gql: t,
+      dispatchers: o,
+      listener: i
+    } = n;
 
     function foo({
       gql: t,
       dispatchers: o,
       listener: i
-    }, {
-      gql: a,
-      dispatchers: b,
-      listener: c
     }) {
-      o.delete(t, i, a, b, c);
+      o.delete(t, i);
     }
   `).toMatchInlineSnapshot(`
     const gql = 1;
-    function foo({
+    const {
       gql: _gql,
       dispatchers,
       listener
-    }, {
+    } = n;
+    function foo({
       gql: _gql2,
       dispatchers: _dispatchers,
       listener: _listener
     }) {
-      dispatchers.delete(_gql, listener, _gql2, _dispatchers, _listener);
+      _dispatchers.delete(_gql2, _listener);
     }
   `));