Implementing precision option with tests, fixes #117, fixes #132

Adding test for invalid `precision` value
avoidwork · Jun 30, 2021 · 31d9a21 · 31d9a21
1 parent 8ec6429
commit 31d9a21
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 8 deletions.
diff --git a/lib/filesize.es6.js b/lib/filesize.es6.js
@@ -42,7 +42,7 @@
 	function filesize (arg, descriptor = {}) {
 		let result = [],
 			val = 0,
-			e, base, bits, ceil, full, fullforms, locale, localeOptions, neg, num, output, pad, round, u, unix, separator, spacer, standard, symbols, roundingFunc;
+			e, base, bits, ceil, full, fullforms, locale, localeOptions, neg, num, output, pad, round, u, unix, separator, spacer, standard, symbols, roundingFunc, precision;
 
 		if (isNaN(arg)) {
 			throw new TypeError("Invalid number");
@@ -67,6 +67,7 @@
 		num = Number(arg);
 		neg = num < 0;
 		ceil = base > 2 ? 1000 : 1024;
+		precision = isNaN(descriptor.precision) === false ? parseInt(descriptor.precision, 10) : 0;
 
 		// Flipping a negative number to determine the size
 		if (neg) {
@@ -84,6 +85,10 @@
 
 		// Exceeding supported length, time to reduce & multiply
 		if (e > 8) {
+			if (precision > 0) {
+				precision += 8 - e;
+			}
+
 			e = 8;
 		}
 
@@ -132,6 +137,11 @@
 			result[0] = -result[0];
 		}
 
+		// Setting optional precision
+		if (precision > 0) {
+			result[0] = result[0].toPrecision(precision);
+		}
+
 		// Applying custom symbol
 		result[1] = symbols[result[1]] || result[1];
 

diff --git a/lib/filesize.es6.min.js b/lib/filesize.es6.min.js
diff --git a/lib/filesize.es6.min.js.map b/lib/filesize.es6.min.js.map
diff --git a/lib/filesize.js b/lib/filesize.js
@@ -62,7 +62,8 @@
 	      spacer,
 	      standard,
 	      symbols,
-	      roundingFunc;
+	      roundingFunc,
+	      precision;
 
 	  if (isNaN(arg)) {
 	    throw new TypeError("Invalid number");
@@ -86,7 +87,8 @@
 	  roundingFunc = roundingFuncs[descriptor.roundingMethod] || Math.round;
 	  num = Number(arg);
 	  neg = num < 0;
-	  ceil = base > 2 ? 1000 : 1024; // Flipping a negative number to determine the size
+	  ceil = base > 2 ? 1000 : 1024;
+	  precision = isNaN(descriptor.precision) === false ? parseInt(descriptor.precision, 10) : 0; // Flipping a negative number to determine the size
 
 	  if (neg) {
 	    num = -num;
@@ -103,6 +105,10 @@
 
 
 	  if (e > 8) {
+	    if (precision > 0) {
+	      precision += 8 - e;
+	    }
+
 	    e = 8;
 	  }
 
@@ -149,6 +155,11 @@
 
 	  if (neg) {
 	    result[0] = -result[0];
+	  } // Setting optional precision
+
+
+	  if (precision > 0) {
+	    result[0] = result[0].toPrecision(precision);
 	  } // Applying custom symbol
 
 

diff --git a/lib/filesize.min.js b/lib/filesize.min.js
diff --git a/lib/filesize.min.js.map b/lib/filesize.min.js.map
diff --git a/src/filesize.js b/src/filesize.js
@@ -29,7 +29,7 @@ const b = /^(b|B)$/,
 function filesize (arg, descriptor = {}) {
 	let result = [],
 		val = 0,
-		e, base, bits, ceil, full, fullforms, locale, localeOptions, neg, num, output, pad, round, u, unix, separator, spacer, standard, symbols, roundingFunc;
+		e, base, bits, ceil, full, fullforms, locale, localeOptions, neg, num, output, pad, round, u, unix, separator, spacer, standard, symbols, roundingFunc, precision;
 
 	if (isNaN(arg)) {
 		throw new TypeError("Invalid number");
@@ -54,6 +54,7 @@ function filesize (arg, descriptor = {}) {
 	num = Number(arg);
 	neg = num < 0;
 	ceil = base > 2 ? 1000 : 1024;
+	precision = isNaN(descriptor.precision) === false ? parseInt(descriptor.precision, 10) : 0;
 
 	// Flipping a negative number to determine the size
 	if (neg) {
@@ -71,6 +72,10 @@ function filesize (arg, descriptor = {}) {
 
 	// Exceeding supported length, time to reduce & multiply
 	if (e > 8) {
+		if (precision > 0) {
+			precision += 8 - e;
+		}
+
 		e = 8;
 	}
 
@@ -119,6 +124,11 @@ function filesize (arg, descriptor = {}) {
 		result[0] = -result[0];
 	}
 
+	// Setting optional precision
+	if (precision > 0) {
+		result[0] = result[0].toPrecision(precision);
+	}
+
 	// Applying custom symbol
 	result[1] = symbols[result[1]] || result[1];
 

diff --git a/test/filesize_test.js b/test/filesize_test.js
@@ -195,5 +195,14 @@ exports.filesize = {
 		test.equal(filesize(1024 * 1.666, {round: 1, roundingMethod: "floor"}), "1.6 KB", "Should be '1.6 KB'");
 		test.equal(filesize(1024 * 1.666, {round: 1, roundingMethod: "ceil"}), "1.7 KB", "Should be '1.7 KB'");
 		test.done();
+	},
+	precision: function (test) {
+		test.expect(5);
+		test.equal(filesize(1024 * 1, {precision: 3}), "1.00 KB", "Should be '1.00 KB'");
+		test.equal(filesize(1024 * 1024 * 10.25, {precision: 3}), "10.3 MB", "Should be '10.3 MB'");
+		test.equal(filesize(1024 * 1024 * 10.25, {precision: "x"}), "10.25 MB", "Should be '10.25 MB'");
+		test.equal(filesize(1024 * 1024 * 1024, {precision: 3}), "1.00 GB", "Should be '1.00 GB'");
+		test.equal(filesize(Math.pow(1024, 10), {precision: 3}), "1e+6 YB", "Should be '1e+6 YB'");
+		test.done();
 	}
 };