Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix milliseconds rounding inconsistency #41

Merged
merged 8 commits into from Feb 12, 2020
Merged

Fix milliseconds rounding inconsistency #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d1b5bf
fix rounding inconsistency
explodingcamera Oct 3, 2019
995aded
fix rounding difference
explodingcamera Oct 3, 2019
6154e5a
fix rounding
explodingcamera Oct 3, 2019
6adf3cd
fix formatting
explodingcamera Oct 3, 2019
6624cde
Update index.js
sindresorhus Nov 13, 2019
e32a5b6
added comment
explodingcamera Dec 22, 2019
999bc4f
grammar
explodingcamera Dec 22, 2019
7d38fb7
fix linting issue
explodingcamera Dec 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 19 additions & 1 deletion index.js
View file
Open in desktop
Expand Up @@ -37,6 +37,20 @@ module.exports = (milliseconds, options = {}) => {
}
}

// Round up milliseconds for values lager than 1 minute - 50ms since these
// always need to be round up.
// (this fixes issues when rounding seconds independently of minutes later)
if (
explodingcamera marked this conversation as resolved.
Show resolved Hide resolved
milliseconds >= (1000 * 60) - 50 &&
explodingcamera marked this conversation as resolved.
Show resolved Hide resolved
!options.separateMilliseconds &&
!options.formatSubMilliseconds
) {
const difference = 60 - (milliseconds % 60);
if (difference <= 50) {
milliseconds += difference;
}
}

const parsed = parseMilliseconds(milliseconds);

add(Math.trunc(parsed.days / 365), 'year', 'y');
Expand Down Expand Up @@ -65,9 +79,13 @@ module.exports = (milliseconds, options = {}) => {
options.millisecondsDecimalDigits :
0;

const roundedMiliseconds = millisecondsAndBelow >= 1 ?
Math.round(millisecondsAndBelow) :
Math.ceil(millisecondsAndBelow);

const millisecondsString = millisecondsDecimalDigits ?
millisecondsAndBelow.toFixed(millisecondsDecimalDigits) :
Math.ceil(millisecondsAndBelow);
roundedMiliseconds;

add(
parseFloat(millisecondsString, 10),
Expand Down
5 changes: 3 additions & 2 deletions test.js
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@ test('prettify milliseconds', t => {
t.is(prettyMilliseconds(1000 * 60 * 60 * 999), '41d 15h');
t.is(prettyMilliseconds(1000 * 60 * 60 * 24 * 465), '1y 100d');
t.is(prettyMilliseconds(1000 * 60 * 67 * 24 * 465), '1y 154d 6h');
t.is(prettyMilliseconds(119999), '2m');
});

test('have a compact option', t => {
Expand Down Expand Up @@ -43,8 +44,8 @@ test('have a secondsDecimalDigits option', t => {
});

test('have a millisecondsDecimalDigits option', t => {
t.is(prettyMilliseconds(33.333), '34ms');
t.is(prettyMilliseconds(33.333, {millisecondsDecimalDigits: 0}), '34ms');
t.is(prettyMilliseconds(33.333), '33ms');
t.is(prettyMilliseconds(33.333, {millisecondsDecimalDigits: 0}), '33ms');
t.is(prettyMilliseconds(33.333, {millisecondsDecimalDigits: 4}), '33.3330ms');
});

Expand Down