Handling bits, and base collision

README.md

@@ -27,7 +27,7 @@ _***(number)***_ Decimal place, default is `2`
 _***(string)***_ Character between the `result` and `suffix`, default is `" "`
 
 ### standard
-_***(string)***_ Standard unit of measure, can be `iec` or `jedec`, default is `jedec`
+_***(string)***_ Standard unit of measure, can be `iec` or `jedec`, default is `jedec`; can be overruled by `base`
 
 ### symbols
 _***(object)***_ Dictionary of SI/JEDEC symbols to replace for localization, defaults to english if no match is found

lib/filesize.es6.js

@@ -8,9 +8,14 @@
 (function (global) {
 const b = /^(b|B)$/;
 const symbol = {
-	bits: ["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"]
+	iec: {
+		bits: ["b", "Kib", "Mib", "Gib", "Tib", "Pib", "Eib", "Zib", "Yib"],
+		bytes: ["B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"]
+	},
+	jedec: {
+		bits: ["b", "Kb", "Mb", "Gb", "Tb", "Pb", "Eb", "Zb", "Yb"],
+		bytes: ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]
+	}
 };
 
 /**
@@ -36,7 +41,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";
+	standard = base === 2 ? descriptor.standard || "jedec" : "jedec";
 	output = descriptor.output || "string";
 	e = descriptor.exponent !== undefined ? descriptor.exponent : -1;
 	num = Number(arg);
@@ -79,7 +84,7 @@ 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-" + standard][e];
+		result[1] = base === 10 && e === 1 ? bits ? "kb" : "kB" : symbol[standard][bits ? "bits" : "bytes"][e];
 
 		if (unix) {
 			result[1] = standard === "jedec" ? result[1].charAt(0) : result[1].length > 1 ? result[1].replace(/B$/, "") : result[1];

lib/filesize.js

@@ -10,9 +10,14 @@
 (function (global) {
 	var b = /^(b|B)$/;
 	var symbol = {
-		bits: ["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"]
+		iec: {
+			bits: ["b", "Kib", "Mib", "Gib", "Tib", "Pib", "Eib", "Zib", "Yib"],
+			bytes: ["B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"]
+		},
+		jedec: {
+			bits: ["b", "Kb", "Mb", "Gb", "Tb", "Pb", "Eb", "Zb", "Yb"],
+			bytes: ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]
+		}
 	};
 
 	/**
@@ -51,7 +56,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";
+		standard = base === 2 ? descriptor.standard || "jedec" : "jedec";
 		output = descriptor.output || "string";
 		e = descriptor.exponent !== undefined ? descriptor.exponent : -1;
 		num = Number(arg);
@@ -94,7 +99,7 @@
 			}
 
 			result[0] = Number(val.toFixed(e > 0 ? round : 0));
-			result[1] = base === 10 && e === 1 ? bits ? "kb" : "kB" : symbol[bits ? "bits" : "bytes-" + standard][e];
+			result[1] = base === 10 && e === 1 ? bits ? "kb" : "kB" : symbol[standard][bits ? "bits" : "bytes"][e];
 
 			if (unix) {
 				result[1] = standard === "jedec" ? result[1].charAt(0) : result[1].length > 1 ? result[1].replace(/B$/, "") : result[1];