fix(postcss): fix unocss#3699

DarkHole1 · Apr 8, 2024 · 9d3cfb1 · 9d3cfb1
1 parent 5ae78df
commit 9d3cfb1
Showing 1 changed file with 69 additions and 66 deletions.
diff --git a/packages/postcss/src/apply.ts b/packages/postcss/src/apply.ts
@@ -8,82 +8,85 @@ import { expandVariantGroup, notNull, regexScopePlaceholder } from '@unocss/core
 type Writeable<T> = { -readonly [P in keyof T]: T[P] }
 
 export async function parseApply(root: Root, uno: UnoGenerator, directiveName: string) {
-  // @ts-expect-error types doesn't allow async callback but it seems work
-  root.walkAtRules(directiveName, async (rule) => {
-    if (!rule.parent)
-      return
+  const promises: Promise<unknown>[] = [];
+  root.walkAtRules(directiveName, (rule) => {
+    promises.push((async () => {
+      if (!rule.parent)
+        return
 
-    const source = rule.source
-    const classNames = expandVariantGroup(rule.params)
-      .split(/\s+/g)
-      .map(className => className.trim().replace(/\\/, ''))
-    const utils = (await Promise.all(
-      classNames.map(i => uno.parseToken(i, '-')),
-    ))
-      .filter(notNull).flat()
-      .sort((a, b) => a[0] - b[0])
-      .sort((a, b) => (a[3] ? uno.parentOrders.get(a[3]) ?? 0 : 0) - (b[3] ? uno.parentOrders.get(b[3]) ?? 0 : 0))
-      .reduce((acc, item) => {
-        const target = acc.find(i => i[1] === item[1] && i[3] === item[3])
-        if (target)
-          target[2] += item[2]
-        else
-          // use spread operator to prevent reassign to uno internal cache
-          acc.push([...item] as Writeable<StringifiedUtil>)
-        return acc
-      }, [] as Writeable<StringifiedUtil>[])
+      const source = rule.source
+      const classNames = expandVariantGroup(rule.params)
+        .split(/\s+/g)
+        .map(className => className.trim().replace(/\\/, ''))
+      const utils = (await Promise.all(
+        classNames.map(i => uno.parseToken(i, '-')),
+      ))
+        .filter(notNull).flat()
+        .sort((a, b) => a[0] - b[0])
+        .sort((a, b) => (a[3] ? uno.parentOrders.get(a[3]) ?? 0 : 0) - (b[3] ? uno.parentOrders.get(b[3]) ?? 0 : 0))
+        .reduce((acc, item) => {
+          const target = acc.find(i => i[1] === item[1] && i[3] === item[3])
+          if (target)
+            target[2] += item[2]
+          else
+            // use spread operator to prevent reassign to uno internal cache
+            acc.push([...item] as Writeable<StringifiedUtil>)
+          return acc
+        }, [] as Writeable<StringifiedUtil>[])
 
-    if (!utils.length)
-      return
+      if (!utils.length)
+        return
 
-    const parentAfterNodes: Root[] = []
+      const parentAfterNodes: Root[] = []
 
-    for (const i of utils) {
-      const [, _selector, body, parent] = i
-      const selector = _selector?.replace(regexScopePlaceholder, ' ') || _selector
+      for (const i of utils) {
+        const [, _selector, body, parent] = i
+        const selector = _selector?.replace(regexScopePlaceholder, ' ') || _selector
 
-      if (parent || (selector && selector !== '.\\-')) {
-        const node = parse(rule.parent.toString(), {
-          context: 'rule',
-        }) as Rule
-        let newSelector = generate(node.prelude)
-        if (selector && selector !== '.\\-') {
-          const selectorAST = parse(selector, {
-            context: 'selector',
-          }) as Selector
+        if (parent || (selector && selector !== '.\\-')) {
+          const node = parse(rule.parent.toString(), {
+            context: 'rule',
+          }) as Rule
+          let newSelector = generate(node.prelude)
+          if (selector && selector !== '.\\-') {
+            const selectorAST = parse(selector, {
+              context: 'selector',
+            }) as Selector
 
-          const prelude = clone(node.prelude) as SelectorList
+            const prelude = clone(node.prelude) as SelectorList
 
-          prelude.children.forEach((child) => {
-            const parentSelectorAst = clone(selectorAST) as Selector
-            parentSelectorAst.children.forEach((i) => {
-              if (i.type === 'ClassSelector' && i.name === '\\-')
-                Object.assign(i, clone(child))
+            prelude.children.forEach((child) => {
+              const parentSelectorAst = clone(selectorAST) as Selector
+              parentSelectorAst.children.forEach((i) => {
+                if (i.type === 'ClassSelector' && i.name === '\\-')
+                  Object.assign(i, clone(child))
+              })
+              Object.assign(child, parentSelectorAst)
             })
-            Object.assign(child, parentSelectorAst)
-          })
-          newSelector = generate(prelude)
-        }
+            newSelector = generate(prelude)
+          }
 
-        let css = `${newSelector}{${body}}`
-        if (parent)
-          css = `${parent}{${css}}`
+          let css = `${newSelector}{${body}}`
+          if (parent)
+            css = `${parent}{${css}}`
 
-        const css_parsed = postcss.parse(css)
-        css_parsed.walkDecls((declaration) => {
-          declaration.source = source
-        })
-        parentAfterNodes.push(css_parsed)
-      }
-      else {
-        const css = postcss.parse(body)
-        css.walkDecls((declaration) => {
-          declaration.source = source
-        })
-        rule.parent.append(css)
+          const css_parsed = postcss.parse(css)
+          css_parsed.walkDecls((declaration) => {
+            declaration.source = source
+          })
+          parentAfterNodes.push(css_parsed)
+        }
+        else {
+          const css = postcss.parse(body)
+          css.walkDecls((declaration) => {
+            declaration.source = source
+          })
+          rule.parent.append(css)
+        }
       }
-    }
-    rule.parent.after(parentAfterNodes)
-    rule.remove()
+      rule.parent.after(parentAfterNodes)
+      rule.remove()
+    })())
   })
+  await Promise.all(promises);
 }