@eslint/css-tree 3.5.3 → 3.6.0

package/cjs/lexer/generic.cjs

@@ -7,7 +7,91 @@ const charCodeDefinitions = require('../tokenizer/char-code-definitions.cjs');
 const types = require('../tokenizer/types.cjs');
 const utils = require('../tokenizer/utils.cjs');
 
-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([
     [types.Function, types.RightParenthesis],
     [types.LeftParenthesis, types.RightParenthesis],
@@ -114,16 +198,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 === types.Function && eqStrAny(token.value, calcFunctionNames)) {
+        if (token.type === types.Function && eqStrAny(token.value, functionNames)) {
             return consumeFunction(token, getNextToken);
         }
 
@@ -530,12 +615,12 @@ const productionTypes = {
     'ident': tokenType(types.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,
@@ -563,15 +648,15 @@ 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/cjs/syntax/node/Block.cjs

@@ -35,10 +35,24 @@ function consumeDeclaration() {
     return node;
 }
 
+function isElementSelectorStart() {
+    if (this.tokenType !== types.Ident) {
+        return false;
+    }
+
+    const nextTokenType = this.lookupTypeNonSC(1);
+
+    if (nextTokenType !== types.Colon && nextTokenType !== types.Semicolon && nextTokenType !== types.RightCurlyBracket) {
+        return true;
+    }
+
+    return false;
+}
+
 function isSelectorStart() {
     return this.tokenType === types.Delim && selectorStarts.has(this.source.charCodeAt(this.tokenStart)) ||
         this.tokenType === types.Hash || this.tokenType === types.LeftSquareBracket ||
-        this.tokenType === types.Colon;
+        this.tokenType === types.Colon || isElementSelectorStart.call(this);
 }
 
 const name = 'Block';
@@ -51,8 +65,7 @@ const structure = {
     ]]
 };
 
-function parse(isStyleBlock) {
-    const consumer = isStyleBlock ? consumeDeclaration : consumeRule;
+function parse(isStyleBlock, { allowNestedRules = false } = {}) {
     const start = this.tokenStart;
     let children = this.createList();
 
@@ -74,10 +87,16 @@ 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/cjs/syntax/node/Rule.cjs

@@ -37,7 +37,7 @@ function parse() {
         prelude = consumeRaw.call(this, startToken);
     }
 
-    block = this.Block(true);
+    block = this.Block(true, { allowNestedRules: true });
 
     return {
         type: 'Rule',

package/data/patch.json

@@ -815,10 +815,6 @@
         "system-family-name": {
             "syntax": "caption | icon | menu | message-box | small-caption | status-bar",
             "comment": "new definition on font-4, https://drafts.csswg.org/css-fonts-4/#system-family-name-value"
-        },
-        "parentheses-block": {
-            "comment": "missed in mdn-data",
-            "syntax": "( <any-value>* )"
         }
     }
 }