vue-hook-optimizer 0.0.45 → 0.0.47

package/dist/index.js

@@ -550,8 +550,11 @@ function processSetup(ast, parentScope, parentPath, _spread, _lineOffset = 0) {
               const binding = path1.scope.getBinding(path1.node.name);
               if (graph.nodes.has(path1.node.name) && (path1.parent.type !== "MemberExpression" && path1.parent.type !== "OptionalMemberExpression" || path1.parent.object === path1.node) && (binding?.scope.block.type === "Program" || 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);
@@ -947,7 +950,7 @@ function analyze3(content, lineOffset = 0, jsx = false) {
             if (hookName === "watch" && path1.node.value.type === "ObjectExpression") {
               path1.node.value.properties.forEach((prop) => {
                 if ((prop.type === "ObjectProperty" || prop.type === "ObjectMethod") && (prop.key.type === "Identifier" || prop.key.type === "StringLiteral")) {
-                  const keyName = prop.key.type === "Identifier" ? prop.key.name : prop.key.type === "StringLiteral" ? prop.key.value : "";
+                  const keyName = prop.key.type === "Identifier" ? prop.key.name : prop.key.type === "StringLiteral" ? prop.key.value.split(".")[0] : "";
                   const watchArg = tNodes.get(keyName);
                   const _node = nodeCollection.getNode(keyName);
                   if (_node?.info?.used) {
@@ -961,7 +964,7 @@ function analyze3(content, lineOffset = 0, jsx = false) {
                   traverse3(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);
                         }
                       }
@@ -2055,7 +2058,7 @@ function gen(graph, usedNodes) {
       suggestions.push({
         type: "error" /* error */,
         message: `There is a loop call in nodes [${hasCycleResult.cycleNodes.map((node) => node.label).join(",")}], perhaps you can refactor it.`,
-        nodeInfo: nodes
+        nodeInfo: hasCycleResult.cycleNodes
       });
     }
     const paths = findLinearPaths(g);