@unocss/core 66.7.5 → 66.8.0-beta.1

package/dist/index.d.mts

@@ -1,6 +1,5 @@
 import MagicString from "magic-string";
 import { LoadConfigResult } from "unconfig";
-
 //#region src/utils/basic.d.ts
 declare function toArray<T>(value?: T | T[]): T[];
 declare function uniq<T>(value: T[]): T[];
@@ -44,7 +43,7 @@ declare class Emitter<Events extends EventsMap = DefaultEvents> {
    * emitter2.events = { }
    * ```
    */
-  events: Partial<{ [E in keyof Events]: Events[E][] }>;
+  events: Partial<{ [E in keyof Events]: Events[E][]; }>;
   /**
    * Add a listener for a given event.
    *
@@ -171,16 +170,21 @@ declare class UnoGeneratorInternal<Theme extends object = object> {
     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>>;
+  private tokenProcessor;
   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>;
   applyExtractors(code: string, id?: string, extracted?: Set<string>): Promise<Set<string>>;
   applyExtractors(code: string, id?: string, extracted?: CountableSet<string>): Promise<CountableSet<string>>;
   makeContext(raw: string, applied: VariantMatchedResult<Theme>): RuleContext<Theme>;
+  /** @internal */
+  resetTokenProcessing(): void;
+  getParentOrder(parent: string): number | undefined;
+  getActivatedRules(): ReadonlySet<Rule<Theme>>;
+  getCachedTokens(input: string): string[];
+  getCachedAliases(token: string): string[] | undefined;
+  blockTokens(tokens: Iterable<string>): void;
+  invalidateToken(token: string): void;
   parseToken(raw: string, alias?: string): Promise<StringifiedUtil<Theme>[] | undefined | null>;
   generate(input: string | Set<string> | CountableSet<string> | string[], options?: GenerateOptions<false>): Promise<GenerateResult<Set<string>>>;
   generate(input: string | Set<string> | CountableSet<string> | string[], options?: GenerateOptions<true>): Promise<GenerateResult<Map<string, ExtendedTokenInfo<Theme>>>>;
@@ -213,8 +217,8 @@ type ToArray<T> = T extends (infer U)[] ? U[] : T[];
 type ArgumentType<T> = T extends ((...args: infer A) => any) ? A : never;
 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 DeepPartial<T> = { [P in keyof T]?: DeepPartial<T[P]>; };
+type FlatObjectTuple<T> = { [K in keyof T]: T[K]; };
 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>;
@@ -335,7 +339,7 @@ interface ControlSymbolsValue {
   [SymbolSort]: number;
   [SymbolBody]: string;
 }
-type ObjectToEntry<T> = { [K in keyof T]: [K, T[K]] }[keyof T];
+type ObjectToEntry<T> = { [K in keyof T]: [K, T[K]]; }[keyof T];
 type ControlSymbolsEntry = ObjectToEntry<ControlSymbolsValue>;
 interface VariantContext<Theme extends object = object> {
   /**
@@ -788,6 +792,10 @@ interface Preset<Theme extends object = object> extends ConfigBase<Theme> {
    * Custom metadata for the preset
    */
   meta?: Record<string, any>;
+  /**
+   * Documentation URL for the preset
+   */
+  docs?: string;
 }
 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>>;
@@ -909,6 +917,10 @@ interface HighlightAnnotation {
 type SourceCodeTransformerEnforce = 'pre' | 'post' | 'default';
 interface SourceCodeTransformer {
   name: string;
+  /**
+   * Documentation URL for the transformer
+   */
+  docs?: string;
   /**
    * The order of transformer
    */

package/dist/index.mjs

@@ -252,9 +252,10 @@ function normalizeCSSEntries(obj) {
 	return (!Array.isArray(obj) ? Object.entries(obj) : obj).filter((i) => i[1] != null);
 }
 function normalizeCSSValues(obj) {
-	if (Array.isArray(obj)) if (obj.some((i) => !Array.isArray(i) || Array.isArray(i[0]))) return obj.map((i) => normalizeCSSEntries(i));
-	else return [obj];
-	else return [normalizeCSSEntries(obj)];
+	if (Array.isArray(obj)) {
+		if (obj.some((i) => !Array.isArray(i) || Array.isArray(i[0]))) return obj.map((i) => normalizeCSSEntries(i));
+		else return [obj];
+	} else return [normalizeCSSEntries(obj)];
 }
 function clearIdenticalEntries(entry) {
 	return entry.filter(([k, v], idx) => {
@@ -277,8 +278,10 @@ function isObject(item) {
 function mergeDeep(original, patch, mergeArray = false) {
 	const o = original;
 	const p = patch;
-	if (Array.isArray(p)) if (mergeArray && Array.isArray(p)) return [...o, ...p];
-	else return [...p];
+	if (Array.isArray(p)) {
+		if (mergeArray && Array.isArray(p)) return [...o, ...p];
+		else return [...p];
+	}
 	const output = { ...o };
 	if (isObject(o) && isObject(p)) Object.keys(p).forEach((key) => {
 		if (isObject(o[key]) && isObject(p[key]) || Array.isArray(o[key]) && Array.isArray(p[key])) output[key] = mergeDeep(o[key], p[key], mergeArray);
@@ -628,7 +631,7 @@ function definePreset(preset) {
 }
 //#endregion
 //#region package.json
-var version = "66.7.5";
+var version = "66.8.0-beta.1";
 //#endregion
 //#region src/generator.ts
 const symbols = {
@@ -643,16 +646,91 @@ const symbols = {
 	body: "$$symbol-body"
 };
 const TOKEN_PARSE_BATCH_SIZE = 4096;
+var TokenProcessor = class {
+	cache = /* @__PURE__ */ new Map();
+	blocked = /* @__PURE__ */ new Set();
+	parentOrders = /* @__PURE__ */ new Map();
+	activatedRules = /* @__PURE__ */ new Set();
+	async parse(generator, raw, alias) {
+		if (this.blocked.has(raw)) return;
+		const cacheKey = `${raw}${alias ? ` ${alias}` : ""}`;
+		if (this.cache.has(cacheKey)) return this.cache.get(cacheKey);
+		const current = generator.config.preprocess.reduce((acc, p) => p(acc) ?? acc, raw);
+		if (generator.isBlocked(current)) {
+			this.blocked.add(raw);
+			this.cache.set(cacheKey, null);
+			return;
+		}
+		const variantResults = await generator.matchVariants(raw, current);
+		if (variantResults.every((i) => !i || generator.isBlocked(i[1]))) {
+			this.blocked.add(raw);
+			this.cache.set(cacheKey, null);
+			return;
+		}
+		const data = (await Promise.all(variantResults.map(async (matched) => {
+			const context = generator.makeContext(raw, [
+				alias || matched[0],
+				matched[1],
+				matched[2],
+				matched[3]
+			]);
+			if (generator.config.details) context.variants = [...matched[3]];
+			const expanded = await generator.expandShortcut(context.currentSelector, context, 5, true);
+			return expanded ? await generator.stringifyShortcuts(context.variantMatch, context, expanded[0], expanded[1]) : (await generator.parseUtil(context.variantMatch, context))?.flatMap((i) => generator.stringifyUtil(i, context)).filter(notNull);
+		}))).flat().filter(notNull);
+		this.cache.set(cacheKey, data.length ? data : null);
+		return data.length ? data : void 0;
+	}
+	isBlocked(raw, blocklist) {
+		if (!raw) return true;
+		for (const rule of blocklist) {
+			const value = Array.isArray(rule) ? rule[0] : rule;
+			if (typeof value === "function" ? value(raw) : isString(value) ? value === raw : value.test(raw)) return true;
+		}
+		return false;
+	}
+	getBlocked(raw, blocklist) {
+		const rule = blocklist.find((e) => {
+			const value = Array.isArray(e) ? e[0] : e;
+			return typeof value === "function" ? value(raw) : isString(value) ? value === raw : value.test(raw);
+		});
+		return rule ? Array.isArray(rule) ? rule : [rule, void 0] : void 0;
+	}
+	setParentOrder(parent, order) {
+		this.parentOrders.set(parent, order);
+	}
+	getParentOrder(parent) {
+		return this.parentOrders.get(parent);
+	}
+	activateRule(rule) {
+		this.activatedRules.add(rule);
+	}
+	getActivatedRules() {
+		return this.activatedRules;
+	}
+	getCachedTokens(input) {
+		return Array.from(this.cache).filter(([token, result]) => result && token.startsWith(input)).map(([token]) => token);
+	}
+	getCachedAliases(token) {
+		const target = this.cache.get(token);
+		if (!target) return;
+		return Array.from(this.cache).filter(([, utilities]) => utilities?.length === target.length && utilities.every((utility, index) => utility[2] === target[index][2])).map(([alias]) => alias);
+	}
+	block(tokens) {
+		for (const token of tokens) this.blocked.add(token);
+	}
+	invalidate(token) {
+		this.cache.delete(token);
+		this.blocked.delete(token);
+	}
+};
 var UnoGeneratorInternal = class UnoGeneratorInternal {
 	userConfig;
 	defaults;
 	version = version;
 	events = createNanoEvents();
 	config = void 0;
-	cache = /* @__PURE__ */ new Map();
-	blocked = /* @__PURE__ */ new Set();
-	parentOrders = /* @__PURE__ */ new Map();
-	activatedRules = /* @__PURE__ */ new Set();
+	tokenProcessor = new TokenProcessor();
 	constructor(userConfig = {}, defaults = {}) {
 		this.userConfig = userConfig;
 		this.defaults = defaults;
@@ -667,11 +745,8 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 		if (!userConfig) return;
 		if (defaults) this.defaults = defaults;
 		this.userConfig = userConfig;
-		this.blocked.clear();
-		this.parentOrders.clear();
-		this.activatedRules.clear();
-		this.cache.clear();
 		this.config = await resolveConfig(userConfig, this.defaults);
+		this.resetTokenProcessing();
 		this.events.emit("config", this.config);
 	}
 	async applyExtractors(code, id, extracted = /* @__PURE__ */ new Set()) {
@@ -703,39 +778,30 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 		};
 		return context;
 	}
+	/** @internal */
+	resetTokenProcessing() {
+		this.tokenProcessor = new TokenProcessor();
+	}
+	getParentOrder(parent) {
+		return this.tokenProcessor.getParentOrder(parent);
+	}
+	getActivatedRules() {
+		return new Set(this.tokenProcessor.getActivatedRules());
+	}
+	getCachedTokens(input) {
+		return this.tokenProcessor.getCachedTokens(input);
+	}
+	getCachedAliases(token) {
+		return this.tokenProcessor.getCachedAliases(token);
+	}
+	blockTokens(tokens) {
+		this.tokenProcessor.block(tokens);
+	}
+	invalidateToken(token) {
+		this.tokenProcessor.invalidate(token);
+	}
 	async parseToken(raw, alias) {
-		if (this.blocked.has(raw)) return;
-		const cacheKey = `${raw}${alias ? ` ${alias}` : ""}`;
-		if (this.cache.has(cacheKey)) return this.cache.get(cacheKey);
-		const current = this.config.preprocess.reduce((acc, p) => p(acc) ?? acc, raw);
-		if (this.isBlocked(current)) {
-			this.blocked.add(raw);
-			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);
-			return;
-		}
-		const handleVariantResult = async (matched) => {
-			const context = this.makeContext(raw, [
-				alias || matched[0],
-				matched[1],
-				matched[2],
-				matched[3]
-			]);
-			if (this.config.details) context.variants = [...matched[3]];
-			const expanded = await this.expandShortcut(context.currentSelector, context, 5, true);
-			return expanded ? await this.stringifyShortcuts(context.variantMatch, context, expanded[0], expanded[1]) : (await this.parseUtil(context.variantMatch, context))?.flatMap((i) => this.stringifyUtil(i, context)).filter(notNull);
-		};
-		const result = (await Promise.all(variantResults.map((i) => handleVariantResult(i)))).flat().filter((x) => !!x);
-		if (result?.length) {
-			this.cache.set(cacheKey, result);
-			return result;
-		}
-		this.cache.set(cacheKey, null);
+		return this.tokenProcessor.parse(this, raw, alias);
 	}
 	async generate(input, options = {}) {
 		const { id, scope, preflights = true, safelist = true, minify = false, extendedInfo = false } = options;
@@ -757,23 +823,28 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 		let preflightsMap = {};
 		const tokenList = Array.from(tokens);
 		for (let offset = 0; offset < tokenList.length; offset += TOKEN_PARSE_BATCH_SIZE) {
-			const tokenPromises = tokenList.slice(offset, offset + TOKEN_PARSE_BATCH_SIZE).map(async (raw) => {
-				if (matched.has(raw)) return;
-				const payload = await this.parseToken(raw);
-				if (payload == null) return;
-				if (matched instanceof Map) matched.set(raw, {
-					data: payload,
-					count: isCountableSet(tokens) ? tokens.getCount(raw) : -1
-				});
-				else matched.add(raw);
-				for (const item of payload) {
-					const parent = item[3] || "";
-					const layer = item[4]?.layer;
-					if (!sheet.has(parent)) sheet.set(parent, []);
-					sheet.get(parent).push(item);
-					if (layer) layerSet.add(layer);
-				}
-			});
+			const batchSize = Math.min(TOKEN_PARSE_BATCH_SIZE, tokenList.length - offset);
+			const tokenPromises = [];
+			for (let index = 0; index < batchSize; index++) {
+				const raw = tokenList[offset + index];
+				tokenPromises[index] = (async () => {
+					if (matched.has(raw)) return;
+					const payload = await this.parseToken(raw);
+					if (payload == null) return;
+					if (matched instanceof Map) matched.set(raw, {
+						data: payload,
+						count: isCountableSet(tokens) ? tokens.getCount(raw) : -1
+					});
+					else matched.add(raw);
+					for (const item of payload) {
+						const parent = item[3] || "";
+						const layer = item[4]?.layer;
+						if (!sheet.has(parent)) sheet.set(parent, []);
+						sheet.get(parent).push(item);
+						if (layer) layerSet.add(layer);
+					}
+				})();
+			}
 			await Promise.all(tokenPromises);
 		}
 		await (async () => {
@@ -802,8 +873,7 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 		};
 		const getLayer = (layer = LAYER_DEFAULT) => {
 			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;
+			let css = Array.from(sheet).sort((a, b) => (this.tokenProcessor.getParentOrder(a[0]) ?? 0) - (this.tokenProcessor.getParentOrder(b[0]) ?? 0) || a[0]?.localeCompare(b[0] || "") || 0).map(([parent, items]) => {
 				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]) => {
@@ -814,14 +884,28 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 					];
 				});
 				if (!sorted.length) return void 0;
-				const ruleLines = sorted.reverse().map(([selectorSortPair, body, noMerge], idx) => {
-					if (!noMerge && this.config.mergeSelectors) for (let i = idx + 1; i < size; i++) {
-						const current = sorted[i];
-						if (current && !current[2] && (selectorSortPair && current[0] || selectorSortPair == null && current[0] == null) && current[1] === body) {
-							if (selectorSortPair && current[0]) current[0].push(...selectorSortPair);
-							return null;
+				sorted.reverse();
+				const mergedRules = /* @__PURE__ */ new Set();
+				if (this.config.mergeSelectors) {
+					const mergeIndex = /* @__PURE__ */ new Map();
+					for (let i = sorted.length - 1; i >= 0; i--) {
+						const rule = sorted[i];
+						const [selectorSortPair, body, noMerge] = rule;
+						if (noMerge) continue;
+						const selectorIndex = selectorSortPair ? 1 : 0;
+						const candidates = mergeIndex.get(body) || [void 0, void 0];
+						const candidate = candidates[selectorIndex];
+						if (candidate) {
+							if (selectorSortPair && candidate[0]) candidate[0].push(...selectorSortPair);
+							mergedRules.add(rule);
+						} else {
+							candidates[selectorIndex] = rule;
+							mergeIndex.set(body, candidates);
 						}
 					}
+				}
+				const ruleLines = sorted.map(([selectorSortPair, body], idx) => {
+					if (mergedRules.has(sorted[idx])) return null;
 					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);
@@ -944,7 +1028,7 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 			entries: parsed[2]
 		});
 		const { parent, parentOrder } = variantContextResult;
-		if (parent != null && parentOrder != null) this.parentOrders.set(parent, parentOrder);
+		if (parent != null && parentOrder != null) this.tokenProcessor.setParentOrder(parent, parentOrder);
 		const obj = {
 			selector: [
 				variantContextResult.prefix,
@@ -1034,7 +1118,7 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 		const entries = normalizeCSSValues(result).filter((i) => i.length);
 		if (entries.length) {
 			if (this.config.details) context.rules.push(rule);
-			context.generator.activatedRules.add(rule);
+			this.tokenProcessor.activateRule(rule);
 			const meta = rule[2];
 			return entries.map((css) => {
 				if (isString(css)) return [
@@ -1076,9 +1160,7 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 					case symbols.noScope:
 						setMeta({ noScope: entry[1] });
 						break;
-					case symbols.body:
-						entry[0] = VirtualKey;
-						break;
+					case symbols.body: entry[0] = VirtualKey;
 				}
 				return [
 					meta.__index,
@@ -1249,14 +1331,10 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 		}).flat(2).filter(Boolean)));
 	}
 	isBlocked(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));
+		return this.tokenProcessor.isBlocked(raw, this.config.blocklist);
 	}
 	getBlocked(raw) {
-		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;
+		return this.tokenProcessor.getBlocked(raw, this.config.blocklist);
 	}
 };
 var UnoGenerator = class extends UnoGeneratorInternal {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/core",
   "type": "module",
-  "version": "66.7.5",
+  "version": "66.8.0-beta.1",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -33,11 +33,11 @@
     "dist"
   ],
   "devDependencies": {
-    "magic-string": "^0.30.21",
+    "magic-string": "^1.2.0",
     "unconfig": "^7.5.0"
   },
   "scripts": {
-    "bench": "pnpm --dir ../.. exec vitest bench packages-engine/core/test/generate.bench.ts --run --project unit",
+    "bench": "pnpm --dir ../.. exec vitest bench packages-engine/core/test --run --project unit",
     "build": "tsdown",
     "dev": "tsdown --watch"
   }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021-PRESENT Anthony Fu <https://github.com/antfu>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.