vue-hook-optimizer 0.0.22 → 0.0.24

package/dist/index.d.mts

@@ -1,23 +1,27 @@
 export { parse } from '@vue/compiler-sfc';
-import * as vis_network from 'vis-network';
+import { Edge, Node } from 'vis-network';
 
 declare function analyze$2(content: string): Set<string>;
 
 type TypedNode = {
     label: string;
     type: NodeType;
+    info?: Partial<{
+        line: number;
+        column: number;
+    }>;
 };
 declare enum NodeType {
     var = "var",
     fun = "fun"
 }
 
-declare function analyze$1(content: string): {
+declare function analyze$1(content: string, lineOffset?: number): {
     nodes: Set<TypedNode>;
     edges: Map<TypedNode, Set<TypedNode>>;
 };
 
-declare function analyze(content: string): {
+declare function analyze(content: string, lineOffset?: number): {
     nodes: Set<TypedNode>;
     edges: Map<TypedNode, Set<TypedNode>>;
 };
@@ -36,12 +40,15 @@ declare function gen(graph: {
     edges: Map<TypedNode, Set<TypedNode>>;
 }, usedNodes: Set<string>): Suggestion[];
 
+type CustomNode = Node & {
+    info: TypedNode['info'];
+};
 declare function getVisData(graph: {
     nodes: Set<TypedNode>;
     edges: Map<TypedNode, Set<TypedNode>>;
 }, usedNodes: Set<string>): {
-    nodes: vis_network.Node[];
-    edges: vis_network.Edge[];
+    nodes: CustomNode[];
+    edges: Edge[];
 };
 
 export { NodeType, Suggestion, SuggestionType, TypedNode, analyze as analyzeOptions, analyze$1 as analyzeSetupScript, analyze$2 as analyzeTemplate, gen, getVisData };

package/dist/index.d.ts

@@ -1,23 +1,27 @@
 export { parse } from '@vue/compiler-sfc';
-import * as vis_network from 'vis-network';
+import { Edge, Node } from 'vis-network';
 
 declare function analyze$2(content: string): Set<string>;
 
 type TypedNode = {
     label: string;
     type: NodeType;
+    info?: Partial<{
+        line: number;
+        column: number;
+    }>;
 };
 declare enum NodeType {
     var = "var",
     fun = "fun"
 }
 
-declare function analyze$1(content: string): {
+declare function analyze$1(content: string, lineOffset?: number): {
     nodes: Set<TypedNode>;
     edges: Map<TypedNode, Set<TypedNode>>;
 };
 
-declare function analyze(content: string): {
+declare function analyze(content: string, lineOffset?: number): {
     nodes: Set<TypedNode>;
     edges: Map<TypedNode, Set<TypedNode>>;
 };
@@ -36,12 +40,15 @@ declare function gen(graph: {
     edges: Map<TypedNode, Set<TypedNode>>;
 }, usedNodes: Set<string>): Suggestion[];
 
+type CustomNode = Node & {
+    info: TypedNode['info'];
+};
 declare function getVisData(graph: {
     nodes: Set<TypedNode>;
     edges: Map<TypedNode, Set<TypedNode>>;
 }, usedNodes: Set<string>): {
-    nodes: vis_network.Node[];
-    edges: vis_network.Edge[];
+    nodes: CustomNode[];
+    edges: Edge[];
 };
 
 export { NodeType, Suggestion, SuggestionType, TypedNode, analyze as analyzeOptions, analyze$1 as analyzeSetupScript, analyze$2 as analyzeTemplate, gen, getVisData };

package/dist/index.js

@@ -86284,30 +86284,45 @@ var NodeType = /* @__PURE__ */ ((NodeType3) => {
   return NodeType3;
 })(NodeType || {});
 var NodeCollection = class {
+  lineOffset = 0;
+  constructor(_lineOffset = 0) {
+    this.lineOffset = _lineOffset;
+  }
   nodes = /* @__PURE__ */ new Map();
-  addNode(label, node2, options = { isComputed: false }) {
+  addNode(label, node2, options = { isComputed: false, isMethod: false }) {
     if (this.nodes.has(label)) {
       return;
     }
     if (!options.isComputed && (node2.type === "VariableDeclarator" && [
       "ArrowFunctionExpression",
       "FunctionDeclaration"
-    ].includes(node2.init?.type || "") || node2.type === "FunctionDeclaration" || node2.type === "ObjectMethod")) {
+    ].includes(node2.init?.type || "") || node2.type === "FunctionDeclaration" || node2.type === "ObjectMethod") || options.isMethod) {
       this.nodes.set(label, {
         label,
-        type: "fun" /* fun */
+        type: "fun" /* fun */,
+        info: {
+          line: (node2.loc?.start.line || 1) - 1 + this.lineOffset,
+          column: node2.loc?.start.column || 0
+        }
       });
     } else {
       this.nodes.set(label, {
         label,
-        type: "var" /* var */
+        type: "var" /* var */,
+        info: {
+          line: (node2.loc?.start.line || 1) - 1 + this.lineOffset,
+          column: node2.loc?.start.column || 0
+        }
       });
     }
   }
   addTypedNode(label, node2) {
     this.nodes.set(label, {
       label,
-      type: node2.type
+      type: node2.type,
+      info: {
+        ...node2.info || {}
+      }
     });
   }
   map(graph) {
@@ -86331,9 +86346,9 @@ var traverse2 = (
   //@ts-ignore
   import_traverse2.default.default?.default || import_traverse2.default.default || import_traverse2.default
 );
-function processSetup(ast, parentScope, parentPath, _spread) {
+function processSetup(ast, parentScope, parentPath, _spread, _lineOffset = 0) {
   const spread = _spread || [];
-  const nodeCollection = new NodeCollection();
+  const nodeCollection = new NodeCollection(_lineOffset);
   const graph = {
     nodes: /* @__PURE__ */ new Set(),
     edges: /* @__PURE__ */ new Map(),
@@ -86349,7 +86364,18 @@ function processSetup(ast, parentScope, parentPath, _spread) {
               const binding2 = path2.scope.getBinding(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);
-                nodeCollection.addNode(name, declaration2);
+                nodeCollection.addNode(name, element);
+                if (!graph.edges.get(name)) {
+                  graph.edges.set(name, /* @__PURE__ */ new Set());
+                }
+              }
+            }
+            if (element?.type === "RestElement" && element.argument.type === "Identifier") {
+              const name = element.argument.name;
+              const binding2 = path2.scope.getBinding(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);
+                nodeCollection.addNode(name, element.argument);
                 if (!graph.edges.get(name)) {
                   graph.edges.set(name, /* @__PURE__ */ new Set());
                 }
@@ -86364,7 +86390,18 @@ function processSetup(ast, parentScope, parentPath, _spread) {
               const binding2 = path2.scope.getBinding(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);
-                nodeCollection.addNode(name, declaration2);
+                nodeCollection.addNode(name, property.value);
+                if (!graph.edges.get(name)) {
+                  graph.edges.set(name, /* @__PURE__ */ new Set());
+                }
+              }
+            }
+            if (property.type === "RestElement" && property.argument.type === "Identifier") {
+              const name = property.argument.name;
+              const binding2 = path2.scope.getBinding(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);
+                nodeCollection.addNode(name, property.argument);
                 if (!graph.edges.get(name)) {
                   graph.edges.set(name, /* @__PURE__ */ new Set());
                 }
@@ -86434,7 +86471,7 @@ function processSetup(ast, parentScope, parentPath, _spread) {
         const binding2 = path2.scope.getBinding(name);
         if (binding2 && (path2.parent.type === "Program" || parentPath?.type === "ObjectMethod" && parentPath.body === path2.parent)) {
           graph.nodes.add(name);
-          nodeCollection.addNode(name, path2.node);
+          nodeCollection.addNode(name, path2.node.id, { isMethod: true });
           if (!graph.edges.get(name)) {
             graph.edges.set(name, /* @__PURE__ */ new Set());
           }
@@ -86568,14 +86605,14 @@ function processSetup(ast, parentScope, parentPath, _spread) {
     nodeCollection
   };
 }
-function analyze2(content) {
+function analyze2(content, lineOffset = 0) {
   const ast = parse_1$1(content, {
     sourceType: "module",
     plugins: [
       "typescript"
     ]
   });
-  const { graph, nodeCollection } = processSetup(ast);
+  const { graph, nodeCollection } = processSetup(ast, void 0, void 0, void 0, lineOffset);
   return nodeCollection.map(graph);
 }
 
@@ -86585,14 +86622,14 @@ var traverse3 = (
   //@ts-ignore
   import_traverse3.default.default?.default || import_traverse3.default.default || import_traverse3.default
 );
-function analyze3(content) {
+function analyze3(content, lineOffset = 0) {
   const ast = parse_1$1(content, {
     sourceType: "module",
     plugins: [
       "typescript"
     ]
   });
-  const nodeCollection = new NodeCollection();
+  const nodeCollection = new NodeCollection(lineOffset);
   const graph = {
     nodes: /* @__PURE__ */ new Set(),
     edges: /* @__PURE__ */ new Map()
@@ -86601,6 +86638,29 @@ function analyze3(content) {
     traverse3(node2, {
       ObjectProperty(path1) {
         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 === "data" && path1.node.value.type === "ArrowFunctionExpression") {
+            const dataNode = path1.node.value;
+            traverse3(dataNode, {
+              ReturnStatement(path22) {
+                if (path22.parent == dataNode.body) {
+                  if (path22.node.argument?.type === "ObjectExpression") {
+                    path22.node.argument.properties.forEach((prop) => {
+                      if (prop.type === "ObjectProperty") {
+                        if (prop.key.type === "Identifier") {
+                          const name = prop.key.name;
+                          graph.nodes.add(name);
+                          nodeCollection.addNode(name, prop);
+                          if (!graph.edges.get(name)) {
+                            graph.edges.set(name, /* @__PURE__ */ new Set());
+                          }
+                        }
+                      }
+                    });
+                  }
+                }
+              }
+            }, path1.scope, path1);
+          }
           if (path1.node.key.type === "Identifier" && path1.node.key.name === "computed") {
             const computedNode = path1.node;
             if (computedNode.value.type === "ObjectExpression") {
@@ -86624,11 +86684,11 @@ function analyze3(content) {
             const methodsNode = path1.node;
             if (methodsNode.value.type === "ObjectExpression") {
               methodsNode.value.properties.forEach((prop) => {
-                if (prop.type === "ObjectMethod") {
+                if (prop.type === "ObjectProperty" || prop.type === "ObjectMethod") {
                   if (prop.key.type === "Identifier") {
                     const name = prop.key.name;
                     graph.nodes.add(name);
-                    nodeCollection.addNode(name, prop);
+                    nodeCollection.addNode(name, prop, { isMethod: true });
                     if (!graph.edges.get(name)) {
                       graph.edges.set(name, /* @__PURE__ */ new Set());
                     }
@@ -86667,7 +86727,7 @@ function analyze3(content) {
                 spread: tempSpread
               },
               nodeCollection: tempNodeCollection
-            } = processSetup(setupNode, path1.scope, setupNode, spread);
+            } = processSetup(setupNode, path1.scope, setupNode, spread, lineOffset);
             traverse3(setupNode, {
               ReturnStatement(path22) {
                 if (path22.node.argument?.type === "ObjectExpression") {
@@ -87067,7 +87127,8 @@ function getVisData(graph, usedNodes) {
       id: node2.label,
       label: node2.label,
       shape: node2.type === "var" ? "dot" : "diamond",
-      group: usedNodes.has(node2.label) ? "used" : "normal"
+      group: usedNodes.has(node2.label) ? "used" : "normal",
+      info: node2.info
     });
   });
   graph.edges.forEach((edge, key) => {