@tbela99/css-parser 1.2.0 → 1.3.0

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

@@ -74,12 +74,12 @@ function color2RgbToken(token) {
 }
 function rgb2RgbToken(values) {
     const chi = [
-        { typ: EnumToken.NumberTokenType, val: String(values[0]) },
-        { typ: EnumToken.NumberTokenType, val: String(values[1]) },
-        { typ: EnumToken.NumberTokenType, val: String(values[2]) },
+        { typ: EnumToken.NumberTokenType, val: values[0] },
+        { typ: EnumToken.NumberTokenType, val: values[1] },
+        { typ: EnumToken.NumberTokenType, val: values[2] },
     ];
     if (values.length == 4) {
-        chi.push({ typ: EnumToken.PercentageTokenType, val: (values[3] * 100).toFixed() });
+        chi.push({ typ: EnumToken.PercentageTokenType, val: values[3] * 100 });
     }
     return {
         typ: EnumToken.ColorTokenType,

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

@@ -1,6 +1,6 @@
 import { ColorType, EnumToken } from '../../../ast/types.js';
 import '../../../ast/minify.js';
-import '../../../ast/walk.js';
+import { walkValues } from '../../../ast/walk.js';
 import '../../../parser/parse.js';
 import '../../../parser/tokenize.js';
 import '../../../parser/utils/config.js';
@@ -13,7 +13,7 @@ function getComponents(token) {
         const value = expandHexValue(token.kin == ColorType.LIT ? COLORS_NAMES[token.val.toLowerCase()] : token.val);
         // @ts-ignore
         return value.slice(1).match(/([a-fA-F0-9]{2})/g).map((t, index) => {
-            return { typ: EnumToken.Number, val: (index < 3 ? parseInt(t, 16) : parseInt(t, 16) / 255).toString() };
+            return { typ: EnumToken.Number, val: index < 3 ? parseInt(t, 16) : parseInt(t, 16) / 255 };
         });
     }
     const result = [];
@@ -23,7 +23,19 @@ function getComponents(token) {
         ].includes(child.typ)) {
             continue;
         }
-        if (child.typ == EnumToken.ColorTokenType && child.val.localeCompare('currentcolor', undefined, { sensitivity: 'base' }) == 0) {
+        if (child.typ == EnumToken.FunctionTokenType) {
+            if ('var' == child.val.toLowerCase()) {
+                return null;
+            }
+            else {
+                for (const { value } of walkValues(child.chi)) {
+                    if (value.typ == EnumToken.FunctionTokenType && 'var' === value.val.toLowerCase()) {
+                        return null;
+                    }
+                }
+            }
+        }
+        if (child.typ == EnumToken.ColorTokenType && 'currentcolor' === child.val.toLowerCase()) {
             return null;
         }
         result.push(child);

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

@@ -9,13 +9,23 @@ import '../../../parser/utils/config.js';
 import './constants.js';
 import '../../../renderer/sourcemap/lib/encode.js';
 
+/**
+ * Calculate the distance between two okLab colors.
+ * @param okLab1
+ * @param okLab2
+ */
 function okLabDistance(okLab1, okLab2) {
     return Math.sqrt(Math.pow(okLab1[0] - okLab2[0], 2) + Math.pow(okLab1[1] - okLab2[1], 2) + Math.pow(okLab1[2] - okLab2[2], 2));
 }
+/**
+ * Check if two colors are close.
+ * @param color1
+ * @param color2
+ * @param threshold
+ */
 function isOkLabClose(color1, color2, threshold = .01) {
     color1 = convertColor(color1, ColorType.OKLAB);
     color2 = convertColor(color2, ColorType.OKLAB);
-    // console.error(JSON.stringify({color1, color2}, null, 1));
     if (color1 == null || color2 == null) {
         return false;
     }

package/dist/lib/syntax/syntax.js

@@ -499,18 +499,18 @@ function isPolarColorspace(token) {
 }
 function isHueInterpolationMethod(token) {
     if (!Array.isArray(token)) {
-        return token.typ == EnumToken.IdenTokenType && 'hue'.localeCompare(token.val, undefined, { sensitivity: 'base' }) == 0;
+        return token.typ == EnumToken.IdenTokenType && 'hue' === token.val?.toLowerCase?.();
     }
     if (token.length != 2 || token[0].typ != EnumToken.IdenTokenType || token[1].typ != EnumToken.IdenTokenType) {
         return false;
     }
-    return ['shorter', 'longer', 'increasing', 'decreasing'].includes(token[0].val) && 'hue'.localeCompare(token[1].val, undefined, { sensitivity: 'base' }) == 0;
+    return ['shorter', 'longer', 'increasing', 'decreasing'].includes(token[0].val?.toLowerCase?.()) && 'hue' === token[1].val?.toLowerCase?.();
 }
 function isIdentColor(token) {
     return token.typ == EnumToken.ColorTokenType && [ColorType.SYS, ColorType.DPSYS, ColorType.LIT].includes(token.kin) && isIdent(token.val);
 }
 function isPercentageToken(token) {
-    return token.typ == EnumToken.PercentageTokenType || (token.typ == EnumToken.NumberTokenType && token.val == '0');
+    return token.typ == EnumToken.PercentageTokenType || (token.typ == EnumToken.NumberTokenType && token.val == 0);
 }
 function isColor(token) {
     if (token.typ == EnumToken.ColorTokenType) {
@@ -621,7 +621,7 @@ function isColor(token) {
                 if (children.length == 3) {
                     if (children[0].length > 4 ||
                         children[0][0].typ != EnumToken.IdenTokenType ||
-                        'in'.localeCompare(children[0][0].val, undefined, { sensitivity: 'base' }) != 0 ||
+                        'in' !== children[0][0].val?.toLowerCase?.() ||
                         !isColorspace(children[0][1]) ||
                         (children[0].length >= 3 && !isHueInterpolationMethod(children[0].slice(2))) ||
                         children[1].length > 2 ||
@@ -633,12 +633,12 @@ function isColor(token) {
                         return false;
                     }
                     if (children[1].length == 2) {
-                        if (!(children[1][1].typ == EnumToken.PercentageTokenType || (children[1][1].typ == EnumToken.NumberTokenType && children[1][1].val == '0'))) {
+                        if (!(children[1][1].typ == EnumToken.PercentageTokenType || (children[1][1].typ == EnumToken.NumberTokenType && children[1][1].val == 0))) {
                             return false;
                         }
                     }
                     if (children[2].length == 2) {
-                        if (!(children[2][1].typ == EnumToken.PercentageTokenType || (children[2][1].typ == EnumToken.NumberTokenType && children[2][1].val == '0'))) {
+                        if (!(children[2][1].typ == EnumToken.PercentageTokenType || (children[2][1].typ == EnumToken.NumberTokenType && children[2][1].val == 0))) {
                             return false;
                         }
                     }
@@ -782,15 +782,6 @@ function isIdent(name) {
     }
     return true;
 }
-function isNonPrintable(codepoint) {
-    // null -> backspace
-    return (codepoint >= 0 && codepoint <= 0x8) ||
-        // tab
-        codepoint == 0xb ||
-        // delete
-        codepoint == 0x7f ||
-        (codepoint >= 0xe && codepoint <= 0x1f);
-}
 function isPseudo(name) {
     return name.charAt(0) == ':' &&
         ((name.endsWith('(') && isIdent(name.charAt(1) == ':' ? name.slice(2, -1) : name.slice(1, -1))) ||
@@ -897,7 +888,7 @@ function parseDimension(name) {
     }
     const dimension = {
         typ: EnumToken.DimensionTokenType,
-        val: name.slice(0, index),
+        val: +name.slice(0, index),
         unit: name.slice(index)
     };
     if (isAngle(dimension)) {
@@ -957,4 +948,4 @@ function isWhiteSpace(codepoint) {
         codepoint == 0xa || codepoint == 0xc || codepoint == 0xd;
 }
 
-export { colorFontTech, fontFeaturesTech, fontFormat, isAngle, isAtKeyword, isColor, isColorspace, isDigit, isDimension, isFlex, isFrequency, isFunction, isHash, isHexColor, isHueInterpolationMethod, isIdent, isIdentCodepoint, isIdentColor, isIdentStart, isLength, isNewLine, isNonPrintable, isNumber, isPercentage, isPercentageToken, isPolarColorspace, isPseudo, isRectangularOrthogonalColorspace, isResolution, isTime, isWhiteSpace, mathFuncs, mediaTypes, mozExtensions, parseColor, parseDimension, pseudoAliasMap, pseudoElements, transformFunctions, webkitExtensions, wildCardFuncs };
+export { colorFontTech, fontFeaturesTech, fontFormat, isAngle, isAtKeyword, isColor, isColorspace, isDigit, isDimension, isFlex, isFrequency, isFunction, isHash, isHexColor, isHueInterpolationMethod, isIdent, isIdentCodepoint, isIdentColor, isIdentStart, isLength, isNewLine, isNumber, isPercentage, isPercentageToken, isPolarColorspace, isPseudo, isRectangularOrthogonalColorspace, isResolution, isTime, isWhiteSpace, mathFuncs, mediaTypes, mozExtensions, parseColor, parseDimension, pseudoAliasMap, pseudoElements, transformFunctions, webkitExtensions, wildCardFuncs };

package/dist/lib/syntax/utils.js

@@ -50,7 +50,7 @@ function length2Px(value) {
  * @param val
  */
 function minifyNumber(val) {
-    val = String(+val);
+    val = String(val);
     if (val === '0') {
         return '0';
     }

package/dist/lib/validation/at-rules/document.js

@@ -45,7 +45,7 @@ function validateAtRuleDocument(atRule, options, root) {
             };
         }
         // @ts-ignore
-        if ((t[0].typ != EnumToken.FunctionTokenType && t[0].typ != EnumToken.UrlFunctionTokenType) || !['url', 'url-prefix', 'domain', 'media-document', 'regexp'].some((f) => f.localeCompare(t[0].val, undefined, { sensitivity: 'base' }) == 0)) {
+        if ((t[0].typ != EnumToken.FunctionTokenType && t[0].typ != EnumToken.UrlFunctionTokenType) || !['url', 'url-prefix', 'domain', 'media-document', 'regexp'].includes(t[0].val?.toLowerCase?.())) {
             return {
                 valid: SyntaxValidationResult.Drop,
                 context: [],

package/dist/lib/validation/at-rules/import.js

@@ -94,8 +94,7 @@ function validateAtRuleImport(atRule, options, root) {
     if (tokens.length > 0) {
         // @ts-ignore
         if (tokens[0].typ == EnumToken.IdenTokenType) {
-            // @ts-ignore
-            if ('layer'.localeCompare(tokens[0].val, undefined, { sensitivity: 'base' }) == 0) {
+            if ('layer' === tokens[0].val.toLowerCase()) {
                 tokens.shift();
                 // @ts-ignore
                 if (!consumeWhitespace(tokens)) {
@@ -113,7 +112,7 @@ function validateAtRuleImport(atRule, options, root) {
         // @ts-ignore
         else if (tokens[0].typ == EnumToken.FunctionTokenType) {
             // @ts-ignore
-            if ('layer'.localeCompare(tokens[0].val, undefined, { sensitivity: 'base' }) == 0) {
+            if ('layer' === tokens[0].val.toLowerCase()) {
                 const result = validateLayerName(tokens[0].chi);
                 if (result.valid == SyntaxValidationResult.Drop) {
                     return result;
@@ -122,8 +121,9 @@ function validateAtRuleImport(atRule, options, root) {
                 // @ts-ignore
                 consumeWhitespace(tokens);
             }
+            // tokens[0]?.val
             // @ts-ignore
-            if ('supports'.localeCompare(tokens[0]?.val, undefined, { sensitivity: 'base' }) == 0) {
+            if ('supports' === tokens[0]?.val?.toLowerCase?.()) {
                 const result = validateAtRuleSupportsConditions(atRule, tokens[0].chi);
                 if (result.valid == SyntaxValidationResult.Drop) {
                     return result;

package/dist/lib/validation/at-rules/keyframes.js

@@ -21,17 +21,6 @@ function validateAtRuleKeyframes(atRule, options, root) {
     }
     const tokens = atRule.tokens.filter((t) => t.typ != EnumToken.CommentTokenType).slice();
     consumeWhitespace(tokens);
-    // if (tokens.length == 0) {
-    //
-    //     // @ts-ignore
-    //     return {
-    //         valid: SyntaxValidationResult.Drop,
-    //         context: [],
-    //         node: atRule,
-    //         syntax: '@keyframes',
-    //         error: 'expecting at-rule prelude'
-    //     } as ValidationSyntaxResult;
-    // }
     if (tokens.length == 0 || ![EnumToken.StringTokenType, EnumToken.IdenTokenType].includes(tokens[0].typ)) {
         // @ts-ignore
         return {

package/dist/lib/validation/at-rules/supports.js

@@ -166,7 +166,7 @@ function validateSupportCondition(atRule, token) {
     if (token.typ == EnumToken.MediaFeatureNotTokenType) {
         return validateSupportCondition(atRule, token.val);
     }
-    if (token.typ == EnumToken.FunctionTokenType && token.val.localeCompare('selector', undefined, { sensitivity: 'base' }) == 0) {
+    if (token.typ == EnumToken.FunctionTokenType && 'selector' === token.val.toLowerCase()) {
         return {
             valid: SyntaxValidationResult.Valid,
             context: [],
@@ -223,7 +223,7 @@ function validateSupportFeature(token) {
         return validateSupportFeature(token.val);
     }
     if (token.typ == EnumToken.FunctionTokenType) {
-        if (token.val.localeCompare('selector', undefined, { sensitivity: 'base' }) == 0) {
+        if ('selector' === token.val.toLowerCase()) {
             return {
                 valid: SyntaxValidationResult.Valid,
                 context: [],
@@ -232,10 +232,10 @@ function validateSupportFeature(token) {
                 error: ''
             };
         }
-        if (token.val.localeCompare('font-tech', undefined, { sensitivity: 'base' }) == 0) {
+        if ('font-tech' === token.val.toLowerCase()) {
             const chi = token.chi.filter((t) => ![EnumToken.WhitespaceTokenType, EnumToken.CommentTokenType].includes(t.typ));
             // @ts-ignore
-            return chi.length == 1 && chi[0].typ == EnumToken.IdenTokenType && colorFontTech.concat(fontFeaturesTech).some((t) => t.localeCompare(chi[0].val, undefined, { sensitivity: 'base' }) == 0) ?
+            return chi.length == 1 && chi[0].typ == EnumToken.IdenTokenType && colorFontTech.concat(fontFeaturesTech).includes(chi[0].val.toLowerCase()) ?
                 {
                     valid: SyntaxValidationResult.Valid,
                     context: [],
@@ -251,10 +251,10 @@ function validateSupportFeature(token) {
                     error: 'expected font-tech'
                 };
         }
-        if (token.val.localeCompare('font-format', undefined, { sensitivity: 'base' }) == 0) {
+        if ('font-format' === token.val.toLowerCase()) {
             const chi = token.chi.filter((t) => ![EnumToken.WhitespaceTokenType, EnumToken.CommentTokenType].includes(t.typ));
             // @ts-ignore
-            return chi.length == 1 && chi[0].typ == EnumToken.IdenTokenType && fontFormat.some((t) => t.localeCompare(chi[0].val, undefined, { sensitivity: 'base' }) == 0) ?
+            return chi.length == 1 && chi[0].typ == EnumToken.IdenTokenType && fontFormat.includes(chi[0].val, toLowerCase()) ?
                 {
                     valid: SyntaxValidationResult.Valid,
                     context: [],

package/dist/lib/validation/config.js

@@ -21,10 +21,6 @@ function getSyntax(group, key) {
                     key = matches[1] + matches[3];
                 }
             }
-            // if (!(key in obj)) {
-            //
-            //     return null;
-            // }
         }
         // @ts-ignore
         obj = obj[key];

package/dist/lib/validation/parser/parse.js

@@ -175,7 +175,6 @@ function parseSyntax(syntax) {
         typ: ValidationTokenEnum.Root,
         chi: []
     }, 'pos', { ...objectProperties, value: { ind: 0, lin: 1, col: 0 } });
-    // return minify(doParseSyntax(syntaxes, tokenize(syntaxes), root)) as ValidationRootToken;
     return minify(doParseSyntax(syntax, tokenize(syntax), root));
 }
 function matchParens(syntax, iterator) {
@@ -351,10 +350,6 @@ function matchAtRule(syntax, iterator) {
                 token.typ = ValidationTokenEnum.AtRule;
                 break;
             }
-            // if (item.value.typ != ValidationTokenEnum.Whitespace) {
-            //
-            //     console.error('unexpected token', item.value);
-            // }
             item = iterator.next();
             if (item.done) {
                 break;
@@ -971,9 +966,6 @@ function renderSyntax(token, parent) {
             return '{' + token.chi.reduce((acc, t) => acc + renderSyntax(t), '') + '}';
         case ValidationTokenEnum.DeclarationDefinitionToken:
             return token.nam + ': ' + renderSyntax(token.val);
-        // case ValidationTokenEnum.ColumnArrayToken:
-        //
-        //     return (token as ValidationColumnArrayToken).chi.reduce((acc: string, curr: ValidationToken) => acc + (acc.trim().length > 0 ? '||' : '') + renderSyntax(curr), '');
         default:
             throw new Error('Unhandled token: ' + JSON.stringify({ token }, null, 1));
     }

package/dist/lib/validation/selector.js

@@ -13,15 +13,6 @@ import './config.js';
 import { validateSelectorList } from './syntaxes/selector-list.js';
 
 function validateSelector(selector, options, root) {
-    // if (root == null) {
-    //
-    //     return validateSelectorList(selector, root, options);
-    // }
-    // @ts-ignore
-    // if (root.typ == EnumToken.AtRuleNodeType && root.nam.match(/^(-[a-z]+-)?keyframes$/)) {
-    //
-    //     return validateKeyframeBlockList(selector, root as AstAtRule, options);
-    // }
     let isNested = root.typ == EnumToken.RuleNodeType ? 1 : 0;
     let currentRoot = root.parent;
     while (currentRoot != null && isNested == 0) {