vue-hook-optimizer 0.0.56 → 0.0.58

package/dist/index.js

@@ -73,7 +73,9 @@ function analyze(content) {
       if (path.node.key.type === "Identifier" && path.node.key.name === "ref") {
         if (path.node.value.type === "StringLiteral") {
           const name = path.node.value.value;
-          name && nodes.add(name);
+          if (name) {
+            nodes.add(name);
+          }
         }
       }
     },
@@ -82,7 +84,9 @@ function analyze(content) {
       if (path.node.callee.type === "Identifier" && path.node.callee.name === "_resolveComponent") {
         if (path.node.arguments[0].type === "StringLiteral") {
           const name = path.node.arguments[0].value;
-          name && nodes.add(name);
+          if (name) {
+            nodes.add(name);
+          }
         }
       }
     }
@@ -182,7 +186,7 @@ function getComment(node) {
       return;
     }
     if (_comment.value.trim().startsWith("*")) {
-      comment += `${_comment.value.trim().replace(/^[\s]*\*+[\s]*\**/gm, "").trim()}
+      comment += `${_comment.value.trim().replace(/^\s*\*+\s*\**/gm, "").trim()}
 `;
     }
   });
@@ -191,7 +195,7 @@ function getComment(node) {
       return;
     }
     if (_comment.value.trim().startsWith("*")) {
-      comment += `${_comment.value.trim().replace(/^[\s]*\*+[\s]*\**/gm, "").trim()}
+      comment += `${_comment.value.trim().replace(/^\s*\*+\s*\**/gm, "").trim()}
 `;
     } else {
       comment += `${_comment.value.trim()}
@@ -2018,23 +2022,69 @@ function noIndegreeFilter(graph) {
 function findLinearPaths(graph) {
   const linearPaths = [];
   const visitedNodes = /* @__PURE__ */ new Set();
+  const nodeInDegrees = /* @__PURE__ */ new Map();
   for (const [node, edges] of graph.entries()) {
-    if (edges.size === 1 && !visitedNodes.has(node) && node.type === "fun" /* fun */) {
-      const path = [node];
-      let nextNode = Array.from(edges)[0];
-      visitedNodes.add(node);
-      while (graph.get(nextNode)?.size === 1) {
-        if (visitedNodes.has(nextNode)) {
+    for (const edge of edges) {
+      const inDegree = nodeInDegrees.get(edge) || 0;
+      nodeInDegrees.set(edge, inDegree + 1);
+    }
+  }
+  function dfs2(node, path) {
+    if (visitedNodes.has(node)) {
+      return;
+    }
+    path.push(node);
+    visitedNodes.add(node);
+    const edges = graph.get(node) || /* @__PURE__ */ new Set();
+    if (edges.size === 0 || edges.size > 1) {
+      if (path.length > 1) {
+        addOrUpdatePath([...path]);
+      }
+    } else {
+      const nextNode = Array.from(edges)[0];
+      const nextNodeInDegree = nodeInDegrees.get(nextNode) || 0;
+      if (nextNodeInDegree === 1) {
+        dfs2(nextNode, path);
+      }
+    }
+    path.pop();
+    visitedNodes.delete(node);
+  }
+  function addOrUpdatePath(newPath) {
+    let shouldAddNewPath = true;
+    for (let i = linearPaths.length - 1; i >= 0; i--) {
+      const existingPath = linearPaths[i];
+      if (isSubpath(existingPath, newPath)) {
+        linearPaths.splice(i, 1);
+      } else if (isSubpath(newPath, existingPath)) {
+        shouldAddNewPath = false;
+        break;
+      }
+    }
+    if (shouldAddNewPath && newPath.length > 2) {
+      linearPaths.push(newPath);
+    }
+  }
+  function isSubpath(shortPath, longPath) {
+    if (shortPath.length >= longPath.length) {
+      return false;
+    }
+    for (let i = 0; i <= longPath.length - shortPath.length; i++) {
+      let isSub = true;
+      for (let j = 0; j < shortPath.length; j++) {
+        if (shortPath[j] !== longPath[i + j]) {
+          isSub = false;
           break;
         }
-        path.push(nextNode);
-        visitedNodes.add(nextNode);
-        nextNode = Array.from(graph.get(nextNode))[0];
       }
-      if (path.length > 1) {
-        linearPaths.push(path);
+      if (isSub) {
+        return true;
       }
     }
+    return false;
+  }
+  for (const node of graph.keys()) {
+    dfs2(node, []);
   }
   return linearPaths;
 }