Merge pull request #5813 from plotly/sort-object-key-values-in-schema

Sort object key values in schema

Author: archmoj

Diff for: draftlogs/5813_change.md

@@ -0,0 +1 @@
+ - Sort object key values in schema [[#5813](https://github.com/plotly/plotly.js/pull/5813)]

Diff for: src/components/calendars/index.js

@@ -10,7 +10,7 @@ var ONEDAY = constants.ONEDAY;
 
 var attributes = {
     valType: 'enumerated',
-    values: Object.keys(calendars.calendars),
+    values: Lib.sortObjectKeys(calendars.calendars),
     editType: 'calc',
     dflt: 'gregorian'
 };

Diff for: src/components/colorscale/attributes.js

@@ -2,9 +2,10 @@
 
 var colorbarAttrs = require('../colorbar/attributes');
 var counterRegex = require('../../lib/regex').counter;
+var sortObjectKeys = require('../../lib/sort_object_keys');
 
 var palettes = require('./scales.js').scales;
-var paletteStr = Object.keys(palettes);
+var paletteStr = sortObjectKeys(palettes);
 
 function code(s) {
     return '`' + s + '`';

Diff for: src/lib/index.js

@@ -67,6 +67,8 @@ lib.roundUp = searchModule.roundUp;
 lib.sort = searchModule.sort;
 lib.findIndexOfMin = searchModule.findIndexOfMin;
 
+lib.sortObjectKeys = require('./sort_object_keys');
+
 var statsModule = require('./stats');
 lib.aggNums = statsModule.aggNums;
 lib.len = statsModule.len;

Diff for: src/lib/sort_object_keys.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = function sortObjectKeys(obj) {
+    return Object.keys(obj).sort();
+};

Diff for: src/plots/geo/layout_attributes.js

@@ -4,6 +4,7 @@ var colorAttrs = require('../../components/color/attributes');
 var domainAttrs = require('../domain').attributes;
 var constants = require('./constants');
 var overrideAll = require('../../plot_api/edit_types').overrideAll;
+var sortObjectKeys = require('../../lib/sort_object_keys');
 
 var geoAxesAttrs = {
     range: {
@@ -100,14 +101,14 @@ var attrs = module.exports = overrideAll({
     },
     scope: {
         valType: 'enumerated',
-        values: Object.keys(constants.scopeDefaults),
+        values: sortObjectKeys(constants.scopeDefaults),
         dflt: 'world',
         description: 'Set the scope of the map.'
     },
     projection: {
         type: {
             valType: 'enumerated',
-            values: Object.keys(constants.projNames),
+            values: sortObjectKeys(constants.projNames),
             description: 'Sets the projection type.'
         },
         rotation: {

Diff for: src/plots/mapbox/constants.js

@@ -1,5 +1,7 @@
 'use strict';
 
+var sortObjectKeys = require('../../lib/sort_object_keys');
+
 var requiredVersion = '1.10.1';
 
 var OSM = '© <a target="_blank" href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors';
@@ -156,7 +158,7 @@ var stylesNonMapbox = {
     }
 };
 
-var styleValuesNonMapbox = Object.keys(stylesNonMapbox);
+var styleValuesNonMapbox = sortObjectKeys(stylesNonMapbox);
 
 module.exports = {
     requiredVersion: requiredVersion,

Diff for: src/traces/scatter3d/attributes.js

@@ -11,6 +11,7 @@ var DASHES = require('../../constants/gl3d_dashes');
 var MARKER_SYMBOLS = require('../../constants/gl3d_markers');
 var extendFlat = require('../../lib/extend').extendFlat;
 var overrideAll = require('../../plot_api/edit_types').overrideAll;
+var sortObjectKeys = require('../../lib/sort_object_keys');
 
 var scatterLineAttrs = scatterAttrs.line;
 var scatterMarkerAttrs = scatterAttrs.marker;
@@ -20,7 +21,7 @@ var lineAttrs = extendFlat({
     width: scatterLineAttrs.width,
     dash: {
         valType: 'enumerated',
-        values: Object.keys(DASHES),
+        values: sortObjectKeys(DASHES),
         dflt: 'solid',
         description: 'Sets the dash style of the lines.'
     }
@@ -122,7 +123,7 @@ var attrs = module.exports = overrideAll({
     marker: extendFlat({  // Parity with scatter.js?
         symbol: {
             valType: 'enumerated',
-            values: Object.keys(MARKER_SYMBOLS),
+            values: sortObjectKeys(MARKER_SYMBOLS),
             dflt: 'circle',
             arrayOk: true,
             description: 'Sets the marker symbol type.'

Diff for: src/traces/scattergl/attributes.js

@@ -5,6 +5,7 @@ var scatterAttrs = require('../scatter/attributes');
 var axisHoverFormat = require('../../plots/cartesian/axis_format_attributes').axisHoverFormat;
 var colorScaleAttrs = require('../../components/colorscale/attributes');
 
+var sortObjectKeys = require('../../lib/sort_object_keys');
 var extendFlat = require('../../lib/extend').extendFlat;
 var overrideAll = require('../../plot_api/edit_types').overrideAll;
 var DASHES = require('./constants').DASHES;
@@ -59,7 +60,7 @@ var attrs = module.exports = overrideAll({
         },
         dash: {
             valType: 'enumerated',
-            values: Object.keys(DASHES),
+            values: sortObjectKeys(DASHES),
             dflt: 'solid',
             description: 'Sets the style of the lines.'
         }