feat: add hwb, lab, and lch to functions matching isColor (#111)

* Add hwb, lab, and lch to functions matching isColor * Use Regex for all function checks * Update snapshots
shellscape · Apr 18, 2020 · 9189daa · 9189daa
1 parent 11b91a0
commit 9189daa
Show file tree

Hide file tree

Showing 16 changed files with 1,837 additions and 1,377 deletions.
diff --git a/lib/nodes/Func.js b/lib/nodes/Func.js
@@ -84,11 +84,13 @@ const allFunctions = [
   'url',
   'var'
 ];
-const colorFunctions = ['hsl', 'hsla', 'rgb', 'rgba'];
 const vendorPrefixes = ['-webkit-', '-moz-', '-ms-', '-o-'];
 const reFunctions = new RegExp(`^(${vendorPrefixes.join('|')})?(${allFunctions.join('|')})`, 'i');
 const rePunctuation = new RegExp(`^(\\${Punctuation.chars.join('|\\')})`);
-const reVar = /^--[^\s]+$/;
+
+const colorFunctionsRegex = /^(hsla?|hwb|lab|lch|rgba?)$/i;
+const varFunctionRegex = /^var$/i;
+const varPrefixRegex = /^--[^\s]+$/;
 
 class Func extends Container {
   constructor(options = {}) {
@@ -189,10 +191,10 @@ class Func extends Container {
     parser.back(rightTokens);
 
     const { lastNode } = parser;
-    const lowerName = lastNode.name.toLowerCase();
     const { nodes } = node;
-    lastNode.isColor = colorFunctions.includes(lowerName);
-    lastNode.isVar = lowerName === 'var' && nodes.length && reVar.test(nodes[0].value);
+    lastNode.isColor = colorFunctionsRegex.test(lastNode.name);
+    lastNode.isVar =
+      varFunctionRegex.test(lastNode.name) && nodes.length && varPrefixRegex.test(nodes[0].value);
   }
 }
 

diff --git a/test/fixtures/func.js b/test/fixtures/func.js
@@ -25,6 +25,9 @@ module.exports = {
     'rgba( 29, 439 , 29 )',
     'RGBA( 29, 439 , 29 )',
     'RgBa( 29, 439 , 29 )',
+    'Lab( 40%  56.6   39 )',
+    'lCH(40% 68.8 34.5 / 50%)',
+    'hwb(90deg 0% 0% / 0.5)',
     'calc(-0.5 * var(foo))',
     'calc(1px + -2vw - 4px)',
     'calc(((768px - 100vw) / 2) - 15px)',

diff --git a/test/snapshots/atword.test.js.md b/test/snapshots/atword.test.js.md
@@ -2,7 +2,7 @@
 
 The actual snapshot is saved in `atword.test.js.snap`.
 
-Generated by [AVA](https://ava.li).
+Generated by [AVA](https://avajs.dev).
 
 ##   @word 
 

diff --git a/test/snapshots/comment.test.js.md b/test/snapshots/comment.test.js.md
@@ -2,7 +2,7 @@
 
 The actual snapshot is saved in `comment.test.js.snap`.
 
-Generated by [AVA](https://ava.li).
+Generated by [AVA](https://avajs.dev).
 
 ## /**/
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     The actual snapshot is saved in `comment.test.js.snap`.
-    Generated by [AVA](https://ava.li).
+    Generated by [AVA](https://avajs.dev).
     ## /**/
@@ Expand Down @@