Lint and add edgeWeight

Author: krm35

src/index.ts

@@ -178,7 +178,7 @@ export function Graph(serialized?: Serialized) {
   function depthFirstSearch(
     sourceNodes?: NodeId[],
     includeSourceNodes: boolean = true,
-    errorOnCycle: boolean = false
+    errorOnCycle: boolean = false,
   ) {
     if (!sourceNodes) {
       sourceNodes = nodes();
@@ -284,7 +284,7 @@ export function Graph(serialized?: Serialized) {
   // Cormen et al. "Introduction to Algorithms" 3rd Ed. p. 613
   function topologicalSort(
     sourceNodes?: NodeId[],
-    includeSourceNodes: boolean = true
+    includeSourceNodes: boolean = true,
   ) {
     return depthFirstSearch(sourceNodes, includeSourceNodes, true).reverse();
   }
@@ -394,17 +394,18 @@ export function Graph(serialized?: Serialized) {
   function shortestPaths(source: NodeId, destination: NodeId) {
     let path = shortestPath(source, destination);
     const paths = [path],
-      removedEdges = [],
+      removedEdges: any = [],
       weight = path.weight;
     while (weight) {
-      if (hasEdge(path[0], path[1])) {
-        removeEdge(path[0], path[1]);
-        removedEdges.push([path[0], path[1]]);
-      }
-      if (hasEdge(path[1], path[0])) {
-        removeEdge(path[1], path[0]);
-        removedEdges.push([path[1], path[0]]);
-      }
+      [
+        [path[0], path[1]],
+        [path[1], path[0]],
+      ].forEach(([u, v]) => {
+        if (hasEdge(u, v)) {
+          removedEdges.push({ u, v, weight: getEdgeWeight(u, v) });
+          removeEdge(u, v);
+        }
+      });
       try {
         path = shortestPath(source, destination);
         if (!path.weight || weight < path.weight) break;
@@ -413,7 +414,7 @@ export function Graph(serialized?: Serialized) {
         break;
       }
     }
-    for (const [u, v] of removedEdges) addEdge(u, v);
+    for (const { u, v, weight } of removedEdges) addEdge(u, v, weight);
     return paths;
   }
 

test.js

@@ -378,7 +378,7 @@ describe("Graph", function () {
       var graph = Graph().addEdge("a", "b").addEdge("b", "c");
       assert.deepEqual(
         graph.shortestPath("a", "c"),
-        withWeight(["a", "b", "c"], 2)
+        withWeight(["a", "b", "c"], 2),
       );
     });
 
@@ -396,11 +396,11 @@ describe("Graph", function () {
 
       assert.deepEqual(
         graph.shortestPath("s", "z"),
-        withWeight(["s", "y", "z"], 5 + 2)
+        withWeight(["s", "y", "z"], 5 + 2),
       );
       assert.deepEqual(
         graph.shortestPath("s", "x"),
-        withWeight(["s", "y", "t", "x"], 5 + 3 + 1)
+        withWeight(["s", "y", "t", "x"], 5 + 3 + 1),
       );
     });
 
@@ -423,7 +423,7 @@ describe("Graph", function () {
       var graph = Graph().addEdge("a", "b").addEdge("b", "c").addEdge("d", "e");
       assert.deepEqual(
         graph.shortestPath("a", "c"),
-        withWeight(["a", "b", "c"], 2)
+        withWeight(["a", "b", "c"], 2),
       );
     });