postcss-merge-rules 8.0.2 → 8.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-merge-rules",
-  "version": "8.0.2",
+  "version": "8.0.3",
   "description": "Merge CSS rules with PostCSS.",
   "exports": {
     ".": {
@@ -43,10 +43,10 @@
     "url": "cssnano/cssnano"
   },
   "dependencies": {
-    "browserslist": "^4.28.7",
+    "browserslist": "^4.28.8",
     "caniuse-api": "^4.0.0",
-    "postcss-selector-parser": "^7.1.4",
-    "cssnano-utils": "^6.0.2"
+    "postcss-selector-parser": "^7.1.5",
+    "cssnano-utils": "^6.0.3"
   },
   "bugs": {
     "url": "https://github.com/cssnano/cssnano/issues"
@@ -55,11 +55,14 @@
     "node": "^22.11.0 || ^24.11.0 || >=26.0"
   },
   "devDependencies": {
-    "postcss": "^8.5.25",
+    "postcss": "^8.5.26",
     "postcss-simple-vars": "^7.0.1",
-    "postcss-discard-comments": "^8.0.2"
+    "postcss-discard-comments": "^8.0.3"
   },
   "peerDependencies": {
-    "postcss": "^8.5.25"
+    "postcss": "^8.5.26"
+  },
+  "scripts": {
+    "test": "node --test"
   }
 }

package/src/index.js

@@ -300,45 +300,47 @@ function mergeParents(first, second) {
   return true;
 }
 
+/**
+ * @param {Rule} second
+ * @return {Rule | null}
+ */
+function getNextRule(second) {
+  let nextRule = second.next();
+  if (!nextRule) {
+    // Grab next cousin
+    /** @type {any} */
+    const parentSibling =
+      /** @type {import('postcss').Container<import('postcss').ChildNode>} */ (
+        second.parent
+      ).next();
+    nextRule = parentSibling && parentSibling.nodes && parentSibling.nodes[0];
+  }
+  return nextRule?.type === 'rule' ? nextRule : null;
+}
+
 /**
  * @param {Rule} first
  * @param {Rule} second
+ * @param {Declaration[]} intersection
  * @param {string[]} browsers
  * @param {Map<string, boolean>} compatibilityCache
  * @param {WeakSet<Rule>} ruleCache
  * @param {WeakMap<Rule, RuleMeta>} ruleMeta
- * @return {Rule} mergedRule
+ * @return {{first: Rule, second: Rule, intersection: Declaration[]}}
  */
-function partialMerge(
+function mergeWithNextRule(
   first,
   second,
+  intersection,
   browsers,
   compatibilityCache,
   ruleCache,
   ruleMeta
 ) {
-  if (ruleMeta) {
-    flush(first, ruleMeta);
-  }
-  const metaFirst = getMeta(first, ruleMeta);
-  const metaSecond = getMeta(second, ruleMeta);
-  let intersection = intersect(metaFirst.declarations, metaSecond.declarations);
-  if (intersection.length === 0) {
-    return second;
-  }
-  let nextRule = second.next();
-  if (!nextRule) {
-    // Grab next cousin
-    /** @type {any} */
-    const parentSibling =
-      /** @type {import('postcss').Container<import('postcss').ChildNode>} */ (
-        second.parent
-      ).next();
-    nextRule = parentSibling && parentSibling.nodes && parentSibling.nodes[0];
-  }
+  const nextRule = getNextRule(second);
   if (
-    nextRule?.type === 'rule' &&
-    canMerge(
+    !nextRule ||
+    !canMerge(
       second,
       nextRule,
       browsers,
@@ -347,24 +349,28 @@ function partialMerge(
       ruleMeta
     )
   ) {
-    const metaNext = getMeta(nextRule, ruleMeta);
-    const nextIntersection = intersect(
-      metaSecond.declarations,
-      metaNext.declarations
-    );
-    if (nextIntersection.length > intersection.length) {
-      mergeParents(second, nextRule);
-      first = second;
-      second = nextRule;
-      intersection = nextIntersection;
-    }
+    return { first, second, intersection };
   }
 
-  const metaFirstActual = getMeta(first, ruleMeta);
-  const metaSecondActual = getMeta(second, ruleMeta);
-  const firstDecls = [...metaFirstActual.declarations];
-  const secondDecls = [...metaSecondActual.declarations];
+  const nextIntersection = intersect(
+    getMeta(second, ruleMeta).declarations,
+    getMeta(nextRule, ruleMeta).declarations
+  );
+  if (nextIntersection.length <= intersection.length) {
+    return { first, second, intersection };
+  }
+
+  mergeParents(second, nextRule);
+  return { first: second, second: nextRule, intersection: nextIntersection };
+}
 
+/**
+ * @param {Declaration[]} intersection
+ * @param {Declaration[]} firstDecls
+ * @param {Declaration[]} secondDecls
+ * @return {Declaration[]}
+ */
+function filterIntersections(intersection, firstDecls, secondDecls) {
   // Filter out intersections with later conflicts in First
   intersection = intersection.filter((decl, intersectIndex) => {
     const indexOfDecl = indexOfDeclaration(firstDecls, decl);
@@ -386,7 +392,7 @@ function partialMerge(
   });
 
   // Filter out intersections with previous conflicts in Second
-  intersection = intersection.filter((decl) => {
+  return intersection.filter((decl) => {
     const nextConflictIndex = secondDecls.findIndex((d) =>
       isConflictingProp(d.prop, decl.prop)
     );
@@ -408,15 +414,20 @@ function partialMerge(
     secondDecls.splice(nextConflictIndex, 1);
     return true;
   });
+}
 
-  if (intersection.length === 0) {
-    // Nothing to merge
-    return second;
-  }
-
+/**
+ * @param {Rule} first
+ * @param {Rule} second
+ * @param {Declaration[]} intersection
+ * @param {WeakSet<Rule>} ruleCache
+ * @param {WeakMap<Rule, RuleMeta>} ruleMeta
+ * @return {Rule}
+ */
+function buildMergedRule(first, second, intersection, ruleCache, ruleMeta) {
   const receivingBlock = second.clone();
-  const firstSelectors = metaFirstActual.selectors;
-  const secondSelectors = metaSecondActual.selectors;
+  const firstSelectors = getMeta(first, ruleMeta).selectors;
+  const secondSelectors = getMeta(second, ruleMeta).selectors;
 
   receivingBlock.selector = [...firstSelectors, ...secondSelectors].join();
   receivingBlock.nodes = [];
@@ -464,11 +475,11 @@ function partialMerge(
   if (merged < original) {
     first.replaceWith(firstClone);
     second.replaceWith(secondClone);
-    [firstClone, receivingBlock, secondClone].forEach((r) => {
+    for (const r of [firstClone, receivingBlock, secondClone]) {
       if (r.nodes.length === 0) {
         r.remove();
       }
-    });
+    }
     if (!secondClone.parent) {
       ruleCache?.add(receivingBlock);
       return receivingBlock;
@@ -478,10 +489,64 @@ function partialMerge(
     ruleMeta?.delete(first);
     ruleMeta?.delete(second);
     return secondClone;
-  } else {
-    receivingBlock.remove();
+  }
+
+  receivingBlock.remove();
+  return second;
+}
+
+/**
+ * @param {Rule} first
+ * @param {Rule} second
+ * @param {string[]} browsers
+ * @param {Map<string, boolean>} compatibilityCache
+ * @param {WeakSet<Rule>} ruleCache
+ * @param {WeakMap<Rule, RuleMeta>} ruleMeta
+ * @return {Rule} mergedRule
+ */
+function partialMerge(
+  first,
+  second,
+  browsers,
+  compatibilityCache,
+  ruleCache,
+  ruleMeta
+) {
+  if (ruleMeta) {
+    flush(first, ruleMeta);
+  }
+  const metaFirst = getMeta(first, ruleMeta);
+  const metaSecond = getMeta(second, ruleMeta);
+  let intersection = intersect(metaFirst.declarations, metaSecond.declarations);
+  if (intersection.length === 0) {
     return second;
   }
+  const mergedNext = mergeWithNextRule(
+    first,
+    second,
+    intersection,
+    browsers,
+    compatibilityCache,
+    ruleCache,
+    ruleMeta
+  );
+  first = mergedNext.first;
+  second = mergedNext.second;
+  intersection = mergedNext.intersection;
+
+  const metaFirstActual = getMeta(first, ruleMeta);
+  const metaSecondActual = getMeta(second, ruleMeta);
+  const firstDecls = [...metaFirstActual.declarations];
+  const secondDecls = [...metaSecondActual.declarations];
+
+  intersection = filterIntersections(intersection, firstDecls, secondDecls);
+
+  if (intersection.length === 0) {
+    // Nothing to merge
+    return second;
+  }
+
+  return buildMergedRule(first, second, intersection, ruleCache, ruleMeta);
 }
 
 /**

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":";;AAII,OAAQ,KAAA,YAAY,MAAM,cAAc,CAAA;AAQxC,OAAQ,KAAA,EAAC,WAAW,EAAO,MAAM,SAAS,CAAA;AAmD3C,YAAkB,QAAQ,GAC1B;;;;IAAqB,SAAS,EAAnB,MAAM,EAAE,CACnB;;;;IAA0B,YAAY,EAA3B,WAAW,EAAE,CACxB;;;;IAAoB,KAAK,EAAd,OAAO,CACpB;CAAA,CAAA;AAygBE,YAAwD,mBAAmB,GAAjE;IAAE,oBAAoB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAqB;AAC3E,YAAgE,mBAAmB,GAAzE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC,CAAqB;AACnF,YAAqD,OAAO,GAAlD,mBAAmB,GAAG,mBAAmB,CAAS"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":";;AAII,OAAQ,KAAA,YAAY,MAAM,cAAc,CAAA;AAQxC,OAAQ,KAAA,EAAC,WAAW,EAAO,MAAM,SAAS,CAAA;AAmD3C,YAAkB,QAAQ,GAC1B;;;;IAAqB,SAAS,EAAnB,MAAM,EAAE,CACnB;;;;IAA0B,YAAY,EAA3B,WAAW,EAAE,CACxB;;;;IAAoB,KAAK,EAAd,OAAO,CACpB;CAAA,CAAA;AA0kBE,YAAwD,mBAAmB,GAAjE;IAAE,oBAAoB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAqB;AAC3E,YAAgE,mBAAmB,GAAzE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC,CAAqB;AACnF,YAAqD,OAAO,GAAlD,mBAAmB,GAAG,mBAAmB,CAAS"}