@eslint/css-tree 3.3.0 → 3.3.2

package/dist/version.cjs

@@ -1 +1 @@
-module.exports = "3.3.0";
+module.exports = "3.3.2";

package/dist/version.js

@@ -1 +1 @@
-export const version = "3.3.0";
+export const version = "3.3.2";

package/lib/index.d.ts

@@ -606,6 +606,18 @@ export interface Comment extends CssNodeCommon {
     value: string;
 }
 
+export interface Condition extends CssNodeCommon {
+    type: "Condition";
+    kind: string;
+    children: List<CssNode>;
+}
+
+export interface ConditionPlain extends CssNodeCommon {
+    type: "Condition";
+    kind: string;
+    children: CssNodePlain[];
+}
+
 export interface Declaration extends CssNodeCommon {
     type: "Declaration";
     important: boolean | string;
@@ -636,6 +648,37 @@ export interface Dimension extends CssNodeCommon {
     unit: string;
 }
 
+export interface Feature extends CssNodeCommon {
+    type: "Feature";
+    name: string;
+    kind: string;
+    value: Identifier | NumberNode | Dimension | Ratio | FunctionNode | null;
+}
+
+export interface FeatureFunction extends CssNodeCommon {
+    type: "FeatureFunction";
+    feature: string;
+    kind: string;
+    value: Declaration | Selector;
+}
+
+export interface FeatureFunctionPlain extends CssNodeCommon {
+    type: "FeatureFunction";
+    feature: string;
+    kind: string;
+    value: DeclarationPlain | SelectorPlain;
+}
+
+export interface FeatureRange extends CssNodeCommon {
+    type: "FeatureRange";
+    kind: string;
+    left: Identifier | NumberNode | Dimension | Ratio | FunctionNode;
+    leftComparison: string;
+    middle: Identifier | NumberNode | Dimension | Ratio | FunctionNode;
+    rightComparison: string | null;
+    right: Identifier | NumberNode | Dimension | Ratio | FunctionNode | null;
+}
+
 export interface FunctionNode extends CssNodeCommon {
     type: "Function";
     name: string;
@@ -663,6 +706,21 @@ export interface Identifier extends CssNodeCommon {
     name: string;
 }
 
+export interface Layer extends CssNodeCommon {
+    type: "Layer";
+    name: string;
+}
+
+export interface LayerList extends CssNodeCommon {
+    type: "LayerList";
+    children: List<Layer>;
+}
+
+export interface LayerListPlain extends CssNodeCommon {
+    type: "LayerList";
+    children: Layer[];
+}
+
 export interface MediaFeature extends CssNodeCommon {
     type: "MediaFeature";
     name: string;
@@ -807,6 +865,11 @@ export interface StyleSheet extends CssNodeCommon {
     children: List<CssNode>;
 }
 
+export interface SupportsDeclaration extends CssNodeCommon {
+    type: "SupportsDeclaration";
+    declaration: Declaration | Raw;
+}
+
 export interface StyleSheetPlain extends CssNodeCommon {
     type: "StyleSheet";
     children: CssNodePlain[];
@@ -842,6 +905,7 @@ export interface WhiteSpace extends CssNodeCommon {
     value: string;
 }
 
+/* IMPORTANT! If you update this, also update `CssNodePlain` */
 export type CssNode =
     | AnPlusB
     | Atrule
@@ -854,13 +918,19 @@ export type CssNode =
     | ClassSelector
     | Combinator
     | Comment
+    | Condition
     | Declaration
     | DeclarationList
     | Dimension
+    | Feature
+    | FeatureFunction
+    | FeatureRange
     | FunctionNode
     | Hash
     | IdSelector
     | Identifier
+    | Layer
+    | LayerList
     | MediaFeature
     | MediaQuery
     | MediaQueryList
@@ -879,12 +949,14 @@ export type CssNode =
     | SelectorList
     | StringNode
     | StyleSheet
+    | SupportsDeclaration
     | TypeSelector
     | UnicodeRange
     | Url
     | Value
     | WhiteSpace;
 
+/* IMPORTANT! If you update this, also update `CssNode` */
 export type CssNodePlain =
     | AnPlusB
     | AtrulePlain
@@ -897,16 +969,23 @@ export type CssNodePlain =
     | ClassSelector
     | Combinator
     | Comment
+    | ConditionPlain
     | DeclarationPlain
     | DeclarationListPlain
     | Dimension
+    | Feature
+    | FeatureFunctionPlain
+    | FeatureRange
     | FunctionNodePlain
     | Hash
     | IdSelector
     | Identifier
+    | Layer
+    | LayerListPlain
     | MediaFeature
     | MediaQueryPlain
     | MediaQueryListPlain
+    | NestingSelector
     | NthPlain
     | NumberNode
     | Operator
@@ -921,54 +1000,16 @@ export type CssNodePlain =
     | SelectorListPlain
     | StringNode
     | StyleSheetPlain
+    | SupportsDeclaration
     | TypeSelector
     | UnicodeRange
     | Url
     | ValuePlain
     | WhiteSpace;
 
-type CssNodeNames =
-    | "AnPlusB"
-    | "Atrule"
-    | "AtrulePrelude"
-    | "AttributeSelector"
-    | "Block"
-    | "Brackets"
-    | "CDC"
-    | "CDO"
-    | "ClassSelector"
-    | "Combinator"
-    | "Comment"
-    | "Declaration"
-    | "DeclarationList"
-    | "Dimension"
-    | "Function"
-    | "Hash"
-    | "IdSelector"
-    | "Identifier"
-    | "MediaFeature"
-    | "MediaQuery"
-    | "MediaQueryList"
-    | "NestingSelector"
-    | "Nth"
-    | "Number"
-    | "Operator"
-    | "Parentheses"
-    | "Percentage"
-    | "PseudoClassSelector"
-    | "PseudoElementSelector"
-    | "Ratio"
-    | "Raw"
-    | "Rule"
-    | "Selector"
-    | "SelectorList"
-    | "String"
-    | "StyleSheet"
-    | "TypeSelector"
-    | "UnicodeRange"
-    | "Url"
-    | "Value"
-    | "WhiteSpace";
+type CssNodeNames = CssNode["type"];
+
+type AnyCssNode = CssNode | CssNodePlain;
 
 // ----------------------------------------------------------
 // Tokenizer
@@ -1382,27 +1423,46 @@ export class OffsetToLocation {
  * Represents an error that occurs during CSS parsing. Extends the standard `SyntaxError`
  * to include additional details about the parsing error.
  */
+
+/**
+ * Represents a syntax error while parsing CSS code. In the actual code,
+ * this is called `SyntaxError`, but that clashes with the global `SyntaxError` class.
+ * This isn't exported separately but rather as a member of the `parse` function.
+ */
 export interface SyntaxParseError extends SyntaxError {
+
     /**
-     * The original input string that caused the error.
+     * The source code where the error occurred.
      */
-    input: string;
+    source: string;
 
     /**
-     * The character offset in the input string where the error occurred.
+     * The character offset in the source code where the error occurred.
      */
     offset: number;
 
     /**
-     * The raw error message without formatting.
+     * The line number (1-indexed) in the source code where the error occurred.
      */
-    rawMessage: string;
+    line: number;
+
+    /**
+     * The column number (1-indexed) in the source code where the error occurred.
+     */
+    column: number;
+
+    /**
+     * The source code fragment around the error, including a specified number of extra lines.
+     * @param extraLines The number of extra lines to include in the fragment.
+     * @return A string containing the source code fragment around the error.
+     * This fragment includes the error line and the specified number of lines before and after it.
+     */
+    sourceFragment(extraLines: number): string;
 
     /**
-     * The formatted error message, including contextual information such as
-     * the location in the input string.
+     * The error message formatted with the source fragment.
      */
-    formattedMessage: string;
+    readonly formattedMessage: string;
 }
 
 /**
@@ -1506,6 +1566,18 @@ export interface ParseOptions {
     parseCustomProperty?: boolean | undefined;
 }
 
+/**
+ * Creates a new instance of a parse error.
+ * @param message The error message describing the syntax error.
+ * @param source The source code where the error occurred.
+ * @param offset The character offset in the source code where the error occurred.
+ * @param line The line number (1-indexed) in the source code where the error occurred.
+ * @param column The column number (1-indexed) in the source code where the error occurred.
+ * @param baseLine The base line number (1-indexed) for the error, used for relative positioning.
+ * @param baseColumn The base column number (1-indexed) for the error, used for relative positioning.
+ */
+export type SyntaxErrorCreator = (message: string, source: string, offset: number, line: number, column: number, baseLine?: number, baseColumn?: number) => SyntaxParseError;
+
 /**
  * A function that parses a CSS string into an abstract syntax tree (AST).
  */
@@ -1523,7 +1595,7 @@ export interface ParseFunction {
     /**
      * The error class used for parsing errors.
      */
-    SyntaxError: typeof CSSSyntaxError;
+    SyntaxError: SyntaxErrorCreator;
 
     /**
      * The configuration used by the parser.
@@ -1613,7 +1685,7 @@ export interface GenerateOptions {
  * @param options - Optional configuration for the generator.
  * @returns The generated CSS string.
  */
-export type GenerateFunction = (ast: CssNode, options?: GenerateOptions) => string;
+export type GenerateFunction = (ast: AnyCssNode, options?: GenerateOptions) => string;
 
 /**
  * Generates a CSS string from an abstract syntax tree (AST).
@@ -1645,7 +1717,7 @@ export interface WalkContext {
     /**
      * The root node of the tree being traversed.
      */
-    root: CssNode;
+    root: AnyCssNode;
 
     /**
      * The current stylesheet node being visited, or `null` if not applicable.
@@ -1753,48 +1825,7 @@ export interface WalkOptionsVisit<NodeType extends CssNode = CssNode> {
 /**
  * Combined options for tree-walking, supporting specific node types or general traversal options.
  */
-export type WalkOptions =
-    | WalkOptionsVisit<AnPlusB>
-    | WalkOptionsVisit<Atrule>
-    | WalkOptionsVisit<AtrulePrelude>
-    | WalkOptionsVisit<AttributeSelector>
-    | WalkOptionsVisit<Block>
-    | WalkOptionsVisit<Brackets>
-    | WalkOptionsVisit<CDC>
-    | WalkOptionsVisit<CDO>
-    | WalkOptionsVisit<ClassSelector>
-    | WalkOptionsVisit<Combinator>
-    | WalkOptionsVisit<Comment>
-    | WalkOptionsVisit<Declaration>
-    | WalkOptionsVisit<DeclarationList>
-    | WalkOptionsVisit<Dimension>
-    | WalkOptionsVisit<FunctionNode>
-    | WalkOptionsVisit<Hash>
-    | WalkOptionsVisit<IdSelector>
-    | WalkOptionsVisit<Identifier>
-    | WalkOptionsVisit<MediaFeature>
-    | WalkOptionsVisit<MediaQuery>
-    | WalkOptionsVisit<MediaQueryList>
-    | WalkOptionsVisit<Nth>
-    | WalkOptionsVisit<NumberNode>
-    | WalkOptionsVisit<Operator>
-    | WalkOptionsVisit<Parentheses>
-    | WalkOptionsVisit<Percentage>
-    | WalkOptionsVisit<PseudoClassSelector>
-    | WalkOptionsVisit<PseudoElementSelector>
-    | WalkOptionsVisit<Ratio>
-    | WalkOptionsVisit<Raw>
-    | WalkOptionsVisit<Rule>
-    | WalkOptionsVisit<Selector>
-    | WalkOptionsVisit<SelectorList>
-    | WalkOptionsVisit<StringNode>
-    | WalkOptionsVisit<StyleSheet>
-    | WalkOptionsVisit<TypeSelector>
-    | WalkOptionsVisit<UnicodeRange>
-    | WalkOptionsVisit<Url>
-    | WalkOptionsVisit<Value>
-    | WalkOptionsVisit<WhiteSpace>
-    | WalkOptionsNoVisit;
+export type WalkOptions = WalkOptionsVisit<CssNode> | WalkOptionsNoVisit;
 
 /**
  * Walks through a CSS abstract syntax tree (AST) and invokes callback functions on nodes.
@@ -1806,7 +1837,7 @@ export const walk: {
      * @param ast - The CSS abstract syntax tree to traverse.
      * @param options - The options controlling the traversal process.
      */
-    (ast: CssNode, options: EnterOrLeaveFn | WalkOptions): void;
+    (ast: AnyCssNode, options: EnterOrLeaveFn | WalkOptions): void;
 
     /**
      * Stops traversal. No visitor function will be invoked once this value is returned by a visitor.
@@ -1828,7 +1859,7 @@ export const walk: {
  * @param list - The list containing the current node.
  * @returns `true` if the node matches the condition; `false` otherwise.
  */
-export type FindFn = (this: WalkContext, node: CssNode, item: ListItem<CssNode>, list: List<CssNode>) => boolean;
+export type FindFn = (this: WalkContext, node: AnyCssNode, item: ListItem<CssNode>, list: List<CssNode>) => boolean;
 
 /**
  * Finds the first node in the tree that matches the specified predicate function.
@@ -1837,7 +1868,7 @@ export type FindFn = (this: WalkContext, node: CssNode, item: ListItem<CssNode>,
  * @param fn - The predicate function to match nodes.
  * @returns The first matching node, or `null` if no match is found.
  */
-export function find(ast: CssNode, fn: FindFn): CssNode | null;
+export function find(ast: AnyCssNode, fn: FindFn): AnyCssNode | null;
 
 /**
  * Finds the last node in the tree that matches the specified predicate function.
@@ -1846,7 +1877,7 @@ export function find(ast: CssNode, fn: FindFn): CssNode | null;
  * @param fn - The predicate function to match nodes.
  * @returns The last matching node, or `null` if no match is found.
  */
-export function findLast(ast: CssNode, fn: FindFn): CssNode | null;
+export function findLast(ast: AnyCssNode, fn: FindFn): AnyCssNode | null;
 
 /**
  * Finds all nodes in the tree that match the specified predicate function.
@@ -1855,7 +1886,7 @@ export function findLast(ast: CssNode, fn: FindFn): CssNode | null;
  * @param fn - The predicate function to match nodes.
  * @returns An array of all matching nodes.
  */
-export function findAll(ast: CssNode, fn: FindFn): CssNode[];
+export function findAll(ast: AnyCssNode, fn: FindFn): AnyCssNode[];
 
 // ----------------------------------------------------------
 // Name utils
@@ -2266,59 +2297,6 @@ export const url: {
 // https://github.com/csstree/csstree/blob/master/lib/lexer/Lexer.js
 // ----------------------------------------------------------
 
-/**
- * Represents a syntax error while parsing CSS code. In the actual code,
- * this is called `SyntaxError`, but that clashes with the global `SyntaxError` class.
- * This isn't exported separately but rather as a member of the `parse` function.
- */
-declare class CSSSyntaxError extends SyntaxError {
-
-    /**
-     * Creates a new instance
-     * @param message The error message describing the syntax error.
-     * @param source The source code where the error occurred.
-     * @param offset The character offset in the source code where the error occurred.
-     * @param line The line number (1-indexed) in the source code where the error occurred.
-     * @param column The column number (1-indexed) in the source code where the error occurred.
-     * @param baseLine The base line number (1-indexed) for the error, used for relative positioning.
-     * @param baseColumn The base column number (1-indexed) for the error, used for relative positioning.
-     */
-    constructor(message: string, source: string, offset: number, line: number, column: number, baseLine?: number, baseColumn?: number);
-
-    /**
-     * The source code where the error occurred.
-     */
-    source: string;
-
-    /**
-     * The character offset in the source code where the error occurred.
-     */
-    offset: number;
-
-    /**
-     * The line number (1-indexed) in the source code where the error occurred.
-     */
-    line: number;
-
-    /**
-     * The column number (1-indexed) in the source code where the error occurred.
-     */
-    column: number;
-
-    /**
-     * The source code fragment around the error, including a specified number of extra lines.
-     * @param extraLines The number of extra lines to include in the fragment.
-     * @return A string containing the source code fragment around the error.
-     * This fragment includes the error line and the specified number of lines before and after it.
-     */
-    sourceFragment(extraLines: number): string;
-
-    /**
-     * The error message formatted with the source fragment.
-     */
-    readonly formattedMessage: string;
-}
-
 /**
  * Represents an error that occurs during the syntax matching process.
  * Extends the standard `SyntaxError` with additional properties specific to CSS parsing.
@@ -3055,7 +3033,7 @@ export class Lexer {
      * @param prelude - The prelude content.
      * @returns The match result as a `LexerMatchResult`.
      */
-    matchAtrulePrelude(atruleName: string, prelude: CssNode | string): LexerMatchResult;
+    matchAtrulePrelude(atruleName: string, prelude: AnyCssNode | string): LexerMatchResult;
 
     /**
      * Matches an at-rule descriptor value against its syntax definition.
@@ -3065,7 +3043,7 @@ export class Lexer {
      * @param value - The value to match.
      * @returns The match result as a `LexerMatchResult`.
      */
-    matchAtruleDescriptor(atruleName: string, descriptorName: string, value: CssNode | string): LexerMatchResult;
+    matchAtruleDescriptor(atruleName: string, descriptorName: string, value: AnyCssNode | string): LexerMatchResult;
 
     /**
      * Matches a declaration node against its syntax definition.
@@ -3073,7 +3051,7 @@ export class Lexer {
      * @param node - The declaration node to match.
      * @returns The match result as a `LexerMatchResult`.
      */
-    matchDeclaration(node: CssNode): LexerMatchResult;
+    matchDeclaration(node: AnyCssNode): LexerMatchResult;
 
     /**
      * Matches a property value against its syntax definition.
@@ -3082,7 +3060,7 @@ export class Lexer {
      * @param value - The value to match.
      * @returns The match result as a `LexerMatchResult`.
      */
-    matchProperty(propertyName: string, value: CssNode | string): LexerMatchResult;
+    matchProperty(propertyName: string, value: AnyCssNode | string): LexerMatchResult;
 
     /**
      * Matches a type value against its syntax definition.
@@ -3091,7 +3069,7 @@ export class Lexer {
      * @param value - The value to match.
      * @returns The match result as a `LexerMatchResult`.
      */
-    matchType(typeName: string, value: CssNode | string): LexerMatchResult;
+    matchType(typeName: string, value: AnyCssNode | string): LexerMatchResult;
 
     /**
      * Matches a generic syntax descriptor against a value.
@@ -3100,7 +3078,7 @@ export class Lexer {
      * @param value - The value to match.
      * @returns The match result as a `LexerMatchResult`.
      */
-    match(syntax: SyntaxDescriptor | string, value: CssNode | string): LexerMatchResult;
+    match(syntax: SyntaxDescriptor | string, value: AnyCssNode | string): LexerMatchResult;
 
     /**
      * Finds fragments of a value that match a specific syntax type and name.
@@ -3111,7 +3089,7 @@ export class Lexer {
      * @param name - The name to match.
      * @returns An array of matching fragments.
      */
-    findValueFragments(propertyName: string, value: CssNode, type: string, name: string): FragmentMatch<Value>[];
+    findValueFragments(propertyName: string, value: AnyCssNode, type: string, name: string): FragmentMatch<Value>[];
 
     /**
      * Finds fragments of a declaration value that match a specific syntax type and name.
@@ -3131,7 +3109,7 @@ export class Lexer {
      * @param name - The name to match.
      * @returns An array of matching fragments.
      */
-    findAllFragments(ast: CssNode, type: string, name: string): FragmentMatch[];
+    findAllFragments(ast: AnyCssNode, type: string, name: string): FragmentMatch[];
 
     /**
      * Retrieves the syntax descriptor for an at-rule.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint/css-tree",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "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",