diff --git a/lib/agent.js b/lib/agent.js index cae55e1b..7ddb8fca 100644 --- a/lib/agent.js +++ b/lib/agent.js @@ -20,15 +20,18 @@ function env (key) { module.exports = function () { try { - const proxy = url.parse(proxies.map(env).find(is.string)); + const proxy = new url.URL(proxies.map(env).find(is.string)); const tunnel = proxy.protocol === 'https:' ? tunnelAgent.httpsOverHttps : tunnelAgent.httpsOverHttp; + const proxyAuth = proxy.username && proxy.password + ? `${proxy.username}:${proxy.password}` + : null; return tunnel({ proxy: { port: Number(proxy.port), host: proxy.hostname, - proxyAuth: proxy.auth + proxyAuth } }); } catch (err) { diff --git a/lib/output.js b/lib/output.js index 0f0fcf71..15e3e0c0 100644 --- a/lib/output.js +++ b/lib/output.js @@ -517,7 +517,7 @@ const formats = new Map([ function toFormat (format, options) { const actualFormat = formats.get(is.object(format) && is.string(format.id) ? format.id : format); if (!actualFormat) { - throw is.invalidParameterError('format', `one of: ${[...formats.keys()].join(`, `)}`, format); + throw is.invalidParameterError('format', `one of: ${[...formats.keys()].join(', ')}`, format); } return this[actualFormat](options); } diff --git a/package.json b/package.json index 5c45c237..a5ff87d7 100644 --- a/package.json +++ b/package.json @@ -100,27 +100,27 @@ "detect-libc": "^1.0.3", "nan": "^2.14.0", "npmlog": "^4.1.2", - "prebuild-install": "^5.3.0", + "prebuild-install": "^5.3.2", "semver": "^6.3.0", - "simple-get": "^3.0.3", - "tar": "^4.4.10", + "simple-get": "^3.1.0", + "tar": "^4.4.11", "tunnel-agent": "^0.6.0" }, "devDependencies": { "async": "^3.1.0", "cc": "^1.0.2", "decompress-zip": "^0.3.2", - "documentation": "^12.1.1", + "documentation": "^12.1.2", "exif-reader": "^1.0.2", "icc": "^1.0.0", "license-checker": "^25.0.1", "mocha": "^6.2.0", "mock-fs": "^4.10.1", "nyc": "^14.1.1", - "prebuild": "^9.0.1", + "prebuild": "^9.1.0", "prebuild-ci": "^3.1.0", "rimraf": "^3.0.0", - "semistandard": "^13.0.1" + "semistandard": "^14.2.0" }, "license": "Apache-2.0", "config": { diff --git a/test/bench/perf.js b/test/bench/perf.js index b52d1ea9..74cf60ab 100644 --- a/test/bench/perf.js +++ b/test/bench/perf.js @@ -28,7 +28,7 @@ const height = 588; sharp.cache(false); async.series({ - 'jpeg': function (callback) { + jpeg: function (callback) { const inputJpgBuffer = fs.readFileSync(fixtures.inputJpg); const jpegSuite = new Benchmark.Suite('jpeg'); // jimp diff --git a/test/unit/linear.js b/test/unit/linear.js index 267356d7..17d9c5e7 100644 --- a/test/unit/linear.js +++ b/test/unit/linear.js @@ -73,7 +73,7 @@ describe('Linear adjustment', function () { assert.throws(function () { sharp(fixtures.inputPngOverlayLayer1) - .linear(undefined, { 'bar': 'baz' }); + .linear(undefined, { bar: 'baz' }); }); }); }); diff --git a/test/unit/raw.js b/test/unit/raw.js index a9e82def..d71394c7 100644 --- a/test/unit/raw.js +++ b/test/unit/raw.js @@ -53,7 +53,8 @@ describe('Raw pixel data', function () { width: info.width, height: info.height, channels: info.channels - } }) + } + }) .jpeg() .toBuffer(function (err, data, info) { if (err) throw err; @@ -81,7 +82,8 @@ describe('Raw pixel data', function () { width: info.width, height: info.height, channels: info.channels - } }) + } + }) .png() .toBuffer(function (err, data, info) { if (err) throw err; diff --git a/test/unit/stats.js b/test/unit/stats.js index a7e623fe..88726242 100644 --- a/test/unit/stats.js +++ b/test/unit/stats.js @@ -27,52 +27,52 @@ describe('Image Stats', function () { assert.strictEqual(true, isInAcceptableRange(stats.entropy, 7.319914765248541)); // red channel - assert.strictEqual(0, stats.channels[0]['min']); - assert.strictEqual(255, stats.channels[0]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['sum'], 615101275)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['squaresSum'], 83061892917)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['mean'], 101.44954540768993)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['stdev'], 58.373870588815414)); - assert.strictEqual(true, isInteger(stats.channels[0]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minY'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxY'], 0, 2725)); + assert.strictEqual(0, stats.channels[0].min); + assert.strictEqual(255, stats.channels[0].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].sum, 615101275)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].squaresSum, 83061892917)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].mean, 101.44954540768993)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].stdev, 58.373870588815414)); + assert.strictEqual(true, isInteger(stats.channels[0].minX)); + assert.strictEqual(true, isInRange(stats.channels[0].minX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].minY)); + assert.strictEqual(true, isInRange(stats.channels[0].minY, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxX)); + assert.strictEqual(true, isInRange(stats.channels[0].maxX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxY)); + assert.strictEqual(true, isInRange(stats.channels[0].maxY, 0, 2725)); // green channel - assert.strictEqual(0, stats.channels[1]['min']); - assert.strictEqual(255, stats.channels[1]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['sum'], 462824115)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['squaresSum'], 47083677255)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['mean'], 76.33425255128337)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['stdev'], 44.03023262954866)); - assert.strictEqual(true, isInteger(stats.channels[1]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[1]['minX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[1]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[1]['minY'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[1]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[1]['maxX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[1]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[1]['maxY'], 0, 2725)); + assert.strictEqual(0, stats.channels[1].min); + assert.strictEqual(255, stats.channels[1].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].sum, 462824115)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].squaresSum, 47083677255)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].mean, 76.33425255128337)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].stdev, 44.03023262954866)); + assert.strictEqual(true, isInteger(stats.channels[1].minX)); + assert.strictEqual(true, isInRange(stats.channels[1].minX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[1].minY)); + assert.strictEqual(true, isInRange(stats.channels[1].minY, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[1].maxX)); + assert.strictEqual(true, isInRange(stats.channels[1].maxX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[1].maxY)); + assert.strictEqual(true, isInRange(stats.channels[1].maxY, 0, 2725)); // blue channel - assert.strictEqual(0, stats.channels[2]['min']); - assert.strictEqual(255, stats.channels[2]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['sum'], 372986756)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['squaresSum'], 32151543524)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['mean'], 61.51724663436759)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['stdev'], 38.96702865090125)); - assert.strictEqual(true, isInteger(stats.channels[2]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[2]['minX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[2]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[2]['minY'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[2]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[2]['maxX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[2]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[2]['maxY'], 0, 2725)); + assert.strictEqual(0, stats.channels[2].min); + assert.strictEqual(255, stats.channels[2].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].sum, 372986756)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].squaresSum, 32151543524)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].mean, 61.51724663436759)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].stdev, 38.96702865090125)); + assert.strictEqual(true, isInteger(stats.channels[2].minX)); + assert.strictEqual(true, isInRange(stats.channels[2].minX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[2].minY)); + assert.strictEqual(true, isInRange(stats.channels[2].minY, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[2].maxX)); + assert.strictEqual(true, isInRange(stats.channels[2].maxX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[2].maxY)); + assert.strictEqual(true, isInRange(stats.channels[2].maxY, 0, 2725)); done(); }); @@ -86,20 +86,20 @@ describe('Image Stats', function () { assert.strictEqual(true, isInAcceptableRange(stats.entropy, 0.3409031108021736)); // red channel - assert.strictEqual(0, stats.channels[0]['min']); - assert.strictEqual(255, stats.channels[0]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['sum'], 1391368230)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['squaresSum'], 354798898650)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['mean'], 238.8259925648822)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['stdev'], 62.15121915523771)); - assert.strictEqual(true, isInteger(stats.channels[0]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minX'], 0, 2809)); - assert.strictEqual(true, isInteger(stats.channels[0]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minY'], 0, 2074)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxX'], 0, 2809)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxY'], 0, 2074)); + assert.strictEqual(0, stats.channels[0].min); + assert.strictEqual(255, stats.channels[0].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].sum, 1391368230)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].squaresSum, 354798898650)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].mean, 238.8259925648822)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].stdev, 62.15121915523771)); + assert.strictEqual(true, isInteger(stats.channels[0].minX)); + assert.strictEqual(true, isInRange(stats.channels[0].minX, 0, 2809)); + assert.strictEqual(true, isInteger(stats.channels[0].minY)); + assert.strictEqual(true, isInRange(stats.channels[0].minY, 0, 2074)); + assert.strictEqual(true, isInteger(stats.channels[0].maxX)); + assert.strictEqual(true, isInRange(stats.channels[0].maxX, 0, 2809)); + assert.strictEqual(true, isInteger(stats.channels[0].maxY)); + assert.strictEqual(true, isInRange(stats.channels[0].maxY, 0, 2074)); done(); }); }); @@ -112,68 +112,68 @@ describe('Image Stats', function () { assert.strictEqual(true, isInAcceptableRange(stats.entropy, 0.06778064835816622)); // red channel - assert.strictEqual(0, stats.channels[0]['min']); - assert.strictEqual(255, stats.channels[0]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['sum'], 795678795)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['squaresSum'], 202898092725)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['mean'], 252.9394769668579)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['stdev'], 22.829537532816)); - assert.strictEqual(true, isInteger(stats.channels[0]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minX'], 0, 2048)); - assert.strictEqual(true, isInteger(stats.channels[0]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minY'], 0, 1536)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxX'], 0, 2048)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxY'], 0, 1536)); + assert.strictEqual(0, stats.channels[0].min); + assert.strictEqual(255, stats.channels[0].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].sum, 795678795)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].squaresSum, 202898092725)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].mean, 252.9394769668579)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].stdev, 22.829537532816)); + assert.strictEqual(true, isInteger(stats.channels[0].minX)); + assert.strictEqual(true, isInRange(stats.channels[0].minX, 0, 2048)); + assert.strictEqual(true, isInteger(stats.channels[0].minY)); + assert.strictEqual(true, isInRange(stats.channels[0].minY, 0, 1536)); + assert.strictEqual(true, isInteger(stats.channels[0].maxX)); + assert.strictEqual(true, isInRange(stats.channels[0].maxX, 0, 2048)); + assert.strictEqual(true, isInteger(stats.channels[0].maxY)); + assert.strictEqual(true, isInRange(stats.channels[0].maxY, 0, 1536)); // green channel - assert.strictEqual(0, stats.channels[1]['min']); - assert.strictEqual(255, stats.channels[1]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['sum'], 795678795)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['squaresSum'], 202898092725)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['mean'], 252.9394769668579)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['stdev'], 22.829537532816)); - assert.strictEqual(true, isInteger(stats.channels[1]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[1]['minX'], 0, 2048)); - assert.strictEqual(true, isInteger(stats.channels[1]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[1]['minY'], 0, 1536)); - assert.strictEqual(true, isInteger(stats.channels[1]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[1]['maxX'], 0, 2048)); - assert.strictEqual(true, isInteger(stats.channels[1]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[1]['maxY'], 0, 1536)); + assert.strictEqual(0, stats.channels[1].min); + assert.strictEqual(255, stats.channels[1].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].sum, 795678795)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].squaresSum, 202898092725)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].mean, 252.9394769668579)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].stdev, 22.829537532816)); + assert.strictEqual(true, isInteger(stats.channels[1].minX)); + assert.strictEqual(true, isInRange(stats.channels[1].minX, 0, 2048)); + assert.strictEqual(true, isInteger(stats.channels[1].minY)); + assert.strictEqual(true, isInRange(stats.channels[1].minY, 0, 1536)); + assert.strictEqual(true, isInteger(stats.channels[1].maxX)); + assert.strictEqual(true, isInRange(stats.channels[1].maxX, 0, 2048)); + assert.strictEqual(true, isInteger(stats.channels[1].maxY)); + assert.strictEqual(true, isInRange(stats.channels[1].maxY, 0, 1536)); // blue channel - assert.strictEqual(0, stats.channels[2]['min']); - assert.strictEqual(255, stats.channels[2]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['sum'], 795678795)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['squaresSum'], 202898092725)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['mean'], 252.9394769668579)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['stdev'], 22.829537532816)); - assert.strictEqual(true, isInteger(stats.channels[2]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[2]['minX'], 0, 2048)); - assert.strictEqual(true, isInteger(stats.channels[2]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[2]['minY'], 0, 1536)); - assert.strictEqual(true, isInteger(stats.channels[2]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[2]['maxX'], 0, 2048)); - assert.strictEqual(true, isInteger(stats.channels[2]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[2]['maxY'], 0, 1536)); + assert.strictEqual(0, stats.channels[2].min); + assert.strictEqual(255, stats.channels[2].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].sum, 795678795)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].squaresSum, 202898092725)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].mean, 252.9394769668579)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].stdev, 22.829537532816)); + assert.strictEqual(true, isInteger(stats.channels[2].minX)); + assert.strictEqual(true, isInRange(stats.channels[2].minX, 0, 2048)); + assert.strictEqual(true, isInteger(stats.channels[2].minY)); + assert.strictEqual(true, isInRange(stats.channels[2].minY, 0, 1536)); + assert.strictEqual(true, isInteger(stats.channels[2].maxX)); + assert.strictEqual(true, isInRange(stats.channels[2].maxX, 0, 2048)); + assert.strictEqual(true, isInteger(stats.channels[2].maxY)); + assert.strictEqual(true, isInRange(stats.channels[2].maxY, 0, 1536)); // alpha channel - assert.strictEqual(0, stats.channels[3]['min']); - assert.strictEqual(255, stats.channels[3]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[3]['sum'], 5549142)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[3]['squaresSum'], 1333571132)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[3]['mean'], 1.7640247344970703)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[3]['stdev'], 20.51387814157297)); - assert.strictEqual(true, isInteger(stats.channels[3]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[3]['minX'], 0, 2048)); - assert.strictEqual(true, isInteger(stats.channels[3]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[3]['minY'], 0, 1536)); - assert.strictEqual(true, isInteger(stats.channels[3]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[3]['maxX'], 0, 2048)); - assert.strictEqual(true, isInteger(stats.channels[3]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[3]['maxY'], 0, 1536)); + assert.strictEqual(0, stats.channels[3].min); + assert.strictEqual(255, stats.channels[3].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[3].sum, 5549142)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[3].squaresSum, 1333571132)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[3].mean, 1.7640247344970703)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[3].stdev, 20.51387814157297)); + assert.strictEqual(true, isInteger(stats.channels[3].minX)); + assert.strictEqual(true, isInRange(stats.channels[3].minX, 0, 2048)); + assert.strictEqual(true, isInteger(stats.channels[3].minY)); + assert.strictEqual(true, isInRange(stats.channels[3].minY, 0, 1536)); + assert.strictEqual(true, isInteger(stats.channels[3].maxX)); + assert.strictEqual(true, isInRange(stats.channels[3].maxX, 0, 2048)); + assert.strictEqual(true, isInteger(stats.channels[3].maxY)); + assert.strictEqual(true, isInRange(stats.channels[3].maxY, 0, 1536)); done(); }); @@ -187,20 +187,20 @@ describe('Image Stats', function () { assert.strictEqual(true, isInAcceptableRange(stats.entropy, 0)); // alpha channel - assert.strictEqual(0, stats.channels[3]['min']); - assert.strictEqual(0, stats.channels[3]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[3]['sum'], 0)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[3]['squaresSum'], 0)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[3]['mean'], 0)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[3]['stdev'], 0)); - assert.strictEqual(true, isInteger(stats.channels[3]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[3]['minX'], 0, 300)); - assert.strictEqual(true, isInteger(stats.channels[3]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[3]['minY'], 0, 300)); - assert.strictEqual(true, isInteger(stats.channels[3]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[3]['maxX'], 0, 300)); - assert.strictEqual(true, isInteger(stats.channels[3]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[3]['maxY'], 0, 300)); + assert.strictEqual(0, stats.channels[3].min); + assert.strictEqual(0, stats.channels[3].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[3].sum, 0)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[3].squaresSum, 0)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[3].mean, 0)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[3].stdev, 0)); + assert.strictEqual(true, isInteger(stats.channels[3].minX)); + assert.strictEqual(true, isInRange(stats.channels[3].minX, 0, 300)); + assert.strictEqual(true, isInteger(stats.channels[3].minY)); + assert.strictEqual(true, isInRange(stats.channels[3].minY, 0, 300)); + assert.strictEqual(true, isInteger(stats.channels[3].maxX)); + assert.strictEqual(true, isInRange(stats.channels[3].maxX, 0, 300)); + assert.strictEqual(true, isInteger(stats.channels[3].maxY)); + assert.strictEqual(true, isInRange(stats.channels[3].maxY, 0, 300)); done(); }); @@ -214,20 +214,20 @@ describe('Image Stats', function () { assert.strictEqual(true, isInAcceptableRange(stats.entropy, 0.3851250782608986)); // red channel - assert.strictEqual(0, stats.channels[0]['min']); - assert.strictEqual(255, stats.channels[0]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['sum'], 1887266220)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['squaresSum'], 481252886100)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['mean'], 235.81772349417824)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['stdev'], 67.25712856093298)); - assert.strictEqual(true, isInteger(stats.channels[0]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minX'], 0, 2464)); - assert.strictEqual(true, isInteger(stats.channels[0]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minY'], 0, 3248)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxX'], 0, 2464)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxY'], 0, 3248)); + assert.strictEqual(0, stats.channels[0].min); + assert.strictEqual(255, stats.channels[0].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].sum, 1887266220)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].squaresSum, 481252886100)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].mean, 235.81772349417824)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].stdev, 67.25712856093298)); + assert.strictEqual(true, isInteger(stats.channels[0].minX)); + assert.strictEqual(true, isInRange(stats.channels[0].minX, 0, 2464)); + assert.strictEqual(true, isInteger(stats.channels[0].minY)); + assert.strictEqual(true, isInRange(stats.channels[0].minY, 0, 3248)); + assert.strictEqual(true, isInteger(stats.channels[0].maxX)); + assert.strictEqual(true, isInRange(stats.channels[0].maxX, 0, 2464)); + assert.strictEqual(true, isInteger(stats.channels[0].maxY)); + assert.strictEqual(true, isInRange(stats.channels[0].maxY, 0, 3248)); done(); }); @@ -241,52 +241,52 @@ describe('Image Stats', function () { assert.strictEqual(true, isInAcceptableRange(stats.entropy, 7.51758075132966)); // red channel - assert.strictEqual(0, stats.channels[0]['min']); - assert.strictEqual(255, stats.channels[0]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['sum'], 83291370)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['squaresSum'], 11379783198)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['mean'], 105.36169496842616)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['stdev'], 57.39412151419967)); - assert.strictEqual(true, isInteger(stats.channels[0]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minX'], 0, 1024)); - assert.strictEqual(true, isInteger(stats.channels[0]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minY'], 0, 772)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxX'], 0, 1024)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxY'], 0, 772)); + assert.strictEqual(0, stats.channels[0].min); + assert.strictEqual(255, stats.channels[0].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].sum, 83291370)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].squaresSum, 11379783198)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].mean, 105.36169496842616)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].stdev, 57.39412151419967)); + assert.strictEqual(true, isInteger(stats.channels[0].minX)); + assert.strictEqual(true, isInRange(stats.channels[0].minX, 0, 1024)); + assert.strictEqual(true, isInteger(stats.channels[0].minY)); + assert.strictEqual(true, isInRange(stats.channels[0].minY, 0, 772)); + assert.strictEqual(true, isInteger(stats.channels[0].maxX)); + assert.strictEqual(true, isInRange(stats.channels[0].maxX, 0, 1024)); + assert.strictEqual(true, isInteger(stats.channels[0].maxY)); + assert.strictEqual(true, isInRange(stats.channels[0].maxY, 0, 772)); // green channel - assert.strictEqual(0, stats.channels[1]['min']); - assert.strictEqual(255, stats.channels[1]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['sum'], 120877425)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['squaresSum'], 20774687595)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['mean'], 152.9072025279307)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['stdev'], 53.84143349689916)); - assert.strictEqual(true, isInteger(stats.channels[1]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[1]['minX'], 0, 1024)); - assert.strictEqual(true, isInteger(stats.channels[1]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[1]['minY'], 0, 772)); - assert.strictEqual(true, isInteger(stats.channels[1]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[1]['maxX'], 0, 1024)); - assert.strictEqual(true, isInteger(stats.channels[1]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[1]['maxY'], 0, 772)); + assert.strictEqual(0, stats.channels[1].min); + assert.strictEqual(255, stats.channels[1].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].sum, 120877425)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].squaresSum, 20774687595)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].mean, 152.9072025279307)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].stdev, 53.84143349689916)); + assert.strictEqual(true, isInteger(stats.channels[1].minX)); + assert.strictEqual(true, isInRange(stats.channels[1].minX, 0, 1024)); + assert.strictEqual(true, isInteger(stats.channels[1].minY)); + assert.strictEqual(true, isInRange(stats.channels[1].minY, 0, 772)); + assert.strictEqual(true, isInteger(stats.channels[1].maxX)); + assert.strictEqual(true, isInRange(stats.channels[1].maxX, 0, 1024)); + assert.strictEqual(true, isInteger(stats.channels[1].maxY)); + assert.strictEqual(true, isInRange(stats.channels[1].maxY, 0, 772)); // blue channel - assert.strictEqual(0, stats.channels[2]['min']); - assert.strictEqual(255, stats.channels[2]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['sum'], 138938859)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['squaresSum'], 28449125593)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['mean'], 175.75450711423252)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['stdev'], 71.39929031070358)); - assert.strictEqual(true, isInteger(stats.channels[2]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[2]['minX'], 0, 1024)); - assert.strictEqual(true, isInteger(stats.channels[2]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[2]['minY'], 0, 772)); - assert.strictEqual(true, isInteger(stats.channels[2]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[2]['maxX'], 0, 1024)); - assert.strictEqual(true, isInteger(stats.channels[2]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[2]['maxY'], 0, 772)); + assert.strictEqual(0, stats.channels[2].min); + assert.strictEqual(255, stats.channels[2].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].sum, 138938859)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].squaresSum, 28449125593)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].mean, 175.75450711423252)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].stdev, 71.39929031070358)); + assert.strictEqual(true, isInteger(stats.channels[2].minX)); + assert.strictEqual(true, isInRange(stats.channels[2].minX, 0, 1024)); + assert.strictEqual(true, isInteger(stats.channels[2].minY)); + assert.strictEqual(true, isInRange(stats.channels[2].minY, 0, 772)); + assert.strictEqual(true, isInteger(stats.channels[2].maxX)); + assert.strictEqual(true, isInRange(stats.channels[2].maxX, 0, 1024)); + assert.strictEqual(true, isInteger(stats.channels[2].maxY)); + assert.strictEqual(true, isInRange(stats.channels[2].maxY, 0, 772)); done(); }); @@ -300,52 +300,52 @@ describe('Image Stats', function () { assert.strictEqual(true, isInAcceptableRange(stats.entropy, 6.087309412541799)); // red channel - assert.strictEqual(35, stats.channels[0]['min']); - assert.strictEqual(254, stats.channels[0]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['sum'], 56088385)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['squaresSum'], 8002132113)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['mean'], 131.53936444652908)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['stdev'], 38.26389131415863)); - assert.strictEqual(true, isInteger(stats.channels[0]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minX'], 0, 800)); - assert.strictEqual(true, isInteger(stats.channels[0]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minY'], 0, 533)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxX'], 0, 800)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxY'], 0, 533)); + assert.strictEqual(35, stats.channels[0].min); + assert.strictEqual(254, stats.channels[0].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].sum, 56088385)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].squaresSum, 8002132113)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].mean, 131.53936444652908)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].stdev, 38.26389131415863)); + assert.strictEqual(true, isInteger(stats.channels[0].minX)); + assert.strictEqual(true, isInRange(stats.channels[0].minX, 0, 800)); + assert.strictEqual(true, isInteger(stats.channels[0].minY)); + assert.strictEqual(true, isInRange(stats.channels[0].minY, 0, 533)); + assert.strictEqual(true, isInteger(stats.channels[0].maxX)); + assert.strictEqual(true, isInRange(stats.channels[0].maxX, 0, 800)); + assert.strictEqual(true, isInteger(stats.channels[0].maxY)); + assert.strictEqual(true, isInRange(stats.channels[0].maxY, 0, 533)); // green channel - assert.strictEqual(43, stats.channels[1]['min']); - assert.strictEqual(255, stats.channels[1]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['sum'], 58612156)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['squaresSum'], 8548344254)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['mean'], 137.45815196998123)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['stdev'], 33.955424103758205)); - assert.strictEqual(true, isInteger(stats.channels[1]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[1]['minX'], 0, 800)); - assert.strictEqual(true, isInteger(stats.channels[1]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[1]['minY'], 0, 533)); - assert.strictEqual(true, isInteger(stats.channels[1]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[1]['maxX'], 0, 800)); - assert.strictEqual(true, isInteger(stats.channels[1]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[1]['maxY'], 0, 533)); + assert.strictEqual(43, stats.channels[1].min); + assert.strictEqual(255, stats.channels[1].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].sum, 58612156)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].squaresSum, 8548344254)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].mean, 137.45815196998123)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].stdev, 33.955424103758205)); + assert.strictEqual(true, isInteger(stats.channels[1].minX)); + assert.strictEqual(true, isInRange(stats.channels[1].minX, 0, 800)); + assert.strictEqual(true, isInteger(stats.channels[1].minY)); + assert.strictEqual(true, isInRange(stats.channels[1].minY, 0, 533)); + assert.strictEqual(true, isInteger(stats.channels[1].maxX)); + assert.strictEqual(true, isInRange(stats.channels[1].maxX, 0, 800)); + assert.strictEqual(true, isInteger(stats.channels[1].maxY)); + assert.strictEqual(true, isInRange(stats.channels[1].maxY, 0, 533)); // blue channel - assert.strictEqual(51, stats.channels[2]['min']); - assert.strictEqual(254, stats.channels[2]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['sum'], 49628525)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['squaresSum'], 6450556071)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['mean'], 116.38959896810506)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['stdev'], 39.7669551046809)); - assert.strictEqual(true, isInteger(stats.channels[2]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[2]['minX'], 0, 800)); - assert.strictEqual(true, isInteger(stats.channels[2]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[2]['minY'], 0, 533)); - assert.strictEqual(true, isInteger(stats.channels[2]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[2]['maxX'], 0, 800)); - assert.strictEqual(true, isInteger(stats.channels[2]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[2]['maxY'], 0, 533)); + assert.strictEqual(51, stats.channels[2].min); + assert.strictEqual(254, stats.channels[2].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].sum, 49628525)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].squaresSum, 6450556071)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].mean, 116.38959896810506)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].stdev, 39.7669551046809)); + assert.strictEqual(true, isInteger(stats.channels[2].minX)); + assert.strictEqual(true, isInRange(stats.channels[2].minX, 0, 800)); + assert.strictEqual(true, isInteger(stats.channels[2].minY)); + assert.strictEqual(true, isInRange(stats.channels[2].minY, 0, 533)); + assert.strictEqual(true, isInteger(stats.channels[2].maxX)); + assert.strictEqual(true, isInRange(stats.channels[2].maxX, 0, 800)); + assert.strictEqual(true, isInteger(stats.channels[2].maxY)); + assert.strictEqual(true, isInRange(stats.channels[2].maxY, 0, 533)); done(); }); @@ -359,36 +359,36 @@ describe('Image Stats', function () { assert.strictEqual(true, isInAcceptableRange(stats.entropy, 1)); // gray channel - assert.strictEqual(0, stats.channels[0]['min']); - assert.strictEqual(101, stats.channels[0]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['sum'], 101)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['squaresSum'], 10201)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['mean'], 50.5)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['stdev'], 71.4177848998413)); - assert.strictEqual(true, isInteger(stats.channels[0]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minX'], 0, 2)); - assert.strictEqual(true, isInteger(stats.channels[0]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minY'], 0, 1)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxX'], 0, 2)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxY'], 0, 1)); + assert.strictEqual(0, stats.channels[0].min); + assert.strictEqual(101, stats.channels[0].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].sum, 101)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].squaresSum, 10201)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].mean, 50.5)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].stdev, 71.4177848998413)); + assert.strictEqual(true, isInteger(stats.channels[0].minX)); + assert.strictEqual(true, isInRange(stats.channels[0].minX, 0, 2)); + assert.strictEqual(true, isInteger(stats.channels[0].minY)); + assert.strictEqual(true, isInRange(stats.channels[0].minY, 0, 1)); + assert.strictEqual(true, isInteger(stats.channels[0].maxX)); + assert.strictEqual(true, isInRange(stats.channels[0].maxX, 0, 2)); + assert.strictEqual(true, isInteger(stats.channels[0].maxY)); + assert.strictEqual(true, isInRange(stats.channels[0].maxY, 0, 1)); // alpha channel - assert.strictEqual(0, stats.channels[1]['min']); - assert.strictEqual(255, stats.channels[1]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['sum'], 255)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['squaresSum'], 65025)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['mean'], 127.5)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['stdev'], 180.31222920256963)); - assert.strictEqual(true, isInteger(stats.channels[1]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[1]['minX'], 0, 2)); - assert.strictEqual(true, isInteger(stats.channels[1]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[1]['minY'], 0, 1)); - assert.strictEqual(true, isInteger(stats.channels[1]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[1]['maxX'], 0, 2)); - assert.strictEqual(true, isInteger(stats.channels[1]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[1]['maxY'], 0, 1)); + assert.strictEqual(0, stats.channels[1].min); + assert.strictEqual(255, stats.channels[1].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].sum, 255)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].squaresSum, 65025)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].mean, 127.5)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].stdev, 180.31222920256963)); + assert.strictEqual(true, isInteger(stats.channels[1].minX)); + assert.strictEqual(true, isInRange(stats.channels[1].minX, 0, 2)); + assert.strictEqual(true, isInteger(stats.channels[1].minY)); + assert.strictEqual(true, isInRange(stats.channels[1].minY, 0, 1)); + assert.strictEqual(true, isInteger(stats.channels[1].maxX)); + assert.strictEqual(true, isInRange(stats.channels[1].maxX, 0, 2)); + assert.strictEqual(true, isInteger(stats.channels[1].maxY)); + assert.strictEqual(true, isInRange(stats.channels[1].maxY, 0, 1)); done(); }); @@ -412,52 +412,52 @@ describe('Image Stats', function () { assert.strictEqual(true, isInAcceptableRange(stats.entropy, 7.319914765248541)); // red channel - assert.strictEqual(0, stats.channels[0]['min']); - assert.strictEqual(255, stats.channels[0]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['sum'], 615101275)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['squaresSum'], 83061892917)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['mean'], 101.44954540768993)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['stdev'], 58.373870588815414)); - assert.strictEqual(true, isInteger(stats.channels[0]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minY'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxY'], 0, 2725)); + assert.strictEqual(0, stats.channels[0].min); + assert.strictEqual(255, stats.channels[0].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].sum, 615101275)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].squaresSum, 83061892917)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].mean, 101.44954540768993)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].stdev, 58.373870588815414)); + assert.strictEqual(true, isInteger(stats.channels[0].minX)); + assert.strictEqual(true, isInRange(stats.channels[0].minX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].minY)); + assert.strictEqual(true, isInRange(stats.channels[0].minY, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxX)); + assert.strictEqual(true, isInRange(stats.channels[0].maxX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxY)); + assert.strictEqual(true, isInRange(stats.channels[0].maxY, 0, 2725)); // green channel - assert.strictEqual(0, stats.channels[1]['min']); - assert.strictEqual(255, stats.channels[1]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['sum'], 462824115)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['squaresSum'], 47083677255)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['mean'], 76.33425255128337)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['stdev'], 44.03023262954866)); - assert.strictEqual(true, isInteger(stats.channels[1]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[1]['minX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[1]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[1]['minY'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[1]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[1]['maxX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[1]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[1]['maxY'], 0, 2725)); + assert.strictEqual(0, stats.channels[1].min); + assert.strictEqual(255, stats.channels[1].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].sum, 462824115)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].squaresSum, 47083677255)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].mean, 76.33425255128337)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].stdev, 44.03023262954866)); + assert.strictEqual(true, isInteger(stats.channels[1].minX)); + assert.strictEqual(true, isInRange(stats.channels[1].minX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[1].minY)); + assert.strictEqual(true, isInRange(stats.channels[1].minY, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[1].maxX)); + assert.strictEqual(true, isInRange(stats.channels[1].maxX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[1].maxY)); + assert.strictEqual(true, isInRange(stats.channels[1].maxY, 0, 2725)); // blue channel - assert.strictEqual(0, stats.channels[2]['min']); - assert.strictEqual(255, stats.channels[2]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['sum'], 372986756)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['squaresSum'], 32151543524)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['mean'], 61.51724663436759)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['stdev'], 38.96702865090125)); - assert.strictEqual(true, isInteger(stats.channels[2]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[2]['minX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[2]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[2]['minY'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[2]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[2]['maxX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[2]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[2]['maxY'], 0, 2725)); + assert.strictEqual(0, stats.channels[2].min); + assert.strictEqual(255, stats.channels[2].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].sum, 372986756)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].squaresSum, 32151543524)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].mean, 61.51724663436759)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].stdev, 38.96702865090125)); + assert.strictEqual(true, isInteger(stats.channels[2].minX)); + assert.strictEqual(true, isInRange(stats.channels[2].minX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[2].minY)); + assert.strictEqual(true, isInRange(stats.channels[2].minY, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[2].maxX)); + assert.strictEqual(true, isInRange(stats.channels[2].maxX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[2].maxY)); + assert.strictEqual(true, isInRange(stats.channels[2].maxY, 0, 2725)); done(); }); @@ -474,52 +474,52 @@ describe('Image Stats', function () { assert.strictEqual(true, isInAcceptableRange(stats.entropy, 7.319914765248541)); // red channel - assert.strictEqual(0, stats.channels[0]['min']); - assert.strictEqual(255, stats.channels[0]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['sum'], 615101275)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['squaresSum'], 83061892917)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['mean'], 101.44954540768993)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['stdev'], 58.373870588815414)); - assert.strictEqual(true, isInteger(stats.channels[0]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minY'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxY'], 0, 2725)); + assert.strictEqual(0, stats.channels[0].min); + assert.strictEqual(255, stats.channels[0].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].sum, 615101275)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].squaresSum, 83061892917)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].mean, 101.44954540768993)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].stdev, 58.373870588815414)); + assert.strictEqual(true, isInteger(stats.channels[0].minX)); + assert.strictEqual(true, isInRange(stats.channels[0].minX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].minY)); + assert.strictEqual(true, isInRange(stats.channels[0].minY, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxX)); + assert.strictEqual(true, isInRange(stats.channels[0].maxX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxY)); + assert.strictEqual(true, isInRange(stats.channels[0].maxY, 0, 2725)); // green channel - assert.strictEqual(0, stats.channels[1]['min']); - assert.strictEqual(255, stats.channels[1]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['sum'], 462824115)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['squaresSum'], 47083677255)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['mean'], 76.33425255128337)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['stdev'], 44.03023262954866)); - assert.strictEqual(true, isInteger(stats.channels[0]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minY'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxY'], 0, 2725)); + assert.strictEqual(0, stats.channels[1].min); + assert.strictEqual(255, stats.channels[1].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].sum, 462824115)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].squaresSum, 47083677255)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].mean, 76.33425255128337)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].stdev, 44.03023262954866)); + assert.strictEqual(true, isInteger(stats.channels[0].minX)); + assert.strictEqual(true, isInRange(stats.channels[0].minX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].minY)); + assert.strictEqual(true, isInRange(stats.channels[0].minY, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxX)); + assert.strictEqual(true, isInRange(stats.channels[0].maxX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxY)); + assert.strictEqual(true, isInRange(stats.channels[0].maxY, 0, 2725)); // blue channel - assert.strictEqual(0, stats.channels[2]['min']); - assert.strictEqual(255, stats.channels[2]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['sum'], 372986756)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['squaresSum'], 32151543524)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['mean'], 61.51724663436759)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['stdev'], 38.96702865090125)); - assert.strictEqual(true, isInteger(stats.channels[0]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minY'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxY'], 0, 2725)); + assert.strictEqual(0, stats.channels[2].min); + assert.strictEqual(255, stats.channels[2].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].sum, 372986756)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].squaresSum, 32151543524)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].mean, 61.51724663436759)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].stdev, 38.96702865090125)); + assert.strictEqual(true, isInteger(stats.channels[0].minX)); + assert.strictEqual(true, isInRange(stats.channels[0].minX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].minY)); + assert.strictEqual(true, isInRange(stats.channels[0].minY, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxX)); + assert.strictEqual(true, isInRange(stats.channels[0].maxX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxY)); + assert.strictEqual(true, isInRange(stats.channels[0].maxY, 0, 2725)); }).catch(function (err) { throw err; }); @@ -531,52 +531,52 @@ describe('Image Stats', function () { assert.strictEqual(true, isInAcceptableRange(stats.entropy, 7.319914765248541)); // red channel - assert.strictEqual(0, stats.channels[0]['min']); - assert.strictEqual(255, stats.channels[0]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['sum'], 615101275)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['squaresSum'], 83061892917)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['mean'], 101.44954540768993)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[0]['stdev'], 58.373870588815414)); - assert.strictEqual(true, isInteger(stats.channels[0]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minY'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxY'], 0, 2725)); + assert.strictEqual(0, stats.channels[0].min); + assert.strictEqual(255, stats.channels[0].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].sum, 615101275)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].squaresSum, 83061892917)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].mean, 101.44954540768993)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[0].stdev, 58.373870588815414)); + assert.strictEqual(true, isInteger(stats.channels[0].minX)); + assert.strictEqual(true, isInRange(stats.channels[0].minX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].minY)); + assert.strictEqual(true, isInRange(stats.channels[0].minY, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxX)); + assert.strictEqual(true, isInRange(stats.channels[0].maxX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxY)); + assert.strictEqual(true, isInRange(stats.channels[0].maxY, 0, 2725)); // green channel - assert.strictEqual(0, stats.channels[1]['min']); - assert.strictEqual(255, stats.channels[1]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['sum'], 462824115)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['squaresSum'], 47083677255)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['mean'], 76.33425255128337)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[1]['stdev'], 44.03023262954866)); - assert.strictEqual(true, isInteger(stats.channels[0]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minY'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxY'], 0, 2725)); + assert.strictEqual(0, stats.channels[1].min); + assert.strictEqual(255, stats.channels[1].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].sum, 462824115)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].squaresSum, 47083677255)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].mean, 76.33425255128337)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[1].stdev, 44.03023262954866)); + assert.strictEqual(true, isInteger(stats.channels[0].minX)); + assert.strictEqual(true, isInRange(stats.channels[0].minX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].minY)); + assert.strictEqual(true, isInRange(stats.channels[0].minY, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxX)); + assert.strictEqual(true, isInRange(stats.channels[0].maxX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxY)); + assert.strictEqual(true, isInRange(stats.channels[0].maxY, 0, 2725)); // blue channel - assert.strictEqual(0, stats.channels[2]['min']); - assert.strictEqual(255, stats.channels[2]['max']); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['sum'], 372986756)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['squaresSum'], 32151543524)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['mean'], 61.51724663436759)); - assert.strictEqual(true, isInAcceptableRange(stats.channels[2]['stdev'], 38.96702865090125)); - assert.strictEqual(true, isInteger(stats.channels[0]['minX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['minY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['minY'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxX'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxX'], 0, 2725)); - assert.strictEqual(true, isInteger(stats.channels[0]['maxY'])); - assert.strictEqual(true, isInRange(stats.channels[0]['maxY'], 0, 2725)); + assert.strictEqual(0, stats.channels[2].min); + assert.strictEqual(255, stats.channels[2].max); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].sum, 372986756)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].squaresSum, 32151543524)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].mean, 61.51724663436759)); + assert.strictEqual(true, isInAcceptableRange(stats.channels[2].stdev, 38.96702865090125)); + assert.strictEqual(true, isInteger(stats.channels[0].minX)); + assert.strictEqual(true, isInRange(stats.channels[0].minX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].minY)); + assert.strictEqual(true, isInRange(stats.channels[0].minY, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxX)); + assert.strictEqual(true, isInRange(stats.channels[0].maxX, 0, 2725)); + assert.strictEqual(true, isInteger(stats.channels[0].maxY)); + assert.strictEqual(true, isInRange(stats.channels[0].maxY, 0, 2725)); }).catch(function (err) { throw err; }); diff --git a/test/unit/tile.js b/test/unit/tile.js index 661c8d43..a3aad2d7 100644 --- a/test/unit/tile.js +++ b/test/unit/tile.js @@ -56,7 +56,7 @@ const assertZoomifyTiles = function (directory, expectedTileSize, expectedLevels fs.readdirSync(path.join(directory, 'TileGroup0')).forEach(function (tile) { // Verify tile file name assert.ok(/^[0-9]+-[0-9]+-[0-9]+\.jpg$/.test(tile)); - let level = parseInt(tile.split('-')[0]); + const level = parseInt(tile.split('-')[0]); maxTileLevel = Math.max(maxTileLevel, level); }); @@ -319,7 +319,7 @@ describe('Tile', function () { assert.strictEqual('undefined', typeof info.size); assertDeepZoomTiles(directory, 512, 13, done); // Verifies tiles in 10th level are rotated - let tile = path.join(directory, '10', '0_1.jpeg'); + const tile = path.join(directory, '10', '0_1.jpeg'); // verify that the width and height correspond to the rotated image // expected are w=512 and h=170 for the 0_1.jpeg. // if a 0 angle is supplied to the .tile function @@ -396,7 +396,7 @@ describe('Tile', function () { if (err) throw err; // assert them 0_0.jpeg doesn't exist because it's a white tile const whiteTilePath = path.join(directory, '11', '0_0.jpeg'); - assert.strictEqual(fs.existsSync(whiteTilePath), false, `Tile shouldn't exist`); + assert.strictEqual(fs.existsSync(whiteTilePath), false, 'Tile should not exist'); // Verify only one depth generated assertDeepZoomTiles(directory, 256, 12, done); }); @@ -503,7 +503,7 @@ describe('Tile', function () { if (err) throw err; // assert them 0_0.jpeg doesn't exist because it's a white tile const whiteTilePath = path.join(directory, 'TileGroup0', '2-0-0.jpg'); - assert.strictEqual(fs.existsSync(whiteTilePath), false, `Tile shouldn't exist`); + assert.strictEqual(fs.existsSync(whiteTilePath), false, 'Tile should not exist'); assert.strictEqual('dz', info.format); assert.strictEqual(2048, info.width); assert.strictEqual(1536, info.height); @@ -727,7 +727,7 @@ describe('Tile', function () { if (err) throw err; const whiteTilePath = path.join(directory, '4', '8', '0.jpg'); - assert.strictEqual(fs.existsSync(whiteTilePath), false, `Tile shouldn't exist`); + assert.strictEqual(fs.existsSync(whiteTilePath), false, 'Tile should not exist'); assert.strictEqual('dz', info.format); assert.strictEqual(2809, info.width); diff --git a/test/unit/toBuffer.js b/test/unit/toBuffer.js index 3e5a07db..2f79c04c 100644 --- a/test/unit/toBuffer.js +++ b/test/unit/toBuffer.js @@ -7,7 +7,7 @@ const fixtures = require('../fixtures'); describe('toBuffer', () => { it('reusing same sharp object does not reset previously passed parameters to toBuffer', (done) => { - let image = sharp(fixtures.inputJpg); + const image = sharp(fixtures.inputJpg); image.toBuffer({ resolveWithObject: true }).then((obj) => { image.toBuffer().then((buff) => { assert.strict.equal(Buffer.isBuffer(buff), true);