@unocss/core 66.8.1 → 66.9.0

package/dist/index.d.mts

@@ -702,6 +702,10 @@ interface ConfigBase<Theme extends object = object> {
    * Custom transformers to the source code.
    */
   transformers?: SourceCodeTransformer[];
+  /**
+   * Processors to transform generated CSS layers before they are exposed.
+   */
+  processors?: CSSProcessor<Theme>[];
 }
 interface OutputCssLayersOptions {
   /**
@@ -942,6 +946,27 @@ interface SourceCodeTransformer {
     highlightAnnotations?: HighlightAnnotation[];
   } | void>;
 }
+interface CSSProcessorContext<Theme extends object = object> {
+  /**
+   * The current CSS layer being processed.
+   */
+  layer: string;
+  /**
+   * The theme object
+   */
+  theme: Theme;
+  /**
+   * Environment mode
+   *
+   * @default 'build'
+   */
+  envMode: 'dev' | 'build';
+}
+interface CSSProcessor<Theme extends object = object> {
+  name: string;
+  order?: number;
+  process: (css: string, context: CSSProcessorContext<Theme>) => Awaitable<string>;
+}
 interface ContentOptions {
   /**
    * Glob patterns to extract from the file system, in addition to other content sources.
@@ -1172,4 +1197,4 @@ declare const defaultSplitRE: RegExp;
 declare const splitWithVariantGroupRE: RegExp;
 declare const extractorSplit: Extractor;
 //#endregion
-export { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BaseContext, BetterMap, BlocklistMeta, BlocklistRule, BlocklistValue, CSSEntries, CSSEntriesInput, CSSEntry, CSSObject, CSSObjectInput, CSSValue, CSSValueInput, CSSValues, CliEntryItem, CliOptions, ConfigBase, ContentOptions, ControlSymbols, ControlSymbolsEntry, ControlSymbolsValue, CountableSet, DEFAULT_LAYERS, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Emitter, ExtendedTokenInfo, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, HighlightAnnotation, LAYER_DEFAULT, LAYER_IMPORTS, LAYER_PREFLIGHTS, LAYER_SHORTCUTS, ObjectToEntry, OutputCssLayersOptions, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetFactory, PresetFactoryAwaitable, PresetOptions, PresetOrFactory, PresetOrFactoryAwaitable, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, SafeListContext, Shift, Shortcut, ShortcutInlineValue, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, ToArray, TwoKeyMap, UnoGenerator, UnocssPluginContext, Unsubscribe, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, 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 { ArgumentType, Arrayable, AutoCompleteExtractor, AutoCompleteExtractorContext, AutoCompleteExtractorResult, AutoCompleteFunction, AutoCompleteTemplate, Awaitable, BaseContext, BetterMap, BlocklistMeta, BlocklistRule, BlocklistValue, CSSEntries, CSSEntriesInput, CSSEntry, CSSObject, CSSObjectInput, CSSProcessor, CSSProcessorContext, CSSValue, CSSValueInput, CSSValues, CliEntryItem, CliOptions, ConfigBase, ContentOptions, ControlSymbols, ControlSymbolsEntry, ControlSymbolsValue, CountableSet, DEFAULT_LAYERS, DeepPartial, DynamicMatcher, DynamicRule, DynamicShortcut, DynamicShortcutMatcher, Emitter, ExtendedTokenInfo, Extractor, ExtractorContext, FilterPattern, FlatObjectTuple, GenerateOptions, GenerateResult, GeneratorOptions, HighlightAnnotation, LAYER_DEFAULT, LAYER_IMPORTS, LAYER_PREFLIGHTS, LAYER_SHORTCUTS, ObjectToEntry, OutputCssLayersOptions, ParsedUtil, PartialByKeys, PluginOptions, Postprocessor, Preflight, PreflightContext, PreparedRule, Preprocessor, Preset, PresetFactory, PresetFactoryAwaitable, PresetOptions, PresetOrFactory, PresetOrFactoryAwaitable, RawUtil, Replacement, RequiredByKey, ResolvedConfig, RestArgs, Rule, RuleContext, RuleMeta, SafeListContext, Shift, Shortcut, ShortcutInlineValue, ShortcutValue, SourceCodeTransformer, SourceCodeTransformerEnforce, SourceMap, StaticRule, StaticShortcut, StaticShortcutMap, StringifiedUtil, SuggestResult, ThemeExtender, ToArray, TwoKeyMap, UnoGenerator, UnocssPluginContext, Unsubscribe, UserConfig, UserConfigDefaults, UserOnlyOptions, UserShortcuts, UtilObject, Variant, VariantContext, VariantFunction, VariantHandler, VariantHandlerContext, VariantMatchedResult, VariantObject, 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/dist/index.mjs

@@ -320,7 +320,7 @@ function isStaticShortcut(sc) {
 const regexCache = {};
 function makeRegexClassGroup(separators = ["-", ":"]) {
 	const key = separators.map((s) => escapeRegExp(s)).join("|");
-	if (!regexCache[key]) regexCache[key] = new RegExp(`((?:[!@*<~\\w+:_-]|\\[&?>?:?\\S*\\])+?)(${key})\\(((?:[~!<>\\w\\s:/\\\\,%#.$?-]|\\[[^\\]]*?\\])+?)\\)(?!\\s*?=>)`, "gm");
+	if (!regexCache[key]) regexCache[key] = new RegExp(`((?:[!@*<~\\w+:_-]|\\[&?>?:?[^\\s\\]]*\\])+?)(${key})\\(((?:[~!<>@*\\w\\s:/\\\\,%#.$?-]|\\[[^\\]]*?\\])+?)\\)(?!\\s*?=>)`, "gm");
 	regexCache[key].lastIndex = 0;
 	return regexCache[key];
 }
@@ -361,10 +361,11 @@ function parseVariantGroup(str, separators = ["-", ":"], depth = 5) {
 		depth -= 1;
 	} while (hasChanged && depth);
 	let expanded;
+	const groupsInOrder = [...groupsByOffset].sort(([a], [b]) => a - b);
 	if (typeof str === "string") {
 		expanded = "";
 		let prevOffset = 0;
-		for (const [offset, group] of groupsByOffset) {
+		for (const [offset, group] of groupsInOrder) {
 			expanded += str.slice(prevOffset, offset);
 			expanded += group.items.map((item) => item.className).join(" ");
 			prevOffset = offset + group.length;
@@ -372,7 +373,7 @@ function parseVariantGroup(str, separators = ["-", ":"], depth = 5) {
 		expanded += str.slice(prevOffset);
 	} else {
 		expanded = str;
-		for (const [offset, group] of groupsByOffset) expanded.overwrite(offset, offset + group.length, group.items.map((item) => item.className).join(" "));
+		for (const [offset, group] of groupsInOrder) expanded.overwrite(offset, offset + group.length, group.items.map((item) => item.className).join(" "));
 	}
 	return {
 		prefixes: Array.from(prefixes),
@@ -576,7 +577,8 @@ async function resolveConfig(userConfig = {}, defaults = {}) {
 		separators,
 		details: config.details ?? config.envMode === "dev",
 		content,
-		transformers: uniqueBy(getMerged("transformers"), (a, b) => a.name === b.name)
+		transformers: uniqueBy(getMerged("transformers"), (a, b) => a.name === b.name),
+		processors: uniqueBy(getMerged("processors"), (a, b) => a.name === b.name)
 	};
 	const extendThemes = getMerged("extendTheme");
 	for (const extendTheme of extendThemes) resolved.theme = extendTheme(resolved.theme, resolved) || resolved.theme;
@@ -631,7 +633,7 @@ function definePreset(preset) {
 }
 //#endregion
 //#region package.json
-var version = "66.8.1";
+var version = "66.9.0";
 //#endregion
 //#region src/generator.ts
 const symbols = {
@@ -864,15 +866,16 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 		})();
 		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 rawLayerCache = {};
+		const processedLayerCache = {};
 		const outputCssLayers = this.config.outputToCssLayers;
 		const getLayerAlias = (layer) => {
 			let alias = layer;
 			if (typeof outputCssLayers === "object") alias = outputCssLayers.cssLayerName?.(layer);
 			return alias === null ? null : alias ?? layer;
 		};
-		const getLayer = (layer = LAYER_DEFAULT) => {
-			if (layerCache[layer]) return layerCache[layer];
+		const getRawLayer = (layer = LAYER_DEFAULT) => {
+			if (rawLayerCache[layer] != null) return rawLayerCache[layer];
 			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;
@@ -915,17 +918,32 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 				return `${parents.join("{")}{${nl}${rules}${nl}${"}".repeat(parents.length)}`;
 			}).filter(Boolean).join(nl);
 			if (preflights) css = [preflightsMap[layer], css].filter(Boolean).join(nl);
+			if (!css) return rawLayerCache[layer] = "";
 			let alias;
-			if (outputCssLayers && css) {
+			if (outputCssLayers) {
 				alias = getLayerAlias(layer);
 				if (alias !== null) css = `@layer ${alias}{${nl}${css}${nl}}`;
 			}
-			const layerMark = minify ? "" : `/* layer: ${layer}${alias && alias !== layer ? `, alias: ${alias}` : ""} */${nl}`;
-			return layerCache[layer] = css ? layerMark + css : "";
+			css = (minify ? "" : `/* layer: ${layer}${alias && alias !== layer ? `, alias: ${alias}` : ""} */${nl}`) + css;
+			return rawLayerCache[layer] = css;
+		};
+		const processors = this.config.processors?.slice().sort((a, b) => (a.order || 0) - (b.order || 0)) ?? [];
+		const processLayer = async (css, layer) => {
+			let processed = css;
+			const context = {
+				layer,
+				theme: this.config.theme,
+				envMode: this.config.envMode || "build"
+			};
+			for (const processor of processors) processed = await processor.process(processed, context);
+			return processed;
+		};
+		const getLayer = (layer = LAYER_DEFAULT) => {
+			return processedLayerCache[layer] ?? getRawLayer(layer);
 		};
 		const getLayers = (includes = layers, excludes) => {
 			const layers = includes.filter((i) => !excludes?.includes(i));
-			const css = layers.map(getLayer).filter(Boolean);
+			const css = layers.map((layer) => getLayer(layer)).filter(Boolean);
 			if (outputCssLayers) {
 				let layerNames = layers;
 				if (typeof outputCssLayers === "object" && outputCssLayers.allLayers) layerNames = sortLayers(Object.keys(this.config.layers));
@@ -934,10 +952,16 @@ var UnoGeneratorInternal = class UnoGeneratorInternal {
 			return css.join(nl);
 		};
 		const setLayer = async (layer, callback) => {
-			const content = await callback(getLayer(layer));
-			layerCache[layer] = content;
-			return content;
+			const raw = await callback(getRawLayer(layer));
+			const processed = await processLayer(raw, layer);
+			rawLayerCache[layer] = raw;
+			processedLayerCache[layer] = processed;
+			return processed;
 		};
+		await Promise.all(layers.map(async (layer) => {
+			const raw = getRawLayer(layer);
+			processedLayerCache[layer] = raw ? await processLayer(raw, layer) : raw;
+		}));
 		return {
 			get css() {
 				return getLayers();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/core",
   "type": "module",
-  "version": "66.8.1",
+  "version": "66.9.0",
   "description": "The instant on-demand Atomic CSS engine.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -33,7 +33,7 @@
     "dist"
   ],
   "devDependencies": {
-    "magic-string": "^1.2.0",
+    "magic-string": "^1.2.2",
     "unconfig": "^7.5.0"
   },
   "scripts": {