Fix valueType and add more tests

This does not have immediate observable effects.

Author: asamuzaK

lib/parsers.js

@@ -62,8 +62,11 @@ exports.valueType = function valueType(val) {
   if (percentRegEx.test(val)) {
     return exports.TYPES.PERCENT;
   }
-  if (urlRegEx.test(val)) {
-    return exports.TYPES.URL;
+  if (val.startsWith('url(') && val.endsWith(')')) {
+    if (urlRegEx.test(val)) {
+      return exports.TYPES.URL;
+    }
+    return undefined;
   }
   if (varRegEx.test(val)) {
     return exports.TYPES.VAR;

test/parsers.js

@@ -5,74 +5,88 @@ const assert = require('node:assert/strict');
 const parsers = require('../lib/parsers');
 
 describe('valueType', () => {
-  it('returns color for red', () => {
-    let input = 'red';
+  it('returns null or empty string for null', () => {
+    let input = null;
     let output = parsers.valueType(input);
 
-    assert.strictEqual(output, parsers.TYPES.COLOR);
+    assert.strictEqual(output, parsers.TYPES.NULL_OR_EMPTY_STR);
   });
 
-  it('returns color for #nnnnnn', () => {
-    let input = '#fefefe';
+  it('returns null or empty string for empty string', () => {
+    let input = '';
     let output = parsers.valueType(input);
 
-    assert.strictEqual(output, parsers.TYPES.COLOR);
+    assert.strictEqual(output, parsers.TYPES.NULL_OR_EMPTY_STR);
   });
 
-  it('returns color for rgb(n, n, n)', () => {
-    let input = 'rgb(10, 10, 10)';
+  it('returns undefined for undefined', () => {
+    let input = undefined;
     let output = parsers.valueType(input);
 
-    assert.strictEqual(output, parsers.TYPES.COLOR);
+    assert.strictEqual(output, undefined);
   });
 
-  it('returns color for rgb(p, p, p)', () => {
-    let input = 'rgb(10%, 10%, 10%)';
+  it('returns integer for 1', () => {
+    let input = 1;
     let output = parsers.valueType(input);
 
-    assert.strictEqual(output, parsers.TYPES.COLOR);
+    assert.strictEqual(output, parsers.TYPES.INTEGER);
   });
 
-  it('returns color for rgba(n, n, n, n)', () => {
-    let input = 'rgba(10, 10, 10, 1)';
+  it('returns number for 1.1', () => {
+    let input = 1.1;
     let output = parsers.valueType(input);
 
-    assert.strictEqual(output, parsers.TYPES.COLOR);
+    assert.strictEqual(output, parsers.TYPES.NUMBER);
   });
 
-  it('returns color for rgba(n, n, n, n) with decimal alpha', () => {
-    let input = 'rgba(10, 10, 10, 0.5)';
+  it('returns length for 100ch', () => {
+    let input = '100ch';
     let output = parsers.valueType(input);
 
-    assert.strictEqual(output, parsers.TYPES.COLOR);
+    assert.strictEqual(output, parsers.TYPES.LENGTH);
   });
 
-  it('returns color for rgba(p, p, p, n)', () => {
-    let input = 'rgba(10%, 10%, 10%, 1)';
+  it('returns percent for 10%', () => {
+    let input = '10%';
     let output = parsers.valueType(input);
 
-    assert.strictEqual(output, parsers.TYPES.COLOR);
+    assert.strictEqual(output, parsers.TYPES.PERCENT);
   });
 
-  it('returns color for rgba(p, p, p, n) with decimal alpha', () => {
-    let input = 'rgba(10%, 10%, 10%, 0.5)';
+  it('returns url for url(https://example.com)', () => {
+    let input = 'url(https://example.com)';
     let output = parsers.valueType(input);
 
-    assert.strictEqual(output, parsers.TYPES.COLOR);
+    assert.strictEqual(output, parsers.TYPES.URL);
   });
 
-  it('returns color for transparent keyword', () => {
-    let input = 'transparent';
+  it('returns url for url("https://example.com")', () => {
+    let input = 'url("https://example.com")';
     let output = parsers.valueType(input);
 
-    assert.strictEqual(output, parsers.TYPES.COLOR);
+    assert.strictEqual(output, parsers.TYPES.URL);
   });
 
-  it('returns length for 100ch', () => {
-    let input = '100ch';
+  it('returns url for url(foo.png)', () => {
+    let input = 'url(foo.png)';
     let output = parsers.valueType(input);
 
-    assert.strictEqual(output, parsers.TYPES.LENGTH);
+    assert.strictEqual(output, parsers.TYPES.URL);
+  });
+
+  it('returns url for url("foo.png")', () => {
+    let input = 'url("foo.png")';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.URL);
+  });
+
+  it('returns undefined for url(var(--foo))', () => {
+    let input = 'url(var(--foo))';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, undefined);
   });
 
   it('returns var from calc(100px *  var(--foo))', () => {
@@ -116,6 +130,111 @@ describe('valueType', () => {
 
     assert.strictEqual(output, parsers.TYPES.CALC);
   });
+
+  it('returns string from "foo"', () => {
+    let input = '"foo"';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.STRING);
+  });
+
+  it("returns string from 'foo'", () => {
+    let input = "'foo'";
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.STRING);
+  });
+
+  it('returns angle for 90deg', () => {
+    let input = '90deg';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.ANGLE);
+  });
+
+  it('returns color for red', () => {
+    let input = 'red';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.COLOR);
+  });
+
+  it('returns color for #nnnnnn', () => {
+    let input = '#fefefe';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.COLOR);
+  });
+
+  it('returns color for rgb(n, n, n)', () => {
+    let input = 'rgb(10, 10, 10)';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.COLOR);
+  });
+
+  it('returns color for rgb(p, p, p)', () => {
+    let input = 'rgb(10%, 10%, 10%)';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.COLOR);
+  });
+
+  it('returns color for rgba(n, n, n, n)', () => {
+    let input = 'rgba(10, 10, 10, 1)';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.COLOR);
+  });
+
+  it('returns color for rgba(n, n, n, n) with decimal alpha', () => {
+    let input = 'rgba(10, 10, 10, 0.5)';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.COLOR);
+  });
+
+  it('returns color for rgba(p, p, p, n)', () => {
+    let input = 'rgba(10%, 10%, 10%, 1)';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.COLOR);
+  });
+
+  it('returns color for rgba(p, p, p, n) with decimal alpha', () => {
+    let input = 'rgba(10%, 10%, 10%, 0.5)';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.COLOR);
+  });
+
+  it('returns color for transparent keyword', () => {
+    let input = 'transparent';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.COLOR);
+  });
+
+  it('returns gradient for linear-gradient(red, blue)', () => {
+    let input = 'linear-gradient(red, blue)';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.GRADIENT);
+  });
+
+  it('returns color for legacy activeborder', () => {
+    let input = 'ActiveBorder';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.COLOR);
+  });
+
+  it('returns keyword for else', () => {
+    let input = 'foo';
+    let output = parsers.valueType(input);
+
+    assert.strictEqual(output, parsers.TYPES.KEYWORD);
+  });
 });
 
 describe('parseInteger', () => {