@tbela99/css-parser 0.0.1-rc7 → 0.1.0

package/dist/lib/renderer/render.js

@@ -1,5 +1,10 @@
 import { getAngle, COLORS_NAMES, rgb2Hex, hsl2Hex, hwb2hex, cmyk2hex, NAMES_COLORS } from './utils/color.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';
 
 const colorsFunc = ['rgb', 'rgba', 'hsl', 'hsla', 'hwb', 'device-cmyk'];
 function reduceNumber(val) {
@@ -19,35 +24,88 @@ function reduceNumber(val) {
     }
     return val;
 }
-function render(data, opt = {}) {
+function update(position, str) {
+    let i = 0;
+    for (; i < str.length; i++) {
+        if (isNewLine(str[i].charCodeAt(0))) {
+            position.lin++;
+            position.col = 0;
+        }
+        else {
+            position.col++;
+        }
+    }
+}
+function doRender(data, options = {}) {
+    options = {
+        ...(options.minify ?? true ? {
+            indent: '',
+            newLine: '',
+            removeComments: true
+        } : {
+            indent: ' ',
+            newLine: '\n',
+            compress: false,
+            removeComments: false,
+        }), sourcemap: false, colorConvert: true, expandNestingRules: false, preserveLicense: false, ...options
+    };
     const startTime = performance.now();
     const errors = [];
-    const options = Object.assign(opt.minify ?? true ? {
-        indent: '',
-        newLine: '',
-        removeComments: true
-    } : {
-        indent: ' ',
-        newLine: '\n',
-        compress: false,
-        removeComments: false,
-    }, { colorConvert: true, expandNestingRules: false, preserveLicense: false }, opt);
-    return {
-        code: doRender(options.expandNestingRules ? expand(data) : data, options, errors, function reducer(acc, curr) {
-            if (curr.typ == 'Comment' && options.removeComments) {
+    const sourcemap = options.sourcemap ? new SourceMap : null;
+    const cache = Object.create(null);
+    const result = {
+        code: renderAstNode(options.expandNestingRules ? expand(data) : data, options, sourcemap, {
+            ind: 0,
+            lin: 1,
+            col: 1
+        }, errors, function reducer(acc, curr) {
+            if (curr.typ == EnumToken.CommentTokenType && options.removeComments) {
                 if (!options.preserveLicense || !curr.val.startsWith('/*!')) {
                     return acc;
                 }
                 return acc + curr.val;
             }
-            return acc + renderToken(curr, options, reducer, errors);
-        }, 0), errors, stats: {
+            return acc + renderToken(curr, options, cache, reducer, errors);
+        }, cache), errors, stats: {
             total: `${(performance.now() - startTime).toFixed(2)}ms`
         }
     };
+    if (options.output != null) {
+        // @ts-ignore
+        options.output = options.resolve(options.output, options.cwd).absolute;
+    }
+    if (sourcemap != null) {
+        result.map = sourcemap.toJSON();
+        // @ts-ignore
+        // result.map.sources = result.map.sources?.map(s => <string>options?.resolve(s, <string>options?.cwd)?.relative)
+    }
+    return result;
+}
+function updateSourceMap(node, options, cache, sourcemap, position, str) {
+    if ([4 /* NodeType.RuleNodeType */, 3 /* NodeType.AtRuleNodeType */].includes(node.typ)) {
+        let src = node.loc?.src ?? '';
+        let output = options.output ?? '';
+        if (src !== '') {
+            if (!(src in cache)) {
+                // @ts-ignore
+                cache[src] = options.resolve(src, options.cwd ?? '').relative;
+            }
+        }
+        if (!(output in cache)) {
+            // @ts-ignore
+            cache[output] = options.resolve(output, options.cwd).relative;
+        }
+        // @ts-ignore
+        sourcemap.add({ src: cache[output], sta: { ...position } }, {
+            ...node.loc,
+            // @ts-ignore
+            src: options.resolve(cache[src], options.cwd).relative
+        });
+    }
+    update(position, str);
 }
 // @ts-ignore
-function doRender(data, options, errors, reducer, level = 0, indents = []) {
+function renderAstNode(data, options, sourcemap, position, errors, reducer, cache, level = 0, indents = []) {
     if (indents.length < level + 1) {
         indents.push(options.indent.repeat(level));
     }
@@ -57,46 +115,61 @@ function doRender(data, options, errors, reducer, level = 0, indents = []) {
     const indent = indents[level];
     const indentSub = indents[level + 1];
     switch (data.typ) {
-        case 'Declaration':
+        case 5 /* NodeType.DeclarationNodeType */:
             return `${data.nam}:${options.indent}${data.val.reduce(reducer, '')}`;
-        case 'Comment':
-        case 'CDOCOMM':
+        case 0 /* NodeType.CommentNodeType */:
+        case 1 /* NodeType.CDOCOMMNodeType */:
+            if (data.val.startsWith('# sourceMappingURL=')) {
+                // ignore sourcemap
+                return '';
+            }
             return !options.removeComments || (options.preserveLicense && data.val.startsWith('/*!')) ? data.val : '';
-        case 'StyleSheet':
+        case 2 /* NodeType.StyleSheetNodeType */:
             return data.chi.reduce((css, node) => {
-                const str = doRender(node, options, errors, reducer, level, indents);
+                const str = renderAstNode(node, options, sourcemap, { ...position }, errors, reducer, cache, level, indents);
                 if (str === '') {
                     return css;
                 }
                 if (css === '') {
+                    if (sourcemap != null) {
+                        updateSourceMap(node, options, cache, sourcemap, position, str);
+                    }
                     return str;
                 }
+                if (sourcemap != null) {
+                    update(position, options.newLine);
+                    updateSourceMap(node, options, cache, sourcemap, position, str);
+                }
                 return `${css}${options.newLine}${str}`;
             }, '');
-        case 'AtRule':
-        case 'Rule':
-            if (data.typ == 'AtRule' && !('chi' in data)) {
+        case 3 /* NodeType.AtRuleNodeType */:
+        case 4 /* NodeType.RuleNodeType */:
+            if (data.typ == 3 /* NodeType.AtRuleNodeType */ && !('chi' in data)) {
                 return `${indent}@${data.nam}${data.val === '' ? '' : options.indent || ' '}${data.val};`;
             }
             // @ts-ignore
             let children = data.chi.reduce((css, node) => {
                 let str;
-                if (node.typ == 'Comment') {
+                if (node.typ == 0 /* NodeType.CommentNodeType */) {
                     str = options.removeComments && (!options.preserveLicense || !node.val.startsWith('/*!')) ? '' : node.val;
                 }
-                else if (node.typ == 'Declaration') {
+                else if (node.typ == 5 /* NodeType.DeclarationNodeType */) {
                     if (node.val.length == 0) {
                         // @ts-ignore
-                        errors.push({ action: 'ignore', message: `render: invalid declaration ${JSON.stringify(node)}`, location: node.loc });
+                        errors.push({
+                            action: 'ignore',
+                            message: `render: invalid declaration ${JSON.stringify(node)}`,
+                            location: node.loc
+                        });
                         return '';
                     }
                     str = `${node.nam}:${options.indent}${node.val.reduce(reducer, '').trimEnd()};`;
                 }
-                else if (node.typ == 'AtRule' && !('chi' in node)) {
+                else if (node.typ == 3 /* NodeType.AtRuleNodeType */ && !('chi' in node)) {
                     str = `${data.val === '' ? '' : options.indent || ' '}${data.val};`;
                 }
                 else {
-                    str = doRender(node, options, errors, reducer, level + 1, indents);
+                    str = renderAstNode(node, options, sourcemap, { ...position }, errors, reducer, cache, level + 1, indents);
                 }
                 if (css === '') {
                     return str;
@@ -109,28 +182,40 @@ function doRender(data, options, errors, reducer, level = 0, indents = []) {
             if (children.endsWith(';')) {
                 children = children.slice(0, -1);
             }
-            if (data.typ == 'AtRule') {
+            if (data.typ == 3 /* NodeType.AtRuleNodeType */) {
                 return `@${data.nam}${data.val === '' ? '' : options.indent || ' '}${data.val}${options.indent}{${options.newLine}` + (children === '' ? '' : indentSub + children + options.newLine) + indent + `}`;
             }
             return data.sel + `${options.indent}{${options.newLine}` + (children === '' ? '' : indentSub + children + options.newLine) + indent + `}`;
     }
     return '';
 }
-function renderToken(token, options = {}, reducer, errors) {
+function renderToken(token, options = {}, cache = Object.create(null), reducer, errors) {
     if (reducer == null) {
         reducer = function (acc, curr) {
-            if (curr.typ == 'Comment' && options.removeComments) {
+            if (curr.typ == EnumToken.CommentTokenType && options.removeComments) {
                 if (!options.preserveLicense || !curr.val.startsWith('/*!')) {
                     return acc;
                 }
                 return acc + curr.val;
             }
-            return acc + renderToken(curr, options, reducer, errors);
+            return acc + renderToken(curr, options, cache, reducer, errors);
         };
     }
     switch (token.typ) {
-        case 'Color':
-            if (options.minify || options.colorConvert) {
+        case EnumToken.ListToken:
+            return token.chi.reduce((acc, curr) => acc + renderToken(curr, options, cache), '');
+        case EnumToken.BinaryExpressionTokenType:
+            return renderToken(token.l, options, cache) + (token.op == EnumToken.Add ? ' + ' : (token.op == EnumToken.Sub ? ' - ' : (token.op == EnumToken.Mul ? '*' : '/'))) + renderToken(token.r, options, cache);
+        case EnumToken.Add:
+            return ' + ';
+        case EnumToken.Sub:
+            return ' - ';
+        case EnumToken.Mul:
+            return '*';
+        case EnumToken.Div:
+            return '/';
+        case EnumToken.ColorTokenType:
+            if (options.colorConvert) {
                 if (token.kin == 'lit' && token.val.toLowerCase() == 'currentcolor') {
                     return 'currentcolor';
                 }
@@ -170,54 +255,69 @@ function renderToken(token, options = {}, reducer, errors) {
             if (token.kin == 'hex' || token.kin == 'lit') {
                 return token.val;
             }
-        case 'Start-parens':
-            if (!('chi' in token)) {
-                return '(';
+        case EnumToken.ParensTokenType:
+        case EnumToken.FunctionTokenType:
+        case EnumToken.UrlFunctionTokenType:
+        case EnumToken.PseudoClassFuncTokenType:
+            if (token.typ == EnumToken.FunctionTokenType &&
+                token.val == 'calc' &&
+                token.chi.length == 1) {
+                // calc(200px) => 200px
+                return token.chi.reduce((acc, curr) => acc + renderToken(curr, options, cache, reducer), '');
             }
-        case 'Func':
-        case 'UrlFunc':
-        case 'Pseudo-class-func':
             // @ts-ignore
             return ( /* options.minify && 'Pseudo-class-func' == token.typ && token.val.slice(0, 2) == '::' ? token.val.slice(1) :*/token.val ?? '') + '(' + token.chi.reduce(reducer, '') + ')';
-        case 'Includes':
+        case EnumToken.StartParensTokenType:
+            return '(';
+        case EnumToken.IncludesTokenType:
             return '~=';
-        case 'Dash-match':
+        case EnumToken.DashMatchTokenType:
             return '|=';
-        case 'Lt':
+        case EnumToken.LtTokenType:
             return '<';
-        case 'Lte':
+        case EnumToken.LteTokenType:
             return '<=';
-        case 'Gt':
+        case EnumToken.GtTokenType:
             return '>';
-        case 'Gte':
+        case EnumToken.GteTokenType:
             return '>=';
-        case 'End-parens':
+        case EnumToken.EndParensTokenType:
             return ')';
-        case 'Attr-start':
+        case EnumToken.AttrStartTokenType:
             return '[';
-        case 'Attr-end':
+        case EnumToken.AttrEndTokenType:
             return ']';
-        case 'Whitespace':
+        case EnumToken.WhitespaceTokenType:
             return ' ';
-        case 'Colon':
+        case EnumToken.ColonTokenType:
             return ':';
-        case 'Semi-colon':
+        case EnumToken.SemiColonTokenType:
             return ';';
-        case 'Comma':
+        case EnumToken.CommaTokenType:
             return ',';
-        case 'Important':
+        case EnumToken.ImportantTokenType:
             return '!important';
-        case 'Attr':
+        case EnumToken.AttrTokenType:
             return '[' + token.chi.reduce(reducer, '') + ']';
-        case 'Time':
-        case 'Angle':
-        case 'Length':
-        case 'Dimension':
-        case 'Frequency':
-        case 'Resolution':
+        case EnumToken.TimeTokenType:
+        case EnumToken.AngleTokenType:
+        case EnumToken.LengthTokenType:
+        case EnumToken.DimensionTokenType:
+        case EnumToken.FrequencyTokenType:
+        case EnumToken.ResolutionTokenType:
+            if (token.val.typ == EnumToken.BinaryExpressionTokenType) {
+                const result = renderToken(token.val, options, cache);
+                if (!('unit' in token)) {
+                    return result;
+                }
+                if (!result.includes(' ')) {
+                    return result + token.unit;
+                }
+                return `(${result})*1${token.unit}`;
+            }
             let val = reduceNumber(token.val);
             let unit = token.unit;
-            if (token.typ == 'Angle') {
+            if (token.typ == EnumToken.AngleTokenType) {
                 const angle = getAngle(token);
                 let v;
                 let value = val + unit;
@@ -262,40 +362,62 @@ function renderToken(token, options = {}, reducer, errors) {
                 }
             }
             if (val === '0') {
-                if (token.typ == 'Time') {
+                if (token.typ == EnumToken.TimeTokenType) {
                     return '0s';
                 }
-                if (token.typ == 'Frequency') {
+                if (token.typ == EnumToken.FrequencyTokenType) {
                     return '0Hz';
                 }
                 // @ts-ignore
-                if (token.typ == 'Resolution') {
+                if (token.typ == EnumToken.ResolutionTokenType) {
                     return '0x';
                 }
                 return '0';
             }
             return val + unit;
-        case 'Perc':
+        case EnumToken.PercentageTokenType:
             const perc = reduceNumber(token.val);
             return options.minify && perc == '0' ? '0' : perc + '%';
-        case 'Number':
+        case EnumToken.NumberTokenType:
             return reduceNumber(token.val);
-        case 'Comment':
+        case EnumToken.CommentTokenType:
             if (options.removeComments && (!options.preserveLicense || !token.val.startsWith('/*!'))) {
                 return '';
             }
-        case 'Url-token':
-        case 'At-rule':
-        case 'Hash':
-        case 'Pseudo-class':
-        case 'Literal':
-        case 'String':
-        case 'Iden':
-        case 'Delim':
+        case EnumToken.UrlTokenTokenType:
+            if (token.typ == EnumToken.UrlTokenTokenType) {
+                if (options.output != null) {
+                    if (!('original' in token)) {
+                        // do not modify original token
+                        token = { ...token };
+                        Object.defineProperty(token, 'original', { enumerable: false, writable: false, value: token.val });
+                    }
+                    // @ts-ignore
+                    if (!(token.original in cache)) {
+                        let output = options.output ?? '';
+                        const key = output + 'abs';
+                        if (!(key in cache)) {
+                            // @ts-ignore
+                            cache[key] = options.dirname(options.resolve(output, options.cwd).absolute);
+                        }
+                        // @ts-ignore
+                        cache[token.original] = options.resolve(token.original, cache[key]).relative;
+                    }
+                    // @ts-ignore
+                    token.val = cache[token.original];
+                }
+            }
+        case EnumToken.AtRuleTokenType:
+        case EnumToken.HashTokenType:
+        case EnumToken.PseudoClassTokenType:
+        case EnumToken.LiteralTokenType:
+        case EnumToken.StringTokenType:
+        case EnumToken.IdenTokenType:
+        case EnumToken.DelimTokenType:
             return /* options.minify && 'Pseudo-class' == token.typ && '::' == token.val.slice(0, 2) ? token.val.slice(1) :  */ token.val;
     }
     errors?.push({ action: 'ignore', message: `render: unexpected token ${JSON.stringify(token, null, 1)}` });
     return '';
 }
 
-export { colorsFunc, render, renderToken };
+export { colorsFunc, doRender, reduceNumber, renderToken };

package/dist/lib/renderer/sourcemap/lib/encode.js

@@ -0,0 +1,37 @@
+// from https://github.com/Rich-Harris/vlq/tree/master
+// credit: Rich Harris
+const integer_to_char = {};
+let i = 0;
+for (const char of 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=') {
+    integer_to_char[i++] = char;
+}
+function encode(value) {
+    if (typeof value === 'number') {
+        return encode_integer(value);
+    }
+    let result = '';
+    for (let i = 0; i < value.length; i += 1) {
+        result += encode_integer(value[i]);
+    }
+    return result;
+}
+function encode_integer(num) {
+    let result = '';
+    if (num < 0) {
+        num = (-num << 1) | 1;
+    }
+    else {
+        num <<= 1;
+    }
+    do {
+        let clamped = num & 31;
+        num >>>= 5;
+        if (num > 0) {
+            clamped |= 32;
+        }
+        result += integer_to_char[clamped];
+    } while (num > 0);
+    return result;
+}
+
+export { encode };

package/dist/lib/renderer/sourcemap/sourcemap.js

@@ -0,0 +1,58 @@
+import { encode } from './lib/encode.js';
+
+class SourceMap {
+    #version = 3;
+    #sources = [];
+    #map = new Map;
+    #line = -1;
+    lastLocation = null;
+    add(source, original) {
+        if (original.src !== '') {
+            if (!this.#sources.includes(original.src)) {
+                this.#sources.push(original.src);
+            }
+            const line = source.sta.lin - 1;
+            let record;
+            if (line > this.#line) {
+                this.#line = line;
+            }
+            if (!this.#map.has(line)) {
+                record = [Math.max(0, source.sta.col - 1), this.#sources.indexOf(original.src), original.sta.lin - 1, original.sta.col - 1];
+                this.#map.set(line, [record]);
+            }
+            else {
+                const arr = this.#map.get(line);
+                record = [Math.max(0, source.sta.col - 1 - arr[0][0]), this.#sources.indexOf(original.src) - arr[0][1], original.sta.lin - 1, original.sta.col - 1];
+                arr.push(record);
+            }
+            if (this.lastLocation != null) {
+                record[2] -= this.lastLocation.sta.lin - 1;
+                record[3] -= this.lastLocation.sta.col - 1;
+            }
+            this.lastLocation = original;
+        }
+    }
+    toUrl() {
+        // /*# sourceMappingURL = ${url} */
+        return `data:application/json,${encodeURIComponent(JSON.stringify(this.toJSON()))}`;
+    }
+    toJSON() {
+        const mappings = [];
+        let i = 0;
+        for (; i <= this.#line; i++) {
+            if (!this.#map.has(i)) {
+                mappings.push('');
+            }
+            else {
+                mappings.push(this.#map.get(i).reduce((acc, curr) => acc + (acc === '' ? '' : ',') + encode(curr), ''));
+            }
+        }
+        return {
+            version: this.#version,
+            sources: this.#sources.slice(),
+            mappings: mappings.join(';')
+        };
+    }
+}
+
+export { SourceMap };

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

@@ -1,3 +1,8 @@
+import { EnumToken } from '../../ast/types.js';
+import '../../ast/minify.js';
+import '../../parser/parse.js';
+import '../sourcemap/lib/encode.js';
+
 // name to color
 const COLORS_NAMES = Object.seal({
     'aliceblue': '#f0f8ff',
@@ -310,18 +315,18 @@ function rgb2Hex(token) {
         // @ts-ignore
         t = token.chi[i];
         // @ts-ignore
-        value += Math.round(t.typ == 'Perc' ? 255 * t.val / 100 : t.val).toString(16).padStart(2, '0');
+        value += Math.round(t.typ == EnumToken.PercentageTokenType ? 255 * t.val / 100 : t.val).toString(16).padStart(2, '0');
     }
     // @ts-ignore
     if (token.chi.length == 7) {
         // @ts-ignore
         t = token.chi[6];
         // @ts-ignore
-        if ((t.typ == 'Number' && t.val < 1) ||
+        if ((t.typ == EnumToken.NumberTokenType && t.val < 1) ||
             // @ts-ignore
-            (t.typ == 'Perc' && t.val < 100)) {
+            (t.typ == EnumToken.PercentageTokenType && t.val < 100)) {
             // @ts-ignore
-            value += Math.round(255 * (t.typ == 'Perc' ? t.val / 100 : t.val)).toString(16).padStart(2, '0');
+            value += Math.round(255 * (t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val)).toString(16).padStart(2, '0');
         }
     }
     return value;
@@ -333,21 +338,21 @@ function hsl2Hex(token) {
     // @ts-ignore
     t = token.chi[2];
     // @ts-ignore
-    let s = t.typ == 'Perc' ? t.val / 100 : t.val;
+    let s = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
     // @ts-ignore
     t = token.chi[4];
     // @ts-ignore
-    let l = t.typ == 'Perc' ? t.val / 100 : t.val;
+    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 == 'Perc' && t.val < 100) ||
+        if ((t.typ == EnumToken.PercentageTokenType && t.val < 100) ||
             // @ts-ignore
-            (t.typ == 'Number' && t.val < 1)) {
+            (t.typ == EnumToken.NumberTokenType && t.val < 1)) {
             // @ts-ignore
-            a = (t.typ == 'Perc' ? t.val / 100 : t.val);
+            a = (t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val);
         }
     }
     return `#${hsl2rgb(h, s, l, a).reduce((acc, curr) => acc + curr.toString(16).padStart(2, '0'), '')}`;
@@ -359,21 +364,21 @@ function hwb2hex(token) {
     // @ts-ignore
     t = token.chi[2];
     // @ts-ignore
-    let white = t.typ == 'Perc' ? t.val / 100 : t.val;
+    let white = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
     // @ts-ignore
     t = token.chi[4];
     // @ts-ignore
-    let black = t.typ == 'Perc' ? t.val / 100 : t.val;
+    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 == 'Perc' && t.val < 100) ||
+        if ((t.typ == EnumToken.PercentageTokenType && t.val < 100) ||
             // @ts-ignore
-            (t.typ == 'Number' && t.val < 1)) {
+            (t.typ == EnumToken.NumberTokenType && t.val < 1)) {
             // @ts-ignore
-            a = (t.typ == 'Perc' ? t.val / 100 : t.val);
+            a = (t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val);
         }
     }
     const rgb = hsl2rgb(h, 1, .5, a);
@@ -390,19 +395,19 @@ function cmyk2hex(token) {
     // @ts-ignore
     let t = token.chi[0];
     // @ts-ignore
-    const c = t.typ == 'Perc' ? t.val / 100 : t.val;
+    const c = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
     // @ts-ignore
     t = token.chi[2];
     // @ts-ignore
-    const m = t.typ == 'Perc' ? t.val / 100 : t.val;
+    const m = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
     // @ts-ignore
     t = token.chi[4];
     // @ts-ignore
-    const y = t.typ == 'Perc' ? t.val / 100 : t.val;
+    const y = t.typ == EnumToken.PercentageTokenType ? t.val / 100 : t.val;
     // @ts-ignore
     t = token.chi[6];
     // @ts-ignore
-    const k = t.typ == 'Perc' ? t.val / 100 : t.val;
+    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))),
@@ -413,12 +418,12 @@ function cmyk2hex(token) {
         // @ts-ignore
         t = token.chi[8];
         // @ts-ignore
-        rgb.push(Math.round(255 * (t.typ == 'Perc' ? t.val / 100 : t.val)));
+        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'), '')}`;
 }
 function getAngle(token) {
-    if (token.typ == 'Angle') {
+    if (token.typ == EnumToken.AngleTokenType) {
         switch (token.unit) {
             case 'deg':
                 // @ts-ignore