postcss-convert-values 1.2.3 → 1.3.1

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# 1.3.1
+
+* Fixes an issue where the module would convert values in gradient/url functions
+  since 1.3.0.
+
+# 1.3.0
+
+* Converted the module to use ES6.
+* balanced-match, css-list & some integrated code has been replaced with
+  postcss-value-parser; reducing the number of moving parts in this module, and
+  providing a more futureproof way of parsing CSS numeric values.
+
+# 1.2.5
+
+* Fixes an issue where uppercase units (such as PX) were being deleted.
+
+# 1.2.4
+
+* Fixes convert not px or ms
+
 # 1.2.3
 
 * Adds support for `ch` units; previously they were removed.

package/README.md

@@ -12,13 +12,26 @@ npm install postcss-convert-values --save
 
 ## Example
 
-```js
-var postcss = require('postcss');
+This plugin reduces CSS size by converting values to use different units
+where possible; for example, `500ms` can be represented as `.5s`. You can
+read more about these units in [this article][csstricks].
 
-var css = 'h1 { font-size: 16px; width: 0em }';
-console.log(postcss([ require('postcss-convert-values') ]).process(css).css);
+### Input
 
-// => 'h1 { font-size: 1pc; width: 0 }'
+```css
+h1 {
+    font-size: 16px;
+    width: 0em
+}
+```
+
+### Output
+
+```css
+h1 {
+    font-size: 1pc;
+    width: 0
+}
 ```
 
 Note that this plugin only covers conversions for duration and absolute length
@@ -38,3 +51,5 @@ MIT © [Ben Briggs](http://beneb.info)
 [deps]:     https://gemnasium.com/ben-eb/postcss-convert-values
 [npm]:      http://badge.fury.io/js/postcss-convert-values
 [postcss]:  https://github.com/postcss/postcss
+
+[csstricks]: https://css-tricks.com/the-lengths-of-css/

package/dist/index.js

@@ -0,0 +1,57 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+var _postcss = require('postcss');
+
+var _postcss2 = _interopRequireDefault(_postcss);
+
+var _libConvert = require('./lib/convert');
+
+var _libConvert2 = _interopRequireDefault(_libConvert);
+
+var _postcssValueParser = require('postcss-value-parser');
+
+var _postcssValueParser2 = _interopRequireDefault(_postcssValueParser);
+
+var optimise = function optimise(decl) {
+    if (~decl.prop.indexOf('flex')) {
+        return;
+    }
+
+    var parsed = (0, _postcssValueParser2['default'])(decl.value);
+
+    var transform = function transform(node) {
+        if (node.type === 'word') {
+            var number = (0, _postcssValueParser.unit)(node.value);
+            if (number) {
+                var num = parseFloat(number.number);
+                var u = number.unit.toLowerCase();
+                if (num === 0) {
+                    var value = u === 'ms' || u === 's' ? 0 + u : 0;
+                    node.value = value;
+                    return;
+                }
+                node.value = (0, _libConvert2['default'])(num, u);
+            }
+            return;
+        }
+        if (node.type === 'function' && node.value === 'calc') {
+            return node.nodes.forEach(transform);
+        }
+    };
+
+    parsed.nodes.forEach(transform);
+    decl.value = parsed.toString();
+};
+
+exports['default'] = _postcss2['default'].plugin('postcss-convert-values', function () {
+    return function (css) {
+        css.eachDecl(optimise);
+    };
+});
+module.exports = exports['default'];

package/dist/lib/convert.js

@@ -0,0 +1,65 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});
+var conversions = [{
+    // Length
+    'in': 96,
+    'px': 1,
+    'pt': 4 / 3,
+    'pc': 16
+}, {
+    // Time
+    's': 1000,
+    'ms': 1
+}];
+
+function dropLeadingZero(number) {
+    var value = String(number);
+
+    if (value[0] === '0' && number % 1) {
+        return value.substring(1);
+    }
+
+    if (value[0] === '-' && value[1] === '0' && number % 1) {
+        return '-' + value.substring(2);
+    }
+
+    return value;
+}
+
+exports['default'] = function (number, unit) {
+    var converted = undefined,
+        value = dropLeadingZero(number) + (unit ? unit : ''),
+        conversion = undefined,
+        base = undefined;
+
+    conversion = conversions.filter(function (area) {
+        return unit in area;
+    })[0];
+
+    if (conversion) {
+        if (unit === 'ms' || unit === 'px') {
+            base = number / conversion[unit];
+        } else {
+            base = number * conversion[unit];
+        }
+
+        converted = Object.keys(conversion).filter(function (u) {
+            return unit !== u;
+        }).map(function (u) {
+            return dropLeadingZero(base / conversion[u]) + u;
+        }).reduce(function (a, b) {
+            return a.length < b.length ? a : b;
+        });
+
+        if (converted.length < value.length) {
+            value = converted;
+        }
+    }
+
+    return value;
+};
+
+module.exports = exports['default'];

package/package.json

@@ -1,22 +1,28 @@
 {
   "name": "postcss-convert-values",
-  "version": "1.2.3",
+  "version": "1.3.1",
   "description": "Convert values with PostCSS (e.g. ms -> s)",
-  "main": "index.js",
+  "main": "dist/index.js",
+  "files": [
+    "LICENSE-MIT",
+    "dist"
+  ],
   "scripts": {
-    "test": "tape test.js | tap-spec",
-    "jscs": "jscs index.js test.js lib/*.js"
+    "prepublish": "babel src --out-dir dist --ignore /__tests__/",
+    "test": "babel-tape-runner \"src/**/__tests__/*.js\" | tap-spec"
   },
   "keywords": [
     "css",
     "optimisation",
     "postcss",
-    "postcss-plugins"
+    "postcss-plugin"
   ],
   "license": "MIT",
   "devDependencies": {
-    "tap-spec": "^4.0.2",
-    "tape": "^4.0.0"
+    "babel": "^5.8.21",
+    "babel-tape-runner": "^1.2.0",
+    "tap-spec": "^4.1.0",
+    "tape": "^4.2.0"
   },
   "homepage": "https://github.com/ben-eb/postcss-convert-values",
   "author": {
@@ -26,8 +32,7 @@
   },
   "repository": "ben-eb/postcss-convert-values",
   "dependencies": {
-    "balanced-match": "^0.2.0",
-    "css-list": "^0.1.0",
-    "postcss": "^4.1.13"
+    "postcss": "^4.1.16",
+    "postcss-value-parser": "^1.1.0"
   }
 }

package/.jscsrc

@@ -1,18 +0,0 @@
-{
-  "requireSpaceAfterKeywords": [
-    "do",
-    "for",
-    "if",
-    "else",
-    "switch",
-    "case",
-    "try",
-    "catch",
-    "void",
-    "while",
-    "with",
-    "return",
-    "typeof",
-    "function"
-  ]
-}

package/.npmignore

@@ -1,5 +0,0 @@
-.editorconfig
-.gitignore
-.jshintrc
-.travis.yml
-test.js

package/index.js

@@ -1,31 +0,0 @@
-'use strict';
-
-var postcss = require('postcss');
-var convert = require('./lib/convert');
-var eachValue = require('./lib/eachValue');
-var parseUnit = require('./lib/parseUnit');
-
-module.exports = postcss.plugin('postcss-convert-values', function () {
-    return function (css) {
-        css.eachDecl(function (decl) {
-            if (~decl.prop.indexOf('flex')) {
-                return;
-            }
-            decl.value = eachValue(decl.value, function (value) {
-                var number, unit;
-
-                if (!isNaN(number = parseFloat(value))) {
-                    unit = parseUnit(value);
-
-                    if (number === 0) {
-                        value = (unit === 'ms' || unit === 's') ? 0 + unit : 0;
-                    } else {
-                        value = convert(number, unit);
-                    }
-
-                    return value;
-                }
-            });
-        });
-    };
-});

package/lib/convert.js

@@ -1,59 +0,0 @@
-'use strict';
-
-var conversions = [{
-    // Length
-    'in': 96,
-    'px': 1,
-    'pt': 4 / 3,
-    'pc': 16
-}, {
-    // Time
-    's': 1000,
-    'ms': 1
-}];
-
-function dropLeadingZero (number) {
-    var value = number.toString();
-
-    if (value[0] === '0' && number % 1) {
-        return value.substring(1);
-    }
-
-    if (value[0] === '-' && value[1] === '0' && number % 1) {
-        return '-' + value.substring(2);
-    }
-
-    return value;
-}
-
-module.exports = function (number, unit) {
-    var converted,
-        value = dropLeadingZero(number) + (unit ? unit : ''),
-        conversion,
-        base;
-
-    conversion = conversions.filter(function (area) {
-        return unit in area;
-    })[0];
-
-    if (conversion) {
-        base = number / conversion[unit];
-
-        converted = Object.keys(conversion)
-            .filter(function (u) {
-                return unit !== u;
-            })
-            .map(function (u) {
-                return dropLeadingZero(base / conversion[u]) + u;
-            })
-            .reduce(function (a, b) {
-                return a.length < b.length ? a : b;
-            });
-
-        if (converted.length < value.length) {
-            value = converted;
-        }
-    }
-
-    return value;
-};

package/lib/eachValue.js

@@ -1,27 +0,0 @@
-'use strict';
-
-var balanced = require('balanced-match');
-var list = require('css-list');
-
-module.exports = function eachValue (value, callback) {
-    return list.map(value, function (value, type) {
-        var name,
-            match,
-            index;
-
-        if (type === null) {
-            return callback(value);
-        }
-
-        if (type === 'func') {
-            index = value.indexOf('(');
-            name = value.substring(0, index);
-            if (~name.indexOf('calc')) {
-                match = balanced('(', ')', value);
-                if (match) {
-                    return name + '(' + eachValue(match.body, callback) + ')';
-                }
-            }
-        }
-    });
-};

package/lib/parseUnit.js

@@ -1,36 +0,0 @@
-'use strict';
-
-// From longer to shorter!
-var units = [
-    'vmin',
-    'vmax',
-    'rem',
-    'em',
-    'ex',
-    'vw',
-    'vh',
-    'vm',
-    'ch',
-    'in',
-    'cm',
-    'mm',
-    'pt',
-    'pc',
-    'px',
-    'ms',
-    's',
-    '%'
-];
-
-module.exports = function (value) {
-    var max, index;
-
-    for (max = 4; max !== 0; max -= 1) {
-        index = units.indexOf(value.slice(-max));
-        if (~index) {
-            return units[index];
-        }
-    }
-
-    return null;
-};