postcss-merge-idents 2.1.3 → 2.1.7

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# 2.1.7
+
+* Replaced the `has-own` module with `has`.
+
+# 2.1.6
+
+* Fixes an issue where the module would discard at-rules that were defined in
+  `@media` & `@supports` rules as well as the root. As this is legal to do in
+  CSS, the module now checks to see if the candidate rule has the same parent
+  as the cached rule. If it does, the rules are merged.
+
+# 2.1.5
+
+* Now compiled with babel 6.
+
+# 2.1.4
+
+* Fixed a range error which happened when duplicated at rules were found
+  in the stylesheet.
+
 # 2.1.3
 
 * Fixed an infinite loop regression in the last patch.

package/README.md

@@ -2,6 +2,7 @@
 
 > Merge keyframe and counter style identifiers.
 
+
 ## Install
 
 With [npm](https://npmjs.org/package/postcss-merge-idents) do:
@@ -10,6 +11,7 @@ With [npm](https://npmjs.org/package/postcss-merge-idents) do:
 npm install postcss-merge-idents --save
 ```
 
+
 ## Example
 
 This module will merge identifiers such as `@keyframes` and `@counter-style`,
@@ -55,20 +57,24 @@ depend on the duplicated property.
 }
 ```
 
+
 ## Usage
 
 See the [PostCSS documentation](https://github.com/postcss/postcss#usage) for
 examples for your environment.
 
+
 ## 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-merge-idents
 [deps]:    https://gemnasium.com/ben-eb/postcss-merge-idents
 [npm]:     http://badge.fury.io/js/postcss-merge-idents

package/dist/index.js

@@ -0,0 +1,116 @@
+'use strict';
+
+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 ? "symbol" : typeof obj; };
+
+var _has = require('has');
+
+var _has2 = _interopRequireDefault(_has);
+
+var _postcss = require('postcss');
+
+var _postcssValueParser = require('postcss-value-parser');
+
+var _postcssValueParser2 = _interopRequireDefault(_postcssValueParser);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function canonical(obj) {
+    return function recurse(key) {
+        if ((0, _has2.default)(obj, key) && obj[key] !== key) {
+            return recurse(obj[key]);
+        }
+        return key;
+    };
+}
+
+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
+    if (hasParent && ruleA.parent.type !== 'root' && ruleB.parent.type !== 'root') {
+        sameType = sameType && ruleA.parent.params === ruleB.parent.params && ruleA.parent.name === ruleB.parent.name;
+    }
+    return hasParent ? sameType : true;
+}
+
+function mergeAtRules(css, pairs) {
+    pairs.forEach(function (pair) {
+        pair.cache = [];
+        pair.replacements = [];
+        pair.decls = [];
+    });
+
+    var relevant = void 0;
+
+    css.walk(function (node) {
+        if (node.type === 'atrule') {
+            relevant = pairs.filter(function (pair) {
+                return pair.atrule.test(node.name);
+            })[0];
+            if (!relevant) {
+                return;
+            }
+            if (relevant.cache.length < 1) {
+                relevant.cache.push(node);
+                return;
+            } else {
+                var _ret = function () {
+                    var toString = node.nodes.toString();
+                    relevant.cache.forEach(function (cached) {
+                        if (cached.name === node.name && sameParent(cached, node) && cached.nodes.toString() === toString) {
+                            cached.remove();
+                            relevant.replacements[cached.params] = node.params;
+                        }
+                    });
+                    relevant.cache.push(node);
+                    return {
+                        v: void 0
+                    };
+                }();
+
+                if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v;
+            }
+        }
+        if (node.type === 'decl') {
+            relevant = pairs.filter(function (pair) {
+                return pair.decl.test(node.prop);
+            })[0];
+            if (!relevant) {
+                return;
+            }
+            relevant.decls.push(node);
+        }
+    });
+
+    pairs.forEach(function (pair) {
+        var canon = canonical(pair.replacements);
+        pair.decls.forEach(function (decl) {
+            decl.value = (0, _postcssValueParser2.default)(decl.value).walk(function (node) {
+                if (node.type === 'word') {
+                    node.value = canon(node.value);
+                }
+                if (node.type === 'space') {
+                    node.value = ' ';
+                }
+                if (node.type === 'div') {
+                    node.before = node.after = '';
+                }
+            }).toString();
+        });
+    });
+}
+
+exports.default = (0, _postcss.plugin)('postcss-merge-idents', function () {
+    return function (css) {
+        mergeAtRules(css, [{
+            atrule: /keyframes/,
+            decl: /animation/
+        }, {
+            atrule: /counter-style/,
+            decl: /(list-style|system)/
+        }]);
+    };
+});
+module.exports = exports['default'];

package/package.json

@@ -1,14 +1,17 @@
 {
   "name": "postcss-merge-idents",
-  "version": "2.1.3",
+  "version": "2.1.7",
   "description": "Merge keyframe and counter style identifiers.",
-  "main": "index.js",
+  "main": "dist/index.js",
   "files": [
-    "index.js",
+    "dist",
     "LICENSE-MIT"
   ],
   "scripts": {
-    "test": "tape test.js | tap-spec"
+    "pretest": "eslint src",
+    "prepublish": "del-cli dist && BABEL_ENV=publish babel src --out-dir dist --ignore /__tests__/",
+    "test": "ava src/__tests__",
+    "test-012": "ava src/__tests__"
   },
   "keywords": [
     "css",
@@ -18,8 +21,19 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "tap-spec": "^4.1.0",
-    "tape": "^4.2.2"
+    "ava": "^0.16.0",
+    "babel-cli": "^6.3.17",
+    "babel-core": "^6.3.26",
+    "babel-plugin-add-module-exports": "^0.2.1",
+    "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": "^1.10.2"
   },
   "homepage": "https://github.com/ben-eb/postcss-merge-idents",
   "author": {
@@ -29,8 +43,14 @@
   },
   "repository": "ben-eb/postcss-merge-idents",
   "dependencies": {
-    "has-own": "^1.0.0",
+    "has": "^1.0.1",
     "postcss": "^5.0.10",
     "postcss-value-parser": "^3.1.1"
+  },
+  "ava": {
+    "require": "babel-register"
+  },
+  "eslintConfig": {
+    "extends": "cssnano"
   }
 }

package/index.js

@@ -1,80 +0,0 @@
-'use strict';
-
-var hasOwn = require('has-own');
-var postcss = require('postcss');
-var valueParser = require('postcss-value-parser');
-
-function canonical (obj) {
-    return function recurse (key) {
-        if (hasOwn(key, obj) && obj[key] !== key) {
-            return recurse(obj[key]);
-        }
-        return key;
-    };
-}
-
-function mergeAtRules (css, pairs) {
-    pairs.forEach(function (pair) {
-        pair.cache = [];
-        pair.replacements = [];
-        pair.decls = [];
-    });
-
-    var relevant;
-
-    css.walk(function (node) {
-        if (node.type === 'atrule') {
-            relevant = pairs.filter(function (pair) {
-                return pair.atrule.test(node.name);
-            })[0];
-            if (!relevant) { return; }
-            var toString = node.nodes.toString();
-            var cached = relevant.cache.filter(function (c) {
-                return c.name === node.name && String(c.nodes) === toString;
-            });
-            var cache = relevant.cache;
-            if (cached.length) {
-                relevant.replacements[cached[0].params] = node.params;
-                cached[0].remove();
-                relevant.cache = cache.splice(cache.indexOf(cached[0]) + 1, 1);
-            }
-            relevant.cache.push(node);
-        }
-        if (node.type === 'decl') {
-            relevant = pairs.filter(function (pair) {
-                return pair.decl.test(node.prop);
-            })[0];
-            if (!relevant) { return; }
-            relevant.decls.push(node);
-        }
-    });
-
-    pairs.forEach(function (pair) {
-        var canon = canonical(pair.replacements);
-        pair.decls.forEach(function (decl) {
-            decl.value = valueParser(decl.value).walk(function (node) {
-                if (node.type === 'word') {
-                    node.value = canon(node.value);
-                }
-                if (node.type === 'space') {
-                    node.value = ' ';
-                }
-                if (node.type === 'div') {
-                    node.before = node.after = '';
-                }
-            }).toString();
-        });
-    });
-}
-
-module.exports = postcss.plugin('postcss-merge-idents', function () {
-    return function (css) {
-        mergeAtRules(css, [{
-            atrule: /keyframes/,
-            decl: /animation/
-        }, {
-            atrule: /counter-style/,
-            decl: /(list-style|system)/
-        }]);
-    };
-});