Comparing version 3.1.0 to 3.1.1
@@ -9,6 +9,10 @@ /** | ||
* @module filesize | ||
* @version 3.1.0 | ||
* @version 3.1.1 | ||
*/ | ||
( global ) => { | ||
const bit = /b$/; | ||
const si = { | ||
bits: [ "B", "kb", "Mb", "Gb", "Tb", "Pb", "Eb", "Zb", "Yb" ], | ||
bytes: [ "B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" ] | ||
}; | ||
@@ -23,7 +27,7 @@ /** | ||
*/ | ||
let filesize = ( arg, descriptor ) => { | ||
let result = [], | ||
skip = false, | ||
val = 0, | ||
e, base, bits, ceil, neg, num, output, round, unix, spacer, suffixes; | ||
let filesize = ( arg, descriptor={} ) => { | ||
let result = []; | ||
let skip = false; | ||
let val = 0; | ||
let e, base, bits, ceil, neg, num, output, round, unix, spacer, suffixes; | ||
@@ -34,3 +38,2 @@ if ( isNaN( arg ) ) { | ||
descriptor = descriptor || {}; | ||
bits = ( descriptor.bits === true ); | ||
@@ -59,6 +62,8 @@ unix = ( descriptor.unix === true ); | ||
result[ 1 ] = ""; | ||
} else { | ||
} | ||
else { | ||
result[ 1 ] = "B"; | ||
} | ||
} else { | ||
} | ||
else { | ||
// Determining the exponent | ||
@@ -77,3 +82,4 @@ if ( e === -1 || isNaN( e ) ) { | ||
val = num / Math.pow( 2, ( e * 10 ) ); | ||
} else { | ||
} | ||
else { | ||
val = num / Math.pow( 1000, e ); | ||
@@ -104,3 +110,4 @@ } | ||
result[ 1 ] = ""; | ||
} else if ( !bits && result[ 1 ] === "k" ) { | ||
} | ||
else if ( !bits && result[ 1 ] === "k" ) { | ||
result[ 1 ] = "K"; | ||
@@ -122,7 +129,10 @@ } | ||
return result; | ||
} else if ( output === "exponent" ) { | ||
} | ||
else if ( output === "exponent" ) { | ||
return e; | ||
} else if ( output === "object" ) { | ||
} | ||
else if ( output === "object" ) { | ||
return { value: result[ 0 ], suffix: result[ 1 ] }; | ||
} else { | ||
} | ||
else { | ||
return result.join( spacer ); | ||
@@ -132,22 +142,14 @@ } | ||
/** | ||
* SI suffixes | ||
* | ||
* @type {Object} | ||
*/ | ||
const si = { | ||
bits: [ "B", "kb", "Mb", "Gb", "Tb", "Pb", "Eb", "Zb", "Yb" ], | ||
bytes: [ "B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" ] | ||
}; | ||
// CommonJS, AMD, script tag | ||
if ( typeof exports !== "undefined" ) { | ||
module.exports = filesize; | ||
} else if ( typeof define === "function" ) { | ||
} | ||
else if ( typeof define === "function" ) { | ||
define( () => { | ||
return filesize; | ||
} ); | ||
} else { | ||
} | ||
else { | ||
global.filesize = filesize; | ||
} | ||
}( this ); | ||
}( typeof global !== "undefined" ? global : window ); |
@@ -11,148 +11,143 @@ "use strict"; | ||
* @module filesize | ||
* @version 3.1.0 | ||
* @version 3.1.1 | ||
*/ | ||
(function (global) { | ||
var bit = /b$/; | ||
var bit = /b$/; | ||
var si = { | ||
bits: ["B", "kb", "Mb", "Gb", "Tb", "Pb", "Eb", "Zb", "Yb"], | ||
bytes: ["B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"] | ||
}; | ||
/** | ||
* filesize | ||
* | ||
* @method filesize | ||
* @param {Mixed} arg String, Int or Float to transform | ||
* @param {Object} descriptor [Optional] Flags | ||
* @return {String} Readable file size String | ||
*/ | ||
var filesize = function (arg, descriptor) { | ||
var result = [], | ||
skip = false, | ||
val = 0, | ||
e = undefined, | ||
base = undefined, | ||
bits = undefined, | ||
ceil = undefined, | ||
neg = undefined, | ||
num = undefined, | ||
output = undefined, | ||
round = undefined, | ||
unix = undefined, | ||
spacer = undefined, | ||
suffixes = undefined; | ||
/** | ||
* filesize | ||
* | ||
* @method filesize | ||
* @param {Mixed} arg String, Int or Float to transform | ||
* @param {Object} descriptor [Optional] Flags | ||
* @return {String} Readable file size String | ||
*/ | ||
var filesize = function (arg) { | ||
var descriptor = arguments[1] === undefined ? {} : arguments[1]; | ||
if (isNaN(arg)) { | ||
throw new Error("Invalid arguments"); | ||
} | ||
var result = []; | ||
var skip = false; | ||
var val = 0; | ||
var e = undefined, | ||
base = undefined, | ||
bits = undefined, | ||
ceil = undefined, | ||
neg = undefined, | ||
num = undefined, | ||
output = undefined, | ||
round = undefined, | ||
unix = undefined, | ||
spacer = undefined, | ||
suffixes = undefined; | ||
descriptor = descriptor || {}; | ||
bits = descriptor.bits === true; | ||
unix = descriptor.unix === true; | ||
base = descriptor.base !== undefined ? descriptor.base : 2; | ||
round = descriptor.round !== undefined ? descriptor.round : unix ? 1 : 2; | ||
spacer = descriptor.spacer !== undefined ? descriptor.spacer : unix ? "" : " "; | ||
suffixes = descriptor.suffixes !== undefined ? descriptor.suffixes : {}; | ||
output = descriptor.output !== undefined ? descriptor.output : "string"; | ||
e = descriptor.exponent !== undefined ? descriptor.exponent : -1; | ||
num = Number(arg); | ||
neg = num < 0; | ||
ceil = base > 2 ? 1000 : 1024; | ||
if (isNaN(arg)) { | ||
throw new Error("Invalid arguments"); | ||
} | ||
// Flipping a negative number to determine the size | ||
if (neg) { | ||
num = -num; | ||
} | ||
bits = descriptor.bits === true; | ||
unix = descriptor.unix === true; | ||
base = descriptor.base !== undefined ? descriptor.base : 2; | ||
round = descriptor.round !== undefined ? descriptor.round : unix ? 1 : 2; | ||
spacer = descriptor.spacer !== undefined ? descriptor.spacer : unix ? "" : " "; | ||
suffixes = descriptor.suffixes !== undefined ? descriptor.suffixes : {}; | ||
output = descriptor.output !== undefined ? descriptor.output : "string"; | ||
e = descriptor.exponent !== undefined ? descriptor.exponent : -1; | ||
num = Number(arg); | ||
neg = num < 0; | ||
ceil = base > 2 ? 1000 : 1024; | ||
// Zero is now a special case because bytes divide by 1 | ||
if (num === 0) { | ||
result[0] = 0; | ||
// Flipping a negative number to determine the size | ||
if (neg) { | ||
num = -num; | ||
} | ||
if (unix) { | ||
result[1] = ""; | ||
} else { | ||
result[1] = "B"; | ||
} | ||
} else { | ||
// Determining the exponent | ||
if (e === -1 || isNaN(e)) { | ||
e = Math.floor(Math.log(num) / Math.log(ceil)); | ||
} | ||
// Zero is now a special case because bytes divide by 1 | ||
if (num === 0) { | ||
result[0] = 0; | ||
// Exceeding supported length, time to reduce & multiply | ||
if (e > 8) { | ||
val = val * (1000 * (e - 8)); | ||
e = 8; | ||
} | ||
if (unix) { | ||
result[1] = ""; | ||
} else { | ||
result[1] = "B"; | ||
} | ||
} else { | ||
// Determining the exponent | ||
if (e === -1 || isNaN(e)) { | ||
e = Math.floor(Math.log(num) / Math.log(ceil)); | ||
} | ||
if (base === 2) { | ||
val = num / Math.pow(2, e * 10); | ||
} else { | ||
val = num / Math.pow(1000, e); | ||
} | ||
// Exceeding supported length, time to reduce & multiply | ||
if (e > 8) { | ||
val = val * (1000 * (e - 8)); | ||
e = 8; | ||
} | ||
if (bits) { | ||
val = val * 8; | ||
if (base === 2) { | ||
val = num / Math.pow(2, e * 10); | ||
} else { | ||
val = num / Math.pow(1000, e); | ||
} | ||
if (val > ceil) { | ||
val = val / ceil; | ||
e++; | ||
} | ||
} | ||
if (bits) { | ||
val = val * 8; | ||
result[0] = Number(val.toFixed(e > 0 ? round : 0)); | ||
result[1] = si[bits ? "bits" : "bytes"][e]; | ||
if (val > ceil) { | ||
val = val / ceil; | ||
e++; | ||
} | ||
} | ||
if (!skip && unix) { | ||
if (bits && bit.test(result[1])) { | ||
result[1] = result[1].toLowerCase(); | ||
} | ||
result[0] = Number(val.toFixed(e > 0 ? round : 0)); | ||
result[1] = si[bits ? "bits" : "bytes"][e]; | ||
result[1] = result[1].charAt(0); | ||
if (!skip && unix) { | ||
if (bits && bit.test(result[1])) { | ||
result[1] = result[1].toLowerCase(); | ||
} | ||
if (result[1] === "B") { | ||
result[0] = Math.floor(result[0]); | ||
result[1] = ""; | ||
} else if (!bits && result[1] === "k") { | ||
result[1] = "K"; | ||
} | ||
} | ||
} | ||
result[1] = result[1].charAt(0); | ||
// Decorating a 'diff' | ||
if (neg) { | ||
result[0] = -result[0]; | ||
} | ||
if (result[1] === "B") { | ||
result[0] = Math.floor(result[0]); | ||
result[1] = ""; | ||
} else if (!bits && result[1] === "k") { | ||
result[1] = "K"; | ||
} | ||
} | ||
} | ||
// Applying custom suffix | ||
result[1] = suffixes[result[1]] || result[1]; | ||
// Decorating a 'diff' | ||
if (neg) { | ||
result[0] = -result[0]; | ||
} | ||
// Returning Array, Object, or String (default) | ||
if (output === "array") { | ||
return result; | ||
} else if (output === "exponent") { | ||
return e; | ||
} else if (output === "object") { | ||
return { value: result[0], suffix: result[1] }; | ||
} else { | ||
return result.join(spacer); | ||
} | ||
}; | ||
// Applying custom suffix | ||
result[1] = suffixes[result[1]] || result[1]; | ||
/** | ||
* SI suffixes | ||
* | ||
* @type {Object} | ||
*/ | ||
var si = { | ||
bits: ["B", "kb", "Mb", "Gb", "Tb", "Pb", "Eb", "Zb", "Yb"], | ||
bytes: ["B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"] | ||
}; | ||
// Returning Array, Object, or String (default) | ||
if (output === "array") { | ||
return result; | ||
} else if (output === "exponent") { | ||
return e; | ||
} else if (output === "object") { | ||
return { value: result[0], suffix: result[1] }; | ||
} else { | ||
return result.join(spacer); | ||
} | ||
}; | ||
// CommonJS, AMD, script tag | ||
if (typeof exports !== "undefined") { | ||
module.exports = filesize; | ||
} else if (typeof define === "function") { | ||
define(function () { | ||
return filesize; | ||
}); | ||
} else { | ||
global.filesize = filesize; | ||
} | ||
})(this); | ||
// CommonJS, AMD, script tag | ||
if (typeof exports !== "undefined") { | ||
module.exports = filesize; | ||
} else if (typeof define === "function") { | ||
define(function () { | ||
return filesize; | ||
}); | ||
} else { | ||
global.filesize = filesize; | ||
} | ||
})(typeof global !== "undefined" ? global : window); |
{ | ||
"name": "filesize", | ||
"description": "JavaScript library to generate a human readable String describing the file size", | ||
"version": "3.1.0", | ||
"version": "3.1.1", | ||
"homepage": "http://filesizejs.com", | ||
@@ -31,12 +31,12 @@ "author": { | ||
"devDependencies": { | ||
"grunt": "~0.4.1", | ||
"grunt-cli": "~0.1.6", | ||
"grunt-sed": "~0.1", | ||
"grunt-6to5": "^2.0.0", | ||
"grunt-contrib-concat": "~0.1.3", | ||
"grunt-contrib-nodeunit": "~0.1.2", | ||
"grunt-contrib-watch": "~0.2", | ||
"grunt-contrib-uglify": "~0.6.0" | ||
"grunt": "~0.4.5", | ||
"grunt-cli": "~0.1.13", | ||
"grunt-babel": "^4.0.0", | ||
"grunt-sed": "~0.1.1", | ||
"grunt-contrib-concat": "~0.5.0", | ||
"grunt-contrib-nodeunit": "~0.4.1", | ||
"grunt-contrib-watch": "~0.6.1", | ||
"grunt-contrib-uglify": "~0.7.0" | ||
}, | ||
"keywords": ["file", "filesize", "size", "readable", "file system"] | ||
} |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
0
42996
279