sankey: turn node.groups into a info_array, use for loops

Author: antoinerg

src/traces/sankey/attributes.js

@@ -90,8 +90,11 @@ var attrs = module.exports = overrideAll({
             description: 'The shown name of the node.'
         },
         groups: {
-            valType: 'data_array',
+            valType: 'info_array',
+            dimensions: 2,
+            freeLength: true,
             dflt: [],
+            items: {valType: 'number', editType: 'calc'},
             role: 'calc',
             description: [
                 'Groups of nodes.',

src/traces/sankey/calc.js

@@ -17,10 +17,8 @@ var isIndex = Lib.isIndex;
 var Colorscale = require('../../components/colorscale');
 
 function convertToD3Sankey(trace) {
-    // var nodeSpec = trace.node;
-    // var linkSpec = trace.link;
-    var nodeSpec = Lib.extendDeep({}, trace.node);
-    var linkSpec = Lib.extendDeep({}, trace.link);
+    var nodeSpec = trace.node;
+    var linkSpec = trace.link;
 
     var links = [];
     var hasLinkColorArray = isArrayOrTypedArray(linkSpec.color);
@@ -50,14 +48,10 @@ function convertToD3Sankey(trace) {
     for(i = 0; i < groups.length; i++) {
         var group = groups[i];
         // Build a lookup table to quickly find in which group a node is
-        if(Array.isArray(group)) {
-            for(j = 0; j < group.length; j++) {
-                var nodeIndex = group[j];
-                var groupIndex = nodeCount + i;
-                groupLookup[nodeIndex] = groupIndex;
-            }
-        } else {
-            Lib.warn('node.groups must be an array, default to empty array []');
+        for(j = 0; j < group.length; j++) {
+            var nodeIndex = group[j];
+            var groupIndex = nodeCount + i;
+            groupLookup[nodeIndex] = groupIndex;
         }
     }
 

src/traces/sankey/render.js

@@ -68,7 +68,7 @@ function sankeyModel(layout, d, traceIndex) {
     }
 
     // Create transient nodes for animations
-    Object.keys(calcData._groupLookup).forEach(function(nodePointNumber) {
+    for(var nodePointNumber in calcData._groupLookup) {
         var groupIndex = parseInt(calcData._groupLookup[nodePointNumber]);
 
         var groupingNode;
@@ -89,7 +89,7 @@ function sankeyModel(layout, d, traceIndex) {
             sourceLinks: [],
             targetLinks: []
         });
-    });
+    }
 
     function computeLinkConcentrations() {
         var i, j, k;
@@ -161,7 +161,7 @@ function sankeyModel(layout, d, traceIndex) {
         circular: circular,
         key: traceIndex,
         trace: trace,
-        guid: Math.floor(1e12 * (1 + Math.random())),
+        guid: Lib.randstr(),
         horizontal: horizontal,
         width: width,
         height: height,
@@ -379,7 +379,7 @@ function nodeModel(d, n) {
     var key = 'node_' + n.pointNumber;
     // If it's a group, it's mutable and should be unique
     if(n.group) {
-        key = 'group_' + Math.floor(1e12 * (1 + Math.random()));
+        key = Lib.randstr();
     }
 
     // for event data