postcss-calc 5.1.0 → 5.3.1

package/CHANGELOG.md

@@ -1,6 +1,26 @@
+# 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.
+  ([#29](https://github.com/postcss/postcss-calc/pull/29) - @uniquegestaltung)
+
+# 5.2.1 - 2016-04-10
+
+- Fixed: support for multiline value
+  ([#27](https://github.com/postcss/postcss-calc/pull/27))

+
+# 5.2.0 - 2016-01-08
+
+- Added: "mediaQueries" option for `@media` support
+([#22](https://github.com/postcss/postcss-calc/pull/22))
+
 # 5.1.0 - 2016-01-07
 
 - Added: "warnWhenCannotResolve" option to warn when calc() are not reduced to a single value
+([#20](https://github.com/postcss/postcss-calc/pull/20))
 
 # 5.0.0 - 2015-08-25
 

package/README.md

@@ -65,6 +65,10 @@ body {
 h1 {
   font-size: calc(var(--main-font-size) * 2);
   height: calc(100px - 2em);
+  margin-bottom: calc(
+      var(--main-font-size)
+      * 1.5
+    )
 }
 ```
 
@@ -77,7 +81,8 @@ body {
 
 h1 {
   font-size: 32px;
-  height: calc(100px - 2em)
+  height: calc(100px - 2em);
+  margin-bottom: 24px
 }
 ```
 
@@ -118,6 +123,36 @@ var out = postcss()
   .css
 ```
 
+#### `mediaQueries` (default: `false`)
+
+Allows calc() usage as part of media query declarations.
+
+```js
+var out = postcss()
+  .use(calc({mediaQueries: true}))
+  .process(css)
+  .css
+```
+
+#### `selectors` (default: `false`)
+
+Allows calc() usage as part of selectors.
+
+```js
+var out = postcss()
+  .use(calc({selectors: true}))
+  .process(css)
+  .css
+```
+
+Example:
+
+```css
+div[data-size="calc(3*3)"] {
+  width: 100px;
+}
+```
+
 ---
 
 ## Contributing

package/index.js

@@ -5,7 +5,7 @@ var reduceCSSCalc = require("reduce-css-calc")
 var helpers = require("postcss-message-helpers")
 var postcss = require("postcss")
 
-var CONTAINS_CALC = /calc\(.*\)/
+var CONTAINS_CALC = /\bcalc\([\s\S]*?\)/
 
 /**
  * PostCSS plugin to reduce calc() function calls.
@@ -15,33 +15,48 @@ module.exports = postcss.plugin("postcss-calc", function(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]
 
-    style.walkDecls(function transformDecl(decl) {
-      if (!decl.value || decl.value.indexOf("calc(") === -1) {
+      if (!value || !CONTAINS_CALC.test(value)) {
         return
       }
 
       helpers.try(function transformCSSCalc() {
-        var value = reduceCSSCalc(decl.value, precision)
+        var reducedValue = reduceCSSCalc(value, precision)
 
-        if (warnWhenCannotResolve && CONTAINS_CALC.test(value)) {
-          result.warn("Could not reduce expression: " + decl.value,
-            {plugin: "postcss-calc", node: decl})
+        if (warnWhenCannotResolve && CONTAINS_CALC.test(reducedValue)) {
+          result.warn("Could not reduce expression: " + value,
+            {plugin: "postcss-calc", node: node})
         }
 
         if (!preserve) {
-          decl.value = value
+          node[property] = reducedValue
           return
         }
 
-        if (value != decl.value) {
-          var clone = decl.clone()
-          clone.value = value
-          decl.parent.insertBefore(decl, clone)
+        if (reducedValue != value) {
+          var clone = node.clone()
+          clone[property] = reducedValue
+          node.parent.insertBefore(node, clone)
         }
-      }, decl.source)
+      }, 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")
+      }
     })
   }
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-calc",
-  "version": "5.1.0",
+  "version": "5.3.1",
   "description": "PostCSS plugin to reduce calc()",
   "keywords": [
     "css",
@@ -17,15 +17,17 @@
   ],
   "dependencies": {
     "postcss-message-helpers": "^2.0.0",
-    "reduce-css-calc": "^1.2.0",
+    "reduce-css-calc": "^1.2.6",
     "postcss": "^5.0.2"
   },
   "devDependencies": {
     "eslint": "^1.0.0",
+    "npmpub": "^3.1.0",
     "postcss-custom-properties": "^5.0.0",
     "tape": "^3.0.0"
   },
   "scripts": {
-    "test": "eslint . && tape test"
+    "test": "eslint . && tape test",
+    "release": "npmpub"
   }
 }