Adding support for IEC standard via new standard descriptor property (defaults to jedec), fixes #80

Author: avoidwork

README.md

@@ -26,6 +26,9 @@ _***(number)***_ Decimal place, default is `2`
 ### spacer
 _***(string)***_ Character between the `result` and `suffix`, default is `" "`
 
+### standard
+_***(string)***_ Standard unit of measure, can be `iec` or `jedec`, default is `jedec`
+
 ### symbols
 _***(object)***_ Dictionary of SI/JEDEC symbols to replace for localization, defaults to english if no match is found
 
@@ -49,6 +52,7 @@ filesize(1, {symbols: {B: "Б"}});    // "1 Б"
 filesize(1024);                       // "1 KB"
 filesize(1024, {exponent: 0});        // "1024 B"
 filesize(1024, {output: "exponent"}); // 1
+filesize(265318, {standard: "iec"});  // "259.1 KiB"
 ```
 
 ## How can I load filesize.js?

lib/filesize.es6.js

@@ -3,13 +3,14 @@
  *
  * @copyright 2016 Jason Mulligan <[email protected]>
  * @license BSD-3-Clause
- * @version 3.2.1
+ * @version 3.3.0
  */
 (function (global) {
 const b = /^(b|B)$/;
 const symbol = {
 	bits: ["b", "Kb", "Mb", "Gb", "Tb", "Pb", "Eb", "Zb", "Yb"],
-	bytes: ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]
+	"bytes-jedec": ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"],
+	"bytes-iec": ["B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"]
 };
 
 /**
@@ -23,7 +24,7 @@ const symbol = {
 function filesize (arg, descriptor = {}) {
 	let result = [],
 		val = 0,
-		e, base, bits, ceil, neg, num, output, round, unix, spacer, symbols;
+		e, base, bits, ceil, neg, num, output, round, unix, spacer, standard, symbols;
 
 	if (isNaN(arg)) {
 		throw new Error("Invalid arguments");
@@ -35,6 +36,7 @@ function filesize (arg, descriptor = {}) {
 	round = descriptor.round !== undefined ? descriptor.round : unix ? 1 : 2;
 	spacer = descriptor.spacer !== undefined ? descriptor.spacer : unix ? "" : " ";
 	symbols = descriptor.symbols || descriptor.suffixes || {};
+	standard = descriptor.standard || "jedec";
 	output = descriptor.output || "string";
 	e = descriptor.exponent !== undefined ? descriptor.exponent : -1;
 	num = Number(arg);
@@ -77,10 +79,10 @@ function filesize (arg, descriptor = {}) {
 		}
 
 		result[0] = Number(val.toFixed(e > 0 ? round : 0));
-		result[1] = base === 10 && e === 1 ? bits ? "kb" : "kB" : symbol[bits ? "bits" : "bytes"][e];
+		result[1] = base === 10 && e === 1 ? bits ? "kb" : "kB" : symbol[bits ? "bits" : "bytes-" + standard][e];
 
 		if (unix) {
-			result[1] = result[1].charAt(0);
+			result[1] = standard === "jedec" ? result[1].charAt(0) : result[1].length > 1 ? result[1].replace(/B$/, "") : result[1];
 
 			if (b.test(result[1])) {
 				result[0] = Math.floor(result[0]);

lib/filesize.js

@@ -5,13 +5,14 @@
  *
  * @copyright 2016 Jason Mulligan <[email protected]>
  * @license BSD-3-Clause
- * @version 3.2.1
+ * @version 3.3.0
  */
 (function (global) {
 	var b = /^(b|B)$/;
 	var symbol = {
 		bits: ["b", "Kb", "Mb", "Gb", "Tb", "Pb", "Eb", "Zb", "Yb"],
-		bytes: ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]
+		"bytes-jedec": ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"],
+		"bytes-iec": ["B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"]
 	};
 
 	/**
@@ -27,17 +28,18 @@
 
 		var result = [],
 		    val = 0,
-		    e = undefined,
-		    base = undefined,
-		    bits = undefined,
-		    ceil = undefined,
-		    neg = undefined,
-		    num = undefined,
-		    output = undefined,
-		    round = undefined,
-		    unix = undefined,
-		    spacer = undefined,
-		    symbols = undefined;
+		    e = void 0,
+		    base = void 0,
+		    bits = void 0,
+		    ceil = void 0,
+		    neg = void 0,
+		    num = void 0,
+		    output = void 0,
+		    round = void 0,
+		    unix = void 0,
+		    spacer = void 0,
+		    standard = void 0,
+		    symbols = void 0;
 
 		if (isNaN(arg)) {
 			throw new Error("Invalid arguments");
@@ -49,6 +51,7 @@
 		round = descriptor.round !== undefined ? descriptor.round : unix ? 1 : 2;
 		spacer = descriptor.spacer !== undefined ? descriptor.spacer : unix ? "" : " ";
 		symbols = descriptor.symbols || descriptor.suffixes || {};
+		standard = descriptor.standard || "jedec";
 		output = descriptor.output || "string";
 		e = descriptor.exponent !== undefined ? descriptor.exponent : -1;
 		num = Number(arg);
@@ -91,10 +94,10 @@
 			}
 
 			result[0] = Number(val.toFixed(e > 0 ? round : 0));
-			result[1] = base === 10 && e === 1 ? bits ? "kb" : "kB" : symbol[bits ? "bits" : "bytes"][e];
+			result[1] = base === 10 && e === 1 ? bits ? "kb" : "kB" : symbol[bits ? "bits" : "bytes-" + standard][e];
 
 			if (unix) {
-				result[1] = result[1].charAt(0);
+				result[1] = standard === "jedec" ? result[1].charAt(0) : result[1].length > 1 ? result[1].replace(/B$/, "") : result[1];
 
 				if (b.test(result[1])) {
 					result[0] = Math.floor(result[0]);

lib/filesize.min.js

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