Format %t and %T: fix rounding error making it possible to display 60…

…s instead of the incremented minute, fix sign

CHANGELOG

@@ -1,4 +1,10 @@
 
+v0.16.6
+-------
+
+Format %t and %T: fix rounding error making it possible to display 60s instead of the incremented minute, fix sign
+
+
 v0.16.5
 -------
 

browser/string-kit.js

@@ -60,6 +60,12 @@ StringNumber.prototype.set = function( number ) {
 
 	number = + number ;
 
+	// Reset anything, if it was already used...
+	this.sign = 1 ;
+	this.digits.length = 0 ;
+	this.exposant = 0 ;
+	this.special = null ;
+
 	if ( ! Number.isFinite( number ) ) {
 		this.special = number ;
 		return null ;
@@ -301,6 +307,8 @@ StringNumber.prototype.precision = function( n , type = 0 ) {
 
 	if ( n < 0 ) { this.digits.length = 0 ; return this ; }
 
+	type *= this.sign ;
+
 	if ( type < 0 ) {
 		roundUp =
 			this.digits.length > n + 4
@@ -1664,32 +1672,61 @@ modes.t = ( arg , modeArg , useLetters = true ) => {
 	if ( typeof arg !== 'number' ) { return '(NaN)' ; }
 
 	var h , min , s , sn , sStr ,
+		sign = '' ,
 		subModes = timeModeArg( modeArg ) ,
+		roundingType = subModes.roundingType ,
 		hSeparator = useLetters ? 'h' : ':' ,
 		minSeparator = useLetters ? 'min' : ':' ,
 		sSeparator = useLetters ? 's' : '.' ,
 		forceDecimalSeparator = useLetters ;
 
 	s = arg / 1000 ;
+
+	if ( s < 0 ) {
+		s = -s ;
+		roundingType *= -1 ;
+		sign = '-' ;
+	}
+
 	if ( s < 60 && ! subModes.forceMinutes ) {
 		sn = new StringNumber( s , sSeparator , undefined , forceDecimalSeparator ) ;
-		sn.round( subModes.rounding , subModes.roundingType ) ;
-		sStr = sn.toString( 1 , subModes.rightPadding , subModes.rightPaddingOnlyIfDecimal ) ;
-		return sStr ;
+		sn.round( subModes.rounding , roundingType ) ;
+
+		// Check if rounding has made it reach 60
+		if ( sn.toNumber() < 60 ) {
+			sStr = sn.toString( 1 , subModes.rightPadding , subModes.rightPaddingOnlyIfDecimal ) ;
+			return sign + sStr ;
+		}
+
+		s = 60 ;
+
 	}
 
 	min = Math.floor( s / 60 ) ;
 	s = s % 60 ;
 
 	sn = new StringNumber( s , sSeparator , undefined , forceDecimalSeparator ) ;
-	sn.round( subModes.rounding , subModes.roundingType ) ;
-	sStr = sn.toString( 2 , subModes.rightPadding , subModes.rightPaddingOnlyIfDecimal ) ;
+	sn.round( subModes.rounding , roundingType ) ;
+
+	// Check if rounding has made it reach 60
+	if ( sn.toNumber() < 60 ) {
+		sStr = sn.toString( 2 , subModes.rightPadding , subModes.rightPaddingOnlyIfDecimal ) ;
+	}
+	else {
+		min ++ ;
+		s = 0 ;
+		sn.set( s ) ;
+		sStr = sn.toString( 2 , subModes.rightPadding , subModes.rightPaddingOnlyIfDecimal ) ;
+	}
 
-	if ( min < 60 && ! subModes.forceHours ) { return min + minSeparator + sStr ; }
+	if ( min < 60 && ! subModes.forceHours ) {
+		return sign + min + minSeparator + sStr ;
+	}
 
 	h = Math.floor( min / 60 ) ;
 	min = min % 60 ;
-	return h + hSeparator + ( '' + min ).padStart( 2 , '0' ) + minSeparator + sStr ;
+
+	return sign + h + hSeparator + ( '' + min ).padStart( 2 , '0' ) + minSeparator + sStr ;
 } ;
 
 modes.t.noSanitize = true ;

lib/StringNumber.js

@@ -59,6 +59,12 @@ StringNumber.prototype.set = function( number ) {
 
 	number = + number ;
 
+	// Reset anything, if it was already used...
+	this.sign = 1 ;
+	this.digits.length = 0 ;
+	this.exposant = 0 ;
+	this.special = null ;
+
 	if ( ! Number.isFinite( number ) ) {
 		this.special = number ;
 		return null ;
@@ -300,6 +306,8 @@ StringNumber.prototype.precision = function( n , type = 0 ) {
 
 	if ( n < 0 ) { this.digits.length = 0 ; return this ; }
 
+	type *= this.sign ;
+
 	if ( type < 0 ) {
 		roundUp =
 			this.digits.length > n + 4

lib/format.js

@@ -808,32 +808,61 @@ modes.t = ( arg , modeArg , useLetters = true ) => {
 	if ( typeof arg !== 'number' ) { return '(NaN)' ; }
 
 	var h , min , s , sn , sStr ,
+		sign = '' ,
 		subModes = timeModeArg( modeArg ) ,
+		roundingType = subModes.roundingType ,
 		hSeparator = useLetters ? 'h' : ':' ,
 		minSeparator = useLetters ? 'min' : ':' ,
 		sSeparator = useLetters ? 's' : '.' ,
 		forceDecimalSeparator = useLetters ;
 
 	s = arg / 1000 ;
+
+	if ( s < 0 ) {
+		s = -s ;
+		roundingType *= -1 ;
+		sign = '-' ;
+	}
+
 	if ( s < 60 && ! subModes.forceMinutes ) {
 		sn = new StringNumber( s , sSeparator , undefined , forceDecimalSeparator ) ;
-		sn.round( subModes.rounding , subModes.roundingType ) ;
-		sStr = sn.toString( 1 , subModes.rightPadding , subModes.rightPaddingOnlyIfDecimal ) ;
-		return sStr ;
+		sn.round( subModes.rounding , roundingType ) ;
+
+		// Check if rounding has made it reach 60
+		if ( sn.toNumber() < 60 ) {
+			sStr = sn.toString( 1 , subModes.rightPadding , subModes.rightPaddingOnlyIfDecimal ) ;
+			return sign + sStr ;
+		}
+
+		s = 60 ;
+
 	}
 
 	min = Math.floor( s / 60 ) ;
 	s = s % 60 ;
 
 	sn = new StringNumber( s , sSeparator , undefined , forceDecimalSeparator ) ;
-	sn.round( subModes.rounding , subModes.roundingType ) ;
-	sStr = sn.toString( 2 , subModes.rightPadding , subModes.rightPaddingOnlyIfDecimal ) ;
+	sn.round( subModes.rounding , roundingType ) ;
 
-	if ( min < 60 && ! subModes.forceHours ) { return min + minSeparator + sStr ; }
+	// Check if rounding has made it reach 60
+	if ( sn.toNumber() < 60 ) {
+		sStr = sn.toString( 2 , subModes.rightPadding , subModes.rightPaddingOnlyIfDecimal ) ;
+	}
+	else {
+		min ++ ;
+		s = 0 ;
+		sn.set( s ) ;
+		sStr = sn.toString( 2 , subModes.rightPadding , subModes.rightPaddingOnlyIfDecimal ) ;
+	}
+
+	if ( min < 60 && ! subModes.forceHours ) {
+		return sign + min + minSeparator + sStr ;
+	}
 
 	h = Math.floor( min / 60 ) ;
 	min = min % 60 ;
-	return h + hSeparator + ( '' + min ).padStart( 2 , '0' ) + minSeparator + sStr ;
+
+	return sign + h + hSeparator + ( '' + min ).padStart( 2 , '0' ) + minSeparator + sStr ;
 } ;
 
 modes.t.noSanitize = true ;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "string-kit",
-  "version": "0.16.5",
+  "version": "0.16.6",
   "engines": {
     "node": ">=14.15.0"
   },

test/string-test.js

@@ -414,6 +414,12 @@ describe( "format()" , () => {
 		expect( format( '%T' , 3600000 ) ).to.be( '1:00:00' ) ;
 		expect( format( '%T' , 3599999 ) ).to.be( '59:59' ) ;
 		expect( format( '%T' , 7890000 ) ).to.be( '2:11:30' ) ;
+
+		expect( format( '%[c]T' , 120000 ) ).to.be( '2:00' ) ;
+		expect( format( '%[c]T' , 119900 ) ).to.be( '2:00' ) ;
+
+		expect( format( '%T' , -120000 ) ).to.be( '-2:00' ) ;
+		expect( format( '%T' , -119900 ) ).to.be( '-2:00' ) ;
 	} ) ;
 
 	it( "%z should format as base64" , () => {