refactor: add error handling

Author: mrholek

js/src/utilities/hex-to-rgb.js

@@ -7,13 +7,27 @@
 
 /* eslint-disable no-magic-numbers */
 const hexToRgb = (color) => {
-  const hex = color.replace('#', '')
-  const r = parseInt(hex.substring(0, 2), 16)
-  const g = parseInt(hex.substring(2, 4), 16)
-  const b = parseInt(hex.substring(4, 6), 16)
+  if (typeof color === 'undefined') {
+    throw new Error('Hex color is not defined')
+  }
+  const hex = color.match(/^#(?:[0-9a-f]{3}){1,2}$/i)
+  if (!hex) {
+    throw new Error(`${color} is not a valid hex color`)
+  }
+  let r
+  let g
+  let b
+  if (color.length === 7) {
+    r = parseInt(color.substring(1, 3), 16)
+    g = parseInt(color.substring(3, 5), 16)
+    b = parseInt(color.substring(5, 7), 16)
+  } else {
+    r = parseInt(color.substring(1, 2), 16)
+    g = parseInt(color.substring(2, 3), 16)
+    b = parseInt(color.substring(3, 5), 16)
+  }
 
-  const result = `rgba(${r}, ${g}, ${b}`
-  return result
+  return `rgba(${r}, ${g}, ${b}`
 }
 
 export default hexToRgb

js/src/utilities/hex-to-rgba.js

@@ -7,13 +7,27 @@
 
 /* eslint-disable no-magic-numbers */
 const hexToRgba = (color, opacity = 100) => {
-  const hex = color.replace('#', '')
-  const r = parseInt(hex.substring(0, 2), 16)
-  const g = parseInt(hex.substring(2, 4), 16)
-  const b = parseInt(hex.substring(4, 6), 16)
+  if (typeof color === 'undefined') {
+    throw new Error('Hex color is not defined')
+  }
+  const hex = color.match(/^#(?:[0-9a-f]{3}){1,2}$/i)
+  if (!hex) {
+    throw new Error(`${color} is not a valid hex color`)
+  }
+  let r
+  let g
+  let b
+  if (color.length === 7) {
+    r = parseInt(color.substring(1, 3), 16)
+    g = parseInt(color.substring(3, 5), 16)
+    b = parseInt(color.substring(5, 7), 16)
+  } else {
+    r = parseInt(color.substring(1, 2), 16)
+    g = parseInt(color.substring(2, 3), 16)
+    b = parseInt(color.substring(3, 5), 16)
+  }
 
-  const result = `rgba(${r}, ${g}, ${b}, ${opacity / 100}`
-  return result
+  return `rgba(${r}, ${g}, ${b}, ${opacity / 100}`
 }
 
 export default hexToRgba

js/src/utilities/rgb-to-hex.js

@@ -7,15 +7,18 @@
 
 /* eslint-disable no-magic-numbers */
 const rgbToHex = (color) => {
+  if (typeof color === 'undefined') {
+    throw new Error('Hex color is not defined')
+  }
   const rgb = color.match(/^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?/i)
-  if (rgb) {
-    const r = `0${parseInt(rgb[1], 10).toString(16)}`
-    const g = `0${parseInt(rgb[2], 10).toString(16)}`
-    const b = `0${parseInt(rgb[3], 10).toString(16)}`
-
-    return rgb ? `#${r.slice(-2)}${g.slice(-2)}${b.slice(-2)}` : ''
+  if (!rgb) {
+    throw new Error(`${color} is not a valid rgb color`)
   }
-  return ''
+  const r = `0${parseInt(rgb[1], 10).toString(16)}`
+  const g = `0${parseInt(rgb[2], 10).toString(16)}`
+  const b = `0${parseInt(rgb[3], 10).toString(16)}`
+
+  return `#${r.slice(-2)}${g.slice(-2)}${b.slice(-2)}`
 }
 
 export default rgbToHex