Skip to content

Commit

Permalink
.eslintrc.js and fix shadow
Browse files Browse the repository at this point in the history
  • Loading branch information
@cronvel
cronvel committed Jun 3, 2021
1 parent 36df8fb commit 324385a
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 33 deletions.
8 changes: 3 additions & 5 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ module.exports = {
'valid-typeof': 'error' ,
'no-unneeded-ternary': 'error' ,
'no-unused-vars': 'warn' , // During development phase, it's boring to clean unused var since they can be used later
'no-lonely-if': 'error' ,
'no-lonely-if': 'off' , // Can hurt semantic programming
'no-nested-ternary': 'off' , // Now I use the streamlined ternary operator a lot
'no-shadow': 'warn' ,
'no-shadow': 'error' ,
'no-shadow-restricted-names': 'error' ,
'require-atomic-updates': 'off' , // check for possible race condition on assignment, interesting but too nitpicky

Expand Down Expand Up @@ -62,9 +62,7 @@ module.exports = {
'MemberExpression': 1 ,
'flatTernaryExpressions': true
} ] ,
'newline-per-chained-call': [ 'error', {
'ignoreChainWithDepth': 2
} ] ,
'newline-per-chained-call': 'off',
'no-multi-spaces': 'off' ,
'block-spacing': 'error' ,
'comma-spacing': [ 'error' , {
Expand Down
56 changes: 28 additions & 28 deletions lib/format.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,13 +345,13 @@ modes.f = ( arg , modeArg ) => {
if ( typeof arg === 'string' ) { arg = parseFloat( arg ) ; }
if ( typeof arg !== 'number' ) { arg = 0 ; }

var modes = floatModeArg( modeArg ) ,
sn = new StringNumber( arg , '.' , modes.groupSeparator ) ;
var subModes = floatModeArg( modeArg ) ,
sn = new StringNumber( arg , '.' , subModes.groupSeparator ) ;

if ( modes.rounding !== null ) { sn.round( modes.rounding ) ; }
if ( modes.precision ) { sn.precision( modes.precision ) ; }
if ( subModes.rounding !== null ) { sn.round( subModes.rounding ) ; }
if ( subModes.precision ) { sn.precision( subModes.precision ) ; }

return sn.toString( modes.leftPadding , modes.rightPadding , modes.rightPaddingOnlyIfDecimal ) ;
return sn.toString( subModes.leftPadding , subModes.rightPadding , subModes.rightPaddingOnlyIfDecimal ) ;
} ;

modes.f.noSanitize = true ;
Expand All @@ -365,14 +365,14 @@ modes.P = ( arg , modeArg ) => {

arg *= 100 ;

var modes = floatModeArg( modeArg ) ,
sn = new StringNumber( arg , '.' , modes.groupSeparator ) ;
var subModes = floatModeArg( modeArg ) ,
sn = new StringNumber( arg , '.' , subModes.groupSeparator ) ;

// Force rounding to zero by default
if ( modes.rounding !== null || ! modes.precision ) { sn.round( modes.rounding || 0 ) ; }
if ( modes.precision ) { sn.precision( modes.precision ) ; }
if ( subModes.rounding !== null || ! subModes.precision ) { sn.round( subModes.rounding || 0 ) ; }
if ( subModes.precision ) { sn.precision( subModes.precision ) ; }

return sn.toNoExpString( modes.leftPadding , modes.rightPadding , modes.rightPaddingOnlyIfDecimal ) + '%' ;
return sn.toNoExpString( subModes.leftPadding , subModes.rightPadding , subModes.rightPaddingOnlyIfDecimal ) + '%' ;
} ;

modes.P.noSanitize = true ;
Expand All @@ -386,15 +386,15 @@ modes.p = ( arg , modeArg ) => {

arg = ( arg - 1 ) * 100 ;

var modes = floatModeArg( modeArg ) ,
sn = new StringNumber( arg , '.' , modes.groupSeparator ) ;
var subModes = floatModeArg( modeArg ) ,
sn = new StringNumber( arg , '.' , subModes.groupSeparator ) ;

// Force rounding to zero by default
if ( modes.rounding !== null || ! modes.precision ) { sn.round( modes.rounding || 0 ) ; }
if ( modes.precision ) { sn.precision( modes.precision ) ; }
if ( subModes.rounding !== null || ! subModes.precision ) { sn.round( subModes.rounding || 0 ) ; }
if ( subModes.precision ) { sn.precision( subModes.precision ) ; }

// 4th argument force a '+' sign
return sn.toNoExpString( modes.leftPadding , modes.rightPadding , modes.rightPaddingOnlyIfDecimal , true ) + '%' ;
return sn.toNoExpString( subModes.leftPadding , subModes.rightPadding , subModes.rightPaddingOnlyIfDecimal , true ) + '%' ;
} ;

modes.p.noSanitize = true ;
Expand All @@ -406,14 +406,14 @@ modes.k = ( arg , modeArg ) => {
if ( typeof arg === 'string' ) { arg = parseFloat( arg ) ; }
if ( typeof arg !== 'number' ) { return '0' ; }

var modes = floatModeArg( modeArg ) ,
sn = new StringNumber( arg , '.' , modes.groupSeparator ) ;
var subModes = floatModeArg( modeArg ) ,
sn = new StringNumber( arg , '.' , subModes.groupSeparator ) ;

if ( modes.rounding !== null ) { sn.round( modes.rounding ) ; }
if ( subModes.rounding !== null ) { sn.round( subModes.rounding ) ; }
// Default to 3 numbers precision
if ( modes.precision || modes.rounding === null ) { sn.precision( modes.precision || 3 ) ; }
if ( subModes.precision || subModes.rounding === null ) { sn.precision( subModes.precision || 3 ) ; }

return sn.toMetricString( modes.leftPadding , modes.rightPadding , modes.rightPaddingOnlyIfDecimal ) ;
return sn.toMetricString( subModes.leftPadding , subModes.rightPadding , subModes.rightPaddingOnlyIfDecimal ) ;
} ;

modes.k.noSanitize = true ;
Expand All @@ -425,11 +425,11 @@ modes.e = ( arg , modeArg ) => {
if ( typeof arg === 'string' ) { arg = parseFloat( arg ) ; }
if ( typeof arg !== 'number' ) { arg = 0 ; }

var modes = floatModeArg( modeArg ) ,
sn = new StringNumber( arg , '.' , modes.groupSeparator ) ;
var subModes = floatModeArg( modeArg ) ,
sn = new StringNumber( arg , '.' , subModes.groupSeparator ) ;

if ( modes.rounding !== null ) { sn.round( modes.rounding ) ; }
if ( modes.precision ) { sn.precision( modes.precision ) ; }
if ( subModes.rounding !== null ) { sn.round( subModes.rounding ) ; }
if ( subModes.precision ) { sn.precision( subModes.precision ) ; }

return sn.toExponential() ;
} ;
Expand All @@ -443,11 +443,11 @@ modes.K = ( arg , modeArg ) => {
if ( typeof arg === 'string' ) { arg = parseFloat( arg ) ; }
if ( typeof arg !== 'number' ) { arg = 0 ; }

var modes = floatModeArg( modeArg ) ,
sn = new StringNumber( arg , '.' , modes.groupSeparator ) ;
var subModes = floatModeArg( modeArg ) ,
sn = new StringNumber( arg , '.' , subModes.groupSeparator ) ;

if ( modes.rounding !== null ) { sn.round( modes.rounding ) ; }
if ( modes.precision ) { sn.precision( modes.precision ) ; }
if ( subModes.rounding !== null ) { sn.round( subModes.rounding ) ; }
if ( subModes.precision ) { sn.precision( subModes.precision ) ; }

return sn.toScientific() ;
} ;
Expand Down

0 comments on commit 324385a

Please sign in to comment.