Skip to content

Commit

Permalink
Precision and Intl formatting now applied to small numbers. Fixes #15
Browse files Browse the repository at this point in the history
  • Loading branch information
@75lb
75lb committed Jul 20, 2024
1 parent 05b8db0 commit 381b499
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 30 deletions.
3 changes: 1 addition & 2 deletions dist/index.cjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,10 @@ class ByteSize {
if (units) {
const defaultFormat = new Intl.NumberFormat(options.locale, {
style: 'decimal',
minimumFractionDigits: options.precision,
maximumFractionDigits: options.precision
});
const value = units.from === 0
? prefix + bytes
? prefix + defaultFormat.format(bytes)
: prefix + defaultFormat.format(bytes / units.from);
this.value = value;
this.unit = units.unit;
Expand Down
3 changes: 1 addition & 2 deletions dist/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,10 @@
if (units) {
const defaultFormat = new Intl.NumberFormat(options.locale, {
style: 'decimal',
minimumFractionDigits: options.precision,
maximumFractionDigits: options.precision
});
const value = units.from === 0
? prefix + bytes
? prefix + defaultFormat.format(bytes)
: prefix + defaultFormat.format(bytes / units.from);
this.value = value;
this.unit = units.unit;
Expand Down
1 change: 0 additions & 1 deletion index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ class ByteSize {
if (units) {
const defaultFormat = new Intl.NumberFormat(options.locale, {
style: 'decimal',
minimumFractionDigits: options.precision,
maximumFractionDigits: options.precision
})
const value = units.from === 0
Expand Down
56 changes: 31 additions & 25 deletions test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ tom.test('metric 10', function () {
})
tom.test('metric 1000', function () {
const result = byteSize(1000)
a.equal(result.value, '1.0')
a.equal(result.value, '1')
a.equal(result.unit, 'kB')
})
tom.test('metric -1000', function () {
const result = byteSize(-1000)
a.equal(result.value, '-1.0')
a.equal(result.value, '-1')
a.equal(result.unit, 'kB')
})
tom.test('metric 10000', function () {
const result = byteSize(10000)
a.equal(result.value, '10.0')
a.equal(result.value, '10')
a.equal(result.unit, 'kB')
})
tom.test('metric 34560000', function () {
Expand Down Expand Up @@ -79,17 +79,17 @@ tom.test('metric_octet 10', function () {
})
tom.test('metric_octet 1000', function () {
const result = byteSize(1000, { units: 'metric_octet' })
a.equal(result.value, '1.0')
a.equal(result.value, '1')
a.equal(result.unit, 'ko')
})
tom.test('metric_octet -1000', function () {
const result = byteSize(-1000, { units: 'metric_octet' })
a.equal(result.value, '-1.0')
a.equal(result.value, '-1')
a.equal(result.unit, 'ko')
})
tom.test('metric_octet 10000', function () {
const result = byteSize(10000, { units: 'metric_octet' })
a.equal(result.value, '10.0')
a.equal(result.value, '10')
a.equal(result.unit, 'ko')
})
tom.test('metric_octet 34560000', function () {
Expand Down Expand Up @@ -145,12 +145,12 @@ tom.test('iec 10', function () {
})
tom.test('iec 1000', function () {
const result = byteSize(1000, { units: 'iec' })
a.equal(result.value, '1000')
a.equal(result.value, '1,000')
a.equal(result.unit, 'B')
})
tom.test('iec -1000', function () {
const result = byteSize(-1000, { units: 'iec' })
a.equal(result.value, '-1000')
a.equal(result.value, '-1,000')
a.equal(result.unit, 'B')
})
tom.test('iec 10000', function () {
Expand All @@ -160,7 +160,7 @@ tom.test('iec 10000', function () {
})
tom.test('iec 34560000', function () {
const result = byteSize(34560000, { units: 'iec' })
a.equal(result.value, '33.0')
a.equal(result.value, '33')
a.equal(result.unit, 'MiB')
})
tom.test('iec 34560000000', function () {
Expand All @@ -180,7 +180,7 @@ tom.test('iec 34560000000000000', function () {
})
tom.test('iec 34560000000000000000', function () {
const result = byteSize(34560000000000000000, { units: 'iec' })
a.equal(result.value, '30.0')
a.equal(result.value, '30')
a.equal(result.unit, 'EiB')
})
tom.test('iec 34560000000000000000000', function () {
Expand Down Expand Up @@ -211,12 +211,12 @@ tom.test('iec_octet 10', function () {
})
tom.test('iec_octet 1000', function () {
const result = byteSize(1000, { units: 'iec_octet' })
a.equal(result.value, '1000')
a.equal(result.value, '1,000')
a.equal(result.unit, 'o')
})
tom.test('iec_octet -1000', function () {
const result = byteSize(-1000, { units: 'iec_octet' })
a.equal(result.value, '-1000')
a.equal(result.value, '-1,000')
a.equal(result.unit, 'o')
})
tom.test('iec_octet 10000', function () {
Expand All @@ -226,7 +226,7 @@ tom.test('iec_octet 10000', function () {
})
tom.test('iec_octet 34560000', function () {
const result = byteSize(34560000, { units: 'iec_octet' })
a.equal(result.value, '33.0')
a.equal(result.value, '33')
a.equal(result.unit, 'Mio')
})
tom.test('iec_octet 34560000000', function () {
Expand All @@ -246,7 +246,7 @@ tom.test('iec_octet 34560000000000000', function () {
})
tom.test('iec_octet 34560000000000000000', function () {
const result = byteSize(34560000000000000000, { units: 'iec_octet' })
a.equal(result.value, '30.0')
a.equal(result.value, '30')
a.equal(result.unit, 'Eio')
})
tom.test('iec_octet 34560000000000000000000', function () {
Expand Down Expand Up @@ -293,27 +293,27 @@ tom.test('precision', function () {
})
tom.test('precision 2', function () {
const result = byteSize(1500, { precision: 2 })
a.equal(result.value, '1.50')
a.equal(result.value, '1.5')
a.equal(result.unit, 'kB')
})
tom.test('precision 3', function () {
const result = byteSize(-1500, { precision: 2 })
a.equal(result.value, '-1.50')
a.equal(result.value, '-1.5')
a.equal(result.unit, 'kB')
})
tom.test('precision 4', function () {
const result = byteSize(1500000, { precision: 5 })
a.equal(result.value, '1.50000')
a.equal(result.value, '1.5')
a.equal(result.unit, 'MB')
})

tom.test('toString 1', function () {
const result = byteSize(1000).toString()
a.equal(result, '1.0 kB')
a.equal(result, '1 kB')
})
tom.test('toString 2', function () {
const result = byteSize(-1000).toString()
a.equal(result, '-1.0 kB')
a.equal(result, '-1 kB')
})

tom.test('use custom table 1', function () {
Expand All @@ -340,7 +340,7 @@ tom.test('use custom table 2', function () {
]
}
const result = byteSize(10000, { customUnits, units: 'test' })
a.equal(result.value, '10.0')
a.equal(result.value, '10')
a.equal(result.unit, 'K')
})

Expand Down Expand Up @@ -386,7 +386,7 @@ tom.test('byteSize.defaultOptions', async function () {
byteSize.defaultOptions(defaultOptions)
const result = byteSize(2500)
a.equal(result.toString(), 'test')
a.equal(result.value, '2500')
a.equal(result.value, '2,500')
a.equal(result.unit, 'test')
byteSize.defaultOptions({})
})
Expand Down Expand Up @@ -415,9 +415,9 @@ tom.test('options.locale: metric 1000', function () {

/* Intl is expected to work in Node v13+ or modern browser only */
if (isNode13Plus) {
a.equal(result.value, '1,0')
a.equal(result.value, '1')
} else {
a.equal(result.value, '1.0')
a.equal(result.value, '1')
}

return result.value
Expand All @@ -429,12 +429,18 @@ tom.test('options.locale with precision 2', function () {

/* Intl is expected to work in Node v13+ or modern browser only */
if (isNode13Plus) {
a.equal(result.value, '1,50')
a.equal(result.value, '1,5')
} else {
a.equal(result.value, '1.50')
a.equal(result.value, '1.5')
}

return result.value
})

tom.test('small number with precision', function () {
const result = byteSize(15.123456789, { precision: 3 })
a.equal(result.value, '15.123')
a.equal(result.unit, 'B')
})

export default tom

0 comments on commit 381b499

Please sign in to comment.