@@ -13,24 +13,20 @@ function isArray(v) {
1313}
1414
1515function isObject ( v ) {
16- return typeof v === 'object' && v !== null && ! ( isArray ( v ) ) ;
16+ return typeof v === 'object' && v !== null && ! isArray ( v ) ;
1717}
1818
1919function isArrayOfObjects ( v ) {
2020 return isArray ( v ) && isObject ( v [ 0 ] ) ;
2121}
2222
2323function typeHandle ( v ) {
24- return (
25- isArrayOfObjects ( v ) ? sortArrayOfObjects ( v ) :
26- isObject ( v ) ? sortObject ( v ) :
27- v
28- ) ;
24+ return isArrayOfObjects ( v ) ? sortArrayOfObjects ( v ) : isObject ( v ) ? sortObject ( v ) : v ;
2925}
3026
3127function sortArrayOfObjects ( list ) {
3228 var newList = [ ] ;
33- for ( var i = 0 ; i < list . length ; i ++ ) {
29+ for ( var i = 0 ; i < list . length ; i ++ ) {
3430 newList [ i ] = typeHandle ( list [ i ] ) ;
3531 }
3632
@@ -42,7 +38,7 @@ function sortObject(obj) {
4238 allKeys . sort ( caseInsensitive ) ;
4339
4440 var newObj = { } ;
45- for ( var i = 0 ; i < allKeys . length ; i ++ ) {
41+ for ( var i = 0 ; i < allKeys . length ; i ++ ) {
4642 var key = allKeys [ i ] ;
4743 newObj [ key ] = typeHandle ( obj [ key ] ) ;
4844 }
@@ -64,7 +60,7 @@ function makeSchema(plotlyPath, schemaPath) {
6460 var lenAfterSort = plotSchemaStr . length ;
6561 var linesBeforeSort = plotSchemaRaw . split ( '\n' ) . length ;
6662 var linesAfterSort = plotSchemaStr . split ( '\n' ) . length ;
67- if ( linesAfterSort !== linesBeforeSort || lenAfterSort !== lenBeforeSort ) {
63+ if ( linesAfterSort !== linesBeforeSort || lenAfterSort !== lenBeforeSort ) {
6864 throw 'plot schema should have the same length & number of lines before and after sort' ;
6965 } else {
7066 console . log ( 'ok ' + path . basename ( schemaPath ) ) ;
@@ -73,13 +69,9 @@ function makeSchema(plotlyPath, schemaPath) {
7369
7470var isDist = process . argv . indexOf ( 'dist' ) !== - 1 ;
7571
76- var pathToSchema = isDist ?
77- constants . pathToSchemaDist :
78- constants . pathToSchemaDiff ;
72+ var pathToSchema = isDist ? constants . pathToSchemaDist : constants . pathToSchemaDiff ;
7973
80- var pathToPlotly = isDist ?
81- constants . pathToPlotlyDistWithMeta :
82- constants . pathToPlotlyBuild ;
74+ var pathToPlotly = isDist ? constants . pathToPlotlyDistWithMeta : constants . pathToPlotlyBuild ;
8375
8476// output plot-schema JSON
8577makeSchema ( pathToPlotly , pathToSchema ) ;
0 commit comments