postcss-calc 10.0.2 → 10.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-calc",
-  "version": "10.0.2",
+  "version": "10.1.0",
   "description": "PostCSS plugin to reduce calc()",
   "keywords": [
     "css",
@@ -27,16 +27,16 @@
     "node": "^18.12 || ^20.9 || >=22.0"
   },
   "devDependencies": {
-    "@types/node": "^22.4.0",
-    "eslint": "^9.9.0",
+    "@types/node": "^22.10.2",
+    "eslint": "^9.17.0",
     "eslint-config-prettier": "^9.1.0",
     "jison-gho": "0.6.1-216",
-    "postcss": "^8.4.41",
-    "prettier": "^3.3.3",
-    "typescript": "~5.5.4"
+    "postcss": "^8.4.49",
+    "prettier": "^3.4.2",
+    "typescript": "~5.7.2"
   },
   "dependencies": {
-    "postcss-selector-parser": "^6.1.2",
+    "postcss-selector-parser": "^7.0.0",
     "postcss-value-parser": "^4.2.0"
   },
   "peerDependencies": {

package/src/lib/reducer.js

@@ -47,6 +47,8 @@ function isValueType(node) {
     case 'CqminValue':
     case 'CqmaxValue':
     case 'PercentageValue':
+    case 'LhValue':
+    case 'RlhValue':
     case 'Number':
       return true;
   }

package/src/lib/transform.js

@@ -7,7 +7,7 @@ const { parser } = require('../parser.js');
 const reducer = require('./reducer.js');
 const stringifier = require('./stringifier.js');
 
-const MATCH_CALC = /((?:-(moz|webkit)-)?calc)/i;
+const MATCH_CALC = /((?:-(moz|webkit)-)?calc(?!-))/i;
 
 /**
  * @param {string} value

package/src/parser.d.ts

@@ -51,7 +51,9 @@ export interface DimensionExpression {
     | 'CqbValue'
     | 'CqiValue'
     | 'CqminValue'
-    | 'CqmaxValue';    
+    | 'CqmaxValue'
+    | 'LhValue'
+    | 'RlhValue';
   value: number;
   unit: string;
 }

package/src/parser.js

@@ -632,6 +632,7 @@ symbols_: {
   "FREQ": 14,
   "FUNCTION": 10,
   "LENGTH": 11,
+  "LHS": 51,
   "LPAREN": 4,
   "LVBS": 39,
   "LVHS": 23,
@@ -640,10 +641,11 @@ symbols_: {
   "LVMINS": 31,
   "LVWS": 27,
   "MUL": 8,
-  "NUMBER": 52,
-  "PERCENTAGE": 51,
+  "NUMBER": 54,
+  "PERCENTAGE": 53,
   "REMS": 20,
   "RES": 15,
+  "RLHS": 52,
   "RPAREN": 5,
   "SUB": 7,
   "SVBS": 38,
@@ -660,12 +662,12 @@ symbols_: {
   "VMAXS": 33,
   "VMINS": 29,
   "VWS": 25,
-  "dimension": 56,
+  "dimension": 58,
   "error": 2,
-  "expression": 53,
-  "function": 55,
-  "math_expression": 54,
-  "number": 57
+  "expression": 55,
+  "function": 57,
+  "math_expression": 56,
+  "number": 59
 },
 terminals_: {
   1: "EOF",
@@ -718,8 +720,10 @@ terminals_: {
   48: "CQBS",
   49: "CQMINS",
   50: "CQMAXS",
-  51: "PERCENTAGE",
-  52: "NUMBER"
+  51: "LHS",
+  52: "RLHS",
+  53: "PERCENTAGE",
+  54: "NUMBER"
 },
 TERROR: 2,
     EOF: 1,
@@ -825,14 +829,14 @@ TERROR: 2,
     },
 productions_: bp({
   pop: u([
-  53,
-  s,
-  [54, 9],
   55,
   s,
-  [56, 43],
+  [56, 9],
+  57,
+  s,
+  [58, 45],
   s,
-  [57, 3]
+  [59, 3]
 ]),
   rule: u([
   2,
@@ -840,7 +844,7 @@ productions_: bp({
   s,
   [3, 5],
   s,
-  [1, 45],
+  [1, 47],
   2,
   2,
   c,
@@ -1159,32 +1163,44 @@ case 51:
     break;
 
 case 52:
+    /*! Production::    dimension : LHS */
+
+    this.$ = { type: 'LhValue', value: parseFloat(yyvstack[yysp]), unit: 'lh' };
+    break;
+
+case 53:
+    /*! Production::    dimension : RLHS */
+
+    this.$ = { type: 'RlhValue', value: parseFloat(yyvstack[yysp]), unit: 'rlh' };
+    break;
+
+case 54:
     /*! Production::    dimension : PERCENTAGE */
 
     this.$ = { type: 'PercentageValue', value: parseFloat(yyvstack[yysp]), unit: '%' };
     break;
 
-case 53:
+case 55:
     /*! Production::    dimension : ADD dimension */
 
     var prev = yyvstack[yysp]; this.$ = prev;
     break;
 
-case 54:
+case 56:
     /*! Production::    dimension : SUB dimension */
 
     var prev = yyvstack[yysp]; prev.value *= -1; this.$ = prev;
     break;
 
-case 55:
+case 57:
     /*! Production::    number : NUMBER */
-case 56:
+case 58:
     /*! Production::    number : ADD NUMBER */
 
     this.$ = { type: 'Number', value: parseFloat(yyvstack[yysp]) };
     break;
 
-case 57:
+case 59:
     /*! Production::    number : SUB NUMBER */
 
     this.$ = { type: 'Number', value: parseFloat(yyvstack[yysp]) * -1 };
@@ -1194,24 +1210,24 @@ case 57:
 },
 table: bt({
   len: u([
-  52,
+  54,
   1,
   5,
   1,
-  51,
+  53,
   s,
-  [0, 45],
-  45,
-  45,
+  [0, 47],
+  47,
+  47,
   0,
   0,
   s,
-  [51, 5],
+  [53, 5],
   5,
   0,
   0,
-  44,
-  44,
+  46,
+  46,
   0,
   0,
   6,
@@ -1227,37 +1243,37 @@ table: bt({
   6,
   7,
   s,
-  [10, 48, 1],
+  [10, 50, 1],
   1,
   1,
   s,
   [6, 4, 1],
   4,
   c,
-  [59, 47],
+  [61, 49],
   c,
-  [58, 4],
+  [60, 4],
   6,
   7,
   c,
-  [48, 42],
-  56,
+  [50, 44],
+  58,
   c,
-  [45, 45],
+  [47, 47],
   c,
-  [141, 51],
+  [147, 53],
   c,
-  [51, 204],
+  [53, 212],
   s,
   [5, 5, 1],
   c,
-  [305, 43],
+  [317, 45],
   c,
-  [349, 44],
-  56,
+  [363, 46],
+  58,
   1,
   c,
-  [94, 5],
+  [98, 5],
   c,
   [6, 6],
   c,
@@ -1265,26 +1281,26 @@ table: bt({
 ]),
   type: u([
   s,
-  [2, 47],
+  [2, 49],
   s,
   [0, 5],
   1,
   s,
-  [2, 53],
+  [2, 55],
   s,
   [0, 4],
   c,
-  [48, 45],
+  [50, 47],
   c,
-  [45, 89],
+  [47, 93],
   c,
-  [141, 51],
+  [147, 53],
   c,
-  [51, 207],
+  [53, 215],
   c,
-  [304, 45],
+  [316, 47],
   c,
-  [44, 18]
+  [46, 18]
 ]),
   state: u([
   1,
@@ -1292,30 +1308,30 @@ table: bt({
   5,
   6,
   7,
-  59,
+  61,
   c,
   [4, 3],
-  60,
-  64,
+  62,
   66,
+  68,
   c,
   [6, 3],
-  67,
+  69,
   c,
   [4, 3],
-  68,
+  70,
   c,
   [4, 3],
-  69,
+  71,
   c,
   [4, 3],
-  70,
+  72,
   c,
   [22, 5]
 ]),
   mode: u([
   s,
-  [1, 514],
+  [1, 536],
   s,
   [2, 4],
   c,
@@ -1326,70 +1342,70 @@ table: bt({
   goto: u([
   3,
   4,
-  50,
-  51,
+  52,
+  53,
   s,
-  [8, 42, 1],
+  [8, 44, 1],
   s,
-  [52, 7, 1],
+  [54, 7, 1],
   c,
-  [53, 47],
-  62,
-  63,
+  [55, 49],
+  64,
+  65,
   c,
-  [44, 41],
-  61,
+  [46, 43],
+  63,
   c,
-  [44, 43],
-  65,
+  [46, 45],
+  67,
   c,
-  [135, 47],
+  [141, 49],
   c,
-  [47, 188],
-  71,
+  [49, 196],
+  73,
   c,
-  [376, 4],
+  [392, 4],
   c,
-  [284, 43],
+  [296, 45],
   c,
-  [43, 43],
+  [45, 45],
   s,
   [3, 4],
-  56,
-  57,
+  58,
+  59,
   s,
   [4, 4],
-  56,
-  57,
-  72,
+  58,
+  59,
+  74,
   c,
-  [103, 4]
+  [107, 4]
 ])
 }),
 defaultActions: bda({
   idx: u([
   s,
-  [5, 45, 1],
-  52,
-  53,
-  60,
-  61,
-  64,
-  65,
-  68,
-  69,
+  [5, 47, 1],
+  54,
+  55,
+  62,
+  63,
+  66,
+  67,
+  70,
   71,
-  72
+  73,
+  74
 ]),
   goto: u([
   s,
-  [8, 45, 1],
-  55,
+  [8, 47, 1],
+  57,
   1,
-  53,
+  55,
+  58,
   56,
-  54,
-  57,
+  59,
   5,
   6,
   7,
@@ -1433,7 +1449,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, 73 /* === table.length :: ensures that anyone using this new state will fail dramatically! */];
+    var NO_ACTION = [0, 75 /* === table.length :: ensures that anyone using this new state will fail dramatically! */];
 
     var lexer;
     if (this.__lexer__) {
@@ -3904,101 +3920,109 @@ EOF: 1,
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)cqmax\b */
       40: 50,
 
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)lh\b */
+      41: 51,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)rlh\b */
+      42: 52,
+
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)cm\b */
-      41: 11,
+      43: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)mm\b */
-      42: 11,
+      44: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)Q\b */
-      43: 11,
+      45: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)in\b */
-      44: 11,
+      46: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)pt\b */
-      45: 11,
+      47: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)pc\b */
-      46: 11,
+      48: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)px\b */
-      47: 11,
+      49: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)deg\b */
-      48: 12,
+      50: 12,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)grad\b */
-      49: 12,
+      51: 12,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)rad\b */
-      50: 12,
+      52: 12,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)turn\b */
-      51: 12,
+      53: 12,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)s\b */
-      52: 13,
+      54: 13,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)ms\b */
-      53: 13,
+      55: 13,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)Hz\b */
-      54: 14,
+      56: 14,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)kHz\b */
-      55: 14,
+      57: 14,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dpi\b */
-      56: 15,
+      58: 15,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dpcm\b */
-      57: 15,
+      59: 15,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dppx\b */
-      58: 15,
+      60: 15,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)% */
-      59: 51,
+      61: 53,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)\b */
-      60: 52,
+      62: 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 */
-      61: 16,
+      63: 16,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       \( */
-      62: 4,
+      64: 4,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       \) */
-      63: 5,
+      65: 5,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       $ */
-      64: 1
+      66: 1
     },
 
     rules: [
@@ -4043,30 +4067,32 @@ EOF: 1,
       /* 38: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqb\b)/i,
       /* 39: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqmin\b)/i,
       /* 40: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqmax\b)/i,
-      /* 41: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cm\b)/i,
-      /* 42: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)mm\b)/i,
-      /* 43: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)Q\b)/i,
-      /* 44: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)in\b)/i,
-      /* 45: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)pt\b)/i,
-      /* 46: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)pc\b)/i,
-      /* 47: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)px\b)/i,
-      /* 48: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)deg\b)/i,
-      /* 49: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)grad\b)/i,
-      /* 50: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)rad\b)/i,
-      /* 51: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)turn\b)/i,
-      /* 52: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)s\b)/i,
-      /* 53: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)ms\b)/i,
-      /* 54: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)Hz\b)/i,
-      /* 55: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)kHz\b)/i,
-      /* 56: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dpi\b)/i,
-      /* 57: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dpcm\b)/i,
-      /* 58: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dppx\b)/i,
-      /* 59: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)%)/i,
-      /* 60: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)\b)/i,
-      /* 61: */  /^(?:((\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,
-      /* 62: */  /^(?:\()/i,
-      /* 63: */  /^(?:\))/i,
-      /* 64: */  /^(?:$)/i
+      /* 41: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)lh\b)/i,
+      /* 42: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)rlh\b)/i,
+      /* 43: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cm\b)/i,
+      /* 44: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)mm\b)/i,
+      /* 45: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)Q\b)/i,
+      /* 46: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)in\b)/i,
+      /* 47: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)pt\b)/i,
+      /* 48: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)pc\b)/i,
+      /* 49: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)px\b)/i,
+      /* 50: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)deg\b)/i,
+      /* 51: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)grad\b)/i,
+      /* 52: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)rad\b)/i,
+      /* 53: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)turn\b)/i,
+      /* 54: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)s\b)/i,
+      /* 55: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)ms\b)/i,
+      /* 56: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)Hz\b)/i,
+      /* 57: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)kHz\b)/i,
+      /* 58: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dpi\b)/i,
+      /* 59: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dpcm\b)/i,
+      /* 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
     ],
 
     conditions: {
@@ -4136,7 +4162,9 @@ EOF: 1,
           61,
           62,
           63,
-          64
+          64,
+          65,
+          66
         ],
 
         inclusive: true