@tbela99/css-parser 0.9.1 → 1.1.0

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

@@ -1,30 +1,32 @@
 import { consumeWhitespace } from '../utils/whitespace.js';
-import { ValidationLevel } from '../../ast/types.js';
+import '../../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 { combinatorsTokens } from './complex-selector.js';
 
 function validateRelativeSelector(tokens, root, options) {
     tokens = tokens.slice();
     consumeWhitespace(tokens);
-    if (tokens.length == 0) {
-        // @ts-ignore
-        return {
-            valid: ValidationLevel.Drop,
-            matches: [],
-            // @ts-ignore
-            node: root,
-            // @ts-ignore
-            syntax: null,
-            error: 'expected selector',
-            tokens
-        };
-    }
+    // if (tokens.length == 0) {
+    //
+    //     // @ts-ignore
+    //     return {
+    //         valid: ValidationLevel.Drop,
+    //         matches: [],
+    //         // @ts-ignore
+    //         node: root,
+    //         // @ts-ignore
+    //         syntax: null,
+    //         error: 'expected selector',
+    //         tokens
+    //     }
+    // }
     // , EnumToken.DescendantCombinatorTokenType
     if (combinatorsTokens.includes(tokens[0].typ)) {
         tokens.shift();

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

@@ -1,35 +1,34 @@
-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 { consumeWhitespace } from '../utils/whitespace.js';
 
 function validateURL(token) {
     if (token.typ == EnumToken.UrlTokenTokenType) {
         // @ts-ignore
         return {
-            valid: ValidationLevel.Valid,
-            matches: [],
+            valid: SyntaxValidationResult.Valid,
+            context: [],
             node: token,
             // @ts-ignore
             syntax: 'url()',
-            error: '',
-            tokens: []
+            error: ''
         };
     }
     if (token.typ != EnumToken.UrlFunctionTokenType) {
         // @ts-ignore
         return {
-            valid: ValidationLevel.Drop,
-            matches: [],
+            valid: SyntaxValidationResult.Drop,
+            context: [],
             node: token,
             // @ts-ignore
             syntax: 'url()',
-            error: 'expected url()',
-            tokens: []
+            error: 'expected url()'
         };
     }
     const children = token.chi.slice();
@@ -37,13 +36,12 @@ function validateURL(token) {
     if (children.length == 0 || ![EnumToken.UrlTokenTokenType, EnumToken.StringTokenType, EnumToken.HashTokenType].includes(children[0].typ)) {
         // @ts-ignore
         return {
-            valid: ValidationLevel.Drop,
-            matches: [],
+            valid: SyntaxValidationResult.Drop,
+            context: [],
             node: children[0] ?? token,
             // @ts-ignore
             syntax: 'url()',
-            error: 'expected url-token',
-            tokens: children
+            error: 'expected url-token'
         };
     }
     children.shift();
@@ -51,24 +49,22 @@ function validateURL(token) {
     if (children.length > 0) {
         // @ts-ignore
         return {
-            valid: ValidationLevel.Drop,
-            matches: [],
+            valid: SyntaxValidationResult.Drop,
+            context: [],
             node: children[0] ?? token,
             // @ts-ignore
             syntax: 'url()',
-            error: 'unexpected token',
-            tokens: children
+            error: 'unexpected token'
         };
     }
     // @ts-ignore
     return {
-        valid: ValidationLevel.Valid,
-        matches: [],
+        valid: SyntaxValidationResult.Valid,
+        context: [],
         node: token,
         // @ts-ignore
         syntax: 'url()',
-        error: '',
-        tokens: []
+        error: ''
     };
 }
 

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

@@ -2,10 +2,28 @@ import { 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 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.WhitespaceTokenType) {
+            last = tokenList[i];
+        }
+        if (tokenList[i].typ == EnumToken.CommentTokenType || tokenList[i].typ == EnumToken.CommaTokenType) {
+            continue;
+        }
+        result.push(tokenList[i]);
+    }
+    return result;
+}
 function splitTokenList(tokenList, split = [EnumToken.CommaTokenType]) {
     return tokenList.reduce((acc, curr) => {
         if (curr.typ == EnumToken.CommentTokenType) {
@@ -21,4 +39,4 @@ function splitTokenList(tokenList, split = [EnumToken.CommaTokenType]) {
     }, [[]]);
 }
 
-export { splitTokenList };
+export { splitTokenList, stripCommaToken };

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

@@ -2,9 +2,10 @@ import { 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 consumeWhitespace(tokens) {
     if (tokens.length == 0) {

package/dist/node/index.js

@@ -1,18 +1,20 @@
 import process from 'node:process';
-export { EnumToken } from '../lib/ast/types.js';
+export { 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 { doParse } from '../lib/parser/parse.js';
 export { parseString, parseTokens } from '../lib/parser/parse.js';
-import '../lib/renderer/color/utils/constants.js';
+import '../lib/parser/tokenize.js';
 import '../lib/parser/utils/config.js';
 import '../lib/validation/config.js';
 import '../lib/validation/parser/types.js';
 import '../lib/validation/parser/parse.js';
 import '../lib/validation/syntaxes/complex-selector.js';
+import '../lib/validation/syntax.js';
 import { dirname, resolve } from '../lib/fs/resolve.js';
 import { load } from './load.js';
 

package/dist/node/load.js

@@ -7,7 +7,12 @@ function parseResponse(response) {
     }
     return response.text();
 }
-async function load(url, currentFile) {
+/**
+ * load file
+ * @param url
+ * @param currentFile
+ */
+async function load(url, currentFile = '.') {
     const resolved = resolve(url, currentFile);
     return matchUrl.test(resolved.absolute) ? fetch(resolved.absolute).then(parseResponse) : readFile(resolved.absolute, { encoding: 'utf-8' });
 }

package/dist/web/index.js

@@ -1,17 +1,19 @@
-export { EnumToken } from '../lib/ast/types.js';
+export { 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 { doParse } from '../lib/parser/parse.js';
 export { parseString, parseTokens } from '../lib/parser/parse.js';
-import '../lib/renderer/color/utils/constants.js';
+import '../lib/parser/tokenize.js';
 import '../lib/parser/utils/config.js';
 import '../lib/validation/config.js';
 import '../lib/validation/parser/types.js';
 import '../lib/validation/parser/parse.js';
 import '../lib/validation/syntaxes/complex-selector.js';
+import '../lib/validation/syntax.js';
 import { dirname, resolve } from '../lib/fs/resolve.js';
 import { load } from './load.js';
 

package/dist/web/load.js

@@ -6,6 +6,11 @@ function parseResponse(response) {
     }
     return response.text();
 }
+/**
+ * load file
+ * @param url
+ * @param currentFile
+ */
 async function load(url, currentFile) {
     let t;
     if (matchUrl.test(url)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tbela99/css-parser",
   "description": "CSS parser for node and the browser",
-  "version": "v0.9.1",
+  "version": "v1.1.0",
   "exports": {
     ".": "./dist/node/index.js",
     "./node": "./dist/node/index.js",
@@ -17,9 +17,10 @@
   "scripts": {
     "build": "rollup -c;./build.sh dist/index.d.ts 'declare interface' 'declare type'",
     "test": "web-test-runner \"test/**/web.spec.js\" --node-resolve --playwright --browsers chromium firefox webkit --root-dir=.; mocha --reporter-options='maxDiffSize=1801920' \"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 dist/lib/validation/syntax.js -x 'dist/lib/validation/parser/*.js' --reporter=html --reporter=text --reporter=json-summary mocha --reporter-options='maxDiffSize=1801920' \"test/**/node.spec.js\"",
-    "test:web-cov": "web-test-runner -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' -x dist/lib/validation/syntax.js -x 'dist/lib/validation/parser/*.js' --reporter=html --reporter=text --reporter=json-summary mocha --reporter-options='maxDiffSize=1801920' \"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",
     "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=."
@@ -51,22 +52,22 @@
   "homepage": "https://github.com/tbela99/css-parser#readme",
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",
-    "@rollup/plugin-commonjs": "^28.0.2",
+    "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^16.0.0",
-    "@rollup/plugin-typescript": "^12.1.2",
-    "@types/chai": "^5.0.1",
+    "@rollup/plugin-node-resolve": "^16.0.1",
+    "@rollup/plugin-typescript": "^12.1.4",
+    "@types/chai": "^5.2.2",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^22.13.5",
-    "@types/web": "^0.0.206",
-    "@web/test-runner": "^0.20.0",
-    "@web/test-runner-playwright": "^0.11.0",
+    "@types/node": "^24.0.10",
+    "@types/web": "^0.0.245",
+    "@web/test-runner": "^0.20.2",
+    "@web/test-runner-playwright": "^0.11.1",
     "c8": "^10.1.3",
     "esno": "^4.8.0",
-    "mocha": "^11.1.0",
-    "playwright": "^1.50.1",
-    "rollup": "^4.34.8",
-    "rollup-plugin-dts": "^6.1.1",
+    "mocha": "^11.7.1",
+    "playwright": "^1.53.2",
+    "rollup": "^4.44.2",
+    "rollup-plugin-dts": "^6.2.1",
     "tslib": "^2.8.1"
   }
 }

package/dist/lib/renderer/color/prophotoRgb.js

@@ -1,56 +0,0 @@
-import { srgb2xyz } from './xyz.js';
-import { XYZ_D65_to_D50, xyzd502srgb } from './xyzd50.js';
-
-function prophotorgb2srgbvalues(r, g, b, a = null) {
-    // @ts-ignore
-    return xyzd502srgb(...prophotorgb2xyz50(r, g, b, a));
-}
-function srgb2prophotorgbvalues(r, g, b, a) {
-    // @ts-ignore
-    return xyz50_to_prophotorgb(...XYZ_D65_to_D50(...srgb2xyz(r, g, b, a)));
-}
-function prophotorgb2lin_ProPhoto(r, g, b, a = null) {
-    return [r, g, b].map(v => {
-        let abs = Math.abs(v);
-        if (abs >= 16 / 512) {
-            return Math.sign(v) * Math.pow(abs, 1.8);
-        }
-        return v / 16;
-    }).concat(a == null || a == 1 ? [] : [a]);
-}
-function prophotorgb2xyz50(r, g, b, a = null) {
-    [r, g, b, a] = prophotorgb2lin_ProPhoto(r, g, b, a);
-    const xyz = [
-        0.7977666449006423 * r +
-            0.1351812974005331 * g +
-            0.0313477341283922 * b,
-        0.2880748288194013 * r +
-            0.7118352342418731 * g +
-            0.0000899369387256 * b,
-        0.8251046025104602 * b
-    ];
-    return xyz.concat(a == null || a == 1 ? [] : [a]);
-}
-function xyz50_to_prophotorgb(x, y, z, a) {
-    // @ts-ignore
-    return gam_prophotorgb(...[
-        x * 1.3457868816471585 -
-            y * 0.2555720873797946 -
-            0.0511018649755453 * z,
-        x * -0.5446307051249019 +
-            y * 1.5082477428451466 +
-            0.0205274474364214 * z,
-        1.2119675456389452 * z
-    ].concat(a == null || a == 1 ? [] : [a]));
-}
-function gam_prophotorgb(r, g, b, a) {
-    return [r, g, b].map(v => {
-        let abs = Math.abs(v);
-        if (abs >= 1 / 512) {
-            return Math.sign(v) * Math.pow(abs, 1 / 1.8);
-        }
-        return 16 * v;
-    }).concat(a == null || a == 1 ? [] : [a]);
-}
-
-export { prophotorgb2srgbvalues, srgb2prophotorgbvalues };

package/dist/lib/validation/declaration.js

@@ -1,94 +0,0 @@
-import { EnumToken, ValidationLevel } 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 { getSyntaxConfig, getParsedSyntax } from './config.js';
-import { validateSyntax } from './syntax.js';
-
-function validateDeclaration(declaration, options, root) {
-    const config = getSyntaxConfig();
-    let name = declaration.nam;
-    if (!(name in config.declarations) && !(name in config.syntaxes)) {
-        if (name[0] == '-') {
-            const match = /^-([a-z]+)-(.*)$/.exec(name);
-            if (match != null) {
-                name = match[2];
-            }
-        }
-    }
-    // root is at-rule - check if declaration allowed
-    if (root?.typ == EnumToken.AtRuleNodeType) {
-        //
-        const syntax = getParsedSyntax("atRules" /* ValidationSyntaxGroupEnum.AtRules */, '@' + root.nam)?.[0];
-        if (syntax != null) {
-            if (!('chi' in syntax)) {
-                return {
-                    valid: ValidationLevel.Drop,
-                    node: declaration,
-                    syntax,
-                    error: 'declaration not allowed here'
-                };
-            }
-            if (name.startsWith('--')) {
-                return {
-                    valid: ValidationLevel.Valid,
-                    node: declaration,
-                    syntax: null,
-                    error: ''
-                };
-            }
-            // console.error({syntax});
-            const config = getSyntaxConfig();
-            // @ts-ignore
-            const obj = config["atRules" /* ValidationSyntaxGroupEnum.AtRules */]['@' + root.nam];
-            if ('descriptors' in obj) {
-                const descriptors = obj.descriptors;
-                if (!(name in descriptors)) {
-                    return {
-                        valid: ValidationLevel.Drop,
-                        node: declaration,
-                        syntax: `<${declaration.nam}>`,
-                        error: `declaration <${declaration.nam}> is not allowed in <@${root.nam}>`
-                    };
-                }
-                const syntax = getParsedSyntax("atRules" /* ValidationSyntaxGroupEnum.AtRules */, ['@' + root.nam, 'descriptors', name]);
-                return validateSyntax(syntax, declaration.val, root, options);
-            }
-            // console.error({name});
-            //         if (!(name in config.declarations) && !(name in config.syntaxes)) {
-            //
-            //             return {
-            //
-            //                 valid: ValidationLevel.Drop,
-            //                 node: declaration,
-            //                 syntax: null,
-            //                 error: `unknown declaration "${declaration.nam}"`
-            //             }
-            //         }
-            //
-            //         return validateSyntax((syntax as ValidationAtRuleDefinitionToken).chi as ValidationToken[], [declaration], root, options);
-        }
-    }
-    if (name.startsWith('--')) {
-        return {
-            valid: ValidationLevel.Valid,
-            node: declaration,
-            syntax: null,
-            error: ''
-        };
-    }
-    if (!(name in config.declarations) && !(name in config.syntaxes)) {
-        return {
-            valid: ValidationLevel.Drop,
-            node: declaration,
-            syntax: `<${declaration.nam}>`,
-            error: `unknown declaration "${declaration.nam}"`
-        };
-    }
-    return validateSyntax(getParsedSyntax("declarations" /* ValidationSyntaxGroupEnum.Declarations */, name), declaration.val);
-}
-
-export { validateDeclaration };

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

@@ -1,29 +0,0 @@
-import { EnumToken, ValidationLevel } 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 { validateSyntax } from '../syntax.js';
-import { getParsedSyntax } from '../config.js';
-import { validateURL } from './url.js';
-
-function validateImage(token) {
-    if (token.typ == EnumToken.UrlFunctionTokenType) {
-        return validateURL(token);
-    }
-    if (token.typ == EnumToken.ImageFunctionTokenType) {
-        return validateSyntax(getParsedSyntax("syntaxes" /* ValidationSyntaxGroupEnum.Syntaxes */, token.val + '()'), token.chi);
-    }
-    return {
-        valid: ValidationLevel.Drop,
-        matches: [],
-        node: token,
-        syntax: 'image()',
-        error: 'expected <image> or <url>',
-        tokens: []
-    };
-}
-
-export { validateImage };