@unocss/core 66.7.2-beta.1 → 66.7.3

package/dist/index.d.mts

@@ -190,7 +190,7 @@ declare class UnoGeneratorInternal<Theme extends object = object> {
   parseUtil(input: string | VariantMatchedResult<Theme>, context: RuleContext<Theme>, internal?: boolean, shortcutPrefix?: string | string[] | undefined): Promise<(ParsedUtil | RawUtil)[] | undefined>;
   private resolveCSSResult;
   stringifyUtil(parsed?: ParsedUtil | RawUtil, context?: RuleContext<Theme>): StringifiedUtil<Theme>[] | undefined;
-  expandShortcut(input: string, context: RuleContext<Theme>, depth?: number): Promise<[(string | ShortcutInlineValue)[], RuleMeta | undefined] | undefined>;
+  expandShortcut(input: string, context: RuleContext<Theme>, depth?: number, skipVariantMatch?: boolean): Promise<[(string | ShortcutInlineValue)[], RuleMeta | undefined] | undefined>;
   stringifyShortcuts(parent: VariantMatchedResult<Theme>, context: RuleContext<Theme>, expanded: (string | ShortcutInlineValue)[], meta?: RuleMeta): Promise<StringifiedUtil<Theme>[] | undefined>;
   isBlocked(raw: string): boolean;
   getBlocked(raw: string): [BlocklistValue, BlocklistMeta | undefined] | undefined;
@@ -917,6 +917,12 @@ interface SourceCodeTransformer {
    * Custom id filter, if not provided, the extraction filter will be applied
    */
   idFilter?: (id: string) => boolean;
+  /**
+   * Cheap source filter evaluated before creating a MagicString instance.
+   *
+   * It must return true for every source the transformer may modify.
+   */
+  codeFilter?: (code: string, id: string) => boolean;
   /**
    * The transform function
    */
@@ -1014,6 +1020,14 @@ interface ResolvedConfig<Theme extends object = object> extends Omit<RequiredByK
   rulesSize: number;
   rules: readonly Rule<Theme>[];
   rulesDynamic: readonly DynamicRule<Theme>[];
+  /**
+   * Prefilter for dynamic rules.
+   * @internal
+   */
+  rulesDynamicFilter?: {
+    fallback: readonly DynamicRule<Theme>[];
+    filters: readonly RegExp[];
+  };
   rulesStaticMap: Record<string, StaticRule | undefined>;
   autocomplete: {
     templates: (AutoCompleteFunction | AutoCompleteTemplate)[];

package/dist/index.mjs

@@ -423,6 +423,31 @@ function resolveShortcuts(shortcuts) {
 		return Object.entries(s);
 	});
 }
+function createDynamicRuleFilters(rules) {
+	const filterSources = /* @__PURE__ */ new Map();
+	const fallback = [];
+	for (const rule of rules) {
+		const [matcher, , meta] = rule;
+		if (meta?.prefix || matcher.global || matcher.sticky || /\\(?:[1-9]|k<)|\(\?</.test(matcher.source)) {
+			fallback.push(rule);
+			continue;
+		}
+		const sources = filterSources.get(matcher.flags) ?? [];
+		sources.push(`(?:${matcher.source})`);
+		filterSources.set(matcher.flags, sources);
+	}
+	try {
+		return {
+			fallback,
+			filters: Array.from(filterSources, ([flags, sources]) => new RegExp(sources.join("|"), flags))
+		};
+	} catch {
+		return {
+			fallback: [...rules],
+			filters: []
+		};
+	}
+}
 const __RESOLVED = "_uno_resolved";
 /**
 * Resolve a single preset, nested presets are ignored
@@ -553,6 +578,7 @@ async function resolveConfig(userConfig = {}, defaults = {}) {
 	const extendThemes = getMerged("extendTheme");
 	for (const extendTheme of extendThemes) resolved.theme = extendTheme(resolved.theme, resolved) || resolved.theme;
 	for (const p of sources) p?.configResolved?.(resolved);
+	resolved.rulesDynamicFilter = createDynamicRuleFilters(resolved.rulesDynamic);
 	return resolved;
 }
 /**
@@ -602,7 +628,7 @@ function definePreset(preset) {
 }
 //#endregion
 //#region package.json
-var version = "66.7.2-beta.1";
+var version = "66.7.3";
 //#endregion
 //#region src/generator.ts
 const symbols = {
@@ -616,6 +642,7 @@ const symbols = {
 	sort: "$$symbol-sort",
 	body: "$$symbol-body"
 };
+const TOKEN_PARSE_BATCH_SIZE = 4096;
 var UnoGeneratorInternal = class UnoGeneratorInternal {
 	userConfig;
 	defaults;
@@ -700,7 +727,7 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 				matched[3]
 			]);
 			if (this.config.details) context.variants = [...matched[3]];
-			const expanded = await this.expandShortcut(context.currentSelector, context);
+			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);
@@ -724,28 +751,31 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 			});
 		}
 		const nl = minify ? "" : "\n";
-		const layerSet = new Set([LAYER_DEFAULT]);
+		const layerSet = /* @__PURE__ */ new Set([LAYER_DEFAULT]);
 		const matched = extendedInfo ? /* @__PURE__ */ new Map() : /* @__PURE__ */ new Set();
 		const sheet = /* @__PURE__ */ new Map();
 		let preflightsMap = {};
-		const tokenPromises = Array.from(tokens).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
+		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);
+				}
 			});
-			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 Promise.all(tokenPromises);
+		}
 		await (async () => {
 			if (!preflights) return;
 			const preflightContext = {
@@ -964,7 +994,9 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 			if (staticMatch) {
 				if (staticMatch[1] && (internal || !staticMatch[2]?.internal)) return this.resolveCSSResult(raw, staticMatch[1], staticMatch, scopeContext);
 			}
-			for (const rule of this.config.rulesDynamic) {
+			const dynamicRuleFilter = this.config.rulesDynamicFilter;
+			const dynamicRules = dynamicRuleFilter?.filters.length && !dynamicRuleFilter.filters.some((filter) => filter.test(processed)) ? dynamicRuleFilter.fallback : this.config.rulesDynamic;
+			for (const rule of dynamicRules) {
 				const [matcher, handler, meta] = rule;
 				if (meta?.internal && !internal) continue;
 				let unprefixed = processed;
@@ -1093,7 +1125,7 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 		}
 		return result;
 	}
-	async expandShortcut(input, context, depth = 5) {
+	async expandShortcut(input, context, depth = 5, skipVariantMatch = false) {
 		if (depth === 0) return;
 		const recordShortcut = this.config.details ? (s) => {
 			context.shortcuts = context.shortcuts ?? [];
@@ -1134,7 +1166,7 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 				value: i
 			}));
 		}
-		if (!result) {
+		if (!result && !skipVariantMatch) {
 			const matched = isString(input) ? await this.matchVariants(input) : [input];
 			for (const match of matched) {
 				const [raw, inputWithoutVariant, handles] = match;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/core",
   "type": "module",
-  "version": "66.7.2-beta.1",
+  "version": "66.7.3",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -37,6 +37,7 @@
     "unconfig": "^7.5.0"
   },
   "scripts": {
+    "bench": "pnpm --dir ../.. exec vitest bench packages-engine/core/test/generate.bench.ts --run --project unit",
     "build": "tsdown",
     "dev": "tsdown --watch"
   }