From db14c64512ae820b9625dd5d655809cff0095d30 Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Fri, 5 Mar 2021 17:35:40 +0200 Subject: [PATCH] Run Prettier on all files --- benchmark/index.html | 15 ++++----- benchmark/util/benchmark.js | 4 +-- src/cubehelix/constants.js | 8 ++--- src/cubehelix/convertCubehelixToRgb.js | 4 +-- src/dlch/constants.js | 4 +-- src/dlch/convertDlabToDlch.js | 6 ++-- src/dlch/convertDlchToDlab.js | 6 ++-- src/hsi/convertHsiToRgb.js | 46 +++++++++++++------------- src/hsi/convertRgbToHsi.js | 17 +++++++--- src/hsl/convertHslToRgb.js | 35 ++++++++++++++------ src/hsl/convertRgbToHsl.js | 15 ++++++--- src/hsl/parseHsl.js | 2 +- src/hsv/convertHsvToRgb.js | 35 ++++++++++++++------ src/hsv/convertRgbToHsv.js | 15 ++++++--- src/hwb/convertHwbToRgb.js | 12 +++---- src/hwb/convertRgbToHwb.js | 2 +- src/hwb/parseHwb.js | 6 ++-- src/lch/parseLch.js | 9 +++-- src/lrgb/convertRgbToLrgb.js | 4 +-- src/rgb/parseNamed.js | 8 +++-- src/rgb/parseNumber.js | 33 +++++++++--------- src/rgb/parseRgb.js | 27 ++++++++------- src/rgb/parseTransparent.js | 3 +- src/util/fixup.js | 2 +- src/util/hue.js | 14 +++++--- src/util/normalizeHue.js | 2 +- test/blend.test.js | 2 +- test/cubehelix.test.js | 2 +- test/displayable.test.js | 4 +-- test/hsi.test.js | 4 +-- test/hsl.test.js | 6 ++-- test/hsv.test.js | 6 ++-- test/hwb.test.js | 2 +- 33 files changed, 204 insertions(+), 156 deletions(-) diff --git a/benchmark/index.html b/benchmark/index.html index 0d922be1..c207e26f 100644 --- a/benchmark/index.html +++ b/benchmark/index.html @@ -1,10 +1,9 @@ - - - culori browser playground - - - - - \ No newline at end of file + + + culori browser playground + + + + diff --git a/benchmark/util/benchmark.js b/benchmark/util/benchmark.js index f16e7ba3..2e451526 100644 --- a/benchmark/util/benchmark.js +++ b/benchmark/util/benchmark.js @@ -8,8 +8,8 @@ function endBench() { return end[0] + 's ' + end[1] / 1000000 + 'ms'; } -module.exports = function(name, fn) { +module.exports = function (name, fn) { startBench(); fn(); console.log(name, endBench()); -} \ No newline at end of file +}; diff --git a/src/cubehelix/constants.js b/src/cubehelix/constants.js index b067721f..7a90b348 100644 --- a/src/cubehelix/constants.js +++ b/src/cubehelix/constants.js @@ -1,8 +1,4 @@ -export const M = [ - -0.14861, 1.78277, - -0.29227, -0.90649, - 1.97294, 0 -]; +export const M = [-0.14861, 1.78277, -0.29227, -0.90649, 1.97294, 0]; export const degToRad = Math.PI / 180; -export const radToDeg = 180 / Math.PI; \ No newline at end of file +export const radToDeg = 180 / Math.PI; diff --git a/src/cubehelix/convertCubehelixToRgb.js b/src/cubehelix/convertCubehelixToRgb.js index d3911668..1c9b5757 100644 --- a/src/cubehelix/convertCubehelixToRgb.js +++ b/src/cubehelix/convertCubehelixToRgb.js @@ -4,7 +4,7 @@ export default ({ h, s, l, alpha }) => { let res = { mode: 'rgb' }; h = (h === undefined ? 0 : h + 120) * degToRad; - + let amp = s === undefined ? 0 : s * l * (1 - l); let cosh = Math.cos(h); @@ -16,4 +16,4 @@ export default ({ h, s, l, alpha }) => { if (alpha !== undefined) res.alpha = alpha; return res; -}; \ No newline at end of file +}; diff --git a/src/dlch/constants.js b/src/dlch/constants.js index 2010f253..61ce019a 100644 --- a/src/dlch/constants.js +++ b/src/dlch/constants.js @@ -1,6 +1,6 @@ export const kE = 1; export const kCH = 1; -export const θ = 26 / 180 * Math.PI; +export const θ = (26 / 180) * Math.PI; export const cosθ = Math.cos(θ); export const sinθ = Math.sin(θ); -export const factor = 100/Math.log(139/100); // ~ 303.67 \ No newline at end of file +export const factor = 100 / Math.log(139 / 100); // ~ 303.67 diff --git a/src/dlch/convertDlabToDlch.js b/src/dlch/convertDlabToDlch.js index 106ae0bd..bb3bf9d9 100644 --- a/src/dlch/convertDlabToDlch.js +++ b/src/dlch/convertDlabToDlch.js @@ -6,8 +6,8 @@ export default ({ l, a, b, alpha }) => { mode: 'dlch', l: l, c: c - } - if (c) res.h = normalizeHue(Math.atan2(b, a) * 180 / Math.PI); + }; + if (c) res.h = normalizeHue((Math.atan2(b, a) * 180) / Math.PI); if (alpha !== undefined) res.alpha = alpha; return res; -}; \ No newline at end of file +}; diff --git a/src/dlch/convertDlchToDlab.js b/src/dlch/convertDlchToDlab.js index d30c6f15..b7b3cfc3 100644 --- a/src/dlch/convertDlchToDlab.js +++ b/src/dlch/convertDlchToDlab.js @@ -2,9 +2,9 @@ export default ({ l, c, h, alpha }) => { let res = { mode: 'dlab', l: l, - a: c === 0 ? 0 : c * Math.cos(h / 180 * Math.PI), - b: c === 0 ? 0 : c * Math.sin(h / 180 * Math.PI) + a: c === 0 ? 0 : c * Math.cos((h / 180) * Math.PI), + b: c === 0 ? 0 : c * Math.sin((h / 180) * Math.PI) }; if (alpha !== undefined) res.alpha = alpha; return res; -}; \ No newline at end of file +}; diff --git a/src/hsi/convertHsiToRgb.js b/src/hsi/convertHsiToRgb.js index 6f66691f..e5ed8809 100644 --- a/src/hsi/convertHsiToRgb.js +++ b/src/hsi/convertHsiToRgb.js @@ -4,49 +4,49 @@ import normalizeHue from '../util/normalizeHue'; export default function ({ h, s, i, alpha }) { h = normalizeHue(h); - let f = Math.abs(h/60 % 2 - 1); + let f = Math.abs(((h / 60) % 2) - 1); let res; - switch (Math.floor(h/60)) { - case 0: + switch (Math.floor(h / 60)) { + case 0: res = { - r: i * (1 + s * (3 / (2 - f) - 1)), - g: i * (1 + s * (3 * (1 - f) / (2 - f) - 1)), + r: i * (1 + s * (3 / (2 - f) - 1)), + g: i * (1 + s * ((3 * (1 - f)) / (2 - f) - 1)), b: i * (1 - s) }; break; - case 1: + case 1: res = { - r: i * (1 + s * (3 * (1 - f) / (2 - f) - 1)), - g: i * (1 + s * (3 / (2 - f) - 1)), + r: i * (1 + s * ((3 * (1 - f)) / (2 - f) - 1)), + g: i * (1 + s * (3 / (2 - f) - 1)), b: i * (1 - s) }; break; - case 2: + case 2: res = { - r: i * (1 - s), - g: i * (1 + s * (3 / (2 - f) - 1)), - b: i * (1 + s * (3 * (1 - f) / (2 - f) - 1)) + r: i * (1 - s), + g: i * (1 + s * (3 / (2 - f) - 1)), + b: i * (1 + s * ((3 * (1 - f)) / (2 - f) - 1)) }; break; - case 3: + case 3: res = { - r: i * (1 - s), - g: i * (1 + s * (3 * (1 - f) / (2 - f) - 1)), + r: i * (1 - s), + g: i * (1 + s * ((3 * (1 - f)) / (2 - f) - 1)), b: i * (1 + s * (3 / (2 - f) - 1)) }; break; - case 4: + case 4: res = { - r: i * (1 + s * (3 * (1 - f) / (2 - f) - 1)), - g: i * (1 - s), + r: i * (1 + s * ((3 * (1 - f)) / (2 - f) - 1)), + g: i * (1 - s), b: i * (1 + s * (3 / (2 - f) - 1)) }; break; - case 5: + case 5: res = { - r: i * (1 + s * (3 / (2 - f) - 1)), - g: i * (1 - s), - b: i * (1 + s * (3 * (1 - f) / (2 - f) - 1)) + r: i * (1 + s * (3 / (2 - f) - 1)), + g: i * (1 - s), + b: i * (1 + s * ((3 * (1 - f)) / (2 - f) - 1)) }; break; default: @@ -56,4 +56,4 @@ export default function ({ h, s, i, alpha }) { res.mode = 'rgb'; if (alpha !== undefined) res.alpha = alpha; return res; -} \ No newline at end of file +} diff --git a/src/hsi/convertRgbToHsi.js b/src/hsi/convertRgbToHsi.js index 8d0d5f57..ad0a2a0c 100644 --- a/src/hsi/convertRgbToHsi.js +++ b/src/hsi/convertRgbToHsi.js @@ -1,13 +1,20 @@ // Based on: https://en.wikipedia.org/wiki/HSL_and_HSV#Formal_derivation -export default function({ r, g, b, alpha }) { - let M = Math.max(r, g, b), m = Math.min(r, g, b); +export default function ({ r, g, b, alpha }) { + let M = Math.max(r, g, b), + m = Math.min(r, g, b); let res = { mode: 'hsi', - s: r + g + b === 0 ? 0 : 1 - 3 * m / (r + g + b), + s: r + g + b === 0 ? 0 : 1 - (3 * m) / (r + g + b), i: (r + g + b) / 3 }; - if (M - m !== 0) res.h = (M === r ? (g - b) / (M - m) + (g < b) * 6 : M === g ? (b - r) / (M - m) + 2 : (r - g) / (M - m) + 4) * 60; + if (M - m !== 0) + res.h = + (M === r + ? (g - b) / (M - m) + (g < b) * 6 + : M === g + ? (b - r) / (M - m) + 2 + : (r - g) / (M - m) + 4) * 60; if (alpha !== undefined) res.alpha = alpha; return res; -} \ No newline at end of file +} diff --git a/src/hsl/convertHslToRgb.js b/src/hsl/convertHslToRgb.js index 782ce8d0..fbfcbdf6 100644 --- a/src/hsl/convertHslToRgb.js +++ b/src/hsl/convertHslToRgb.js @@ -1,21 +1,34 @@ import normalizeHue from '../util/normalizeHue'; // Based on: https://en.wikipedia.org/wiki/HSL_and_HSV#Converting_to_RGB -export default function({ h, s, l, alpha }) { +export default function ({ h, s, l, alpha }) { h = normalizeHue(h); let m1 = l + s * (l < 0.5 ? l : 1 - l); - let m2 = m1 - (m1 - l) * 2 * Math.abs(h/60 % 2 - 1); + let m2 = m1 - (m1 - l) * 2 * Math.abs(((h / 60) % 2) - 1); let res; - switch (Math.floor(h/60)) { - case 0: res = { r: m1, g: m2, b: 2 * l - m1 }; break; - case 1: res = { r: m2, g: m1, b: 2 * l - m1 }; break; - case 2: res = { r: 2 * l - m1, g: m1, b: m2 }; break; - case 3: res = { r: 2 * l - m1, g: m2, b: m1 }; break; - case 4: res = { r: m2, g: 2 * l - m1, b: m1 }; break; - case 5: res = { r: m1, g: 2 * l - m1, b: m2 }; break; - default: res = { r: 2 * l - m1, g: 2 * l - m1, b: 2 * l - m1 }; + switch (Math.floor(h / 60)) { + case 0: + res = { r: m1, g: m2, b: 2 * l - m1 }; + break; + case 1: + res = { r: m2, g: m1, b: 2 * l - m1 }; + break; + case 2: + res = { r: 2 * l - m1, g: m1, b: m2 }; + break; + case 3: + res = { r: 2 * l - m1, g: m2, b: m1 }; + break; + case 4: + res = { r: m2, g: 2 * l - m1, b: m1 }; + break; + case 5: + res = { r: m1, g: 2 * l - m1, b: m2 }; + break; + default: + res = { r: 2 * l - m1, g: 2 * l - m1, b: 2 * l - m1 }; } res.mode = 'rgb'; if (alpha !== undefined) res.alpha = alpha; return res; -}; \ No newline at end of file +} diff --git a/src/hsl/convertRgbToHsl.js b/src/hsl/convertRgbToHsl.js index dacd4308..ab152ecd 100644 --- a/src/hsl/convertRgbToHsl.js +++ b/src/hsl/convertRgbToHsl.js @@ -1,13 +1,20 @@ // Based on: https://en.wikipedia.org/wiki/HSL_and_HSV#Formal_derivation -export default function({ r, g, b, alpha }) { - let M = Math.max(r, g, b), m = Math.min(r, g, b); +export default function ({ r, g, b, alpha }) { + let M = Math.max(r, g, b), + m = Math.min(r, g, b); let res = { mode: 'hsl', s: M === m ? 0 : (M - m) / (1 - Math.abs(M + m - 1)), l: 0.5 * (M + m) }; - if (M - m !== 0) res.h = (M === r ? (g - b) / (M - m) + (g < b) * 6 : M === g ? (b - r) / (M - m) + 2 : (r - g) / (M - m) + 4) * 60; + if (M - m !== 0) + res.h = + (M === r + ? (g - b) / (M - m) + (g < b) * 6 + : M === g + ? (b - r) / (M - m) + 2 + : (r - g) / (M - m) + 4) * 60; if (alpha !== undefined) res.alpha = alpha; return res; -} \ No newline at end of file +} diff --git a/src/hsl/parseHsl.js b/src/hsl/parseHsl.js index 0253dd42..f40e1194 100644 --- a/src/hsl/parseHsl.js +++ b/src/hsl/parseHsl.js @@ -17,4 +17,4 @@ export default color => { res.alpha = match[7] / 255; } return res; -} \ No newline at end of file +}; diff --git a/src/hsv/convertHsvToRgb.js b/src/hsv/convertHsvToRgb.js index 70afb160..13dc7d9e 100644 --- a/src/hsv/convertHsvToRgb.js +++ b/src/hsv/convertHsvToRgb.js @@ -2,20 +2,33 @@ import normalizeHue from '../util/normalizeHue'; // Based on: https://en.wikipedia.org/wiki/HSL_and_HSV#Converting_to_RGB -export default function({ h, s, v, alpha }) { +export default function ({ h, s, v, alpha }) { h = normalizeHue(h); - let f = Math.abs(h/60 % 2 - 1); + let f = Math.abs(((h / 60) % 2) - 1); let res; - switch (Math.floor(h/60)) { - case 0: res = { r: v, g: v * (1 - s * f), b: v * (1 - s) }; break; - case 1: res = { r: v * (1 - s * f), g: v, b: v * (1 - s) }; break; - case 2: res = { r: v * (1 - s), g: v, b: v * (1 - s * f) }; break; - case 3: res = { r: v * (1 - s), g: v * (1 - s * f), b: v }; break; - case 4: res = { r: v * (1 - s * f), g: v * (1 - s), b: v }; break; - case 5: res = { r: v, g: v * (1 - s), b: v * (1 - s * f) }; break; - default: res = { r: v * (1 - s), g: v * (1 - s), b: v * (1 - s) }; + switch (Math.floor(h / 60)) { + case 0: + res = { r: v, g: v * (1 - s * f), b: v * (1 - s) }; + break; + case 1: + res = { r: v * (1 - s * f), g: v, b: v * (1 - s) }; + break; + case 2: + res = { r: v * (1 - s), g: v, b: v * (1 - s * f) }; + break; + case 3: + res = { r: v * (1 - s), g: v * (1 - s * f), b: v }; + break; + case 4: + res = { r: v * (1 - s * f), g: v * (1 - s), b: v }; + break; + case 5: + res = { r: v, g: v * (1 - s), b: v * (1 - s * f) }; + break; + default: + res = { r: v * (1 - s), g: v * (1 - s), b: v * (1 - s) }; } res.mode = 'rgb'; if (alpha !== undefined) res.alpha = alpha; return res; -}; \ No newline at end of file +} diff --git a/src/hsv/convertRgbToHsv.js b/src/hsv/convertRgbToHsv.js index e87fad02..30cc4213 100644 --- a/src/hsv/convertRgbToHsv.js +++ b/src/hsv/convertRgbToHsv.js @@ -1,13 +1,20 @@ // Based on: https://en.wikipedia.org/wiki/HSL_and_HSV#Formal_derivation -export default function({ r, g, b, alpha }) { - let M = Math.max(r, g, b), m = Math.min(r, g, b); +export default function ({ r, g, b, alpha }) { + let M = Math.max(r, g, b), + m = Math.min(r, g, b); let res = { mode: 'hsv', s: M === 0 ? 0 : 1 - m / M, v: M }; - if (M - m !== 0) res.h = (M === r ? (g - b) / (M - m) + (g < b) * 6 : M === g ? (b - r) / (M - m) + 2 : (r - g) / (M - m) + 4) * 60; + if (M - m !== 0) + res.h = + (M === r + ? (g - b) / (M - m) + (g < b) * 6 + : M === g + ? (b - r) / (M - m) + 2 + : (r - g) / (M - m) + 4) * 60; if (alpha !== undefined) res.alpha = alpha; return res; -} \ No newline at end of file +} diff --git a/src/hwb/convertHwbToRgb.js b/src/hwb/convertHwbToRgb.js index 14635c9e..27531271 100644 --- a/src/hwb/convertHwbToRgb.js +++ b/src/hwb/convertHwbToRgb.js @@ -14,13 +14,13 @@ export default function ({ h, w, b, alpha }) { // normalize w + b to 1 if (w + b > 1) { let s = w + b; - w /= s; + w /= s; b /= s; } - return convertHsvToRgb({ - h: h, - s: b === 1 ? 1 : 1 - w / (1 - b), + return convertHsvToRgb({ + h: h, + s: b === 1 ? 1 : 1 - w / (1 - b), v: 1 - b, alpha: alpha - }); -}; \ No newline at end of file + }); +} diff --git a/src/hwb/convertRgbToHwb.js b/src/hwb/convertRgbToHwb.js index 9d783521..8073ab33 100644 --- a/src/hwb/convertRgbToHwb.js +++ b/src/hwb/convertRgbToHwb.js @@ -10,7 +10,7 @@ import convertRgbToHsv from '../hsv/convertRgbToHsv'; -export default function(rgba) { +export default function (rgba) { let hsv = convertRgbToHsv(rgba); if (hsv === undefined) return undefined; let res = { diff --git a/src/hwb/parseHwb.js b/src/hwb/parseHwb.js index b4fe47bb..81f88307 100644 --- a/src/hwb/parseHwb.js +++ b/src/hwb/parseHwb.js @@ -11,11 +11,11 @@ export default color => { w: match[4] / 100, b: match[5] / 100 }; - + // normalize w + b to at most 1 if (res.w + res.b > 1) { let s = res.w + res.b; - res.w /= s; + res.w /= s; res.b /= s; } @@ -25,4 +25,4 @@ export default color => { res.alpha = match[7] / 255; } return res; -} \ No newline at end of file +}; diff --git a/src/lch/parseLch.js b/src/lch/parseLch.js index 674b3d76..c9cfec4f 100644 --- a/src/lch/parseLch.js +++ b/src/lch/parseLch.js @@ -2,11 +2,10 @@ import { lch } from '../util/regex'; import { hue } from '../util/hue'; export default color => { - if (typeof color !== 'string') return undefined; - + let match = color.match(lch); - + if (!match) { return undefined; } @@ -23,6 +22,6 @@ export default color => { } else if (match[7] !== undefined) { res.alpha = +match[7]; } - + return res; -}; \ No newline at end of file +}; diff --git a/src/lrgb/convertRgbToLrgb.js b/src/lrgb/convertRgbToLrgb.js index 49b27de4..c5a36e9c 100644 --- a/src/lrgb/convertRgbToLrgb.js +++ b/src/lrgb/convertRgbToLrgb.js @@ -1,4 +1,4 @@ -const fn = c => c < 0.04045 ? c / 12.92 : Math.pow((c + 0.055) / 1.055, 2.4); +const fn = c => (c < 0.04045 ? c / 12.92 : Math.pow((c + 0.055) / 1.055, 2.4)); export default ({ r, g, b, alpha }) => { let res = { @@ -9,4 +9,4 @@ export default ({ r, g, b, alpha }) => { }; if (alpha !== undefined) res.alpha = alpha; return res; -} \ No newline at end of file +}; diff --git a/src/rgb/parseNamed.js b/src/rgb/parseNamed.js index 64d2d303..e7f76e87 100644 --- a/src/rgb/parseNamed.js +++ b/src/rgb/parseNamed.js @@ -4,5 +4,9 @@ import named from '../colors/named'; // Also supports the `transparent` color as defined in: // https://drafts.csswg.org/css-color/#transparent-black export default color => { - return (typeof color === 'string' && parseNumber(named[color.toLowerCase()], 6)) || undefined; -} \ No newline at end of file + return ( + (typeof color === 'string' && + parseNumber(named[color.toLowerCase()], 6)) || + undefined + ); +}; diff --git a/src/rgb/parseNumber.js b/src/rgb/parseNumber.js index 3fbd473e..d3170b41 100644 --- a/src/rgb/parseNumber.js +++ b/src/rgb/parseNumber.js @@ -1,14 +1,13 @@ export default (color, len) => { - if (typeof color !== 'number') return; // hex3: #c93 -> #cc9933 if (len === 3) { return { mode: 'rgb', - r: ((color >> 8 & 0xF) | (color >> 4 & 0xF0)) / 255, - g: ((color >> 4 & 0xF) | (color & 0xF0)) / 255, - b: ((color & 0xF) | (color << 4 & 0xF0)) / 255 + r: (((color >> 8) & 0xf) | ((color >> 4) & 0xf0)) / 255, + g: (((color >> 4) & 0xf) | (color & 0xf0)) / 255, + b: ((color & 0xf) | ((color << 4) & 0xf0)) / 255 }; } @@ -16,20 +15,20 @@ export default (color, len) => { if (len === 4) { return { mode: 'rgb', - r: ((color >> 12 & 0xF) | (color >> 8 & 0xF0)) / 255, - g: ((color >> 8 & 0xF) | (color >> 4 & 0xF0)) / 255, - b: ((color >> 4 & 0xF) | (color & 0xF0)) / 255, - alpha: ((color & 0xF) | (color << 4 & 0xF0)) / 255 + r: (((color >> 12) & 0xf) | ((color >> 8) & 0xf0)) / 255, + g: (((color >> 8) & 0xf) | ((color >> 4) & 0xf0)) / 255, + b: (((color >> 4) & 0xf) | (color & 0xf0)) / 255, + alpha: ((color & 0xf) | ((color << 4) & 0xf0)) / 255 }; } - + // hex6: #f0f1f2 if (len === 6) { return { mode: 'rgb', - r: (color >> 16 & 0xFF) / 255, - g: (color >> 8 & 0xFF) / 255, - b: (color & 0xFF) / 255 + r: ((color >> 16) & 0xff) / 255, + g: ((color >> 8) & 0xff) / 255, + b: (color & 0xff) / 255 }; } @@ -37,10 +36,10 @@ export default (color, len) => { if (len === 8) { return { mode: 'rgb', - r: (color >> 24 & 0xFF) / 255, - g: (color >> 16 & 0xFF) / 255, - b: (color >> 8 & 0xFF) / 255, - alpha: (color & 0xFF) / 255 + r: ((color >> 24) & 0xff) / 255, + g: ((color >> 16) & 0xff) / 255, + b: ((color >> 8) & 0xff) / 255, + alpha: (color & 0xff) / 255 }; } -} \ No newline at end of file +}; diff --git a/src/rgb/parseRgb.js b/src/rgb/parseRgb.js index 81e34512..a917bae5 100644 --- a/src/rgb/parseRgb.js +++ b/src/rgb/parseRgb.js @@ -1,27 +1,26 @@ import { rgb_num_old, rgb_num_new, - rgb_per_old, + rgb_per_old, rgb_per_new } from '../util/regex'; export default color => { - let match, res; - if (match = color.match(rgb_num_old) || color.match(rgb_num_new)) { - res = { + if ((match = color.match(rgb_num_old) || color.match(rgb_num_new))) { + res = { mode: 'rgb', - r: match[1] / 255, - g: match[2] / 255, - b: match[3] / 255 + r: match[1] / 255, + g: match[2] / 255, + b: match[3] / 255 }; - } else if (match = color.match(rgb_per_old) || color.match(rgb_per_new)) { - res = { + } else if ((match = color.match(rgb_per_old) || color.match(rgb_per_new))) { + res = { mode: 'rgb', - r: match[1] / 100, - g: match[2] / 100, - b: match[3] / 100 + r: match[1] / 100, + g: match[2] / 100, + b: match[3] / 100 }; } else { return undefined; @@ -32,6 +31,6 @@ export default color => { } else if (match[5] !== undefined) { res.alpha = +match[5]; } - + return res; -}; \ No newline at end of file +}; diff --git a/src/rgb/parseTransparent.js b/src/rgb/parseTransparent.js index f0a7e625..c5fc5cc0 100644 --- a/src/rgb/parseTransparent.js +++ b/src/rgb/parseTransparent.js @@ -1,3 +1,4 @@ import parseNumber from './parseNumber'; -export default c => c === 'transparent' ? parseNumber(0x00000000, 8) : undefined; \ No newline at end of file +export default c => + c === 'transparent' ? parseNumber(0x00000000, 8) : undefined; diff --git a/src/util/fixup.js b/src/util/fixup.js index c7bb58b8..b19965fd 100644 --- a/src/util/fixup.js +++ b/src/util/fixup.js @@ -1 +1 @@ -export default value => Math.round(Math.max(0, Math.min(value, 1)) * 255); \ No newline at end of file +export default value => Math.round(Math.max(0, Math.min(value, 1)) * 255); diff --git a/src/util/hue.js b/src/util/hue.js index c0230474..a3f95300 100644 --- a/src/util/hue.js +++ b/src/util/hue.js @@ -1,8 +1,12 @@ export const hue = (val, unit) => { switch (unit) { - case 'deg': return +val; - case 'rad': return val / Math.PI * 180; - case 'grad': return val / 10 * 9; - case 'turn': return val * 360; + case 'deg': + return +val; + case 'rad': + return (val / Math.PI) * 180; + case 'grad': + return (val / 10) * 9; + case 'turn': + return val * 360; } -}; \ No newline at end of file +}; diff --git a/src/util/normalizeHue.js b/src/util/normalizeHue.js index 132b73be..18aba1fc 100644 --- a/src/util/normalizeHue.js +++ b/src/util/normalizeHue.js @@ -1 +1 @@ -export default hue => (hue = hue % 360) < 0 ? hue + 360 : hue; \ No newline at end of file +export default hue => ((hue = hue % 360) < 0 ? hue + 360 : hue); diff --git a/test/blend.test.js b/test/blend.test.js index f7a7bae0..9dc39cb9 100644 --- a/test/blend.test.js +++ b/test/blend.test.js @@ -1,7 +1,7 @@ import tape from 'tape'; import { blend } from '../src/index'; -tape('blendNormal', function(test) { +tape('blendNormal', function (test) { test.deepEqual(blend(['white', 'rgba(0, 0, 0, 0.5)']), { mode: 'rgb', r: 0.5, diff --git a/test/cubehelix.test.js b/test/cubehelix.test.js index 5c96fcff..f4e5ecc7 100644 --- a/test/cubehelix.test.js +++ b/test/cubehelix.test.js @@ -1,6 +1,6 @@ import tape from 'tape'; -tape('RGB -> Cubehelix', function(test) { +tape('RGB -> Cubehelix', function (test) { // test.deepEqual( // cubehelix('red'), // {}, diff --git a/test/displayable.test.js b/test/displayable.test.js index 5e804519..db77554f 100644 --- a/test/displayable.test.js +++ b/test/displayable.test.js @@ -1,7 +1,7 @@ import tape from 'tape'; import { displayable } from '../src/index'; -tape('RGB', function(test) { +tape('RGB', function (test) { test.equal(displayable({ mode: 'rgb', r: 0, g: 0, b: 0 }), true); test.equal( @@ -17,7 +17,7 @@ tape('RGB', function(test) { test.end(); }); -tape('LCh', function(test) { +tape('LCh', function (test) { test.equal(displayable('lch(50 0 0)'), true); test.equal(displayable('lch(50 -100 0)'), true); diff --git a/test/hsi.test.js b/test/hsi.test.js index 4370ca4c..9388750a 100644 --- a/test/hsi.test.js +++ b/test/hsi.test.js @@ -1,7 +1,7 @@ import tape from 'tape'; import { hsi, rgb } from '../src/index'; -tape('rgb() converts from HSI to RGB', function(test) { +tape('rgb() converts from HSI to RGB', function (test) { test.deepEqual( rgb(hsi({ h: 0, s: 0, i: 0 })), { r: 0, g: 0, b: 0, mode: 'rgb' }, @@ -35,7 +35,7 @@ tape('rgb() converts from HSI to RGB', function(test) { test.end(); }); -tape('hsi() converts RGB to HSI', function(test) { +tape('hsi() converts RGB to HSI', function (test) { test.deepEqual( hsi(rgb({ r: 0, g: 0, b: 0 })), { s: 0, i: 0, mode: 'hsi' }, diff --git a/test/hsl.test.js b/test/hsl.test.js index c4217eba..b694b1af 100644 --- a/test/hsl.test.js +++ b/test/hsl.test.js @@ -1,7 +1,7 @@ import tape from 'tape'; import { hsl, rgb } from '../src/index'; -tape('rgb() converts from HSL to RGB', function(test) { +tape('rgb() converts from HSL to RGB', function (test) { test.deepEqual( rgb(hsl({ h: 0, s: 0, l: 0 })), { r: 0, g: 0, b: 0, mode: 'rgb' }, @@ -35,7 +35,7 @@ tape('rgb() converts from HSL to RGB', function(test) { test.end(); }); -tape('hsl() converts RGB to HSL', function(test) { +tape('hsl() converts RGB to HSL', function (test) { test.deepEqual( hsl(rgb({ r: 0, g: 0, b: 0 })), { s: 0, l: 0, mode: 'hsl' }, @@ -93,7 +93,7 @@ tape('hsl() converts RGB to HSL', function(test) { test.end(); }); -tape('hsl() parses hsl / hsla CSS strings', function(test) { +tape('hsl() parses hsl / hsla CSS strings', function (test) { test.deepEqual( hsl('hsl(0, 100%, 0%)'), { s: 1, l: 0, h: 0, mode: 'hsl' }, diff --git a/test/hsv.test.js b/test/hsv.test.js index 30793867..8a4f0aa2 100644 --- a/test/hsv.test.js +++ b/test/hsv.test.js @@ -1,7 +1,7 @@ import tape from 'tape'; import { hsv, rgb } from '../src/index'; -tape('rgb() converts from HSV to RGB', function(test) { +tape('rgb() converts from HSV to RGB', function (test) { test.deepEqual( rgb(hsv({ h: 0, s: 0, v: 0 })), { r: 0, g: 0, b: 0, mode: 'rgb' }, @@ -35,7 +35,7 @@ tape('rgb() converts from HSV to RGB', function(test) { test.end(); }); -tape('hsv() converts RGB to HSV', function(test) { +tape('hsv() converts RGB to HSV', function (test) { test.deepEqual( hsv(rgb({ r: 0, g: 0, b: 0 })), { s: 0, v: 0, mode: 'hsv' }, @@ -93,7 +93,7 @@ tape('hsv() converts RGB to HSV', function(test) { test.end(); }); -tape('hsv(str)', function(test) { +tape('hsv(str)', function (test) { test.deepEqual(hsv('white'), { mode: 'hsv', s: 0, v: 1 }); test.end(); }); diff --git a/test/hwb.test.js b/test/hwb.test.js index 699b357c..975a3681 100644 --- a/test/hwb.test.js +++ b/test/hwb.test.js @@ -1,7 +1,7 @@ import tape from 'tape'; import { hwb } from '../src/index'; -tape('hwb() parses hwb CSS strings', function(test) { +tape('hwb() parses hwb CSS strings', function (test) { test.deepEqual( hwb('hwb(100 0% 0%)'), { h: 100, w: 0, b: 0, mode: 'hwb' },