fix: fix function name reference

Author: pionxzh

package.json

@@ -44,7 +44,7 @@
     }
   },
   "resolutions": {
-    "ast-types": "npm:ast-types-x@1.17.1",
-    "recast": "npm:[email protected].3"
+    "ast-types": "npm:ast-types-x@1.18.0",
+    "recast": "npm:[email protected].5"
   }
 }

packages/ast-utils/package.json

@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@babel/helper-validator-identifier": "^7.24.7",
-    "ast-types": "npm:ast-types-x@1.17.1",
+    "ast-types": "npm:ast-types-x@1.18.0",
     "jscodeshift": "npm:[email protected]"
   },
   "devDependencies": {

packages/ast-utils/src/reference.ts

@@ -171,6 +171,7 @@ export function findReferences(
 ): Collection<Identifier> {
     const targetScope = 'bindings' in nodeOrScope ? nodeOrScope : j(nodeOrScope).get().scope as Scope
     const range = 'bindings' in nodeOrScope ? nodeOrScope.path : nodeOrScope
+    const rangeNode = 'node' in range ? range.node : range
 
     return j(range)
         .find(j.Identifier, { name: identifierName })
@@ -179,6 +180,11 @@ export function findReferences(
             // ignore properties (e.g. in MemberExpression
             if (path.name === 'property' && j.MemberExpression.check(path.parent.node) && !path.parent.node.computed) return false
 
+            // ignore function name that is at the top level
+            if (path.parent.node === rangeNode && j.FunctionDeclaration.check(path.parent.node) && path.parent.node.id === path.node) {
+                return false
+            }
+
             if (!path.scope) return false
 
             let scope: Scope | null = path.scope

packages/shared/package.json

@@ -30,8 +30,8 @@
     "lint:fix": "eslint src --fix --max-warnings=0"
   },
   "dependencies": {
-    "@babel/parser": "^7.25.0",
-    "ast-types": "npm:ast-types-x@1.17.1",
+    "@babel/parser": "^7.25.6",
+    "ast-types": "npm:ast-types-x@1.18.0",
     "jscodeshift": "npm:[email protected]",
     "pathe": "^1.1.2",
     "zod": "^3.23.8"

packages/unminify/package.json

@@ -25,19 +25,19 @@
   },
   "dependencies": {
     "@babel/helper-validator-identifier": "^7.24.7",
-    "@babel/parser": "^7.25.0",
-    "ast-types": "npm:ast-types-x@1.17.1",
+    "@babel/parser": "^7.25.6",
+    "ast-types": "npm:ast-types-x@1.18.0",
     "jscodeshift": "npm:[email protected]",
     "lebab": "^3.2.4",
     "pathe": "^1.1.2",
     "prettier": "^2.8.8",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@babel/core": "^7.24.9",
+    "@babel/core": "^7.25.2",
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@swc/core": "^1.7.2",
+    "@swc/core": "^1.7.22",
     "@types/jscodeshift": "^0.11.11",
     "@types/prettier": "^2.7.3",
     "@types/yargs": "^17.0.32",
@@ -46,7 +46,7 @@
     "@wakaru/shared": "workspace:*",
     "@wakaru/test-utils": "workspace:*",
     "picocolors": "^1.0.1",
-    "rollup": "^4.19.1",
+    "rollup": "^4.21.2",
     "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-swc3": "^0.11.2",
     "typescript": "^5.5.4"

packages/unminify/src/transformations/__tests__/smart-inline.spec.ts

@@ -323,6 +323,25 @@ function foo() {
 `,
 )
 
+inlineTest('property destructuring - resolve naming conflicts #4',
+  `
+function J(U) {
+  const B = U.children;
+  const G = U.className;
+  const J = U.description;
+}
+`,
+  `
+function J(U) {
+  const {
+    children,
+    className,
+    description
+  } = U;
+}
+`,
+)
+
 inlineTest('array destructuring',
   `
 const t = e[0];

packages/unpacker/package.json

@@ -25,21 +25,21 @@
   },
   "dependencies": {
     "@babel/helper-validator-identifier": "^7.24.7",
-    "@babel/parser": "^7.25.0",
-    "ast-types": "npm:ast-types-x@1.17.1",
+    "@babel/parser": "^7.25.6",
+    "ast-types": "npm:ast-types-x@1.18.0",
     "jscodeshift": "npm:[email protected]",
     "pathe": "^1.1.2",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@swc/core": "^1.7.2",
+    "@swc/core": "^1.7.22",
     "@types/jscodeshift": "^0.11.11",
     "@wakaru/ast-utils": "workspace:*",
     "@wakaru/shared": "workspace:*",
     "@wakaru/test-utils": "workspace:*",
-    "rollup": "^4.18.1",
+    "rollup": "^4.21.2",
     "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-swc3": "^0.11.2",
     "typescript": "^5.5.4"