@tbela99/css-parser 0.0.1-rc3 → 0.0.1-rc5

package/dist/index.d.ts

@@ -91,12 +91,14 @@ interface BlockEndToken {
 }
 interface AttrStartToken {
     typ: 'Attr-start';
+    chi?: Token[];
 }
 interface AttrEndToken {
     typ: 'Attr-end';
 }
 interface ParensStartToken {
     typ: 'Start-parens';
+    chi?: Token[];
 }
 interface ParensEndToken {
     typ: 'End-parens';
@@ -117,7 +119,7 @@ interface CDOCommentToken {
     val: string;
 }
 interface BadCDOCommentToken {
-    typ: 'BADCDO';
+    typ: 'Bad-cdo';
     val: string;
 }
 interface IncludesToken {
@@ -131,9 +133,15 @@ interface DashMatchToken {
 interface LessThanToken {
     typ: 'Lt';
 }
+interface LessThanOrEqualToken {
+    typ: 'Lte';
+}
 interface GreaterThanToken {
     typ: 'Gt';
 }
+interface GreaterThanOrEqualToken {
+    typ: 'Gte';
+}
 interface PseudoClassToken {
     typ: 'Pseudo-class';
     val: string;
@@ -171,7 +179,7 @@ interface AttrToken {
     typ: 'Attr';
     chi: Token[];
 }
-declare type Token = LiteralToken | IdentToken | CommaToken | ColonToken | SemiColonToken | NumberToken | AtRuleToken | PercentageToken | FunctionURLToken | FunctionToken | DimensionToken | LengthToken | AngleToken | StringToken | TimeToken | FrequencyToken | ResolutionToken | UnclosedStringToken | HashToken | BadStringToken | BlockStartToken | BlockEndToken | AttrStartToken | AttrEndToken | ParensStartToken | ParensEndToken | CDOCommentToken | BadCDOCommentToken | CommentToken | BadCommentToken | WhitespaceToken | IncludesToken | DashMatchToken | LessThanToken | GreaterThanToken | PseudoClassToken | PseudoClassFunctionToken | DelimToken | BadUrlToken | UrlToken | ImportantToken | ColorToken | AttrToken | EOFToken;
+declare type Token = LiteralToken | IdentToken | CommaToken | ColonToken | SemiColonToken | NumberToken | AtRuleToken | PercentageToken | FunctionURLToken | FunctionToken | DimensionToken | LengthToken | AngleToken | StringToken | TimeToken | FrequencyToken | ResolutionToken | UnclosedStringToken | HashToken | BadStringToken | BlockStartToken | BlockEndToken | AttrStartToken | AttrEndToken | ParensStartToken | ParensEndToken | CDOCommentToken | BadCDOCommentToken | CommentToken | BadCommentToken | WhitespaceToken | IncludesToken | DashMatchToken | LessThanToken | LessThanOrEqualToken | GreaterThanToken | GreaterThanOrEqualToken | PseudoClassToken | PseudoClassFunctionToken | DelimToken | BadUrlToken | UrlToken | ImportantToken | ColorToken | AttrToken | EOFToken;
 
 interface PropertyMapType {
     default: string[];
@@ -634,6 +642,7 @@ declare function isResolution(dimension: DimensionToken): boolean;
 declare function isAngle(dimension: DimensionToken): boolean;
 declare function isTime(dimension: DimensionToken): boolean;
 declare function isFrequency(dimension: DimensionToken): boolean;
+declare function isColor(token: Token): boolean;
 declare function isIdentStart(codepoint: number): boolean;
 declare function isDigit(codepoint: number): boolean;
 declare function isIdentCodepoint(codepoint: number): boolean;
@@ -653,10 +662,12 @@ declare function isWhiteSpace(codepoint: number): boolean;
 
 declare const getConfig: () => PropertiesConfig;
 
+declare const funcList: string[];
 declare function matchType(val: Token, properties: PropertyMapType): boolean;
 
+declare const colorsFunc: string[];
 declare function render(data: AstNode, opt?: RenderOptions): RenderResult;
-declare function renderToken(token: Token, options?: RenderOptions): string;
+declare function renderToken(token: Token, options?: RenderOptions, reducer?: (acc: string, curr: Token) => string): string;
 
 declare const combinators: string[];
 declare function minify(ast: AstNode, options?: ParserOptions, recursive?: boolean): AstNode;
@@ -687,4 +698,4 @@ declare function resolve(url: string, currentDirectory: string, cwd?: string): {
 declare function parse(iterator: string, opt?: ParserOptions): Promise<ParseResult>;
 declare function transform(css: string, options?: TransformOptions): Promise<TransformResult>;
 
-export { combinators, dirname, getConfig, hasDeclaration, isAngle, isAtKeyword, isDigit, isDimension, isFrequency, isFunction, isHash, isHexColor, isHexDigit, isIdent, isIdentCodepoint, isIdentStart, isLength, isNewLine, isNumber, isPercentage, isPseudo, isResolution, isTime, isWhiteSpace, load, matchType, matchUrl, minify, minifyRule, parse, parseDimension, parseString, reduceSelector, render, renderToken, resolve, tokenize, transform, urlTokenMatcher, walk };
+export { colorsFunc, combinators, dirname, funcList, getConfig, hasDeclaration, isAngle, isAtKeyword, isColor, isDigit, isDimension, isFrequency, isFunction, isHash, isHexColor, isHexDigit, isIdent, isIdentCodepoint, isIdentStart, isLength, isNewLine, isNumber, isPercentage, isPseudo, isResolution, isTime, isWhiteSpace, load, matchType, matchUrl, minify, minifyRule, parse, parseDimension, parseString, reduceSelector, render, renderToken, resolve, tokenize, transform, urlTokenMatcher, walk };

package/dist/lib/ast/minify.js

@@ -344,6 +344,17 @@ function minify(ast, options = {}, recursive = false) {
                     continue;
                     // }
                 }
+                // @ts-ignore
+                if (hasDeclaration(node)) {
+                    // @ts-ignore
+                    minifyRule(node);
+                }
+                else {
+                    minify(node, options, recursive);
+                }
+                previous = node;
+                nodeIndex = i;
+                continue;
             }
             // @ts-ignore
             if (node.typ == 'Rule') {

package/dist/lib/parser/declaration/list.js

@@ -1,4 +1,5 @@
 import { PropertySet } from './set.js';
+import '../../renderer/utils/color.js';
 import { getConfig } from '../utils/config.js';
 import { PropertyMap } from './map.js';
 import { parseString } from '../parse.js';

package/dist/lib/parser/declaration/map.js

@@ -1,7 +1,8 @@
 import { eq } from '../utils/eq.js';
+import { renderToken } from '../../renderer/render.js';
+import '../../renderer/utils/color.js';
 import { getConfig } from '../utils/config.js';
 import { matchType } from '../utils/type.js';
-import { renderToken } from '../../renderer/render.js';
 import { parseString } from '../parse.js';
 import { PropertySet } from './set.js';
 
@@ -55,6 +56,7 @@ class PropertyMap {
                                 i--;
                                 continue;
                             }
+                            // @ts-ignore
                             if (('propertyName' in acc[i] && acc[i].propertyName == property) || matchType(acc[i], props)) {
                                 if ('prefix' in props && props.previous != null && !(props.previous in tokens)) {
                                     return acc;
@@ -220,17 +222,18 @@ class PropertyMap {
                         if (props.multiple && props.separator != null && props.separator.typ == val.typ && eq(props.separator, val)) {
                             continue;
                         }
-                        match = matchType(val, curr[1]);
+                        // @ts-ignore
+                        match = val.typ == 'Comment' || matchType(val, curr[1]);
                         if (isShorthand) {
                             isShorthand = match;
                         }
+                        // @ts-ignore
                         if (('propertyName' in val && val.propertyName == property) || match) {
                             if (!(curr[0] in tokens)) {
                                 tokens[curr[0]] = [[]];
                             }
                             // is default value
                             tokens[curr[0]][current].push(val);
-                            // continue;
                         }
                         else {
                             acc.push(curr[0]);
@@ -247,7 +250,9 @@ class PropertyMap {
             if (!isShorthand || Object.entries(this.config.properties).some(entry => {
                 // missing required property
                 return entry[1].required && !(entry[0] in tokens);
-            }) || !Object.values(tokens).every(v => v.length == count)) {
+            }) ||
+                // @ts-ignore
+                !Object.values(tokens).every(v => v.filter(t => t.typ != 'Comment').length == count)) {
                 // @ts-ignore
                 iterable = this.declarations.values();
             }

package/dist/lib/parser/parse.js

@@ -1,10 +1,11 @@
-import { isPseudo, isAtKeyword, isFunction, isNumber, isDimension, parseDimension, isPercentage, isIdent, isHexColor, isHash, isIdentStart } from './utils/syntax.js';
+import { isPseudo, isAtKeyword, isFunction, isNumber, isDimension, parseDimension, isPercentage, isIdent, isHexColor, isHash, isIdentStart, isColor } from './utils/syntax.js';
 import { renderToken } from '../renderer/render.js';
 import { COLORS_NAMES } from '../renderer/utils/color.js';
 import { minify, combinators } from '../ast/minify.js';
 import { tokenize } from './tokenize.js';
 
 const urlTokenMatcher = /^(["']?)[a-zA-Z0-9_/.-][a-zA-Z0-9_/:.#?-]+(\1)$/;
+const trimWhiteSpace = ['Gt', 'Gte', 'Lt', 'Lte'];
 const funcLike = ['Start-parens', 'Func', 'UrlFunc', 'Pseudo-class-func'];
 /**
  *
@@ -169,7 +170,7 @@ async function parse(iterator, opt = {}) {
             // https://www.w3.org/TR/css-nesting-1/#conditionals
             // allowed nesting at-rules
             // there must be a top level rule in the stack
-            const raw = tokens.reduce((acc, curr) => {
+            const raw = parseTokens(tokens, { minify: options.minify }).reduce((acc, curr) => {
                 acc.push(renderToken(curr, { removeComments: true }));
                 return acc;
             }, []);
@@ -200,8 +201,8 @@ async function parse(iterator, opt = {}) {
                 const uniq = new Map;
                 parseTokens(tokens, { minify: options.minify }).reduce((acc, curr, index, array) => {
                     if (curr.typ == 'Whitespace') {
-                        if (array[index - 1]?.typ == 'Gt' ||
-                            array[index + 1]?.typ == 'Gt' ||
+                        if (trimWhiteSpace.includes(array[index - 1]?.typ) ||
+                            trimWhiteSpace.includes(array[index + 1]?.typ) ||
                             combinators.includes(array[index - 1]?.val) ||
                             combinators.includes(array[index + 1]?.val)) {
                             return acc;
@@ -327,6 +328,11 @@ async function parse(iterator, opt = {}) {
         if (item == null) {
             break;
         }
+        // console.debug({item});
+        if (item.hint != null && item.hint.startsWith('Bad-')) {
+            // bad token
+            continue;
+        }
         tokens.push(item);
         bytesIn = item.bytesIn;
         if (item.token == ';' || item.token == '{') {
@@ -405,7 +411,7 @@ function getTokenType(val, hint) {
         return ([
             'Whitespace', 'Semi-colon', 'Colon', 'Block-start',
             'Block-start', 'Attr-start', 'Attr-end', 'Start-parens', 'End-parens',
-            'Comma', 'Gt', 'Lt'
+            'Comma', 'Gt', 'Lt', 'Gte', 'Lte', 'EOF'
         ].includes(hint) ? { typ: hint } : { typ: hint, val });
     }
     if (val == ' ') {
@@ -533,11 +539,12 @@ function parseTokens(tokens, options = {}) {
         const t = tokens[i];
         if (t.typ == 'Whitespace' && ((i == 0 ||
             i + 1 == tokens.length ||
-            ['Comma'].includes(tokens[i + 1].typ) ||
+            ['Comma', 'Gte', 'Lte'].includes(tokens[i + 1].typ)) ||
             (i > 0 &&
-                tokens[i + 1]?.typ != 'Literal' &&
-                funcLike.includes(tokens[i - 1].typ) &&
-                !['var', 'calc'].includes(tokens[i - 1].val))))) {
+                // tokens[i + 1]?.typ != 'Literal' ||
+                // funcLike.includes(tokens[i - 1].typ) &&
+                // !['var', 'calc'].includes((<FunctionToken>tokens[i - 1]).val)))) &&
+                trimWhiteSpace.includes(tokens[i - 1].typ)))) {
             tokens.splice(i--, 1);
             continue;
         }
@@ -635,41 +642,33 @@ function parseTokens(tokens, options = {}) {
                 // @ts-ignore
                 t.chi.pop();
             }
-            let isColor = true;
             // @ts-ignore
-            if (options.parseColor && ['rgb', 'rgba', 'hsl', 'hsla', 'hwb', 'device-cmyk'].includes(t.val)) {
+            if (options.parseColor && t.typ == 'Func' && isColor(t)) {
+                // if (isColor) {
                 // @ts-ignore
-                for (const v of t.chi) {
-                    if (v.typ == 'Func' && v.val == 'var') {
-                        isColor = false;
-                        break;
-                    }
-                }
-                if (isColor) {
-                    // @ts-ignore
-                    t.typ = 'Color';
-                    // @ts-ignore
-                    t.kin = t.val;
+                t.typ = 'Color';
+                // @ts-ignore
+                t.kin = t.val;
+                // @ts-ignore
+                let m = t.chi.length;
+                while (m-- > 0) {
                     // @ts-ignore
-                    let m = t.chi.length;
-                    while (m-- > 0) {
+                    if (['Literal'].concat(trimWhiteSpace).includes(t.chi[m].typ)) {
                         // @ts-ignore
-                        if (t.chi[m].typ == 'Literal') {
+                        if (t.chi[m + 1]?.typ == 'Whitespace') {
                             // @ts-ignore
-                            if (t.chi[m + 1]?.typ == 'Whitespace') {
-                                // @ts-ignore
-                                t.chi.splice(m + 1, 1);
-                            }
+                            t.chi.splice(m + 1, 1);
+                        }
+                        // @ts-ignore
+                        if (t.chi[m - 1]?.typ == 'Whitespace') {
                             // @ts-ignore
-                            if (t.chi[m - 1]?.typ == 'Whitespace') {
-                                // @ts-ignore
-                                t.chi.splice(m - 1, 1);
-                                m--;
-                            }
+                            t.chi.splice(m - 1, 1);
+                            m--;
                         }
                     }
-                    continue;
                 }
+                continue;
+                // }
             }
             if (t.typ == 'UrlFunc') {
                 // @ts-ignore
@@ -694,7 +693,7 @@ function parseTokens(tokens, options = {}) {
             // @ts-ignore
             if (t.chi.length > 0) {
                 // @ts-ignore
-                parseTokens(t.chi, t.typ);
+                parseTokens(t.chi, options);
                 if (t.typ == 'Pseudo-class-func' && t.val == ':is' && options.minify) {
                     //
                     const count = t.chi.filter(t => t.typ != 'Comment').length;
@@ -713,7 +712,7 @@ function parseTokens(tokens, options = {}) {
             if (t.typ == 'Iden') {
                 // named color
                 const value = t.val.toLowerCase();
-                if (COLORS_NAMES[value] != null) {
+                if (value in COLORS_NAMES) {
                     Object.assign(t, {
                         typ: 'Color',
                         val: COLORS_NAMES[value].length < value.length ? COLORS_NAMES[value] : value,

package/dist/lib/parser/tokenize.js

@@ -36,11 +36,6 @@ function* tokenize(iterator) {
         }
         buffer += quoteStr;
         while (value = peek()) {
-            // if (ind >= iterator.length) {
-            //
-            //     yield pushToken(buffer, hasNewLine ? 'Bad-string' : 'Unclosed-string');
-            //     break;
-            // }
             if (value == '\\') {
                 const sequence = peek(6);
                 let escapeSequence = '';
@@ -60,9 +55,23 @@ function* tokenize(iterator) {
                     }
                     break;
                 }
+                // @ts-ignore
+                if (isNewLine(codepoint)) {
+                    if (i == 1) {
+                        buffer += value + escapeSequence.slice(0, i);
+                        next(i + 1);
+                        continue;
+                    }
+                    // else {
+                    yield pushToken(buffer + value + escapeSequence.slice(0, i), 'Bad-string');
+                    buffer = '';
+                    // }
+                    next(i + 1);
+                    break;
+                }
                 // not hex or new line
                 // @ts-ignore
-                if (i == 1 && !isNewLine(codepoint)) {
+                else if (i == 1) {
                     buffer += value + sequence[i];
                     next(2);
                     continue;
@@ -82,13 +91,6 @@ function* tokenize(iterator) {
                     next(escapeSequence.length + 1);
                     continue;
                 }
-                // buffer += value;
-                // if (ind >= iterator.length) {
-                //
-                //     // drop '\\' at the end
-                //     yield pushToken(buffer);
-                //     break;
-                // }
                 buffer += next(2);
                 continue;
             }
@@ -98,20 +100,28 @@ function* tokenize(iterator) {
                 next();
                 // i += value.length;
                 buffer = '';
-                break;
+                return;
             }
             if (isNewLine(value.charCodeAt(0))) {
                 hasNewLine = true;
             }
             if (hasNewLine && value == ';') {
-                yield pushToken(buffer, 'Bad-string');
+                yield pushToken(buffer + value, 'Bad-string');
                 buffer = '';
+                next();
                 break;
             }
             buffer += value;
-            // i += value.length;
             next();
         }
+        if (hasNewLine) {
+            yield pushToken(buffer, 'Bad-string');
+        }
+        else {
+            // EOF - 'Unclosed-string' fixed
+            yield pushToken(buffer + quote, 'String');
+        }
+        buffer = '';
     }
     function peek(count = 1) {
         if (count == 1) {
@@ -144,31 +154,18 @@ function* tokenize(iterator) {
         return char;
     }
     while (value = next()) {
-        if (ind >= iterator.length) {
-            if (buffer.length > 0) {
-                yield pushToken(buffer);
-                buffer = '';
-            }
-            break;
-        }
         if (isWhiteSpace(value.charCodeAt(0))) {
             if (buffer.length > 0) {
                 yield pushToken(buffer);
                 buffer = '';
             }
             while (value = next()) {
-                if (ind >= iterator.length) {
-                    break;
-                }
                 if (!isWhiteSpace(value.charCodeAt(0))) {
                     break;
                 }
             }
             yield pushToken('', 'Whitespace');
             buffer = '';
-            if (ind >= iterator.length) {
-                break;
-            }
         }
         switch (value) {
             case '/':
@@ -182,34 +179,12 @@ function* tokenize(iterator) {
                 }
                 buffer += value;
                 if (peek() == '*') {
-                    buffer += '*';
-                    // i++;
-                    next();
+                    buffer += next();
                     while (value = next()) {
-                        if (ind >= iterator.length) {
-                            yield pushToken(buffer, 'Bad-comment');
-                            break;
-                        }
-                        if (value == '\\') {
-                            buffer += value;
-                            value = next();
-                            if (ind >= iterator.length) {
-                                yield pushToken(buffer, 'Bad-comment');
-                                break;
-                            }
-                            buffer += value;
-                            continue;
-                        }
                         if (value == '*') {
                             buffer += value;
-                            value = next();
-                            if (ind >= iterator.length) {
-                                yield pushToken(buffer, 'Bad-comment');
-                                break;
-                            }
-                            buffer += value;
-                            if (value == '/') {
-                                yield pushToken(buffer, 'Comment');
+                            if (peek() == '/') {
+                                yield pushToken(buffer + next(), 'Comment');
                                 buffer = '';
                                 break;
                             }
@@ -218,6 +193,8 @@ function* tokenize(iterator) {
                             buffer += value;
                         }
                     }
+                    yield pushToken(buffer, 'Bad-comment');
+                    buffer = '';
                 }
                 break;
             case '<':
@@ -225,16 +202,15 @@ function* tokenize(iterator) {
                     yield pushToken(buffer);
                     buffer = '';
                 }
-                buffer += value;
-                value = next();
-                if (ind >= iterator.length) {
+                if (peek() == '=') {
+                    yield pushToken('', 'Lte');
+                    next();
                     break;
                 }
+                buffer += value;
                 if (peek(3) == '!--') {
+                    buffer += next(3);
                     while (value = next()) {
-                        if (ind >= iterator.length) {
-                            break;
-                        }
                         buffer += value;
                         if (value == '>' && prev(2) == '--') {
                             yield pushToken(buffer, 'CDOCOMM');
@@ -243,15 +219,14 @@ function* tokenize(iterator) {
                         }
                     }
                 }
-                if (ind >= iterator.length) {
-                    yield pushToken(buffer, 'BADCDO');
-                    buffer = '';
-                }
+                // if (!peek()) {
+                yield pushToken(buffer, 'Bad-cdo');
+                buffer = '';
+                // }
                 break;
             case '\\':
-                value = next();
                 // EOF
-                if (ind + 1 >= iterator.length) {
+                if (!(value = next())) {
                     // end of stream ignore \\
                     yield pushToken(buffer);
                     buffer = '';
@@ -270,8 +245,7 @@ function* tokenize(iterator) {
                     buffer = '';
                 }
                 buffer += value;
-                value = next();
-                if (ind >= iterator.length) {
+                if (!(value = next())) {
                     yield pushToken(buffer);
                     buffer = '';
                     break;
@@ -293,7 +267,13 @@ function* tokenize(iterator) {
                     yield pushToken(buffer);
                     buffer = '';
                 }
-                yield pushToken('', 'Gt');
+                if (peek() == '=') {
+                    yield pushToken('', 'Gte');
+                    next();
+                }
+                else {
+                    yield pushToken('', 'Gt');
+                }
                 consumeWhiteSpace();
                 break;
             case '.':
@@ -335,7 +315,7 @@ function* tokenize(iterator) {
                 break;
             case '(':
                 if (buffer.length == 0) {
-                    yield pushToken('', 'Start-parens');
+                    yield pushToken(value);
                     break;
                 }
                 buffer += value;
@@ -432,8 +412,7 @@ function* tokenize(iterator) {
                     yield pushToken(buffer);
                     buffer = '';
                 }
-                const important = peek(9);
-                if (important == 'important') {
+                if (peek(9) == 'important') {
                     yield pushToken('', 'Important');
                     next(9);
                     buffer = '';
@@ -449,6 +428,7 @@ function* tokenize(iterator) {
     if (buffer.length > 0) {
         yield pushToken(buffer);
     }
+    // yield pushToken('', 'EOF');
 }
 
 export { tokenize };

package/dist/lib/parser/utils/syntax.js

@@ -1,3 +1,6 @@
+import { colorsFunc } from '../../renderer/render.js';
+import { COLORS_NAMES } from '../../renderer/utils/color.js';
+
 // https://www.w3.org/TR/CSS21/syndata.html#syntax
 // https://www.w3.org/TR/2021/CRD-css-syntax-3-20211224/#typedef-ident-token
 // '\\'
@@ -23,6 +26,25 @@ function isTime(dimension) {
 function isFrequency(dimension) {
     return 'unit' in dimension && ['hz', 'khz'].includes(dimension.unit.toLowerCase());
 }
+function isColor(token) {
+    if (token.typ == 'Color') {
+        return true;
+    }
+    if (token.typ == 'Iden') {
+        // named color
+        return token.val.toLowerCase() in COLORS_NAMES;
+    }
+    if (token.typ == 'Func' && token.chi.length > 0 && colorsFunc.includes(token.val)) {
+        // @ts-ignore
+        for (const v of token.chi) {
+            if (!['Number', 'Perc', 'Comma', 'Whitespace'].includes(v.typ)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    return false;
+}
 function isLetter(codepoint) {
     // lowercase
     return (codepoint >= 0x61 && codepoint <= 0x7a) ||
@@ -75,19 +97,12 @@ function isIdent(name) {
     return true;
 }
 function isPseudo(name) {
-    if (name.charAt(0) != ':') {
-        return false;
-    }
-    if (name.endsWith('(')) {
-        return isIdent(name.charAt(1) == ':' ? name.slice(2, -1) : name.slice(1, -1));
-    }
-    return isIdent(name.charAt(1) == ':' ? name.slice(2) : name.slice(1));
+    return name.charAt(0) == ':' &&
+        ((name.endsWith('(') && isIdent(name.charAt(1) == ':' ? name.slice(2, -1) : name.slice(1, -1))) ||
+            isIdent(name.charAt(1) == ':' ? name.slice(2) : name.slice(1)));
 }
 function isHash(name) {
-    if (name.charAt(0) != '#') {
-        return false;
-    }
-    return isIdent(name.charAt(1));
+    return name.charAt(0) == '#' && isIdent(name.charAt(1));
 }
 function isNumber(name) {
     if (name.length == 0) {
@@ -159,37 +174,30 @@ function isNumber(name) {
     return true;
 }
 function isDimension(name) {
-    let index = 0;
-    while (index++ < name.length) {
-        if (isDigit(name.charCodeAt(name.length - index))) {
-            index--;
-            break;
-        }
-        if (index == 3) {
-            break;
+    let index = name.length;
+    while (index--) {
+        if (isLetter(name.charCodeAt(index))) {
+            continue;
         }
+        index++;
+        break;
     }
-    if (index == 0 || index > 3) {
-        return false;
-    }
-    const number = name.slice(0, -index);
-    return number.length > 0 && isIdentStart(name.charCodeAt(name.length - index)) && isNumber(number);
+    const number = name.slice(0, index);
+    return number.length > 0 && isIdentStart(name.charCodeAt(index)) && isNumber(number);
 }
 function isPercentage(name) {
     return name.endsWith('%') && isNumber(name.slice(0, -1));
 }
 function parseDimension(name) {
-    let index = 0;
-    while (index++ < name.length) {
-        if (isDigit(name.charCodeAt(name.length - index))) {
-            index--;
-            break;
-        }
-        if (index == 3) {
-            break;
+    let index = name.length;
+    while (index--) {
+        if (isLetter(name.charCodeAt(index))) {
+            continue;
         }
+        index++;
+        break;
     }
-    const dimension = { typ: 'Dimension', val: name.slice(0, -index), unit: name.slice(-index) };
+    const dimension = { typ: 'Dimension', val: name.slice(0, index), unit: name.slice(index) };
     if (isAngle(dimension)) {
         // @ts-ignore
         dimension.typ = 'Angle';
@@ -263,4 +271,4 @@ function isWhiteSpace(codepoint) {
         codepoint == 0xa || codepoint == 0xc || codepoint == 0xd;
 }
 
-export { isAngle, isAtKeyword, isDigit, isDimension, isFrequency, isFunction, isHash, isHexColor, isHexDigit, isIdent, isIdentCodepoint, isIdentStart, isLength, isNewLine, isNumber, isPercentage, isPseudo, isResolution, isTime, isWhiteSpace, parseDimension };
+export { isAngle, isAtKeyword, isColor, isDigit, isDimension, isFrequency, isFunction, isHash, isHexColor, isHexDigit, isIdent, isIdentCodepoint, isIdentStart, isLength, isNewLine, isNumber, isPercentage, isPseudo, isResolution, isTime, isWhiteSpace, parseDimension };