@unocss/core 0.55.1 → 0.55.3

package/dist/index.cjs

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 function escapeRegExp(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -21,11 +19,19 @@ function escapeSelector(str) {
       result += "\\,";
       continue;
     }
-    if (codeUnit >= 1 && codeUnit <= 31 || codeUnit === 127 || index === 0 && codeUnit >= 48 && codeUnit <= 57 || index === 1 && codeUnit >= 48 && codeUnit <= 57 && firstCodeUnit === 45) {
+    if (
+      // If the character is in the range [\1-\1F] (U+0001 to U+001F) or is
+      // U+007F, […]
+      codeUnit >= 1 && codeUnit <= 31 || codeUnit === 127 || index === 0 && codeUnit >= 48 && codeUnit <= 57 || index === 1 && codeUnit >= 48 && codeUnit <= 57 && firstCodeUnit === 45
+    ) {
       result += `\\${codeUnit.toString(16)} `;
       continue;
     }
-    if (index === 0 && length === 1 && codeUnit === 45) {
+    if (
+      // If the character is the first character and is a `-` (U+002D), and
+      // there is no second character, […]
+      index === 0 && length === 1 && codeUnit === 45
+    ) {
       result += `\\${str.charAt(index)}`;
       continue;
     }
@@ -158,9 +164,15 @@ function notNull(value) {
 function noop() {
 }
 
+var __defProp$2 = Object.defineProperty;
+var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$2 = (obj, key, value) => {
+  __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class TwoKeyMap {
   constructor() {
-    this._map = /* @__PURE__ */ new Map();
+    __publicField$2(this, "_map", /* @__PURE__ */ new Map());
   }
   get(key1, key2) {
     const m2 = this._map.get(key1);
@@ -213,9 +225,16 @@ class BetterMap extends Map {
   }
 }
 
+var __defProp$1 = Object.defineProperty;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$1 = (obj, key, value) => {
+  __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class CountableSet extends Set {
   constructor(values) {
     super(values);
+    __publicField$1(this, "_map");
     this._map ?? (this._map = /* @__PURE__ */ new Map());
   }
   add(key) {
@@ -325,6 +344,7 @@ function parseVariantGroup(str, separators = ["-", ":"], depth = 5) {
     prefixes: Array.from(prefixes),
     hasChanged,
     groupsByOffset,
+    // Computed lazily because MagicString's toString does a lot of work
     get expanded() {
       return expanded.toString();
     }
@@ -546,33 +566,25 @@ function resolveConfig(userConfig = {}, defaults = {}) {
     shortcuts: resolveShortcuts(getMerged("shortcuts")).reverse(),
     extractors,
     safelist: getMerged("safelist"),
-    separators
+    separators,
+    details: config.details ?? config.envMode === "dev"
   };
   for (const p of sources)
     p?.configResolved?.(resolved);
   return resolved;
 }
 function mergeConfigs(configs) {
-  function getMerged(key) {
-    return uniq(configs.flatMap((p) => toArray(p[key] || [])));
-  }
-  const merged = Object.assign(
-    {},
-    ...configs,
-    {
-      theme: mergeThemes(configs.map((c) => c.theme)),
-      presets: getMerged("presets"),
-      safelist: getMerged("safelist"),
-      preprocess: getMerged("preprocess"),
-      postprocess: getMerged("postprocess"),
-      preflights: getMerged("preflights"),
-      rules: getMerged("rules"),
-      variants: getMerged("variants"),
-      shortcuts: getMerged("shortcuts"),
-      extractors: getMerged("extractors")
-    }
-  );
-  return merged;
+  const maybeArrays = ["shortcuts", "preprocess", "postprocess"];
+  const config = configs.map((config2) => Object.entries(config2).reduce((acc, [key, value]) => ({
+    ...acc,
+    [key]: maybeArrays.includes(key) ? toArray(value) : value
+  }), {})).reduce(({ theme: themeA, ...a }, { theme: themeB, ...b }) => {
+    const c = mergeDeep(a, b, true);
+    if (themeA || themeB)
+      c.theme = mergeThemes([themeA, themeB]);
+    return c;
+  }, {});
+  return config;
 }
 function mergeThemes(themes) {
   return themes.map((theme) => theme ? clone(theme) : {}).reduce((a, b) => mergeDeep(a, b), {});
@@ -597,17 +609,24 @@ function mergeAutocompleteShorthands(shorthands) {
   );
 }
 
-const version = "0.55.1";
+const version = "0.55.3";
 
+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;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class UnoGenerator {
   constructor(userConfig = {}, defaults = {}) {
     this.userConfig = userConfig;
     this.defaults = defaults;
-    this.version = version;
-    this._cache = /* @__PURE__ */ new Map();
-    this.blocked = /* @__PURE__ */ new Set();
-    this.parentOrders = /* @__PURE__ */ new Map();
-    this.events = createNanoEvents();
+    __publicField(this, "version", version);
+    __publicField(this, "_cache", /* @__PURE__ */ new Map());
+    __publicField(this, "config");
+    __publicField(this, "blocked", /* @__PURE__ */ new Set());
+    __publicField(this, "parentOrders", /* @__PURE__ */ new Map());
+    __publicField(this, "events", createNanoEvents());
     this.config = resolveConfig(userConfig, defaults);
     this.events.emit("config", this.config);
   }