Merge pull request #113 from avoidwork/exponents

Adding `exponent` to `object` output, fixes #112
avoidwork · Feb 22, 2020 · b66d8c6 · b66d8c6
2 parents 6eb9744 + 8acef4c
commit b66d8c6
Show file tree

Hide file tree

Showing 12 changed files with 568 additions and 499 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: node_js
 node_js:
   - node
+  - 12
   - 10
   - 8
 

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019, Jason Mulligan
+Copyright (c) 2020, Jason Mulligan
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ filesize(265318, {base: 10});         // "265.32 kB"
 filesize(265318);                     // "259.1 KB"
 filesize(265318, {round: 0});         // "259 KB"
 filesize(265318, {output: "array"});  // [259.1, "KB"]
-filesize(265318, {output: "object"}); // {value: 259.1, symbol: "KB"}
+filesize(265318, {output: "object"}); // {value: 259.1, symbol: "KB", exponent: 1}
 filesize(1, {symbols: {B: "Б"}});     // "1 Б"
 filesize(1024);                       // "1 KB"
 filesize(1024, {exponent: 0});        // "1024 B"

diff --git a/lib/filesize.es6.js b/lib/filesize.es6.js
@@ -1,9 +1,9 @@
 /**
  * filesize
  *
- * @copyright 2019 Jason Mulligan <[email protected]>
+ * @copyright 2020 Jason Mulligan <[email protected]>
  * @license BSD-3-Clause
- * @version 6.0.1
+ * @version 6.1.0
  */
 (function (global) {
 	const b = /^(b|B)$/,
@@ -141,7 +141,7 @@
 		}
 
 		if (output === "object") {
-			return {value: result[0], symbol: result[1]};
+			return {value: result[0], symbol: result[1], exponent: e};
 		}
 
 		return result.join(spacer);

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
@@ -3,9 +3,9 @@
 /**
  * filesize
  *
- * @copyright 2019 Jason Mulligan <[email protected]>
+ * @copyright 2020 Jason Mulligan <[email protected]>
  * @license BSD-3-Clause
- * @version 6.0.1
+ * @version 6.1.0
  */
 (function (global) {
   var b = /^(b|B)$/,
@@ -161,7 +161,8 @@
     if (output === "object") {
       return {
         value: result[0],
-        symbol: result[1]
+        symbol: result[1],
+        exponent: e
       };
     }
 

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