@unocss/core 0.65.2 → 0.65.3

package/dist/index.d.mts

@@ -136,15 +136,15 @@ declare const symbols: ControlSymbols;
 declare class UnoGeneratorInternal<Theme extends object = object> {
     userConfig: UserConfig<Theme>;
     defaults: UserConfigDefaults<Theme>;
-    version: string;
-    private _cache;
+    readonly version: string;
+    readonly events: Emitter<{
+        config: (config: ResolvedConfig<Theme>) => void;
+    }>;
     config: ResolvedConfig<Theme>;
+    cache: Map<string, StringifiedUtil<Theme>[] | null>;
     blocked: Set<string>;
     parentOrders: Map<string, number>;
     activatedRules: Set<Rule<Theme>>;
-    events: Emitter<{
-        config: (config: ResolvedConfig<Theme>) => void;
-    }>;
     protected constructor(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>);
     static create<Theme extends object = object>(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): Promise<UnoGeneratorInternal<Theme>>;
     setConfig(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): Promise<void>;
@@ -772,15 +772,29 @@ interface CliOptions {
     };
 }
 interface UnocssPluginContext<Config extends UserConfig = UserConfig> {
+    /**
+     * Singleton promise for config loading
+     */
     ready: Promise<LoadConfigResult<Config>>;
+    /**
+     * The UnoCSS generator instance. Should be used after `ready` resolved.
+     */
     uno: UnoGenerator;
-    /** All tokens scanned */
+    /**
+     * All tokens scanned
+     */
     tokens: Set<string>;
-    /** Map for all module's raw content */
+    /**
+     * Map for all module's raw content
+     */
     modules: BetterMap<string, string>;
-    /** Module IDs that been affected by UnoCSS */
+    /**
+     * Module IDs that been affected by UnoCSS
+     */
     affectedModules: Set<string>;
-    /** Pending promises */
+    /**
+     *  Pending promises
+     */
     tasks: Promise<any>[];
     /**
      * Await all pending tasks
@@ -1060,6 +1074,7 @@ declare function resolveConfig<Theme extends object = object>(userConfig?: UserC
  */
 declare function mergeConfigs<Theme extends object = object>(configs: UserConfig<Theme>[]): UserConfig<Theme>;
 declare function definePreset<Options extends object | undefined = undefined, Theme extends object = object>(preset: PresetFactory<Theme, Options>): PresetFactory<Theme, Options>;
+declare function definePreset<Options extends object | undefined = undefined, Theme extends object = object>(preset: PresetFactoryAwaitable<Theme, Options>): PresetFactoryAwaitable<Theme, Options>;
 declare function definePreset<Theme extends object = object>(preset: Preset<Theme>): Preset<Theme>;
 
 declare const defaultSplitRE: RegExp;

package/dist/index.d.ts

@@ -136,15 +136,15 @@ declare const symbols: ControlSymbols;
 declare class UnoGeneratorInternal<Theme extends object = object> {
     userConfig: UserConfig<Theme>;
     defaults: UserConfigDefaults<Theme>;
-    version: string;
-    private _cache;
+    readonly version: string;
+    readonly events: Emitter<{
+        config: (config: ResolvedConfig<Theme>) => void;
+    }>;
     config: ResolvedConfig<Theme>;
+    cache: Map<string, StringifiedUtil<Theme>[] | null>;
     blocked: Set<string>;
     parentOrders: Map<string, number>;
     activatedRules: Set<Rule<Theme>>;
-    events: Emitter<{
-        config: (config: ResolvedConfig<Theme>) => void;
-    }>;
     protected constructor(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>);
     static create<Theme extends object = object>(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): Promise<UnoGeneratorInternal<Theme>>;
     setConfig(userConfig?: UserConfig<Theme>, defaults?: UserConfigDefaults<Theme>): Promise<void>;
@@ -772,15 +772,29 @@ interface CliOptions {
     };
 }
 interface UnocssPluginContext<Config extends UserConfig = UserConfig> {
+    /**
+     * Singleton promise for config loading
+     */
     ready: Promise<LoadConfigResult<Config>>;
+    /**
+     * The UnoCSS generator instance. Should be used after `ready` resolved.
+     */
     uno: UnoGenerator;
-    /** All tokens scanned */
+    /**
+     * All tokens scanned
+     */
     tokens: Set<string>;
-    /** Map for all module's raw content */
+    /**
+     * Map for all module's raw content
+     */
     modules: BetterMap<string, string>;
-    /** Module IDs that been affected by UnoCSS */
+    /**
+     * Module IDs that been affected by UnoCSS
+     */
     affectedModules: Set<string>;
-    /** Pending promises */
+    /**
+     *  Pending promises
+     */
     tasks: Promise<any>[];
     /**
      * Await all pending tasks
@@ -1060,6 +1074,7 @@ declare function resolveConfig<Theme extends object = object>(userConfig?: UserC
  */
 declare function mergeConfigs<Theme extends object = object>(configs: UserConfig<Theme>[]): UserConfig<Theme>;
 declare function definePreset<Options extends object | undefined = undefined, Theme extends object = object>(preset: PresetFactory<Theme, Options>): PresetFactory<Theme, Options>;
+declare function definePreset<Options extends object | undefined = undefined, Theme extends object = object>(preset: PresetFactoryAwaitable<Theme, Options>): PresetFactoryAwaitable<Theme, Options>;
 declare function definePreset<Theme extends object = object>(preset: Preset<Theme>): Preset<Theme>;
 
 declare const defaultSplitRE: RegExp;

package/dist/index.mjs

@@ -40,20 +40,14 @@ function isString(s) {
   return typeof s === "string";
 }
 
-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, key + "" , value);
-  return value;
-};
 class CountableSet extends Set {
+  _map;
   constructor(values) {
     super(values);
-    __publicField$2(this, "_map");
-    this._map ?? (this._map = /* @__PURE__ */ new Map());
+    this._map ??= /* @__PURE__ */ new Map();
   }
   add(key) {
-    this._map ?? (this._map = /* @__PURE__ */ new Map());
+    this._map ??= /* @__PURE__ */ new Map();
     this._map.set(key, (this._map.get(key) ?? 0) + 1);
     return super.add(key);
   }
@@ -157,16 +151,8 @@ function withLayer(layer, rules) {
   return rules;
 }
 
-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, key + "" , value);
-  return value;
-};
 class TwoKeyMap {
-  constructor() {
-    __publicField$1(this, "_map", /* @__PURE__ */ new Map());
-  }
+  _map = /* @__PURE__ */ new Map();
   get(key1, key2) {
     const m2 = this._map.get(key1);
     if (m2)
@@ -289,8 +275,7 @@ function clone(val) {
   let k, out, tmp;
   if (Array.isArray(val)) {
     out = Array.from({ length: k = val.length });
-    while (k--)
-      out[k] = (tmp = val[k]) && typeof tmp === "object" ? clone(tmp) : tmp;
+    while (k--) out[k] = (tmp = val[k]) && typeof tmp === "object" ? clone(tmp) : tmp;
     return out;
   }
   if (Object.prototype.toString.call(val) === "[object Object]") {
@@ -653,7 +638,7 @@ function definePreset(preset) {
   return preset;
 }
 
-const version = "0.65.2";
+const version = "0.65.3";
 
 function createNanoEvents() {
   return {
@@ -668,12 +653,6 @@ function createNanoEvents() {
   };
 }
 
-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;
-};
 const symbols = {
   shortcutsNoMerge: "$$symbol-shortcut-no-merge",
   variants: "$$symbol-variants",
@@ -686,14 +665,14 @@ class UnoGeneratorInternal {
   constructor(userConfig = {}, defaults = {}) {
     this.userConfig = userConfig;
     this.defaults = defaults;
-    __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, "activatedRules", /* @__PURE__ */ new Set());
-    __publicField(this, "events", createNanoEvents());
   }
+  version = version;
+  events = createNanoEvents();
+  config = void 0;
+  cache = /* @__PURE__ */ new Map();
+  blocked = /* @__PURE__ */ new Set();
+  parentOrders = /* @__PURE__ */ new Map();
+  activatedRules = /* @__PURE__ */ new Set();
   static async create(userConfig = {}, defaults = {}) {
     const uno = new UnoGeneratorInternal(userConfig, defaults);
     uno.config = await resolveConfig(uno.userConfig, uno.defaults);
@@ -709,7 +688,7 @@ class UnoGeneratorInternal {
     this.blocked.clear();
     this.parentOrders.clear();
     this.activatedRules.clear();
-    this._cache.clear();
+    this.cache.clear();
     this.config = await resolveConfig(userConfig, this.defaults);
     this.events.emit("config", this.config);
   }
@@ -752,20 +731,20 @@ class UnoGeneratorInternal {
     if (this.blocked.has(raw))
       return;
     const cacheKey = `${raw}${alias ? ` ${alias}` : ""}`;
-    if (this._cache.has(cacheKey))
-      return this._cache.get(cacheKey);
+    if (this.cache.has(cacheKey))
+      return this.cache.get(cacheKey);
     let current = raw;
     for (const p of this.config.preprocess)
       current = p(raw);
     if (this.isBlocked(current)) {
       this.blocked.add(raw);
-      this._cache.set(cacheKey, null);
+      this.cache.set(cacheKey, null);
       return;
     }
     const variantResults = await this.matchVariants(raw, current);
     if (variantResults.every((i) => !i || this.isBlocked(i[1]))) {
       this.blocked.add(raw);
-      this._cache.set(cacheKey, null);
+      this.cache.set(cacheKey, null);
       return;
     }
     const handleVariantResult = async (matched) => {
@@ -778,10 +757,10 @@ class UnoGeneratorInternal {
     };
     const result = (await Promise.all(variantResults.map((i) => handleVariantResult(i)))).flat().filter((x) => !!x);
     if (result?.length) {
-      this._cache.set(cacheKey, result);
+      this.cache.set(cacheKey, result);
       return result;
     }
-    this._cache.set(cacheKey, null);
+    this.cache.set(cacheKey, null);
   }
   async generate(input, options = {}) {
     const {

package/package.json

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