easy-dep-graph 1.1.0 → 1.1.2

package/bin/index.js

@@ -5,6 +5,7 @@ import fastify from "fastify";
 import open from "open";
 import fs from "node:fs";
 import path from "node:path";
+import semver from "semver";
 let flatDeps;
 void (async function main() {
     // Check if peer dependencies mode
@@ -55,11 +56,24 @@ void (async function main() {
         name: packageInfo.name,
         applyForceLayout: shouldApplyForceLayout,
         nodes: JSON.stringify(nodeEntries.map((dep, index) => {
+            let x, y;
+            if (shouldApplyForceLayout) {
+                // Random initial position for force layout
+                x = Math.random() * 100 - 50;
+                y = Math.random() * 100 - 50;
+            }
+            else {
+                // Arrange in a circle with equal spacing
+                const radius = Math.max(50, nodeCount * 3);
+                const angle = (index / nodeCount) * 2 * Math.PI;
+                x = Math.cos(angle) * radius;
+                y = Math.sin(angle) * radius;
+            }
             return {
                 key: dep[0],
                 label: `${dep[0]} V${dep[1].version}`,
-                x: Math.random() * 100 - 50,
-                y: Math.random() * 100 - 50,
+                x,
+                y,
                 size: 10,
                 color: dep[1].isRoot ? "#22c55e" : "#3b82f6",
             };
@@ -117,27 +131,24 @@ async function runPeerDependenciesMode(port, shouldOpenBrowser) {
         ...packageJson.dependencies,
         ...packageJson.devDependencies,
     };
-    // Run npm list to get all dependencies
-    const result = shell.exec("npm list --json --all", {
-        windowsHide: true,
-        silent: true,
-    });
-    const packageInfo = JSON.parse(result.stdout);
-    // Collect all package names from the dependency tree
-    const allPackageNames = new Set();
-    collectAllPackageNames(packageInfo.dependencies, allPackageNames);
-    // Collect all peer dependencies by reading package.json files
-    const peerDeps = collectPeerDependenciesFromNodeModules(allPackageNames);
+    // Collect all peer dependencies recursively starting from installed packages
+    const peerDeps = collectPeerDependenciesRecursively(installedPackages);
     // Resolve versions
     const peerDepsList = Object.entries(peerDeps).map(([name, info]) => {
         const resolvedVersion = resolveVersion(info.versions);
-        const isInstalled = installedPackages[name] !== undefined;
+        const isInPackageJson = installedPackages[name] !== undefined;
+        // Check if installed in node_modules (even if not in package.json)
+        const nodeModulesPath = path.join(process.cwd(), "node_modules");
+        const pkgPath = path.join(nodeModulesPath, name, "package.json");
+        const existsInNodeModules = fs.existsSync(pkgPath);
+        const isInstalledByDependency = existsInNodeModules && !isInPackageJson;
         return {
             name,
             version: resolvedVersion.version,
             isConflict: resolvedVersion.isConflict,
             requiredBy: info.requiredBy,
-            isInstalled,
+            isInstalled: isInPackageJson,
+            isInstalledByDependency,
         };
     });
     // Sort by name
@@ -184,26 +195,25 @@ async function runPeerDependenciesMode(port, shouldOpenBrowser) {
             open(address);
     });
 }
-function collectAllPackageNames(deps, packageNames) {
-    if (deps == null)
-        return;
-    for (const [depName, depInfo] of Object.entries(deps)) {
-        packageNames.add(depName);
-        if (depInfo.dependencies) {
-            collectAllPackageNames(depInfo.dependencies, packageNames);
-        }
-    }
-}
-function collectPeerDependenciesFromNodeModules(packageNames) {
+function collectPeerDependenciesRecursively(initialPackages) {
     const peerDeps = {};
     const nodeModulesPath = path.join(process.cwd(), "node_modules");
-    for (const packageName of packageNames) {
+    const visited = new Set();
+    const queue = Object.keys(initialPackages);
+    while (queue.length > 0) {
+        const packageName = queue.shift();
+        // Skip if already processed
+        if (visited.has(packageName)) {
+            continue;
+        }
+        visited.add(packageName);
         try {
             const pkgJsonPath = path.join(nodeModulesPath, packageName, "package.json");
             if (!fs.existsSync(pkgJsonPath)) {
                 continue;
             }
             const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
+            // Collect peer dependencies
             if (pkgJson.peerDependencies) {
                 for (const [peerDepName, peerDepVersion] of Object.entries(pkgJson.peerDependencies)) {
                     if (!peerDeps[peerDepName]) {
@@ -219,40 +229,25 @@ function collectPeerDependenciesFromNodeModules(packageNames) {
                     if (!peerDeps[peerDepName].requiredBy.includes(packageName)) {
                         peerDeps[peerDepName].requiredBy.push(packageName);
                     }
+                    // Add peer dependency to queue for processing
+                    if (!visited.has(peerDepName)) {
+                        queue.push(peerDepName);
+                    }
                 }
             }
-        }
-        catch (error) {
-            // Skip packages that can't be read
-            console.warn(`Warning: Could not read package.json for ${packageName}`);
-        }
-    }
-    return peerDeps;
-}
-function collectPeerDependencies(deps, peerDeps = {}, parentName) {
-    if (deps == null)
-        return peerDeps;
-    for (const [depName, depInfo] of Object.entries(deps)) {
-        // Check if this dependency has peer dependencies
-        if (depInfo.peerDependencies) {
-            for (const [peerDepName, peerDepVersion] of Object.entries(depInfo.peerDependencies)) {
-                if (!peerDeps[peerDepName]) {
-                    peerDeps[peerDepName] = {
-                        versions: [],
-                        requiredBy: [],
-                    };
-                }
-                if (!peerDeps[peerDepName].versions.includes(peerDepVersion)) {
-                    peerDeps[peerDepName].versions.push(peerDepVersion);
-                }
-                if (!peerDeps[peerDepName].requiredBy.includes(depName)) {
-                    peerDeps[peerDepName].requiredBy.push(depName);
+            // Collect dependencies and devDependencies to continue traversal
+            const allDeps = {
+                ...pkgJson.dependencies,
+                ...pkgJson.devDependencies,
+            };
+            for (const depName of Object.keys(allDeps)) {
+                if (!visited.has(depName)) {
+                    queue.push(depName);
                 }
             }
         }
-        // Recursively check nested dependencies
-        if (depInfo.dependencies) {
-            collectPeerDependencies(depInfo.dependencies, peerDeps, depName);
+        catch (error) {
+            console.warn(`Warning: Could not read package.json for ${packageName}`);
         }
     }
     return peerDeps;
@@ -264,35 +259,42 @@ function resolveVersion(versions) {
     if (versions.length === 1) {
         return { version: versions[0], isConflict: false };
     }
-    // Try to find a compatible version
-    // For simplicity, if all versions are the same, use that
+    // Get unique versions
     const uniqueVersions = [...new Set(versions)];
     if (uniqueVersions.length === 1) {
         return { version: uniqueVersions[0], isConflict: false };
     }
-    // Check if all are compatible (simple heuristic: same major version for ^)
-    const allCompatible = uniqueVersions.every((v) => {
-        const baseVersion = uniqueVersions[0];
-        // If both start with ^, check major version
-        if (v.startsWith("^") && baseVersion.startsWith("^")) {
-            const vMajor = v.substring(1).split(".")[0];
-            const baseMajor = baseVersion.substring(1).split(".")[0];
-            return vMajor === baseMajor;
+    // Use semver to find intersecting range
+    try {
+        // Try to find a version range that satisfies all requirements
+        let intersection = uniqueVersions[0];
+        for (let i = 1; i < uniqueVersions.length; i++) {
+            const range1 = intersection;
+            const range2 = uniqueVersions[i];
+            // Check if ranges intersect
+            if (semver.intersects(range1, range2)) {
+                // Find the more restrictive range
+                // Use the one with higher minimum version
+                const min1 = semver.minVersion(range1);
+                const min2 = semver.minVersion(range2);
+                if (min1 && min2) {
+                    intersection = semver.gt(min1, min2) ? range1 : range2;
+                }
+                else {
+                    intersection = range1;
+                }
+            }
+            else {
+                // Ranges don't intersect - conflict detected
+                return { version: uniqueVersions.join(" | "), isConflict: true };
+            }
         }
-        // If both are exact versions, they must match
-        return v === baseVersion;
-    });
-    if (allCompatible && uniqueVersions[0].startsWith("^")) {
-        // Return the highest version requirement
-        const sorted = [...uniqueVersions].sort((a, b) => {
-            const aVer = a.substring(1);
-            const bVer = b.substring(1);
-            return bVer.localeCompare(aVer, undefined, { numeric: true });
-        });
-        return { version: sorted[0], isConflict: false };
+        return { version: intersection, isConflict: false };
+    }
+    catch (error) {
+        // If semver parsing fails, fall back to showing all versions
+        return { version: uniqueVersions.join(" | "), isConflict: true };
     }
-    // Conflict detected
-    return { version: uniqueVersions.join(" | "), isConflict: true };
 }
 function getPeerDepsTemplate() {
     return `
@@ -454,11 +456,28 @@ function getPeerDepsTemplate() {
         font-weight: 600;
       }
       
+      .installed-by-dep-badge {
+        display: flex;
+        align-items: center;
+        gap: 0.5rem;
+        padding: 0.5rem 1rem;
+        background: #e0e7ff;
+        color: #3730a3;
+        border-radius: 6px;
+        font-size: 0.875rem;
+        font-weight: 600;
+      }
+      
       .checkmark {
         color: #10b981;
         font-size: 1.25rem;
       }
       
+      .info-icon {
+        color: #4f46e5;
+        font-size: 1.25rem;
+      }
+      
       .message {
         margin-top: 0.5rem;
         padding: 0.5rem;
@@ -515,11 +534,19 @@ function getPeerDepsTemplate() {
                 Installed
               </div>
               {{/isInstalled}}
+              {{#isInstalledByDependency}}
+              <div class="installed-by-dep-badge">
+                <span class="info-icon">ℹ</span>
+                Install by dependency
+              </div>
+              {{/isInstalledByDependency}}
               {{^isInstalled}}
+              {{^isInstalledByDependency}}
               <button class="install-btn" onclick="installPackage('{{name}}', '{{version}}', this)">
                 npm install
               </button>
               <div class="message" id="msg-{{name}}"></div>
+              {{/isInstalledByDependency}}
               {{/isInstalled}}
             </div>
           </div>
@@ -595,8 +622,8 @@ function getTemplate() {
             var nodes = graph.nodes();
             var edges = graph.edges();
             
-            // Physics constants
-            var repulsionStrength = 100;
+            // Physics constants - lower repulsion for better spacing
+            var repulsionStrength = 50;
             var attractionStrength = 0.01;
             var damping = 0.5;
             
@@ -678,7 +705,7 @@ function getTemplate() {
             });
             
             edges.forEach(function(edge, index) {
-                graph.addEdge(edge.source, edge.target, {
+                graph.mergeEdge(edge.source, edge.target, {
                     size: 2,
                     color: '#94a3b8'
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-dep-graph",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Easily see the dependency graph of your npm project",
   "homepage": "https://github.com/danisss9/easy-dep-graph#readme",
   "repository": {
@@ -54,11 +54,13 @@
     "fastify": "^5.7.4",
     "mustache": "^4.2.0",
     "open": "^11.0.0",
+    "semver": "^7.7.3",
     "shelljs": "^0.10.0"
   },
   "devDependencies": {
     "@types/mustache": "^4.2.6",
     "@types/node": "^25.2.1",
+    "@types/semver": "^7.7.1",
     "@types/shelljs": "^0.10.0",
     "typescript": "^5.9.3"
   }