@unocss/core 66.6.6-beta.1 → 66.6.7

package/dist/index.d.mts

@@ -8,14 +8,14 @@ declare function uniqueBy<T>(array: readonly T[], equalFn: (a: T, b: T) => boole
 declare function isString(s: any): s is string;
 //#endregion
 //#region src/utils/countable-set.d.ts
-declare class CountableSet<K$1> extends Set<K$1> {
-  _map: Map<K$1, number>;
-  constructor(values?: Iterable<K$1>);
-  add(key: K$1): this;
-  delete(key: K$1): boolean;
+declare class CountableSet<K> extends Set<K> {
+  _map: Map<K, number>;
+  constructor(values?: Iterable<K>);
+  add(key: K): this;
+  delete(key: K): boolean;
   clear(): void;
-  getCount(key: K$1): number;
-  setCount(key: K$1, count: number): this;
+  getCount(key: K): number;
+  setCount(key: K, count: number): this;
 }
 declare function isCountableSet<T = string>(value: any): value is CountableSet<T>;
 //#endregion
@@ -62,7 +62,7 @@ declare class Emitter<Events extends EventsMap = DefaultEvents> {
    * @param cb The listener function.
    * @returns Unbind listener from event.
    */
-  on<K$1 extends keyof Events>(this: this, event: K$1, cb: Events[K$1]): Unsubscribe;
+  on<K extends keyof Events>(this: this, event: K, cb: Events[K]): Unsubscribe;
   /**
    * Calls each of the listeners registered for a given event.
    *
@@ -73,7 +73,7 @@ declare class Emitter<Events extends EventsMap = DefaultEvents> {
    * @param event The event name.
    * @param args The arguments for listeners.
    */
-  emit<K$1 extends keyof Events>(this: this, event: K$1, ...args: Parameters<Events[K$1]>): void;
+  emit<K extends keyof Events>(this: this, event: K, ...args: Parameters<Events[K]>): void;
 }
 /**
  * Create event emitter.
@@ -121,10 +121,10 @@ declare class TwoKeyMap<K1, K2, V> {
   deleteTop(key1: K1): boolean;
   map<T>(fn: (v: V, k1: K1, k2: K2) => T): T[];
 }
-declare class BetterMap<K$1, V> extends Map<K$1, V> {
-  getFallback(key: K$1, fallback: V): V;
-  map<R>(mapFn: (value: V, key: K$1) => R): R[];
-  flatMap<R extends readonly unknown[]>(mapFn: (value: V, key: K$1) => R): R[number][];
+declare class BetterMap<K, V> extends Map<K, V> {
+  getFallback(key: K, fallback: V): V;
+  map<R>(mapFn: (value: V, key: K) => R): R[];
+  flatMap<R extends readonly unknown[]>(mapFn: (value: V, key: K) => R): R[number][];
 }
 //#endregion
 //#region src/utils/object.d.ts
@@ -215,8 +215,8 @@ type Shift<T> = T extends [_: any, ...args: infer A] ? A : never;
 type RestArgs<T> = Shift<ArgumentType<T>>;
 type DeepPartial<T> = { [P in keyof T]?: DeepPartial<T[P]> };
 type FlatObjectTuple<T> = { [K in keyof T]: T[K] };
-type PartialByKeys<T, K$1 extends keyof T = keyof T> = FlatObjectTuple<Partial<Pick<T, Extract<keyof T, K$1>>> & Omit<T, K$1>>;
-type RequiredByKey<T, K$1 extends keyof T = keyof T> = FlatObjectTuple<Required<Pick<T, Extract<keyof T, K$1>>> & Omit<T, K$1>>;
+type PartialByKeys<T, K extends keyof T = keyof T> = FlatObjectTuple<Partial<Pick<T, Extract<keyof T, K>>> & Omit<T, K>>;
+type RequiredByKey<T, K extends keyof T = keyof T> = FlatObjectTuple<Required<Pick<T, Extract<keyof T, K>>> & Omit<T, K>>;
 type CSSObject = Record<string, string | number | undefined>;
 /**
  * [property, value, operators?]
@@ -789,8 +789,8 @@ interface Preset<Theme extends object = object> extends ConfigBase<Theme> {
    */
   meta?: Record<string, any>;
 }
-type PresetFactory<Theme extends object = object, PresetOptions$1 extends object | undefined = undefined> = (options?: PresetOptions$1) => Preset<Theme>;
-type PresetFactoryAwaitable<Theme extends object = object, PresetOptions$1 extends object | undefined = undefined> = (options?: PresetOptions$1) => Awaitable<Preset<Theme>>;
+type PresetFactory<Theme extends object = object, PresetOptions extends object | undefined = undefined> = (options?: PresetOptions) => Preset<Theme>;
+type PresetFactoryAwaitable<Theme extends object = object, PresetOptions extends object | undefined = undefined> = (options?: PresetOptions) => Awaitable<Preset<Theme>>;
 type PresetOrFactory<Theme extends object = object> = Preset<Theme> | PresetFactory<Theme, any>;
 type PresetOrFactoryAwaitable<Theme extends object = object> = PresetOrFactory<Theme> | Promise<Preset<Theme>> | PresetFactoryAwaitable<Theme>;
 interface GeneratorOptions {

package/dist/index.mjs

@@ -9,7 +9,6 @@ const DEFAULT_LAYERS = {
 	[LAYER_SHORTCUTS]: -10,
 	[LAYER_DEFAULT]: 0
 };
-
 //#endregion
 //#region src/extractors/split.ts
 const defaultSplitRE = /[\\:]?[\s'"`;{}]+/g;
@@ -24,7 +23,6 @@ const extractorSplit = {
 		return splitCode(code);
 	}
 };
-
 //#endregion
 //#region src/utils/basic.ts
 function toArray(value = []) {
@@ -42,7 +40,6 @@ function uniqueBy(array, equalFn) {
 function isString(s) {
 	return typeof s === "string";
 }
-
 //#endregion
 //#region src/utils/countable-set.ts
 var CountableSet = class extends Set {
@@ -75,7 +72,6 @@ var CountableSet = class extends Set {
 function isCountableSet(value) {
 	return value instanceof CountableSet;
 }
-
 //#endregion
 //#region src/utils/escape.ts
 function escapeRegExp(string) {
@@ -121,7 +117,6 @@ function escapeSelector(str) {
 	return result;
 }
 const e = escapeSelector;
-
 //#endregion
 //#region src/utils/events.ts
 /**
@@ -155,7 +150,6 @@ function createNanoEvents() {
 		}
 	};
 }
-
 //#endregion
 //#region src/utils/helpers.ts
 const attributifyRE = /^\[(.+?)~?="(.*)"\]$/;
@@ -177,7 +171,6 @@ function notNull(value) {
 	return value != null;
 }
 function noop() {}
-
 //#endregion
 //#region src/utils/layer.ts
 function withLayer(layer, rules) {
@@ -187,7 +180,6 @@ function withLayer(layer, rules) {
 	});
 	return rules;
 }
-
 //#endregion
 //#region src/utils/map.ts
 var TwoKeyMap = class {
@@ -255,7 +247,6 @@ var BetterMap = class extends Map {
 		return result;
 	}
 };
-
 //#endregion
 //#region src/utils/object.ts
 function normalizeCSSEntries(obj) {
@@ -277,7 +268,7 @@ function clearIdenticalEntries(entry) {
 const VirtualKey = "__virtual_key__";
 function entriesToCss(arr) {
 	if (arr == null) return "";
-	return clearIdenticalEntries(arr).map(([key, value]) => value != null && typeof value !== "function" ? key !== VirtualKey ? `${key}:${value};` : value : void 0).filter(Boolean).join("");
+	return clearIdenticalEntries(arr).map(([key, value]) => value != null && typeof value !== "function" ? key !== "__virtual_key__" ? `${key}:${value};` : value : void 0).filter(Boolean).join("");
 }
 function isObject(item) {
 	return item && typeof item === "object" && !Array.isArray(item);
@@ -323,7 +314,6 @@ function isStaticRule(rule) {
 function isStaticShortcut(sc) {
 	return isString(sc[0]);
 }
-
 //#endregion
 //#region src/utils/variant-group.ts
 const regexCache = {};
@@ -396,7 +386,7 @@ function collapseVariantGroup(str, prefixes) {
 	const collection = /* @__PURE__ */ new Map();
 	const sortedPrefix = prefixes.sort((a, b) => b.length - a.length);
 	return str.split(/\s+/g).map((part) => {
-		const prefix = sortedPrefix.find((prefix$1) => part.startsWith(prefix$1));
+		const prefix = sortedPrefix.find((prefix) => part.startsWith(prefix));
 		if (!prefix) return part;
 		const body = part.slice(prefix.length);
 		if (collection.has(prefix)) {
@@ -419,7 +409,6 @@ function expandVariantGroup(str, separators = ["-", ":"], depth = 5) {
 	const res = parseVariantGroup(str, separators, depth);
 	return typeof str === "string" ? res.expanded : str;
 }
-
 //#endregion
 //#region src/utils/warn.ts
 const warned = /* @__PURE__ */ new Set();
@@ -428,7 +417,6 @@ function warnOnce(msg) {
 	console.warn("[unocss]", msg);
 	warned.add(msg);
 }
-
 //#endregion
 //#region src/config.ts
 function resolveShortcuts(shortcuts) {
@@ -539,7 +527,7 @@ async function resolveConfig(userConfig = {}, defaults = {}) {
 	const resolved = {
 		mergeSelectors: true,
 		warn: true,
-		sortLayers: (layers$1) => layers$1,
+		sortLayers: (layers) => layers,
 		...config,
 		blocklist: getMerged("blocklist"),
 		presets: sortedPresets,
@@ -614,11 +602,9 @@ function flatternFilterPattern(pattern) {
 function definePreset(preset) {
 	return preset;
 }
-
 //#endregion
 //#region package.json
-var version = "66.6.6-beta.1";
-
+var version = "66.6.7";
 //#endregion
 //#region src/generator.ts
 const symbols = {
@@ -832,10 +818,10 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 				preflightLayerSet.add(layer);
 			});
 			preflightsMap = Object.fromEntries(await Promise.all(Array.from(preflightLayerSet).map(async (layer) => {
-				return [layer, (await Promise.all(this.config.preflights.filter((i) => (i.layer || LAYER_PREFLIGHTS) === layer).map(async (i) => await i.getCSS(preflightContext)))).filter(Boolean).join(nl)];
+				return [layer, (await Promise.all(this.config.preflights.filter((i) => (i.layer || "preflights") === layer).map(async (i) => await i.getCSS(preflightContext)))).filter(Boolean).join(nl)];
 			})));
 		})();
-		const sortLayers = (layers$1) => this.config.sortLayers(layers$1.sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
+		const sortLayers = (layers) => this.config.sortLayers(layers.sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
 		const layers = sortLayers(Array.from(layerSet));
 		const layerCache = {};
 		const outputCssLayers = this.config.outputToCssLayers;
@@ -848,7 +834,7 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 			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) => {
+				const sorted = items.filter((i) => (i[4]?.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]) => {
 					return [
@@ -884,10 +870,10 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 			return layerCache[layer] = css ? layerMark + css : "";
 		};
 		const getLayers = (includes = layers, excludes) => {
-			const layers$1 = includes.filter((i) => !excludes?.includes(i));
-			const css = layers$1.map(getLayer).filter(Boolean);
+			const layers = includes.filter((i) => !excludes?.includes(i));
+			const css = layers.map(getLayer).filter(Boolean);
 			if (outputCssLayers) {
-				let layerNames = layers$1;
+				let layerNames = layers;
 				if (typeof outputCssLayers === "object" && outputCssLayers.allLayers) layerNames = sortLayers(Object.keys(this.config.layers));
 				if (layerNames.length > 0) css.unshift(`@layer ${layerNames.map(getLayerAlias).filter(notNull).join(", ")};`);
 			}
@@ -1199,16 +1185,16 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 			}
 			const isNoMerge = Object.fromEntries(item[2])[symbols.shortcutsNoMerge];
 			const variants = [...item[4], ...!isNoMerge ? parentVariants : []];
-			for (const { selector, entries, parent: parent$1, sort, noMerge, layer } of this.applyVariants(item, variants, raw)) layerMap.getFallback(layer ?? meta.layer, new TwoKeyMap()).getFallback(selector, parent$1, [[], item[0]])[0].push([
+			for (const { selector, entries, parent, sort, noMerge, layer } of this.applyVariants(item, variants, raw)) layerMap.getFallback(layer ?? meta.layer, new TwoKeyMap()).getFallback(selector, parent, [[], item[0]])[0].push([
 				entries,
 				!!(noMerge ?? item[3]?.noMerge),
 				sort ?? 0
 			]);
 		}
-		return rawStringifiedUtil.concat(layerMap.flatMap((selectorMap, layer) => selectorMap.map(([e$1, index], selector, joinedParents) => {
+		return rawStringifiedUtil.concat(layerMap.flatMap((selectorMap, layer) => selectorMap.map(([e, index], selector, joinedParents) => {
 			const stringify = (flatten, noMerge, entrySortPair) => {
-				const maxSort = Math.max(...entrySortPair.map((e$2) => e$2[1]));
-				const entriesList = entrySortPair.map((e$2) => e$2[0]);
+				const maxSort = Math.max(...entrySortPair.map((e) => e[1]));
+				const entriesList = entrySortPair.map((e) => e[0]);
 				return (flatten ? [entriesList.flat(1)] : entriesList).map((entries) => {
 					const body = entriesToCss(entries);
 					if (body) return [
@@ -1227,15 +1213,15 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 					];
 				});
 			};
-			return [[e$1.filter(([, noMerge]) => noMerge).map(([entries, , sort]) => [entries, sort]), true], [e$1.filter(([, noMerge]) => !noMerge).map(([entries, , sort]) => [entries, sort]), false]].map(([e$2, noMerge]) => [...stringify(false, noMerge, e$2.filter(([entries]) => entries.some((entry) => entry[0] === symbols.shortcutsNoMerge))), ...stringify(true, noMerge, e$2.filter(([entries]) => entries.every((entry) => entry[0] !== symbols.shortcutsNoMerge)))]);
+			return [[e.filter(([, noMerge]) => noMerge).map(([entries, , sort]) => [entries, sort]), true], [e.filter(([, noMerge]) => !noMerge).map(([entries, , sort]) => [entries, sort]), false]].map(([e, noMerge]) => [...stringify(false, noMerge, e.filter(([entries]) => entries.some((entry) => entry[0] === symbols.shortcutsNoMerge))), ...stringify(true, noMerge, e.filter(([entries]) => entries.every((entry) => entry[0] !== symbols.shortcutsNoMerge)))]);
 		}).flat(2).filter(Boolean)));
 	}
 	isBlocked(raw) {
-		return !raw || this.config.blocklist.map((e$1) => Array.isArray(e$1) ? e$1[0] : e$1).some((e$1) => typeof e$1 === "function" ? e$1(raw) : isString(e$1) ? e$1 === raw : e$1.test(raw));
+		return !raw || this.config.blocklist.map((e) => Array.isArray(e) ? e[0] : e).some((e) => typeof e === "function" ? e(raw) : isString(e) ? e === raw : e.test(raw));
 	}
 	getBlocked(raw) {
-		const rule = this.config.blocklist.find((e$1) => {
-			const v = Array.isArray(e$1) ? e$1[0] : e$1;
+		const rule = this.config.blocklist.find((e) => {
+			const v = Array.isArray(e) ? e[0] : e;
 			return typeof v === "function" ? v(raw) : isString(v) ? v === raw : v.test(raw);
 		});
 		return rule ? Array.isArray(rule) ? rule : [rule, void 0] : void 0;
@@ -1269,6 +1255,5 @@ function toEscapedSelector(raw) {
 function defaultVariantHandler(input, next) {
 	return next(input);
 }
-
 //#endregion
-export { BetterMap, CountableSet, DEFAULT_LAYERS, LAYER_DEFAULT, LAYER_IMPORTS, LAYER_PREFLIGHTS, LAYER_SHORTCUTS, TwoKeyMap, UnoGenerator, VirtualKey, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createNanoEvents, cssIdRE, defaultSplitRE, definePreset, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, symbols, toArray, toEscapedSelector, uniq, uniqueBy, validateFilterRE, warnOnce, withLayer };
+export { BetterMap, CountableSet, DEFAULT_LAYERS, LAYER_DEFAULT, LAYER_IMPORTS, LAYER_PREFLIGHTS, LAYER_SHORTCUTS, TwoKeyMap, UnoGenerator, VirtualKey, attributifyRE, clearIdenticalEntries, clone, collapseVariantGroup, createGenerator, createNanoEvents, cssIdRE, defaultSplitRE, definePreset, e, entriesToCss, escapeRegExp, escapeSelector, expandVariantGroup, extractorSplit as extractorDefault, extractorSplit, hasScopePlaceholder, isAttributifySelector, isCountableSet, isObject, isRawUtil, isStaticRule, isStaticShortcut, isString, isValidSelector, makeRegexClassGroup, mergeConfigs, mergeDeep, noop, normalizeCSSEntries, normalizeCSSValues, normalizeVariant, notNull, parseVariantGroup, regexScopePlaceholder, resolveConfig, resolvePreset, resolvePresets, resolveShortcuts, splitWithVariantGroupRE, symbols, toArray, toEscapedSelector, uniq, uniqueBy, validateFilterRE, warnOnce, withLayer };

package/package.json

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