lib function to interleave trace updates into a restyle

Conflicts:
	src/lib/index.js

lib function to interleave trace updates into a restyle

Conflicts:
	src/lib/index.js

Author: rreusser

src/lib/index.js

@@ -746,3 +746,42 @@ lib.computeFrame = function(frameLookup, frameName) {
 
     return result;
 };
+
+/**
+ * Interleaves separate trace updates (frames) into a restyle command.
+ * Attributes not specified in both traces are set to `undefined` so that
+ * they are not altered by restyle. Object paths are *not* expanded.
+ *
+ * @example
+ * lib.interleaveTraceUpdates([{x: [1]}, {x: [2]}])
+ * // returns {x: [[1], [2]]}
+ *
+ * @param   {array} traces       the trace updates to be interleaved
+ *
+ * @return  {object}    an object contianing the interleaved properties
+ */
+lib.interleaveTraceUpdates = function(traces) {
+    var i, j, k, prop, trace, props;
+    var n = traces.length;
+    var output = {};
+
+    for(i = 0; i < traces.length; i++) {
+        trace = traces[i];
+        props = Object.keys(trace);
+        for(j = 0; j < props.length; j++) {
+            prop = props[j];
+            if(!output[prop]) {
+                // If not present, allocate a new array:
+                output[prop] = [];
+
+                // Explicitly fill this array with undefined:
+                for(k = 0; k < n; k++) {
+                    output[prop][k] = undefined;
+                }
+            }
+            output[prop][i] = traces[i][prop];
+        }
+    }
+
+    return output;
+};

test/jasmine/tests/lib_test.js

@@ -1401,6 +1401,34 @@ describe('Test lib.js:', function() {
             }).toThrowError('Separator string required for formatting!');
         });
     });
+
+    describe('interleaveTraceUpdates', function() {
+        it('wraps property updates in arrays', function() {
+            var input = [{x: [1], 'marker.color': 'red'}];
+            var output = Lib.interleaveTraceUpdates(input);
+
+            expect(output).toEqual({
+                x: [[1]],
+                'marker.color': ['red']
+            });
+        });
+
+        it('merges traces into a single restyle', function() {
+            var input = [
+                {x: [1], 'marker.color': 'red'},
+                {y: [[7, 8], [4, 2]], 'marker.goodness': 'very', symbols: {visible: 'please'}}
+            ];
+            var output = Lib.interleaveTraceUpdates(input);
+
+            expect(output).toEqual({
+                x: [[1], undefined],
+                y: [undefined, [[7, 8], [4, 2]]],
+                'marker.color': ['red', undefined],
+                'marker.goodness': [undefined, 'very'],
+                'symbols': [undefined, {visible: 'please'}]
+            });
+        });
+    });
 });
 
 describe('Queue', function() {