try more useless refs to input container in full trace

- move traceOut.index and traceOut._input assignments
  out of supplyTraceDefaults for clarity
- 'index' ref -> index in user data (as before)
- '_input' ref -> trace in user data (as before)
- '_expandedIndex' ref -> index in fullData
- '_expandedInput' ref -> full trace after transform,
  before 2nd trace dflts

Author: etpinard

src/plots/plots.js

@@ -647,29 +647,33 @@ plots.supplyDataDefaults = function(dataIn, dataOut, layout) {
     }
 
     for(var i = 0; i < dataIn.length; i++) {
-        var trace = dataIn[i];
-
-        var fullTrace = plots.supplyTraceDefaults(trace, cnt, layout);
-
-        // keep track of pre-transform _input
-        var traceIn = fullTrace._input;
+        var trace = dataIn[i],
+            fullTrace = plots.supplyTraceDefaults(trace, cnt, layout);
 
         if(fullTrace.transforms && fullTrace.transforms.length) {
             var expandedTraces = applyTransforms(fullTrace, dataOut, layout);
 
             for(var j = 0; j < expandedTraces.length; j++) {
-                var expandedTrace = expandedTraces[j];
-                var fullExpandedTrace = plots.supplyTraceDefaults(expandedTrace, cnt, layout);
+                var expandedTrace = expandedTraces[j],
+                    fullExpandedTrace = plots.supplyTraceDefaults(expandedTrace, cnt, layout);
+
+                // add info about parent data trace
+                fullExpandedTrace.index = i;
+                fullExpandedTrace._input = trace;
+                fullExpandedTrace._fullInput = fullTrace;
 
-                // copy refs
-                fullExpandedTrace._input = traceIn;
-                fullExpandedTrace._fullTransforms = fullTrace.transforms;
-                fullExpandedTrace._index = i;
+                // add info about the expanded data
+                fullExpandedTrace._expandedIndex = cnt;
+                fullExpandedTrace._expandedInput = expandedTrace;
 
                 pushModule(fullExpandedTrace);
             }
         }
         else {
+            fullTrace.index = i;
+            fullTrace._input = trace;
+            fullTrace._expandedIndex = cnt;
+
             pushModule(fullTrace);
         }
     }
@@ -690,8 +694,6 @@ plots.supplyTraceDefaults = function(traceIn, traceIndex, layout) {
             plots.subplotsRegistry[subplotType].attributes, subplotAttr);
     }
 
-    // module-independent attributes
-    traceOut.index = traceIndex;
     var visible = coerce('visible');
 
     coerce('type');
@@ -740,9 +742,6 @@ plots.supplyTraceDefaults = function(traceIn, traceIndex, layout) {
         supplyTransformDefaults(traceIn, traceOut, layout);
     }
 
-    // reference back to the input object for convenience
-    traceOut._input = traceIn;
-
     return traceOut;
 };
 

test/jasmine/tests/transforms_test.js

@@ -95,7 +95,7 @@ describe('one-to-one transforms:', function() {
         }]);
 
         // keep ref to full transforms array
-        expect(dataOut[0]._fullTransforms).toEqual([{
+        expect(dataOut[0]._fullInput.transforms).toEqual([{
             type: 'filter',
             operation: '>',
             value: 0,
@@ -107,7 +107,7 @@ describe('one-to-one transforms:', function() {
 
         // TODO do we really need this ???
         // set _index w.r.t. user data
-        expect(dataOut[0]._index).toEqual(0);
+        expect(dataOut[0].index).toEqual(0);
     });
 
     it('Plotly.plot should plot the transform trace', function(done) {