@eslint/css-tree 4.1.0 → 4.1.1

package/dist/data.cjs

@@ -427,7 +427,7 @@ module.exports = {
         "superellipse()": "superellipse( [<number>|infinity|-infinity] )",
         "supports-condition": "not <supports-in-parens>|<supports-in-parens> [and <supports-in-parens>]*|<supports-in-parens> [or <supports-in-parens>]*",
         "supports-decl": "( <declaration> )",
-        "supports-feature": "<supports-decl>|<supports-selector-fn>",
+        "supports-feature": "<supports-selector-fn>|<supports-font-tech-fn>|<supports-font-format-fn>|<supports-at-rule-fn>|<supports-named-feature-fn>|<supports-env-fn>|<supports-decl>",
         "supports-in-parens": "( <supports-condition> )|<supports-feature>|<general-enclosed>",
         "supports-selector-fn": "selector( <complex-selector> )",
         "symbol": "<string>|<image>|<custom-ident>",
@@ -498,6 +498,10 @@ module.exports = {
         "bottom": "<length>|auto",
         "generic-voice": "[<age>? <gender> <integer>?]",
         "gender": "male|female|neutral",
+        "font-features-tech": "features-opentype|features-aat|features-graphite",
+        "font-format": "<string>|collection|embedded-opentype|opentype|svg|truetype|woff|woff2",
+        "font-tech": "<font-features-tech>|<color-font-tech>|variations|palettes|incremental",
+        "color-font-tech": "color-COLRv0|color-COLRv1|color-SVG|color-sbix|color-CBDT",
         "generic-script-specific": "generic( kai )|generic( fangsong )|generic( nastaliq )",
         "-non-standard-generic-family": "-apple-system|BlinkMacSystemFont",
         "intrinsic-size-keyword": "min-content|max-content|fit-content",
@@ -557,6 +561,11 @@ module.exports = {
         "alpha()": "alpha( [from <color>] [/ [<alpha-value>|none]]? )",
         "xyz-space": "xyz|xyz-d50|xyz-d65",
         "style-condition": "not <style-in-parens>|<style-in-parens> [[and <style-in-parens>]*|[or <style-in-parens>]*]",
+        "supports-font-tech-fn": "font-tech( <font-tech> )",
+        "supports-font-format-fn": "font-format( <font-format> )",
+        "supports-at-rule-fn": "at-rule( <at-keyword-token> )",
+        "supports-named-feature-fn": "named-feature( <ident> )",
+        "supports-env-fn": "env( <ident> )",
         "-non-standard-display": "-ms-inline-flexbox|-ms-grid|-ms-inline-grid|-webkit-flex|-webkit-inline-flex|-webkit-box|-webkit-inline-box|-moz-inline-stack|-moz-box|-moz-inline-box",
         "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}]",
         "syntax": "'*'|<syntax-component> [<syntax-combinator> <syntax-component>]*|<syntax-string>",

package/dist/data.js

@@ -427,7 +427,7 @@ export default {
         "superellipse()": "superellipse( [<number>|infinity|-infinity] )",
         "supports-condition": "not <supports-in-parens>|<supports-in-parens> [and <supports-in-parens>]*|<supports-in-parens> [or <supports-in-parens>]*",
         "supports-decl": "( <declaration> )",
-        "supports-feature": "<supports-decl>|<supports-selector-fn>",
+        "supports-feature": "<supports-selector-fn>|<supports-font-tech-fn>|<supports-font-format-fn>|<supports-at-rule-fn>|<supports-named-feature-fn>|<supports-env-fn>|<supports-decl>",
         "supports-in-parens": "( <supports-condition> )|<supports-feature>|<general-enclosed>",
         "supports-selector-fn": "selector( <complex-selector> )",
         "symbol": "<string>|<image>|<custom-ident>",
@@ -498,6 +498,10 @@ export default {
         "bottom": "<length>|auto",
         "generic-voice": "[<age>? <gender> <integer>?]",
         "gender": "male|female|neutral",
+        "font-features-tech": "features-opentype|features-aat|features-graphite",
+        "font-format": "<string>|collection|embedded-opentype|opentype|svg|truetype|woff|woff2",
+        "font-tech": "<font-features-tech>|<color-font-tech>|variations|palettes|incremental",
+        "color-font-tech": "color-COLRv0|color-COLRv1|color-SVG|color-sbix|color-CBDT",
         "generic-script-specific": "generic( kai )|generic( fangsong )|generic( nastaliq )",
         "-non-standard-generic-family": "-apple-system|BlinkMacSystemFont",
         "intrinsic-size-keyword": "min-content|max-content|fit-content",
@@ -557,6 +561,11 @@ export default {
         "alpha()": "alpha( [from <color>] [/ [<alpha-value>|none]]? )",
         "xyz-space": "xyz|xyz-d50|xyz-d65",
         "style-condition": "not <style-in-parens>|<style-in-parens> [[and <style-in-parens>]*|[or <style-in-parens>]*]",
+        "supports-font-tech-fn": "font-tech( <font-tech> )",
+        "supports-font-format-fn": "font-format( <font-format> )",
+        "supports-at-rule-fn": "at-rule( <at-keyword-token> )",
+        "supports-named-feature-fn": "named-feature( <ident> )",
+        "supports-env-fn": "env( <ident> )",
         "-non-standard-display": "-ms-inline-flexbox|-ms-grid|-ms-inline-grid|-webkit-flex|-webkit-inline-flex|-webkit-box|-webkit-inline-box|-moz-inline-stack|-moz-box|-moz-inline-box",
         "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}]",
         "syntax": "'*'|<syntax-component> [<syntax-combinator> <syntax-component>]*|<syntax-string>",

package/dist/version.cjs

@@ -1 +1 @@
-module.exports = "4.1.0";
+module.exports = "4.1.1";

package/dist/version.js

@@ -1 +1 @@
-export const version = "4.1.0";
+export const version = "4.1.1";

package/lib/index.d.ts

@@ -547,6 +547,11 @@ export interface AnPlusB extends CssNodeCommon {
     b: string | null;
 }
 
+export interface AtKeyword extends CssNodeCommon {
+    type: "AtKeyword";
+    name: string;
+}
+
 export interface Atrule extends CssNodeCommon {
     type: "Atrule";
     name: string;
@@ -665,14 +670,14 @@ export interface FeatureFunction extends CssNodeCommon {
     type: "FeatureFunction";
     feature: string;
     kind: string;
-    value: Declaration | Selector;
+    value: AtKeyword | Declaration | Identifier | Raw | Selector | StringNode;
 }
 
 export interface FeatureFunctionPlain extends CssNodeCommon {
     type: "FeatureFunction";
     feature: string;
     kind: string;
-    value: DeclarationPlain | SelectorPlain;
+    value: AtKeyword | DeclarationPlain | Identifier | Raw | SelectorPlain | StringNode;
 }
 
 export interface FeatureRange extends CssNodeCommon {
@@ -892,6 +897,7 @@ export interface WhiteSpace extends CssNodeCommon {
 /* IMPORTANT! If you update this, also update `CssNodePlain` */
 export type CssNode =
     | AnPlusB
+    | AtKeyword
     | Atrule
     | AtrulePrelude
     | AttributeSelector
@@ -943,6 +949,7 @@ export type CssNode =
 /* IMPORTANT! If you update this, also update `CssNode` */
 export type CssNodePlain =
     | AnPlusB
+    | AtKeyword
     | AtrulePlain
     | AtrulePreludePlain
     | AttributeSelector

package/lib/syntax/atrule/import.js

@@ -4,7 +4,8 @@ import {
     Url,
     Function as FunctionToken,
     LeftParenthesis,
-    RightParenthesis
+    RightParenthesis,
+    Colon
 } from '../../tokenizer/index.js';
 
 function parseWithFallback(parse, fallback) {
@@ -42,8 +43,9 @@ const parseFunctions = {
         const children = this.createList();
         const node = parseWithFallback.call(
             this,
-            this.Declaration,
-            () => parseWithFallback.call(this, () => this.Condition('supports'))
+            this.tokenType === Ident && this.lookupTypeNonSC(1) === Colon
+                ? this.Declaration
+                : () => this.Condition('supports')
         );
 
         if (node.type !== 'Raw' || node.value !== '') {

package/lib/syntax/config/parser.js

@@ -2,7 +2,28 @@ import * as scope from '../scope/index.js';
 import atrule from '../atrule/index.js';
 import pseudo from '../pseudo/index.js';
 import * as node from '../node/index-parse.js';
-import { tokenize } from '../../tokenizer/index.js';
+import {
+    Ident,
+    String as StringToken,
+    tokenize
+} from '../../tokenizer/index.js';
+
+function identifier() {
+    return this.Identifier();
+}
+
+function fontFormat() {
+    switch (this.tokenType) {
+        case Ident:
+            return this.Identifier();
+
+        case StringToken:
+            return this.String();
+
+        default:
+            this.error('Identifier or string is expected');
+    }
+}
 
 export default {
     parseContext: {
@@ -31,7 +52,14 @@ export default {
         supports: {
             selector() {
                 return this.Selector();
-            }
+            },
+            'font-tech': identifier,
+            'font-format': fontFormat,
+            'at-rule'() {
+                return this.AtKeyword();
+            },
+            'named-feature': identifier,
+            env: identifier
         },
         container: {
             style() {

package/lib/syntax/node/AtKeyword.js

@@ -0,0 +1,22 @@
+import { AtKeyword as AtKeywordToken } from '../../tokenizer/index.js';
+
+export const name = 'AtKeyword';
+export const structure = {
+    name: String
+};
+
+export function parse() {
+    const start = this.tokenStart;
+
+    this.eat(AtKeywordToken);
+
+    return {
+        type: 'AtKeyword',
+        loc: this.getLocation(start, this.tokenStart),
+        name: this.substrToCursor(start + 1)
+    };
+}
+
+export function generate(node) {
+    this.token(AtKeywordToken, '@' + node.name);
+}

package/lib/syntax/node/Condition.js

@@ -36,7 +36,12 @@ const parentheses = {
     media: featureOrRange,
     container: featureOrRange,
     supports() {
-        return this.SupportsDeclaration();
+        if (this.lookupTypeNonSC(1) === Ident &&
+            this.lookupTypeNonSC(2) === Colon) {
+            return this.SupportsDeclaration();
+        }
+
+        return null;
     }
 };
 

package/lib/syntax/node/FeatureFunction.js

@@ -7,7 +7,7 @@ export const name = 'FeatureFunction';
 export const structure = {
     kind: String,
     feature: String,
-    value: ['Declaration', 'Selector']
+    value: ['Declaration', 'Selector', 'Identifier', 'String', 'AtKeyword', 'Raw']
 };
 
 function getFeatureParser(kind, name) {
@@ -33,6 +33,8 @@ export function parse(kind = 'unknown') {
             const startValueToken = this.tokenIndex;
             const value = valueParser.call(this);
 
+            this.skipSC();
+
             if (this.eof === false &&
                 this.isBalanceEdge(startValueToken) === false) {
                 this.error();

package/lib/syntax/node/index-generate.js

@@ -1,4 +1,5 @@
 export { generate as AnPlusB } from './AnPlusB.js';
+export { generate as AtKeyword } from './AtKeyword.js';
 export { generate as Atrule } from './Atrule.js';
 export { generate as AtrulePrelude } from './AtrulePrelude.js';
 export { generate as AttributeSelector } from './AttributeSelector.js';

package/lib/syntax/node/index-parse.js

@@ -1,4 +1,5 @@
 export { parse as AnPlusB } from './AnPlusB.js';
+export { parse as AtKeyword } from './AtKeyword.js';
 export { parse as Atrule } from './Atrule.js';
 export { parse as AtrulePrelude } from './AtrulePrelude.js';
 export { parse as AttributeSelector } from './AttributeSelector.js';

package/lib/syntax/node/index.js

@@ -1,4 +1,5 @@
 export * as AnPlusB from './AnPlusB.js';
+export * as AtKeyword from './AtKeyword.js';
 export * as Atrule from './Atrule.js';
 export * as AtrulePrelude from './AtrulePrelude.js';
 export * as AttributeSelector from './AttributeSelector.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint/css-tree",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "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.34.0",
+    "mdn-data": "2.35.0",
     "source-map-js": "^1.2.1"
   },
   "devDependencies": {