postcss-calc 10.1.0 → 10.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-calc",
-  "version": "10.1.0",
+  "version": "10.1.1",
   "description": "PostCSS plugin to reduce calc()",
   "keywords": [
     "css",
@@ -27,13 +27,13 @@
     "node": "^18.12 || ^20.9 || >=22.0"
   },
   "devDependencies": {
-    "@types/node": "^22.10.2",
-    "eslint": "^9.17.0",
-    "eslint-config-prettier": "^9.1.0",
+    "@types/node": "^22.10.10",
+    "eslint": "^9.19.0",
+    "eslint-config-prettier": "^10.0.1",
     "jison-gho": "0.6.1-216",
-    "postcss": "^8.4.49",
+    "postcss": "^8.5.1",
     "prettier": "^3.4.2",
-    "typescript": "~5.7.2"
+    "typescript": "~5.7.3"
   },
   "dependencies": {
     "postcss-selector-parser": "^7.0.0",

package/src/lib/reducer.js

@@ -361,6 +361,12 @@ function includesNoCssProperties(node) {
  * @return {import('../parser').CalcNode}
  */
 function reduce(node, precision) {
+  if (
+    node.type === 'MathExpression' &&
+    (node.left.type === 'CalcKeyword' || node.right.type === 'CalcKeyword')
+  ) {
+    return node;
+  }
   if (node.type === 'MathExpression') {
     if (isAddSubOperator(node.operator)) {
       // reduceAddSubExpression will call reduce recursively

package/src/lib/stringifier.js

@@ -31,6 +31,8 @@ function stringify(node, prec) {
       let str = '';
       if (left.type === 'MathExpression' && order[op] < order[left.operator]) {
         str += `(${stringify(left, prec)})`;
+      } else if (left.type === 'CalcKeyword') {
+        str += left.value;
       } else {
         str += stringify(left, prec);
       }
@@ -42,6 +44,8 @@ function stringify(node, prec) {
         order[op] < order[right.operator]
       ) {
         str += `(${stringify(right, prec)})`;
+      } else if (right.type === 'CalcKeyword') {
+        str += right.value;
       } else {
         str += stringify(right, prec);
       }
@@ -54,6 +58,8 @@ function stringify(node, prec) {
       return node.value.toString();
     case 'ParenthesizedExpression':
       return `(${stringify(node.content, prec)})`;
+    case 'CalcKeyword':
+      return node.value;
     default:
       return round(node.value, prec) + node.unit;
   }
@@ -73,8 +79,10 @@ module.exports = function (calc, node, originalValue, options, result, item) {
   let str = stringify(node, options.precision);
 
   const shouldPrintCalc =
-    node.type === 'MathExpression' || node.type === 'Function' ||
-    node.type === 'ParenthesizedExpression';
+    node.type === 'MathExpression' ||
+    node.type === 'Function' ||
+    node.type === 'ParenthesizedExpression' ||
+    node.type === 'CalcKeyword';
 
   if (shouldPrintCalc) {
     // if calc expression couldn't be resolved to a single value, re-wrap it as

package/src/parser.d.ts

@@ -68,9 +68,19 @@ export interface FunctionExpression {
   value: string;
 }
 
+export interface CalcKeywordExpression {
+  type: 'CalcKeyword';
+  value: string;
+}
+
 export type ValueExpression = DimensionExpression | NumberExpression;
 
-export type CalcNode = MathExpression | ValueExpression | FunctionExpression | ParenthesizedExpression;
+export type CalcNode =
+  | MathExpression
+  | ValueExpression
+  | FunctionExpression
+  | ParenthesizedExpression
+  | CalcKeywordExpression;
 
 export interface Parser {
   parse: (arg: string) => CalcNode;

package/src/parser.js

@@ -612,6 +612,7 @@ symbols_: {
   "ADD": 6,
   "ANGLE": 12,
   "CALC": 3,
+  "CALC_KEYWORD": 54,
   "CHS": 19,
   "CQBS": 48,
   "CQHS": 46,
@@ -641,7 +642,7 @@ symbols_: {
   "LVMINS": 31,
   "LVWS": 27,
   "MUL": 8,
-  "NUMBER": 54,
+  "NUMBER": 55,
   "PERCENTAGE": 53,
   "REMS": 20,
   "RES": 15,
@@ -662,12 +663,13 @@ symbols_: {
   "VMAXS": 33,
   "VMINS": 29,
   "VWS": 25,
-  "dimension": 58,
+  "calc_keyword": 60,
+  "dimension": 59,
   "error": 2,
-  "expression": 55,
-  "function": 57,
-  "math_expression": 56,
-  "number": 59
+  "expression": 56,
+  "function": 58,
+  "math_expression": 57,
+  "number": 61
 },
 terminals_: {
   1: "EOF",
@@ -723,7 +725,8 @@ terminals_: {
   51: "LHS",
   52: "RLHS",
   53: "PERCENTAGE",
-  54: "NUMBER"
+  54: "CALC_KEYWORD",
+  55: "NUMBER"
 },
 TERROR: 2,
     EOF: 1,
@@ -829,14 +832,15 @@ TERROR: 2,
     },
 productions_: bp({
   pop: u([
-  55,
+  56,
   s,
-  [56, 9],
-  57,
+  [57, 10],
+  58,
   s,
-  [58, 45],
+  [59, 45],
+  60,
   s,
-  [59, 3]
+  [61, 3]
 ]),
   rule: u([
   2,
@@ -844,11 +848,11 @@ productions_: bp({
   s,
   [3, 5],
   s,
-  [1, 47],
+  [1, 48],
   2,
   2,
   c,
-  [3, 3]
+  [4, 4]
 ])
 }),
 performAction: function parser__PerformAction(yystate /* action[1] */, yysp, yyvstack) {
@@ -912,295 +916,303 @@ case 9:
     /*! Production::    math_expression : dimension */
 case 10:
     /*! Production::    math_expression : number */
+case 11:
+    /*! Production::    math_expression : calc_keyword */
 
     this.$ = yyvstack[yysp];
     break;
 
-case 11:
+case 12:
     /*! Production::    function : FUNCTION */
 
     this.$ = { type: 'Function', value: yyvstack[yysp] };
     break;
 
-case 12:
+case 13:
     /*! Production::    dimension : LENGTH */
 
     this.$ = { type: 'LengthValue', value: parseFloat(yyvstack[yysp]), unit: /[a-z]+$/i.exec(yyvstack[yysp])[0] };
     break;
 
-case 13:
+case 14:
     /*! Production::    dimension : ANGLE */
 
     this.$ = { type: 'AngleValue', value: parseFloat(yyvstack[yysp]), unit: /[a-z]+$/i.exec(yyvstack[yysp])[0] };
     break;
 
-case 14:
+case 15:
     /*! Production::    dimension : TIME */
 
     this.$ = { type: 'TimeValue', value: parseFloat(yyvstack[yysp]), unit: /[a-z]+$/i.exec(yyvstack[yysp])[0] };
     break;
 
-case 15:
+case 16:
     /*! Production::    dimension : FREQ */
 
     this.$ = { type: 'FrequencyValue', value: parseFloat(yyvstack[yysp]), unit: /[a-z]+$/i.exec(yyvstack[yysp])[0] };
     break;
 
-case 16:
+case 17:
     /*! Production::    dimension : RES */
 
     this.$ = { type: 'ResolutionValue', value: parseFloat(yyvstack[yysp]), unit: /[a-z]+$/i.exec(yyvstack[yysp])[0] };
     break;
 
-case 17:
+case 18:
     /*! Production::    dimension : UNKNOWN_DIMENSION */
 
     this.$ = { type: 'UnknownDimension', value: parseFloat(yyvstack[yysp]), unit: /[a-z]+$/i.exec(yyvstack[yysp])[0] };
     break;
 
-case 18:
+case 19:
     /*! Production::    dimension : EMS */
 
     this.$ = { type: 'EmValue', value: parseFloat(yyvstack[yysp]), unit: 'em' };
     break;
 
-case 19:
+case 20:
     /*! Production::    dimension : EXS */
 
     this.$ = { type: 'ExValue', value: parseFloat(yyvstack[yysp]), unit: 'ex' };
     break;
 
-case 20:
+case 21:
     /*! Production::    dimension : CHS */
 
     this.$ = { type: 'ChValue', value: parseFloat(yyvstack[yysp]), unit: 'ch' };
     break;
 
-case 21:
+case 22:
     /*! Production::    dimension : REMS */
 
     this.$ = { type: 'RemValue', value: parseFloat(yyvstack[yysp]), unit: 'rem' };
     break;
 
-case 22:
+case 23:
     /*! Production::    dimension : VHS */
 
     this.$ = { type: 'VhValue', value: parseFloat(yyvstack[yysp]), unit: 'vh' };
     break;
 
-case 23:
+case 24:
     /*! Production::    dimension : SVHS */
 
     this.$ = { type: 'SvhValue', value: parseFloat(yyvstack[yysp]), unit: 'svh' };
     break;
 
-case 24:
+case 25:
     /*! Production::    dimension : LVHS */
 
     this.$ = { type: 'LvhValue', value: parseFloat(yyvstack[yysp]), unit: 'lvh' };
     break;
 
-case 25:
+case 26:
     /*! Production::    dimension : DVHS */
 
     this.$ = { type: 'DvhValue', value: parseFloat(yyvstack[yysp]), unit: 'dvh' };
     break;
 
-case 26:
+case 27:
     /*! Production::    dimension : VWS */
 
     this.$ = { type: 'VwValue', value: parseFloat(yyvstack[yysp]), unit: 'vw' };
     break;
 
-case 27:
+case 28:
     /*! Production::    dimension : SVWS */
 
     this.$ = { type: 'SvwValue', value: parseFloat(yyvstack[yysp]), unit: 'svw' };
     break;
 
-case 28:
+case 29:
     /*! Production::    dimension : LVWS */
 
     this.$ = { type: 'LvwValue', value: parseFloat(yyvstack[yysp]), unit: 'lvw' };
     break;
 
-case 29:
+case 30:
     /*! Production::    dimension : DVWS */
 
     this.$ = { type: 'DvwValue', value: parseFloat(yyvstack[yysp]), unit: 'dvw'  };
     break;
 
-case 30:
+case 31:
     /*! Production::    dimension : VMINS */
 
     this.$ = { type: 'VminValue', value: parseFloat(yyvstack[yysp]), unit: 'vmin' };
     break;
 
-case 31:
+case 32:
     /*! Production::    dimension : SVMINS */
 
     this.$ = { type: 'SvminValue', value: parseFloat(yyvstack[yysp]), unit: 'svmin' };
     break;
 
-case 32:
+case 33:
     /*! Production::    dimension : LVMINS */
 
     this.$ = { type: 'LvminValue', value: parseFloat(yyvstack[yysp]), unit: 'lvmin' };
     break;
 
-case 33:
+case 34:
     /*! Production::    dimension : DVMINS */
 
     this.$ = { type: 'DvminValue', value: parseFloat(yyvstack[yysp]), unit: 'dvmin' };
     break;
 
-case 34:
+case 35:
     /*! Production::    dimension : VMAXS */
 
     this.$ = { type: 'VmaxValue', value: parseFloat(yyvstack[yysp]), unit: 'vmax' };
     break;
 
-case 35:
+case 36:
     /*! Production::    dimension : SVMAXS */
 
     this.$ = { type: 'SvmaxValue', value: parseFloat(yyvstack[yysp]), unit: 'svmax' };
     break;
 
-case 36:
+case 37:
     /*! Production::    dimension : LVMAXS */
 
     this.$ = { type: 'LvmaxValue', value: parseFloat(yyvstack[yysp]), unit: 'lvmax' };
     break;
 
-case 37:
+case 38:
     /*! Production::    dimension : DVMAXS */
 
     this.$ = { type: 'DvmaxValue', value: parseFloat(yyvstack[yysp]), unit: 'dvmax' };
     break;
 
-case 38:
+case 39:
     /*! Production::    dimension : VBS */
 
     this.$ = { type: 'VbValue', value: parseFloat(yyvstack[yysp]), unit: 'vb' };
     break;
 
-case 39:
+case 40:
     /*! Production::    dimension : SVBS */
 
     this.$ = { type: 'SvbValue', value: parseFloat(yyvstack[yysp]), unit: 'svb' };
     break;
 
-case 40:
+case 41:
     /*! Production::    dimension : LVBS */
 
     this.$ = { type: 'LvbValue', value: parseFloat(yyvstack[yysp]), unit: 'lvb' };
     break;
 
-case 41:
+case 42:
     /*! Production::    dimension : DVBS */
 
     this.$ = { type: 'DvbValue', value: parseFloat(yyvstack[yysp]), unit: 'dvb' };
     break;
 
-case 42:
+case 43:
     /*! Production::    dimension : VIS */
 
     this.$ = { type: 'VhValue', value: parseFloat(yyvstack[yysp]), unit: 'vi' };
     break;
 
-case 43:
+case 44:
     /*! Production::    dimension : SVIS */
 
     this.$ = { type: 'SvhValue', value: parseFloat(yyvstack[yysp]), unit: 'svi' };
     break;
 
-case 44:
+case 45:
     /*! Production::    dimension : LVIS */
 
     this.$ = { type: 'LvhValue', value: parseFloat(yyvstack[yysp]), unit: 'lvi' };
     break;
 
-case 45:
+case 46:
     /*! Production::    dimension : DVIS */
 
     this.$ = { type: 'DvhValue', value: parseFloat(yyvstack[yysp]), unit: 'dvi' };
     break;
 
-case 46:
+case 47:
     /*! Production::    dimension : CQWS */
 
     this.$ = { type: 'CqwValue', value: parseFloat(yyvstack[yysp]), unit: 'cqw' };
     break;
 
-case 47:
+case 48:
     /*! Production::    dimension : CQHS */
 
     this.$ = { type: 'CqhValue', value: parseFloat(yyvstack[yysp]), unit: 'cqh' };
     break;
 
-case 48:
+case 49:
     /*! Production::    dimension : CQIS */
 
     this.$ = { type: 'CqiValue', value: parseFloat(yyvstack[yysp]), unit: 'cqi' };
     break;
 
-case 49:
+case 50:
     /*! Production::    dimension : CQBS */
 
     this.$ = { type: 'CqbValue', value: parseFloat(yyvstack[yysp]), unit: 'cqb' };
     break;
 
-case 50:
+case 51:
     /*! Production::    dimension : CQMINS */
 
     this.$ = { type: 'CqminValue', value: parseFloat(yyvstack[yysp]), unit: 'cqmin' };
     break;
 
-case 51:
+case 52:
     /*! Production::    dimension : CQMAXS */
 
     this.$ = { type: 'CqmaxValue', value: parseFloat(yyvstack[yysp]), unit: 'cqmax' };
     break;
 
-case 52:
+case 53:
     /*! Production::    dimension : LHS */
 
     this.$ = { type: 'LhValue', value: parseFloat(yyvstack[yysp]), unit: 'lh' };
     break;
 
-case 53:
+case 54:
     /*! Production::    dimension : RLHS */
 
     this.$ = { type: 'RlhValue', value: parseFloat(yyvstack[yysp]), unit: 'rlh' };
     break;
 
-case 54:
+case 55:
     /*! Production::    dimension : PERCENTAGE */
 
     this.$ = { type: 'PercentageValue', value: parseFloat(yyvstack[yysp]), unit: '%' };
     break;
 
-case 55:
+case 56:
     /*! Production::    dimension : ADD dimension */
 
     var prev = yyvstack[yysp]; this.$ = prev;
     break;
 
-case 56:
+case 57:
     /*! Production::    dimension : SUB dimension */
 
     var prev = yyvstack[yysp]; prev.value *= -1; this.$ = prev;
     break;
 
-case 57:
-    /*! Production::    number : NUMBER */
 case 58:
+    /*! Production::    calc_keyword : CALC_KEYWORD */
+
+    this.$ = { type: 'CalcKeyword', value: yyvstack[yysp] };
+    break;
+
+case 59:
+    /*! Production::    number : NUMBER */
+case 60:
     /*! Production::    number : ADD NUMBER */
 
     this.$ = { type: 'Number', value: parseFloat(yyvstack[yysp]) };
     break;
 
-case 59:
+case 61:
     /*! Production::    number : SUB NUMBER */
 
     this.$ = { type: 'Number', value: parseFloat(yyvstack[yysp]) * -1 };
@@ -1210,19 +1222,19 @@ case 59:
 },
 table: bt({
   len: u([
-  54,
+  56,
   1,
   5,
   1,
-  53,
+  55,
   s,
-  [0, 47],
+  [0, 48],
   47,
   47,
-  0,
-  0,
   s,
-  [53, 5],
+  [0, 3],
+  s,
+  [55, 5],
   5,
   0,
   0,
@@ -1243,34 +1255,35 @@ table: bt({
   6,
   7,
   s,
-  [10, 50, 1],
+  [10, 52, 1],
   1,
   1,
   s,
   [6, 4, 1],
   4,
   c,
-  [61, 49],
+  [63, 50],
   c,
-  [60, 4],
+  [62, 5],
   6,
   7,
   c,
-  [50, 44],
-  58,
+  [52, 43],
+  55,
+  59,
   c,
   [47, 47],
   c,
-  [147, 53],
+  [149, 55],
   c,
-  [53, 212],
+  [55, 220],
   s,
   [5, 5, 1],
   c,
-  [317, 45],
+  [327, 45],
   c,
-  [363, 46],
-  58,
+  [373, 46],
+  59,
   1,
   c,
   [98, 5],
@@ -1281,57 +1294,56 @@ table: bt({
 ]),
   type: u([
   s,
-  [2, 49],
+  [2, 50],
   s,
-  [0, 5],
+  [0, 6],
   1,
   s,
-  [2, 55],
+  [2, 56],
   s,
-  [0, 4],
+  [0, 5],
   c,
-  [50, 47],
+  [51, 47],
   c,
   [47, 93],
   c,
-  [147, 53],
-  c,
-  [53, 215],
+  [149, 55],
   c,
-  [316, 47],
+  [55, 225],
   c,
-  [46, 18]
+  [46, 63]
 ]),
   state: u([
   1,
   2,
   5,
   6,
+  8,
   7,
-  61,
+  63,
   c,
-  [4, 3],
-  62,
-  66,
+  [5, 4],
+  64,
   68,
-  c,
-  [6, 3],
-  69,
-  c,
-  [4, 3],
   70,
   c,
-  [4, 3],
+  [7, 4],
   71,
   c,
-  [4, 3],
+  [5, 4],
   72,
   c,
-  [22, 5]
+  [5, 4],
+  73,
+  c,
+  [5, 4],
+  74,
+  c,
+  [27, 6]
 ]),
   mode: u([
   s,
-  [1, 536],
+  [1, 543],
   s,
   [2, 4],
   c,
@@ -1342,42 +1354,44 @@ table: bt({
   goto: u([
   3,
   4,
-  52,
   53,
+  54,
   s,
-  [8, 44, 1],
+  [9, 44, 1],
+  56,
+  55,
   s,
-  [54, 7, 1],
+  [57, 6, 1],
   c,
-  [55, 49],
-  64,
-  65,
+  [56, 50],
+  66,
+  67,
   c,
-  [46, 43],
-  63,
+  [47, 43],
+  65,
   c,
   [46, 45],
-  67,
+  69,
   c,
-  [141, 49],
+  [142, 50],
   c,
-  [49, 196],
-  73,
+  [50, 200],
+  75,
   c,
-  [392, 4],
+  [398, 4],
   c,
-  [296, 45],
+  [301, 45],
   c,
   [45, 45],
   s,
   [3, 4],
-  58,
-  59,
+  60,
+  61,
   s,
   [4, 4],
-  58,
-  59,
-  74,
+  60,
+  61,
+  76,
   c,
   [107, 4]
 ])
@@ -1385,27 +1399,29 @@ table: bt({
 defaultActions: bda({
   idx: u([
   s,
-  [5, 47, 1],
-  54,
+  [5, 48, 1],
   55,
-  62,
-  63,
-  66,
-  67,
-  70,
-  71,
+  56,
+  57,
+  64,
+  65,
+  68,
+  69,
+  72,
   73,
-  74
+  75,
+  76
 ]),
   goto: u([
   s,
-  [8, 47, 1],
-  57,
-  1,
-  55,
+  [8, 48, 1],
+  59,
   58,
+  1,
   56,
-  59,
+  60,
+  57,
+  61,
   5,
   6,
   7,
@@ -1449,7 +1465,7 @@ parse: function parse(input) {
     var TERROR = this.TERROR;
     var EOF = this.EOF;
     var ERROR_RECOVERY_TOKEN_DISCARD_COUNT = (this.options.errorRecoveryTokenDiscardCount | 0) || 3;
-    var NO_ACTION = [0, 75 /* === table.length :: ensures that anyone using this new state will fail dramatically! */];
+    var NO_ACTION = [0, 77 /* === table.length :: ensures that anyone using this new state will fail dramatically! */];
 
     var lexer;
     if (this.__lexer__) {
@@ -4006,23 +4022,27 @@ EOF: 1,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)\b */
-      62: 54,
+      62: 55,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (infinity|pi|e)\b */
+      63: 54,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)-?([a-zA-Z_]|[\240-\377]|(\\[0-9a-fA-F]{1,6}(\r\n|[ \t\r\n\f])?|\\[^\r\n\f0-9a-fA-F]))([a-zA-Z0-9_-]|[\240-\377]|(\\[0-9a-fA-F]{1,6}(\r\n|[ \t\r\n\f])?|\\[^\r\n\f0-9a-fA-F]))*\b */
-      63: 16,
+      64: 16,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       \( */
-      64: 4,
+      65: 4,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       \) */
-      65: 5,
+      66: 5,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       $ */
-      66: 1
+      67: 1
     },
 
     rules: [
@@ -4089,10 +4109,11 @@ EOF: 1,
       /* 60: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dppx\b)/i,
       /* 61: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)%)/i,
       /* 62: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)\b)/i,
-      /* 63: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)-?([^\W\d]|[ -ÿ]|(\\[\dA-Fa-f]{1,6}(\r\n|[\t\n\f\r ])?|\\[^\d\n\f\rA-Fa-f]))([\w\-]|[ -ÿ]|(\\[\dA-Fa-f]{1,6}(\r\n|[\t\n\f\r ])?|\\[^\d\n\f\rA-Fa-f]))*\b)/i,
-      /* 64: */  /^(?:\()/i,
-      /* 65: */  /^(?:\))/i,
-      /* 66: */  /^(?:$)/i
+      /* 63: */  /^(?:(infinity|pi|e)\b)/i,
+      /* 64: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)-?([^\W\d]|[ -ÿ]|(\\[\dA-Fa-f]{1,6}(\r\n|[\t\n\f\r ])?|\\[^\d\n\f\rA-Fa-f]))([\w\-]|[ -ÿ]|(\\[\dA-Fa-f]{1,6}(\r\n|[\t\n\f\r ])?|\\[^\d\n\f\rA-Fa-f]))*\b)/i,
+      /* 65: */  /^(?:\()/i,
+      /* 66: */  /^(?:\))/i,
+      /* 67: */  /^(?:$)/i
     ],
 
     conditions: {
@@ -4164,7 +4185,8 @@ EOF: 1,
           63,
           64,
           65,
-          66
+          66,
+          67
         ],
 
         inclusive: true