@tbela99/css-parser 1.4.1 → 1.4.3

package/dist/lib/syntax/color/color.js

@@ -1,10 +1,4 @@
-import { EnumToken, ColorType } from '../../ast/types.js';
-import '../../ast/minify.js';
-import '../../ast/walk.js';
-import '../../parser/parse.js';
-import '../../parser/tokenize.js';
-import '../../parser/utils/config.js';
-import { isIdentColor } from '../syntax.js';
+import { ColorType, EnumToken } from '../../ast/types.js';
 import { color2RgbToken, lch2RgbToken, lab2RgbToken, oklch2RgbToken, oklab2RgbToken, cmyk2RgbToken, hwb2RgbToken, hsl2RgbToken, hex2RgbToken, cmyk2rgbvalues } from './rgb.js';
 import { color2HslToken, lch2HslToken, lab2HslToken, oklch2HslToken, oklab2HslToken, cmyk2HslToken, hwb2HslToken, hex2HslToken, rgb2HslToken } from './hsl.js';
 import { color2hwbToken, cmyk2hwbToken, lch2hwbToken, lab2hwbToken, oklch2hwbToken, oklab2hwbToken, hsl2hwbToken, rgb2hwbToken } from './hwb.js';
@@ -12,7 +6,6 @@ import { color2labToken, oklch2labToken, oklab2labToken, lch2labToken, cmyk2labT
 import { color2lchToken, oklch2lchToken, oklab2lchToken, lab2lchToken, cmyk2lchToken, hwb2lchToken, hsl2lchToken, rgb2lchToken, hex2lchToken } from './lch.js';
 import { color2oklabToken, oklch2oklabToken, lch2oklabToken, lab2oklabToken, cmyk2oklabToken, hwb2oklabToken, hsl2oklabToken, rgb2oklabToken, hex2oklabToken } from './oklab.js';
 import { color2oklchToken, lch2oklchToken, oklab2oklchToken, lab2oklchToken, cmyk2oklchToken, hwb2oklchToken, hsl2oklchToken, rgb2oklchToken, hex2oklchToken } from './oklch.js';
-import { colorFuncColorSpace, colorPrecision, anglePrecision } from './utils/constants.js';
 import { getComponents } from './utils/components.js';
 import { oklch2srgbvalues, lch2srgbvalues, oklab2srgbvalues, lab2srgbvalues, hwb2srgbvalues, hsl2srgb, rgb2srgb, hex2srgbvalues, xyz2srgb, lsrgb2srgbvalues, srgb2lsrgbvalues } from './srgb.js';
 import { prophotorgb2srgbvalues, srgb2prophotorgbvalues } from './prophotorgb.js';
@@ -23,10 +16,11 @@ import { xyzd502srgb } from './xyzd50.js';
 import { colorMix } from './color-mix.js';
 import { reduceHexValue, rgb2HexToken, color2HexToken, lch2HexToken, lab2HexToken, oklch2HexToken, oklab2HexToken, cmyk2HexToken, hwb2HexToken, hsl2HexToken } from './hex.js';
 import { parseRelativeColor } from './relativecolor.js';
+import { isIdentColor } from '../syntax.js';
 import { color2cmykToken, lch2cmykToken, lab2cmykToken, oklch2cmykToken, oklab2cmyk, hwb2cmykToken, hsl2cmykToken, rgb2cmykToken } from './cmyk.js';
 import { a98rgb2srgbvalues, srgb2a98values } from './a98rgb.js';
 import { epsilon } from '../../ast/transform/utils.js';
-import '../../renderer/sourcemap/lib/encode.js';
+import { definedPropertySettings, colorFuncColorSpace, colorPrecision, anglePrecision } from '../constants.js';
 
 /**
  * Converts a color to another color space
@@ -35,29 +29,26 @@ import '../../renderer/sourcemap/lib/encode.js';
  *
  * @private
  *
- * <code>
+ * ```ts
  *
  *     const token = {typ: EnumToken.ColorTokenType, kin: ColorType.HEX, val: '#F00'}
  *     const result = convertColor(token, ColorType.LCH);
  *
- * </code>
+ * ```
  */
 function convertColor(token, to) {
     if (token.kin == ColorType.SYS ||
         token.kin == ColorType.DPSYS ||
-        (isIdentColor(token) &&
-            'currentcolor' == token.val.toLowerCase())) {
+        (isIdentColor(token) && "currentcolor" == token.val.toLowerCase())) {
         return token;
     }
     if (token.kin == ColorType.COLOR_MIX && to != ColorType.COLOR_MIX) {
         const children = token.chi.reduce((acc, t) => {
-            if (t.typ == EnumToken.ColorTokenType) {
-                acc.push([t]);
+            if (t.typ === EnumToken.CommaTokenType) {
+                acc.push([]);
             }
-            else {
-                if (![EnumToken.WhitespaceTokenType, EnumToken.CommentTokenType, EnumToken.CommaTokenType].includes(t.typ)) {
-                    acc[acc.length - 1].push(t);
-                }
+            else if (t.typ !== EnumToken.WhitespaceTokenType && t.typ !== EnumToken.CommentTokenType) {
+                acc[acc.length - 1].push(t);
             }
             return acc;
         }, [[]]);
@@ -66,35 +57,40 @@ function convertColor(token, to) {
             return null;
         }
     }
-    if (token.cal == 'rel' && ['rgb', 'hsl', 'hwb', 'lab', 'lch', 'oklab', 'oklch', 'color'].includes(token.val.toLowerCase())) {
+    if (token.cal == "rel" &&
+        ["rgb", "hsl", "hwb", "lab", "lch", "oklab", "oklch", "color"].includes(token.val.toLowerCase())) {
         const chi = getComponents(token);
-        const offset = token.val == 'color' ? 2 : 1;
+        const offset = token.val == "color" ? 2 : 1;
         if (chi != null) {
             // @ts-ignore
             const color = chi[1];
-            const components = parseRelativeColor(token.val.toLowerCase() == 'color' ? chi[offset].val : token.val, color, chi[offset + 1], chi[offset + 2], chi[offset + 3], chi[offset + 4]);
-            if (components != null) {
-                token = {
-                    ...token,
-                    chi: [...(token.val == 'color' ? [chi[offset]] : []), ...Object.values(components)],
-                    kin: ColorType[token.val.toUpperCase().replaceAll('-', '_')]
-                };
-                delete token.cal;
+            const components = parseRelativeColor(token.val.toLowerCase() == "color"
+                ? chi[offset].val
+                : token.val, color, chi[offset + 1], chi[offset + 2], chi[offset + 3], chi[offset + 4]);
+            if (components == null) {
+                return null;
             }
+            let { cal, ...tk } = {
+                ...token,
+                chi: [...(token.val == "color" ? [chi[offset]] : []), ...Object.values(components)],
+                kin: ColorType[token.val.toUpperCase().replaceAll("-", "_")],
+            };
+            Object.defineProperty(tk, "loc", { ...definedPropertySettings, value: token.loc });
+            token = tk;
         }
     }
     if (token.kin == to) {
         if (token.kin == ColorType.HEX || token.kin == ColorType.LIT) {
             token.val = reduceHexValue(token.val);
-            token.kin = token.val[0] == '#' ? ColorType.HEX : ColorType.LIT;
+            token.kin = token.val[0] == "#" ? ColorType.HEX : ColorType.LIT;
         }
         return token;
     }
     if (token.kin == ColorType.COLOR) {
-        const colorSpace = token.chi.find(t => ![EnumToken.WhitespaceTokenType, EnumToken.CommentTokenType].includes(t.typ));
-        if (colorSpace.val == ColorType[to].toLowerCase().replaceAll('_', '-')) {
+        const colorSpace = token.chi.find((t) => ![EnumToken.WhitespaceTokenType, EnumToken.CommentTokenType].includes(t.typ));
+        if (colorSpace.val == ColorType[to].toLowerCase().replaceAll("_", "-")) {
             for (const chi of token.chi) {
-                if (chi.typ == EnumToken.NumberTokenType && typeof chi.val == 'number') {
+                if (chi.typ == EnumToken.NumberTokenType && typeof chi.val == "number") {
                     chi.val = toPrecisionValue(getNumber(chi));
                 }
             }
@@ -169,7 +165,6 @@ function convertColor(token, to) {
                 return oklch2cmykToken(token);
             case ColorType.LAB:
                 return lab2cmykToken(token);
-            //
             case ColorType.LCH:
                 return lch2cmykToken(token);
             case ColorType.COLOR:
@@ -183,8 +178,8 @@ function convertColor(token, to) {
                 const val = reduceHexValue(token.val);
                 return {
                     typ: EnumToken.ColorTokenType,
-                    val,
-                    kin: val[0] == '#' ? ColorType.HEX : ColorType.LIT
+                    val: val,
+                    kin: val[0] == "#" ? ColorType.HEX : ColorType.LIT,
                 };
             }
             case ColorType.HSL:
@@ -331,7 +326,7 @@ function convertColor(token, to) {
                 return color2oklchToken(token);
         }
     }
-    else if (colorFuncColorSpace.includes(ColorType[to].toLowerCase().replaceAll('_', '-').toLowerCase().replaceAll('_', '-'))) {
+    else if (colorFuncColorSpace.includes(ColorType[to].toLowerCase().replaceAll("_", "-").toLowerCase().replaceAll("_", "-"))) {
         switch (token.kin) {
             case ColorType.HEX:
             case ColorType.LIT:
@@ -485,36 +480,35 @@ function color2srgbvalues(token) {
     const colorSpace = components.shift();
     let values = components.map((val) => getNumber(val));
     switch (colorSpace.val.toLowerCase()) {
-        case 'display-p3':
+        case "display-p3":
             // @ts-ignore
             values = p32srgbvalues(...values);
             break;
-        case 'srgb-linear':
+        case "srgb-linear":
             // @ts-ignore
             values = lsrgb2srgbvalues(...values);
             break;
-        case 'prophoto-rgb':
+        case "prophoto-rgb":
             // @ts-ignore
             values = prophotorgb2srgbvalues(...values);
             break;
-        case 'a98-rgb':
+        case "a98-rgb":
             // @ts-ignore
             values = a98rgb2srgbvalues(...values);
             break;
-        case 'rec2020':
+        case "rec2020":
             // @ts-ignore
             values = rec20202srgb(...values);
             break;
-        case 'xyz':
-        case 'xyz-d65':
+        case "xyz":
+        case "xyz-d65":
             // @ts-ignore
             values = xyz2srgb(...values);
             break;
-        case 'xyz-d50':
+        case "xyz-d50":
             // @ts-ignore
             values = xyzd502srgb(...values);
             break;
-        // case srgb:
     }
     return values;
 }
@@ -528,31 +522,34 @@ function values2colortoken(values, to) {
     if (values.length == 4) {
         chi.push({ typ: EnumToken.LiteralTokenType, val: "/" }, {
             typ: EnumToken.PercentageTokenType,
-            val: values[3] * 100
+            val: values[3] * 100,
         });
     }
-    const colorSpace = ColorType[to].toLowerCase().replaceAll('_', '-');
-    return colorFuncColorSpace.includes(colorSpace) ? {
-        typ: EnumToken.ColorTokenType,
-        val: 'color',
-        chi: [{ typ: EnumToken.IdenTokenType, val: colorSpace }].concat(chi),
-        kin: ColorType.COLOR
-    } : {
-        typ: EnumToken.ColorTokenType,
-        val: colorSpace,
-        chi,
-        kin: to
-    };
+    const colorSpace = ColorType[to].toLowerCase().replaceAll("_", "-");
+    return colorFuncColorSpace.includes(colorSpace)
+        ? {
+            typ: EnumToken.ColorTokenType,
+            val: "color",
+            chi: [{ typ: EnumToken.IdenTokenType, val: colorSpace }].concat(chi),
+            kin: ColorType.COLOR,
+        }
+        : {
+            typ: EnumToken.ColorTokenType,
+            val: colorSpace,
+            chi,
+            kin: to,
+        };
 }
 function getNumber(token) {
-    if (token.typ == EnumToken.IdenTokenType && token.val == 'none') {
+    if (token.typ == EnumToken.IdenTokenType && token.val == "none") {
         return 0;
     }
     let val;
     // @ts-ignore
-    if (typeof token.val != 'number' && token.val?.typ == EnumToken.FractionTokenType) {
-        // @ts-ignore
-        val = token.val.l.val / token.val.r.val;
+    if (typeof token.val != "number" && token.val?.typ == EnumToken.FractionTokenType) {
+        val = (token.val.l.val /
+            // @ts-expect-error
+            token.val.r.val);
     }
     else {
         val = token.val;
@@ -566,22 +563,22 @@ function getNumber(token) {
  */
 function getAngle(token) {
     if (token.typ == EnumToken.IdenTokenType) {
-        if (token.val == 'none') {
+        if (token.val == "none") {
             return 0;
         }
     }
     if (token.typ == EnumToken.AngleTokenType) {
         switch (token.unit) {
-            case 'deg':
+            case "deg":
                 // @ts-ignore
                 return token.val / 360;
-            case 'rad':
+            case "rad":
                 // @ts-ignore
                 return token.val / (2 * Math.PI);
-            case 'grad':
+            case "grad":
                 // @ts-ignore
                 return token.val / 400;
-            case 'turn':
+            case "turn":
                 // @ts-ignore
                 return +token.val;
         }

package/dist/lib/syntax/color/hex.d.ts

@@ -0,0 +1,16 @@
+import type { ColorToken } from "../../../@types/index.d.ts";
+export declare function reduceHexValue(value: string): string;
+export declare function expandHexValue(value: string): string;
+export declare function rgb2HexToken(token: ColorToken): ColorToken | null;
+export declare function hsl2HexToken(token: ColorToken): ColorToken | null;
+export declare function cmyk2HexToken(token: ColorToken): ColorToken | null;
+export declare function hwb2HexToken(token: ColorToken): ColorToken | null;
+export declare function color2HexToken(token: ColorToken): ColorToken | null;
+export declare function oklab2HexToken(token: ColorToken): ColorToken | null;
+export declare function oklch2HexToken(token: ColorToken): ColorToken | null;
+export declare function lab2HexToken(token: ColorToken): ColorToken | null;
+export declare function lch2HexToken(token: ColorToken): ColorToken | null;
+export declare function rgb2hexvalues(token: ColorToken): string | null;
+export declare function hsl2hexvalues(token: ColorToken): string | null;
+export declare function hwb2hexvalues(token: ColorToken): string | null;
+export declare function cmyk2hexvalues(token: ColorToken): string | null;

package/dist/lib/syntax/color/hex.js

@@ -1,39 +1,28 @@
 import { EnumToken, ColorType } from '../../ast/types.js';
-import '../../ast/minify.js';
-import '../../ast/walk.js';
-import '../../parser/parse.js';
-import '../../parser/tokenize.js';
-import '../../parser/utils/config.js';
 import { color2srgbvalues, getNumber } from './color.js';
 import { srgb2rgb, cmyk2rgbvalues, hwb2rgbvalues, hsl2rgbvalues } from './rgb.js';
-import { COLORS_NAMES, NAMES_COLORS } from './utils/constants.js';
 import { getComponents } from './utils/components.js';
 import { lch2srgbvalues, lab2srgbvalues, oklch2srgbvalues, oklab2srgbvalues } from './srgb.js';
-import '../../renderer/sourcemap/lib/encode.js';
+import { COLORS_NAMES, NAMES_COLORS } from '../constants.js';
 
 function toHexString(acc, value) {
-    return acc + value.toString(16).padStart(2, '0');
+    return acc + value.toString(16).padStart(2, "0");
 }
 function reduceHexValue(value) {
-    if (value[0] != '#') {
+    if (value[0] != "#") {
         value = COLORS_NAMES[value.toLowerCase()] ?? value;
     }
     const named_color = NAMES_COLORS[expandHexValue(value)];
     if (value.length == 7) {
-        if (value[1] == value[2] &&
-            value[3] == value[4] &&
-            value[5] == value[6]) {
+        if (value[1] == value[2] && value[3] == value[4] && value[5] == value[6]) {
             value = `#${value[1]}${value[3]}${value[5]}`;
         }
     }
     else if (value.length == 9) {
-        if (value[1] == value[2] &&
-            value[3] == value[4] &&
-            value[5] == value[6] &&
-            value[7] == value[8]) {
-            value = `#${value[1]}${value[3]}${value[5]}${value[7] == 'f' ? '' : value[7]}`;
+        if (value[1] == value[2] && value[3] == value[4] && value[5] == value[6] && value[7] == value[8]) {
+            value = `#${value[1]}${value[3]}${value[5]}${value[7] == "f" ? "" : value[7]}`;
         }
-        if (value.endsWith('ff')) {
+        if (value.endsWith("ff")) {
             value = value.slice(0, -2);
         }
     }
@@ -81,46 +70,46 @@ function color2HexToken(token) {
     if (value == null) {
         return null;
     }
-    return hexToken(value.reduce((acc, curr) => acc + srgb2rgb(curr).toString(16).padStart(2, '0'), '#'));
+    return hexToken(value.reduce((acc, curr) => acc + srgb2rgb(curr).toString(16).padStart(2, "0"), "#"));
 }
 function oklab2HexToken(token) {
     let value = oklab2srgbvalues(token);
     if (value == null) {
         return null;
     }
-    return hexToken(value.reduce((acc, curr) => acc + srgb2rgb(curr).toString(16).padStart(2, '0'), '#'));
+    return hexToken(value.reduce((acc, curr) => acc + srgb2rgb(curr).toString(16).padStart(2, "0"), "#"));
 }
 function oklch2HexToken(token) {
     let value = oklch2srgbvalues(token);
     if (value == null) {
         return null;
     }
-    return hexToken(value.reduce((acc, curr) => acc + srgb2rgb(curr).toString(16).padStart(2, '0'), '#'));
+    return hexToken(value.reduce((acc, curr) => acc + srgb2rgb(curr).toString(16).padStart(2, "0"), "#"));
 }
 function lab2HexToken(token) {
     let value = lab2srgbvalues(token);
     if (value == null) {
         return null;
     }
-    return hexToken(value.reduce((acc, curr) => acc + srgb2rgb(curr).toString(16).padStart(2, '0'), '#'));
+    return hexToken(value.reduce((acc, curr) => acc + srgb2rgb(curr).toString(16).padStart(2, "0"), "#"));
 }
 function lch2HexToken(token) {
     let value = lch2srgbvalues(token);
     if (value == null) {
         return null;
     }
-    return hexToken(value.reduce((acc, curr) => acc + srgb2rgb(curr).toString(16).padStart(2, '0'), '#'));
+    return hexToken(value.reduce((acc, curr) => acc + srgb2rgb(curr).toString(16).padStart(2, "0"), "#"));
 }
 function hexToken(value) {
     value = reduceHexValue(value);
     return {
         typ: EnumToken.ColorTokenType,
         val: value,
-        kin: value[0] == '#' ? ColorType.HEX : ColorType.LIT
+        kin: value[0] == "#" ? ColorType.HEX : ColorType.LIT,
     };
 }
 function rgb2hexvalues(token) {
-    let value = '#';
+    let value = "#";
     let t;
     // @ts-ignore
     const components = getComponents(token);
@@ -131,8 +120,13 @@ function rgb2hexvalues(token) {
     for (let i = 0; i < 3; i++) {
         // @ts-ignore
         t = components[i];
-        // @ts-ignore
-        value += (t.typ == EnumToken.Iden && t.val == 'none' ? '0' : Math.round(getNumber(t) * (t.typ == EnumToken.PercentageTokenType ? 255 : 1))).toString(16).padStart(2, '0');
+        value +=
+            ( // @ts-expect-error
+            t.typ == EnumToken.Iden && t.val == "none"
+                ? "0"
+                : Math.round(getNumber(t) * (t.typ == EnumToken.PercentageTokenType ? 255 : 1)))
+                .toString(16)
+                .padStart(2, "0");
     }
     // @ts-ignore
     if (components.length == 4) {
@@ -143,7 +137,9 @@ function rgb2hexvalues(token) {
         // @ts-ignore
         if (v < 1) {
             // @ts-ignore
-            value += Math.round(255 * getNumber(t)).toString(16).padStart(2, '0');
+            value += Math.round(255 * getNumber(t))
+                .toString(16)
+                .padStart(2, "0");
         }
     }
     return value;
@@ -156,7 +152,7 @@ function hsl2hexvalues(token) {
     if (t.length == 4) {
         t[3] = srgb2rgb(t[3]);
     }
-    return `${t.reduce(toHexString, '#')}`;
+    return `${t.reduce(toHexString, "#")}`;
 }
 function hwb2hexvalues(token) {
     const t = hwb2rgbvalues(token);
@@ -166,7 +162,7 @@ function hwb2hexvalues(token) {
     if (t.length == 4) {
         t[3] = srgb2rgb(t[3]);
     }
-    return `${t.reduce(toHexString, '#')}`;
+    return `${t.reduce(toHexString, "#")}`;
 }
 function cmyk2hexvalues(token) {
     const t = cmyk2rgbvalues(token);
@@ -176,7 +172,7 @@ function cmyk2hexvalues(token) {
     if (t.length == 4) {
         t[3] = srgb2rgb(t[3]);
     }
-    return `#${t.reduce(toHexString, '')}`;
+    return `#${t.reduce(toHexString, "")}`;
 }
 
 export { cmyk2HexToken, cmyk2hexvalues, color2HexToken, expandHexValue, hsl2HexToken, hsl2hexvalues, hwb2HexToken, hwb2hexvalues, lab2HexToken, lch2HexToken, oklab2HexToken, oklch2HexToken, reduceHexValue, rgb2HexToken, rgb2hexvalues };

package/dist/lib/syntax/color/hsl.d.ts

@@ -0,0 +1,20 @@
+import type { ColorToken } from "../../../@types/index.d.ts";
+export declare function hex2HslToken(token: ColorToken): ColorToken | null;
+export declare function rgb2HslToken(token: ColorToken): ColorToken | null;
+export declare function hwb2HslToken(token: ColorToken): ColorToken | null;
+export declare function cmyk2HslToken(token: ColorToken): ColorToken | null;
+export declare function oklab2HslToken(token: ColorToken): ColorToken | null;
+export declare function oklch2HslToken(token: ColorToken): ColorToken | null;
+export declare function lab2HslToken(token: ColorToken): ColorToken | null;
+export declare function lch2HslToken(token: ColorToken): ColorToken | null;
+export declare function color2HslToken(token: ColorToken): ColorToken | null;
+export declare function rgb2hslvalues(token: ColorToken): number[] | null;
+export declare function hsv2hsl(h: number, s: number, v: number, a?: number): number[];
+export declare function cmyk2hslvalues(token: ColorToken): number[];
+export declare function hwb2hslvalues(token: ColorToken): [number, number, number, number];
+export declare function lab2hslvalues(token: ColorToken): number[] | null;
+export declare function lch2hslvalues(token: ColorToken): number[] | null;
+export declare function oklab2hslvalues(token: ColorToken): number[] | null;
+export declare function oklch2hslvalues(token: ColorToken): number[] | null;
+export declare function rgbvalues2hslvalues(r: number, g: number, b: number, a?: number | null): number[];
+export declare function srgb2hslvalues(r: number, g: number, b: number, a?: number | null): number[];

package/dist/lib/syntax/color/hsl.js

@@ -1,16 +1,9 @@
 import { hwb2hsv } from './hsv.js';
 import { color2srgbvalues, toPrecisionAngle, toPrecisionValue, getNumber } from './color.js';
 import { lch2rgbvalues, lab2rgbvalues, cmyk2rgbvalues } from './rgb.js';
-import './utils/constants.js';
 import { getComponents } from './utils/components.js';
 import { hex2srgbvalues, oklch2srgbvalues, oklab2srgbvalues, hslvalues } from './srgb.js';
 import { EnumToken, ColorType } from '../../ast/types.js';
-import '../../ast/minify.js';
-import '../../ast/walk.js';
-import '../../parser/parse.js';
-import '../../parser/tokenize.js';
-import '../../parser/utils/config.js';
-import '../../renderer/sourcemap/lib/encode.js';
 
 function hex2HslToken(token) {
     // @ts-ignore
@@ -81,16 +74,16 @@ function hslToken(values) {
         { typ: EnumToken.PercentageTokenType, val: toPrecisionValue(values[2]) * 100 },
     ];
     if (values.length == 4 && values[3] != 1) {
-        chi.push({ typ: EnumToken.LiteralTokenType, val: '/' }, {
+        chi.push({ typ: EnumToken.LiteralTokenType, val: "/" }, {
             typ: EnumToken.PercentageTokenType,
-            val: values[3] * 100
+            val: values[3] * 100,
         });
     }
     return {
         typ: EnumToken.ColorTokenType,
-        val: 'hsl',
+        val: "hsl",
         chi,
-        kin: ColorType.HSL
+        kin: ColorType.HSL,
     };
 }
 function rgb2hslvalues(token) {
@@ -132,7 +125,7 @@ function hsv2hsl(h, s, v, a) {
         //If (2-sat)*val < 1 set it to sat*val/((2-sat)*val)
         //Otherwise sat*val/(2-(2-sat)*val)
         //Conditional is not operating with hue, it is reassigned!
-        s * v / ((h = (2 - s) * v) < 1 ? h : 2 - h),
+        (s * v) / ((h = (2 - s) * v) < 1 ? h : 2 - h),
         h / 2, //Lightness is (2-sat)*val/2
     ];
     if (a != null) {

package/dist/lib/syntax/color/hsv.d.ts

@@ -0,0 +1,2 @@
+export declare function hwb2hsv(h: number, w: number, b: number, a?: number): [number, number, number, number | null];
+export declare function hsl2hsv(h: number, s: number, l: number, a?: number | null): number[];

package/dist/lib/syntax/color/hwb.d.ts

@@ -0,0 +1,21 @@
+import type { ColorToken } from "../../../@types/index.d.ts";
+export declare function rgb2hwbToken(token: ColorToken): ColorToken | null;
+export declare function hsl2hwbToken(token: ColorToken): ColorToken | null;
+export declare function cmyk2hwbToken(token: ColorToken): ColorToken | null;
+export declare function oklab2hwbToken(token: ColorToken): ColorToken | null;
+export declare function oklch2hwbToken(token: ColorToken): ColorToken | null;
+export declare function lab2hwbToken(token: ColorToken): ColorToken | null;
+export declare function lch2hwbToken(token: ColorToken): ColorToken | null;
+export declare function color2hwbToken(token: ColorToken): ColorToken | null;
+export declare function hwbToken(values: number[]): ColorToken;
+export declare function rgb2hwbvalues(token: ColorToken): number[];
+export declare function cmyk2hwbvalues(token: ColorToken): number[];
+export declare function hsl2hwbvalues(token: ColorToken): number[];
+export declare function lab2hwbvalues(token: ColorToken): number[] | null;
+export declare function lch2hwbvalues(token: ColorToken): number[] | null;
+export declare function oklab2hwbvalues(token: ColorToken): number[] | null;
+export declare function oklch2hwbvalues(token: ColorToken): number[];
+export declare function color2hwbvalues(token: ColorToken): number[] | null;
+export declare function srgb2hwb(r: number, g: number, b: number, a?: number | null, fallback?: number): number[];
+export declare function hsv2hwb(h: number, s: number, v: number, a?: number | null): number[];
+export declare function hslvalues2hwbvalues(h: number, s: number, l: number, a?: number | null): number[];

package/dist/lib/syntax/color/hwb.js

@@ -1,15 +1,8 @@
 import { hsl2hsv } from './hsv.js';
-import './utils/constants.js';
 import { getComponents } from './utils/components.js';
 import { color2srgbvalues, toPrecisionAngle, toPrecisionValue, getAngle, getNumber } from './color.js';
-import { cmyk2srgbvalues, lch2srgbvalues, lab2srgbvalues, oklch2srgbvalues, oklab2srgbvalues } from './srgb.js';
 import { EnumToken, ColorType } from '../../ast/types.js';
-import '../../ast/minify.js';
-import '../../ast/walk.js';
-import '../../parser/parse.js';
-import '../../parser/tokenize.js';
-import '../../parser/utils/config.js';
-import '../../renderer/sourcemap/lib/encode.js';
+import { cmyk2srgbvalues, lch2srgbvalues, lab2srgbvalues, oklch2srgbvalues, oklab2srgbvalues } from './srgb.js';
 
 function rgb2hwbToken(token) {
     const values = rgb2hwbvalues(token);
@@ -75,16 +68,16 @@ function hwbToken(values) {
         { typ: EnumToken.PercentageTokenType, val: toPrecisionValue(values[2]) * 100 },
     ];
     if (values.length == 4) {
-        chi.push({ typ: EnumToken.LiteralTokenType, val: '/' }, {
+        chi.push({ typ: EnumToken.LiteralTokenType, val: "/" }, {
             typ: EnumToken.PercentageTokenType,
-            val: values[3] * 100
+            val: values[3] * 100,
         });
     }
     return {
         typ: EnumToken.ColorTokenType,
-        val: 'hwb',
+        val: "hwb",
         chi,
-        kin: ColorType.HWB
+        kin: ColorType.HWB,
     };
 }
 function rgb2hwbvalues(token) {
@@ -103,7 +96,7 @@ function cmyk2hwbvalues(token) {
 function hsl2hwbvalues(token) {
     // @ts-ignore
     return hslvalues2hwbvalues(...getComponents(token).map((t, index) => {
-        if (index == 3 && (t.typ == EnumToken.IdenTokenType && t.val == 'none')) {
+        if (index == 3 && t.typ == EnumToken.IdenTokenType && t.val == "none") {
             return 1;
         }
         if (index == 0) {
@@ -147,15 +140,9 @@ function rgb2hue(r, g, b, fallback = 0) {
     let delta = value - whiteness;
     if (delta > 0) {
         // calculate segment
-        let segment = value === r ? (g - b) / delta : (value === g
-            ? (b - r) / delta
-            : (r - g) / delta);
+        let segment = value === r ? (g - b) / delta : value === g ? (b - r) / delta : (r - g) / delta;
         // calculate shift
-        let shift = value === r ? segment < 0
-            ? 360 / 60
-            : 0 / 60 : (value === g
-            ? 120 / 60
-            : 240 / 60);
+        let shift = value === r ? (segment < 0 ? 360 / 60 : 0 / 60) : value === g ? 120 / 60 : 240 / 60;
         // calculate hue
         return (segment + shift) * 60;
     }

package/dist/lib/syntax/color/lab.d.ts

@@ -0,0 +1,25 @@
+import type { ColorToken } from "../../../@types/index.d.ts";
+export declare function hex2labToken(token: ColorToken): ColorToken | null;
+export declare function rgb2labToken(token: ColorToken): ColorToken | null;
+export declare function hsl2labToken(token: ColorToken): ColorToken | null;
+export declare function hwb2labToken(token: ColorToken): ColorToken | null;
+export declare function cmyk2labToken(token: ColorToken): ColorToken | null;
+export declare function lch2labToken(token: ColorToken): ColorToken | null;
+export declare function oklab2labToken(token: ColorToken): ColorToken | null;
+export declare function oklch2labToken(token: ColorToken): ColorToken | null;
+export declare function color2labToken(token: ColorToken): ColorToken | null;
+export declare function hex2labvalues(token: ColorToken): number[] | null;
+export declare function rgb2labvalues(token: ColorToken): number[] | null;
+export declare function cmyk2labvalues(token: ColorToken): number[] | null;
+export declare function hsl2labvalues(token: ColorToken): number[] | null;
+export declare function hwb2labvalues(token: ColorToken): number[] | null;
+export declare function lch2labvalues(token: ColorToken): number[] | null;
+export declare function oklab2labvalues(token: ColorToken): number[] | null;
+export declare function oklch2labvalues(token: ColorToken): number[] | null;
+export declare function color2labvalues(token: ColorToken): number[] | null;
+export declare function srgb2labvalues(r: number, g: number, b: number, a: number | null): number[];
+export declare function xyz2lab(x: number, y: number, z: number, a?: number | null): number[];
+export declare function lchvalues2labvalues(l: number, c: number, h: number, a?: number | null): number[];
+export declare function getLABComponents(token: ColorToken): number[] | null;
+export declare function Lab_to_sRGB(l: number, a: number, b: number): number[];
+export declare function Lab_to_XYZ(l: number, a: number, b: number): number[];