graph-cache - npm Package Compare versions

Comparing version 1.0.4 to 1.0.5

build/update_graph.js

@@ -7,6 +7,10 @@ 'use strict';
 
-function ensureConnectivity(g, nwg, leafs) {
+function ensureConnectivity(g, nwg, leafs, processed) {
   var nextCheck = [];
   leafs.forEach(function (leaf) {
-    nextCheck = nextCheck.concat(g.predecessors(leaf) || []);
+    processed[leaf] = true;
+    nextCheck = nextCheck.concat(g.predecessors(leaf) || []).filter(function (el) {
+      return !processed[leaf];
+    });
+
     if (!nwg.node(leaf) && g.successors(leaf).length === 0) {
@@ -21,3 +25,3 @@ g.removeNode(leaf);
 
-  return ensureConnectivity(g, nwg, nextCheck);
+  return ensureConnectivity(g, nwg, nextCheck, processed);
 }
@@ -68,3 +72,3 @@
     if (diffPred.length > 0) {
-      ensureConnectivity(g, nwg, diffPred);
+      ensureConnectivity(g, nwg, diffPred, {});
     }
@@ -71,0 +75,0 @@ });

lib/update_graph.js

 const diff = require('lodash.differenceby');
 
-function ensureConnectivity(g, nwg, leafs) {
+function ensureConnectivity(g, nwg, leafs, processed) {
   let nextCheck = [];
   leafs.forEach(leaf => {
-    nextCheck = nextCheck.concat(g.predecessors(leaf) || []);
+    processed[leaf] = true;
+    nextCheck = nextCheck.concat(g.predecessors(leaf) || [])
+      .filter(el => !processed[leaf]);
+
     if (!nwg.node(leaf) && g.successors(leaf).length === 0) {
@@ -16,3 +19,3 @@ g.removeNode(leaf);
 
-  return ensureConnectivity(g, nwg, nextCheck);
+  return ensureConnectivity(g, nwg, nextCheck, processed);
 }
@@ -56,6 +59,6 @@
     if (diffPred.length > 0) {
-      ensureConnectivity(g, nwg, diffPred);
+      ensureConnectivity(g, nwg, diffPred, {});
     }
   });
-  
+
   nextLeafs = nextLeafs.filter(([el]) => !walked[el]);
@@ -62,0 +65,0 @@

package.json

 {
   "name": "graph-cache",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "",
@@ -5,0 +5,0 @@ "main": "index.js",

tests/lib/update_graph.js

@@ -14,3 +14,5 @@ const chai = require('chai');
   compareGraphs,
-  loadCyclicGraph
+  loadCyclicGraph,
+  loadCyclicGraphChange,
+  loadCyclicGraphSimple,
 } = require('../utils/test_utils');
@@ -152,4 +154,4 @@ const { loadFile } = require('../../lib/file_process');
     load2Graph().then(g =>
-      loadCyclicGraph().then(gg => {
-        return updateGraph(g, testSign, loadCyclicGraph.bind(null, false), '', getName(1))
+      loadCyclicGraphSimple().then(gg => {
+        return updateGraph(g, testSign, loadCyclicGraphSimple.bind(null, false), '', getName(1))
           .then(nwg => compareGraphs(nwg, gg))
@@ -160,2 +162,11 @@ })
 
+  it('handles complex cyclic graphs', () =>
+    loadCyclicGraph().then(g =>
+      loadCyclicGraphChange().then(gg => {
+        return updateGraph(g, testSign, loadCyclicGraphChange.bind(null, false), '', getName(1))
+          .then(nwg => compareGraphs(nwg, gg))
+      })
+    )
+  );
+
   it('if subgraph is empty, will remove leaf and nodes with no connection', () =>
@@ -162,0 +173,0 @@ load2Graph(true).then(([g]) =>

tests/utils/test_utils.js

@@ -90,3 +90,3 @@ const Graph = require('graphlib').Graph;
 
-function loadCyclicGraph(info = false) {
+function loadCyclicGraphSimple(info = false) {
   return load2Graph(true).then(([g, files, names]) => {
@@ -101,2 +101,28 @@ g.setEdge(getName(1), getName(2));
 
+function loadCyclicGraph(info = false) {
+  return load4Graph(true).then(([g, files, names]) => {
+    g.setEdge(getName(2), getName(4));
+    g.removeEdge(getName(2), getName(1));
+    g.setEdge(getName(1), getName(2));
+
+    if (info) {
+      return [g, files, names];
+    }
+    return g;
+  });
+}
+
+function loadCyclicGraphChange(info = false) {
+  return loadCyclicGraph(true).then(([g, files, names]) => {
+    g.removeNode(getName(2));
+    g.setEdge(getName(3), getName(4));
+    g.setEdge(getName(1), getName(3));
+    if (info) {
+      return [g, files, names];
+    }
+
+    return g;
+  });
+}
+
 function compareGraphs(g, nwg) {
@@ -125,2 +151,4 @@ const nodes1 = g.nodes().sort().map(node => [node, g.node(node)]);
   loadCyclicGraph,
+  loadCyclicGraphChange,
+  loadCyclicGraphSimple,
 };

No alert changes

Improved metrics

Total package byte prevSize

50147

2.45%

Lines of code

1532

2.61%

No dependency changes