postcss-merge-rules 1.3.2 → 1.3.6

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# 1.3.6
+
+* Minor boost in performance with reduced stringify passes.
+
+# 1.3.5
+
+* Improves merging of adjacent rules with identical selectors.
+
+# 1.3.4
+
+* Fixes an issue where in some cases, non-adjacent rule merging was being
+  performed.
+
+# 1.3.3
+
+* Fixes an issue where the wildcard hack (`*zoom: 1`) was being propagated to
+  other properties erroneously.
+* Better merging logic in some cases.
+
 # 1.3.2
 
 * Fixes a behaviour in which comment nodes were being processed by the

package/{index.js → dist/index.js}

@@ -1,39 +1,48 @@
 'use strict';
 
-var postcss = require('postcss');
-var list = postcss.list;
-var flatten = require('flatten');
-var clone = require('./lib/clone');
+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 _libClone = require('./lib/clone');
+
+var _libClone2 = _interopRequireDefault(_libClone);
 
+var list = _postcss2['default'].list;
 var prefixes = ['-webkit-', '-moz-', '-ms-', '-o-'];
 
-function intersect (a, b, not) {
+function intersect(a, b, not) {
     return a.filter(function (c) {
         var index = ~b.indexOf(c);
         return not ? !index : index;
     });
 }
 
-function different (a, b) {
+var different = function different(a, b) {
     return intersect(a, b, true).concat(intersect(b, a, true));
-}
-
-function filterPrefixes (selector) {
+};
+var filterPrefixes = function filterPrefixes(selector) {
     return intersect(prefixes, selector);
-}
+};
 
-function sameVendor (selectorsA, selectorsB) {
-    var same = function (selectors) {
-        return flatten(selectors.map(filterPrefixes)).join();
+function sameVendor(selectorsA, selectorsB) {
+    var same = function same(selectors) {
+        return selectors.map(filterPrefixes).join();
     };
     return same(selectorsA) === same(selectorsB);
 }
 
-function noVendor (selector) {
+var noVendor = function noVendor(selector) {
     return !filterPrefixes(selector).length;
-}
+};
 
-function sameParent (ruleA, ruleB) {
+function sameParent(ruleA, ruleB) {
     var hasParent = ruleA.parent && ruleB.parent;
     var sameType = hasParent && ruleA.parent.type === ruleB.parent.type;
     // If an at rule, ensure that the parameters are the same
@@ -43,7 +52,7 @@ function sameParent (ruleA, ruleB) {
     return hasParent ? sameType : true;
 }
 
-function canMerge (ruleA, ruleB) {
+function canMerge(ruleA, ruleB) {
     var a = list.comma(ruleA.selector);
     var b = list.comma(ruleB.selector);
 
@@ -51,32 +60,41 @@ function canMerge (ruleA, ruleB) {
     return parent && (a.concat(b).every(noVendor) || sameVendor(a, b));
 }
 
-function getDeclarations (rule) {
+var getDecls = function getDecls(rule) {
     return rule.nodes.map(String);
-}
+};
+var joinSelectors = function joinSelectors() {
+    for (var _len = arguments.length, rules = Array(_len), _key = 0; _key < _len; _key++) {
+        rules[_key] = arguments[_key];
+    }
 
-function joinSelectors (/* rules... */) {
-    var args = Array.prototype.slice.call(arguments);
-    return flatten(args.map(function (s) { return s.selector; })).join(',');
-}
+    return rules.map(function (s) {
+        return s.selector;
+    }).join();
+};
+
+function ruleLength() {
+    for (var _len2 = arguments.length, rules = Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        rules[_key2] = arguments[_key2];
+    }
 
-function ruleLength (/* rules... */) {
-    var args = Array.prototype.slice.call(arguments);
-    return args.map(function (selector) {
-        return selector.nodes.length ? String(selector) : '';
+    return rules.map(function (r) {
+        return r.nodes.length ? String(r) : '';
     }).join('').length;
 }
 
-function partialMerge (first, second) {
-    var intersection = intersect(getDeclarations(first), getDeclarations(second));
+function partialMerge(first, second) {
+    var _this = this;
+
+    var intersection = intersect(getDecls(first), getDecls(second));
     if (!intersection.length) {
         return second;
     }
     var nextRule = second.next();
     if (nextRule && nextRule.type !== 'comment') {
-        var nextIntersection = intersect(getDeclarations(second), getDeclarations(nextRule));
+        var nextIntersection = intersect(getDecls(second), getDecls(nextRule));
         if (nextIntersection.length > intersection.length) {
-            first = second; second = nextRule; intersection = nextIntersection;
+            first = second;second = nextRule;intersection = nextIntersection;
         }
     }
     var recievingBlock = second.cloneBefore({
@@ -84,26 +102,27 @@ function partialMerge (first, second) {
         nodes: [],
         before: ''
     });
-    var difference = different(getDeclarations(first), getDeclarations(second));
-    var firstClone = clone(first);
-    var secondClone = clone(second);
-    var moveDecl = function (callback) {
+    var difference = different(getDecls(first), getDecls(second));
+    var firstClone = (0, _libClone2['default'])(first);
+    var secondClone = (0, _libClone2['default'])(second);
+    var moveDecl = function moveDecl(callback) {
         return function (decl) {
             var intersects = ~intersection.indexOf(String(decl));
-            var baseProperty = decl.prop.split('-')[0];
+            var base = decl.prop.split('-')[0];
             var canMove = difference.every(function (d) {
-                return d.split(':')[0] !== baseProperty;
+                return d.split(':')[0] !== base;
             });
             if (intersects && canMove) {
-                callback.call(this, decl);
+                callback.call(_this, decl);
             }
         };
     };
     firstClone.eachDecl(moveDecl(function (decl) {
-        decl.moveTo(recievingBlock);
+        decl.removeSelf();
+        recievingBlock.append(decl);
     }));
     secondClone.eachDecl(moveDecl(function (decl) {
-        decl.removeSelf();
+        return decl.removeSelf();
     }));
     var merged = ruleLength(firstClone, recievingBlock, secondClone);
     var original = ruleLength(first, second);
@@ -115,14 +134,17 @@ function partialMerge (first, second) {
                 r.removeSelf();
             }
         });
+        if (!secondClone.parent) {
+            return recievingBlock;
+        }
         return secondClone;
     } else {
         recievingBlock.removeSelf();
-        return first;
+        return second;
     }
 }
 
-function selectorMerger () {
+function selectorMerger() {
     var cache = null;
     return function (rule) {
         // Prime the cache with the first rule, or alternately ensure that it is
@@ -131,11 +153,15 @@ function selectorMerger () {
             cache = rule;
             return;
         }
-        var cacheDecls = getDeclarations(cache);
-        var ruleDecls = getDeclarations(rule);
+        // Ensure that we don't deduplicate the same rule; this is sometimes
+        // caused by a partial merge
+        if (cache === rule) {
+            cache = rule;
+            return;
+        }
         // Merge when declarations are exactly equal
         // e.g. h1 { color: red } h2 { color: red }
-        if (ruleDecls.join(';') === cacheDecls.join(';')) {
+        if (getDecls(rule).join(';') === getDecls(cache).join(';')) {
             rule.selector = joinSelectors(cache, rule);
             cache.removeSelf();
             cache = rule;
@@ -144,8 +170,12 @@ function selectorMerger () {
         // Merge when both selectors are exactly equal
         // e.g. a { color: blue } a { font-weight: bold }
         if (cache.selector === rule.selector) {
-            rule.eachInside(function (declaration) {
-                declaration.moveTo(cache);
+            var toString = String(cache);
+            rule.eachInside(function (decl) {
+                if (~toString.indexOf(String(decl))) {
+                    return decl.removeSelf();
+                }
+                decl.moveTo(cache);
             });
             rule.removeSelf();
             return;
@@ -156,8 +186,9 @@ function selectorMerger () {
     };
 }
 
-module.exports = postcss.plugin('postcss-merge-rules', function () {
+exports['default'] = _postcss2['default'].plugin('postcss-merge-rules', function () {
     return function (css) {
         css.eachRule(selectorMerger());
     };
 });
+module.exports = exports['default'];

package/{lib → dist/lib}/clone.js

@@ -2,13 +2,16 @@
 
 'use strict';
 
-module.exports = function clone (obj, parent) {
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});
+var clone = function clone(obj, parent) {
     if (typeof obj !== 'object') {
         return obj;
     }
     var cloned = new obj.constructor();
     for (var i in obj) {
-        if (!({}.hasOwnProperty.call(obj, i))) {
+        if (!({}).hasOwnProperty.call(obj, i)) {
             continue;
         }
         var value = obj[i];
@@ -28,3 +31,6 @@ module.exports = function clone (obj, parent) {
     }
     return cloned;
 };
+
+exports['default'] = clone;
+module.exports = exports['default'];

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "postcss-merge-rules",
-  "version": "1.3.2",
+  "version": "1.3.6",
   "description": "Merge CSS rules with PostCSS.",
-  "main": "index.js",
+  "main": "dist/index.js",
+  "files": [
+    "LICENSE-MIT",
+    "dist"
+  ],
   "scripts": {
-    "lint": "jshint index.js lib/*.js --reporter node_modules/jshint-stylish/stylish.js",
-    "test": "tape test.js | tap-spec"
+    "prepublish": "babel src --out-dir dist --ignore /__tests__/",
+    "test": "babel-tape-runner \"src/**/__tests__/*.js\" | tap-spec"
   },
   "keywords": [
     "css",
@@ -15,10 +19,10 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "jshint": "^2.8.0",
-    "jshint-stylish": "^2.0.1",
+    "babel": "^5.8.21",
+    "babel-tape-runner": "^1.2.0",
     "tap-spec": "^4.0.2",
-    "tape": "^4.0.0"
+    "tape": "^4.1.0"
   },
   "homepage": "https://github.com/ben-eb/postcss-merge-rules",
   "author": {
@@ -26,12 +30,8 @@
     "email": "beneb.info@gmail.com",
     "url": "http://beneb.info"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/ben-eb/postcss-merge-rules.git"
-  },
+  "repository": "ben-eb/postcss-merge-rules",
   "dependencies": {
-    "flatten": "0.0.1",
     "postcss": "^4.1.16"
   }
 }

package/.npmignore

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