fix incorrect handling of optional comma in rgb() regex (fixes #65)

Qix- · Nov 30, 2021 · 32f3e00 · 32f3e00
1 parent 0766ca7
commit 32f3e00
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -50,7 +50,7 @@ cs.get.rgb = function (string) {
 
 	var abbr = /^#([a-f0-9]{3,4})$/i;
 	var hex = /^#([a-f0-9]{6})([a-f0-9]{2})?$/i;
-	var rgba = /^rgba?\(\s*([+-]?\d+)\s*,?\s*([+-]?\d+)\s*,?\s*([+-]?\d+)\s*(?:[,|\/]\s*([+-]?[\d\.]+)(%?)\s*)?\)$/;
+	var rgba = /^rgba?\(\s*([+-]?\d+)(?=[\s,])\s*(?:,\s*)?([+-]?\d+)(?=[\s,])\s*(?:,\s*)?([+-]?\d+)\s*(?:[,|\/]\s*([+-]?[\d\.]+)(%?)\s*)?\)$/;
 	var per = /^rgba?\(\s*([+-]?[\d\.]+)\%\s*,?\s*([+-]?[\d\.]+)\%\s*,?\s*([+-]?[\d\.]+)\%\s*(?:[,|\/]\s*([+-]?[\d\.]+)(%?)\s*)?\)$/;
 	var keyword = /^(\w+)$/;
 

diff --git a/test/basic.js b/test/basic.js
@@ -53,6 +53,16 @@ assert.strictEqual(string.get('#f'), null);
 assert.strictEqual(string.get('#4f'), null);
 assert.strictEqual(string.get('#45ab4'), null);
 assert.strictEqual(string.get('#45ab45e'), null);
+assert.strictEqual(string.get('rgb()'), null);
+assert.strictEqual(string.get('rgb(10)'), null);
+assert.strictEqual(string.get('rgb(10,  2)'), null);
+assert.strictEqual(string.get('rgb(10,  2, 2348723dskjfs)'), null);
+assert.strictEqual(string.get('rgb(10%)'), null);
+assert.strictEqual(string.get('rgb(10%,  2%)'), null);
+assert.strictEqual(string.get('rgb(10%,  2%, 2348723%dskjfs)'), null);
+assert.strictEqual(string.get('rgb(10%,  2%, 2348723dskjfs%)'), null);
+assert.strictEqual(string.get('rgb(10$,3)'), null);
+assert.strictEqual(string.get('rgba(10,  3)'), null);
 
 // with sign
 assert.deepEqual(string.get.rgb('rgb(-244, +233, -100)'), [0, 233, 0, 1]);