@unocss/core 0.56.1 → 0.56.2

package/dist/index.cjs

@@ -220,11 +220,9 @@ class TwoKeyMap {
     return this._map.delete(key1);
   }
   map(fn) {
-    return Array.from(this._map.entries()).flatMap(
-      ([k1, m2]) => Array.from(m2.entries()).map(([k2, v]) => {
-        return fn(v, k1, k2);
-      })
-    );
+    return Array.from(this._map.entries()).flatMap(([k1, m2]) => Array.from(m2.entries()).map(([k2, v]) => {
+      return fn(v, k1, k2);
+    }));
   }
 }
 class BetterMap extends Map {
@@ -573,29 +571,26 @@ function mergeThemes(themes) {
   return themes.map((theme) => theme ? clone(theme) : {}).reduce((a, b) => mergeDeep(a, b), {});
 }
 function mergeAutocompleteShorthands(shorthands) {
-  return shorthands.reduce(
-    (a, b) => {
-      const rs = {};
-      for (const key in b) {
-        const value = b[key];
-        if (Array.isArray(value))
-          rs[key] = `(${value.join("|")})`;
-        else
-          rs[key] = value;
-      }
-      return {
-        ...a,
-        ...rs
-      };
-    },
-    {}
-  );
+  return shorthands.reduce((a, b) => {
+    const rs = {};
+    for (const key in b) {
+      const value = b[key];
+      if (Array.isArray(value))
+        rs[key] = `(${value.join("|")})`;
+      else
+        rs[key] = value;
+    }
+    return {
+      ...a,
+      ...rs
+    };
+  }, {});
 }
 function definePreset(preset) {
   return preset;
 }
 
-const version = "0.56.1";
+const version = "0.56.2";
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -767,18 +762,16 @@ class UnoGenerator {
         ))
       );
     })();
-    const layers = this.config.sortLayers(
-      Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b))
-    );
+    const layers = this.config.sortLayers(Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
     const layerCache = {};
     const getLayer = (layer) => {
       if (layerCache[layer])
         return layerCache[layer];
       let css = Array.from(sheet).sort((a, b) => (this.parentOrders.get(a[0]) ?? 0) - (this.parentOrders.get(b[0]) ?? 0) || a[0]?.localeCompare(b[0] || "") || 0).map(([parent, items]) => {
         const size = items.length;
-        const sorted = items.filter((i) => (i[4]?.layer || LAYER_DEFAULT) === layer).sort(
-          (a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[5]?.currentSelector?.localeCompare(b[5]?.currentSelector ?? "") || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0
-        ).map(([, selector, body, , meta, , variantNoMerge]) => {
+        const sorted = items.filter((i) => (i[4]?.layer || LAYER_DEFAULT) === layer).sort((a, b) => {
+          return a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[5]?.currentSelector?.localeCompare(b[5]?.currentSelector ?? "") || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0;
+        }).map(([, selector, body, , meta, , variantNoMerge]) => {
           const scopedSelector = selector ? applyScope(selector, scope) : selector;
           return [
             [[scopedSelector ?? "", meta?.sort ?? 0]],
@@ -799,9 +792,7 @@ class UnoGenerator {
               }
             }
           }
-          const selectors = selectorSortPair ? uniq(
-            selectorSortPair.sort((a, b) => a[1] - b[1] || a[0]?.localeCompare(b[0] || "") || 0).map((pair) => pair[0]).filter(Boolean)
-          ) : [];
+          const selectors = selectorSortPair ? uniq(selectorSortPair.sort((a, b) => a[1] - b[1] || a[0]?.localeCompare(b[0] || "") || 0).map((pair) => pair[0]).filter(Boolean)) : [];
           return selectors.length ? `${selectors.join(`,${nl}`)}{${body}}` : body;
         }).filter(Boolean).reverse().join(nl);
         if (!parent)
@@ -832,13 +823,13 @@ class UnoGenerator {
     const variants = /* @__PURE__ */ new Set();
     const handlers = [];
     let processed = current || raw;
-    let applied = false;
+    let applied = true;
     const context = {
       rawSelector: raw,
       theme: this.config.theme,
       generator: this
     };
-    while (true) {
+    while (applied) {
       applied = false;
       for (const v of this.config.variants) {
         if (!v.multiPass && variants.has(v))
@@ -1038,9 +1029,7 @@ class UnoGenerator {
     if (!result)
       return;
     return [
-      (await Promise.all(result.map(
-        async (r) => (isString(r) ? (await this.expandShortcut(r, context, depth - 1))?.[0] : void 0) || [r]
-      ))).flat(1).filter(Boolean),
+      (await Promise.all(result.map(async (r) => (isString(r) ? (await this.expandShortcut(r, context, depth - 1))?.[0] : void 0) || [r]))).flat(1).filter(Boolean),
       meta
     ];
   }

package/dist/index.mjs

@@ -218,11 +218,9 @@ class TwoKeyMap {
     return this._map.delete(key1);
   }
   map(fn) {
-    return Array.from(this._map.entries()).flatMap(
-      ([k1, m2]) => Array.from(m2.entries()).map(([k2, v]) => {
-        return fn(v, k1, k2);
-      })
-    );
+    return Array.from(this._map.entries()).flatMap(([k1, m2]) => Array.from(m2.entries()).map(([k2, v]) => {
+      return fn(v, k1, k2);
+    }));
   }
 }
 class BetterMap extends Map {
@@ -571,29 +569,26 @@ function mergeThemes(themes) {
   return themes.map((theme) => theme ? clone(theme) : {}).reduce((a, b) => mergeDeep(a, b), {});
 }
 function mergeAutocompleteShorthands(shorthands) {
-  return shorthands.reduce(
-    (a, b) => {
-      const rs = {};
-      for (const key in b) {
-        const value = b[key];
-        if (Array.isArray(value))
-          rs[key] = `(${value.join("|")})`;
-        else
-          rs[key] = value;
-      }
-      return {
-        ...a,
-        ...rs
-      };
-    },
-    {}
-  );
+  return shorthands.reduce((a, b) => {
+    const rs = {};
+    for (const key in b) {
+      const value = b[key];
+      if (Array.isArray(value))
+        rs[key] = `(${value.join("|")})`;
+      else
+        rs[key] = value;
+    }
+    return {
+      ...a,
+      ...rs
+    };
+  }, {});
 }
 function definePreset(preset) {
   return preset;
 }
 
-const version = "0.56.1";
+const version = "0.56.2";
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -765,18 +760,16 @@ class UnoGenerator {
         ))
       );
     })();
-    const layers = this.config.sortLayers(
-      Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b))
-    );
+    const layers = this.config.sortLayers(Array.from(layerSet).sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
     const layerCache = {};
     const getLayer = (layer) => {
       if (layerCache[layer])
         return layerCache[layer];
       let css = Array.from(sheet).sort((a, b) => (this.parentOrders.get(a[0]) ?? 0) - (this.parentOrders.get(b[0]) ?? 0) || a[0]?.localeCompare(b[0] || "") || 0).map(([parent, items]) => {
         const size = items.length;
-        const sorted = items.filter((i) => (i[4]?.layer || LAYER_DEFAULT) === layer).sort(
-          (a, b) => a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[5]?.currentSelector?.localeCompare(b[5]?.currentSelector ?? "") || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0
-        ).map(([, selector, body, , meta, , variantNoMerge]) => {
+        const sorted = items.filter((i) => (i[4]?.layer || LAYER_DEFAULT) === layer).sort((a, b) => {
+          return a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[5]?.currentSelector?.localeCompare(b[5]?.currentSelector ?? "") || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0;
+        }).map(([, selector, body, , meta, , variantNoMerge]) => {
           const scopedSelector = selector ? applyScope(selector, scope) : selector;
           return [
             [[scopedSelector ?? "", meta?.sort ?? 0]],
@@ -797,9 +790,7 @@ class UnoGenerator {
               }
             }
           }
-          const selectors = selectorSortPair ? uniq(
-            selectorSortPair.sort((a, b) => a[1] - b[1] || a[0]?.localeCompare(b[0] || "") || 0).map((pair) => pair[0]).filter(Boolean)
-          ) : [];
+          const selectors = selectorSortPair ? uniq(selectorSortPair.sort((a, b) => a[1] - b[1] || a[0]?.localeCompare(b[0] || "") || 0).map((pair) => pair[0]).filter(Boolean)) : [];
           return selectors.length ? `${selectors.join(`,${nl}`)}{${body}}` : body;
         }).filter(Boolean).reverse().join(nl);
         if (!parent)
@@ -830,13 +821,13 @@ class UnoGenerator {
     const variants = /* @__PURE__ */ new Set();
     const handlers = [];
     let processed = current || raw;
-    let applied = false;
+    let applied = true;
     const context = {
       rawSelector: raw,
       theme: this.config.theme,
       generator: this
     };
-    while (true) {
+    while (applied) {
       applied = false;
       for (const v of this.config.variants) {
         if (!v.multiPass && variants.has(v))
@@ -1036,9 +1027,7 @@ class UnoGenerator {
     if (!result)
       return;
     return [
-      (await Promise.all(result.map(
-        async (r) => (isString(r) ? (await this.expandShortcut(r, context, depth - 1))?.[0] : void 0) || [r]
-      ))).flat(1).filter(Boolean),
+      (await Promise.all(result.map(async (r) => (isString(r) ? (await this.expandShortcut(r, context, depth - 1))?.[0] : void 0) || [r]))).flat(1).filter(Boolean),
       meta
     ];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/core",
-  "version": "0.56.1",
+  "version": "0.56.2",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",