splashy 6.0.0-0 → 6.0.0-2

package/package.json

@@ -2,7 +2,7 @@
   "name": "splashy",
   "description": "Given an image, extract predominant & palette colors",
   "homepage": "https://github.com/microlinkhq/splashy",
-  "version": "6.0.0-0",
+  "version": "6.0.0-2",
   "main": "src/index.js",
   "author": {
     "name": "Kiko Beats",
@@ -28,6 +28,7 @@
   "keywords": [
     "canvas",
     "color",
+    "colorthief",
     "colour",
     "dominant",
     "extract",
@@ -74,6 +75,12 @@
     "src"
   ],
   "license": "MIT",
+  "ava": {
+    "files": [
+      "test/**/*.js",
+      "!test/util.js"
+    ]
+  },
   "commitlint": {
     "extends": [
       "@commitlint/config-conventional"

package/src/index.js

@@ -1,15 +1,10 @@
 'use strict'
 
-const quantize = require('@lokesh.dhakar/quantize')
+const quantize = require('@lokesh.dhakar/quantize').default || require('@lokesh.dhakar/quantize')
 const ndarray = require('ndarray')
 const sharp = require('sharp')
 
-async function getPixels (buffer) {
-  const { data, info } = await sharp(buffer)
-    .ensureAlpha()
-    .raw()
-    .toBuffer({ resolveWithObject: true })
-
+async function getPixels ({ data, info }) {
   return ndarray(
     new Uint8Array(data.buffer, data.byteOffset, data.length),
     [info.width, info.height, 4],
@@ -20,17 +15,15 @@ async function getPixels (buffer) {
 
 function createPixelArray (pixels, pixelCount, quality = 10) {
   const pixelArray = []
-
   for (let i = 0, offset; i < pixelCount; i += quality) {
     offset = i * 4
     const r = pixels[offset]
     const g = pixels[offset + 1]
     const b = pixels[offset + 2]
     const a = pixels[offset + 3]
-
-    if ((a === undefined || a >= 125) && !(r > 250 && g > 250 && b > 250)) {
-      pixelArray.push([r, g, b])
-    }
+    const isOpaqueEnough = a >= 125
+    const isWhite = r > 250 && g > 250 && b > 250
+    if (isOpaqueEnough && !isWhite) pixelArray.push([r, g, b])
   }
 
   return pixelArray
@@ -39,9 +32,18 @@ function createPixelArray (pixels, pixelCount, quality = 10) {
 const toHex = ([r, g, b]) => '#' + (b | (g << 8) | (r << 16) | (1 << 24)).toString(16).slice(1)
 
 module.exports = async function (buffer) {
-  const imgData = await getPixels(await sharp(buffer).toBuffer())
+  const raw = await sharp(buffer)
+    // resizing the image before processing leads to more consistent (and much shorter) processing times.
+    // .resize(200, 200, { fit: 'inside', withoutEnlargement: true })
+    .ensureAlpha()
+    .raw()
+    .toBuffer({ resolveWithObject: true })
+
+  const imgData = await getPixels(raw)
   const pixelCount = imgData.shape[0] * imgData.shape[1]
   const pixelArray = createPixelArray(imgData.data, pixelCount)
   const cmap = quantize(pixelArray, 10) // internal tuning
   return cmap.palette().slice(0, 6).map(toHex)
 }
+
+module.exports.toHex = toHex