@eslint/css-tree 3.6.9 → 4.0.1

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2016-2024 by Roman Dvornov
+Copyright (C) 2016-2026 by Roman Dvornov
 Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

package/README.md

@@ -202,9 +202,9 @@ to get your logo on our READMEs and [website](https://eslint.org/sponsors).
 
 <h3>Platinum Sponsors</h3>
 <p><a href="https://automattic.com"><img src="https://images.opencollective.com/automattic/d0ef3e1/logo.png" alt="Automattic" height="128"></a></p><h3>Gold Sponsors</h3>
-<p><a href="https://qlty.sh/"><img src="https://images.opencollective.com/qltysh/33d157d/logo.png" alt="Qlty Software" height="96"></a> <a href="https://shopify.engineering/"><img src="https://avatars.githubusercontent.com/u/8085" alt="Shopify" height="96"></a></p><h3>Silver Sponsors</h3>
+<p><a href="https://qlty.sh/"><img src="https://images.opencollective.com/qltysh/33d157d/logo.png" alt="Qlty Software" height="96"></a></p><h3>Silver Sponsors</h3>
 <p><a href="https://vite.dev/"><img src="https://images.opencollective.com/vite/d472863/logo.png" alt="Vite" height="64"></a> <a href="https://liftoff.io/"><img src="https://images.opencollective.com/liftoff/2d6c3b6/logo.png" alt="Liftoff" height="64"></a> <a href="https://stackblitz.com"><img src="https://avatars.githubusercontent.com/u/28635252" alt="StackBlitz" height="64"></a></p><h3>Bronze Sponsors</h3>
-<p><a href="https://cybozu.co.jp/"><img src="https://images.opencollective.com/cybozu/933e46d/logo.png" alt="Cybozu" height="32"></a> <a href="https://opensource.sap.com"><img src="https://avatars.githubusercontent.com/u/2531208" alt="SAP" height="32"></a> <a href="https://www.crawljobs.com/"><img src="https://images.opencollective.com/crawljobs-poland/fa43a17/logo.png" alt="CrawlJobs" height="32"></a> <a href="https://depot.dev"><img src="https://images.opencollective.com/depot/39125a1/logo.png" alt="Depot" height="32"></a> <a href="https://www.n-ix.com/"><img src="https://images.opencollective.com/n-ix-ltd/575a7a5/logo.png" alt="N-iX Ltd" height="32"></a> <a href="https://icons8.com/"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8" height="32"></a> <a href="https://discord.com"><img src="https://images.opencollective.com/discordapp/f9645d9/logo.png" alt="Discord" height="32"></a> <a href="https://www.gitbook.com"><img src="https://avatars.githubusercontent.com/u/7111340" alt="GitBook" height="32"></a> <a href="https://herocoders.com"><img src="https://avatars.githubusercontent.com/u/37549774" alt="HeroCoders" height="32"></a> <a href="https://www.lambdatest.com"><img src="https://avatars.githubusercontent.com/u/171592363" alt="TestMu AI Open Source Office (Formerly LambdaTest)" height="32"></a></p>
+<p><a href="https://syntax.fm"><img src="https://github.com/syntaxfm.png" alt="Syntax" height="32"></a> <a href="https://cybozu.co.jp/"><img src="https://images.opencollective.com/cybozu/933e46d/logo.png" alt="Cybozu" height="32"></a> <a href="https://opensource.sap.com"><img src="https://avatars.githubusercontent.com/u/2531208" alt="SAP" height="32"></a> <a href="https://www.crawljobs.com/"><img src="https://images.opencollective.com/crawljobs-poland/fa43a17/logo.png" alt="CrawlJobs" height="32"></a> <a href="https://depot.dev"><img src="https://images.opencollective.com/depot/39125a1/logo.png" alt="Depot" height="32"></a> <a href="https://www.n-ix.com/"><img src="https://images.opencollective.com/n-ix-ltd/575a7a5/logo.png" alt="N-iX Ltd" height="32"></a> <a href="https://icons8.com/"><img src="https://images.opencollective.com/icons8/7fa1641/logo.png" alt="Icons8" height="32"></a> <a href="https://discord.com"><img src="https://images.opencollective.com/discordapp/f9645d9/logo.png" alt="Discord" height="32"></a> <a href="https://www.gitbook.com"><img src="https://avatars.githubusercontent.com/u/7111340" alt="GitBook" height="32"></a> <a href="https://herocoders.com"><img src="https://avatars.githubusercontent.com/u/37549774" alt="HeroCoders" height="32"></a> <a href="https://www.lambdatest.com"><img src="https://avatars.githubusercontent.com/u/171592363" alt="TestMu AI Open Source Office (Formerly LambdaTest)" height="32"></a></p>
 <h3>Technology Sponsors</h3>
 Technology sponsors allow us to use their products and services for free as part of a contribution to the open source ecosystem and our work.
 <p><a href="https://netlify.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/netlify-icon.svg" alt="Netlify" height="32"></a> <a href="https://algolia.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/algolia-icon.svg" alt="Algolia" height="32"></a> <a href="https://1password.com"><img src="https://raw.githubusercontent.com/eslint/eslint.org/main/src/assets/images/techsponsors/1password-icon.svg" alt="1Password" height="32"></a></p>

package/cjs/definition-syntax/parse.cjs

@@ -162,6 +162,16 @@ function maybeMultiplied(scanner, node) {
             return maybeMultiplied(scanner, multiplier);
         }
 
+        // https://www.w3.org/TR/css-values-4/#component-multipliers
+        // > the # and ? multipliers, {A} and ? multipliers, and {A,B} and ? multipliers
+        // > may be stacked as #?, {A}?, and {A,B}?, respectively
+        // Represent "{}?" as nested multipliers as well as "+#".
+        // The "#?" case is already handled above, in maybeMultiplied()
+        if (scanner.charCode() === QUESTIONMARK &&
+            scanner.charCodeAt(scanner.pos - 1) === RIGHTCURLYBRACKET) {
+            return maybeMultiplied(scanner, multiplier);
+        }
+
         return multiplier;
     }
 
@@ -378,35 +388,65 @@ function regroupTerms(terms, combinators) {
     return combinator;
 }
 
-function readImplicitGroup(scanner, stopCharCode) {
+function readImplicitGroup(scanner, stopCharCode = -1) {
     const combinators = Object.create(null);
     const terms = [];
-    let token;
     let prevToken = null;
     let prevTokenPos = scanner.pos;
+    let prevTokenIsFunction = false;
+
+    while (scanner.charCode() !== stopCharCode) {
+        let token = prevTokenIsFunction
+            ? readImplicitGroup(scanner, RIGHTPARENTHESIS)
+            : peek(scanner);
+
+        if (!token) {
+            break;
+        }
+
+        if (token.type === 'Spaces') {
+            continue;
+        }
+
+        if (prevTokenIsFunction) {
+            if (token.terms.length === 0) {
+                prevTokenIsFunction = false;
+                continue;
+            }
 
-    while (scanner.charCode() !== stopCharCode && (token = peek(scanner, stopCharCode))) {
-        if (token.type !== 'Spaces') {
-            if (token.type === 'Combinator') {
-                // check for combinator in group beginning and double combinator sequence
-                if (prevToken === null || prevToken.type === 'Combinator') {
-                    scanner.pos = prevTokenPos;
-                    scanner.error('Unexpected combinator');
+            if (token.combinator === ' ') {
+                while (token.terms.length > 1) {
+                    combinators[' '] = true;  // a b
+                    terms.push({
+                        type: 'Combinator',
+                        value: ' '
+                    }, token.terms.shift());
                 }
 
-                combinators[token.value] = true;
-            } else if (prevToken !== null && prevToken.type !== 'Combinator') {
-                combinators[' '] = true;  // a b
-                terms.push({
-                    type: 'Combinator',
-                    value: ' '
-                });
+                token = token.terms[0];
             }
+        }
 
-            terms.push(token);
-            prevToken = token;
-            prevTokenPos = scanner.pos;
+        if (token.type === 'Combinator') {
+            // check for combinator in group beginning and double combinator sequence
+            if (prevToken === null || prevToken.type === 'Combinator') {
+                scanner.pos = prevTokenPos;
+                scanner.error('Unexpected combinator');
+            }
+
+            combinators[token.value] = true;
+        } else if (prevToken !== null && prevToken.type !== 'Combinator') {
+            combinators[' '] = true;  // a b
+            terms.push({
+                type: 'Combinator',
+                value: ' '
+            });
         }
+
+        terms.push(token);
+        prevToken = token;
+        prevTokenPos = scanner.pos;
+        prevTokenIsFunction = token.type === 'Function';
     }
 
     // check for combinator in group ending
@@ -424,11 +464,11 @@ function readImplicitGroup(scanner, stopCharCode) {
     };
 }
 
-function readGroup(scanner, stopCharCode) {
+function readGroup(scanner) {
     let result;
 
     scanner.eat(LEFTSQUAREBRACKET);
-    result = readImplicitGroup(scanner, stopCharCode);
+    result = readImplicitGroup(scanner, RIGHTSQUAREBRACKET);
     scanner.eat(RIGHTSQUAREBRACKET);
 
     result.explicit = true;
@@ -441,7 +481,7 @@ function readGroup(scanner, stopCharCode) {
     return result;
 }
 
-function peek(scanner, stopCharCode) {
+function peek(scanner) {
     let code = scanner.charCode();
 
     switch (code) {
@@ -450,7 +490,7 @@ function peek(scanner, stopCharCode) {
             break;
 
         case LEFTSQUAREBRACKET:
-            return maybeMultiplied(scanner, readGroup(scanner, stopCharCode));
+            return maybeMultiplied(scanner, readGroup(scanner));
 
         case LESSTHANSIGN:
             return scanner.nextCharCode() === APOSTROPHE

package/cjs/generator/create.cjs

@@ -49,9 +49,13 @@ function createGenerator(config) {
                 }
             },
             tokenBefore: tokenBefore.safe,
-            token(type, value) {
+            token(type, value, suppressAutoWhiteSpace) {
                 prevCode = this.tokenBefore(prevCode, type, value);
 
+                if (!suppressAutoWhiteSpace && prevCode & 1) {
+                    this.emit(' ', types.WhiteSpace, true);
+                }
+
                 this.emit(value, type, false);
 
                 if (type === types.Delim && value.charCodeAt(0) === REVERSESOLIDUS) {
@@ -88,7 +92,11 @@ function createGenerator(config) {
                 const tokenize = getTokenizer.getTokenizer(config);
 
                 return tokenize(chunk, (type, start, end) => {
-                    this.token(type, chunk.slice(start, end));
+                    handlers.token(
+                        type,
+                        chunk.slice(start, end),
+                        start !== 0 // suppress auto whitespace for internal value tokens
+                    );
                 });
             }
         };

package/cjs/generator/token-before.cjs

@@ -5,17 +5,20 @@ const types = require('../tokenizer/types.cjs');
 const PLUSSIGN = 0x002B;    // U+002B PLUS SIGN (+)
 const HYPHENMINUS = 0x002D; // U+002D HYPHEN-MINUS (-)
 
+// code:
+// 0xxxxxxx x0000000 - char code (0x80 for non-ASCII) or delim value
+// 00000000 0xxxxxx0 - token type (0 for delim, 1 for token)
+// 00000000 0000000x - reserved for carriage emit flag (0 for no space, 1 for space)
 const code = (type, value) => {
     if (type === types.Delim) {
         type = value;
     }
 
     if (typeof type === 'string') {
-        const charCode = type.charCodeAt(0);
-        return charCode > 0x7F ? 0x8000 : charCode << 8;
+        type = Math.min(type.charCodeAt(0), 0x80) << 6; // replace non-ASCII with 0x80
     }
 
-    return type;
+    return type << 1;
 };
 
 // https://www.w3.org/TR/css-syntax-3/#serialization
@@ -152,14 +155,10 @@ function createMap(pairs) {
                 type !== types.Function &&
                 type !== types.CDC) ||
             (nextCharCode === PLUSSIGN)
-                ? isWhiteSpaceRequired.has(prevCode << 16 | nextCharCode << 8)
-                : isWhiteSpaceRequired.has(prevCode << 16 | nextCode);
+                ? isWhiteSpaceRequired.has((prevCode & 0xFFFE) << 16 | nextCharCode << 7)
+                : isWhiteSpaceRequired.has((prevCode & 0xFFFE) << 16 | nextCode);
 
-        if (emitWs) {
-            this.emit(' ', types.WhiteSpace, true);
-        }
-
-        return nextCode;
+        return nextCode | emitWs;
     };
 }
 

package/cjs/lexer/Lexer.cjs

@@ -443,9 +443,13 @@ class Lexer {
         return atrule && atrule.prelude || null;
     }
     getAtruleDescriptor(atruleName, name) {
-        return this.atrules.hasOwnProperty(atruleName) && this.atrules.declarators
-            ? this.atrules[atruleName].declarators[name] || null
+        const atrule = this.getAtrule(atruleName);
+        const descriptor = names.keyword(name);
+        const descriptorEntry = atrule && atrule.descriptors
+            ? atrule.descriptors[descriptor.name] || atrule.descriptors[descriptor.basename]
             : null;
+
+        return descriptorEntry || null;
     }
     getProperty(propertyName, fallbackBasename = true) {
         const property = names.property(propertyName);

package/cjs/lexer/generic.cjs

@@ -634,6 +634,17 @@ const productionTypes = {
     'any-value': anyValue
 };
 
+const unitGroups = [
+    'length',
+    'angle',
+    'time',
+    'frequency',
+    'resolution',
+    'flex',
+    'decibel',
+    'semitones'
+];
+
 // dimensions types depend on units set
 function createDemensionTypes(units) {
     const {
@@ -660,11 +671,42 @@ function createDemensionTypes(units) {
     };
 }
 
+// The <attr-unit> production matches any identifier that is an ASCII case-insensitive
+// match for the name of a CSS dimension unit, such as px, or the <delim-token> %.
+function createAttrUnit(units) {
+    const unitSet = new Set();
+
+    for (const group of unitGroups) {
+        if (Array.isArray(units[group])) {
+            for (const unit of units[group]) {
+                unitSet.add(unit.toLowerCase());
+            }
+        }
+    }
+
+    return function attrUnit(token) {
+        if (token === null) {
+            return 0;
+        }
+
+        if (token.type === types.Delim && token.value === '%') {
+            return 1;
+        }
+
+        if (token.type === types.Ident && unitSet.has(token.value.toLowerCase())) {
+            return 1;
+        }
+
+        return 0;
+    };
+}
+
 function createGenericTypes(units) {
     return {
         ...tokenTypes,
         ...productionTypes,
-        ...createDemensionTypes(units)
+        ...createDemensionTypes(units),
+        'attr-unit': createAttrUnit(units)
     };
 }
 
@@ -672,3 +714,4 @@ exports.createDemensionTypes = createDemensionTypes;
 exports.createGenericTypes = createGenericTypes;
 exports.productionTypes = productionTypes;
 exports.tokenTypes = tokenTypes;
+exports.unitGroups = unitGroups;

package/cjs/parser/create.cjs

@@ -17,6 +17,36 @@ const SEMICOLON = 0x003B;        // U+003B SEMICOLON (;)
 const LEFTCURLYBRACKET = 0x007B; // U+007B LEFT CURLY BRACKET ({)
 const NULL = 0;
 
+const arrayMethods = {
+    createList() {
+        return [];
+    },
+    createSingleNodeList(node) {
+        return [node];
+    },
+    getFirstListNode(list) {
+        return list && list[0] || null;
+    },
+    getLastListNode(list) {
+        return list && list.length > 0 ? list[list.length - 1] : null;
+    }
+};
+
+const listMethods = {
+    createList() {
+        return new List.List();
+    },
+    createSingleNodeList(node) {
+        return new List.List().appendData(node);
+    },
+    getFirstListNode(list) {
+        return list && list.first;
+    },
+    getLastListNode(list) {
+        return list && list.last;
+    }
+};
+
 function createParseContext(name) {
     return function() {
         return this[name]();
@@ -98,18 +128,10 @@ function createParser(config) {
             return code === SEMICOLON ? 2 : 0;
         },
 
-        createList() {
-            return new List.List();
-        },
-        createSingleNodeList(node) {
-            return new List.List().appendData(node);
-        },
-        getFirstListNode(list) {
-            return list && list.first;
-        },
-        getLastListNode(list) {
-            return list && list.last;
-        },
+        createList: NOOP,
+        createSingleNodeList: NOOP,
+        getFirstListNode: NOOP,
+        getLastListNode: NOOP,
 
         parseWithFallback(consumer, fallback) {
             const startIndex = this.tokenIndex;
@@ -334,12 +356,14 @@ function createParser(config) {
         parser.parseValue = 'parseValue' in options ? Boolean(options.parseValue) : true;
         parser.parseCustomProperty = 'parseCustomProperty' in options ? Boolean(options.parseCustomProperty) : false;
 
-        const { context = 'default', onComment, onToken } = options;
+        const { context = 'default', list = true, onComment, onToken } = options;
 
         if (context in parser.context === false) {
             throw new Error('Unknown context `' + context + '`');
         }
 
+        Object.assign(parser, list ? listMethods : arrayMethods);
+
         if (Array.isArray(onToken)) {
             parser.forEachToken((type, start, end) => {
                 onToken.push({ type, start, end });

package/data/patch.json

@@ -264,9 +264,10 @@
         "fill-opacity": {
             "comment": "added SVG property",
             "references": [
+                "https://developer.mozilla.org/en-US/docs/Web/CSS/fill-opacity",
                 "https://www.w3.org/TR/SVG/painting.html#FillProperty"
             ],
-            "syntax": "<number-zero-one>"
+            "syntax": "<number-zero-one> | <percentage>"
         },
         "filter": {
             "comment": "extend with IE legacy syntaxes",
@@ -346,6 +347,14 @@
             "comment": "extend by vendor keywords https://developer.mozilla.org/en-US/docs/Web/CSS/overflow-y",
             "syntax": "| <-non-standard-overflow>"
         },
+        "overflow-block": {
+            "comment": "extend by vendor keywords https://developer.mozilla.org/en-US/docs/Web/CSS/overflow-y",
+            "syntax": "| <-non-standard-overflow>"
+        },
+        "overflow-inline": {
+            "comment": "extend by vendor keywords https://developer.mozilla.org/en-US/docs/Web/CSS/overflow-x",
+            "syntax": "| <-non-standard-overflow>"
+        },
         "pause": {
             "comment": "https://www.w3.org/TR/css3-speech/#property-index",
             "syntax": "<'pause-before'> <'pause-after'>?"
@@ -572,6 +581,9 @@
         "attr-fallback": {
             "syntax": "<any-value>"
         },
+        "autospace": {
+            "syntax": "no-autospace | [ ideograph-alpha || ideograph-numeric || punctuation ] || [ insert | replace ]"
+        },
         "bottom": {
             "comment": "missed; not sure we should add it, but no others except `shape` is using it so it's ok for now; https://drafts.fxtf.org/css-masking-1/#funcdef-clip-rect",
             "syntax": "<length> | auto"
@@ -917,6 +929,27 @@
             "references": [
                 "https://drafts.csswg.org/css-anchor-position-1/#typedef-position-area"
             ]
+        },
+        "syntax": {
+            "syntax": "'*' | <syntax-component> [ <syntax-combinator> <syntax-component> ]* | <syntax-string>"
+        },
+        "syntax-component": {
+            "syntax": "<syntax-single-component> <syntax-multiplier>? | '<' transform-list '>'"
+        },
+        "syntax-single-component": {
+            "syntax": "'<' <syntax-type-name> '>' | <ident>"
+        },
+        "syntax-type-name": {
+            "syntax": "angle | color | custom-ident | image | integer | length | length-percentage | number | percentage | resolution | string | time | url | transform-function"
+        },
+        "syntax-combinator": {
+            "syntax": "'|'"
+        },
+        "syntax-multiplier": {
+            "syntax": "'#' | '+'"
+        },
+        "syntax-string": {
+            "syntax": "<string>"
         }
     }
 }