@unocss/postcss 0.59.0-beta.1 → 0.59.1

package/dist/esm.mjs

@@ -13,66 +13,70 @@ const defaultFilesystemGlobs = [
 ];
 
 async function parseApply(root, uno, directiveName) {
-  root.walkAtRules(directiveName, async (rule) => {
-    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
-        acc.push([...item]);
-      return acc;
-    }, []);
-    if (!utils.length)
-      return;
-    const parentAfterNodes = [];
-    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"
-        });
-        let newSelector = generate(node.prelude);
-        if (selector && selector !== ".\\-") {
-          const selectorAST = parse(selector, {
-            context: "selector"
+  const promises = [];
+  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
+          acc.push([...item]);
+        return acc;
+      }, []);
+      if (!utils.length)
+        return;
+      const parentAfterNodes = [];
+      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"
           });
-          const prelude = clone(node.prelude);
-          prelude.children.forEach((child) => {
-            const parentSelectorAst = clone(selectorAST);
-            parentSelectorAst.children.forEach((i2) => {
-              if (i2.type === "ClassSelector" && i2.name === "\\-")
-                Object.assign(i2, clone(child));
+          let newSelector = generate(node.prelude);
+          if (selector && selector !== ".\\-") {
+            const selectorAST = parse(selector, {
+              context: "selector"
+            });
+            const prelude = clone(node.prelude);
+            prelude.children.forEach((child) => {
+              const parentSelectorAst = clone(selectorAST);
+              parentSelectorAst.children.forEach((i2) => {
+                if (i2.type === "ClassSelector" && i2.name === "\\-")
+                  Object.assign(i2, clone(child));
+              });
+              Object.assign(child, parentSelectorAst);
             });
-            Object.assign(child, parentSelectorAst);
+            newSelector = generate(prelude);
+          }
+          let css = `${newSelector}{${body}}`;
+          if (parent)
+            css = `${parent}{${css}}`;
+          const css_parsed = postcss.parse(css);
+          css_parsed.walkDecls((declaration) => {
+            declaration.source = source;
           });
-          newSelector = generate(prelude);
+          parentAfterNodes.push(css_parsed);
+        } else {
+          const css = postcss.parse(body);
+          css.walkDecls((declaration) => {
+            declaration.source = source;
+          });
+          rule.parent.append(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);
       }
-    }
-    rule.parent.after(parentAfterNodes);
-    rule.remove();
+      rule.parent.after(parentAfterNodes);
+      rule.remove();
+    })());
   });
+  await Promise.all(promises);
 }
 
 async function parseTheme(root, uno) {
@@ -212,8 +216,14 @@ function createPlugin(options) {
         const { matched } = await uno.generate(c2.code, { id: c2.id ?? `__plain_content_${idx}__` });
         for (const candidate of matched)
           classes.add(candidate);
-      }),
-      ...entries.map(async ({ path: file, mtimeMs }) => {
+      })
+    );
+    await Promise.all(promises);
+    promises = [];
+    const BATCH_SIZE = 500;
+    for (let i = 0; i < entries.length; i += BATCH_SIZE) {
+      const batch = entries.slice(i, i + BATCH_SIZE);
+      promises.push(...batch.map(async ({ path: file, mtimeMs }) => {
         result.messages.push({
           type: "dependency",
           plugin: directiveMap.unocss,
@@ -229,10 +239,10 @@ function createPlugin(options) {
           id: file
         });
         fileClassMap.set(file, matched);
-      })
-    );
-    await Promise.all(promises);
-    promises = [];
+      }));
+      await Promise.all(promises);
+      promises = [];
+    }
     for (const set of fileClassMap.values()) {
       for (const candidate of set)
         classes.add(candidate);

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@unocss/postcss",
-  "version": "0.59.0-beta.1",
+  "type": "module",
+  "version": "0.59.1",
   "description": "PostCSS plugin for UnoCSS",
   "author": "sibbng <sibbngheid@gmail.com>",
   "license": "MIT",
@@ -18,13 +19,31 @@
   "sideEffects": false,
   "exports": {
     ".": {
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
+    },
+    "./esm": {
+      "types": "./dist/esm.d.mts",
+      "default": "./dist/esm.mjs"
     }
   },
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "*": [
+        "dist/*",
+        "./*"
+      ]
+    }
+  },
   "files": [
     "dist"
   ],
@@ -37,11 +56,11 @@
   "dependencies": {
     "css-tree": "^2.3.1",
     "fast-glob": "^3.3.2",
-    "magic-string": "^0.30.8",
+    "magic-string": "^0.30.9",
     "postcss": "^8.4.38",
-    "@unocss/core": "0.59.0-beta.1",
-    "@unocss/config": "0.59.0-beta.1",
-    "@unocss/rule-utils": "0.59.0-beta.1"
+    "@unocss/core": "0.59.1",
+    "@unocss/config": "0.59.1",
+    "@unocss/rule-utils": "0.59.1"
   },
   "scripts": {
     "build": "unbuild",