@plumeria/utils 18.2.10 → 18.2.11

package/dist/mergeRules.js

@@ -2,6 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeRules = void 0;
 const zss_engine_1 = require("zss-engine");
+const conditionOf = (node) => `@${node.name} ${node.params}`;
+function sortByImplication(nodes) {
+    const blockedBy = nodes.map((node, i) => nodes.filter((other, j) => i !== j && (0, zss_engine_1.impliesCondition)(conditionOf(node), conditionOf(other))));
+    const emitted = new Set();
+    const sorted = [];
+    while (sorted.length < nodes.length) {
+        const next = nodes.findIndex((node, i) => !emitted.has(node) && blockedBy[i].every((other) => emitted.has(other)));
+        if (next === -1)
+            return nodes;
+        emitted.add(nodes[next]);
+        sorted.push(nodes[next]);
+    }
+    return sorted;
+}
 function mergeContainer(container) {
     if (!container.nodes)
         return;
@@ -34,10 +48,9 @@ function mergeContainer(container) {
     for (const node of [...rules.values(), ...atRules.values()]) {
         mergeContainer(node);
     }
-    for (const node of [...container.nodes]) {
-        if (node.type === 'atrule' && (0, zss_engine_1.isAtRule)(`@${node.name}`)) {
-            container.append(node);
-        }
+    const conditionals = [...container.nodes].filter((node) => node.type === 'atrule' && (0, zss_engine_1.isAtRule)(`@${node.name}`));
+    for (const node of sortByImplication(conditionals)) {
+        container.append(node);
     }
 }
 const mergeRules = () => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/utils",
-  "version": "18.2.10",
+  "version": "18.2.11",
   "description": "Plumeria Utils",
   "author": "Refirst 11",
   "license": "MIT",
@@ -25,7 +25,7 @@
     "@swc/core": "1.15.47",
     "lightningcss": "^1.32.0",
     "postcss": "8.5.25",
-    "zss-engine": "2.4.3"
+    "zss-engine": "2.5.0"
   },
   "publishConfig": {
     "access": "public",