reuse the plotly_schema crawler and fix some crawling issues (squashed)

Author: monfera

src/plot_api/plot_schema.js

@@ -56,16 +56,17 @@ PlotSchema.get = function() {
     return plotSchema;
 };
 
-PlotSchema.crawl = function(attrs, callback) {
+PlotSchema.crawl = function (attrs, callback, specifiedLevel) {
+    var level = specifiedLevel || 0;
     Object.keys(attrs).forEach(function(attrName) {
         var attr = attrs[attrName];
 
         if(UNDERSCORE_ATTRS.indexOf(attrName) !== -1) return;
 
-        callback(attr, attrName, attrs);
+        callback(attr, attrName, attrs, level);
 
         if(PlotSchema.isValObject(attr)) return;
-        if(Lib.isPlainObject(attr)) PlotSchema.crawl(attr, callback);
+        if(Lib.isPlainObject(attr)) PlotSchema.crawl(attr, callback, level + 1);
     });
 };
 

src/plots/plots.js

@@ -9,6 +9,7 @@
 
 'use strict';
 
+var PlotSchema = require('./../plot_api/plot_schema')
 var d3 = require('d3');
 var isNumeric = require('fast-isnumeric');
 
@@ -786,6 +787,27 @@ function applyTransforms(fullTrace, fullData, layout) {
     var container = fullTrace.transforms,
         dataOut = [fullTrace];
 
+    var attributeSets = dataOut.map(function(trace) {
+
+        var arraySplitAttributes = [];
+
+        var stack = [];
+
+        function callback(attr, attrName, attrs, level) {
+
+            stack = stack.slice(0, level).concat([attrName]);
+
+            var splittableAttr = attr.valType === 'data_array' || attr.arrayOk === true
+            if(splittableAttr) {
+                arraySplitAttributes.push(stack.slice());
+            }
+        }
+
+        PlotSchema.crawl(trace._module.attributes, callback);
+
+        return arraySplitAttributes;
+    });
+
     for(var i = 0; i < container.length; i++) {
         var transform = container[i],
             type = transform.type,
@@ -796,6 +818,7 @@ function applyTransforms(fullTrace, fullData, layout) {
                 transform: transform,
                 fullTrace: fullTrace,
                 fullData: fullData,
+                attributeSets: attributeSets,
                 layout: layout
             });
         }

src/transforms/groupby.js

@@ -90,20 +90,15 @@ exports.transform = function(data, state) {
 
     var newData = [];
 
-    data.forEach(function(trace) {
+    data.forEach(function(trace, i) {
 
-        var splittingAttributes = [];
-
-        var attributes = trace._module.attributes;
-        crawl(attributes, splittingAttributes);
-
-        newData = newData.concat(transformOne(trace, state, splittingAttributes));
+        newData = newData.concat(transformOne(trace, state, state.attributeSets[i]));
     });
 
     return newData;
 };
 
-function transformOne(trace, state, splittingAttributes) {
+function transformOne(trace, state, attributeSet) {
 
     var opts = state.transform;
     var groups = opts.groups;
@@ -117,7 +112,7 @@ function transformOne(trace, state, splittingAttributes) {
 
     var style = opts.style || {};
 
-    var topLevelAttributes = splittingAttributes
+    var topLevelAttributes = attributeSet
         .filter(function(array) {return Array.isArray(getDeepProp(trace, array));});
 
     var initializeArray = function(newTrace, a) {
@@ -177,36 +172,3 @@ function setDeepProp(thing, propArray, value) {
     }
     current[propArray[propArray.length - 1]] = value;
 }
-
-// fixme check if similar functions in plot_schema.js can be reused
-function crawl(attrs, list, path) {
-    path = path || [];
-
-    Object.keys(attrs).forEach(function(attrName) {
-        var attr = attrs[attrName];
-        var _path = path.slice();
-        _path.push(attrName);
-
-        if(attrName.charAt(0) === '_') return;
-
-        callback(attr, list, _path);
-
-        if(isValObject(attr)) return;
-        if(isPlainObject(attr)) crawl(attr, list, _path);
-    });
-}
-
-function isValObject(obj) {
-    return obj && obj.valType !== undefined;
-}
-
-function callback(attr, list, path) {
-    // see schema.defs for complete list of 'val types'
-    if(attr.valType === 'data_array' || attr.arrayOk === true) {
-        list.push(path);
-    }
-}
-
-function isPlainObject(obj) {
-    return Object.prototype.toString.call(obj) === '[object Object]';
-}