postcss-calc 7.0.5 → 8.0.0

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 8.0.0
+
+- Breaking: Updated PostCSS from v7.x to v8.x ([#125](https://github.com/postcss/postcss-calc/pull/125))
+
 # 7.0.5
 
 - Fixed: reduction

package/dist/index.js

@@ -5,38 +5,47 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _postcss = require("postcss");
-
 var _transform = _interopRequireDefault(require("./lib/transform"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _default = (0, _postcss.plugin)('postcss-calc', function (opts) {
-  var options = Object.assign({
+function pluginCreator(opts) {
+  const options = Object.assign({
     precision: 5,
     preserve: false,
     warnWhenCannotResolve: false,
     mediaQueries: false,
     selectors: false
   }, opts);
-  return function (css, result) {
-    css.walk(function (node) {
-      var type = node.type;
-
-      if (type === 'decl') {
-        (0, _transform.default)(node, "value", options, result);
-      }
-
-      if (type === 'atrule' && options.mediaQueries) {
-        (0, _transform.default)(node, "params", options, result);
-      }
-
-      if (type === 'rule' && options.selectors) {
-        (0, _transform.default)(node, "selector", options, result);
-      }
-    });
+  return {
+    postcssPlugin: 'postcss-calc',
+
+    OnceExit(css, {
+      result
+    }) {
+      css.walk(node => {
+        const {
+          type
+        } = node;
+
+        if (type === 'decl') {
+          (0, _transform.default)(node, "value", options, result);
+        }
+
+        if (type === 'atrule' && options.mediaQueries) {
+          (0, _transform.default)(node, "params", options, result);
+        }
+
+        if (type === 'rule' && options.selectors) {
+          (0, _transform.default)(node, "selector", options, result);
+        }
+      });
+    }
+
   };
-});
+}
 
+pluginCreator.postcss = true;
+var _default = pluginCreator;
 exports.default = _default;
 module.exports = exports.default;

package/dist/lib/convertUnit.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var conversions = {
+const conversions = {
   // Absolute length units
   'px': {
     'px': 1,
@@ -131,8 +131,8 @@ var conversions = {
 };
 
 function convertUnit(value, sourceUnit, targetUnit, precision) {
-  var sourceUnitNormalized = sourceUnit.toLowerCase();
-  var targetUnitNormalized = targetUnit.toLowerCase();
+  const sourceUnitNormalized = sourceUnit.toLowerCase();
+  const targetUnitNormalized = targetUnit.toLowerCase();
 
   if (!conversions[targetUnitNormalized]) {
     throw new Error("Cannot convert to " + targetUnit);
@@ -142,7 +142,7 @@ function convertUnit(value, sourceUnit, targetUnit, precision) {
     throw new Error("Cannot convert from " + sourceUnit + " to " + targetUnit);
   }
 
-  var converted = conversions[targetUnitNormalized][sourceUnitNormalized] * value;
+  const converted = conversions[targetUnitNormalized][sourceUnitNormalized] * value;
 
   if (precision !== false) {
     precision = Math.pow(10, parseInt(precision) || 5);

package/dist/lib/reducer.js

@@ -45,21 +45,20 @@ function collectAddSubItems(preOperator, node, collected, precision) {
     throw new Error(`invalid operator ${preOperator}`);
   }
 
-  var type = node.type;
+  const type = node.type;
 
   if (isValueType(type)) {
-    var itemIndex = collected.findIndex(function (x) {
-      return x.node.type === type;
-    });
+    const itemIndex = collected.findIndex(x => x.node.type === type);
 
     if (itemIndex >= 0) {
       if (node.value === 0) {
         return;
       }
 
-      var _covertNodesUnits = covertNodesUnits(collected[itemIndex].node, node, precision),
-          reducedNode = _covertNodesUnits.left,
-          current = _covertNodesUnits.right;
+      const {
+        left: reducedNode,
+        right: current
+      } = covertNodesUnits(collected[itemIndex].node, node, precision);
 
       if (collected[itemIndex].preOperator === '-') {
         collected[itemIndex].preOperator = '+';
@@ -103,18 +102,17 @@ function collectAddSubItems(preOperator, node, collected, precision) {
   } else if (type === "MathExpression") {
     if (isAddSubOperator(node.operator)) {
       collectAddSubItems(preOperator, node.left, collected, precision);
-      var collectRightOperator = preOperator === '-' ? flip(node.operator) : node.operator;
+      const collectRightOperator = preOperator === '-' ? flip(node.operator) : node.operator;
       collectAddSubItems(collectRightOperator, node.right, collected, precision);
     } else {
       // * or /
-      var _reducedNode = reduce(node, precision); // prevent infinite recursive call
-
+      const reducedNode = reduce(node, precision); // prevent infinite recursive call
 
-      if (_reducedNode.type !== "MathExpression" || isAddSubOperator(_reducedNode.operator)) {
-        collectAddSubItems(preOperator, _reducedNode, collected, precision);
+      if (reducedNode.type !== "MathExpression" || isAddSubOperator(reducedNode.operator)) {
+        collectAddSubItems(preOperator, reducedNode, collected, precision);
       } else {
         collected.push({
-          node: _reducedNode,
+          node: reducedNode,
           preOperator
         });
       }
@@ -128,19 +126,15 @@ function collectAddSubItems(preOperator, node, collected, precision) {
 }
 
 function reduceAddSubExpression(node, precision) {
-  var collected = [];
+  const collected = [];
   collectAddSubItems('+', node, collected, precision);
-  var withoutZeroItem = collected.filter(function (item) {
-    return !(isValueType(item.node.type) && item.node.value === 0);
-  });
-  var firstNonZeroItem = withoutZeroItem[0]; // could be undefined
+  const withoutZeroItem = collected.filter(item => !(isValueType(item.node.type) && item.node.value === 0));
+  const firstNonZeroItem = withoutZeroItem[0]; // could be undefined
   // prevent producing "calc(-var(--a))" or "calc()"
   // which is invalid css
 
   if (!firstNonZeroItem || firstNonZeroItem.preOperator === '-' && !isValueType(firstNonZeroItem.node.type)) {
-    var firstZeroItem = collected.find(function (item) {
-      return isValueType(item.node.type) && item.node.value === 0;
-    });
+    const firstZeroItem = collected.find(item => isValueType(item.node.type) && item.node.value === 0);
     withoutZeroItem.unshift(firstZeroItem);
   } // make sure the preOperator of the first item is +
 
@@ -150,9 +144,9 @@ function reduceAddSubExpression(node, precision) {
     withoutZeroItem[0].preOperator = '+';
   }
 
-  var root = withoutZeroItem[0].node;
+  let root = withoutZeroItem[0].node;
 
-  for (var i = 1; i < withoutZeroItem.length; i++) {
+  for (let i = 1; i < withoutZeroItem.length; i++) {
     root = {
       type: 'MathExpression',
       operator: withoutZeroItem[i].preOperator,
@@ -270,7 +264,7 @@ function covertNodesUnits(left, right, precision) {
     case 'FrequencyValue':
     case 'ResolutionValue':
       if (right.type === left.type && right.unit && left.unit) {
-        var converted = (0, _convertUnit.default)(right.value, right.unit, left.unit, precision);
+        const converted = (0, _convertUnit.default)(right.value, right.unit, left.unit, precision);
         right = {
           type: left.type,
           value: converted,

package/dist/lib/stringifier.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-var order = {
+const order = {
   "*": 0,
   "/": 0,
   "+": 1,
@@ -13,7 +13,7 @@ var order = {
 
 function round(value, prec) {
   if (prec !== false) {
-    var precision = Math.pow(10, prec);
+    const precision = Math.pow(10, prec);
     return Math.round(value * precision) / precision;
   }
 
@@ -24,10 +24,12 @@ function stringify(node, prec) {
   switch (node.type) {
     case "MathExpression":
       {
-        var left = node.left,
-            right = node.right,
-            op = node.operator;
-        var str = "";
+        const {
+          left,
+          right,
+          operator: op
+        } = node;
+        let str = "";
 
         if (left.type === 'MathExpression' && order[op] < order[left.operator]) {
           str += `(${stringify(left, prec)})`;
@@ -58,8 +60,8 @@ function stringify(node, prec) {
 }
 
 function _default(calc, node, originalValue, options, result, item) {
-  var str = stringify(node, options.precision);
-  var shouldPrintCalc = node.type === "MathExpression" || node.type === "Function";
+  let str = stringify(node, options.precision);
+  const shouldPrintCalc = node.type === "MathExpression" || node.type === "Function";
 
   if (shouldPrintCalc) {
     // if calc expression couldn't be resolved to a single value, re-wrap it as

package/dist/lib/transform.js

@@ -18,23 +18,23 @@ var _stringifier = _interopRequireDefault(require("./stringifier"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // eslint-disable-next-line import/no-unresolved
-var MATCH_CALC = /((?:-(moz|webkit)-)?calc)/i;
+const MATCH_CALC = /((?:-(moz|webkit)-)?calc)/i;
 
 function transformValue(value, options, result, item) {
-  return (0, _postcssValueParser.default)(value).walk(function (node) {
+  return (0, _postcssValueParser.default)(value).walk(node => {
     // skip anything which isn't a calc() function
     if (node.type !== 'function' || !MATCH_CALC.test(node.value)) {
       return node;
     } // stringify calc expression and produce an AST
 
 
-    var contents = _postcssValueParser.default.stringify(node.nodes);
+    const contents = _postcssValueParser.default.stringify(node.nodes);
 
-    var ast = _parser.parser.parse(contents); // reduce AST to its simplest form, that is, either to a single value
+    const ast = _parser.parser.parse(contents); // reduce AST to its simplest form, that is, either to a single value
     // or a simplified calc expression
 
 
-    var reducedAst = (0, _reducer.default)(ast, options.precision); // stringify AST and write it back
+    const reducedAst = (0, _reducer.default)(ast, options.precision); // stringify AST and write it back
 
     node.type = 'word';
     node.value = (0, _stringifier.default)(node.value, reducedAst, value, options, result, item);
@@ -43,8 +43,8 @@ function transformValue(value, options, result, item) {
 }
 
 function transformSelector(value, options, result, item) {
-  return (0, _postcssSelectorParser.default)(function (selectors) {
-    selectors.walk(function (node) {
+  return (0, _postcssSelectorParser.default)(selectors => {
+    selectors.walk(node => {
       // attribute value
       // e.g. the "calc(3*3)" part of "div[data-size="calc(3*3)"]"
       if (node.type === 'attribute' && node.value) {
@@ -62,14 +62,14 @@ function transformSelector(value, options, result, item) {
   }).processSync(value);
 }
 
-var _default = function _default(node, property, options, result) {
-  var value = property === "selector" ? transformSelector(node[property], options, result, node) : transformValue(node[property], options, result, node); // if the preserve option is enabled and the value has changed, write the
+var _default = (node, property, options, result) => {
+  const value = property === "selector" ? transformSelector(node[property], options, result, node) : transformValue(node[property], options, result, node); // if the preserve option is enabled and the value has changed, write the
   // transformed value into a cloned node which is inserted before the current
   // node, preserving the original value. Otherwise, overwrite the original
   // value.
 
   if (options.preserve && node[property] !== value) {
-    var clone = node.clone();
+    const clone = node.clone();
     clone[property] = value;
     node.parent.insertBefore(node, clone);
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-calc",
-  "version": "7.0.5",
+  "version": "8.0.0",
   "description": "PostCSS plugin to reduce calc()",
   "keywords": [
     "css",
@@ -36,22 +36,25 @@
     "@babel/polyfill": "^7.0.0",
     "@babel/preset-env": "^7.1.0",
     "@babel/register": "^7.0.0",
-    "ava": "^1.4.1",
+    "ava": "^3.15.0",
     "babel-eslint": "^10.0.1",
     "babel-plugin-add-module-exports": "^1.0.0",
-    "cross-env": "^5.2.0",
-    "del-cli": "^1.1.0",
+    "cross-env": "^7.0.0",
+    "del-cli": "^3.0.0",
     "eslint": "^5.7.0",
     "eslint-config-i-am-meticulous": "^11.0.0",
     "eslint-plugin-babel": "^5.2.1",
     "eslint-plugin-import": "^2.14.0",
-    "jison-gho": "^0.6.1-215"
+    "jison-gho": "^0.6.1-216",
+    "postcss": "^8.2.2"
   },
   "dependencies": {
-    "postcss": "^7.0.27",
     "postcss-selector-parser": "^6.0.2",
     "postcss-value-parser": "^4.0.2"
   },
+  "peerDependencies": {
+    "postcss": "^8.2.2"
+  },
   "ava": {
     "require": [
       "@babel/register",