postcss-calc 5.3.0 → 6.0.2

package/CHANGELOG.md

@@ -1,3 +1,20 @@
+# 6.0.2 - 2018-09-25
+
+- Fixed: use PostCSS 7 (thanks to @douglasduteil)
+
+# 6.0.1 - 2017-10-10
+
+- Fixed: throwing error for attribute selectors without a value
+
+# 6.0.0 - 2017-05-08
+
+- Breaking: Updated PostCSS from v5.x to v6.x, and reduce-css-calc from v1.x
+  to v2.x (thanks to @andyjansson).
+
+# 5.3.1 - 2016-08-22
+
+- Fixed: avoid security issue related to ``reduce-css-calc@< 1.2.4``.
+
 # 5.3.0 - 2016-07-11
 
 - Added: support for selector transformation via `selectors` option.

package/README.md

@@ -86,13 +86,13 @@ h1 {
 }
 ```
 
-Checkout [tests](test) for more examples.
+Checkout [tests](src/__tests__/index.js) for more examples.
 
 ### Options
 
 #### `precision` (default: `5`)
 
-Allow you to definine the precision for decimal numbers.
+Allow you to define the precision for decimal numbers.
 
 ```js
 var out = postcss()

package/dist/index.js

@@ -0,0 +1,34 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _postcss = require('postcss');
+
+var _transform = require('./lib/transform');
+
+var _transform2 = _interopRequireDefault(_transform);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+exports.default = (0, _postcss.plugin)('postcss-calc', function (opts) {
+  var 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, _transform2.default)(node, "value", options, result);
+      if (type === 'atrule' && options.mediaQueries) (0, _transform2.default)(node, "params", options, result);
+      if (type === 'rule' && options.selectors) (0, _transform2.default)(node, "selector", options, result);
+    });
+  };
+});
+module.exports = exports['default'];

package/dist/lib/transform.js

@@ -0,0 +1,67 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _postcssSelectorParser = require('postcss-selector-parser');
+
+var _postcssSelectorParser2 = _interopRequireDefault(_postcssSelectorParser);
+
+var _reduceCssCalc = require('reduce-css-calc');
+
+var _reduceCssCalc2 = _interopRequireDefault(_reduceCssCalc);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var MATCH_CALC = /((?:\-[a-z]+\-)?calc)/;
+
+function transformValue(value, options, result, item) {
+  if (!value) {
+    return value;
+  }
+
+  var reduced = (0, _reduceCssCalc2.default)(value, options.precision);
+  // if the warnWhenCannotResolve option is on, inform the user that the calc
+  // expression could not be resolved to a single value
+  if (options.warnWhenCannotResolve && MATCH_CALC.test(reduced)) {
+    result.warn("Could not reduce expression: " + value, { plugin: 'postcss-calc', node: item });
+  }
+
+  return reduced;
+}
+
+function transformSelector(value, options, result, item) {
+  return (0, _postcssSelectorParser2.default)(function (selectors) {
+    selectors.walk(function (node) {
+      // attribute value
+      // e.g. the "calc(3*3)" part of "div[data-size="calc(3*3)"]"
+      if (node.type === 'attribute') {
+        var val = transformValue(node.raws.unquoted, options, result, item);
+        node.value = node.quoted ? '"' + val + '"' : val;
+      }
+
+      // tag value
+      // e.g. the "calc(3*3)" part of "div:nth-child(2n + calc(3*3))"
+      if (node.type === 'tag') node.value = transformValue(node.value, options, result, item);
+
+      return;
+    });
+  }).process(value).result.toString();
+}
+
+exports.default = function (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
+  // 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();
+    clone[property] = value;
+    node.parent.insertBefore(node, clone);
+  } else node[property] = value;
+};
+
+module.exports = exports['default'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-calc",
-  "version": "5.3.0",
+  "version": "6.0.2",
   "description": "PostCSS plugin to reduce calc()",
   "keywords": [
     "css",
@@ -9,25 +9,46 @@
     "calculation",
     "calc"
   ],
+  "main": "dist/index.js",
+  "files": [
+    "dist",
+    "LICENSE"
+  ],
+  "scripts": {
+    "prepublish": "npm run build && del-cli dist/__tests__",
+    "build": "del-cli dist && cross-env BABEL_ENV=publish babel src --out-dir dist",
+    "pretest": "eslint src && npm run build",
+    "test": "ava src/__tests__/"
+  },
   "author": "Maxime Thirouin",
   "license": "MIT",
   "repository": "https://github.com/postcss/postcss-calc.git",
-  "files": [
-    "index.js"
-  ],
-  "dependencies": {
-    "postcss-message-helpers": "^2.0.0",
-    "reduce-css-calc": "^1.2.0",
-    "postcss": "^5.0.2"
+  "eslintConfig": {
+    "parser": "babel-eslint",
+    "extends": "eslint-config-i-am-meticulous"
   },
   "devDependencies": {
-    "eslint": "^1.0.0",
-    "npmpub": "^3.1.0",
-    "postcss-custom-properties": "^5.0.0",
-    "tape": "^3.0.0"
+    "ava": "^0.19.1",
+    "babel-cli": "^6.18.0",
+    "babel-core": "^6.21.0",
+    "babel-eslint": "^7.1.1",
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "babel-preset-env": "^1.4.0",
+    "babel-register": "^6.18.0",
+    "cross-env": "^4.0.0",
+    "del-cli": "^0.2.1",
+    "eslint": "^3.12.2",
+    "eslint-config-i-am-meticulous": "^6.0.1",
+    "eslint-plugin-babel": "^4.0.0",
+    "eslint-plugin-import": "^2.2.0"
   },
-  "scripts": {
-    "test": "eslint . && tape test",
-    "release": "npmpub"
+  "dependencies": {
+    "css-unit-converter": "^1.1.1",
+    "postcss": "^7.0.2",
+    "postcss-selector-parser": "^2.2.2",
+    "reduce-css-calc": "^2.0.0"
+  },
+  "ava": {
+    "require": "babel-register"
   }
 }

package/index.js

@@ -1,62 +0,0 @@
-/**
- * Module dependencies.
- */
-var reduceCSSCalc = require("reduce-css-calc")
-var helpers = require("postcss-message-helpers")
-var postcss = require("postcss")
-
-var CONTAINS_CALC = /\bcalc\([\s\S]*?\)/
-
-/**
- * PostCSS plugin to reduce calc() function calls.
- */
-module.exports = postcss.plugin("postcss-calc", function(options) {
-  options = options || {}
-  var precision = options.precision
-  var preserve = options.preserve
-  var warnWhenCannotResolve = options.warnWhenCannotResolve
-  var mediaQueries = options.mediaQueries
-  var selectors = options.selectors
-
-  return function(style, result) {
-    function transformValue(node, property) {
-      var value = node[property]
-
-      if (!value || !CONTAINS_CALC.test(value)) {
-        return
-      }
-
-      helpers.try(function transformCSSCalc() {
-        var reducedValue = reduceCSSCalc(value, precision)
-
-        if (warnWhenCannotResolve && CONTAINS_CALC.test(reducedValue)) {
-          result.warn("Could not reduce expression: " + value,
-            {plugin: "postcss-calc", node: node})
-        }
-
-        if (!preserve) {
-          node[property] = reducedValue
-          return
-        }
-
-        if (reducedValue != value) {
-          var clone = node.clone()
-          clone[property] = reducedValue
-          node.parent.insertBefore(node, clone)
-        }
-      }, node.source)
-    }
-
-    style.walk(function(rule) {
-      if (mediaQueries && rule.type === "atrule") {
-        return transformValue(rule, "params")
-      }
-      else if (rule.type === "decl") {
-        return transformValue(rule, "value")
-      }
-      else if (selectors && rule.type === "rule") {
-        return transformValue(rule, "selector")
-      }
-    })
-  }
-})