@itrocks/dependency 0.0.2 → 0.0.4

package/cjs/dependency.js

@@ -2,28 +2,63 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dependencies = dependencies;
 const app_dir_1 = require("@itrocks/app-dir");
-const dependency_graph_1 = require("dependency-graph");
 const list_installed_1 = require("list-installed");
 async function dependencies(path = app_dir_1.appDir) {
     const dependencies = new Map;
-    const graph = new dependency_graph_1.DepGraph();
+    const already = new Set;
+    const result = new Array;
+    // list installed packages and their dependencies
     for (const [packageName, packageJson] of (await (0, list_installed_1.listInstalled)(path)).entries()) {
-        dependencies.set(packageName, Object.keys(packageJson.dependencies ?? {}));
-    }
-    for (const packageName of dependencies.keys()) {
-        graph.addNode(packageName);
+        const packageDependencies = new Set;
+        for (const dependency of Object.keys(packageJson.dependencies ?? {})) {
+            if (!already.has(dependency)) {
+                packageDependencies.add(dependency);
+            }
+        }
+        if (packageDependencies.size) {
+            dependencies.set(packageName, packageDependencies);
+        }
+        else {
+            already.add(packageName);
+            result.push(packageName);
+        }
     }
+    // remove not-installed dependencies
     for (const [packageName, packageDependencies] of dependencies.entries()) {
-        if (packageName.startsWith('@itrocks'))
-            console.log('deps of', packageName + ':');
         for (const dependency of packageDependencies) {
-            if (dependencies.has(dependency)) {
-                if (packageName.startsWith('@itrocks'))
-                    console.log('>', dependency);
-                graph.addDependency(packageName, dependency);
+            if (!dependencies.has(dependency)) {
+                packageDependencies.delete(dependency);
             }
         }
+        if (!packageDependencies.size) {
+            dependencies.delete(packageName);
+            already.add(packageName);
+            result.push(packageName);
+        }
+    }
+    // order packages by their dependencies
+    let didSomething = true;
+    while (dependencies && didSomething) {
+        didSomething = false;
+        for (const [packageName, packageDependencies] of dependencies.entries()) {
+            for (const dependency of packageDependencies) {
+                if (already.has(dependency)) {
+                    packageDependencies.delete(dependency);
+                }
+            }
+            if (!packageDependencies.size) {
+                dependencies.delete(packageName);
+                already.add(packageName);
+                result.push(packageName);
+                didSomething = true;
+            }
+        }
+    }
+    // cyclic dependency error
+    if (dependencies.size) {
+        throw 'Cyclic dependencies: ' + new Array(dependencies.keys()).join(', ');
     }
-    return graph.overallOrder();
+    // done
+    return result;
 }
 //# sourceMappingURL=dependency.js.map

package/package.json

@@ -4,7 +4,6 @@
 		"email": "baptiste@pillot.fr"
 	},
 	"dependencies": {
-		"dependency-graph": "^1.0",
 		"list-installed": "^5.3"
 	},
 	"description": "Builds a dependency-sorted list of Nodes.js modules",
@@ -45,5 +44,5 @@
 		"build": "tsc"
 	},
 	"types": "./cjs/dependency.d.ts",
-	"version": "0.0.2"
+	"version": "0.0.4"
 }