weapp-tailwindcss 5.1.0 → 5.1.1

package/dist/{hmr-timing-BXMLsF4b.mjs → hmr-timing-B0KuWDjV.mjs}

@@ -1,7 +1,7 @@
-import { $ as isFileMatchedByTailwindSourceEntries, A as removeTailwindSourceDirectives, B as stripGeneratorPlaceholderMarkers, C as hasTailwindRootDirectives, D as normalizeTailwindSourceDirectives, F as hasTailwindGeneratedCss, H as stripTailwindBanners, I as hasTailwindGeneratedCssMarkers, L as splitGeneratorPlaceholderCssBySourceOrder, M as GENERATOR_PLACEHOLDER_MARKER_RE, N as VITE_MARKER_RE, P as createCssAppend, R as splitTailwindGeneratedCssByBanner, T as hasTailwindSourceDirectives, U as normalizeConfigDirective, V as stripTailwindBanner, W as prependConfigDirective, Y as FULL_SOURCE_SCAN_EXTENSION_RE, at as toPosixPath$1, ct as omitUndefined, i as resolveTailwindV4SourceOptionsFromRuntime, it as resolveTailwindV4CssSourceBase, j as resolveCssEntrySource, k as parseImportRequest, n as resolveTailwindV4SourceFromRuntime, rt as resolveSourceScanPath, st as filterUnsupportedMiniProgramTailwindV4Candidates, t as resolveTailwindV4Source$1, ut as loadTailwindV4DesignSystem, x as hasTailwindApplyDirective, z as splitTailwindV4GeneratedCssBySourceOrder } from "./v4-engine-CF9zt4Cw.mjs";
-import { a as resolveGeneratorRuntimeBranch, i as normalizeWeappTailwindcssGeneratorOptions, s as shouldUseMiniProgramCssBranch, t as createWeappTailwindcssGenerator } from "./generator-Dc4qaPmT.mjs";
-import { S as md5Hash, h as traverse, m as babelParse, n as resolveStyleOptionsFromContext, p as replaceWxml, x as createDebug } from "./context-Mbzkek1q.mjs";
-import { h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, r as isUniAppXEnabled } from "./tailwindcss-wyUHrfil.mjs";
+import { A as resolveCssEntrySource, B as stripTailwindBanner, C as hasTailwindRootDirectives, E as normalizeTailwindSourceDirectives, F as hasTailwindGeneratedCssMarkers, H as normalizeConfigDirective, I as splitGeneratorPlaceholderCssBySourceOrder, J as FULL_SOURCE_SCAN_EXTENSION_RE, L as splitTailwindGeneratedCssByBanner, M as VITE_MARKER_RE, N as createCssAppend, O as parseImportRequest, P as hasTailwindGeneratedCss, Q as isFileMatchedByTailwindSourceEntries, R as splitTailwindV4GeneratedCssBySourceOrder, U as prependConfigDirective, V as stripTailwindBanners, i as resolveTailwindV4SourceOptionsFromRuntime, it as toPosixPath$1, j as GENERATOR_PLACEHOLDER_MARKER_RE, k as removeTailwindSourceDirectives, lt as loadTailwindV4DesignSystem, n as resolveTailwindV4SourceFromRuntime, nt as resolveSourceScanPath, ot as filterUnsupportedMiniProgramTailwindV4Candidates, rt as resolveTailwindV4CssSourceBase, st as omitUndefined, t as resolveTailwindV4Source$1, w as hasTailwindSourceDirectives, x as hasTailwindApplyDirective, z as stripGeneratorPlaceholderMarkers } from "./v4-engine-C3qSwQ-e.mjs";
+import { a as resolveGeneratorRuntimeBranch, i as normalizeWeappTailwindcssGeneratorOptions, s as shouldUseMiniProgramCssBranch, t as createWeappTailwindcssGenerator } from "./generator-CjzBK7h-.mjs";
+import { C as md5Hash, S as createDebug, g as traverse, h as babelParse, m as replaceWxml, r as resolveStyleOptionsFromContext } from "./context-DlpKD7aN.mjs";
+import { h as resolveTailwindV4EntriesFromCss, l as getRuntimeClassSetSignature, r as isUniAppXEnabled } from "./tailwindcss-B5mRo0-M.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
@@ -128,6 +128,30 @@ function annotateCssSourceTrace(css, options) {
 	}
 }
 //#endregion
+//#region src/bundlers/shared/generator-css/class-selectors.ts
+function normalizeCssClassSelector(value) {
+	return value.replace(/\\([^\da-f\r\n])/gi, "$1").replace(/\\([\da-f]{1,6})\s?/gi, (_, code) => String.fromCodePoint(Number.parseInt(code, 16)));
+}
+function collectRawSourceClassSelectors(rawSource) {
+	const selectors = /* @__PURE__ */ new Set();
+	try {
+		postcss.parse(rawSource).walkRules((rule) => {
+			for (const selector of rule.selectors ?? [rule.selector]) for (const match of selector.matchAll(/\.((?:\\.|[_a-z\u00A0-\uFFFF-])(?:\\.|[\w\u00A0-\uFFFF-])*)/gi)) selectors.add(normalizeCssClassSelector(match[1]));
+		});
+	} catch {}
+	return selectors;
+}
+function collectGeneratedRawSourceCandidates(candidates, rawSource, escapeMap) {
+	const selectors = collectRawSourceClassSelectors(rawSource);
+	if (selectors.size === 0) return /* @__PURE__ */ new Set();
+	const matched = /* @__PURE__ */ new Set();
+	for (const candidate of candidates) {
+		const escaped = normalizeCssClassSelector(replaceWxml(candidate, { escapeMap }));
+		if (selectors.has(candidate) || selectors.has(escaped)) matched.add(candidate);
+	}
+	return matched;
+}
+//#endregion
 //#region src/bundlers/shared/generator-css/generation-helpers.ts
 function hasMiniProgramTailwindV4PreflightReset(css) {
 	return /(?:^|[},])\s*view\s*,\s*text\s*,\s*::after\s*,\s*::before\s*\{[^}]*\bborder\s*:\s*0\s+solid\b/.test(css);
@@ -210,7 +234,7 @@ function shouldUseGeneratorForCurrentCss(_majorVersion, cssHandlerOptions, optio
 	const hasApplyDirectives = hasTailwindApplyDirective(options.rawSource);
 	const sourceCss = cssHandlerOptions.sourceOptions?.sourceCss;
 	const hasSourceCssDirectives = typeof sourceCss === "string" && (hasTailwindRootDirectives(sourceCss, { importFallback: true }) || hasTailwindSourceDirectives(sourceCss, { importFallback: true }) || hasTailwindApplyDirective(sourceCss));
-	return options.forceGenerator === true || options.hasGeneratedCss || options.hasGeneratedMarkers || options.hasSourceDirectives || hasApplyDirectives || hasSourceCssDirectives;
+	return options.forceGenerator === true || options.hasGeneratedCss || options.hasGeneratedMarkers || options.hasSourceDirectives || hasApplyDirectives || hasSourceCssDirectives || cssHandlerOptions.isMainChunk && (options.configuredCssSourceCount ?? 0) > 0 || cssHandlerOptions.isMainChunk && options.rawSource.includes("weapp-tailwindcss") || options.target === "web" && cssHandlerOptions.isMainChunk && (options.runtimeCandidateCount ?? 0) > 0;
 }
 function createRuntimeWithCurrentCssCandidates(runtime, currentCssCandidates, isolateCurrentCssCandidates) {
 	return isolateCurrentCssCandidates ? new Set(currentCssCandidates) : currentCssCandidates.length > 0 ? new Set([...runtime, ...currentCssCandidates]) : runtime;
@@ -620,7 +644,7 @@ function collectLocalStyleImportFiles(source, base) {
 		postcss.parse(styleSource).walkAtRules("import", (rule) => {
 			const request = parseImportRequest(rule.params);
 			if (!isLocalStyleImportRequest(request)) return;
-			const file = resolveLocalStyleImportFile(request, base);
+			const file = request ? resolveLocalStyleImportFile(request, base) : void 0;
 			if (file) files.push(file);
 		});
 	} catch {}
@@ -1881,7 +1905,7 @@ function hasConfiguredContainerCompatSource(source) {
 	if (cssEntrySource?.config) try {
 		if (/\bcontainer\b/.test(readFileSync(cssEntrySource.config, "utf8"))) return true;
 	} catch {}
-	if ("config" in source && source.config) try {
+	if ("config" in source && typeof source.config === "string") try {
 		if (/\bcontainer\b/.test(readFileSync(source.config, "utf8"))) return true;
 	} catch {}
 	return false;
@@ -2257,30 +2281,28 @@ function pushConcurrentTaskFactories(queue, factories, limit) {
 //#endregion
 //#region src/bundlers/shared/generator-css/validate.ts
 async function validateCandidatesByGenerator(options) {
-	const { candidates, cssHandlerOptions, debug, file, opts, rawSource, runtimeState, skipGenerateFallback } = options;
+	const { candidates, cssHandlerOptions, debug, file, opts, rawSource, runtimeState } = options;
 	const majorVersion = runtimeState.tailwindRuntime.majorVersion;
 	if (majorVersion !== 4 || candidates.size === 0) return /* @__PURE__ */ new Set();
-	const generatorOptions = {
-		...normalizeWeappTailwindcssGeneratorOptions(opts.generator),
-		bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues
-	};
-	const sources = await resolveGeneratorSources(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions, {
-		cssEntries: opts.cssEntries,
-		runtime: candidates
-	});
-	const classSets = await Promise.all(sources.map(async (source) => {
-		const generator = createWeappTailwindcssGenerator(source);
-		if (generatorOptions.bareArbitraryValues === void 0 || generatorOptions.bareArbitraryValues === false) {
-			if (typeof generator.validateCandidates === "function") return generator.validateCandidates(candidates);
-		}
-		if (skipGenerateFallback) return /* @__PURE__ */ new Set();
-		return (await generator.generate({
-			bareArbitraryValues: generatorOptions.bareArbitraryValues,
-			candidates,
-			target: "web"
-		})).classSet;
-	}));
-	const classSet = new Set(classSets.flatMap((item) => [...item]));
+	const classSet = /* @__PURE__ */ new Set();
+	try {
+		const sources = await resolveGeneratorSources(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, {
+			...normalizeWeappTailwindcssGeneratorOptions(opts.generator),
+			bareArbitraryValues: opts.arbitraryValues?.bareArbitraryValues
+		}, {
+			cssEntries: opts.cssEntries,
+			runtime: candidates
+		});
+		const classSets = await Promise.all(sources.map(async (source) => {
+			const generator = createWeappTailwindcssGenerator(source);
+			if (typeof generator.validateCandidates !== "function") return /* @__PURE__ */ new Set();
+			return generator.validateCandidates(candidates);
+		}));
+		for (const candidate of classSets.flatMap((item) => [...item])) classSet.add(candidate);
+	} catch {}
+	const rawSourceCandidates = collectGeneratedRawSourceCandidates(candidates, rawSource, opts.escapeMap);
+	for (const candidate of rawSourceCandidates) classSet.add(candidate);
+	for (const generatedCss of options.generatedCssSources ?? []) for (const candidate of collectGeneratedRawSourceCandidates(candidates, generatedCss, opts.escapeMap)) classSet.add(candidate);
 	debug("tailwind generator validated candidates: %s candidates=%d classSet=%d", file, candidates.size, classSet.size);
 	return classSet;
 }
@@ -2318,6 +2340,11 @@ function isCssAlreadyRepresentedByMarkers(css, source) {
 	for (const marker of sourceMarkers) if (!cssMarkers.has(marker)) return false;
 	return true;
 }
+function mergeGeneratedCssClassSet(classSet, candidates, css, escapeMap) {
+	const merged = new Set(classSet);
+	for (const candidate of collectGeneratedRawSourceCandidates(candidates, css, escapeMap)) merged.add(candidate);
+	return merged;
+}
 async function generateCssByGenerator(options) {
 	const { opts, runtimeState, runtime, rawSource, file, cssHandlerOptions, cssUserHandlerOptions, getSourceCandidatesForEntries, styleHandler, userRawSource, userRawSourceProcessed, debug } = options;
 	const generatorOptions = {
@@ -2344,8 +2371,10 @@ async function generateCssByGenerator(options) {
 	const rawUserSource = userRawSource === void 0 ? generatorRawSource : userRawSourceProcessed ? userRawSource : stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(normalizeTailwindSourceDirectives(userRawSource, { importFallback: generatorOptions.importFallback })));
 	const userSource = splitLocalCssImports(rawUserSource)?.source ?? rawUserSource;
 	const userCssRawSource = removeTailwindV4GeneratorAtRules(userSource);
-	const userCssOrderSource = GENERATOR_PLACEHOLDER_MARKER_RE.test(userSource) ? userSource : userCssRawSource;
-	const hasDistinctUserRawSource = typeof userRawSource === "string" && normalizeCssSourceForCompare(userCssRawSource) !== normalizeCssSourceForCompare(generatorRawSource);
+	const generatedUserCssOrderSource = hasTailwindGeneratedCss(userSource) ? splitTailwindV4GeneratedCssBySourceOrder(userSource, generatorRawSource) : void 0;
+	const generatedUserCssRawSource = generatedUserCssOrderSource ? createCssAppend(generatedUserCssOrderSource.before, generatedUserCssOrderSource.after) : hasTailwindGeneratedCss(userSource) ? "" : userCssRawSource;
+	const userCssOrderSource = GENERATOR_PLACEHOLDER_MARKER_RE.test(userSource) ? userSource : hasTailwindGeneratedCss(userSource) ? userSource : generatedUserCssRawSource;
+	const hasDistinctUserRawSource = typeof userRawSource === "string" && normalizeCssSourceForCompare(generatedUserCssRawSource) !== normalizeCssSourceForCompare(generatorRawSource);
 	const cleanedLocalImportWrapper = cleanLocalCssImportWrapperTailwindDirectives(effectiveRawSource);
 	if (cleanedLocalImportWrapper !== void 0) return {
 		css: shouldUseMiniProgramCssBranch(generatorBranch) ? removeUnsupportedMiniProgramAtRules(cleanedLocalImportWrapper) : cleanedLocalImportWrapper,
@@ -2367,7 +2396,10 @@ async function generateCssByGenerator(options) {
 		hasGeneratedCss,
 		hasGeneratedMarkers,
 		hasSourceDirectives,
-		rawSource: generatorRawSource
+		rawSource: generatorRawSource,
+		runtimeCandidateCount: runtime.size,
+		target: generatorOptions.target,
+		configuredCssSourceCount: options.cssSources?.length
 	})) return;
 	try {
 		await runtimeState.readyPromise;
@@ -2423,12 +2455,13 @@ async function generateCssByGenerator(options) {
 		debug("tailwind generator result: %s rawBytes=%d cssBytes=%d candidates=%d", file, generated.rawCss.length, generated.css.length, generated.classSet.size);
 		if ((generated.target !== "weapp" || !hasUserCssLayerBlocks(generatorRawSource)) && typeof options.previousCss === "string" && typeof generated.incrementalCss === "string") {
 			const incrementalCss = stripTailwindBanner(generated.incrementalCss);
+			const finalCss = restoreLocalCssImports(incrementalCss.trim().length > 0 ? createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, {
+				injectPreflight: false,
+				styleOptions: generatorStyleOptions
+			})) : options.previousCss, localImports);
 			return {
-				css: restoreLocalCssImports(incrementalCss.trim().length > 0 ? createCssAppend(options.previousCss, finalizeMiniProgramGeneratorCss(incrementalCss, generated.target, majorVersion, opts.cssPreflight, {
-					injectPreflight: false,
-					styleOptions: generatorStyleOptions
-				})) : options.previousCss, localImports),
-				classSet: generated.classSet,
+				css: finalCss,
+				classSet: mergeGeneratedCssClassSet(generated.classSet, runtimeWithCurrentCss, finalCss, opts.escapeMap),
 				target: generated.target,
 				source: "generator",
 				dependencies: generated.dependencies,
@@ -2481,28 +2514,29 @@ async function generateCssByGenerator(options) {
 				const missingUserCss = isCommentOnlyCss(userCss) ? "" : filterExistingCssRules(css, userCss);
 				css = createCssSourceOrderAppend$1(css, missingUserCss);
 			}
-			if (generated.target === "weapp" && isEmptyCssSourceOrderParts(orderedExtraCss) && hasDistinctUserRawSource && !hasGeneratedCss && !hasGeneratedMarkers && !hasTailwindApplyDirective(userCssRawSource)) {
-				const userCss = await transformGeneratorUserCss(userCssRawSource, userCssOptions);
-				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, userCssRawSource) ? filterExistingCssRules(css, userCss) : userCss;
+			if (generated.target === "weapp" && isEmptyCssSourceOrderParts(orderedExtraCss) && hasDistinctUserRawSource && !hasGeneratedCss && !hasGeneratedMarkers && !hasTailwindApplyDirective(generatedUserCssRawSource)) {
+				const userCss = await transformGeneratorUserCss(generatedUserCssRawSource, userCssOptions);
+				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, generatedUserCssRawSource) ? filterExistingCssRules(css, userCss) : userCss;
 				css = createCssSourceOrderAppend$1(css, missingUserCss);
 			}
 			if (generated.target === "weapp" && shouldAppendMatchedCssSourceCompat) {
 				if (shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
-				if (!shouldFilterApplyOnlyCss && !userRawSourceProcessed) {
-					css = await appendLegacyCompatCss(css, userCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
-					if (!isolateCurrentCssCandidates) css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+				if (!shouldFilterApplyOnlyCss && !userRawSourceProcessed && !hasGeneratedCss && !hasGeneratedMarkers) {
+					css = await appendLegacyCompatCss(css, generatedUserCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+					if (!isolateCurrentCssCandidates) css = await appendLegacyContainerCompatCss(css, generatedUserCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 				}
 			} else if (generated.target === "weapp" && shouldFinalizeMarkedUserLayerComponentsCss(file)) css = reorderMarkedUserLayerComponentsCss(css);
+			const finalCss = restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, {
+				injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
+					cssHandlerOptions,
+					isolateCurrentCssCandidates,
+					localImports
+				}),
+				styleOptions: generatorStyleOptions
+			}), localImports);
 			return {
-				css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, {
-					injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
-						cssHandlerOptions,
-						isolateCurrentCssCandidates,
-						localImports
-					}),
-					styleOptions: generatorStyleOptions
-				}), localImports),
-				classSet: generated.classSet,
+				css: finalCss,
+				classSet: mergeGeneratedCssClassSet(generated.classSet, runtimeWithCurrentCss, finalCss, opts.escapeMap),
 				target: generated.target,
 				source: "generator",
 				dependencies: generated.dependencies,
@@ -2515,7 +2549,7 @@ async function generateCssByGenerator(options) {
 		}
 		debug("tailwind direct css generation prefix mismatch, append transformed bundle css %s", file);
 		let css = generatedCss;
-		if (generated.target === "weapp" && generatorRawSource.includes("weapp-tailwindcss generator-placeholder") && !hasUserCssLayerBlocks(generatorRawSource)) css = createCssSourceOrderAppend$1(await transformGeneratorUserCss(userCssRawSource, {
+		if (generated.target === "weapp" && generatorRawSource.includes("weapp-tailwindcss generator-placeholder") && !hasUserCssLayerBlocks(generatorRawSource)) css = createCssSourceOrderAppend$1(await transformGeneratorUserCss(generatedUserCssRawSource, {
 			generatorTarget: generated.target,
 			generatorStyleOptions,
 			cssUserHandlerOptions,
@@ -2547,7 +2581,7 @@ async function generateCssByGenerator(options) {
 		}
 		if (hasMatchedCssSourceFile || generated.target === "web") {
 			if (generated.target === "weapp" && !hasGeneratedCss && !hasGeneratedMarkers) {
-				const userCss = await transformGeneratorUserCss(userCssRawSource, {
+				const userCss = await transformGeneratorUserCss(generatedUserCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -2555,9 +2589,9 @@ async function generateCssByGenerator(options) {
 					importFallback: generatorOptions.importFallback,
 					processed: userRawSourceProcessed
 				});
-				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, userCssRawSource) ? filterExistingCssRules(css, userCss) : userCss;
+				const missingUserCss = isCssAlreadyRepresentedByMarkers(css, generatedUserCssRawSource) ? filterExistingCssRules(css, userCss) : userCss;
 				css = createCssSourceOrderAppend$1(css, missingUserCss);
-			} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasGeneratedMarkers) {
+			} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasGeneratedMarkers && !hasGeneratedCss) {
 				const userCss = await transformGeneratorUserCss(removeTailwindV4GeneratedUserCssArtifacts(userCssRawSource), {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
@@ -2568,8 +2602,8 @@ async function generateCssByGenerator(options) {
 				});
 				const missingUserCss = filterExistingCssRules(css, userCss);
 				css = createCssSourceOrderAppend$1(css, missingUserCss);
-			} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasUserCssLayerBlocks(userCssRawSource)) {
-				const layerUserCss = await transformGeneratorUserCss(splitUserCssLayerBlocks(userCssRawSource).layer, {
+			} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasUserCssLayerBlocks(generatedUserCssRawSource)) {
+				const layerUserCss = await transformGeneratorUserCss(splitUserCssLayerBlocks(generatedUserCssRawSource).layer, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -2583,13 +2617,13 @@ async function generateCssByGenerator(options) {
 				}
 			}
 			if (hasMatchedCssSourceFile && generated.target === "weapp") {
-				if (!isolateCurrentCssCandidates && !shouldFilterApplyOnlyCss && !userRawSourceProcessed) css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+				if (!isolateCurrentCssCandidates && !shouldFilterApplyOnlyCss && !userRawSourceProcessed && !hasGeneratedCss && !hasGeneratedMarkers) css = await appendLegacyContainerCompatCss(css, generatedUserCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 			}
 			if (shouldAppendWebBundleCssFallback(generated.target, {
 				hasSourceDirectives,
 				hasMatchedCssSourceFile
 			})) {
-				const userCss = await transformGeneratorUserCss(userCssRawSource, {
+				const userCss = await transformGeneratorUserCss(generatedUserCssRawSource, {
 					generatorTarget: generated.target,
 					generatorStyleOptions,
 					cssUserHandlerOptions,
@@ -2600,16 +2634,17 @@ async function generateCssByGenerator(options) {
 				const missingUserCss = isCommentOnlyCss(userCss) ? "" : filterExistingCssRules(css, userCss);
 				css = createCssSourceOrderAppend$1(css, missingUserCss);
 			}
+			const finalCss = restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, {
+				injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
+					cssHandlerOptions,
+					isolateCurrentCssCandidates,
+					localImports
+				}),
+				styleOptions: generatorStyleOptions
+			}), localImports);
 			return {
-				css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, {
-					injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
-						cssHandlerOptions,
-						isolateCurrentCssCandidates,
-						localImports
-					}),
-					styleOptions: generatorStyleOptions
-				}), localImports),
-				classSet: generated.classSet,
+				css: finalCss,
+				classSet: mergeGeneratedCssClassSet(generated.classSet, runtimeWithCurrentCss, finalCss, opts.escapeMap),
 				target: generated.target,
 				source: "generator",
 				dependencies: generated.dependencies,
@@ -2620,12 +2655,12 @@ async function generateCssByGenerator(options) {
 				}
 			};
 		}
-		if (!shouldFilterApplyOnlyCss && !userRawSourceProcessed) {
-			css = await appendLegacyCompatCss(css, userCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
-			css = await appendLegacyContainerCompatCss(css, userCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+		if (!shouldFilterApplyOnlyCss && !userRawSourceProcessed && !hasGeneratedCss && !hasGeneratedMarkers) {
+			css = await appendLegacyCompatCss(css, generatedUserCssRawSource, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
+			css = await appendLegacyContainerCompatCss(css, generatedUserCssRawSource, file, runtime, configuredContainerCompat, generated.target, styleHandler, cssHandlerOptions, generatorStyleOptions);
 		}
-		if (generated.target === "weapp" && hasDistinctUserRawSource && !hasGeneratedCss && !hasGeneratedMarkers && !hasTailwindApplyDirective(userCssRawSource)) {
-			const userCss = await transformGeneratorUserCss(userCssRawSource, {
+		if (generated.target === "weapp" && hasDistinctUserRawSource && !hasGeneratedCss && !hasGeneratedMarkers && !hasTailwindApplyDirective(generatedUserCssRawSource)) {
+			const userCss = await transformGeneratorUserCss(generatedUserCssRawSource, {
 				generatorTarget: generated.target,
 				generatorStyleOptions,
 				cssUserHandlerOptions,
@@ -2633,19 +2668,20 @@ async function generateCssByGenerator(options) {
 				importFallback: generatorOptions.importFallback,
 				processed: userRawSourceProcessed
 			});
-			const missingUserCss = isCssAlreadyRepresentedByMarkers(css, userCssRawSource) ? filterExistingCssRules(css, userCss) : userCss;
+			const missingUserCss = isCssAlreadyRepresentedByMarkers(css, generatedUserCssRawSource) ? filterExistingCssRules(css, userCss) : userCss;
 			css = createCssSourceOrderAppend$1(css, missingUserCss);
 		}
+		const finalCss = restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, {
+			injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
+				cssHandlerOptions,
+				isolateCurrentCssCandidates,
+				localImports
+			}),
+			styleOptions: generatorStyleOptions
+		}), localImports);
 		return {
-			css: restoreLocalCssImports(finalizeMiniProgramGeneratorCss(css, generated.target, majorVersion, opts.cssPreflight, {
-				injectPreflight: shouldInjectMiniProgramPreflightForGeneratorCss(opts, {
-					cssHandlerOptions,
-					isolateCurrentCssCandidates,
-					localImports
-				}),
-				styleOptions: generatorStyleOptions
-			}), localImports),
-			classSet: generated.classSet,
+			css: finalCss,
+			classSet: mergeGeneratedCssClassSet(generated.classSet, runtimeWithCurrentCss, finalCss, opts.escapeMap),
 			target: generated.target,
 			source: "generator",
 			dependencies: generated.dependencies,
@@ -3479,4 +3515,4 @@ function createHmrTimingRecorder(bundler) {
 	};
 }
 //#endregion
-export { stripMiniProgramCssSpecificityPlaceholders as A, stripUnmatchedTailwindSourceMediaCloseFragments as C, finalizeMiniProgramCss as D, hasMiniProgramTailwindV4PreflightReset as E, processCachedTask as F, createCssSourceTraceCacheSignature as M, createCssTokenSourceMap as N, hasMiniProgramCssSpecificityPlaceholders as O, isCssSourceTraceEnabled as P, stripTailwindSourceMediaFragments as S, createCssSourceOrderAppend$1 as T, isPureLocalCssImportWrapper as _, isSourceCandidateRequest as a, removeMiniProgramHoverSelectors as b, collectStrictEscapedRuntimeCandidates as c, validateCandidatesByGenerator as d, pushConcurrentTaskFactories as f, mergeMarkedUserLayerComponentsCss as g, extractMarkedUserLayerComponentsCss as h, createSourceCandidateStore as i, annotateCssSourceTrace as j, pruneMiniProgramGeneratedCss as k, createEscapeFragments as l, runWithConcurrency as m, emitHmrTiming as n, resolveSourceCandidateScanFiles as o, resolveTaskConcurrency as p, createSourceCandidateCollector as r, createBundleRuntimeClassSetManager as s, createHmrTimingRecorder as t, generateCssByGenerator as u, rewriteLocalCssImportRequestsForOutput as v, scoreTailwindV4CssSourceFileMatch as w, removeTailwindV4GeneratorAtRules as x, splitLocalCssImports as y };
+export { hasMiniProgramCssSpecificityPlaceholders as A, stripTailwindSourceMediaFragments as C, createCssSourceOrderAppend$1 as D, removeGeneratedSelectorCompatCss as E, createCssTokenSourceMap as F, isCssSourceTraceEnabled as I, processCachedTask as L, stripMiniProgramCssSpecificityPlaceholders as M, annotateCssSourceTrace as N, hasMiniProgramTailwindV4PreflightReset as O, createCssSourceTraceCacheSignature as P, removeTailwindV4GeneratorAtRules as S, scoreTailwindV4CssSourceFileMatch as T, isPureLocalCssImportWrapper as _, isSourceCandidateRequest as a, removeMiniProgramHoverSelectors as b, collectStrictEscapedRuntimeCandidates as c, validateCandidatesByGenerator as d, pushConcurrentTaskFactories as f, mergeMarkedUserLayerComponentsCss as g, extractMarkedUserLayerComponentsCss as h, createSourceCandidateStore as i, pruneMiniProgramGeneratedCss as j, finalizeMiniProgramCss as k, createEscapeFragments as l, runWithConcurrency as m, emitHmrTiming as n, resolveSourceCandidateScanFiles as o, resolveTaskConcurrency as p, createSourceCandidateCollector as r, createBundleRuntimeClassSetManager as s, createHmrTimingRecorder as t, generateCssByGenerator as u, rewriteLocalCssImportRequestsForOutput as v, stripUnmatchedTailwindSourceMediaCloseFragments as w, removeTailwindV4GeneratedUserCssArtifacts as x, splitLocalCssImports as y };