postcss-merge-rules 5.1.1 → 5.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-merge-rules",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "description": "Merge CSS rules with PostCSS.",
   "types": "types/index.d.ts",
   "main": "src/index.js",
@@ -38,10 +38,9 @@
   "devDependencies": {
     "@types/caniuse-api": "^3.0.2",
     "postcss": "^8.2.15",
-    "postcss-discard-comments": "^5.1.0"
+    "postcss-discard-comments": "^5.1.2"
   },
   "peerDependencies": {
     "postcss": "^8.2.15"
-  },
-  "readme": "# [postcss][postcss]-merge-rules\n\n> Merge CSS rules with PostCSS.\n\n## Install\n\nWith [npm](https://npmjs.org/package/postcss-merge-rules) do:\n\n```\nnpm install postcss-merge-rules --save\n```\n\n## Examples\n\nThis module will attempt to merge *adjacent* CSS rules:\n\n### By declarations\n\n#### Input\n\n```css\na {\n    color: blue;\n    font-weight: bold\n}\n\np {\n    color: blue;\n    font-weight: bold\n}\n```\n\n#### Output\n\n```css\na,p {\n    color: blue;\n    font-weight: bold\n}\n```\n\n### By selectors\n\n#### Input\n\n```css\na {\n    color: blue\n}\n\na {\n    font-weight: bold\n}\n```\n\n#### Output\n\n```css\na {\n    color: blue;\n    font-weight: bold\n}\n```\n\n### By partial declarations\n\n#### Input\n\n```css\na {\n    font-weight: bold\n}\n\np {\n    color: blue;\n    font-weight: bold\n}\n```\n\n#### Output\n\n```css\na,p {\n    font-weight: bold\n}\n\np {\n    color: blue\n}\n```\n\n## Usage\n\nSee the [PostCSS documentation](https://github.com/postcss/postcss#usage) for\nexamples for your environment.\n\n## Contributors\n\nSee [CONTRIBUTORS.md](https://github.com/cssnano/cssnano/blob/master/CONTRIBUTORS.md).\n\n## License\n\nMIT © [Ben Briggs](http://beneb.info)\n\n[postcss]: https://github.com/postcss/postcss\n"
+  }
 }

package/src/index.js

@@ -36,7 +36,7 @@ function indexOfDeclaration(array, decl) {
  */
 function intersect(a, b, not) {
   return a.filter((c) => {
-    const index = ~indexOfDeclaration(b, c);
+    const index = indexOfDeclaration(b, c) !== -1;
     return not ? !index : index;
   });
 }
@@ -74,21 +74,32 @@ function canMerge(ruleA, ruleB, browsers, compatibilityCache) {
     /** @type {any} */ (ruleA),
     /** @type {any} */ (ruleB)
   );
-  const { name } = /** @type {any} */ (ruleA).parent;
-  if (parent && name && name.includes('keyframes')) {
+  if (
+    parent &&
+    ruleA.parent &&
+    ruleA.parent.type === 'atrule' &&
+    /** @type {import('postcss').AtRule} */ (ruleA.parent).name.includes(
+      'keyframes'
+    )
+  ) {
     return false;
   }
   return parent && (selectors.every(noVendor) || sameVendor(a, b));
 }
 
+/**
+ * @param {import('postcss').ChildNode} node
+ * @return {node is import('postcss').Declaration}
+ */
+function isDeclaration(node) {
+  return node.type === 'decl';
+}
 /**
  * @param {import('postcss').Rule} rule
  * @return {import('postcss').Declaration[]}
  */
 function getDecls(rule) {
-  return /** @type {import('postcss').Declaration[]} */ (
-    rule.nodes.filter((node) => node.type === 'decl')
-  );
+  return rule.nodes.filter(isDeclaration);
 }
 
 /** @type {(...rules: import('postcss').Rule[]) => string} */
@@ -290,7 +301,7 @@ function partialMerge(first, second) {
    */
   function moveDecl(callback) {
     return (decl) => {
-      if (~indexOfDeclaration(intersection, decl)) {
+      if (indexOfDeclaration(intersection, decl) !== -1) {
         callback.call(this, decl);
       }
     };
@@ -359,17 +370,12 @@ function selectorMerger(browsers, compatibilityCache) {
     // e.g. a { color: blue } a { font-weight: bold }
     if (cache.selector === rule.selector) {
       const cached = getDecls(cache);
-      rule.walk((decl) => {
-        if (
-          ~indexOfDeclaration(
-            cached,
-            /** @type {import('postcss').Declaration} */ (decl)
-          )
-        ) {
-          decl.remove();
+      rule.walk((node) => {
+        if (node.type === 'decl' && indexOfDeclaration(cached, node) !== -1) {
+          node.remove();
           return;
         }
-        /** @type {import('postcss').Rule} */ (cache).append(decl);
+        /** @type {import('postcss').Rule} */ (cache).append(node);
       });
       rule.remove();
       return;