Skip to content

Commit 72c5736

Browse files
committed
Fixing missing unit on object output when input is 0
1 parent 75c2445 commit 72c5736

10 files changed

+18
-16
lines changed

lib/filesize.es6.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* @copyright 2021 Jason Mulligan <[email protected]>
55
* @license BSD-3-Clause
6-
* @version 6.2.5
6+
* @version 6.2.6
77
*/
88
(function (global, factory) {
99
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -89,7 +89,7 @@
8989
// Zero is now a special case because bytes divide by 1
9090
if (num === 0) {
9191
result[0] = 0;
92-
result[1] = unix ? "" : symbol[standard][bits ? "bits" : "bytes"][e];
92+
u = result[1] = unix ? "" : symbol[standard][bits ? "bits" : "bytes"][e];
9393
} else {
9494
val = num / (base === 2 ? Math.pow(2, e * 10) : Math.pow(1000, e));
9595

lib/filesize.es6.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/filesize.es6.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/filesize.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* @copyright 2021 Jason Mulligan <[email protected]>
55
* @license BSD-3-Clause
6-
* @version 6.2.5
6+
* @version 6.2.6
77
*/
88
(function (global, factory) {
99
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -107,7 +107,7 @@
107107

108108
if (num === 0) {
109109
result[0] = 0;
110-
result[1] = unix ? "" : symbol[standard][bits ? "bits" : "bytes"][e];
110+
u = result[1] = unix ? "" : symbol[standard][bits ? "bits" : "bytes"][e];
111111
} else {
112112
val = num / (base === 2 ? Math.pow(2, e * 10) : Math.pow(1000, e));
113113

lib/filesize.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/filesize.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "filesize",
33
"description": "JavaScript library to generate a human readable String describing the file size",
4-
"version": "6.2.5",
4+
"version": "6.2.6",
55
"homepage": "https://filesizejs.com",
66
"author": "Jason Mulligan <[email protected]>",
77
"repository": {
@@ -28,7 +28,8 @@
2828
"changelog": "auto-changelog -p",
2929
"test": "npm run build && npm run lint && npm run test:unit",
3030
"test:unit": "nodeunit test/*.js",
31-
"lint": "eslint test/*.js src/*.js"
31+
"lint": "eslint test/*.js src/*.js",
32+
"types": "npx typescript src/filesize.js --declaration --allowJs --emitDeclarationOnly --outDir ./"
3233
},
3334
"devDependencies": {
3435
"@babel/core": "^7.13.15",

src/filesize.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function filesize (arg, descriptor = {}) {
7676
// Zero is now a special case because bytes divide by 1
7777
if (num === 0) {
7878
result[0] = 0;
79-
result[1] = unix ? "" : symbol[standard][bits ? "bits" : "bytes"][e];
79+
u = result[1] = unix ? "" : symbol[standard][bits ? "bits" : "bytes"][e];
8080
} else {
8181
val = num / (base === 2 ? Math.pow(2, e * 10) : Math.pow(1000, e));
8282

test/filesize_test.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,9 @@ exports.filesize = {
134134
test.done();
135135
},
136136
fullform: function (test) {
137-
test.expect(8);
137+
test.expect(9);
138138
test.equal(filesize(0, {fullform: true}), "0 bytes", "Should be '0 bytes'");
139+
test.equal(filesize(0, {fullform: true, output: "object"}).unit, "B", "Should be 'B'");
139140
test.equal(filesize(1, {bits: true, base: 10, fullform: true}), "8 bits", "Should be '8 bits'");
140141
test.equal(filesize(1, {base: 10, fullform: true}), "1 byte", "Should be '1 byte'");
141142
test.equal(filesize(this.kilobyte, {fullform: true}), "1 kilobyte", "Should be '1 kilobyte'");

0 commit comments

Comments
 (0)