vue-hook-optimizer 0.0.9 → 0.0.10

package/dist/index.js

@@ -48,8 +48,8 @@ var require_virtual_types = __commonJS({
     exports.Statement = Statement;
     var Expression = ["Expression"];
     exports.Expression = Expression;
-    var Scope2 = ["Scopable", "Pattern"];
-    exports.Scope = Scope2;
+    var Scope3 = ["Scopable", "Pattern"];
+    exports.Scope = Scope3;
     var Referenced = null;
     exports.Referenced = Referenced;
     var BlockScoped = null;
@@ -18062,7 +18062,7 @@ var require_scope = __commonJS({
       }
     };
     var uid = 0;
-    var Scope2 = class _Scope {
+    var Scope3 = class _Scope {
       constructor(path2) {
         this.uid = void 0;
         this.path = void 0;
@@ -18697,9 +18697,9 @@ var require_scope = __commonJS({
         } while (scope = scope.parent);
       }
     };
-    exports.default = Scope2;
-    Scope2.globals = Object.keys(_globals.builtin);
-    Scope2.contextVariables = ["arguments", "undefined", "Infinity", "NaN"];
+    exports.default = Scope3;
+    Scope3.globals = Object.keys(_globals.builtin);
+    Scope3.contextVariables = ["arguments", "undefined", "Infinity", "NaN"];
   }
 });
 
@@ -29011,7 +29011,7 @@ var require_lib9 = __commonJS({
     var CLASS_ELEMENT_INSTANCE_GETTER2 = CLASS_ELEMENT_KIND_GETTER2;
     var CLASS_ELEMENT_INSTANCE_SETTER2 = CLASS_ELEMENT_KIND_SETTER2;
     var CLASS_ELEMENT_OTHER2 = 0;
-    var Scope2 = class {
+    var Scope3 = class {
       constructor(flags) {
         this.var = /* @__PURE__ */ new Set();
         this.lexical = /* @__PURE__ */ new Set();
@@ -29067,7 +29067,7 @@ var require_lib9 = __commonJS({
         return this.treatFunctionsAsVarInScope(this.currentScope());
       }
       createScope(flags) {
-        return new Scope2(flags);
+        return new Scope3(flags);
       }
       enter(flags) {
         this.scopeStack.push(this.createScope(flags));
@@ -29162,7 +29162,7 @@ var require_lib9 = __commonJS({
         }
       }
     };
-    var FlowScope2 = class extends Scope2 {
+    var FlowScope2 = class extends Scope3 {
       constructor(...args) {
         super(...args);
         this.declareFunctions = /* @__PURE__ */ new Set();
@@ -34668,7 +34668,7 @@ var require_lib9 = __commonJS({
         }
       }
     };
-    var TypeScriptScope2 = class extends Scope2 {
+    var TypeScriptScope2 = class extends Scope3 {
       constructor(...args) {
         super(...args);
         this.types = /* @__PURE__ */ new Set();
@@ -86277,13 +86277,7 @@ var traverse2 = (
   //@ts-ignore
   import_traverse2.default.default?.default || import_traverse2.default.default || import_traverse2.default
 );
-function analyze2(content) {
-  const ast = parse_1$1(content, {
-    sourceType: "module",
-    plugins: [
-      "typescript"
-    ]
-  });
+function processSetup(ast, parentScope, parentPath) {
   const graph = {
     nodes: /* @__PURE__ */ new Set(),
     edges: /* @__PURE__ */ new Map()
@@ -86296,7 +86290,7 @@ function analyze2(content) {
             if (element?.type === "Identifier") {
               const name = element.name;
               const binding2 = path2.scope.getBinding(name);
-              if (binding2 && path2.parent.type === "Program" && !(declaration2.init?.type === "CallExpression" && declaration2.init?.callee.type === "Identifier" && ["defineProps", "defineEmits"].includes(declaration2.init?.callee.name))) {
+              if (binding2 && (path2.parent.type === "Program" || parentPath?.type === "ObjectMethod" && parentPath.body === path2.parent) && !(declaration2.init?.type === "CallExpression" && declaration2.init?.callee.type === "Identifier" && ["defineProps", "defineEmits"].includes(declaration2.init?.callee.name))) {
                 graph.nodes.add(name);
                 if (!graph.edges.get(name)) {
                   graph.edges.set(name, /* @__PURE__ */ new Set());
@@ -86310,7 +86304,7 @@ function analyze2(content) {
             if (property.type === "ObjectProperty" && property.value.type === "Identifier") {
               const name = property.value.name;
               const binding2 = path2.scope.getBinding(name);
-              if (binding2 && path2.parent.type === "Program" && !(declaration2.init?.type === "CallExpression" && declaration2.init?.callee.type === "Identifier" && ["defineProps", "defineEmits"].includes(declaration2.init?.callee.name))) {
+              if (binding2 && (path2.parent.type === "Program" || parentPath?.type === "ObjectMethod" && parentPath.body === path2.parent) && !(declaration2.init?.type === "CallExpression" && declaration2.init?.callee.type === "Identifier" && ["defineProps", "defineEmits"].includes(declaration2.init?.callee.name))) {
                 graph.nodes.add(name);
                 if (!graph.edges.get(name)) {
                   graph.edges.set(name, /* @__PURE__ */ new Set());
@@ -86322,7 +86316,7 @@ function analyze2(content) {
         if (declaration2.id?.type === "Identifier") {
           const name = declaration2.id.name;
           const binding2 = path2.scope.getBinding(name);
-          if (binding2 && path2.parent.type === "Program" && !(declaration2.init?.type === "CallExpression" && declaration2.init?.callee.type === "Identifier" && ["defineProps", "defineEmits"].includes(declaration2.init?.callee.name))) {
+          if (binding2 && (path2.parent.type === "Program" || parentPath?.type === "ObjectMethod" && parentPath.body === path2.parent) && !(declaration2.init?.type === "CallExpression" && declaration2.init?.callee.type === "Identifier" && ["defineProps", "defineEmits"].includes(declaration2.init?.callee.name))) {
             graph.nodes.add(name);
             if (!graph.edges.get(name)) {
               graph.edges.set(name, /* @__PURE__ */ new Set());
@@ -86335,7 +86329,7 @@ function analyze2(content) {
       const name = path2.node.id?.name;
       if (name) {
         const binding2 = path2.scope.getBinding(name);
-        if (binding2 && path2.parent.type === "Program") {
+        if (binding2 && (path2.parent.type === "Program" || parentPath?.type === "ObjectMethod" && parentPath.body === path2.parent)) {
           graph.nodes.add(name);
           if (!graph.edges.get(name)) {
             graph.edges.set(name, /* @__PURE__ */ new Set());
@@ -86343,7 +86337,7 @@ function analyze2(content) {
         }
       }
     }
-  });
+  }, parentScope, parentPath);
   traverse2(ast, {
     FunctionDeclaration(path2) {
       const name = path2.node.id?.name;
@@ -86351,7 +86345,7 @@ function analyze2(content) {
         path2.traverse({
           Identifier(path1) {
             const binding2 = path1.scope.getBinding(path1.node.name);
-            if (graph.nodes.has(path1.node.name) && path1.node.name !== name && binding2?.scope.block.type === "Program") {
+            if (graph.nodes.has(path1.node.name) && path1.node.name !== name && (binding2?.scope.block.type === "Program" || parentScope === binding2?.scope)) {
               graph.edges.get(name)?.add(path1.node.name);
             }
           }
@@ -86368,7 +86362,7 @@ function analyze2(content) {
                 traverse2(path2.node.init, {
                   Identifier(path1) {
                     const binding2 = path1.scope.getBinding(path1.node.name);
-                    if (graph.nodes.has(path1.node.name) && path1.node.name !== name && binding2?.scope.block.type === "Program") {
+                    if (graph.nodes.has(path1.node.name) && path1.node.name !== name && (binding2?.scope.block.type === "Program" || parentScope === binding2?.scope)) {
                       graph.edges.get(name)?.add(path1.node.name);
                     }
                   }
@@ -86385,7 +86379,7 @@ function analyze2(content) {
                 traverse2(path2.node.init, {
                   Identifier(path1) {
                     const binding2 = path1.scope.getBinding(path1.node.name);
-                    if (graph.nodes.has(path1.node.name) && path1.node.name !== name && binding2?.scope.block.type === "Program") {
+                    if (graph.nodes.has(path1.node.name) && path1.node.name !== name && (binding2?.scope.block.type === "Program" || parentScope === binding2?.scope)) {
                       graph.edges.get(name)?.add(path1.node.name);
                     }
                   }
@@ -86404,7 +86398,7 @@ function analyze2(content) {
             traverse2(path2.node.init, {
               Identifier(path1) {
                 const binding2 = path1.scope.getBinding(path1.node.name);
-                if (graph.nodes.has(path1.node.name) && path1.node.name !== name && binding2?.scope.block.type === "Program") {
+                if (graph.nodes.has(path1.node.name) && path1.node.name !== name && (binding2?.scope.block.type === "Program" || parentScope === binding2?.scope)) {
                   graph.edges.get(name)?.add(path1.node.name);
                 }
               }
@@ -86413,9 +86407,18 @@ function analyze2(content) {
         }
       }
     }
-  });
+  }, parentScope, parentPath);
   return graph;
 }
+function analyze2(content) {
+  const ast = parse_1$1(content, {
+    sourceType: "module",
+    plugins: [
+      "typescript"
+    ]
+  });
+  return processSetup(ast);
+}
 
 // src/analyze/options.ts
 var import_traverse3 = __toESM(require_lib13());
@@ -86476,68 +86479,10 @@ function analyze3(content) {
         if (path2.node.declaration.type === "ObjectExpression" && path1.parent === path2.node.declaration || path2.node.declaration.type === "CallExpression" && path1.parent === path2.node.declaration.arguments[0]) {
           if (path1.node.key.type === "Identifier" && path1.node.key.name === "setup") {
             const setupNode = path1.node;
-            const tempNodes = /* @__PURE__ */ new Set();
-            const tempEdges = /* @__PURE__ */ new Map();
-            traverse3(setupNode, {
-              VariableDeclaration(path22) {
-                path22.node.declarations.forEach((declaration2) => {
-                  if (declaration2.id?.type === "Identifier") {
-                    const name = declaration2.id.name;
-                    if (path22.parent == setupNode.body) {
-                      tempNodes.add(name);
-                      if (!tempEdges.get(name)) {
-                        tempEdges.set(name, /* @__PURE__ */ new Set());
-                      }
-                    }
-                  }
-                });
-              },
-              FunctionDeclaration(path22) {
-                const name = path22.node.id?.name;
-                if (name) {
-                  if (path22.parent == setupNode.body) {
-                    tempNodes.add(name);
-                    if (!tempEdges.get(name)) {
-                      tempEdges.set(name, /* @__PURE__ */ new Set());
-                    }
-                  }
-                }
-              }
-            }, path1.scope, path1);
-            traverse3(setupNode, {
-              FunctionDeclaration(path3) {
-                const name = path3.node.id?.name;
-                if (name && tempNodes.has(name)) {
-                  path3.traverse({
-                    Identifier(path4) {
-                      if (tempNodes.has(path4.node.name) && path4.node.name !== name) {
-                        tempEdges.get(name)?.add(path4.node.name);
-                      }
-                    }
-                  });
-                }
-              },
-              VariableDeclarator(path3) {
-                if (path3.node.init) {
-                  if ([
-                    "CallExpression",
-                    "ArrowFunctionExpression",
-                    "FunctionDeclaration"
-                  ].includes(path3.node.init.type) && path3.node.id.type === "Identifier") {
-                    const name = path3.node.id?.name;
-                    if (name && tempNodes.has(name)) {
-                      path3.traverse({
-                        Identifier(path4) {
-                          if (tempNodes.has(path4.node.name) && path4.node.name !== name) {
-                            tempEdges.get(name)?.add(path4.node.name);
-                          }
-                        }
-                      });
-                    }
-                  }
-                }
-              }
-            }, path1.scope, path1);
+            const {
+              nodes: tempNodes,
+              edges: tempEdges
+            } = processSetup(setupNode, path1.scope, setupNode);
             traverse3(setupNode, {
               ReturnStatement(path22) {
                 if (path22.node.argument?.type === "ObjectExpression") {