@tbela99/css-parser 0.9.1 → 1.1.0

package/dist/lib/validation/syntaxes/complex-selector-list.js

@@ -1,10 +1,11 @@
-import { ValidationLevel } from '../../ast/types.js';
+import { SyntaxValidationResult } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
+import '../../parser/tokenize.js';
+import '../../parser/utils/config.js';
 import '../../renderer/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
-import '../../parser/utils/config.js';
 import { validateSelector } from './selector.js';
 import { consumeWhitespace } from '../utils/whitespace.js';
 import { splitTokenList } from '../utils/list.js';
@@ -14,31 +15,29 @@ function validateComplexSelectorList(tokens, root, options) {
     consumeWhitespace(tokens);
     if (tokens.length == 0) {
         return {
-            valid: ValidationLevel.Drop,
-            matches: [],
+            valid: SyntaxValidationResult.Drop,
+            context: [],
             // @ts-ignore
             node: root,
             syntax: null,
-            error: 'expecting complex selector list',
-            tokens
+            error: 'expecting complex selector list'
         };
     }
     let result = null;
     for (const t of splitTokenList(tokens)) {
         result = validateSelector(t, root, options);
-        if (result.valid == ValidationLevel.Drop) {
+        if (result.valid == SyntaxValidationResult.Drop) {
             return result;
         }
     }
     // @ts-ignore
     return result ?? {
-        valid: ValidationLevel.Drop,
-        matches: [],
+        valid: SyntaxValidationResult.Drop,
+        context: [],
         // @ts-ignore
         node: root,
         syntax: null,
-        error: 'expecting complex selector list',
-        tokens
+        error: 'expecting complex selector list'
     };
 }
 

package/dist/lib/validation/syntaxes/complex-selector.js

@@ -1,12 +1,13 @@
 import { consumeWhitespace } from '../utils/whitespace.js';
 import { splitTokenList } from '../utils/list.js';
-import { EnumToken, ValidationLevel } from '../../ast/types.js';
+import { EnumToken, SyntaxValidationResult } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
+import '../../parser/tokenize.js';
+import '../../parser/utils/config.js';
 import '../../renderer/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
-import '../../parser/utils/config.js';
 import { validateCompoundSelector } from './compound-selector.js';
 
 const combinatorsTokens = [EnumToken.ChildCombinatorTokenType, EnumToken.ColumnCombinatorTokenType,
@@ -19,13 +20,12 @@ function validateComplexSelector(tokens, root, options) {
     consumeWhitespace(tokens);
     if (tokens.length == 0) {
         return {
-            valid: ValidationLevel.Drop,
-            matches: [],
+            valid: SyntaxValidationResult.Drop,
+            context: [],
             // @ts-ignore
             node: root,
             syntax: null,
-            error: 'expected selector',
-            tokens
+            error: 'expected selector'
         };
     }
     // const config = getSyntaxConfig();
@@ -35,18 +35,17 @@ function validateComplexSelector(tokens, root, options) {
     // const combinators: EnumToken[] = combinatorsTokens.filter((t: EnumToken) => t != EnumToken.DescendantCombinatorTokenType);
     for (const t of splitTokenList(tokens, combinatorsTokens)) {
         result = validateCompoundSelector(t, root, options);
-        if (result.valid == ValidationLevel.Drop) {
+        if (result.valid == SyntaxValidationResult.Drop) {
             return result;
         }
     }
     // @ts-ignore
     return result ?? {
-        valid: ValidationLevel.Drop,
-        matches: [],
+        valid: SyntaxValidationResult.Drop,
+        context: [],
         node: root,
         syntax: null,
-        error: 'expecting compound-selector',
-        tokens
+        error: 'expecting compound-selector'
     };
 }
 

package/dist/lib/validation/syntaxes/compound-selector.js

@@ -1,9 +1,10 @@
-import { ValidationLevel, EnumToken } from '../../ast/types.js';
+import { SyntaxValidationResult, EnumToken } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
-import { mozExtensions, webkitExtensions } from '../../syntax/syntax.js';
+import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
+import { mozExtensions, webkitExtensions } from '../../syntax/syntax.js';
 import '../../renderer/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
 import { consumeWhitespace } from '../utils/whitespace.js';
@@ -13,8 +14,8 @@ function validateCompoundSelector(tokens, root, options) {
     if (tokens.length == 0) {
         // @ts-ignore
         return {
-            valid: ValidationLevel.Drop,
-            matches: [],
+            valid: SyntaxValidationResult.Drop,
+            context: [],
             // @ts-ignore
             node: root,
             // @ts-ignore
@@ -33,13 +34,12 @@ function validateCompoundSelector(tokens, root, options) {
             if (!options?.nestedSelector) {
                 // @ts-ignore
                 return {
-                    valid: ValidationLevel.Drop,
-                    matches: [],
+                    valid: SyntaxValidationResult.Drop,
+                    context: [],
                     // @ts-ignore
                     node: tokens[0],
                     syntax: null,
-                    error: 'nested selector not allowed',
-                    tokens
+                    error: 'nested selector not allowed'
                 };
             }
             match++;
@@ -66,13 +66,12 @@ function validateCompoundSelector(tokens, root, options) {
                 if (!options?.lenient || /^(:?)-webkit-/.test(tokens[0].val)) {
                     // @ts-ignore
                     return {
-                        valid: ValidationLevel.Drop,
-                        matches: [],
+                        valid: SyntaxValidationResult.Drop,
+                        context: [],
                         // @ts-ignore
                         node: tokens[0],
                         syntax: null,
-                        error: 'unknown pseudo-class: ' + tokens[0].val + '()',
-                        tokens
+                        error: 'unknown pseudo-class: ' + tokens[0].val + '()'
                     };
                 }
             }
@@ -93,13 +92,12 @@ function validateCompoundSelector(tokens, root, options) {
                 if (!options?.lenient || /^(:?)-webkit-/.test(tokens[0].val)) {
                     // @ts-ignore
                     return {
-                        valid: ValidationLevel.Drop,
-                        matches: [],
+                        valid: SyntaxValidationResult.Drop,
+                        context: [],
                         // @ts-ignore
                         node: tokens[0],
                         syntax: null,
-                        error: 'unknown pseudo-class: ' + tokens[0].val,
-                        tokens
+                        error: 'unknown pseudo-class: ' + tokens[0].val
                     };
                 }
             }
@@ -113,12 +111,11 @@ function validateCompoundSelector(tokens, root, options) {
             if (children.length == 0) {
                 // @ts-ignore
                 return {
-                    valid: ValidationLevel.Drop,
-                    matches: [],
+                    valid: SyntaxValidationResult.Drop,
+                    context: [],
                     node: tokens[0],
                     syntax: null,
-                    error: 'invalid attribute selector',
-                    tokens
+                    error: 'invalid attribute selector'
                 };
             }
             if (![
@@ -128,23 +125,21 @@ function validateCompoundSelector(tokens, root, options) {
             ].includes(children[0].typ)) {
                 // @ts-ignore
                 return {
-                    valid: ValidationLevel.Drop,
-                    matches: [],
+                    valid: SyntaxValidationResult.Drop,
+                    context: [],
                     node: tokens[0],
                     syntax: null,
-                    error: 'invalid attribute selector',
-                    tokens
+                    error: 'invalid attribute selector'
                 };
             }
             if (children[0].typ == EnumToken.MatchExpressionTokenType) {
                 if (children.length != 1) {
                     return {
-                        valid: ValidationLevel.Drop,
-                        matches: [],
+                        valid: SyntaxValidationResult.Drop,
+                        context: [],
                         node: tokens[0],
                         syntax: null,
-                        error: 'invalid <attribute-selector>',
-                        tokens
+                        error: 'invalid <attribute-selector>'
                     };
                 }
                 if (![
@@ -156,29 +151,27 @@ function validateCompoundSelector(tokens, root, options) {
                         EnumToken.StartMatchTokenType, EnumToken.ContainMatchTokenType,
                         EnumToken.EndMatchTokenType, EnumToken.IncludeMatchTokenType
                     ].includes(children[0].op.typ) ||
-                    ![
+                    !([
                         EnumToken.StringTokenType,
                         EnumToken.IdenTokenType
-                    ].includes(children[0].r.typ)) {
+                    ].includes(children[0].r.typ))) {
                     // @ts-ignore
                     return {
-                        valid: ValidationLevel.Drop,
-                        matches: [],
+                        valid: SyntaxValidationResult.Drop,
+                        context: [],
                         node: tokens[0],
                         syntax: null,
-                        error: 'invalid attribute selector',
-                        tokens
+                        error: 'invalid attribute selector'
                     };
                 }
                 if (children[0].attr != null && !['i', 's'].includes(children[0].attr)) {
                     // @ts-ignore
                     return {
-                        valid: ValidationLevel.Drop,
-                        matches: [],
+                        valid: SyntaxValidationResult.Drop,
+                        context: [],
                         node: tokens[0],
                         syntax: null,
-                        error: 'invalid attribute selector',
-                        tokens
+                        error: 'invalid attribute selector'
                     };
                 }
             }
@@ -188,38 +181,35 @@ function validateCompoundSelector(tokens, root, options) {
         }
         if (length == tokens.length) {
             return {
-                valid: ValidationLevel.Drop,
-                matches: [],
+                valid: SyntaxValidationResult.Drop,
+                context: [],
                 // @ts-ignore
                 node: tokens[0],
                 // @ts-ignore
                 syntax: null,
-                error: 'expected compound selector',
-                tokens
+                error: 'expected compound selector'
             };
         }
         length = tokens.length;
     }
     return match == 0 ? {
-        valid: ValidationLevel.Drop,
-        matches: [],
+        valid: SyntaxValidationResult.Drop,
+        context: [],
         // @ts-ignore
         node: root,
         // @ts-ignore
         syntax: null,
-        error: 'expected compound selector',
-        tokens
+        error: 'expected compound selector'
     } :
         // @ts-ignore
         {
-            valid: ValidationLevel.Valid,
-            matches: [],
+            valid: SyntaxValidationResult.Valid,
+            context: [],
             // @ts-ignore
             node: root,
             // @ts-ignore
             syntax: null,
-            error: null,
-            tokens
+            error: null
         };
 }
 

package/dist/lib/validation/syntaxes/family-name.js

@@ -1,10 +1,11 @@
-import { ValidationLevel, EnumToken } from '../../ast/types.js';
+import { SyntaxValidationResult, EnumToken } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
+import '../../parser/tokenize.js';
+import '../../parser/utils/config.js';
 import '../../renderer/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
-import '../../parser/utils/config.js';
 import { consumeWhitespace } from '../utils/whitespace.js';
 
 function validateFamilyName(tokens, atRule) {
@@ -14,7 +15,7 @@ function validateFamilyName(tokens, atRule) {
     if (tokens.length == 0) {
         // @ts-ignore
         return {
-            valid: ValidationLevel.Drop,
+            valid: SyntaxValidationResult.Drop,
             matches: [],
             node: atRule,
             syntax: null,
@@ -25,7 +26,7 @@ function validateFamilyName(tokens, atRule) {
     if (tokens[0].typ == EnumToken.CommaTokenType) {
         // @ts-ignore
         return {
-            valid: ValidationLevel.Drop,
+            valid: SyntaxValidationResult.Drop,
             matches: [],
             node: tokens[0],
             syntax: null,
@@ -41,7 +42,7 @@ function validateFamilyName(tokens, atRule) {
             if (tokens.length == 0) {
                 // @ts-ignore
                 return {
-                    valid: ValidationLevel.Drop,
+                    valid: SyntaxValidationResult.Drop,
                     matches: [],
                     node,
                     syntax: null,
@@ -54,7 +55,7 @@ function validateFamilyName(tokens, atRule) {
         if (![EnumToken.IdenTokenType, EnumToken.StringTokenType].includes(node.typ)) {
             // @ts-ignore
             return {
-                valid: ValidationLevel.Drop,
+                valid: SyntaxValidationResult.Drop,
                 matches: [],
                 node,
                 syntax: null,
@@ -68,7 +69,7 @@ function validateFamilyName(tokens, atRule) {
         if (tokens.length > 0 && node.typ == EnumToken.BadStringTokenType && tokens[0].typ != EnumToken.CommaTokenType) {
             // @ts-ignore
             return {
-                valid: ValidationLevel.Drop,
+                valid: SyntaxValidationResult.Drop,
                 matches: [],
                 node: tokens[0],
                 syntax: null,
@@ -79,7 +80,7 @@ function validateFamilyName(tokens, atRule) {
     }
     // @ts-ignore
     return {
-        valid: ValidationLevel.Valid,
+        valid: SyntaxValidationResult.Valid,
         matches: [],
         node: null,
         syntax: null,

package/dist/lib/validation/syntaxes/keyframe-block-list.js

@@ -1,10 +1,11 @@
-import { EnumToken, ValidationLevel } from '../../ast/types.js';
+import { EnumToken, SyntaxValidationResult } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
+import '../../parser/tokenize.js';
+import '../../parser/utils/config.js';
 import '../../renderer/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
-import '../../parser/utils/config.js';
 import { validateKeyframeSelector } from './keyframe-selector.js';
 
 function validateKeyframeBlockList(tokens, atRule, options) {
@@ -13,15 +14,15 @@ function validateKeyframeBlockList(tokens, atRule, options) {
     let result = null;
     while (i + 1 < tokens.length) {
         if (tokens[++i].typ == EnumToken.CommaTokenType) {
-            result = validateKeyframeSelector(tokens.slice(j, i), atRule);
-            if (result.valid == ValidationLevel.Drop) {
+            result = validateKeyframeSelector(tokens.slice(j, i));
+            if (result.valid == SyntaxValidationResult.Drop) {
                 return result;
             }
             j = i + 1;
             i = j;
         }
     }
-    return validateKeyframeSelector(i == j ? tokens.slice(i) : tokens.slice(j, i + 1), atRule);
+    return validateKeyframeSelector(i == j ? tokens.slice(i) : tokens.slice(j, i + 1));
 }
 
 export { validateKeyframeBlockList };

package/dist/lib/validation/syntaxes/keyframe-selector.js

@@ -1,136 +1,54 @@
 import { consumeWhitespace } from '../utils/whitespace.js';
-import { ValidationLevel, EnumToken } from '../../ast/types.js';
+import { splitTokenList } from '../utils/list.js';
+import { SyntaxValidationResult, EnumToken } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
+import '../../parser/tokenize.js';
+import '../../parser/utils/config.js';
 import '../../renderer/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
-import '../../parser/utils/config.js';
 
-function validateKeyframeSelector(tokens, atRule, options) {
+function validateKeyframeSelector(tokens, options) {
     consumeWhitespace(tokens);
     if (tokens.length == 0) {
         // @ts-ignore
         return {
-            valid: ValidationLevel.Drop,
-            matches: [],
-            node: atRule,
+            valid: SyntaxValidationResult.Drop,
+            context: [],
+            node: null,
             syntax: null,
-            error: 'expected keyframe selector',
-            tokens
+            error: 'expected keyframe selector'
         };
     }
-    if (tokens[0].typ == EnumToken.PercentageTokenType) {
-        tokens.shift();
-        consumeWhitespace(tokens);
-        if (tokens.length == 0) {
-            // @ts-ignore
+    for (const t of splitTokenList(tokens)) {
+        if (t.length != 1) {
             return {
-                valid: ValidationLevel.Valid,
-                matches: [],
-                node: atRule,
+                valid: SyntaxValidationResult.Drop,
+                context: [],
+                node: t[0] ?? null,
                 syntax: null,
-                error: '',
-                tokens
+                error: 'unexpected token'
             };
         }
-        // @ts-ignore
-        return {
-            valid: ValidationLevel.Drop,
-            matches: [],
-            node: tokens[0],
-            syntax: null,
-            error: 'unexpected token',
-            tokens
-        };
-    }
-    if (tokens[0].typ != EnumToken.IdenTokenType) {
-        // @ts-ignore
-        return {
-            valid: ValidationLevel.Drop,
-            matches: [],
-            node: tokens[0],
-            // @ts-ignore
-            syntax: null,
-            error: 'expected keyframe selector',
-            tokens
-        };
-    }
-    if (['from', 'to'].includes(tokens[0].val)) {
-        tokens.shift();
-        consumeWhitespace(tokens);
-        if (tokens.length > 0) {
-            // @ts-ignore
+        if (t[0].typ != EnumToken.PercentageTokenType && !(t[0].typ == EnumToken.IdenTokenType && ['from', 'to', 'cover', 'contain', 'entry', 'exit', 'entry-crossing', 'exit-crossing'].includes(t[0].val))) {
             return {
-                valid: ValidationLevel.Drop,
-                matches: [],
-                node: tokens[0],
+                valid: SyntaxValidationResult.Drop,
+                context: [],
+                node: t[0],
                 syntax: null,
-                error: 'unexpected token',
-                tokens
+                error: 'expected keyframe selector'
             };
         }
-        // @ts-ignore
-        return {
-            valid: ValidationLevel.Valid,
-            matches: [],
-            node: null,
-            // @ts-ignore
-            syntax: null,
-            error: '',
-            tokens
-        };
-    }
-    if (!['cover', 'contain', 'entry', 'exit', 'entry-crossing', 'exit-crossing'].includes(tokens[0].val)) {
-        // @ts-ignore
-        return {
-            valid: ValidationLevel.Drop,
-            matches: [],
-            node: tokens[0],
-            // @ts-ignore
-            syntax: null,
-            error: 'unexpected token',
-            tokens
-        };
-    }
-    tokens.shift();
-    consumeWhitespace(tokens);
-    // @ts-ignore
-    if (tokens.length == 0 || tokens[0].typ != EnumToken.PercentageTokenType) {
-        // @ts-ignore
-        return {
-            valid: ValidationLevel.Drop,
-            matches: [],
-            node: tokens[0],
-            // @ts-ignore
-            syntax: null,
-            error: 'expecting percentage token',
-            tokens
-        };
-    }
-    tokens.shift();
-    consumeWhitespace(tokens);
-    if (tokens.length > 0) {
-        // @ts-ignore
-        return {
-            valid: ValidationLevel.Drop,
-            matches: [],
-            node: tokens[0],
-            // @ts-ignore
-            syntax: null,
-            error: 'unexpected token',
-            tokens
-        };
     }
     // @ts-ignore
     return {
-        valid: ValidationLevel.Valid,
-        matches: [],
+        valid: SyntaxValidationResult.Valid,
+        context: [],
         node: null,
         // @ts-ignore
         syntax: null,
-        error: '',
-        tokens
+        error: ''
     };
 }
 

package/dist/lib/validation/syntaxes/layer-name.js

@@ -1,10 +1,11 @@
-import { EnumToken, ValidationLevel } from '../../ast/types.js';
+import { EnumToken, SyntaxValidationResult } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
+import '../../parser/tokenize.js';
+import '../../parser/utils/config.js';
 import '../../renderer/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
-import '../../parser/utils/config.js';
 
 function validateLayerName(tokens) {
     const slice = tokens.reduce((acc, curr) => {
@@ -20,7 +21,7 @@ function validateLayerName(tokens) {
         if (slice[i].length == 0) {
             // @ts-ignore
             return {
-                valid: ValidationLevel.Drop,
+                valid: SyntaxValidationResult.Drop,
                 matches: tokens,
                 node: null,
                 syntax: null,
@@ -32,7 +33,7 @@ function validateLayerName(tokens) {
             if (slice[i][j].typ != EnumToken.IdenTokenType && slice[i][j].typ != EnumToken.ClassSelectorTokenType) {
                 // @ts-ignore
                 return {
-                    valid: ValidationLevel.Drop,
+                    valid: SyntaxValidationResult.Drop,
                     matches: tokens,
                     node: slice[i][j],
                     syntax: '<layer-name>',
@@ -44,7 +45,7 @@ function validateLayerName(tokens) {
     }
     // @ts-ignore
     return {
-        valid: ValidationLevel.Valid,
+        valid: SyntaxValidationResult.Valid,
         matches: tokens,
         node: null,
         syntax: null,

package/dist/lib/validation/syntaxes/relative-selector-list.js

@@ -1,10 +1,11 @@
-import { ValidationLevel } from '../../ast/types.js';
+import { SyntaxValidationResult } from '../../ast/types.js';
 import '../../ast/minify.js';
 import '../../ast/walk.js';
 import '../../parser/parse.js';
+import '../../parser/tokenize.js';
+import '../../parser/utils/config.js';
 import '../../renderer/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
-import '../../parser/utils/config.js';
 import { validateRelativeSelector } from './relative-selector.js';
 import { consumeWhitespace } from '../utils/whitespace.js';
 import { splitTokenList } from '../utils/list.js';
@@ -14,7 +15,7 @@ function validateRelativeSelectorList(tokens, root, options) {
     consumeWhitespace(tokens);
     if (tokens.length == 0) {
         return {
-            valid: ValidationLevel.Drop,
+            valid: SyntaxValidationResult.Drop,
             matches: [],
             // @ts-ignore
             node: root,
@@ -27,7 +28,7 @@ function validateRelativeSelectorList(tokens, root, options) {
     for (const t of splitTokenList(tokens)) {
         if (t.length == 0) {
             return {
-                valid: ValidationLevel.Drop,
+                valid: SyntaxValidationResult.Drop,
                 matches: [],
                 // @ts-ignore
                 node: root,
@@ -38,12 +39,12 @@ function validateRelativeSelectorList(tokens, root, options) {
             };
         }
         const result = validateRelativeSelector(t, root, options);
-        if (result.valid == ValidationLevel.Drop) {
+        if (result.valid == SyntaxValidationResult.Drop) {
             return result;
         }
     }
     return {
-        valid: ValidationLevel.Valid,
+        valid: SyntaxValidationResult.Valid,
         matches: [],
         // @ts-ignore
         node: root,