fix(core): fix statement order logic

TomokiMiyauci · Mar 19, 2022 · 6f86977 · 6f86977
1 parent 07e3e80
commit 6f86977
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/core/postcss/order_statement.ts b/core/postcss/order_statement.ts
@@ -1,4 +1,4 @@
-import { isDeclaration, isRule } from "../utils/assert.ts";
+import { isAtRule, isDeclaration, isRule } from "../utils/assert.ts";
 import type { PostcssPlugin } from "../../deps.ts";
 
 function desc<T extends number | string, U extends T = T>(a: T, b: U): number {
@@ -17,10 +17,29 @@ function plugin(): PostcssPlugin {
     OnceExit: (root) => {
       root.nodes.sort((a, b) => {
         if (isRule(a) && isRule(b)) {
-          return desc(
-            a.nodes.filter(isDeclaration).length,
-            b.nodes.filter(isDeclaration).length,
+          const aDecl = a.nodes.filter(isDeclaration);
+          const bDecl = b.nodes.filter(isDeclaration);
+
+          const result = desc(
+            aDecl.length,
+            bDecl.length,
           );
+
+          if (result) {
+            return result;
+          } else {
+            const aVariables = aDecl.filter(({ variable }) => variable);
+            const bVariables = bDecl.filter(({ variable }) => variable);
+            return desc(aVariables.length, bVariables.length);
+          }
+        }
+        if (a.type === b.type) {
+          return 0;
+        }
+        if (isAtRule(a)) {
+          return 1;
+        } else if (isAtRule(b)) {
+          return -1;
         }
         return 0;
       });