postcss-merge-rules 2.1.1 → 2.1.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.1.2
+
+* Performance improvements; no compatibility checking for simple selectors,
+  cached compatibility lookups, and early exit on compatibility mismatches
+  (thanks to @akx).
+
 # 2.1.1
 
 * Resolves an issue with `2.1.0` where `browserslist` was not being installed

package/dist/index.js

@@ -2,8 +2,6 @@
 
 exports.__esModule = true;
 
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
-
 var _browserslist = require('browserslist');
 
 var _browserslist2 = _interopRequireDefault(_browserslist);
@@ -65,13 +63,13 @@ function sameParent(ruleA, ruleB) {
     return hasParent ? sameType : true;
 }
 
-function canMerge(ruleA, ruleB, browsers) {
+function canMerge(ruleA, ruleB, browsers, compatibilityCache) {
     var a = ruleA.selectors;
     var b = ruleB.selectors;
 
     var selectors = a.concat(b);
 
-    if (!(0, _ensureCompatibility2.default)(selectors, browsers)) {
+    if (!(0, _ensureCompatibility2.default)(selectors, browsers, compatibilityCache)) {
         return false;
     }
 
@@ -214,12 +212,12 @@ function partialMerge(first, second) {
     }
 }
 
-function selectorMerger(browsers) {
+function selectorMerger(browsers, compatibilityCache) {
     var cache = null;
     return function (rule) {
         // Prime the cache with the first rule, or alternately ensure that it is
         // safe to merge both declarations before continuing
-        if (!cache || !canMerge(rule, cache, browsers)) {
+        if (!cache || !canMerge(rule, cache, browsers, compatibilityCache)) {
             cache = rule;
             return;
         }
@@ -240,21 +238,15 @@ function selectorMerger(browsers) {
         // Merge when both selectors are exactly equal
         // e.g. a { color: blue } a { font-weight: bold }
         if (cache.selector === rule.selector) {
-            var _ret = function () {
-                var cached = getDecls(cache);
-                rule.walk(function (decl) {
-                    if (~cached.indexOf(String(decl))) {
-                        return decl.remove();
-                    }
-                    decl.moveTo(cache);
-                });
-                rule.remove();
-                return {
-                    v: void 0
-                };
-            }();
-
-            if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v;
+            var cached = getDecls(cache);
+            rule.walk(function (decl) {
+                if (~cached.indexOf(String(decl))) {
+                    return decl.remove();
+                }
+                decl.moveTo(cache);
+            });
+            rule.remove();
+            return;
         }
         // Partial merge: check if the rule contains a subset of the last; if
         // so create a joined selector with the subset, if smaller.
@@ -271,7 +263,8 @@ exports.default = _postcss2.default.plugin('postcss-merge-rules', function () {
             path: opts && opts.from,
             env: opts && opts.env
         });
-        css.walkRules(selectorMerger(browsers));
+        var compatibilityCache = {};
+        css.walkRules(selectorMerger(browsers, compatibilityCache));
     };
 });
 module.exports = exports['default'];

package/dist/lib/ensureCompatibility.js

@@ -12,6 +12,8 @@ var _postcssSelectorParser2 = _interopRequireDefault(_postcssSelectorParser);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var simpleSelectorRe = /^#?[-._a-z0-9 ]+$/i;
+
 var cssSel2 = 'css-sel2';
 var cssSel3 = 'css-sel3';
 var cssGencontent = 'css-gencontent';
@@ -69,12 +71,18 @@ function isCssMixin(selector) {
     return selector[selector.length - 1] === ':';
 }
 
-function ensureCompatibility(selectors, browsers) {
+function ensureCompatibility(selectors, browsers, compatibilityCache) {
     // Should not merge mixins
     if (selectors.some(isCssMixin)) {
         return false;
     }
     return selectors.every(function (selector) {
+        if (simpleSelectorRe.test(selector)) {
+            return true;
+        }
+        if (compatibilityCache && selector in compatibilityCache) {
+            return compatibilityCache[selector];
+        }
         var compatible = true;
         (0, _postcssSelectorParser2.default)(function (ast) {
             ast.walk(function (node) {
@@ -117,8 +125,16 @@ function ensureCompatibility(selectors, browsers) {
                         compatible = (0, _caniuseApi.isSupported)('css-case-insensitive', browsers);
                     }
                 }
+                if (!compatible) {
+                    // If this node was not compatible,
+                    // break out early from walking the rest
+                    return false;
+                }
             });
         }).process(selector);
+        if (compatibilityCache) {
+            compatibilityCache[selector] = compatible;
+        }
         return compatible;
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-merge-rules",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Merge CSS rules with PostCSS.",
   "main": "dist/index.js",
   "files": [