@tbela99/css-parser 0.2.0 → 0.3.0

package/dist/lib/renderer/render.js

@@ -1,14 +1,16 @@
-import { getAngle, COLORS_NAMES, rgb2Hex, hsl2Hex, hwb2hex, cmyk2hex, NAMES_COLORS } from './utils/color.js';
+import { getAngle, clamp, COLORS_NAMES, NAMES_COLORS } from './utils/color.js';
+import { rgb2Hex, hsl2Hex, hwb2hex, cmyk2hex } from './utils/hex.js';
 import { EnumToken } from '../ast/types.js';
 import '../ast/minify.js';
 import { expand } from '../ast/expand.js';
 import { SourceMap } from './sourcemap/sourcemap.js';
 import '../parser/parse.js';
-import { isNewLine } from '../parser/utils/syntax.js';
+import { isColor, isNewLine } from '../parser/utils/syntax.js';
+import { parseRelativeColor } from './utils/calccolor.js';
 
 const colorsFunc = ['rgb', 'rgba', 'hsl', 'hsla', 'hwb', 'device-cmyk'];
 function reduceNumber(val) {
-    val = (+val).toString();
+    val = String(+val);
     if (val === '0') {
         return '0';
     }
@@ -47,7 +49,7 @@ function doRender(data, options = {}) {
             newLine: '\n',
             compress: false,
             removeComments: false,
-        }), sourcemap: false, colorConvert: true, expandNestingRules: false, preserveLicense: false, ...options
+        }), sourcemap: false, convertColor: true, expandNestingRules: false, preserveLicense: false, ...options
     };
     const startTime = performance.now();
     const errors = [];
@@ -199,6 +201,19 @@ function renderToken(token, options = {}, cache = Object.create(null), reducer,
             return acc + renderToken(curr, options, cache, reducer, errors);
         };
     }
+    if (token.typ == EnumToken.FunctionTokenType && colorsFunc.includes(token.val)) {
+        if (isColor(token)) {
+            // @ts-ignore
+            token.typ = EnumToken.ColorTokenType;
+            if (token.chi[0].typ == EnumToken.IdenTokenType && token.chi[0].val == 'from') {
+                // @ts-ignore
+                token.cal = 'rel';
+            }
+            else {
+                token.chi = token.chi.filter((t) => ![EnumToken.WhitespaceTokenType, EnumToken.CommaTokenType, EnumToken.CommentTokenType].includes(t.typ));
+            }
+        }
+    }
     switch (token.typ) {
         case EnumToken.ListToken:
             return token.chi.reduce((acc, curr) => acc + renderToken(curr, options, cache), '');
@@ -241,10 +256,46 @@ function renderToken(token, options = {}, cache = Object.create(null), reducer,
         case EnumToken.Div:
             return '/';
         case EnumToken.ColorTokenType:
-            if (options.colorConvert) {
-                if (token.kin == 'lit' && token.val.toLowerCase() == 'currentcolor') {
+            if (options.convertColor) {
+                if (token.cal == 'rel' && ['rgb', 'hsl', 'hwb'].includes(token.val)) {
+                    const chi = token.chi.filter(x => ![
+                        EnumToken.LiteralTokenType, EnumToken.CommaTokenType, EnumToken.WhitespaceTokenType, EnumToken.CommentTokenType
+                    ].includes(x.typ));
+                    const components = parseRelativeColor(token.val.split(''), chi[1], chi[2], chi[3], chi[4], chi[5]);
+                    if (components != null) {
+                        token.chi = Object.values(components);
+                        delete token.cal;
+                    }
+                }
+                if (token.cal) {
+                    let slice = false;
+                    if (token.cal == 'rel') {
+                        const last = token.chi.at(-1);
+                        if ((last.typ == EnumToken.NumberTokenType && last.val == '1') || (last.typ == EnumToken.IdenTokenType && last.val == 'none')) {
+                            const prev = token.chi.at(-2);
+                            if (prev.typ == EnumToken.LiteralTokenType && prev.val == '/') {
+                                slice = true;
+                            }
+                        }
+                    }
+                    return clamp(token).val + '(' + (slice ? token.chi.slice(0, -2) : token.chi).reduce((acc, curr) => {
+                        const val = renderToken(curr, options, cache);
+                        if ([EnumToken.LiteralTokenType, EnumToken.CommaTokenType].includes(curr.typ)) {
+                            return acc + val;
+                        }
+                        if (acc.length > 0) {
+                            return acc + (['/', ','].includes(acc.at(-1)) ? '' : ' ') + val;
+                        }
+                        return val;
+                    }, '') + ')';
+                }
+                if (token.kin == 'lit' && token.val.localeCompare('currentcolor', undefined, { sensitivity: 'base' }) == 0) {
                     return 'currentcolor';
                 }
+                clamp(token);
+                if (Array.isArray(token.chi) && token.chi.some((t) => t.typ == EnumToken.FunctionTokenType || (t.typ == EnumToken.ColorTokenType && Array.isArray(t.chi)))) {
+                    return (token.val.endsWith('a') ? token.val.slice(0, -1) : token.val) + '(' + token.chi.reduce((acc, curr) => acc + (acc.length > 0 && !(acc.endsWith('/') || curr.typ == EnumToken.LiteralTokenType) ? ' ' : '') + renderToken(curr, options, cache), '') + ')';
+                }
                 let value = token.kin == 'hex' ? token.val.toLowerCase() : (token.kin == 'lit' ? COLORS_NAMES[token.val.toLowerCase()] : '');
                 if (token.val == 'rgb' || token.val == 'rgba') {
                     value = rgb2Hex(token);
@@ -281,13 +332,17 @@ function renderToken(token, options = {}, cache = Object.create(null), reducer,
             if (token.kin == 'hex' || token.kin == 'lit') {
                 return token.val;
             }
+            if (Array.isArray(token.chi)) {
+                return (token.val.endsWith('a') ? token.val.slice(0, -1) : token.val) + '(' + token.chi.reduce((acc, curr) => acc + (acc.length > 0 && !(acc.endsWith('/') || curr.typ == EnumToken.LiteralTokenType) ? ' ' : '') + renderToken(curr, options, cache), '') + ')';
+            }
         case EnumToken.ParensTokenType:
         case EnumToken.FunctionTokenType:
         case EnumToken.UrlFunctionTokenType:
         case EnumToken.ImageFunctionTokenType:
-        case EnumToken.PseudoClassFuncTokenType:
         case EnumToken.TimingFunctionTokenType:
+        case EnumToken.PseudoClassFuncTokenType:
         case EnumToken.TimelineFunctionTokenType:
+        case EnumToken.GridTemplateFuncTokenType:
             if (token.typ == EnumToken.FunctionTokenType &&
                 token.val == 'calc' &&
                 token.chi.length == 1 &&
@@ -350,6 +405,7 @@ function renderToken(token, options = {}, cache = Object.create(null), reducer,
         case EnumToken.ImportantTokenType:
             return '!important';
         case EnumToken.AttrTokenType:
+        case EnumToken.IdenListTokenType:
             return '[' + token.chi.reduce(reducer, '') + ']';
         case EnumToken.TimeTokenType:
         case EnumToken.AngleTokenType:
@@ -416,10 +472,23 @@ function renderToken(token, options = {}, cache = Object.create(null), reducer,
                 }
                 return '0';
             }
+            if (token.typ == EnumToken.TimeTokenType) {
+                if (unit == 'ms') {
+                    // @ts-ignore
+                    const v = reduceNumber(val / 1000);
+                    if (v.length + 1 <= val.length) {
+                        return v + 's';
+                    }
+                    return val + 'ms';
+                }
+                return val + 's';
+            }
             return val.includes('/') ? val.replace('/', unit + '/') : val + unit;
+        case EnumToken.FlexTokenType:
         case EnumToken.PercentageTokenType:
+            const uni = token.typ == EnumToken.PercentageTokenType ? '%' : 'fr';
             const perc = token.val.typ == EnumToken.FractionTokenType ? renderToken(token.val, options, cache) : reduceNumber(token.val);
-            return options.minify && perc == '0' ? '0' : (perc.includes('/') ? perc.replace('/', '%/') : perc + '%');
+            return options.minify && perc == '0' ? '0' : (perc.includes('/') ? perc.replace('/', uni + '/') : perc + uni);
         case EnumToken.NumberTokenType:
             return token.val.typ == EnumToken.FractionTokenType ? renderToken(token.val, options, cache) : reduceNumber(token.val);
         case EnumToken.CommentTokenType:

package/dist/lib/renderer/utils/calccolor.js

@@ -0,0 +1,238 @@
+import { COLORS_NAMES, getNumber, getAngle } from './color.js';
+import { EnumToken } from '../../ast/types.js';
+import '../../ast/minify.js';
+import { walkValues } from '../../ast/walk.js';
+import '../../parser/parse.js';
+import { reduceNumber } from '../render.js';
+import { hwb2rgb, hsl2rgb } from './rgb.js';
+import { rgb2hwb, hsl2hwb } from './hwb.js';
+import { rgb2hsl, hwb2hsl } from './hsl.js';
+import { evaluate } from '../../ast/math/expression.js';
+
+function parseRelativeColor(relativeKeys, original, rExp, gExp, bExp, aExp) {
+    const type = relativeKeys.join('');
+    let r;
+    let g;
+    let b;
+    let alpha = null;
+    let keys = {};
+    let values = {};
+    let children;
+    switch (original.kin) {
+        case 'lit':
+        case 'hex':
+            let value = original.val.toLowerCase();
+            if (original.kin == 'lit') {
+                if (original.val.toLowerCase() in COLORS_NAMES) {
+                    value = COLORS_NAMES[original.val.toLowerCase()];
+                }
+                else {
+                    return null;
+                }
+            }
+            if (value.length == 4) {
+                value = '#' + value[1] + value[1] + value[2] + value[2] + value[3] + value[3];
+            }
+            else if (value.length == 5) {
+                value = '#' + value[1] + value[1] + value[2] + value[2] + value[3] + value[3] + value[4] + value[4];
+            }
+            r = parseInt(value.slice(1, 3), 16);
+            g = parseInt(value.slice(3, 5), 16);
+            b = parseInt(value.slice(5, 7), 16);
+            alpha = value.length == 9 ? parseInt(value.slice(7, 9), 16) : null;
+            break;
+        case 'rgb':
+        case 'rgba':
+            children = original.chi.filter((t) => t.typ == EnumToken.NumberTokenType || t.typ == EnumToken.IdenTokenType || t.typ == EnumToken.PercentageTokenType);
+            if (children.every((t) => (t.typ == EnumToken.IdenTokenType && t.val == 'none') || t.typ == EnumToken.NumberTokenType)) {
+                r = children[0].typ == EnumToken.IdenTokenType && children[0].val == 'none' ? 0 : +children[0].val;
+                g = children[1].typ == EnumToken.IdenTokenType && children[1].val == 'none' ? 0 : +children[1].val;
+                b = children[2].typ == EnumToken.IdenTokenType && children[2].val == 'none' ? 0 : +children[2].val;
+                alpha = children.length < 4 ? null : children[3].typ == EnumToken.IdenTokenType && children[3].val == 'none' ? 0 : +children[3].val;
+            }
+            else if (children.every((t) => t.typ == EnumToken.PercentageTokenType || (t.typ == EnumToken.IdenTokenType && t.val == 'none') || (t.typ == EnumToken.NumberTokenType && t.val == '0'))) {
+                // @ts-ignore
+                r = children[0].typ == EnumToken.IdenTokenType && children[0].val == 'none' ? 0 : children[0].val * 255 / 100;
+                // @ts-ignore
+                g = children[1].typ == EnumToken.IdenTokenType && children[1].val == 'none' ? 0 : children[1].val * 255 / 100;
+                // @ts-ignore
+                b = children[2].typ == EnumToken.IdenTokenType && children[2].val == 'none' ? 0 : children[2].val * 255 / 100;
+                alpha = children.length < 4 ? null : children[3].typ == EnumToken.IdenTokenType && children[3].val == 'none' ? 0 : +children[3].val / 100;
+            }
+            else {
+                return null;
+            }
+            break;
+        case 'hsl':
+        case 'hsla':
+        case 'hwb':
+            children = original.chi.filter((t) => t.typ == EnumToken.AngleTokenType || t.typ == EnumToken.NumberTokenType || t.typ == EnumToken.IdenTokenType || t.typ == EnumToken.PercentageTokenType);
+            if (children.length == 3 || children.length == 4) {
+                [r, g, b, alpha] = children;
+            }
+            else {
+                return null;
+            }
+            break;
+        default:
+            return null;
+    }
+    const from = ['rgb', 'rgba', 'hex', 'lit'].includes(original.kin) ? 'rgb' : original.kin;
+    if (from != type) {
+        if (type == 'hsl' || type == 'hwb') {
+            if (from == 'rgb') {
+                [r, g, b] = (type == 'hwb' ? rgb2hwb : rgb2hsl)(r, g, b);
+                // @ts-ignore
+                r *= 360;
+                // @ts-ignore
+                g *= 100;
+                // @ts-ignore
+                b *= 100;
+                values = {
+                    [relativeKeys[0]]: { typ: EnumToken.AngleTokenType, val: r, unit: 'deg' },
+                    [relativeKeys[1]]: { typ: EnumToken.PercentageTokenType, val: g },
+                    [relativeKeys[2]]: { typ: EnumToken.PercentageTokenType, val: b }
+                };
+            }
+            else if (from == 'hwb' || from == 'hsl') {
+                if (type == 'hsl') {
+                    if (from == 'hwb') {
+                        [r, g, b] = hwb2hsl(getAngle(r), getNumber(g), getNumber(b));
+                        // @ts-ignore
+                        r *= 360;
+                        // @ts-ignore
+                        g *= 100;
+                        // @ts-ignore
+                        b *= 100;
+                        // @ts-ignore
+                        values = {
+                            [relativeKeys[0]]: { typ: EnumToken.AngleTokenType, val: r, unit: 'deg' },
+                            [relativeKeys[1]]: { typ: EnumToken.PercentageTokenType, val: g },
+                            [relativeKeys[2]]: { typ: EnumToken.PercentageTokenType, val: b }
+                        };
+                    }
+                }
+                else if (type == 'hwb') {
+                    if (from == 'hsl') {
+                        [r, g, b] = hsl2hwb(getAngle(r), getNumber(g), getNumber(b));
+                        // @ts-ignore
+                        r *= 360;
+                        // @ts-ignore
+                        g *= 100;
+                        // @ts-ignore
+                        b *= 100;
+                        // @ts-ignore
+                        values = {
+                            [relativeKeys[0]]: { typ: EnumToken.AngleTokenType, val: r, unit: 'deg' },
+                            [relativeKeys[1]]: { typ: EnumToken.PercentageTokenType, val: g },
+                            [relativeKeys[2]]: { typ: EnumToken.PercentageTokenType, val: b }
+                        };
+                    }
+                }
+            }
+            else {
+                return null;
+            }
+        }
+        else if (type == 'rgb') {
+            if (from == 'hsl' || from == 'hwb') {
+                [r, g, b] = (from == 'hwb' ? hwb2rgb : hsl2rgb)(getAngle(r), getNumber(g), getNumber(b));
+                // @ts-ignore
+                values = {
+                    [relativeKeys[0]]: { typ: EnumToken.NumberTokenType, val: r },
+                    [relativeKeys[1]]: { typ: EnumToken.NumberTokenType, val: g },
+                    [relativeKeys[2]]: { typ: EnumToken.NumberTokenType, val: b }
+                };
+            }
+            else {
+                return null;
+            }
+        }
+    }
+    else {
+        values = {
+            [relativeKeys[0]]: r,
+            [relativeKeys[1]]: g,
+            [relativeKeys[2]]: b
+        };
+    }
+    if (aExp != null && aExp.typ == EnumToken.IdenTokenType && aExp.val == 'none') {
+        aExp = null;
+    }
+    keys = {
+        [relativeKeys[0]]: rExp,
+        [relativeKeys[1]]: gExp,
+        [relativeKeys[2]]: bExp,
+        alpha: aExp ?? { typ: EnumToken.IdenTokenType, val: 'alpha' }
+    };
+    // @ts-ignore
+    values.alpha = alpha != null && typeof alpha == 'object' ? alpha : b.typ == EnumToken.PercentageTokenType ? { typ: EnumToken.PercentageTokenType, val: String(alpha ?? 100) } : { typ: EnumToken.NumberTokenType, val: String(alpha ?? 1) };
+    return computeComponentValue(keys, values);
+}
+function computeComponentValue(expr, values) {
+    for (const [key, exp] of Object.entries(expr)) {
+        if (exp == null) {
+            if (key in values) {
+                if (typeof values[key] == 'number') {
+                    expr[key] = {
+                        typ: EnumToken.NumberTokenType,
+                        val: reduceNumber(values[key])
+                    };
+                }
+                else {
+                    expr[key] = values[key];
+                }
+            }
+        }
+        else if ([EnumToken.NumberTokenType, EnumToken.PercentageTokenType, EnumToken.AngleTokenType, EnumToken.LengthTokenType].includes(exp.typ)) ;
+        else if (exp.typ == EnumToken.IdenTokenType && exp.val in values) {
+            if (typeof values[exp.val] == 'number') {
+                expr[key] = {
+                    typ: EnumToken.NumberTokenType,
+                    val: reduceNumber(values[exp.val])
+                };
+            }
+            else {
+                expr[key] = values[exp.val];
+            }
+        }
+        else if (exp.typ == EnumToken.FunctionTokenType && exp.val == 'calc') {
+            for (let { value, parent } of walkValues(exp.chi)) {
+                if (value.typ == EnumToken.IdenTokenType) {
+                    if (!(value.val in values)) {
+                        return null;
+                    }
+                    if (parent == null) {
+                        parent = exp;
+                    }
+                    if (parent.typ == EnumToken.BinaryExpressionTokenType) {
+                        if (parent.l == value) {
+                            parent.l = values[value.val];
+                        }
+                        else {
+                            parent.r = values[value.val];
+                        }
+                    }
+                    else {
+                        for (let i = 0; i < parent.chi.length; i++) {
+                            if (parent.chi[i] == value) {
+                                parent.chi.splice(i, 1, values[value.val]);
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            const result = evaluate(exp.chi);
+            if (result.length == 1 && result[0].typ != EnumToken.BinaryExpressionTokenType) {
+                expr[key] = result[0];
+            }
+            else {
+                return null;
+            }
+        }
+    }
+    return expr;
+}
+
+export { parseRelativeColor };

package/dist/lib/renderer/utils/color.js

@@ -307,122 +307,47 @@ const NAMES_COLORS = Object.seal({
     '#663399': 'rebeccapurple',
     '#00000000': 'transparent'
 });
-function rgb2Hex(token) {
-    let value = '#';
-    let t;
-    // @ts-ignore
-    for (let i = 0; i < 6; i += 2) {
-        // @ts-ignore
-        t = token.chi[i];
-        // @ts-ignore
-        value += Math.round(t.typ == EnumToken.PercentageTokenType ? 255 * t.val / 100 : t.val).toString(16).padStart(2, '0');
+/**
+ * clamp color values
+ * @param token
+ */
+function clamp(token) {
+    if (token.kin == 'rgb' || token.kin == 'rgba') {
+        token.chi.filter((token) => ![EnumToken.LiteralTokenType, EnumToken.CommaTokenType, EnumToken.WhitespaceTokenType].includes(token.typ)).
+            forEach((token, index) => {
+            if (index <= 2) {
+                if (token.typ == EnumToken.NumberTokenType) {
+                    token.val = String(Math.min(255, Math.max(0, +token.val)));
+                }
+                else if (token.typ == EnumToken.PercentageTokenType) {
+                    token.val = String(Math.min(100, Math.max(0, +token.val)));
+                }
+            }
+            else {
+                if (token.typ == EnumToken.NumberTokenType) {
+                    token.val = String(Math.min(1, Math.max(0, +token.val)));
+                }
+                else if (token.typ == EnumToken.PercentageTokenType) {
+                    token.val = String(Math.min(100, Math.max(0, +token.val)));
+                }
+            }
+        });
     }
-    // @ts-ignore
-    if (token.chi.length == 7) {
-        // @ts-ignore
-        t = token.chi[6];
-        // @ts-ignore
-        if ((t.typ == EnumToken.NumberTokenType && t.val < 1) ||
-            // @ts-ignore
-            (t.typ == EnumToken.PercentageTokenType && t.val < 100)) {
-            // @ts-ignore
-            value += Math.round(255 * (t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val)).toString(16).padStart(2, '0');
-        }
-    }
-    return value;
+    return token;
 }
-function hsl2Hex(token) {
-    let t;
-    // @ts-ignore
-    let h = getAngle(token.chi[0]);
-    // @ts-ignore
-    t = token.chi[2];
-    // @ts-ignore
-    let s = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
-    // @ts-ignore
-    t = token.chi[4];
-    // @ts-ignore
-    let l = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
-    let a = null;
-    if (token.chi?.length == 7) {
-        // @ts-ignore
-        t = token.chi[6];
-        // @ts-ignore
-        if ((t.typ == EnumToken.PercentageTokenType && t.val < 100) ||
-            // @ts-ignore
-            (t.typ == EnumToken.NumberTokenType && t.val < 1)) {
-            // @ts-ignore
-            a = (t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val);
-        }
+function getNumber(token) {
+    if (token.typ == EnumToken.IdenTokenType && token.val == 'none') {
+        return 0;
     }
-    return `#${hsl2rgb(h, s, l, a).reduce((acc, curr) => acc + curr.toString(16).padStart(2, '0'), '')}`;
-}
-function hwb2hex(token) {
-    let t;
-    // @ts-ignore
-    let h = getAngle(token.chi[0]);
-    // @ts-ignore
-    t = token.chi[2];
-    // @ts-ignore
-    let white = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
     // @ts-ignore
-    t = token.chi[4];
-    // @ts-ignore
-    let black = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
-    let a = null;
-    if (token.chi?.length == 7) {
-        // @ts-ignore
-        t = token.chi[6];
-        // @ts-ignore
-        if ((t.typ == EnumToken.PercentageTokenType && t.val < 100) ||
-            // @ts-ignore
-            (t.typ == EnumToken.NumberTokenType && t.val < 1)) {
-            // @ts-ignore
-            a = (t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val);
-        }
-    }
-    const rgb = hsl2rgb(h, 1, .5, a);
-    let value;
-    for (let i = 0; i < 3; i++) {
-        value = rgb[i] / 255;
-        value *= (1 - white - black);
-        value += white;
-        rgb[i] = Math.round(value * 255);
-    }
-    return `#${rgb.reduce((acc, curr) => acc + curr.toString(16).padStart(2, '0'), '')}`;
-}
-function cmyk2hex(token) {
-    // @ts-ignore
-    let t = token.chi[0];
-    // @ts-ignore
-    const c = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
-    // @ts-ignore
-    t = token.chi[2];
-    // @ts-ignore
-    const m = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
-    // @ts-ignore
-    t = token.chi[4];
-    // @ts-ignore
-    const y = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
-    // @ts-ignore
-    t = token.chi[6];
-    // @ts-ignore
-    const k = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
-    const rgb = [
-        Math.round(255 * (1 - Math.min(1, c * (1 - k) + k))),
-        Math.round(255 * (1 - Math.min(1, m * (1 - k) + k))),
-        Math.round(255 * (1 - Math.min(1, y * (1 - k) + k)))
-    ];
-    // @ts-ignore
-    if (token.chi.length >= 9) {
-        // @ts-ignore
-        t = token.chi[8];
-        // @ts-ignore
-        rgb.push(Math.round(255 * (t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val)));
-    }
-    return `#${rgb.reduce((acc, curr) => acc + curr.toString(16).padStart(2, '0'), '')}`;
+    return token.typ == EnumToken.PercentageTokenType ? token.val / 100 : +token.val;
 }
 function getAngle(token) {
+    if (token.typ == EnumToken.IdenTokenType) {
+        if (token.val == 'none') {
+            return 0;
+        }
+    }
     if (token.typ == EnumToken.AngleTokenType) {
         switch (token.unit) {
             case 'deg':
@@ -442,58 +367,5 @@ function getAngle(token) {
     // @ts-ignore
     return token.val / 360;
 }
-function hsl2rgb(h, s, l, a = null) {
-    let v = l <= .5 ? l * (1.0 + s) : l + s - l * s;
-    let r = l;
-    let g = l;
-    let b = l;
-    if (v > 0) {
-        let m = l + l - v;
-        let sv = (v - m) / v;
-        h *= 6.0;
-        let sextant = Math.floor(h);
-        let fract = h - sextant;
-        let vsf = v * sv * fract;
-        let mid1 = m + vsf;
-        let mid2 = v - vsf;
-        switch (sextant) {
-            case 0:
-                r = v;
-                g = mid1;
-                b = m;
-                break;
-            case 1:
-                r = mid2;
-                g = v;
-                b = m;
-                break;
-            case 2:
-                r = m;
-                g = v;
-                b = mid1;
-                break;
-            case 3:
-                r = m;
-                g = mid2;
-                b = v;
-                break;
-            case 4:
-                r = mid1;
-                g = m;
-                b = v;
-                break;
-            case 5:
-                r = v;
-                g = m;
-                b = mid2;
-                break;
-        }
-    }
-    const values = [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)];
-    if (a != null && a != 1) {
-        values.push(Math.round(a * 255));
-    }
-    return values;
-}
 
-export { COLORS_NAMES, NAMES_COLORS, cmyk2hex, getAngle, hsl2Hex, hwb2hex, rgb2Hex };
+export { COLORS_NAMES, NAMES_COLORS, clamp, getAngle, getNumber };