Merge pull request #193 from plotly/subplot-registration

mdtusz · mdtusz · commit 58e86d94d1ac · 2016-01-20T10:46:18.000-05:00
Subplot registration
diff --git a/src/components/annotations/attributes.js b/src/components/annotations/attributes.js
@@ -8,8 +8,8 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
 var ARROWPATHS = require('./arrow_paths');
+var Cartesian = require('../../plots/cartesian');
 var fontAttrs = require('../../plots/font_attributes');
 var extendFlat = require('../../lib/extend').extendFlat;
 
@@ -156,7 +156,7 @@ module.exports = {
         valType: 'enumerated',
         values: [
             'paper',
-            Plotly.Plots.subplotsRegistry.cartesian.idRegex.x.toString()
+            Cartesian.idRegex.x.toString()
         ],
         role: 'info',
         description: [
@@ -199,7 +199,7 @@ module.exports = {
         valType: 'enumerated',
         values: [
             'paper',
-            Plotly.Plots.subplotsRegistry.cartesian.idRegex.y.toString()
+            Cartesian.idRegex.y.toString()
         ],
         role: 'info',
         description: [
diff --git a/src/plot_api/plot_schema.js b/src/plot_api/plot_schema.js
@@ -286,7 +286,7 @@ function handleSubplotObjs(layoutAttributes) {
             var subplotRegistry = subplotsRegistry[subplotType],
                 isSubplotObj;
 
-            if(subplotType === 'cartesian') {
+            if(subplotType === 'cartesian' || subplotType === 'gl2d') {
                 isSubplotObj = (
                     subplotRegistry.attrRegex.x.test(k) ||
                     subplotRegistry.attrRegex.y.test(k)
diff --git a/src/plotly.js b/src/plotly.js
@@ -36,23 +36,10 @@ exports.defaultConfig = require('./plot_api/plot_config');
 // plots
 var Plots = exports.Plots = require('./plots/plots');
 
-var Cartesian = require('./plots/cartesian');
-Plots.registerSubplot(Cartesian);
-
-var Geo = require('./plots/geo');
-Plots.registerSubplot(Geo);
-
-var Gl3d = require('./plots/gl3d');
-Plots.registerSubplot(Gl3d);
-
-var Gl2d = require('./plots/gl2d');
-Plots.registerSubplot(Gl2d);
-
 exports.Axes = require('./plots/cartesian/axes');
 exports.Fx = require('./plots/cartesian/graph_interact');
 exports.micropolar = require('./plots/polar/micropolar');
 
-
 // components
 exports.Color = require('./components/color');
 exports.Drawing = require('./components/drawing');
@@ -80,6 +67,10 @@ exports.register = function register(_modules) {
             throw new Error('Invalid module was attempted to be registered!');
         } else {
             Plots.register(newModule, newModule.name, newModule.categories, newModule.meta);
+
+            if(!Plots.subplotsRegistry[newModule.basePlotModule.name]){
+                Plots.registerSubplot(newModule.basePlotModule);
+            }
         }
     }
 };
diff --git a/src/plots/cartesian/index.js b/src/plots/cartesian/index.js
@@ -17,3 +17,13 @@ exports.attr = ['xaxis', 'yaxis'];
 exports.idRoot = ['x', 'y'];
 
 exports.attributes = require('./attributes');
+
+exports.idRegex = {
+    x: /^x([2-9]|[1-9][0-9]+)?$/,
+    y: /^y([2-9]|[1-9][0-9]+)?$/
+};
+
+exports.attrRegex = {
+    x: /^xaxis([2-9]|[1-9][0-9]+)?$/,
+    y: /^yaxis([2-9]|[1-9][0-9]+)?$/
+};
diff --git a/src/plots/cartesian/layout_attributes.js b/src/plots/cartesian/layout_attributes.js
@@ -7,13 +7,11 @@
 */
 
 'use strict';
-
-var Plotly = require('../../plotly');
+var Cartesian = require('./index');
 var fontAttrs = require('../font_attributes');
 var colorAttrs = require('../../components/color/attributes');
 var extendFlat = require('../../lib/extend').extendFlat;
 
-
 module.exports = {
     title: {
         valType: 'string',
@@ -385,8 +383,8 @@ module.exports = {
         valType: 'enumerated',
         values: [
             'free',
-            Plotly.Plots.subplotsRegistry.cartesian.idRegex.x.toString(),
-            Plotly.Plots.subplotsRegistry.cartesian.idRegex.y.toString()
+            Cartesian.idRegex.x.toString(),
+            Cartesian.idRegex.y.toString()
         ],
         role: 'info',
         description: [
@@ -414,8 +412,8 @@ module.exports = {
         valType: 'enumerated',
         values: [
             'free',
-            Plotly.Plots.subplotsRegistry.cartesian.idRegex.x.toString(),
-            Plotly.Plots.subplotsRegistry.cartesian.idRegex.y.toString()
+            Cartesian.idRegex.x.toString(),
+            Cartesian.idRegex.y.toString()
         ],
         role: 'info',
         description: [
diff --git a/src/plots/geo/geo.js b/src/plots/geo/geo.js
@@ -11,10 +11,13 @@
 
 /* global PlotlyGeoAssets:false */
 
-var Plotly = require('../../plotly');
 var d3 = require('d3');
 
+var Color = require('../../components/color');
+var Drawing = require('../../components/drawing');
+
 var Plots = require('../../plots/plots');
+var Axes = require('../../plots/cartesian/axes');
 
 var addProjectionsToD3 = require('./projections');
 var createGeoScale = require('./set_scale');
@@ -350,7 +353,7 @@ function styleFillLayer(selection, layerName, geoLayout) {
     selection.select('.' + layerName)
         .selectAll('path')
             .attr('stroke', 'none')
-            .call(Plotly.Color.fill, geoLayout[layerAdj + 'color']);
+            .call(Color.fill, geoLayout[layerAdj + 'color']);
 }
 
 function styleLineLayer(selection, layerName, geoLayout) {
@@ -359,16 +362,16 @@ function styleLineLayer(selection, layerName, geoLayout) {
     selection.select('.' + layerName)
         .selectAll('path')
             .attr('fill', 'none')
-            .call(Plotly.Color.stroke, geoLayout[layerAdj + 'color'])
-            .call(Plotly.Drawing.dashLine, '', geoLayout[layerAdj + 'width']);
+            .call(Color.stroke, geoLayout[layerAdj + 'color'])
+            .call(Drawing.dashLine, '', geoLayout[layerAdj + 'width']);
 }
 
 function styleGraticule(selection, axisName, geoLayout) {
     selection.select('.' + axisName + 'graticule')
         .selectAll('path')
             .attr('fill', 'none')
-            .call(Plotly.Color.stroke, geoLayout[axisName].gridcolor)
-            .call(Plotly.Drawing.dashLine, '', geoLayout[axisName].gridwidth);
+            .call(Color.stroke, geoLayout[axisName].gridcolor)
+            .call(Drawing.dashLine, '', geoLayout[axisName].gridwidth);
 }
 
 proto.styleLayer = function(selection, layerName, geoLayout) {
@@ -451,10 +454,10 @@ function createMockAxis(fullLayout) {
     var mockAxis = {
         type: 'linear',
         showexponent: 'all',
-        exponentformat: Plotly.Axes.layoutAttributes.exponentformat.dflt,
+        exponentformat: Axes.layoutAttributes.exponentformat.dflt,
         _td: { _fullLayout: fullLayout }
     };
 
-    Plotly.Axes.setConvert(mockAxis);
+    Axes.setConvert(mockAxis);
     return mockAxis;
 }
diff --git a/src/plots/geo/index.js b/src/plots/geo/index.js
@@ -9,11 +9,9 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
-
 var Geo = require('./geo');
 
-var Plots = Plotly.Plots;
+var Plots = require('../../plots/plots');
 
 
 exports.name = 'geo';
@@ -22,6 +20,10 @@ exports.attr = 'geo';
 
 exports.idRoot = 'geo';
 
+exports.idRegex = /^geo([2-9]|[1-9][0-9]+)?$/;
+
+exports.attrRegex = /^geo([2-9]|[1-9][0-9]+)?$/;
+
 exports.attributes = require('./layout/attributes');
 
 exports.layoutAttributes = require('./layout/layout_attributes');
diff --git a/src/plots/geo/layout/axis_defaults.js b/src/plots/geo/layout/axis_defaults.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-var Plotly = require('../../../plotly');
+var Lib = require('../../../lib');
 var constants = require('../../../constants/geo_constants');
 var axisAttributes = require('./axis_attributes');
 
@@ -20,7 +20,7 @@ module.exports = function supplyGeoAxisLayoutDefaults(geoLayoutIn, geoLayoutOut)
     var axisIn, axisOut;
 
     function coerce(attr, dflt) {
-        return Plotly.Lib.coerce(axisIn, axisOut, axisAttributes, attr, dflt);
+        return Lib.coerce(axisIn, axisOut, axisAttributes, attr, dflt);
     }
 
     function getRangeDflt(axisName) {
@@ -55,7 +55,7 @@ module.exports = function supplyGeoAxisLayoutDefaults(geoLayoutIn, geoLayoutOut)
 
         var range = coerce('range', rangeDflt);
 
-        Plotly.Lib.noneOrAll(axisIn.range, axisOut.range, [0, 1]);
+        Lib.noneOrAll(axisIn.range, axisOut.range, [0, 1]);
 
         coerce('tick0', range[0]);
         coerce('dtick', axisName==='lonaxis' ? 30 : 10);
diff --git a/src/plots/geo/layout/defaults.js b/src/plots/geo/layout/defaults.js
@@ -9,20 +9,21 @@
 
 'use strict';
 
-var Plotly = require('../../../plotly');
+var Lib = require('../../../lib');
+var Plots = require('../../plots');
 var constants = require('../../../constants/geo_constants');
 var layoutAttributes = require('./layout_attributes');
 var supplyGeoAxisLayoutDefaults = require('./axis_defaults');
 
 
 module.exports = function supplyLayoutDefaults(layoutIn, layoutOut, fullData) {
-    var geos = Plotly.Plots.getSubplotIdsInData(fullData, 'geo'),
+    var geos = Plots.getSubplotIdsInData(fullData, 'geo'),
         geosLength = geos.length;
 
     var geoLayoutIn, geoLayoutOut;
 
     function coerce(attr, dflt) {
-        return Plotly.Lib.coerce(geoLayoutIn, geoLayoutOut, layoutAttributes, attr, dflt);
+        return Lib.coerce(geoLayoutIn, geoLayoutOut, layoutAttributes, attr, dflt);
     }
 
     for(var i = 0; i < geosLength; i++) {
diff --git a/src/plots/gl2d/index.js b/src/plots/gl2d/index.js
@@ -22,6 +22,16 @@ exports.attr = ['xaxis', 'yaxis'];
 
 exports.idRoot = ['x', 'y'];
 
+exports.idRegex = {
+    x: /^x([2-9]|[1-9][0-9]+)?$/,
+    y: /^y([2-9]|[1-9][0-9]+)?$/
+};
+
+exports.attrRegex = {
+    x: /^xaxis([2-9]|[1-9][0-9]+)?$/,
+    y: /^yaxis([2-9]|[1-9][0-9]+)?$/
+};
+
 exports.attributes = require('../cartesian/attributes');
 
 exports.plot = function plotGl2d(gd) {
diff --git a/src/plots/gl3d/index.js b/src/plots/gl3d/index.js
@@ -21,6 +21,10 @@ exports.attr = 'scene';
 
 exports.idRoot = 'scene';
 
+exports.idRegex = /^scene([2-9]|[1-9][0-9]+)?$/;
+
+exports.attrRegex = /^scene([2-9]|[1-9][0-9]+)?$/;
+
 exports.attributes = require('./layout/attributes');
 
 exports.layoutAttributes = require('./layout/layout_attributes');
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -41,7 +41,7 @@ plots.fontWeight = 'normal';
  */
 plots.register = function(_module, thisType, categoriesIn, meta) {
     if(modules[thisType]) {
-        console.warn('type ' + thisType + ' already registered');
+        console.log('type ' + thisType + ' already registered');
         return;
     }
 
@@ -132,32 +132,12 @@ plots.registerSubplot = function(_module) {
     var plotType = _module.name;
 
     if(subplotsRegistry[plotType]) {
-        throw new Error('plot type' + plotType + ' already registered');
-    }
-
-    var attr = _module.attr,
-        idRoot = _module.idRoot;
-
-    var regexStart = '^',
-        regexEnd = '([2-9]|[1-9][0-9]+)?$',
-        hasXY = (plotType === 'cartesian' || subplotsRegistry === 'gl2d');
-
-    function makeRegex(mid) {
-        return new RegExp(regexStart + mid + regexEnd);
+        console.log('plot type ' + plotType + ' already registered');
+        return;
     }
 
     // not sure what's best for the 'cartesian' type at this point
     subplotsRegistry[plotType] = _module;
-
-    // register the regex representing the set of all valid attribute names
-    subplotsRegistry[plotType].attrRegex = hasXY ?
-        { x: makeRegex(attr[0]), y: makeRegex(attr[1]) } :
-        makeRegex(attr);
-
-    // register the regex representing the set of all valid attribute ids
-    subplotsRegistry[plotType].idRegex = hasXY ?
-        { x: makeRegex(idRoot[0]), y: makeRegex(idRoot[1]) } :
-        makeRegex(idRoot);
 };
 
 // TODO separate the 'find subplot' step (which looks in layout)
diff --git a/src/traces/bar/index.js b/src/traces/bar/index.js
@@ -25,6 +25,7 @@ Bar.hoverPoints = require('./hover');
 
 Bar.moduleType = 'trace';
 Bar.name = 'bar';
+Bar.basePlotModule = require('../../plots/cartesian');
 Bar.categories = ['cartesian', 'bar', 'oriented', 'markerColorscale', 'errorBarsOK', 'showLegend'];
 Bar.meta = {
     description: [
diff --git a/src/traces/box/index.js b/src/traces/box/index.js
@@ -22,6 +22,7 @@ Box.hoverPoints = require('./hover');
 
 Box.moduleType = 'trace';
 Box.name = 'box';
+Box.basePlotModule = require('../../plots/cartesian');
 Box.categories = ['cartesian', 'symbols', 'oriented', 'box', 'showLegend'];
 Box.meta = {
     description: [
diff --git a/src/traces/choropleth/index.js b/src/traces/choropleth/index.js
@@ -19,6 +19,7 @@ Choropleth.plot = require('./plot').plot;
 
 Choropleth.moduleType = 'trace';
 Choropleth.name = 'choropleth';
+Choropleth.basePlotModule = require('../../plots/geo');
 Choropleth.categories = ['geo', 'noOpacity'];
 Choropleth.meta = {
     description: [
diff --git a/src/traces/contour/index.js b/src/traces/contour/index.js
@@ -21,6 +21,7 @@ Contour.hoverPoints = require('./hover');
 
 Contour.moduleType = 'trace';
 Contour.name = 'contour';
+Contour.basePlotModule = require('../../plots/cartesian');
 Contour.categories = ['cartesian', '2dMap', 'contour'];
 Contour.meta = {
     description: [
diff --git a/src/traces/heatmap/index.js b/src/traces/heatmap/index.js
@@ -21,6 +21,7 @@ Heatmap.hoverPoints = require('./hover');
 
 Heatmap.moduleType = 'trace';
 Heatmap.name = 'heatmap';
+Heatmap.basePlotModule = require('../../plots/cartesian');
 Heatmap.categories = ['cartesian', '2dMap'];
 Heatmap.meta = {
     description: [
diff --git a/src/traces/histogram/index.js b/src/traces/histogram/index.js
@@ -38,6 +38,7 @@ Histogram.hoverPoints = require('../bar/hover');
 
 Histogram.moduleType = 'trace';
 Histogram.name = 'histogram';
+Histogram.basePlotModule = require('../../plots/cartesian');
 Histogram.categories = ['cartesian', 'bar', 'histogram', 'oriented', 'errorBarsOK', 'showLegend'];
 Histogram.meta = {
     description: [
diff --git a/src/traces/histogram2d/index.js b/src/traces/histogram2d/index.js
@@ -21,6 +21,7 @@ Histogram2D.hoverPoints = require('../heatmap/hover');
 
 Histogram2D.moduleType = 'trace';
 Histogram2D.name = 'histogram2d';
+Histogram2D.basePlotModule = require('../../plots/cartesian');
 Histogram2D.categories = ['cartesian', '2dMap', 'histogram'];
 Histogram2D.meta = {
     hrName: 'histogram_2d',
diff --git a/src/traces/histogram2dcontour/index.js b/src/traces/histogram2dcontour/index.js
@@ -21,6 +21,7 @@ Histogram2dContour.hoverPoints = require('../contour/hover');
 
 Histogram2dContour.moduleType = 'trace';
 Histogram2dContour.name = 'histogram2dcontour';
+Histogram2dContour.basePlotModule = require('../../plots/cartesian');
 Histogram2dContour.categories = ['cartesian', '2dMap', 'contour', 'histogram'];
 Histogram2dContour.meta = {
     hrName: 'histogram_2d_contour',
diff --git a/src/traces/mesh3d/index.js b/src/traces/mesh3d/index.js
diff --git a/src/traces/pie/index.js b/src/traces/pie/index.js
diff --git a/src/traces/scatter/index.js b/src/traces/scatter/index.js
diff --git a/src/traces/scatter3d/index.js b/src/traces/scatter3d/index.js
diff --git a/src/traces/scattergeo/index.js b/src/traces/scattergeo/index.js
diff --git a/src/traces/scattergeo/plot.js b/src/traces/scattergeo/plot.js
diff --git a/src/traces/scattergl/index.js b/src/traces/scattergl/index.js
diff --git a/src/traces/surface/index.js b/src/traces/surface/index.js
diff --git a/test/jasmine/tests/plots_test.js b/test/jasmine/tests/plots_test.js
diff --git a/test/jasmine/tests/register_test.js b/test/jasmine/tests/register_test.js
