Modify trace modules to all follow the same format, exporing plot

Author: mdtusz

src/traces/bar/index.js

@@ -9,9 +9,11 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
+var Plots = require('../../plots/plots');
 
-Plotly.Plots.register(exports, 'bar',
+var Bar = {};
+
+Plots.register(Bar, 'bar',
     ['cartesian', 'bar', 'oriented', 'markerColorscale', 'errorBarsOK', 'showLegend'], {
         description: [
             'The data visualized by the span of the bars is set in `y`',
@@ -23,24 +25,16 @@ Plotly.Plots.register(exports, 'bar',
     }
 );
 
-exports.attributes = require('./attributes');
-
-exports.layoutAttributes = require('./layout_attributes');
-
-exports.supplyDefaults = require('./defaults');
-
-exports.supplyLayoutDefaults = require('./layout_defaults');
-
-exports.calc = require('./calc');
-
-exports.setPositions = require('./set_positions');
-
-exports.colorbar = require('../scatter/colorbar');
-
-exports.arraysToCalcdata = require('./arrays_to_calcdata');
-
-exports.plot = require('./plot');
-
-exports.style = require('./style');
-
-exports.hoverPoints = require('./hover');
+Bar.attributes = require('./attributes');
+Bar.layoutAttributes = require('./layout_attributes');
+Bar.supplyDefaults = require('./defaults');
+Bar.supplyLayoutDefaults = require('./layout_defaults');
+Bar.calc = require('./calc');
+Bar.setPositions = require('./set_positions');
+Bar.colorbar = require('../scatter/colorbar');
+Bar.arraysToCalcdata = require('./arrays_to_calcdata');
+Bar.plot = require('./plot');
+Bar.style = require('./style');
+Bar.hoverPoints = require('./hover');
+
+module.exports = Bar;

src/traces/box/index.js

@@ -8,9 +8,11 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
+var Plots = require('../../plots/plots');
 
-Plotly.Plots.register(exports, 'box',
+var Box = {};
+
+Plots.register(Box, 'box',
     ['cartesian', 'symbols', 'oriented', 'box', 'showLegend'], {
         description: [
             'In vertical (horizontal) box plots,',
@@ -29,12 +31,14 @@ Plotly.Plots.register(exports, 'box',
     }
 );
 
-exports.attributes = require('./attributes');
-exports.layoutAttributes = require('./layout_attributes');
-exports.supplyDefaults = require('./defaults');
-exports.supplyLayoutDefaults = require('./layout_defaults');
-exports.calc = require('./calc');
-exports.setPositions = require('./set_positions');
-exports.plot = require('./plot');
-exports.style = require('./style');
-exports.hoverPoints = require('./hover');
+Box.attributes = require('./attributes');
+Box.layoutAttributes = require('./layout_attributes');
+Box.supplyDefaults = require('./defaults');
+Box.supplyLayoutDefaults = require('./layout_defaults');
+Box.calc = require('./calc');
+Box.setPositions = require('./set_positions');
+Box.plot = require('./plot');
+Box.style = require('./style');
+Box.hoverPoints = require('./hover');
+
+module.exports = Box;

src/traces/choropleth/index.js

@@ -11,7 +11,9 @@
 
 var Plots = require('../../plots/plots');
 
-Plots.register(exports, 'choropleth', ['geo', 'noOpacity'], {
+var Choropleth = {};
+
+Plots.register(Choropleth, 'choropleth', ['geo', 'noOpacity'], {
     description: [
         'The data that describes the choropleth value-to-color mapping',
         'is set in `z`.',
@@ -20,10 +22,10 @@ Plots.register(exports, 'choropleth', ['geo', 'noOpacity'], {
     ].join(' ')
 });
 
-exports.attributes = require('./attributes');
-
-exports.supplyDefaults = require('./defaults');
-
-exports.colorbar = require('../heatmap/colorbar');
+Choropleth.attributes = require('./attributes');
+Choropleth.supplyDefaults = require('./defaults');
+Choropleth.colorbar = require('../heatmap/colorbar');
+Choropleth.calc = require('../surface/calc');
+Choropleth.plot = require('./plot').plot;
 
-exports.calc = require('../surface/calc');
+module.exports = Choropleth;

src/traces/contour/index.js

@@ -9,9 +9,11 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
+var Plots = require('../../plots/plots');
 
-Plotly.Plots.register(exports, 'contour',
+var Contour = {};
+
+Plots.register(Contour, 'contour',
     ['cartesian', '2dMap', 'contour'], {
         description: [
             'The data from which contour lines are computed is set in `z`.',
@@ -21,22 +23,22 @@ Plotly.Plots.register(exports, 'contour',
             'these N rows correspond to N y coordinates',
             '(set in `y` or auto-generated) and the M columns',
             'correspond to M x coordinates (set in `x` or auto-generated).',
-
             'By setting `transpose` to *true*, the above behavior is flipped.'
         ].join(' ')
-    }
-);
+    });
+
+Contour.attributes = require('./attributes');
 
-exports.attributes = require('./attributes');
+Contour.supplyDefaults = require('./defaults');
 
-exports.supplyDefaults = require('./defaults');
+Contour.calc = require('./calc');
 
-exports.calc = require('./calc');
+Contour.plot = require('./plot');
 
-exports.plot = require('./plot');
+Contour.style = require('./style');
 
-exports.style = require('./style');
+Contour.colorbar = require('./colorbar');
 
-exports.colorbar = require('./colorbar');
+Contour.hoverPoints = require('./hover');
 
-exports.hoverPoints = require('./hover');
+module.exports = Contour;

src/traces/heatmap/index.js

@@ -9,9 +9,11 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
+var Plots = require('../../plots/plots');
 
-Plotly.Plots.register(exports, 'heatmap', ['cartesian', '2dMap'], {
+var Heatmap = {};
+
+Plots.register(Heatmap, 'heatmap', ['cartesian', '2dMap'], {
     description: [
         'The data that describes the heatmap value-to-color mapping',
         'is set in `z`.',
@@ -38,16 +40,12 @@ Plotly.Plots.register(exports, 'heatmap', ['cartesian', '2dMap'], {
     ].join(' ')
 });
 
-exports.attributes = require('./attributes');
-
-exports.supplyDefaults = require('./defaults');
-
-exports.calc = require('./calc');
-
-exports.plot = require('./plot');
-
-exports.colorbar = require('./colorbar');
-
-exports.style = require('./style');
+Heatmap.attributes = require('./attributes');
+Heatmap.supplyDefaults = require('./defaults');
+Heatmap.calc = require('./calc');
+Heatmap.plot = require('./plot');
+Heatmap.colorbar = require('./colorbar');
+Heatmap.style = require('./style');
+Heatmap.hoverPoints = require('./hover');
 
-exports.hoverPoints = require('./hover');
+module.exports = Heatmap;

src/traces/histogram/index.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
+var Plots = require('../../plots/plots');
 
 /**
  * Histogram has its own attribute, defaults and calc steps,
@@ -24,35 +24,30 @@ var Plotly = require('../../plotly');
  * to allow quadrature combination of errors in summed histograms...
  */
 
-Plotly.Plots.register(exports, 'histogram',
+
+var Histogram = {};
+
+Plots.register(Histogram, 'histogram',
     ['cartesian', 'bar', 'histogram', 'oriented', 'errorBarsOK', 'showLegend'], {
         description: [
             'The sample data from which statistics are computed is set in `x`',
             'for vertically spanning histograms and',
             'in `y` for horizontally spanning histograms.',
-
             'Binning options are set `xbins` and `ybins` respectively',
             'if no aggregation data is provided.'
         ].join(' ')
     }
 );
 
-exports.attributes = require('./attributes');
-
-exports.layoutAttributes = require('../bar/layout_attributes');
-
-exports.supplyDefaults = require('./defaults');
-
-exports.supplyLayoutDefaults = require('../bar/layout_defaults');
-
-exports.calc = require('./calc');
-
-exports.setPositions = require('../bar/set_positions');
-
-exports.plot = require('../bar/plot');
-
-exports.style = require('../bar/style');
-
-exports.colorbar = require('../scatter/colorbar');
-
-exports.hoverPoints = require('../bar/hover');
+Histogram.attributes = require('./attributes');
+Histogram.layoutAttributes = require('../bar/layout_attributes');
+Histogram.supplyDefaults = require('./defaults');
+Histogram.supplyLayoutDefaults = require('../bar/layout_defaults');
+Histogram.calc = require('./calc');
+Histogram.setPositions = require('../bar/set_positions');
+Histogram.plot = require('../bar/plot');
+Histogram.style = require('../bar/style');
+Histogram.colorbar = require('../scatter/colorbar');
+Histogram.hoverPoints = require('../bar/hover');
+
+module.exports = Histogram;

src/traces/histogram2d/index.js

@@ -9,9 +9,11 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
+var Plots = require('../../plots/plots');
 
-Plotly.Plots.register(exports, 'histogram2d',
+var Histogram2D = {};
+
+Plots.register(Histogram2D, 'histogram2d',
     ['cartesian', '2dMap', 'histogram'], {
         hrName: 'histogram_2d',
         description: [
@@ -25,16 +27,12 @@ Plotly.Plots.register(exports, 'histogram2d',
     }
 );
 
-exports.attributes = require('./attributes');
-
-exports.supplyDefaults = require('./defaults');
-
-exports.calc = require('../heatmap/calc');
-
-exports.plot = require('../heatmap/plot');
-
-exports.colorbar = require('../heatmap/colorbar');
-
-exports.style = require('../heatmap/style');
+Histogram2D.attributes = require('./attributes');
+Histogram2D.supplyDefaults = require('./defaults');
+Histogram2D.calc = require('../heatmap/calc');
+Histogram2D.plot = require('../heatmap/plot');
+Histogram2D.colorbar = require('../heatmap/colorbar');
+Histogram2D.style = require('../heatmap/style');
+Histogram2D.hoverPoints = require('../heatmap/hover');
 
-exports.hoverPoints = require('../heatmap/hover');
+module.exports = Histogram2D;

src/traces/histogram2dcontour/index.js

@@ -9,9 +9,11 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
+var Plots = require('../../plots/plots');
 
-Plotly.Plots.register(exports, 'histogram2dcontour',
+var Histogram2dContour = {};
+
+Plots.register(Histogram2dContour, 'histogram2dcontour',
     ['cartesian', '2dMap', 'contour', 'histogram'], {
         hrName: 'histogram_2d_contour',
         description: [
@@ -25,16 +27,12 @@ Plotly.Plots.register(exports, 'histogram2dcontour',
     }
 );
 
-exports.attributes = require('./attributes');
-
-exports.supplyDefaults = require('./defaults');
-
-exports.calc = require('../contour/calc');
-
-exports.plot = require('../contour/plot');
-
-exports.style = require('../contour/style');
-
-exports.colorbar = require('../contour/colorbar');
+Histogram2dContour.attributes = require('./attributes');
+Histogram2dContour.supplyDefaults = require('./defaults');
+Histogram2dContour.calc = require('../contour/calc');
+Histogram2dContour.plot = require('../contour/plot');
+Histogram2dContour.style = require('../contour/style');
+Histogram2dContour.colorbar = require('../contour/colorbar');
+Histogram2dContour.hoverPoints = require('../contour/hover');
 
-exports.hoverPoints = require('../contour/hover');
+module.exports = Histogram2dContour;

src/traces/mesh3d/index.js

@@ -9,11 +9,11 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
+var Plots = require('../../plots/plots');
 
-var Mesh3D = module.exports = {};
+var Mesh3D = {};
 
-Plotly.Plots.register(Mesh3D, 'mesh3d', ['gl3d'], {
+Plots.register(Mesh3D, 'mesh3d', ['gl3d'], {
     description: [
         'Draws sets of triangles with coordinates given by',
         'three 1-dimensional arrays in `x`, `y`, `z` and',
@@ -25,7 +25,8 @@ Plotly.Plots.register(Mesh3D, 'mesh3d', ['gl3d'], {
 });
 
 Mesh3D.attributes = require('./attributes');
-
 Mesh3D.supplyDefaults = require('./defaults');
-
 Mesh3D.colorbar = require('../heatmap/colorbar');
+Mesh3D.plot = require('./convert');
+
+module.exports = Mesh3D;