@eslint/css-tree 3.5.3 → 3.6.0

package/dist/data.cjs

@@ -526,8 +526,7 @@ module.exports = {
         "inset-area": "[[left|center|right|span-left|span-right|x-start|x-end|span-x-start|span-x-end|x-self-start|x-self-end|span-x-self-start|span-x-self-end|span-all]||[top|center|bottom|span-top|span-bottom|y-start|y-end|span-y-start|span-y-end|y-self-start|y-self-end|span-y-self-start|span-y-self-end|span-all]|[block-start|center|block-end|span-block-start|span-block-end|span-all]||[inline-start|center|inline-end|span-inline-start|span-inline-end|span-all]|[self-block-start|self-block-end|span-self-block-start|span-self-block-end|span-all]||[self-inline-start|self-inline-end|span-self-inline-start|span-self-inline-end|span-all]|[start|center|end|span-start|span-end|span-all]{1,2}|[self-start|center|self-end|span-self-start|span-self-end|span-all]{1,2}]",
         "font-variant-css2": "normal|small-caps",
         "font-width-css3": "normal|ultra-condensed|extra-condensed|condensed|semi-condensed|semi-expanded|expanded|extra-expanded|ultra-expanded",
-        "system-family-name": "caption|icon|menu|message-box|small-caption|status-bar",
-        "parentheses-block": "( <any-value>* )"
+        "system-family-name": "caption|icon|menu|message-box|small-caption|status-bar"
     },
     "properties": {
         "--*": "<declaration-value>",
@@ -1198,7 +1197,7 @@ module.exports = {
         "counter-style": {
             "prelude": "<counter-style-name>",
             "descriptors": {
-                "additive-symbols": "[<integer>&&<symbol>]#",
+                "additive-symbols": "[<integer [0,∞]>&&<symbol>]#",
                 "fallback": "<counter-style-name>",
                 "negative": "<symbol> <symbol>?",
                 "pad": "<integer>&&<symbol>",
@@ -1274,7 +1273,7 @@ module.exports = {
                 "bleed": "auto|<length>",
                 "marks": "none|[crop||cross]",
                 "page-orientation": "upright|rotate-left|rotate-right",
-                "size": "<length>{1,2}|auto|[<page-size>||[portrait|landscape]]"
+                "size": "<length [0,∞]>{1,2}|auto|[<page-size>||[portrait|landscape]]"
             }
         },
         "position-try": {

package/dist/data.js

@@ -526,8 +526,7 @@ export default {
         "inset-area": "[[left|center|right|span-left|span-right|x-start|x-end|span-x-start|span-x-end|x-self-start|x-self-end|span-x-self-start|span-x-self-end|span-all]||[top|center|bottom|span-top|span-bottom|y-start|y-end|span-y-start|span-y-end|y-self-start|y-self-end|span-y-self-start|span-y-self-end|span-all]|[block-start|center|block-end|span-block-start|span-block-end|span-all]||[inline-start|center|inline-end|span-inline-start|span-inline-end|span-all]|[self-block-start|self-block-end|span-self-block-start|span-self-block-end|span-all]||[self-inline-start|self-inline-end|span-self-inline-start|span-self-inline-end|span-all]|[start|center|end|span-start|span-end|span-all]{1,2}|[self-start|center|self-end|span-self-start|span-self-end|span-all]{1,2}]",
         "font-variant-css2": "normal|small-caps",
         "font-width-css3": "normal|ultra-condensed|extra-condensed|condensed|semi-condensed|semi-expanded|expanded|extra-expanded|ultra-expanded",
-        "system-family-name": "caption|icon|menu|message-box|small-caption|status-bar",
-        "parentheses-block": "( <any-value>* )"
+        "system-family-name": "caption|icon|menu|message-box|small-caption|status-bar"
     },
     "properties": {
         "--*": "<declaration-value>",
@@ -1198,7 +1197,7 @@ export default {
         "counter-style": {
             "prelude": "<counter-style-name>",
             "descriptors": {
-                "additive-symbols": "[<integer>&&<symbol>]#",
+                "additive-symbols": "[<integer [0,∞]>&&<symbol>]#",
                 "fallback": "<counter-style-name>",
                 "negative": "<symbol> <symbol>?",
                 "pad": "<integer>&&<symbol>",
@@ -1274,7 +1273,7 @@ export default {
                 "bleed": "auto|<length>",
                 "marks": "none|[crop||cross]",
                 "page-orientation": "upright|rotate-left|rotate-right",
-                "size": "<length>{1,2}|auto|[<page-size>||[portrait|landscape]]"
+                "size": "<length [0,∞]>{1,2}|auto|[<page-size>||[portrait|landscape]]"
             }
         },
         "position-try": {

package/dist/version.cjs

@@ -1 +1 @@
-module.exports = "3.5.3";
+module.exports = "3.6.0";

package/dist/version.js

@@ -1 +1 @@
-export const version = "3.5.3";
+export const version = "3.6.0";

package/lib/index.d.ts

@@ -1284,7 +1284,7 @@ export class TokenStream {
     lookupOffset(offset: number): number;
 
     /**
-     * Skips whitespace and comments and returns the starting index (inclusive) of the `idx`-th non-whitespace/comment token in the `TokenStream`.
+     * Returns the starting index (inclusive) of the `idx`-th non-whitespace/comment token in the `TokenStream`. This method skips whitespace and comment tokens until it finds the specified non-whitespace/comment token.
      *
      * @param index - The index of the non-whitespace/comment token to look up (starting from 0).
      * @returns The starting index of the `idx`-th non-whitespace/comment token, or `EOF` if the index is out of bounds or if the end of the stream is reached before the specified token is found.
@@ -1331,7 +1331,7 @@ export class TokenStream {
      * @param offset - The offset from the current token's starting index (optional). If provided, the function checks the token at the specified offset instead of the current token.
      * @returns True if the token is a delimiter with the specified character code, false otherwise.
      */
-    isDelim(code: number, offset: number): boolean;
+    isDelim(code: number, offset?: number): boolean;
 
     /**
      * Skips a specified number of tokens forward in the stream.
@@ -1715,8 +1715,7 @@ export interface WalkContext {
     break: symbol;
 
     /**
-     * Prevents the current node from being iterated. No visitor function will
-     * be invoked for its properties or children nodes. This value only affects
+     * Prevents the current node from being iterated. No visitor function will be invoked for its properties or children nodes. This value only affects
      * the `enter` visitor; the `leave` visitor is invoked after iterating
      * over all node's properties and children.
      */
@@ -2681,6 +2680,14 @@ interface Parser {
     error: (this: ParserContext, message: string, offset: number) => void;
 }
 
+// AtruleParseConfig type based on the structure of files in lib/syntax/atrule/
+interface AtruleParseConfig {
+    parse: {
+        prelude?: ((this: ParserContext) => List<CssNode>) | null;
+        block?: ((this: ParserContext, nested?: boolean) => CssNode) | null;
+    };
+}
+
 // https://github.com/csstree/csstree/blob/9de5189fadd6fb4e3a149eec0e80d6ed0d0541e5/lib/parser/create.js#L53-L80
 type ParseConfig = {
     context: Record<string, ConsumerFunction | undefined>;
@@ -2740,7 +2747,7 @@ export interface SyntaxConfig<T extends CssNodeCommon = CssNodeCommon> {
     properties: Record<string, string>;
     atrules: Record<string, AtruleSyntax>;
     node: Record<string, Partial<NodeSyntaxConfig<T>>>;
-    atrule: Record<string, { parse: ConsumerFunction; }>;
+    atrule: Record<string, AtruleParseConfig>;
     pseudo: Record<string, { parse: ConsumerFunction; }>;
     scope: Record<string, Partial<Recognizer>>;
     features: Record<string, Partial<Recognizer>>;

package/lib/lexer/generic.js

@@ -34,7 +34,91 @@ import {
     RightCurlyBracket
 } from '../tokenizer/index.js';
 
-const calcFunctionNames = ['calc(', '-moz-calc(', '-webkit-calc('];
+// CSS mathematical functions categorized by return type behavior
+// See: https://www.w3.org/TR/css-values-4/#math
+
+// Calculation functions that return different types depending on input
+const calcFunctionNames = [
+    'calc(',
+    '-moz-calc(',
+    '-webkit-calc('
+];
+
+// Comparison functions that return different types depending on input
+const comparisonFunctionNames = [
+    'min(',
+    'max(',
+    'clamp('
+];
+
+// Functions that return a stepped value, i.e. a value that is rounded to the nearest step
+const steppedValueFunctionNames = [
+    'round(',
+    'mod(',
+    'rem('
+];
+
+// Trigonometrical functions that return a <number>
+const trigNumberFunctionNames = [
+    'sin(',
+    'cos(',
+    'tan('
+];
+
+// Trigonometrical functions that return a <angle>
+const trigAngleFunctionNames = [
+    'asin(',
+    'acos(',
+    'atan(',
+    'atan2('
+];
+
+// Other functions that return a <number>
+const otherNumberFunctionNames = [
+    'pow(',
+    'sqrt(',
+    'log(',
+    'exp(',
+    'sign('
+];
+
+// Exponential functions that return a <number> or <dimension> or <percentage>
+const expNumberDimensionPercentageFunctionNames = [
+    'hypot('
+];
+
+// Return the same type as the input
+const signFunctionNames = [
+    'abs('
+];
+
+const numberFunctionNames = [
+    ...calcFunctionNames,
+    ...comparisonFunctionNames,
+    ...steppedValueFunctionNames,
+    ...trigNumberFunctionNames,
+    ...otherNumberFunctionNames,
+    ...expNumberDimensionPercentageFunctionNames,
+    ...signFunctionNames
+];
+
+const percentageFunctionNames = [
+    ...calcFunctionNames,
+    ...comparisonFunctionNames,
+    ...steppedValueFunctionNames,
+    ...expNumberDimensionPercentageFunctionNames,
+    ...signFunctionNames
+];
+
+const dimensionFunctionNames = [
+    ...calcFunctionNames,
+    ...comparisonFunctionNames,
+    ...steppedValueFunctionNames,
+    ...trigAngleFunctionNames,
+    ...expNumberDimensionPercentageFunctionNames,
+    ...signFunctionNames
+];
+
 const balancePair = new Map([
     [FunctionToken, RightParenthesis],
     [LeftParenthesis, RightParenthesis],
@@ -141,16 +225,17 @@ function consumeFunction(token, getNextToken) {
     return length;
 }
 
+
 // TODO: implement
 // can be used wherever <length>, <frequency>, <angle>, <time>, <percentage>, <number>, or <integer> values are allowed
 // https://drafts.csswg.org/css-values/#calc-notation
-function calc(next) {
+function math(next, functionNames) {
     return function(token, getNextToken, opts) {
         if (token === null) {
             return 0;
         }
 
-        if (token.type === FunctionToken && eqStrAny(token.value, calcFunctionNames)) {
+        if (token.type === FunctionToken && eqStrAny(token.value, functionNames)) {
             return consumeFunction(token, getNextToken);
         }
 
@@ -557,12 +642,12 @@ export const productionTypes = {
     'ident': tokenType(Ident),
 
     // percentage
-    'percentage': calc(percentage),
+    'percentage': math(percentage, percentageFunctionNames),
 
     // numeric
     'zero': zero(),
-    'number': calc(number),
-    'integer': calc(integer),
+    'number': math(number, numberFunctionNames),
+    'integer': math(integer, numberFunctionNames),
 
     // complex types
     'custom-ident': customIdent,
@@ -601,15 +686,15 @@ export function createDemensionTypes(units) {
     } = units || {};
 
     return {
-        'dimension': calc(dimension(null)),
-        'angle': calc(dimension(angle)),
-        'decibel': calc(dimension(decibel)),
-        'frequency': calc(dimension(frequency)),
-        'flex': calc(dimension(flex)),
-        'length': calc(zero(dimension(length))),
-        'resolution': calc(dimension(resolution)),
-        'semitones': calc(dimension(semitones)),
-        'time': calc(dimension(time))
+        'dimension': math(dimension(null), dimensionFunctionNames),
+        'angle': math(dimension(angle), dimensionFunctionNames),
+        'decibel': math(dimension(decibel), dimensionFunctionNames),
+        'frequency': math(dimension(frequency), dimensionFunctionNames),
+        'flex': math(dimension(flex), dimensionFunctionNames),
+        'length': math(zero(dimension(length)), dimensionFunctionNames),
+        'resolution': math(dimension(resolution), dimensionFunctionNames),
+        'semitones': math(dimension(semitones), dimensionFunctionNames),
+        'time': math(dimension(time), dimensionFunctionNames)
     };
 }
 

package/lib/syntax/node/Block.js

@@ -5,6 +5,7 @@ import {
     Semicolon,
     Hash,
     Colon,
+    Ident,
     AtKeyword,
     LeftSquareBracket,
     LeftCurlyBracket,
@@ -44,10 +45,24 @@ function consumeDeclaration() {
     return node;
 }
 
+function isElementSelectorStart() {
+    if (this.tokenType !== Ident) {
+        return false;
+    }
+
+    const nextTokenType = this.lookupTypeNonSC(1);
+
+    if (nextTokenType !== Colon && nextTokenType !== Semicolon && nextTokenType !== RightCurlyBracket) {
+        return true;
+    }
+
+    return false;
+}
+
 function isSelectorStart() {
     return this.tokenType === Delim && selectorStarts.has(this.source.charCodeAt(this.tokenStart)) ||
         this.tokenType === Hash || this.tokenType === LeftSquareBracket ||
-        this.tokenType === Colon;
+        this.tokenType === Colon || isElementSelectorStart.call(this);
 }
 
 export const name = 'Block';
@@ -60,8 +75,7 @@ export const structure = {
     ]]
 };
 
-export function parse(isStyleBlock) {
-    const consumer = isStyleBlock ? consumeDeclaration : consumeRule;
+export function parse(isStyleBlock, { allowNestedRules = false } = {}) {
     const start = this.tokenStart;
     let children = this.createList();
 
@@ -83,10 +97,16 @@ export function parse(isStyleBlock) {
                 break;
 
             default:
-                if (isStyleBlock && isSelectorStart.call(this)) {
-                    children.push(consumeRule.call(this));
+                if (isStyleBlock) {
+
+                    if (allowNestedRules && isSelectorStart.call(this)) {
+                        children.push(consumeRule.call(this));
+                    } else {
+                        children.push(consumeDeclaration.call(this));
+                    }
+
                 } else {
-                    children.push(consumer.call(this));
+                    children.push(consumeRule.call(this));
                 }
         }
     }

package/lib/syntax/node/Rule.js

@@ -35,7 +35,7 @@ export function parse() {
         prelude = consumeRaw.call(this, startToken);
     }
 
-    block = this.Block(true);
+    block = this.Block(true, { allowNestedRules: true });
 
     return {
         type: 'Rule',
@@ -48,4 +48,3 @@ export function generate(node) {
     this.node(node.prelude);
     this.node(node.block);
 }
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint/css-tree",
-  "version": "3.5.3",
+  "version": "3.6.0",
   "description": "A tool set for CSS: fast detailed parser (CSS → AST), walker (AST traversal), generator (AST → CSS) and lexer (validation and matching) based on specs and browser implementations",
   "author": "Roman Dvornov <rdvornov@gmail.com> (https://github.com/lahmatiy)",
   "license": "MIT",
@@ -107,7 +107,7 @@
     "test:types": "tsc -p tests/types/tsconfig.json"
   },
   "dependencies": {
-    "mdn-data": "2.20.0",
+    "mdn-data": "2.21.0",
     "source-map-js": "^1.0.1"
   },
   "devDependencies": {