postcss-calc 10.0.0 → 10.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-calc",
-  "version": "10.0.0",
+  "version": "10.0.2",
   "description": "PostCSS plugin to reduce calc()",
   "keywords": [
     "css",
@@ -23,37 +23,20 @@
   ],
   "author": "Andy Jansson",
   "license": "MIT",
-  "eslintConfig": {
-    "extends": [
-      "eslint:recommended",
-      "prettier"
-    ],
-    "env": {
-      "node": true,
-      "es2017": true
-    },
-    "ignorePatterns": [
-      "src/parser.js"
-    ],
-    "rules": {
-      "curly": "error"
-    }
-  },
   "engines": {
     "node": "^18.12 || ^20.9 || >=22.0"
   },
   "devDependencies": {
-    "@types/node": "^20.12.7",
-    "eslint": "^9.0.0",
+    "@types/node": "^22.4.0",
+    "eslint": "^9.9.0",
     "eslint-config-prettier": "^9.1.0",
-    "jison-gho": "^0.6.1-216",
-    "postcss": "^8.4.38",
-    "prettier": "^3.2.5",
-    "typescript": "~5.4.5",
-    "uvu": "^0.5.6"
+    "jison-gho": "0.6.1-216",
+    "postcss": "^8.4.41",
+    "prettier": "^3.3.3",
+    "typescript": "~5.5.4"
   },
   "dependencies": {
-    "postcss-selector-parser": "^6.0.16",
+    "postcss-selector-parser": "^6.1.2",
     "postcss-value-parser": "^4.2.0"
   },
   "peerDependencies": {
@@ -62,6 +45,6 @@
   "scripts": {
     "build": "jison ./parser.jison -o src/parser.js",
     "lint": "eslint . && tsc",
-    "test": "uvu test"
+    "test": "node --test"
   }
 }

package/src/lib/reducer.js

@@ -17,9 +17,35 @@ function isValueType(node) {
     case 'ChValue':
     case 'RemValue':
     case 'VhValue':
+    case 'SvhValue':
+    case 'LvhValue':
+    case 'DvhValue':
     case 'VwValue':
+    case 'SvwValue':
+    case 'LvwValue':
+    case 'DvwValue':
     case 'VminValue':
+    case 'SvminValue':
+    case 'LvminValue':
+    case 'DvminValue':
     case 'VmaxValue':
+    case 'SvmaxValue':
+    case 'LvmaxValue':
+    case 'DvmaxValue':
+    case 'VbValue':
+    case 'SvbValue':
+    case 'LvbValue':
+    case 'DvbValue':
+    case 'ViValue':
+    case 'SviValue':
+    case 'LviValue':
+    case 'DviValue':
+    case 'CqwValue':
+    case 'CqhValue':
+    case 'CqiValue':
+    case 'CqbValue':
+    case 'CqminValue':
+    case 'CqmaxValue':
     case 'PercentageValue':
     case 'Number':
       return true;

package/src/parser.d.ts

@@ -23,9 +23,35 @@ export interface DimensionExpression {
     | 'ChValue'
     | 'RemValue'
     | 'VhValue'
+    | 'SvhValue'
+    | 'LvhValue'
+    | 'DvhValue'
     | 'VwValue'
+    | 'SvwValue'
+    | 'LvwValue'
+    | 'DvwValue'
     | 'VminValue'
-    | 'VmaxValue';
+    | 'SvminValue'
+    | 'LvminValue'
+    | 'DvminValue'
+    | 'VmaxValue'
+    | 'SvmaxValue'
+    | 'LvmaxValue'
+    | 'DvmaxValue'
+    | 'VbValue'
+    | 'SvbValue'
+    | 'LvbValue'
+    | 'DvbValue'
+    | 'ViValue'
+    | 'SviValue'
+    | 'LviValue'
+    | 'DviValue'
+    | 'CqwValue'
+    | 'CqhValue'
+    | 'CqbValue'
+    | 'CqiValue'
+    | 'CqminValue'
+    | 'CqmaxValue';    
   value: number;
   unit: string;
 }

package/src/parser.js

@@ -613,7 +613,19 @@ symbols_: {
   "ANGLE": 12,
   "CALC": 3,
   "CHS": 19,
+  "CQBS": 48,
+  "CQHS": 46,
+  "CQIS": 47,
+  "CQMAXS": 50,
+  "CQMINS": 49,
+  "CQWS": 45,
   "DIV": 9,
+  "DVBS": 40,
+  "DVHS": 24,
+  "DVIS": 44,
+  "DVMAXS": 36,
+  "DVMINS": 32,
+  "DVWS": 28,
   "EMS": 17,
   "EOF": 1,
   "EXS": 18,
@@ -621,25 +633,39 @@ symbols_: {
   "FUNCTION": 10,
   "LENGTH": 11,
   "LPAREN": 4,
+  "LVBS": 39,
+  "LVHS": 23,
+  "LVIS": 43,
+  "LVMAXS": 35,
+  "LVMINS": 31,
+  "LVWS": 27,
   "MUL": 8,
-  "NUMBER": 26,
-  "PERCENTAGE": 25,
+  "NUMBER": 52,
+  "PERCENTAGE": 51,
   "REMS": 20,
   "RES": 15,
   "RPAREN": 5,
   "SUB": 7,
+  "SVBS": 38,
+  "SVHS": 22,
+  "SVIS": 42,
+  "SVMAXS": 34,
+  "SVMINS": 30,
+  "SVWS": 26,
   "TIME": 13,
   "UNKNOWN_DIMENSION": 16,
+  "VBS": 37,
   "VHS": 21,
-  "VMAXS": 24,
-  "VMINS": 23,
-  "VWS": 22,
-  "dimension": 30,
+  "VIS": 41,
+  "VMAXS": 33,
+  "VMINS": 29,
+  "VWS": 25,
+  "dimension": 56,
   "error": 2,
-  "expression": 27,
-  "function": 29,
-  "math_expression": 28,
-  "number": 31
+  "expression": 53,
+  "function": 55,
+  "math_expression": 54,
+  "number": 57
 },
 terminals_: {
   1: "EOF",
@@ -663,11 +689,37 @@ terminals_: {
   19: "CHS",
   20: "REMS",
   21: "VHS",
-  22: "VWS",
-  23: "VMINS",
-  24: "VMAXS",
-  25: "PERCENTAGE",
-  26: "NUMBER"
+  22: "SVHS",
+  23: "LVHS",
+  24: "DVHS",
+  25: "VWS",
+  26: "SVWS",
+  27: "LVWS",
+  28: "DVWS",
+  29: "VMINS",
+  30: "SVMINS",
+  31: "LVMINS",
+  32: "DVMINS",
+  33: "VMAXS",
+  34: "SVMAXS",
+  35: "LVMAXS",
+  36: "DVMAXS",
+  37: "VBS",
+  38: "SVBS",
+  39: "LVBS",
+  40: "DVBS",
+  41: "VIS",
+  42: "SVIS",
+  43: "LVIS",
+  44: "DVIS",
+  45: "CQWS",
+  46: "CQHS",
+  47: "CQIS",
+  48: "CQBS",
+  49: "CQMINS",
+  50: "CQMAXS",
+  51: "PERCENTAGE",
+  52: "NUMBER"
 },
 TERROR: 2,
     EOF: 1,
@@ -773,14 +825,14 @@ TERROR: 2,
     },
 productions_: bp({
   pop: u([
-  27,
+  53,
   s,
-  [28, 9],
-  29,
+  [54, 9],
+  55,
   s,
-  [30, 17],
+  [56, 43],
   s,
-  [31, 3]
+  [57, 3]
 ]),
   rule: u([
   2,
@@ -788,7 +840,7 @@ productions_: bp({
   s,
   [3, 5],
   s,
-  [1, 19],
+  [1, 45],
   2,
   2,
   c,
@@ -933,50 +985,206 @@ case 22:
     break;
 
 case 23:
+    /*! Production::    dimension : SVHS */
+
+    this.$ = { type: 'SvhValue', value: parseFloat(yyvstack[yysp]), unit: 'svh' };
+    break;
+
+case 24:
+    /*! Production::    dimension : LVHS */
+
+    this.$ = { type: 'LvhValue', value: parseFloat(yyvstack[yysp]), unit: 'lvh' };
+    break;
+
+case 25:
+    /*! Production::    dimension : DVHS */
+
+    this.$ = { type: 'DvhValue', value: parseFloat(yyvstack[yysp]), unit: 'dvh' };
+    break;
+
+case 26:
     /*! Production::    dimension : VWS */
 
     this.$ = { type: 'VwValue', value: parseFloat(yyvstack[yysp]), unit: 'vw' };
     break;
 
-case 24:
+case 27:
+    /*! Production::    dimension : SVWS */
+
+    this.$ = { type: 'SvwValue', value: parseFloat(yyvstack[yysp]), unit: 'svw' };
+    break;
+
+case 28:
+    /*! Production::    dimension : LVWS */
+
+    this.$ = { type: 'LvwValue', value: parseFloat(yyvstack[yysp]), unit: 'lvw' };
+    break;
+
+case 29:
+    /*! Production::    dimension : DVWS */
+
+    this.$ = { type: 'DvwValue', value: parseFloat(yyvstack[yysp]), unit: 'dvw'  };
+    break;
+
+case 30:
     /*! Production::    dimension : VMINS */
 
     this.$ = { type: 'VminValue', value: parseFloat(yyvstack[yysp]), unit: 'vmin' };
     break;
 
-case 25:
+case 31:
+    /*! Production::    dimension : SVMINS */
+
+    this.$ = { type: 'SvminValue', value: parseFloat(yyvstack[yysp]), unit: 'svmin' };
+    break;
+
+case 32:
+    /*! Production::    dimension : LVMINS */
+
+    this.$ = { type: 'LvminValue', value: parseFloat(yyvstack[yysp]), unit: 'lvmin' };
+    break;
+
+case 33:
+    /*! Production::    dimension : DVMINS */
+
+    this.$ = { type: 'DvminValue', value: parseFloat(yyvstack[yysp]), unit: 'dvmin' };
+    break;
+
+case 34:
     /*! Production::    dimension : VMAXS */
 
     this.$ = { type: 'VmaxValue', value: parseFloat(yyvstack[yysp]), unit: 'vmax' };
     break;
 
-case 26:
+case 35:
+    /*! Production::    dimension : SVMAXS */
+
+    this.$ = { type: 'SvmaxValue', value: parseFloat(yyvstack[yysp]), unit: 'svmax' };
+    break;
+
+case 36:
+    /*! Production::    dimension : LVMAXS */
+
+    this.$ = { type: 'LvmaxValue', value: parseFloat(yyvstack[yysp]), unit: 'lvmax' };
+    break;
+
+case 37:
+    /*! Production::    dimension : DVMAXS */
+
+    this.$ = { type: 'DvmaxValue', value: parseFloat(yyvstack[yysp]), unit: 'dvmax' };
+    break;
+
+case 38:
+    /*! Production::    dimension : VBS */
+
+    this.$ = { type: 'VbValue', value: parseFloat(yyvstack[yysp]), unit: 'vb' };
+    break;
+
+case 39:
+    /*! Production::    dimension : SVBS */
+
+    this.$ = { type: 'SvbValue', value: parseFloat(yyvstack[yysp]), unit: 'svb' };
+    break;
+
+case 40:
+    /*! Production::    dimension : LVBS */
+
+    this.$ = { type: 'LvbValue', value: parseFloat(yyvstack[yysp]), unit: 'lvb' };
+    break;
+
+case 41:
+    /*! Production::    dimension : DVBS */
+
+    this.$ = { type: 'DvbValue', value: parseFloat(yyvstack[yysp]), unit: 'dvb' };
+    break;
+
+case 42:
+    /*! Production::    dimension : VIS */
+
+    this.$ = { type: 'VhValue', value: parseFloat(yyvstack[yysp]), unit: 'vi' };
+    break;
+
+case 43:
+    /*! Production::    dimension : SVIS */
+
+    this.$ = { type: 'SvhValue', value: parseFloat(yyvstack[yysp]), unit: 'svi' };
+    break;
+
+case 44:
+    /*! Production::    dimension : LVIS */
+
+    this.$ = { type: 'LvhValue', value: parseFloat(yyvstack[yysp]), unit: 'lvi' };
+    break;
+
+case 45:
+    /*! Production::    dimension : DVIS */
+
+    this.$ = { type: 'DvhValue', value: parseFloat(yyvstack[yysp]), unit: 'dvi' };
+    break;
+
+case 46:
+    /*! Production::    dimension : CQWS */
+
+    this.$ = { type: 'CqwValue', value: parseFloat(yyvstack[yysp]), unit: 'cqw' };
+    break;
+
+case 47:
+    /*! Production::    dimension : CQHS */
+
+    this.$ = { type: 'CqhValue', value: parseFloat(yyvstack[yysp]), unit: 'cqh' };
+    break;
+
+case 48:
+    /*! Production::    dimension : CQIS */
+
+    this.$ = { type: 'CqiValue', value: parseFloat(yyvstack[yysp]), unit: 'cqi' };
+    break;
+
+case 49:
+    /*! Production::    dimension : CQBS */
+
+    this.$ = { type: 'CqbValue', value: parseFloat(yyvstack[yysp]), unit: 'cqb' };
+    break;
+
+case 50:
+    /*! Production::    dimension : CQMINS */
+
+    this.$ = { type: 'CqminValue', value: parseFloat(yyvstack[yysp]), unit: 'cqmin' };
+    break;
+
+case 51:
+    /*! Production::    dimension : CQMAXS */
+
+    this.$ = { type: 'CqmaxValue', value: parseFloat(yyvstack[yysp]), unit: 'cqmax' };
+    break;
+
+case 52:
     /*! Production::    dimension : PERCENTAGE */
 
     this.$ = { type: 'PercentageValue', value: parseFloat(yyvstack[yysp]), unit: '%' };
     break;
 
-case 27:
+case 53:
     /*! Production::    dimension : ADD dimension */
 
     var prev = yyvstack[yysp]; this.$ = prev;
     break;
 
-case 28:
+case 54:
     /*! Production::    dimension : SUB dimension */
 
     var prev = yyvstack[yysp]; prev.value *= -1; this.$ = prev;
     break;
 
-case 29:
+case 55:
     /*! Production::    number : NUMBER */
-case 30:
+case 56:
     /*! Production::    number : ADD NUMBER */
 
     this.$ = { type: 'Number', value: parseFloat(yyvstack[yysp]) };
     break;
 
-case 31:
+case 57:
     /*! Production::    number : SUB NUMBER */
 
     this.$ = { type: 'Number', value: parseFloat(yyvstack[yysp]) * -1 };
@@ -986,24 +1194,24 @@ case 31:
 },
 table: bt({
   len: u([
-  26,
+  52,
   1,
   5,
   1,
-  25,
+  51,
   s,
-  [0, 19],
-  19,
-  19,
+  [0, 45],
+  45,
+  45,
   0,
   0,
   s,
-  [25, 5],
+  [51, 5],
   5,
   0,
   0,
-  18,
-  18,
+  44,
+  44,
   0,
   0,
   6,
@@ -1019,37 +1227,37 @@ table: bt({
   6,
   7,
   s,
-  [10, 22, 1],
+  [10, 48, 1],
   1,
   1,
   s,
   [6, 4, 1],
   4,
   c,
-  [33, 21],
+  [59, 47],
   c,
-  [32, 4],
+  [58, 4],
   6,
   7,
   c,
-  [22, 16],
-  30,
+  [48, 42],
+  56,
   c,
-  [19, 19],
+  [45, 45],
   c,
-  [63, 25],
+  [141, 51],
   c,
-  [25, 100],
+  [51, 204],
   s,
   [5, 5, 1],
   c,
-  [149, 17],
+  [305, 43],
   c,
-  [167, 18],
-  30,
+  [349, 44],
+  56,
   1,
   c,
-  [42, 5],
+  [94, 5],
   c,
   [6, 6],
   c,
@@ -1057,26 +1265,26 @@ table: bt({
 ]),
   type: u([
   s,
-  [2, 21],
+  [2, 47],
   s,
   [0, 5],
   1,
   s,
-  [2, 27],
+  [2, 53],
   s,
   [0, 4],
   c,
-  [22, 19],
+  [48, 45],
   c,
-  [19, 37],
+  [45, 89],
   c,
-  [63, 25],
+  [141, 51],
   c,
-  [25, 103],
+  [51, 207],
   c,
-  [148, 19],
+  [304, 45],
   c,
-  [18, 18]
+  [44, 18]
 ]),
   state: u([
   1,
@@ -1084,30 +1292,30 @@ table: bt({
   5,
   6,
   7,
-  33,
+  59,
   c,
   [4, 3],
-  34,
-  38,
-  40,
+  60,
+  64,
+  66,
   c,
   [6, 3],
-  41,
+  67,
   c,
   [4, 3],
-  42,
+  68,
   c,
   [4, 3],
-  43,
+  69,
   c,
   [4, 3],
-  44,
+  70,
   c,
   [22, 5]
 ]),
   mode: u([
   s,
-  [1, 228],
+  [1, 514],
   s,
   [2, 4],
   c,
@@ -1118,70 +1326,70 @@ table: bt({
   goto: u([
   3,
   4,
-  24,
-  25,
+  50,
+  51,
   s,
-  [8, 16, 1],
+  [8, 42, 1],
   s,
-  [26, 7, 1],
+  [52, 7, 1],
   c,
-  [27, 21],
-  36,
-  37,
+  [53, 47],
+  62,
+  63,
   c,
-  [18, 15],
-  35,
+  [44, 41],
+  61,
   c,
-  [18, 17],
-  39,
+  [44, 43],
+  65,
   c,
-  [57, 21],
+  [135, 47],
   c,
-  [21, 84],
-  45,
+  [47, 188],
+  71,
   c,
-  [168, 4],
+  [376, 4],
   c,
-  [128, 17],
+  [284, 43],
   c,
-  [17, 17],
+  [43, 43],
   s,
   [3, 4],
-  30,
-  31,
+  56,
+  57,
   s,
   [4, 4],
-  30,
-  31,
-  46,
+  56,
+  57,
+  72,
   c,
-  [51, 4]
+  [103, 4]
 ])
 }),
 defaultActions: bda({
   idx: u([
   s,
-  [5, 19, 1],
-  26,
-  27,
-  34,
-  35,
-  38,
-  39,
-  42,
-  43,
-  45,
-  46
+  [5, 45, 1],
+  52,
+  53,
+  60,
+  61,
+  64,
+  65,
+  68,
+  69,
+  71,
+  72
 ]),
   goto: u([
   s,
-  [8, 19, 1],
-  29,
+  [8, 45, 1],
+  55,
   1,
-  27,
-  30,
-  28,
-  31,
+  53,
+  56,
+  54,
+  57,
   5,
   6,
   7,
@@ -1225,7 +1433,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, 47 /* === table.length :: ensures that anyone using this new state will fail dramatically! */];
+    var NO_ACTION = [0, 73 /* === table.length :: ensures that anyone using this new state will fail dramatically! */];
 
     var lexer;
     if (this.__lexer__) {
@@ -3578,115 +3786,219 @@ EOF: 1,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)vw\b */
-      11: 22,
+      11: 25,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)svw\b */
+      12: 26,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)lvw\b */
+      13: 27,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dvw\b */
+      14: 28,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)vh\b */
-      12: 21,
+      15: 21,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)svh\b */
+      16: 22,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)lvh\b */
+      17: 23,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dvh\b */
+      18: 24,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)vmin\b */
-      13: 23,
+      19: 29,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)svmin\b */
+      20: 30,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)lvmin\b */
+      21: 31,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dvmin\b */
+      22: 32,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)vmax\b */
-      14: 24,
+      23: 33,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)svmax\b */
+      24: 34,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)lvmax\b */
+      25: 35,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dvmax\b */
+      26: 36,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)vb\b */
+      27: 37,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)svb\b */
+      28: 38,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)lvb\b */
+      29: 39,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dvb\b */
+      30: 40,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)vi\b */
+      31: 41,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)svi\b */
+      32: 42,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)lvi\b */
+      33: 43,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dvi\b */
+      34: 44,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)cqw\b */
+      35: 45,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)cqh\b */
+      36: 46,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)cqi\b */
+      37: 47,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)cqb\b */
+      38: 48,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)cqmin\b */
+      39: 49,
+
+      /*! Conditions:: INITIAL */
+      /*! 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]+)?)cm\b */
-      15: 11,
+      41: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)mm\b */
-      16: 11,
+      42: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)Q\b */
-      17: 11,
+      43: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)in\b */
-      18: 11,
+      44: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)pt\b */
-      19: 11,
+      45: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)pc\b */
-      20: 11,
+      46: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)px\b */
-      21: 11,
+      47: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)deg\b */
-      22: 12,
+      48: 12,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)grad\b */
-      23: 12,
+      49: 12,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)rad\b */
-      24: 12,
+      50: 12,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)turn\b */
-      25: 12,
+      51: 12,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)s\b */
-      26: 13,
+      52: 13,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)ms\b */
-      27: 13,
+      53: 13,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)Hz\b */
-      28: 14,
+      54: 14,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)kHz\b */
-      29: 14,
+      55: 14,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dpi\b */
-      30: 15,
+      56: 15,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dpcm\b */
-      31: 15,
+      57: 15,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dppx\b */
-      32: 15,
+      58: 15,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)% */
-      33: 25,
+      59: 51,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)\b */
-      34: 26,
+      60: 52,
 
       /*! 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 */
-      35: 16,
+      61: 16,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       \( */
-      36: 4,
+      62: 4,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       \) */
-      37: 5,
+      63: 5,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       $ */
-      38: 1
+      64: 1
     },
 
     rules: [
@@ -3702,33 +4014,59 @@ EOF: 1,
       /*  9: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)ch\b)/i,
       /* 10: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)rem\b)/i,
       /* 11: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vw\b)/i,
-      /* 12: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vh\b)/i,
-      /* 13: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vmin\b)/i,
-      /* 14: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vmax\b)/i,
-      /* 15: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cm\b)/i,
-      /* 16: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)mm\b)/i,
-      /* 17: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)Q\b)/i,
-      /* 18: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)in\b)/i,
-      /* 19: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)pt\b)/i,
-      /* 20: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)pc\b)/i,
-      /* 21: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)px\b)/i,
-      /* 22: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)deg\b)/i,
-      /* 23: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)grad\b)/i,
-      /* 24: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)rad\b)/i,
-      /* 25: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)turn\b)/i,
-      /* 26: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)s\b)/i,
-      /* 27: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)ms\b)/i,
-      /* 28: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)Hz\b)/i,
-      /* 29: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)kHz\b)/i,
-      /* 30: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dpi\b)/i,
-      /* 31: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dpcm\b)/i,
-      /* 32: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dppx\b)/i,
-      /* 33: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)%)/i,
-      /* 34: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)\b)/i,
-      /* 35: */  /^(?:((\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,
-      /* 36: */  /^(?:\()/i,
-      /* 37: */  /^(?:\))/i,
-      /* 38: */  /^(?:$)/i
+      /* 12: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)svw\b)/i,
+      /* 13: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)lvw\b)/i,
+      /* 14: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dvw\b)/i,
+      /* 15: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vh\b)/i,
+      /* 16: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)svh\b)/i,
+      /* 17: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)lvh\b)/i,
+      /* 18: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dvh\b)/i,
+      /* 19: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vmin\b)/i,
+      /* 20: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)svmin\b)/i,
+      /* 21: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)lvmin\b)/i,
+      /* 22: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dvmin\b)/i,
+      /* 23: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vmax\b)/i,
+      /* 24: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)svmax\b)/i,
+      /* 25: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)lvmax\b)/i,
+      /* 26: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dvmax\b)/i,
+      /* 27: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vb\b)/i,
+      /* 28: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)svb\b)/i,
+      /* 29: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)lvb\b)/i,
+      /* 30: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dvb\b)/i,
+      /* 31: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vi\b)/i,
+      /* 32: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)svi\b)/i,
+      /* 33: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)lvi\b)/i,
+      /* 34: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dvi\b)/i,
+      /* 35: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqw\b)/i,
+      /* 36: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqh\b)/i,
+      /* 37: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqi\b)/i,
+      /* 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
     ],
 
     conditions: {
@@ -3772,7 +4110,33 @@ EOF: 1,
           35,
           36,
           37,
-          38
+          38,
+          39,
+          40,
+          41,
+          42,
+          43,
+          44,
+          45,
+          46,
+          47,
+          48,
+          49,
+          50,
+          51,
+          52,
+          53,
+          54,
+          55,
+          56,
+          57,
+          58,
+          59,
+          60,
+          61,
+          62,
+          63,
+          64
         ],
 
         inclusive: true

package/types/index.d.ts

@@ -11,10 +11,11 @@ export = pluginCreator;
  * @param {PostCssCalcOptions} opts
  * @return {import('postcss').Plugin}
  */
-declare function pluginCreator(opts: PostCssCalcOptions): import('postcss').Plugin;
+declare function pluginCreator(opts: PostCssCalcOptions): import("postcss").Plugin;
 declare namespace pluginCreator {
     export { postcss, PostCssCalcOptions };
 }
+declare var postcss: true;
 type PostCssCalcOptions = {
     precision?: number | false;
     preserve?: boolean;
@@ -22,4 +23,3 @@ type PostCssCalcOptions = {
     mediaQueries?: boolean;
     selectors?: boolean;
 };
-declare var postcss: true;

package/types/lib/reducer.d.ts

@@ -4,11 +4,11 @@ export = reduce;
  * @param {number} precision
  * @return {import('../parser').CalcNode}
  */
-declare function reduce(node: import('../parser').CalcNode, precision: number): import('../parser').CalcNode;
+declare function reduce(node: import("../parser").CalcNode, precision: number): import("../parser").CalcNode;
 declare namespace reduce {
     export { Collectible };
 }
 type Collectible = {
-    preOperator: '+' | '-';
-    node: import('../parser').CalcNode;
+    preOperator: "+" | "-";
+    node: import("../parser").CalcNode;
 };

package/types/lib/stringifier.d.ts

@@ -1,4 +1,4 @@
-declare function _exports(calc: string, node: import('../parser').CalcNode, originalValue: string, options: {
+declare function _exports(calc: string, node: import("../parser").CalcNode, originalValue: string, options: {
     precision: number | false;
     warnWhenCannotResolve: boolean;
 }, result: import("postcss").Result, item: import("postcss").ChildNode): string;

package/types/lib/transform.d.ts

@@ -1,4 +1,4 @@
-declare function _exports(node: any, property: 'value' | 'params' | 'selector', options: {
+declare function _exports(node: any, property: "value" | "params" | "selector", options: {
     precision: number;
     preserve: boolean;
     warnWhenCannotResolve: boolean;