postcss-colormin 2.1.7 → 2.2.2

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# 2.2.2
+
+* Resolves an issue where the module would mangle the non-standard `composes`
+  property when consumed via css-loader.
+
+# 2.2.1
+
+* Resolves an issue where converting an rgb/hsl function next to another token,
+  such as `linear-gradient(rgb(10, 10, 10)0%, blue)` would result in a
+  mangled value.
+
+# 2.2.0
+
+* Adds support for legacy IE versions (< 10).
+
+# 2.1.8
+
+* Fixes incorrect minification of percentages used by `rgb` functions; i.e.
+  `rgb(100%,100%,100%)` was not converted correctly to `#fff`.
+
 # 2.1.7
 
 * Fixes another regression where `hsla(0,0%,100%,.5)` was converted to

package/README.md

@@ -10,6 +10,7 @@ With [npm](https://npmjs.org/package/postcss-colormin) do:
 npm install postcss-colormin --save
 ```
 
+
 ## Example
 
 ```js
@@ -22,17 +23,36 @@ console.log(postcss(colormin()).process(css).css);
 // => 'h1 {color:red}'
 ```
 
-For more examples see the [tests](test.js).
+For more examples see the [tests](src/__tests__/index.js).
+
+
+## API
+
+### colormin([options])
+
+#### options
+
+##### legacy
+
+Type: `boolean`  
+Default: `false`
+
+Set this to `true` to enable IE < 10 compatibility; the browser chokes on the
+`transparent` keyword, so in this mode the conversion from `rgba(0,0,0,0)`
+is turned off.
+
 
 ## Contributing
 
 Pull requests are welcome. If you add functionality, then please add unit tests
 to cover it.
 
+
 ## License
 
 MIT © [Ben Briggs](http://beneb.info)
 
+
 [ci]:       https://travis-ci.org/ben-eb/postcss-colormin
 [deps]:     https://gemnasium.com/ben-eb/postcss-colormin
 [npm]:      http://badge.fury.io/js/postcss-colormin

package/dist/index.js

@@ -1,10 +1,6 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', {
-    value: true
-});
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+exports.__esModule = true;
 
 var _postcss = require('postcss');
 
@@ -14,63 +10,69 @@ var _postcssValueParser = require('postcss-value-parser');
 
 var _postcssValueParser2 = _interopRequireDefault(_postcssValueParser);
 
-var _libColormin = require('./lib/colormin');
-
-var _libColormin2 = _interopRequireDefault(_libColormin);
-
-function extractColorArguments(nodes) {
-    var result = [];
-    for (var i = 0, max = nodes.length; i < max; i += 1) {
-        if (nodes[i].type === 'word') {
-            var val = parseFloat(nodes[i].value);
-            if (isNaN(val)) {
-                return false;
-            }
-            result.push(val);
-        }
-    }
+var _colormin = require('colormin');
 
-    return result;
-}
+var _colormin2 = _interopRequireDefault(_colormin);
 
-function reduceColor(decl) {
-    decl.value = (0, _postcssValueParser2['default'])(decl.value).walk(function (node) {
-        if (node.type === 'function') {
-            if (/^(rgb|hsl)a?$/.test(node.value)) {
-                var args = extractColorArguments(node.nodes);
-                if (args) {
-                    node.value = (0, _libColormin2['default'])(node.value, args);
-                    node.type = 'word';
-                }
-            }
-        } else if (node.type === 'word') {
-            node.value = (0, _libColormin2['default'])(node.value);
-        }
-    }).toString();
-}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function reduceWhitespaces(decl) {
-    decl.value = (0, _postcssValueParser2['default'])(decl.value).walk(function (node) {
+    decl.value = (0, _postcssValueParser2.default)(decl.value).walk(function (node) {
         if (node.type === 'function' || node.type === 'div') {
             node.before = node.after = '';
         }
     }).toString();
 }
 
-function transform(decl) {
+function walk(parent, callback) {
+    parent.nodes.forEach(function (node, index) {
+        var bubble = callback(node, index, parent);
+        if (node.nodes && bubble !== false) {
+            walk(node, callback);
+        }
+    });
+}
+
+function transform(decl, opts) {
     if (decl.prop === '-webkit-tap-highlight-color') {
         if (decl.value === 'inherit' || decl.value === 'transparent') {
             return;
         }
         reduceWhitespaces(decl);
-    } else if (/^(?!font|filter)/.test(decl.prop)) {
-        reduceColor(decl);
+        return;
+    }
+    if (/^(composes|font|filter)/i.test(decl.prop)) {
+        return;
     }
+    var ast = (0, _postcssValueParser2.default)(decl.value);
+    walk(ast, function (node, index, parent) {
+        if (node.type === 'function') {
+            if (/^(rgb|hsl)a?$/.test(node.value)) {
+                var value = node.value;
+
+                node.value = (0, _colormin2.default)((0, _postcssValueParser.stringify)(node), opts);
+                node.type = 'word';
+                var next = parent.nodes[index + 1];
+                if (node.value !== value && next && next.type === 'word') {
+                    parent.nodes.splice(index + 1, 0, { type: 'space', value: ' ' });
+                }
+            } else if (node.value === 'calc') {
+                return false;
+            }
+        } else {
+            node.value = (0, _colormin2.default)(node.value, opts);
+        }
+    });
+    decl.value = ast.toString();
 }
 
-exports['default'] = _postcss2['default'].plugin('postcss-colormin', function () {
+exports.default = _postcss2.default.plugin('postcss-colormin', function () {
+    var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
     return function (css) {
-        css.walkDecls(transform);
+        return css.walkDecls(function (node) {
+            return transform(node, opts);
+        });
     };
 });
 module.exports = exports['default'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-colormin",
-  "version": "2.1.7",
+  "version": "2.2.2",
   "description": "Minify colors in your CSS files with PostCSS.",
   "main": "dist/index.js",
   "files": [
@@ -8,9 +8,10 @@
     "LICENSE-MIT"
   ],
   "scripts": {
-    "prepublish": "babel src --out-dir dist --ignore /__tests__/",
-    "test-unformatted": "babel-tape-runner \"src/**/__tests__/*.js\"",
-    "test": "npm run test-unformatted | tap-spec"
+    "pretest": "eslint src",
+    "prepublish": "del-cli dist && babel src --out-dir dist --ignore /__tests__/",
+    "test": "ava src/__tests__",
+    "test-012": "ava src/__tests__"
   },
   "keywords": [
     "color",
@@ -23,10 +24,19 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "babel": "^5.8.23",
-    "babel-tape-runner": "^1.2.0",
-    "tap-spec": "^4.1.0",
-    "tape": "^4.2.0"
+    "ava": "^0.17.0",
+    "babel-cli": "^6.3.17",
+    "babel-core": "^6.3.26",
+    "babel-plugin-add-module-exports": "^0.2.0",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-es2015-loose": "^7.0.0",
+    "babel-preset-stage-0": "^6.3.13",
+    "babel-register": "^6.9.0",
+    "del-cli": "^0.2.0",
+    "eslint": "^3.0.0",
+    "eslint-config-cssnano": "^3.0.0",
+    "eslint-plugin-babel": "^3.3.0",
+    "eslint-plugin-import": "^2.0.1"
   },
   "homepage": "https://github.com/ben-eb/postcss-colormin",
   "author": {
@@ -36,9 +46,14 @@
   },
   "repository": "ben-eb/postcss-colormin",
   "dependencies": {
-    "colr-convert": "^1.0.5",
-    "css-color-names": "0.0.2",
-    "postcss": "^5.0.4",
-    "postcss-value-parser": "^3.0.2"
+    "colormin": "^1.0.5",
+    "postcss": "^5.0.13",
+    "postcss-value-parser": "^3.2.3"
+  },
+  "eslintConfig": {
+    "extends": "cssnano"
+  },
+  "ava": {
+    "require": "babel-register"
   }
 }

package/dist/lib/colormin.js

@@ -1,119 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', {
-    value: true
-});
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
-
-var _colrConvert = require('colr-convert');
-
-var _colrConvert2 = _interopRequireDefault(_colrConvert);
-
-var _cssColorNames = require('css-color-names');
-
-var _cssColorNames2 = _interopRequireDefault(_cssColorNames);
-
-var _dropLeadingZero = require('./drop-leading-zero');
-
-var _dropLeadingZero2 = _interopRequireDefault(_dropLeadingZero);
-
-var _hex = require('./hex');
-
-var hexes = {};
-var round = Math.round;
-
-Object.keys(_cssColorNames2['default']).forEach(function (keyword) {
-    return hexes[_cssColorNames2['default'][keyword]] = keyword;
-});
-
-var shorter = function shorter(a, b) {
-    return a && a.length < b.length ? a : b;
-};
-
-function clamp(max) {
-    return function (value) {
-        return Math.max(0, Math.min(value, max));
-    };
-}
-
-function clampRgb(value) {
-    return clamp(255)(value);
-}
-
-function clampHsl(value, index) {
-    if (!index) {
-        return clamp(360)(value);
-    }
-    return index < 4 ? clamp(100)(value) : value;
-}
-
-exports['default'] = function (name, args) {
-    var word = name.toLowerCase();
-    if (word === 'rgb' || word === 'rgba' || word === 'hsl' || word === 'hsla') {
-        if (!args) {
-            return name;
-        }
-        if (word[3] === 'a') {
-            if (args[1] === 0 && args[2] === 0 && args[3] === 0) {
-                if (word === 'hsla' || args[0] === 0) {
-                    return 'transparent';
-                }
-            }
-            if (args[3] === 1) {
-                word = word.slice(0, 3);
-            } else {
-                args[3] = (0, _dropLeadingZero2['default'])(args[3]);
-            }
-        }
-        if (word === 'hsl') {
-            word = 'rgb';
-            args = _colrConvert2['default'].hsl.rgb(args.map(clampHsl));
-            args[0] = round(args[0]);
-            args[1] = round(args[1]);
-            args[2] = round(args[2]);
-        }
-        if (word === 'rgb') {
-            word = _colrConvert2['default'].rgb.hex(args.map(clampRgb));
-        } else {
-            var rgba = undefined,
-                hsla = undefined;
-            // alpha conversion
-            if (word === 'rgba') {
-                rgba = args.slice(0, 3).map(clampRgb).concat(args[3]);
-                hsla = _colrConvert2['default'].rgb.hsl(args);
-                hsla[0] = round(hsla[0]);
-                hsla[1] = round(hsla[1]);
-                hsla[2] = round(hsla[2]);
-                hsla.push(args[3]);
-            } else {
-                hsla = args.map(clampHsl);
-                rgba = _colrConvert2['default'].hsl.rgb(hsla);
-                rgba[0] = round(rgba[0]);
-                rgba[1] = round(rgba[1]);
-                rgba[2] = round(rgba[2]);
-                rgba.push(args[3]);
-                hsla[3] = args[3];
-            }
-            hsla[1] = hsla[1] + '%';
-            hsla[2] = hsla[2] + '%';
-            return shorter('hsla(' + hsla.join() + ')', 'rgba(' + rgba.join() + ')');
-        }
-    }
-
-    if ((0, _hex.isHex)(word)) {
-        word = (0, _hex.toLonghand)(word);
-        if (word in hexes) {
-            return shorter(hexes[word], (0, _hex.toShorthand)(word));
-        }
-        return (0, _hex.toShorthand)(word);
-    }
-
-    if (word in _cssColorNames2['default']) {
-        return shorter((0, _hex.toShorthand)(_cssColorNames2['default'][word]), word);
-    }
-
-    return name;
-};
-
-module.exports = exports['default'];

package/dist/lib/drop-leading-zero.js

@@ -1,23 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', {
-    value: true
-});
-
-exports['default'] = function (number) {
-    var value = String(number);
-
-    if (number % 1) {
-        if (value[0] === '0') {
-            return value.slice(1);
-        }
-
-        if (value[0] === '-' && value[1] === '0') {
-            return '-' + value.slice(2);
-        }
-    }
-
-    return value;
-};
-
-module.exports = exports['default'];

package/dist/lib/hex.js

@@ -1,39 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', {
-    value: true
-});
-exports.toShorthand = toShorthand;
-exports.toLonghand = toLonghand;
-exports.isHex = isHex;
-
-function toShorthand(hex) {
-    if (hex.length === 7 && hex[1] === hex[2] && hex[3] === hex[4] && hex[5] === hex[6]) {
-        return '#' + hex[2] + hex[4] + hex[6];
-    }
-    return hex;
-}
-
-;
-
-function toLonghand(hex) {
-    if (hex.length !== 4) {
-        return hex;
-    }
-
-    var h = hex.substring(1);
-    var r = h[0];
-    var g = h[1];
-    var b = h[2];
-    return '#' + r + r + g + g + b + b;
-}
-
-;
-
-function isHex(hex) {
-    if (hex[0] === '#') {
-        var c = toLonghand(hex).substring(1);
-        return c.length === 6 && !isNaN(parseInt(c, 16));
-    }
-    return false;
-}