feat: avoid meaningless circular dependency in watch

zcf0508 · Mar 13, 2024 · 93c0b20 · 93c0b20
1 parent 6577f3f
commit 93c0b20
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/analyze/options.ts b/src/analyze/options.ts
@@ -527,7 +527,7 @@ export function analyze(
                   traverse(path1.node.value, {
                     MemberExpression(path2) {
                       if (path2.node.object.type === 'ThisExpression' && path2.node.property.type === 'Identifier') {
-                        if (watchArg) {
+                        if (watchArg && watchArg.name !== path2.node.property.name) {
                           graph.edges.get(watchArg.name)?.add(path2.node.property.name);
                         }
                       }

diff --git a/src/analyze/setupScript.ts b/src/analyze/setupScript.ts
@@ -605,8 +605,11 @@ export function processSetup(
                 || parentScope === binding?.scope)
               ) {
                 if (['watch', 'useEffect'].includes(hookName) && watchArgs.size > 0) {
+                  const watchArgsNames = Array.from(watchArgs).map(arg => arg.name);
                   watchArgs.forEach((watchArg) => {
-                    graph.edges.get(watchArg.name)?.add(path1.node.name);
+                    if (!watchArgsNames.includes(path1.node.name)) {
+                      graph.edges.get(watchArg.name)?.add(path1.node.name);
+                    }
                   });
                 }
                 const _node = nodeCollection.getNode(path1.node.name);