@tbela99/css-parser 1.1.1 → 1.2.0

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

@@ -5,7 +5,7 @@ import '../../parser/parse.js';
 import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
 import { mozExtensions, webkitExtensions } from '../../syntax/syntax.js';
-import '../../renderer/color/utils/constants.js';
+import '../../syntax/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
 import { consumeWhitespace } from '../utils/whitespace.js';
 import { getSyntaxConfig } from '../config.js';
@@ -108,17 +108,7 @@ function validateCompoundSelector(tokens, root, options) {
         while (tokens.length > 0 && tokens[0].typ == EnumToken.AttrTokenType) {
             const children = tokens[0].chi.slice();
             consumeWhitespace(children);
-            if (children.length == 0) {
-                // @ts-ignore
-                return {
-                    valid: SyntaxValidationResult.Drop,
-                    context: [],
-                    node: tokens[0],
-                    syntax: null,
-                    error: 'invalid attribute selector'
-                };
-            }
-            if (![
+            if (children.length == 0 || ![
                 EnumToken.IdenTokenType,
                 EnumToken.NameSpaceAttributeTokenType,
                 EnumToken.MatchExpressionTokenType
@@ -151,20 +141,11 @@ 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))) {
-                    // @ts-ignore
-                    return {
-                        valid: SyntaxValidationResult.Drop,
-                        context: [],
-                        node: tokens[0],
-                        syntax: null,
-                        error: 'invalid attribute selector'
-                    };
-                }
-                if (children[0].attr != null && !['i', 's'].includes(children[0].attr)) {
+                    ].includes(children[0].r.typ) ||
+                    (children[0].attr != null && !['i', 's'].includes(children[0].attr))) {
                     // @ts-ignore
                     return {
                         valid: SyntaxValidationResult.Drop,

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

@@ -1,10 +1,10 @@
-import { SyntaxValidationResult, EnumToken } 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 '../../syntax/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
 import { consumeWhitespace } from '../utils/whitespace.js';
 
@@ -12,18 +12,19 @@ function validateFamilyName(tokens, atRule) {
     let node;
     tokens = tokens.slice();
     consumeWhitespace(tokens);
-    if (tokens.length == 0) {
-        // @ts-ignore
-        return {
-            valid: SyntaxValidationResult.Drop,
-            matches: [],
-            node: atRule,
-            syntax: null,
-            error: 'expected at-rule prelude',
-            tokens
-        };
-    }
-    if (tokens[0].typ == EnumToken.CommaTokenType) {
+    // if (tokens.length == 0) {
+    //
+    //     // @ts-ignore
+    //     return {
+    //         valid: SyntaxValidationResult.Drop,
+    //         matches: [],
+    //         node: atRule,
+    //         syntax: null,
+    //         error: 'expected at-rule prelude',
+    //         tokens
+    //     } as ValidationSyntaxResult;
+    // }
+    if (tokens.length == 0 || tokens[0].typ == EnumToken.CommaTokenType) {
         // @ts-ignore
         return {
             valid: SyntaxValidationResult.Drop,
@@ -36,21 +37,25 @@ function validateFamilyName(tokens, atRule) {
     }
     while (tokens.length > 0) {
         // @ts-ignore
-        if (tokens[0].typ == EnumToken.CommaTokenType) {
-            node = tokens.shift();
-            consumeWhitespace(tokens);
-            if (tokens.length == 0) {
-                // @ts-ignore
-                return {
-                    valid: SyntaxValidationResult.Drop,
-                    matches: [],
-                    node,
-                    syntax: null,
-                    error: 'unexpected token',
-                    tokens
-                };
-            }
-        }
+        // if (tokens[0].typ == EnumToken.CommaTokenType) {
+        //
+        //     node = tokens.shift() as Token;
+        //
+        //     consumeWhitespace(tokens);
+        //
+        //     if (tokens.length == 0) {
+        //
+        //         // @ts-ignore
+        //         return {
+        //             valid: SyntaxValidationResult.Drop,
+        //             matches: [],
+        //             node,
+        //             syntax: null,
+        //             error: 'unexpected token',
+        //             tokens
+        //         } as ValidationSyntaxResult;
+        //     }
+        // }
         node = tokens[0];
         if (![EnumToken.IdenTokenType, EnumToken.StringTokenType].includes(node.typ)) {
             // @ts-ignore
@@ -66,16 +71,8 @@ function validateFamilyName(tokens, atRule) {
         tokens.shift();
         consumeWhitespace(tokens);
         // @ts-ignore
-        if (tokens.length > 0 && node.typ == EnumToken.BadStringTokenType && tokens[0].typ != EnumToken.CommaTokenType) {
-            // @ts-ignore
-            return {
-                valid: SyntaxValidationResult.Drop,
-                matches: [],
-                node: tokens[0],
-                syntax: null,
-                error: 'expected comma token',
-                tokens
-            };
+        if (tokens.length > 0 && tokens[0].typ == EnumToken.CommaTokenType) {
+            tokens.shift();
         }
     }
     // @ts-ignore

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

@@ -1,37 +1,29 @@
 import { consumeWhitespace } from '../utils/whitespace.js';
 import { splitTokenList } from '../utils/list.js';
-import { SyntaxValidationResult, EnumToken } 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 '../../syntax/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
 
 function validateKeyframeSelector(tokens, options) {
     consumeWhitespace(tokens);
-    if (tokens.length == 0) {
-        // @ts-ignore
-        return {
-            valid: SyntaxValidationResult.Drop,
-            context: [],
-            node: null,
-            syntax: null,
-            error: 'expected keyframe selector'
-        };
-    }
+    // if (tokens.length == 0) {
+    //
+    //     // @ts-ignore
+    //     return {
+    //         valid: SyntaxValidationResult.Drop,
+    //         context: [],
+    //         node: null,
+    //         syntax: null,
+    //         error: 'expected keyframe selector'
+    //     }
+    // }
     for (const t of splitTokenList(tokens)) {
-        if (t.length != 1) {
-            return {
-                valid: SyntaxValidationResult.Drop,
-                context: [],
-                node: t[0] ?? null,
-                syntax: null,
-                error: 'unexpected token'
-            };
-        }
-        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))) {
+        if (t.length != 1 || (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: SyntaxValidationResult.Drop,
                 context: [],

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

@@ -4,7 +4,7 @@ import '../../ast/walk.js';
 import '../../parser/parse.js';
 import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
-import '../../renderer/color/utils/constants.js';
+import '../../syntax/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
 
 function validateLayerName(tokens) {

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

@@ -4,7 +4,7 @@ import '../../ast/walk.js';
 import '../../parser/parse.js';
 import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
-import '../../renderer/color/utils/constants.js';
+import '../../syntax/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
 import { validateRelativeSelector } from './relative-selector.js';
 import { consumeWhitespace } from '../utils/whitespace.js';
@@ -13,31 +13,33 @@ import { splitTokenList } from '../utils/list.js';
 function validateRelativeSelectorList(tokens, root, options) {
     tokens = tokens.slice();
     consumeWhitespace(tokens);
-    if (tokens.length == 0) {
-        return {
-            valid: SyntaxValidationResult.Drop,
-            matches: [],
-            // @ts-ignore
-            node: root,
-            // @ts-ignore
-            syntax: null,
-            error: 'expecting relative selector list',
-            tokens
-        };
-    }
+    // if (tokens.length == 0) {
+    //
+    //     return {
+    //         valid: SyntaxValidationResult.Drop,
+    //         matches: [],
+    //         // @ts-ignore
+    //         node: root,
+    //         // @ts-ignore
+    //         syntax: null,
+    //         error: 'expecting relative selector list',
+    //         tokens
+    //     }
+    // }
     for (const t of splitTokenList(tokens)) {
-        if (t.length == 0) {
-            return {
-                valid: SyntaxValidationResult.Drop,
-                matches: [],
-                // @ts-ignore
-                node: root,
-                // @ts-ignore
-                syntax: null,
-                error: 'unexpected comma',
-                tokens
-            };
-        }
+        // if (t.length == 0) {
+        //
+        //     return {
+        //         valid: SyntaxValidationResult.Drop,
+        //         matches: [],
+        //         // @ts-ignore
+        //         node: root,
+        //         // @ts-ignore
+        //         syntax: null,
+        //         error: 'unexpected comma',
+        //         tokens
+        //     }
+        // }
         const result = validateRelativeSelector(t, root, options);
         if (result.valid == SyntaxValidationResult.Drop) {
             return result;

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

@@ -5,7 +5,7 @@ import '../../ast/walk.js';
 import '../../parser/parse.js';
 import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
-import '../../renderer/color/utils/constants.js';
+import '../../syntax/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
 import { validateSelector } from './selector.js';
 import { combinatorsTokens } from './complex-selector.js';

package/dist/lib/validation/syntaxes/url.js

@@ -4,47 +4,49 @@ import '../../ast/walk.js';
 import '../../parser/parse.js';
 import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
-import '../../renderer/color/utils/constants.js';
+import '../../syntax/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
 import { consumeWhitespace } from '../utils/whitespace.js';
 
 function validateURL(token) {
-    if (token.typ == EnumToken.UrlTokenTokenType) {
-        // @ts-ignore
-        return {
-            valid: SyntaxValidationResult.Valid,
-            context: [],
-            node: token,
-            // @ts-ignore
-            syntax: 'url()',
-            error: ''
-        };
-    }
-    if (token.typ != EnumToken.UrlFunctionTokenType) {
-        // @ts-ignore
-        return {
-            valid: SyntaxValidationResult.Drop,
-            context: [],
-            node: token,
-            // @ts-ignore
-            syntax: 'url()',
-            error: 'expected url()'
-        };
-    }
+    // if (token.typ == EnumToken.UrlTokenTokenType) {
+    //
+    //     // @ts-ignore
+    //     return {
+    //         valid: SyntaxValidationResult.Valid,
+    //         context: [],
+    //         node: token,
+    //         // @ts-ignore
+    //         syntax: 'url()',
+    //         error: ''
+    //     }
+    // }
+    // if (token.typ != EnumToken.UrlFunctionTokenType) {
+    //
+    //     // @ts-ignore
+    //     return {
+    //         valid: SyntaxValidationResult.Drop,
+    //         context: [],
+    //         node: token,
+    //         // @ts-ignore
+    //         syntax: 'url()',
+    //         error: 'expected url()'
+    //     }
+    // }
     const children = token.chi.slice();
     consumeWhitespace(children);
-    if (children.length == 0 || ![EnumToken.UrlTokenTokenType, EnumToken.StringTokenType, EnumToken.HashTokenType].includes(children[0].typ)) {
+    if (children.length > 0 && [EnumToken.UrlTokenTokenType, EnumToken.StringTokenType, EnumToken.HashTokenType].includes(children[0].typ)) {
+        children.shift();
         // @ts-ignore
-        return {
-            valid: SyntaxValidationResult.Drop,
-            context: [],
-            node: children[0] ?? token,
-            // @ts-ignore
-            syntax: 'url()',
-            error: 'expected url-token'
-        };
+        // return {
+        //     valid: SyntaxValidationResult.Drop,
+        //     context: [],
+        //     node: children[0] ?? token,
+        //     // @ts-ignore
+        //     syntax: 'url()',
+        //     error: 'expected url-token'
+        // }
     }
-    children.shift();
     consumeWhitespace(children);
     if (children.length > 0) {
         // @ts-ignore

package/dist/lib/validation/utils/list.js

@@ -4,18 +4,18 @@ import '../../ast/walk.js';
 import '../../parser/parse.js';
 import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
-import '../../renderer/color/utils/constants.js';
+import '../../syntax/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
 
 function stripCommaToken(tokenList) {
     let result = [];
-    let last = null;
     for (let i = 0; i < tokenList.length; i++) {
-        if (tokenList[i].typ == EnumToken.CommaTokenType && last != null && last.typ == EnumToken.CommaTokenType) {
-            return null;
-        }
+        // if (tokenList[i].typ == EnumToken.CommaTokenType && last != null && last.typ == EnumToken.CommaTokenType) {
+        //
+        //     return null;
+        // }
         if (tokenList[i].typ != EnumToken.WhitespaceTokenType) {
-            last = tokenList[i];
+            tokenList[i];
         }
         if (tokenList[i].typ == EnumToken.CommentTokenType || tokenList[i].typ == EnumToken.CommaTokenType) {
             continue;
@@ -26,9 +26,10 @@ function stripCommaToken(tokenList) {
 }
 function splitTokenList(tokenList, split = [EnumToken.CommaTokenType]) {
     return tokenList.reduce((acc, curr) => {
-        if (curr.typ == EnumToken.CommentTokenType) {
-            return acc;
-        }
+        // if (curr.typ == EnumToken.CommentTokenType) {
+        //
+        //     return acc;
+        // }
         if (split.includes(curr.typ)) {
             acc.push([]);
         }

package/dist/lib/validation/utils/whitespace.js

@@ -4,7 +4,7 @@ import '../../ast/walk.js';
 import '../../parser/parse.js';
 import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
-import '../../renderer/color/utils/constants.js';
+import '../../syntax/color/utils/constants.js';
 import '../../renderer/sourcemap/lib/encode.js';
 
 function consumeWhitespace(tokens) {

package/dist/node/index.js

@@ -1,11 +1,13 @@
 import process from 'node:process';
-export { EnumToken, ValidationLevel } from '../lib/ast/types.js';
+export { ColorType, EnumToken, ValidationLevel } from '../lib/ast/types.js';
 export { minify } from '../lib/ast/minify.js';
 export { walk, walkValues } from '../lib/ast/walk.js';
 export { expand } from '../lib/ast/expand.js';
 import { doRender } from '../lib/renderer/render.js';
 export { renderToken } from '../lib/renderer/render.js';
-import '../lib/renderer/color/utils/constants.js';
+import '../lib/syntax/color/utils/constants.js';
+export { convertColor } from '../lib/syntax/color/color.js';
+export { isOkLabClose, okLabDistance } from '../lib/syntax/color/utils/distance.js';
 import { doParse } from '../lib/parser/parse.js';
 export { parseString, parseTokens } from '../lib/parser/parse.js';
 import '../lib/parser/tokenize.js';

package/dist/web/index.js

@@ -1,10 +1,12 @@
-export { EnumToken, ValidationLevel } from '../lib/ast/types.js';
+export { ColorType, EnumToken, ValidationLevel } from '../lib/ast/types.js';
 export { minify } from '../lib/ast/minify.js';
 export { walk, walkValues } from '../lib/ast/walk.js';
 export { expand } from '../lib/ast/expand.js';
 import { doRender } from '../lib/renderer/render.js';
 export { renderToken } from '../lib/renderer/render.js';
-import '../lib/renderer/color/utils/constants.js';
+import '../lib/syntax/color/utils/constants.js';
+export { convertColor } from '../lib/syntax/color/color.js';
+export { isOkLabClose, okLabDistance } from '../lib/syntax/color/utils/distance.js';
 import { doParse } from '../lib/parser/parse.js';
 export { parseString, parseTokens } from '../lib/parser/parse.js';
 import '../lib/parser/tokenize.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tbela99/css-parser",
   "description": "CSS parser for node and the browser",
-  "version": "v1.1.1",
+  "version": "v1.2.0",
   "exports": {
     ".": "./dist/node/index.js",
     "./node": "./dist/node/index.js",
@@ -19,8 +19,8 @@
     "test": "web-test-runner \"test/**/web.spec.js\" --node-resolve --playwright --browsers chromium firefox webkit --root-dir=.; mocha --reporter-options='maxDiffSize=1801920' --timeout=10000 \"test/**/node.spec.js\"",
     "test:web": "web-test-runner \"test/**/web.spec.js\" --node-resolve --playwright --browsers chromium firefox webkit --root-dir=.",
     "test:node": "mocha --reporter-options='maxDiffSize=1801920' \"test/**/node.spec.js\"",
-    "test:cov": "c8 -x 'test/specs/**/*.js' -x dist/lib/validation/syntax.js -x 'dist/lib/validation/parser/*.js' --reporter=html --reporter=text --reporter=json-summary mocha --reporter-options='maxDiffSize=1801920' --timeout=10000 \"test/**/node.spec.js\"",
-    "test:web-cov": "web-test-runner -x 'test/specs/**/*.js' -x dist/lib/validation/syntax.js,dist/lib/validation/parser \"test/**/web.spec.js\" --node-resolve --playwright --browsers chromium firefox webkit --root-dir=. --coverage",
+    "test:cov": "c8 -x 'test/specs/**/*.js' --reporter=html --reporter=text --reporter=json-summary mocha --reporter-options='maxDiffSize=1801920' --timeout=10000 \"test/**/node.spec.js\"",
+    "test:web-cov": "web-test-runner -x 'test/specs/**/*.js' \"test/**/web.spec.js\" --node-resolve --playwright --browsers chromium firefox webkit --root-dir=. --coverage",
     "profile": "node --enable-source-maps --inspect-brk test/inspect.js",
     "syntax-update": "esno tools/validation.ts",
     "debug": "web-test-runner \"test/**/web.spec.js\" --manual --open --node-resolve --root-dir=."
@@ -70,4 +70,4 @@
     "rollup-plugin-dts": "^6.2.1",
     "tslib": "^2.8.1"
   }
-}
+}