Merge pull request #2065 from plotly/gup-utils-rollout

Roll out General Update Pattern utils to `parcoords` and `sankey`

Author: monfera

src/traces/parcoords/calc.js

@@ -11,7 +11,7 @@
 var hasColorscale = require('../../components/colorscale/has_colorscale');
 var calcColorscale = require('../../components/colorscale/calc');
 var Lib = require('../../lib');
-
+var wrap = require('../../lib/gup').wrap;
 
 module.exports = function calc(gd, trace) {
     var cs = !!trace.line.colorscale && Lib.isArray(trace.line.color);
@@ -22,8 +22,8 @@ module.exports = function calc(gd, trace) {
         calcColorscale(trace, trace.line.color, 'line', 'c');
     }
 
-    return [{
+    return wrap({
         lineColor: color,
         cscale: cscale
-    }];
+    });
 };

src/traces/parcoords/parcoords.js

@@ -13,10 +13,9 @@ var c = require('./constants');
 var Lib = require('../../lib');
 var d3 = require('d3');
 var Drawing = require('../../components/drawing');
-
-function keyFun(d) {return d.key;}
-
-function repeat(d) {return [d];}
+var keyFun = require('../../lib/gup').keyFun;
+var repeat = require('../../lib/gup').repeat;
+var unwrap = require('../../lib/gup').unwrap;
 
 function visible(dimension) {return !('visible' in dimension) || dimension.visible;}
 
@@ -126,10 +125,6 @@ function unitToColorScale(cscale) {
     };
 }
 
-function unwrap(d) {
-    return d[0]; // plotly data structure convention
-}
-
 function model(layout, d, i) {
     var cd0 = unwrap(d),
         trace = cd0.trace,

src/traces/sankey/calc.js

@@ -10,6 +10,7 @@
 
 var tarjan = require('strongly-connected-components');
 var Lib = require('../../lib');
+var wrap = require('../../lib/gup').wrap;
 
 function circularityPresent(nodeList, sources, targets) {
 
@@ -44,8 +45,8 @@ module.exports = function calc(gd, trace) {
         trace.node.color = [];
     }
 
-    return [{
+    return wrap({
         link: trace.link,
         node: trace.node
-    }];
+    });
 };

src/traces/sankey/render.js

@@ -16,13 +16,12 @@ var Drawing = require('../../components/drawing');
 var d3sankey = require('@plotly/d3-sankey').sankey;
 var d3Force = require('d3-force');
 var Lib = require('../../lib');
+var keyFun = require('../../lib/gup').keyFun;
+var repeat = require('../../lib/gup').repeat;
+var unwrap = require('../../lib/gup').unwrap;
 
 // basic data utilities
 
-function keyFun(d) {return d.key;}
-function repeat(d) {return [d];} // d3 data binding convention
-function unwrap(d) {return d[0];} // plotly data structure convention
-
 function persistOriginalPlace(nodes) {
     var i, distinctLayerPositions = [];
     for(i = 0; i < nodes.length; i++) {