@tbela99/css-parser 0.8.0 → 0.9.1

package/dist/lib/validation/at-rules/counter-style.js

@@ -15,7 +15,7 @@ function validateAtRuleCounterStyle(atRule, options, root) {
             matches: [],
             node: atRule,
             syntax: '@counter-style',
-            error: 'expected media query list',
+            error: 'expected counter style name',
             tokens: []
         };
     }
@@ -23,7 +23,7 @@ function validateAtRuleCounterStyle(atRule, options, root) {
     if (tokens.length == 0) {
         // @ts-ignore
         return {
-            valid: ValidationLevel.Valid,
+            valid: ValidationLevel.Drop,
             matches: [],
             node: atRule,
             syntax: '@counter-style',

package/dist/lib/validation/at-rules/custom-media.js

@@ -0,0 +1,52 @@
+import { ValidationLevel, EnumToken } from '../../ast/types.js';
+import '../../ast/minify.js';
+import '../../ast/walk.js';
+import '../../parser/parse.js';
+import '../../renderer/color/utils/constants.js';
+import '../../renderer/sourcemap/lib/encode.js';
+import '../../parser/utils/config.js';
+import { consumeWhitespace } from '../utils/whitespace.js';
+import { validateAtRuleMediaQueryList } from './media.js';
+
+function validateAtRuleCustomMedia(atRule, options, root) {
+    // media-query-list
+    if (!Array.isArray(atRule.tokens) || atRule.tokens.length == 0) {
+        // @ts-ignore
+        return {
+            valid: ValidationLevel.Valid,
+            matches: [],
+            node: null,
+            syntax: null,
+            error: '',
+            tokens: []
+        };
+    }
+    const queries = atRule.tokens.slice();
+    consumeWhitespace(queries);
+    if (queries.length == 0 || queries[0].typ != EnumToken.DashedIdenTokenType) {
+        return {
+            valid: ValidationLevel.Drop,
+            matches: [],
+            node: atRule,
+            syntax: '@custom-media',
+            error: 'expecting dashed identifier',
+            tokens: []
+        };
+    }
+    queries.shift();
+    const result = validateAtRuleMediaQueryList(queries, atRule);
+    if (result.valid == ValidationLevel.Drop) {
+        atRule.tokens = [];
+        return {
+            valid: ValidationLevel.Valid,
+            matches: [],
+            node: atRule,
+            syntax: '@custom-media',
+            error: '',
+            tokens: []
+        };
+    }
+    return result;
+}
+
+export { validateAtRuleCustomMedia };

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

@@ -6,6 +6,7 @@ import '../../renderer/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
 import '../../parser/utils/config.js';
 import { consumeWhitespace } from '../utils/whitespace.js';
+import { splitTokenList } from '../utils/list.js';
 import { validateURL } from '../syntaxes/url.js';
 
 function validateAtRuleDocument(atRule, options, root) {
@@ -34,71 +35,50 @@ function validateAtRuleDocument(atRule, options, root) {
             tokens
         };
     }
-    if (tokens[0].typ == EnumToken.CommaTokenType) {
+    for (const t of splitTokenList(tokens)) {
+        if (t.length != 1) {
+            return {
+                valid: ValidationLevel.Drop,
+                matches: [],
+                node: t[0] ?? atRule,
+                syntax: '@document',
+                error: 'unexpected token',
+                tokens
+            };
+        }
         // @ts-ignore
-        return {
-            valid: ValidationLevel.Drop,
-            matches: [],
-            node: tokens[0],
-            syntax: '@document',
-            error: 'unexpected token',
-            tokens
-        };
-    }
-    while (tokens.length > 0) {
-        if (tokens[0].typ == EnumToken.CommentTokenType) {
-            tokens.shift();
-            consumeWhitespace(tokens);
+        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)) {
+            return {
+                valid: ValidationLevel.Drop,
+                matches: [],
+                node: t[0] ?? atRule,
+                syntax: '@document',
+                error: 'expecting any of url-prefix(), domain(), media-document(), regexp() but found ' + t[0].val,
+                tokens
+            };
         }
-        result = validateURL(tokens[0]);
-        if (result.valid == ValidationLevel.Valid) {
-            tokens.shift();
-            consumeWhitespace(tokens);
+        if (t[0].typ == EnumToken.UrlFunctionTokenType) {
+            result = validateURL(t[0]);
+            if (result.valid == ValidationLevel.Drop) {
+                return result;
+            }
             continue;
         }
-        if (tokens[0].typ == EnumToken.FunctionTokenType) {
-            if (!['url-prefix', 'domain', 'media-document', 'regexp'].some((t) => t.localeCompare(tokens[0].val, undefined, { sensitivity: 'base' }) == 0)) {
-                // @ts-ignore
-                return {
-                    valid: ValidationLevel.Drop,
-                    matches: [],
-                    node: tokens[0],
-                    syntax: '@document',
-                    error: 'unexpected token',
-                    tokens
-                };
-            }
-            const children = tokens[0].chi.slice();
-            consumeWhitespace(children);
-            if (children.length == 0) {
-                // @ts-ignore
-                return {
-                    valid: ValidationLevel.Drop,
-                    matches: [],
-                    node: tokens[0],
-                    syntax: '@document',
-                    error: 'expecting string argument',
-                    tokens
-                };
-            }
-            if (children[0].typ == EnumToken.StringTokenType) {
-                children.shift();
-                consumeWhitespace(children);
-            }
-            if (children.length > 0) {
-                // @ts-ignore
-                return {
-                    valid: ValidationLevel.Drop,
-                    matches: [],
-                    node: children[0],
-                    syntax: '@document',
-                    error: 'unexpected token',
-                    tokens
-                };
-            }
-            tokens.shift();
-            consumeWhitespace(tokens);
+        const children = t[0].chi.slice();
+        consumeWhitespace(children);
+        if (children.length != 1 || (children[0].typ != EnumToken.StringTokenType && children[0].typ != EnumToken.UrlTokenTokenType)) {
+            // @ts-ignore
+            return {
+                valid: ValidationLevel.Drop,
+                matches: [],
+                node: tokens[0],
+                syntax: '@document',
+                error: 'expecting string argument',
+                tokens
+            };
         }
+        tokens.shift();
+        consumeWhitespace(tokens);
     }
     // @ts-ignore
     return {

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

@@ -0,0 +1,5 @@
+import { validateAtRuleWhen } from './when.js';
+
+const validateAtRuleElse = validateAtRuleWhen;
+
+export { validateAtRuleElse };

package/dist/lib/validation/at-rules/font-feature-values.js

@@ -7,6 +7,9 @@ import '../../renderer/sourcemap/lib/encode.js';
 import '../../parser/utils/config.js';
 import { validateFamilyName } from '../syntaxes/family-name.js';
 import '../syntaxes/complex-selector.js';
+import '../parser/types.js';
+import '../parser/parse.js';
+import '../config.js';
 
 function validateAtRuleFontFeatureValues(atRule, options, root) {
     if (!Array.isArray(atRule.tokens) || atRule.tokens.length == 0) {

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

@@ -5,11 +5,14 @@ import '../../parser/parse.js';
 import '../../renderer/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
 import '../../parser/utils/config.js';
-import { validateAtRuleSupports } from './supports.js';
 import { validateAtRuleMediaQueryList } from './media.js';
 import { consumeWhitespace } from '../utils/whitespace.js';
 import { validateLayerName } from '../syntaxes/layer-name.js';
 import '../syntaxes/complex-selector.js';
+import '../parser/types.js';
+import '../parser/parse.js';
+import '../config.js';
+import { validateAtRuleSupportsConditions } from './supports.js';
 
 function validateAtRuleImport(atRule, options, root) {
     if (!Array.isArray(atRule.tokens) || atRule.tokens.length == 0) {
@@ -79,6 +82,9 @@ function validateAtRuleImport(atRule, options, root) {
                 };
             }
         }
+        tokens.shift();
+        // @ts-ignore
+        consumeWhitespace(tokens);
     }
     else {
         // @ts-ignore
@@ -114,71 +120,70 @@ 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) {
-                // @ts-ignore
-                return {
-                    valid: ValidationLevel.Drop,
-                    matches: [],
-                    node: tokens[0],
-                    syntax: '@' + atRule.nam,
-                    error: 'expecting layer()',
-                    tokens
-                };
-            }
-            // @ts-ignore
-            const result = validateLayerName(tokens[0].chi);
-            if (result.valid == ValidationLevel.Drop) {
-                return result;
-            }
-            tokens.shift();
-            // @ts-ignore
-            if (!consumeWhitespace(tokens)) {
-                // @ts-ignore
-                return {
-                    valid: ValidationLevel.Drop,
-                    matches: [],
-                    node: tokens[0],
-                    syntax: '@' + atRule.nam,
-                    error: 'expecting whitespace',
-                    tokens
-                };
-            }
-        }
-    }
-    if (tokens.length > 0) {
-        // @ts-ignore
-        if (tokens[0].typ == EnumToken.AtRuleTokenType) {
-            if (tokens[0].nam != 'supports') {
+            if ('layer'.localeCompare(tokens[0].val, undefined, { sensitivity: 'base' }) == 0) {
+                const result = validateLayerName(tokens[0].chi);
+                if (result.valid == ValidationLevel.Drop) {
+                    return result;
+                }
+                tokens.shift();
                 // @ts-ignore
-                return {
-                    valid: ValidationLevel.Drop,
-                    matches: [],
-                    node: tokens[0],
-                    syntax: '@' + atRule.nam,
-                    error: 'expecting @supports or media query list',
-                    tokens
-                };
+                consumeWhitespace(tokens);
             }
             // @ts-ignore
-            const result = validateAtRuleSupports(tokens[0]);
-            if (result.valid == ValidationLevel.Drop) {
-                return result;
-            }
-            tokens.shift();
-            // @ts-ignore
-            if (!consumeWhitespace(tokens)) {
+            if ('supports'.localeCompare(tokens[0]?.val, undefined, { sensitivity: 'base' }) == 0) {
+                const result = validateAtRuleSupportsConditions(atRule, tokens[0].chi);
+                if (result.valid == ValidationLevel.Drop) {
+                    return result;
+                }
+                tokens.shift();
                 // @ts-ignore
-                return {
-                    valid: ValidationLevel.Drop,
-                    matches: [],
-                    node: tokens[0],
-                    syntax: '@' + atRule.nam,
-                    error: 'expecting whitespace',
-                    tokens
-                };
+                consumeWhitespace(tokens);
             }
         }
     }
+    // if (tokens.length > 0) {
+    //
+    //     // @ts-ignore
+    //     if (tokens[0].typ == EnumToken.AtRuleTokenType) {
+    //
+    //         if ((tokens[0] as AstAtRule).nam != 'supports') {
+    //
+    //             // @ts-ignore
+    //             return {
+    //                 valid: ValidationLevel.Drop,
+    //                 matches: [],
+    //                 node: tokens[0],
+    //                 syntax: '@' + atRule.nam,
+    //                 error: 'expecting @supports or media query list',
+    //                 tokens
+    //             }
+    //         }
+    //
+    //         // @ts-ignore
+    //         const result: ValidationSyntaxResult = validateAtRuleSupports(tokens[0] as AstAtRule, options, atRule);
+    //
+    //         if (result.valid == ValidationLevel.Drop) {
+    //
+    //             return result;
+    //         }
+    //
+    //         tokens.shift();
+    //
+    //         // @ts-ignore
+    //         if (!consumeWhitespace(tokens)) {
+    //
+    //             // @ts-ignore
+    //             return {
+    //                 valid: ValidationLevel.Drop,
+    //                 matches: [],
+    //                 node: tokens[0],
+    //                 syntax: '@' + atRule.nam,
+    //                 error: 'expecting whitespace',
+    //                 tokens
+    //             }
+    //         }
+    //     }
+    // }
     if (tokens.length > 0) {
         return validateAtRuleMediaQueryList(tokens, atRule);
     }

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

@@ -7,6 +7,9 @@ import '../../renderer/sourcemap/lib/encode.js';
 import '../../parser/utils/config.js';
 import { validateLayerName } from '../syntaxes/layer-name.js';
 import '../syntaxes/complex-selector.js';
+import '../parser/types.js';
+import '../parser/parse.js';
+import '../config.js';
 
 function validateAtRuleLayer(atRule, options, root) {
     // media-query-list

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

@@ -13,15 +13,28 @@ function validateAtRuleMedia(atRule, options, root) {
     if (!Array.isArray(atRule.tokens) || atRule.tokens.length == 0) {
         // @ts-ignore
         return {
-            valid: ValidationLevel.Drop,
+            valid: ValidationLevel.Valid,
+            matches: [],
+            node: null,
+            syntax: null,
+            error: '',
+            tokens: []
+        };
+    }
+    let result = null;
+    const slice = atRule.tokens.slice();
+    consumeWhitespace(slice);
+    if (slice.length == 0) {
+        return {
+            valid: ValidationLevel.Valid,
             matches: [],
             node: atRule,
             syntax: '@media',
-            error: 'expected media query list',
+            error: '',
             tokens: []
         };
     }
-    const result = validateAtRuleMediaQueryList(atRule.tokens, atRule);
+    result = validateAtRuleMediaQueryList(atRule.tokens, atRule);
     if (result.valid == ValidationLevel.Drop) {
         return result;
     }
@@ -47,10 +60,20 @@ function validateAtRuleMedia(atRule, options, root) {
     };
 }
 function validateAtRuleMediaQueryList(tokenList, atRule) {
-    for (const tokens of splitTokenList(tokenList)) {
+    const split = splitTokenList(tokenList);
+    const matched = [];
+    let result = null;
+    let previousToken;
+    let mediaFeatureType;
+    for (let i = 0; i < split.length; i++) {
+        const tokens = split[i].slice();
+        const match = [];
+        result = null;
+        mediaFeatureType = null;
+        previousToken = null;
         if (tokens.length == 0) {
             // @ts-ignore
-            return {
+            result = {
                 valid: ValidationLevel.Drop,
                 matches: [],
                 node: tokens[0] ?? atRule,
@@ -58,26 +81,38 @@ function validateAtRuleMediaQueryList(tokenList, atRule) {
                 error: 'unexpected token',
                 tokens: []
             };
+            continue;
         }
-        let previousToken = null;
         while (tokens.length > 0) {
-            // media-condition
-            if (validateMediaCondition(tokens[0])) {
-                previousToken = tokens[0];
-                tokens.shift();
-            }
-            // media-type
-            else if (validateMediaFeature(tokens[0])) {
-                previousToken = tokens[0];
-                tokens.shift();
+            previousToken = tokens[0];
+            // media-condition | media-type | custom-media
+            if (!(validateMediaCondition(tokens[0], atRule) || validateMediaFeature(tokens[0]) || validateCustomMediaCondition(tokens[0], atRule))) {
+                if (tokens[0].typ == EnumToken.ParensTokenType) {
+                    result = validateAtRuleMediaQueryList(tokens[0].chi, atRule);
+                }
+                else {
+                    result = {
+                        valid: ValidationLevel.Drop,
+                        matches: [],
+                        node: tokens[0] ?? atRule,
+                        syntax: '@media',
+                        error: 'expecting media feature or media condition',
+                        tokens: []
+                    };
+                }
+                if (result.valid == ValidationLevel.Drop) {
+                    break;
+                }
+                result = null;
             }
+            match.push(tokens.shift());
             if (tokens.length == 0) {
                 break;
             }
             if (!consumeWhitespace(tokens)) {
                 if (previousToken?.typ != EnumToken.ParensTokenType) {
                     // @ts-ignore
-                    return {
+                    result = {
                         valid: ValidationLevel.Drop,
                         matches: [],
                         node: tokens[0] ?? atRule,
@@ -85,11 +120,12 @@ function validateAtRuleMediaQueryList(tokenList, atRule) {
                         error: 'expected media query list',
                         tokens: []
                     };
+                    break;
                 }
             }
-            if (![EnumToken.MediaFeatureOrTokenType, EnumToken.MediaFeatureAndTokenType].includes(tokens[0].typ)) {
+            else if (![EnumToken.MediaFeatureOrTokenType, EnumToken.MediaFeatureAndTokenType].includes(tokens[0].typ)) {
                 // @ts-ignore
-                return {
+                result = {
                     valid: ValidationLevel.Drop,
                     matches: [],
                     node: tokens[0] ?? atRule,
@@ -97,31 +133,70 @@ function validateAtRuleMediaQueryList(tokenList, atRule) {
                     error: 'expected and/or',
                     tokens: []
                 };
+                break;
+            }
+            if (mediaFeatureType == null) {
+                mediaFeatureType = tokens[0];
             }
-            if (tokens.length == 1) {
+            if (mediaFeatureType.typ != tokens[0].typ) {
                 // @ts-ignore
-                return {
+                result = {
                     valid: ValidationLevel.Drop,
                     matches: [],
                     node: tokens[0] ?? atRule,
                     syntax: '@media',
-                    error: 'expected media-condition',
+                    error: 'mixing and/or not allowed at the same level',
                     tokens: []
                 };
+                break;
             }
-            tokens.shift();
-            if (!consumeWhitespace(tokens)) {
+            match.push({ typ: EnumToken.WhitespaceTokenType }, tokens.shift());
+            consumeWhitespace(tokens);
+            if (tokens.length == 0) {
                 // @ts-ignore
-                return {
+                result = {
                     valid: ValidationLevel.Drop,
                     matches: [],
                     node: tokens[0] ?? atRule,
                     syntax: '@media',
-                    error: 'expected whitespace',
+                    error: 'expected media-condition',
                     tokens: []
                 };
+                break;
             }
+            match.push({ typ: EnumToken.WhitespaceTokenType });
         }
+        if (result == null && match.length > 0) {
+            matched.push(match);
+        }
+    }
+    if (result != null) {
+        return result;
+    }
+    if (matched.length == 0) {
+        return {
+            valid: ValidationLevel.Drop,
+            matches: [],
+            node: atRule,
+            syntax: '@media',
+            error: 'expected media query list',
+            tokens: []
+        };
+    }
+    tokenList.length = 0;
+    let hasAll = false;
+    for (let i = 0; i < matched.length; i++) {
+        if (tokenList.length > 0) {
+            tokenList.push({ typ: EnumToken.CommaTokenType });
+        }
+        if (matched[i].length == 1 && matched.length > 1 && matched[i][0].typ == EnumToken.MediaFeatureTokenType && matched[i][0].val == 'all') {
+            hasAll = true;
+            continue;
+        }
+        tokenList.push(...matched[i]);
+    }
+    if (hasAll && tokenList.length == 0) {
+        tokenList.push({ typ: EnumToken.MediaFeatureTokenType, val: 'all' });
     }
     // @ts-ignore
     return {
@@ -133,9 +208,9 @@ function validateAtRuleMediaQueryList(tokenList, atRule) {
         tokens: []
     };
 }
-function validateMediaCondition(token) {
+function validateCustomMediaCondition(token, atRule) {
     if (token.typ == EnumToken.MediaFeatureNotTokenType) {
-        return validateMediaCondition(token.val);
+        return validateMediaCondition(token.val, atRule);
     }
     if (token.typ != EnumToken.ParensTokenType) {
         return false;
@@ -144,15 +219,29 @@ function validateMediaCondition(token) {
     if (chi.length != 1) {
         return false;
     }
+    return chi[0].typ == EnumToken.DashedIdenTokenType;
+}
+function validateMediaCondition(token, atRule) {
+    if (token.typ == EnumToken.MediaFeatureNotTokenType) {
+        return validateMediaCondition(token.val, atRule);
+    }
+    if (token.typ != EnumToken.ParensTokenType && !(['when', 'else', 'import'].includes(atRule.nam) && token.typ == EnumToken.FunctionTokenType && ['media', 'supports', 'selector'].includes(token.val))) {
+        return false;
+    }
+    const chi = token.chi.filter((t) => t.typ != EnumToken.CommentTokenType && t.typ != EnumToken.WhitespaceTokenType);
+    if (chi.length != 1) {
+        return false;
+    }
     if (chi[0].typ == EnumToken.IdenTokenType) {
         return true;
     }
     if (chi[0].typ == EnumToken.MediaFeatureNotTokenType) {
-        return validateMediaCondition(chi[0].val);
+        return validateMediaCondition(chi[0].val, atRule);
     }
     if (chi[0].typ == EnumToken.MediaQueryConditionTokenType) {
         return chi[0].l.typ == EnumToken.IdenTokenType;
     }
+    console.error(chi[0].parent);
     return false;
 }
 function validateMediaFeature(token) {
@@ -163,4 +252,4 @@ function validateMediaFeature(token) {
     return val.typ == EnumToken.MediaFeatureTokenType;
 }
 
-export { validateAtRuleMedia, validateAtRuleMediaQueryList };
+export { validateAtRuleMedia, validateAtRuleMediaQueryList, validateMediaCondition, validateMediaFeature };