Removing the multiple return statements from the end of filesize(), tweaking order of final changes

Author: avoidwork

lib/filesize.es6.js

@@ -3,7 +3,7 @@
  *
  * @copyright 2021 Jason Mulligan <[email protected]>
  * @license BSD-3-Clause
- * @version 6.2.4
+ * @version 6.2.5
  */
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -137,10 +137,6 @@
 			result[0] = result[0].toString().replace(".", separator);
 		}
 
-		if (full) {
-			result[1] = fullforms[e] ? fullforms[e] : fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] === 1 ? "" : "s");
-		}
-
 		if (pad && Number.isInteger(result[0]) === false && round > 0) {
 			const x = separator || ".",
 				tmp = result[0].toString().split(x),
@@ -151,16 +147,12 @@
 			result[0] = `${tmp[0]}${x}${s.padEnd(l + n, "0")}`;
 		}
 
-		// Returning Array, Object, or String (default)
-		if (output === "array") {
-			return result;
-		}
-
-		if (output === "object") {
-			return {value: result[0], symbol: result[1], exponent: e, unit: u};
+		if (full) {
+			result[1] = fullforms[e] ? fullforms[e] : fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] === 1 ? "" : "s");
 		}
 
-		return result.join(spacer);
+		// Returning Array, Object, or String (default)
+		return output === "array" ? result : output === "object" ? {value: result[0], symbol: result[1], exponent: e, unit: u} : result.join(spacer);
 	}
 
 	// Partial application for functional programming

lib/filesize.es6.min.js

@@ -3,7 +3,7 @@
  *
  * @copyright 2021 Jason Mulligan <[email protected]>
  * @license BSD-3-Clause
- * @version 6.2.4
+ * @version 6.2.5
  */
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -155,34 +155,26 @@
 	    result[0] = result[0].toString().replace(".", separator);
 	  }
 
-	  if (full) {
-	    result[1] = fullforms[e] ? fullforms[e] : fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] === 1 ? "" : "s");
-	  }
-
 	  if (pad && Number.isInteger(result[0]) === false && round > 0) {
 	    var x = separator || ".",
 	        tmp = result[0].toString().split(x),
 	        s = tmp[1] || "",
 	        l = s.length,
 	        n = round - l;
 	    result[0] = "".concat(tmp[0]).concat(x).concat(s.padEnd(l + n, "0"));
-	  } // Returning Array, Object, or String (default)
-
-
-	  if (output === "array") {
-	    return result;
 	  }
 
-	  if (output === "object") {
-	    return {
-	      value: result[0],
-	      symbol: result[1],
-	      exponent: e,
-	      unit: u
-	    };
-	  }
+	  if (full) {
+	    result[1] = fullforms[e] ? fullforms[e] : fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] === 1 ? "" : "s");
+	  } // Returning Array, Object, or String (default)
+
 
-	  return result.join(spacer);
+	  return output === "array" ? result : output === "object" ? {
+	    value: result[0],
+	    symbol: result[1],
+	    exponent: e,
+	    unit: u
+	  } : result.join(spacer);
 	} // Partial application for functional programming
 
 

lib/filesize.es6.min.js.map

@@ -1,7 +1,7 @@
 {
   "name": "filesize",
   "description": "JavaScript library to generate a human readable String describing the file size",
-  "version": "6.2.4",
+  "version": "6.2.5",
   "homepage": "https://filesizejs.com",
   "author": "Jason Mulligan <[email protected]>",
   "repository": {

lib/filesize.js

@@ -124,10 +124,6 @@ function filesize (arg, descriptor = {}) {
 		result[0] = result[0].toString().replace(".", separator);
 	}
 
-	if (full) {
-		result[1] = fullforms[e] ? fullforms[e] : fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] === 1 ? "" : "s");
-	}
-
 	if (pad && Number.isInteger(result[0]) === false && round > 0) {
 		const x = separator || ".",
 			tmp = result[0].toString().split(x),
@@ -138,16 +134,12 @@ function filesize (arg, descriptor = {}) {
 		result[0] = `${tmp[0]}${x}${s.padEnd(l + n, "0")}`;
 	}
 
-	// Returning Array, Object, or String (default)
-	if (output === "array") {
-		return result;
-	}
-
-	if (output === "object") {
-		return {value: result[0], symbol: result[1], exponent: e, unit: u};
+	if (full) {
+		result[1] = fullforms[e] ? fullforms[e] : fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] === 1 ? "" : "s");
 	}
 
-	return result.join(spacer);
+	// Returning Array, Object, or String (default)
+	return output === "array" ? result : output === "object" ? {value: result[0], symbol: result[1], exponent: e, unit: u} : result.join(spacer);
 }
 
 // Partial application for functional programming