eg-graph - npm Package Compare versions

Comparing version 0.0.14 to 0.0.15

lib/layouter/sugiyama/cycle-removal/cycle-removal.js

@@ -13,2 +13,4 @@ 'use strict';
 
+var _Object$assign = require('babel-runtime/core-js/object/assign')['default'];
+
 var _interopRequireDefault = require('babel-runtime/helpers/interop-require-default')['default'];
@@ -40,3 +42,3 @@
       g.removeEdge(u, v);
-      g.addEdge(v, u, obj);
+      g.addEdge(v, u, _Object$assign({ reversed: true }, obj));
     }
@@ -43,0 +45,0 @@ } catch (err) {

lib/layouter/sugiyama/index.js

@@ -151,2 +151,32 @@ 'use strict';
 
+var reversed = function reversed(arr) {
+  var result = [];
+  var _iteratorNormalCompletion3 = true;
+  var _didIteratorError3 = false;
+  var _iteratorError3 = undefined;
+
+  try {
+    for (var _iterator3 = _getIterator(arr), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+      var x = _step3.value;
+
+      result.unshift(x);
+    }
+  } catch (err) {
+    _didIteratorError3 = true;
+    _iteratorError3 = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion3 && _iterator3['return']) {
+        _iterator3['return']();
+      }
+    } finally {
+      if (_didIteratorError3) {
+        throw _iteratorError3;
+      }
+    }
+  }
+
+  return result;
+};
+
 var buildResult = function buildResult(g, layers, ltor) {
@@ -159,18 +189,43 @@ var result = {
 
-  var _iteratorNormalCompletion3 = true;
-  var _didIteratorError3 = false;
-  var _iteratorError3 = undefined;
+  var _iteratorNormalCompletion4 = true;
+  var _didIteratorError4 = false;
+  var _iteratorError4 = undefined;
 
   try {
-    for (var _iterator3 = _getIterator(layers), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-      var layer = _step3.value;
+    for (var _iterator4 = _getIterator(g.vertices()), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
+      var u = _step4.value;
 
+      result.edges[u] = {};
+    }
+  } catch (err) {
+    _didIteratorError4 = true;
+    _iteratorError4 = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion4 && _iterator4['return']) {
+        _iterator4['return']();
+      }
+    } finally {
+      if (_didIteratorError4) {
+        throw _iteratorError4;
+      }
+    }
+  }
+
+  var _iteratorNormalCompletion5 = true;
+  var _didIteratorError5 = false;
+  var _iteratorError5 = undefined;
+
+  try {
+    for (var _iterator5 = _getIterator(layers), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
+      var layer = _step5.value;
+
       var maxHeight = -Infinity;
-      var _iteratorNormalCompletion6 = true;
-      var _didIteratorError6 = false;
-      var _iteratorError6 = undefined;
+      var _iteratorNormalCompletion8 = true;
+      var _didIteratorError8 = false;
+      var _iteratorError8 = undefined;
 
       try {
-        for (var _iterator6 = _getIterator(layer), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
-          var u = _step6.value;
+        for (var _iterator8 = _getIterator(layer), _step8; !(_iteratorNormalCompletion8 = (_step8 = _iterator8.next()).done); _iteratorNormalCompletion8 = true) {
+          var u = _step8.value;
 
@@ -180,12 +235,12 @@ maxHeight = Math.max(maxHeight, g.vertex(u).origHeight || 0);
       } catch (err) {
-        _didIteratorError6 = true;
-        _iteratorError6 = err;
+        _didIteratorError8 = true;
+        _iteratorError8 = err;
       } finally {
         try {
-          if (!_iteratorNormalCompletion6 && _iterator6['return']) {
-            _iterator6['return']();
+          if (!_iteratorNormalCompletion8 && _iterator8['return']) {
+            _iterator8['return']();
           }
         } finally {
-          if (_didIteratorError6) {
-            throw _iteratorError6;
+          if (_didIteratorError8) {
+            throw _iteratorError8;
           }
@@ -198,12 +253,12 @@ }
   } catch (err) {
-    _didIteratorError3 = true;
-    _iteratorError3 = err;
+    _didIteratorError5 = true;
+    _iteratorError5 = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion3 && _iterator3['return']) {
-        _iterator3['return']();
+      if (!_iteratorNormalCompletion5 && _iterator5['return']) {
+        _iterator5['return']();
       }
     } finally {
-      if (_didIteratorError3) {
-        throw _iteratorError3;
+      if (_didIteratorError5) {
+        throw _iteratorError5;
       }
@@ -216,9 +271,9 @@ }
         layerHeight = layerHeights[i];
-    var _iteratorNormalCompletion4 = true;
-    var _didIteratorError4 = false;
-    var _iteratorError4 = undefined;
+    var _iteratorNormalCompletion6 = true;
+    var _didIteratorError6 = false;
+    var _iteratorError6 = undefined;
 
     try {
-      for (var _iterator4 = _getIterator(layer), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-        var u = _step4.value;
+      for (var _iterator6 = _getIterator(layer), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
+        var u = _step6.value;
 
@@ -236,13 +291,9 @@ var uNode = g.vertex(u);
 
-          if (result.edges[u] === undefined) {
-            result.edges[u] = {};
-          }
+          var _iteratorNormalCompletion7 = true;
+          var _didIteratorError7 = false;
+          var _iteratorError7 = undefined;
 
-          var _iteratorNormalCompletion5 = true;
-          var _didIteratorError5 = false;
-          var _iteratorError5 = undefined;
-
           try {
-            for (var _iterator5 = _getIterator(g.outVertices(u)), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
-              var v = _step5.value;
+            for (var _iterator7 = _getIterator(g.outVertices(u)), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) {
+              var v = _step7.value;
 
@@ -273,18 +324,27 @@ var points = ltor ? [[uNode.y + (uNode.origHeight || 0) / 2, uNode.x], [uNode.y + layerHeight / 2, uNode.x]] : [[uNode.x, uNode.y + (uNode.origHeight || 0) / 2], [uNode.x, uNode.y + layerHeight / 2]];
               simplify(points, ltor);
-              result.edges[u][w] = {
-                points: points,
-                width: g.edge(u, v).width
-              };
+              if (g.edge(u, v).reversed) {
+                result.edges[w][u] = {
+                  points: reversed(points),
+                  reversed: true,
+                  width: g.edge(u, v).width
+                };
+              } else {
+                result.edges[u][w] = {
+                  points: points,
+                  reversed: false,
+                  width: g.edge(u, v).width
+                };
+              }
             }
           } catch (err) {
-            _didIteratorError5 = true;
-            _iteratorError5 = err;
+            _didIteratorError7 = true;
+            _iteratorError7 = err;
           } finally {
             try {
-              if (!_iteratorNormalCompletion5 && _iterator5['return']) {
-                _iterator5['return']();
+              if (!_iteratorNormalCompletion7 && _iterator7['return']) {
+                _iterator7['return']();
               }
             } finally {
-              if (_didIteratorError5) {
-                throw _iteratorError5;
+              if (_didIteratorError7) {
+                throw _iteratorError7;
               }
@@ -296,12 +356,12 @@ }
     } catch (err) {
-      _didIteratorError4 = true;
-      _iteratorError4 = err;
+      _didIteratorError6 = true;
+      _iteratorError6 = err;
     } finally {
       try {
-        if (!_iteratorNormalCompletion4 && _iterator4['return']) {
-          _iterator4['return']();
+        if (!_iteratorNormalCompletion6 && _iterator6['return']) {
+          _iterator6['return']();
         }
       } finally {
-        if (_didIteratorError4) {
-          throw _iteratorError4;
+        if (_didIteratorError6) {
+          throw _iteratorError6;
         }
@@ -317,9 +377,9 @@ }
   var result = [];
-  var _iteratorNormalCompletion7 = true;
-  var _didIteratorError7 = false;
-  var _iteratorError7 = undefined;
+  var _iteratorNormalCompletion9 = true;
+  var _didIteratorError9 = false;
+  var _iteratorError9 = undefined;
 
   try {
-    for (var _iterator7 = _getIterator(g.vertices()), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) {
-      var u = _step7.value;
+    for (var _iterator9 = _getIterator(g.vertices()), _step9; !(_iteratorNormalCompletion9 = (_step9 = _iterator9.next()).done); _iteratorNormalCompletion9 = true) {
+      var u = _step9.value;
 
@@ -333,12 +393,12 @@ var layer = layers[u];
   } catch (err) {
-    _didIteratorError7 = true;
-    _iteratorError7 = err;
+    _didIteratorError9 = true;
+    _iteratorError9 = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion7 && _iterator7['return']) {
-        _iterator7['return']();
+      if (!_iteratorNormalCompletion9 && _iterator9['return']) {
+        _iterator9['return']();
       }
     } finally {
-      if (_didIteratorError7) {
-        throw _iteratorError7;
+      if (_didIteratorError9) {
+        throw _iteratorError9;
       }
@@ -345,0 +405,0 @@ }

lib/layouter/sugiyama/normalize.js

@@ -41,4 +41,5 @@ 'use strict';
           g.addEdge(w1, w2, {
-            width: d.width,
-            dummy: true
+            dummy: true,
+            reversed: g.edge(u, v).reversed,
+            width: d.width
           });
@@ -49,3 +50,5 @@ layers[i].push(w2);
         g.addEdge(w1, v, {
-          dummy: true
+          dummy: true,
+          reversed: g.edge(u, v).reversed,
+          width: d.width
         });
@@ -52,0 +55,0 @@ g.removeEdge(u, v);

package.json

 {
   "name": "eg-graph",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "Graph drawig tool",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

No alert changes

Improved metrics

Total package byte prevSize

188287

0.97%

Lines of code

5658

1.04%

No dependency changes