weapp-tailwindcss 5.5.4 → 5.5.6

package/dist/{generator-BgbYHNgD.js → generator-C0BJjyLM.js}

@@ -6,9 +6,8 @@ import fs, { existsSync, readFileSync, readdirSync, realpathSync } from "node:fs
 import path from "node:path";
 import process from "node:process";
 import { createTailwindGenerationSession, createTailwindV4Engine, extractRawCandidates, loadTailwindV4DesignSystem, resolveProjectSourceFiles, resolveTailwindV4Source, resolveValidTailwindV4Candidates as resolveValidTailwindV4Candidates$1 } from "@tailwindcss-mangle/engine";
-import { analyzeTailwindCssDirectives, createStyleHandler, filterExistingCssRules, finalizeMiniProgramCss as finalizeMiniProgramCss$1, hasMiniProgramCssSpecificityPlaceholders, isTailwindCssGenerationDirective, isTailwindCssImportAtRule, isTailwindCssPackageJsonImportRequest, normalizeTailwindCssImportRequest, normalizeTailwindcssWebRpxDeclarations, parseTailwindCssConfigRequest, parseTailwindCssDirectiveRequest, postcss, protectDynamicColorMixAlpha, pruneMiniProgramGeneratedCss, pruneMiniProgramGeneratedCss as pruneMiniProgramGeneratedCss$1, removeUnsupportedCascadeLayers, removeUnsupportedMiniProgramAtRules, selectorContainsPseudoClass, stripMiniProgramCssSpecificityPlaceholders } from "@weapp-tailwindcss/postcss";
+import { analyzeTailwindCssDirectives, applyConfiguredCssCalc, createStyleHandler, filterExistingCssRules, finalizeMiniProgramCss as finalizeMiniProgramCss$1, hasMiniProgramCssSpecificityPlaceholders, isTailwindCssGenerationDirective, isTailwindCssImport, isTailwindCssImportAtRule, isTailwindCssPackageJsonImportRequest, isTailwindRuntimePropertyRule, normalizeTailwindCssImportRequest, normalizeTailwindcssWebRpxDeclarations, parseCssImportSpecifier, parseImportSourceParam, parseTailwindCssConfigRequest, parseTailwindCssDirectiveRequest, postcss, protectDynamicColorMixAlpha, pruneMiniProgramGeneratedCss, pruneMiniProgramGeneratedCss as pruneMiniProgramGeneratedCss$1, quoteCssImportSpecifier, removeTailwindV4PreflightImports, removeUnsupportedCascadeLayers, removeUnsupportedMiniProgramAtRules, removeUnsupportedThemeVendorKeyframes, selectorContainsPseudoClass, stripMiniProgramCssSpecificityPlaceholders } from "@weapp-tailwindcss/postcss";
 import { LRUCache } from "lru-cache";
-import { TokenType, tokenize } from "@csstools/css-tokenizer";
 import { stat } from "node:fs/promises";
 import micromatch from "micromatch";
 //#region src/runtime-branch/generator-target-env.ts
@@ -316,7 +315,7 @@ async function transformTailwindV4CssToWeapp(css, options) {
 		...options
 	});
 	const pruneOptions = {
-		preserveContentInit: options?.uniAppX === true && options.uniAppXCssTarget === "uvue" ? false : void 0,
+		...options?.uniAppX === true && options.uniAppXCssTarget === "uvue" ? { preserveContentInit: false } : {},
 		preservePreflight: true,
 		preserveConditionalComments: hasCssMacroStyleOptions(options)
 	};
@@ -334,48 +333,8 @@ function transformTailwindV4WebRpxCss(css) {
 async function transformTailwindV4CssByTarget(css, target, options) {
 	if (target === "weapp") return transformTailwindV4CssToWeapp(css, options);
 	const resolvedWebCss = await (hasCssMacroStyleOptions(options) ? transformCssMacroCss(css, options) : css);
-	return shouldUseUniAppWebRpxCompatibility(options?.appType) ? transformTailwindV4WebRpxCss(resolvedWebCss) : resolvedWebCss;
-}
-//#endregion
-//#region src/tailwindcss/v4-engine/css-import.ts
-function parseCssImportSpecifier(params) {
-	const tokens = tokenize({ css: params }).filter((token) => token[0] !== TokenType.Whitespace && token[0] !== TokenType.Comment);
-	const first = tokens[0];
-	if (!first) return;
-	if (first[0] === TokenType.String || first[0] === TokenType.URL) return {
-		specifier: first[4].value,
-		raw: first[1],
-		quote: first[0] === TokenType.String ? first[1][0] : void 0
-	};
-	if (first[0] === TokenType.Function && first[4].value.toLowerCase() === "url" && tokens[1]?.[0] === TokenType.String && tokens[2]?.[0] === TokenType.CloseParen) return {
-		specifier: tokens[1][4].value,
-		raw: params.slice(first[2], tokens[2][3] + 1),
-		quote: tokens[1][1][0]
-	};
-}
-function quoteCssImportSpecifier(file, quote = "\"") {
-	return `${quote}${(path.sep === "\\" || /^[a-z]:[\\/]|^\\\\/i.test(file) ? file.replaceAll("\\", "/") : file).replaceAll("\\", "\\\\").replaceAll(quote, `\\${quote}`).replaceAll("\n", "\\a ").replaceAll("\r", "\\d ")}${quote}`;
-}
-function isTailwindCssImport(params) {
-	const specifier = parseCssImportSpecifier(params)?.specifier;
-	if (!specifier) return false;
-	if (specifier === "tailwindcss" || specifier.startsWith("tailwindcss/")) return true;
-	const paths = specifier.includes("\\") ? path.win32 : path.posix;
-	return paths.basename(specifier) === "index.css" && paths.basename(paths.dirname(specifier)) === "tailwindcss";
-}
-function parseImportSourceParam(params) {
-	const tokens = tokenize({ css: params }).filter((token) => token[0] !== TokenType.Whitespace && token[0] !== TokenType.Comment);
-	const index = tokens.findIndex((token) => token[0] === TokenType.Function && token[4].value === "source");
-	const value = tokens[index + 1];
-	if (index < 0 || tokens[index + 2]?.[0] !== TokenType.CloseParen) return;
-	if (value?.[0] === TokenType.Ident && value[4].value === "none") return {
-		none: true,
-		sourcePath: void 0
-	};
-	return value?.[0] === TokenType.String ? {
-		none: false,
-		sourcePath: value[4].value
-	} : void 0;
+	const calculatedWebCss = await applyConfiguredCssCalc(resolvedWebCss, options ?? {});
+	return shouldUseUniAppWebRpxCompatibility(options?.appType) ? transformTailwindV4WebRpxCss(calculatedWebCss) : calculatedWebCss;
 }
 //#endregion
 //#region src/tailwindcss/v4-engine/tailwind-v4-default-colors.ts
@@ -799,58 +758,10 @@ function applyMiniProgramTailwindV4DefaultColorCss(css, source) {
 	if (insertionIndex === 0) return `${themeCss}\n${css}`;
 	return `${css.slice(0, insertionIndex)}\n${themeCss}\n${css.slice(insertionIndex)}`;
 }
-function isTailwindCssPreflightImport(params) {
-	const specifier = parseCssImportSpecifier(params)?.specifier;
-	return specifier === "tailwindcss/preflight.css" || specifier === "tailwindcss/preflight";
-}
-function removeTailwindV4PreflightImports(css) {
-	if (!css.includes("preflight")) return css;
-	let root;
-	try {
-		root = postcss.parse(css);
-	} catch {
-		return css;
-	}
-	let changed = false;
-	root.walkAtRules("import", (rule) => {
-		if (isTailwindCssPreflightImport(rule.params)) {
-			rule.remove();
-			changed = true;
-		}
-	});
-	return changed ? root.toString() : css;
-}
-function hasThemeParent(rule) {
-	let parent = rule.parent;
-	while (parent) {
-		if (parent.type === "atrule" && parent.name === "theme") return true;
-		parent = parent.parent;
-	}
-	return false;
-}
-function isVendorPrefixedKeyframes(rule) {
-	return rule.name.startsWith("-") && rule.name.endsWith("keyframes");
-}
-function removeUnsupportedThemeVendorKeyframes(css) {
-	if (!css.includes("@theme") || !css.includes("@-")) return css;
-	let root;
-	try {
-		root = postcss.parse(css);
-	} catch {
-		return css;
-	}
-	let changed = false;
-	root.walkAtRules((rule) => {
-		if (isVendorPrefixedKeyframes(rule) && hasThemeParent(rule)) {
-			rule.remove();
-			changed = true;
-		}
-	});
-	return changed ? root.toString() : css;
-}
 function createCompatibleSource(source, target) {
 	const filteredSourceCss = target === "weapp" ? removeTailwindV4PreflightImports(source.css) : source.css;
-	const compatibleSourceCss = removeUnsupportedThemeVendorKeyframes(target === "weapp" ? applyMiniProgramTailwindV4DefaultColorCss(filteredSourceCss, source) : filteredSourceCss);
+	const sourceCss = target === "weapp" ? applyMiniProgramTailwindV4DefaultColorCss(filteredSourceCss, source) : filteredSourceCss;
+	const compatibleSourceCss = removeUnsupportedThemeVendorKeyframes(sourceCss);
 	return compatibleSourceCss === source.css ? source : {
 		...source,
 		css: compatibleSourceCss
@@ -1268,7 +1179,7 @@ async function resolveCssDefinedScanSources(source) {
 	const definitions = [{
 		css: source.css,
 		base: source.base,
-		from: source.dependencies[0]
+		...source.dependencies[0] === void 0 ? {} : { from: source.dependencies[0] }
 	}];
 	for (const dependency of source.dependencies.slice(1)) {
 		if (!existsSync(dependency)) continue;
@@ -1296,20 +1207,14 @@ async function resolveCssDefinedScanSources(source) {
 		});
 		sourcePatterns.push(...await resolveCssSourceEntries(root, definition.base, "**/*"));
 	}
-	if (!importSourceBase) {
-		if (sourcePatterns.length > 0) return [...normalizeCssDefinedScanSources(source.base, sourcePatterns), ...createDefaultIgnoredScanSources(source.base)];
-		if (hasSourceNone) return false;
-		if (hasTailwindImport) {
-			const defaultBase = resolveDefaultSourceBase(source);
-			return [await resolveTailwindSourceEntry(".", defaultBase, false, "**/*"), ...createDefaultIgnoredScanSources(defaultBase)];
-		}
-		return;
-	}
-	return [
-		await resolveTailwindSourceEntry(".", importSourceBase, false, "**/*"),
-		...sourcePatterns,
-		...createDefaultIgnoredScanSources(importSourceBase)
-	];
+	let entries;
+	if (importSourceBase) entries = [await resolveTailwindSourceEntry(".", importSourceBase, false, "**/*"), ...sourcePatterns];
+	else if (sourcePatterns.length > 0) entries = normalizeCssDefinedScanSources(source.base, sourcePatterns);
+	else if (hasSourceNone) return false;
+	else if (hasTailwindImport) entries = [await resolveTailwindSourceEntry(".", resolveDefaultSourceBase(source), false, "**/*")];
+	else return;
+	const scanBases = /* @__PURE__ */ new Set([importSourceBase ?? (sourcePatterns.length > 0 ? source.base : resolveDefaultSourceBase(source)), ...entries.filter((entry) => !entry.negated).map((entry) => entry.base)]);
+	return [...entries, ...[...scanBases].flatMap((base) => createDefaultIgnoredScanSources(base))];
 }
 async function resolveScanSources(source, scanSources) {
 	if (scanSources !== true) return scanSources;
@@ -1337,6 +1242,20 @@ function resolveCompiledSourceRoot(source) {
 	return root;
 }
 //#endregion
+//#region src/tailwindcss/v4-engine/generator/style-context.ts
+function resolveGenerationStyleContext(sourceCss, generatedCss, options) {
+	const calc = options?.cssOptions?.cssCalc ?? options?.cssCalc;
+	const include = Array.isArray(calc) ? calc : calc && typeof calc === "object" ? calc.includeCustomProperties : void 0;
+	if (calc !== true && !include?.length) return options;
+	const customPropertyValues = collectCustomPropertyValues(sourceCss);
+	mergeCustomPropertyValues(customPropertyValues, generatedCss);
+	for (const [name, value] of options?.customPropertyValues ?? []) customPropertyValues.set(name, value);
+	return {
+		...options,
+		customPropertyValues
+	};
+}
+//#endregion
 //#region src/tailwindcss/v4-engine/generator/engine.ts
 function isCssSyntaxError(error) {
 	return error instanceof Error && error.name === "CssSyntaxError";
@@ -1383,7 +1302,7 @@ function createTailwindV4Engine$1(source) {
 		}
 		const sources = Array.isArray(resolvedScanSources) ? resolvedScanSources : [];
 		const rawCss = restoreRpxLengthCssSelectors(generatedCss, normalizedCandidates.restoreCandidates);
-		const css = await transformTailwindV4CssByTarget(rawCss, target, resolvedStyleOptions);
+		const css = await transformTailwindV4CssByTarget(rawCss, target, resolveGenerationStyleContext(compatibleSource.css, rawCss, resolvedStyleOptions));
 		return {
 			classSet: restoreRpxLengthCandidates(classSet, normalizedCandidates.restoreCandidates),
 			rawCandidates: restoreRpxLengthCandidates(rawCandidates, normalizedCandidates.restoreCandidates),
@@ -2049,8 +1968,7 @@ function createCssNodeSignature(node) {
 		node.selector,
 		node.nodes?.map(createCssNodeSignature) ?? null
 	]);
-	if (node.type === "comment") return JSON.stringify(["comment", node.text]);
-	return node.toString();
+	return JSON.stringify(["comment", node.text]);
 }
 function createRuleBodySignature(rule) {
 	return JSON.stringify(rule.nodes?.map(createCssNodeSignature) ?? []);
@@ -2058,7 +1976,7 @@ function createRuleBodySignature(rule) {
 function createRuleAtRuleContextSignature(rule) {
 	const context = [];
 	let parent = rule.parent;
-	while (parent && parent.type !== "root" && parent.type !== "document") {
+	while (parent && parent.type !== "root") {
 		if (parent.type === "atrule") context.unshift(JSON.stringify([parent.name, parent.params]));
 		parent = parent.parent;
 	}
@@ -2252,6 +2170,7 @@ function filterApplyOnlyGeneratedCss(css, source, options = {}) {
 				});
 			});
 			const isVariableRule = rule.nodes?.some((node) => node.type === "decl" && node.prop.startsWith("--"));
+			if (options.preserveRuntimeProperties && isTailwindRuntimePropertyRule(rule)) return;
 			if (!isApplySelector && (!preserveVariables || !isVariableRule)) rule.remove();
 		});
 		root.walkAtRules((rule) => {
@@ -2334,9 +2253,38 @@ function isTailwindGeneratedThemeScopeSelector(selector) {
 	if (!selectors.every((item) => TAILWIND_GENERATED_THEME_SCOPE_SELECTORS.has(item))) return false;
 	return selectorSet.size === 2 && selectorSet.has(":root") && selectorSet.has(":host") || selectorSet.size === 4 && selectorSet.has(":host") && selectorSet.has("page") && selectorSet.has(".tw-root") && selectorSet.has("wx-root-portal-content");
 }
-function isTailwindGeneratedThemeRule(selector, node) {
-	if (!isTailwindGeneratedThemeScopeSelector(selector)) return false;
-	return node.nodes?.some((child) => child.type === "decl" && /^--(?:color|spacing|text|font|default|radius|tw-)/.test(child.prop)) ?? false;
+function themeDeclarationContext(declaration) {
+	const context = [];
+	let parent = declaration.parent?.parent;
+	while (parent && parent.type !== "root") {
+		if (parent.type === "atrule" && parent.name !== "layer") context.unshift(`@${parent.name} ${parent.params}`);
+		parent = parent.parent;
+	}
+	return context;
+}
+function themeDeclarationKey(declaration) {
+	const value = declaration.value.trim().replace(/^(-?)0\.(\d+(?:[a-z]+|%)?)$/i, "$1.$2");
+	return JSON.stringify([
+		themeDeclarationContext(declaration),
+		declaration.prop,
+		value,
+		Boolean(declaration.important)
+	]);
+}
+function collectGeneratedThemeDeclarations(source) {
+	const declarations = /* @__PURE__ */ new Set();
+	try {
+		postcss.parse(source).walkRules((rule) => {
+			if (!isTailwindGeneratedThemeScopeSelector(rule.selector.replace(/\s+/g, " ").replace(/\s*,\s*/g, ",").trim())) return;
+			for (const child of rule.nodes ?? []) if (child.type === "decl") declarations.add(themeDeclarationKey(child));
+		});
+	} catch {}
+	return declarations;
+}
+/** 同一轮框架恢复共享声明索引；只有遇到根变量时才解析生成产物。 */
+function createGeneratedThemeDeclarationResolver(source) {
+	let declarations;
+	return () => declarations ?? (declarations = collectGeneratedThemeDeclarations(source));
 }
 function isTailwindGeneratedPreflightRule(selector, node) {
 	if (selector === "view,text,::after,::before" || selector === "view, text, ::after, ::before" || selector === "*" || selector === "::after" || selector === "::before" || selector === "::backdrop" || selector === ":host" || selector === "[hidden]:not([hidden=\"until-found\"])" || selector === "[hidden]:not([hidden='until-found'])" || selector === "button,input[type=\"button\"],input[type=\"reset\"],input[type=\"submit\"]" || selector === "button, input[type=\"button\"], input[type=\"reset\"], input[type=\"submit\"]" || selector === "button,input[type='button'],input[type='reset'],input[type='submit']" || selector === "button, input[type='button'], input[type='reset'], input[type='submit']") return true;
@@ -2344,7 +2292,7 @@ function isTailwindGeneratedPreflightRule(selector, node) {
 	if (selector === ":host") return node.nodes?.some((child) => child.type === "decl" && child.value?.includes("--theme(")) ?? false;
 	return false;
 }
-function removeTailwindV4GeneratedUserCssArtifacts(source) {
+function removeTailwindV4GeneratedUserCssArtifacts(source, generatedSource) {
 	try {
 		const root = postcss.parse(source);
 		let changed = false;
@@ -2353,9 +2301,27 @@ function removeTailwindV4GeneratedUserCssArtifacts(source) {
 			comment.remove();
 			changed = true;
 		});
+		let generatedDeclarations;
+		const overriddenProperties = /* @__PURE__ */ new Set();
 		root.walkRules((rule) => {
-			const selector = rule.selector.replace(/\s+/g, " ").trim();
-			if (isTailwindGeneratedThemeRule(selector, rule) || isTailwindGeneratedPreflightRule(selector, rule)) {
+			const selector = rule.selector.replace(/\s+/g, " ").replace(/\s*,\s*/g, ",").trim();
+			if (isTailwindGeneratedThemeScopeSelector(selector) || TAILWIND_GENERATED_THEME_SCOPE_SELECTORS.has(selector) && rule.nodes.some((child) => child.type === "decl" && child.prop.startsWith("--"))) {
+				generatedDeclarations ?? (generatedDeclarations = typeof generatedSource === "function" ? generatedSource() : generatedSource ? collectGeneratedThemeDeclarations(generatedSource) : /* @__PURE__ */ new Set());
+				for (const child of [...rule.nodes]) {
+					if (child.type !== "decl") continue;
+					const propertyKey = JSON.stringify([themeDeclarationContext(child), child.prop]);
+					if (generatedDeclarations?.has(themeDeclarationKey(child)) && !overriddenProperties.has(propertyKey)) {
+						child.remove();
+						changed = true;
+					} else overriddenProperties.add(propertyKey);
+				}
+				if (rule.nodes.length === 0) {
+					rule.remove();
+					changed = true;
+				}
+				return;
+			}
+			if (isTailwindGeneratedPreflightRule(selector, rule)) {
 				rule.remove();
 				changed = true;
 			}
@@ -2619,16 +2585,37 @@ function unwrapMiniProgramCascadeLayers(source) {
 function hasClassSelector(selector) {
 	return /(?:^|[^\w-])\.[_a-z\u00A0-\uFFFF\\-]/i.test(selector);
 }
-function collectBareSelectorUserCss(source) {
+function collectBareSelectorUserCss(source, transformedCss) {
 	try {
 		const root = postcss.parse(source);
+		const representedSelectors = /* @__PURE__ */ new Set();
+		const rootSelectors = /* @__PURE__ */ new Set([
+			":root",
+			":host",
+			"page",
+			".tw-root",
+			"wx-root-portal-content"
+		]);
+		const selectorKey = (rule, selector) => {
+			const context = [];
+			let parent = rule.parent;
+			while (parent && parent.type !== "root") {
+				if (parent.type === "atrule") context.unshift(`@${parent.name} ${parent.params}`);
+				parent = parent.parent;
+			}
+			return JSON.stringify([...context, rootSelectors.has(selector.trim()) ? ":root" : selector.trim()]);
+		};
+		if (transformedCss !== void 0) postcss.parse(transformedCss).walkRules((rule) => {
+			for (const selector of rule.selectors) representedSelectors.add(selectorKey(rule, selector));
+		});
 		let changed = false;
 		root.walkAtRules("import", (rule) => {
 			rule.remove();
 			changed = true;
 		});
 		root.walkRules((rule) => {
-			if ((rule.selectors?.length ? rule.selectors : [rule.selector]).some((selector) => hasClassSelector(selector))) {
+			const selectors = rule.selectors?.length ? rule.selectors : [rule.selector];
+			if (selectors.some((selector) => hasClassSelector(selector)) || selectors.every((selector) => representedSelectors.has(selectorKey(rule, selector)))) {
 				rule.remove();
 				changed = true;
 			}
@@ -2674,22 +2661,30 @@ function stripUnmatchedTailwindSourceMediaCloseFragments(source) {
 //#region src/bundlers/shared/generator-css/user-css/transform.ts
 async function transformGeneratorUserCss(source, options) {
 	if (source.trim().length === 0) return "";
-	if (options.processed) return stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(removeTailwindV4GeneratorAtRules(options.generatorTarget === "weapp" ? removeTailwindV4GeneratedUserCssArtifacts(unwrapMiniProgramCascadeLayers(removeProcessedMiniProgramUnsupportedCss(source, {
-		...options.generatorStyleOptions,
-		...options.cssUserHandlerOptions
-	}))) : source)));
+	if (options.processed) {
+		const compiledSource = await options.compileAuthorCssFunctions?.(source) ?? source;
+		return stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(removeTailwindV4GeneratorAtRules(options.generatorTarget === "weapp" ? removeTailwindV4GeneratedUserCssArtifacts(unwrapMiniProgramCascadeLayers(removeProcessedMiniProgramUnsupportedCss(compiledSource, {
+			...options.generatorStyleOptions,
+			...options.cssUserHandlerOptions
+		})), options.generatedSource) : compiledSource)));
+	}
 	const cleanedSource = removeTailwindSourceDirectives(removeTailwindV4GeneratorAtRules(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(source))), { importFallback: options.importFallback });
 	if (cleanedSource.trim().length === 0) return "";
-	const userSource = stripUnmatchedTailwindSourceMediaCloseFragments(removeTailwindApplyAtRules(removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(options.generatorTarget === "weapp" ? removeTailwindV4GeneratedUserCssArtifacts(removeUnsupportedMiniProgramAtRules(unwrapMiniProgramCascadeLayers(cleanedSource))) : cleanedSource)), { importFallback: options.importFallback })));
+	const authorSource = stripUnmatchedTailwindSourceMediaCloseFragments(removeTailwindApplyAtRules(removeTailwindSourceDirectives(stripUnmatchedTailwindSourceMediaCloseFragments(stripTailwindSourceMediaFragments(options.generatorTarget === "weapp" ? removeTailwindV4GeneratedUserCssArtifacts(removeUnsupportedMiniProgramAtRules(unwrapMiniProgramCascadeLayers(stripTailwindBanners(cleanedSource))), options.generatedSource) : cleanedSource)), { importFallback: options.importFallback })));
+	const userSource = await options.compileAuthorCssFunctions?.(authorSource) ?? authorSource;
 	if (userSource.trim().length === 0) return "";
 	if (isCommentOnlyCss(userSource)) return userSource;
-	if (options.generatorTarget !== "weapp") return userSource;
+	if (options.generatorTarget !== "weapp") return applyConfiguredCssCalc(userSource, {
+		cssCalc: options.generatorStyleOptions.cssOptions?.cssCalc ?? options.generatorStyleOptions.cssCalc ?? options.cssUserHandlerOptions.cssOptions?.cssCalc ?? options.cssUserHandlerOptions.cssCalc,
+		customPropertyValues: options.generatorStyleOptions.customPropertyValues ?? options.cssUserHandlerOptions.customPropertyValues,
+		contextCss: typeof options.generatedSource === "string" ? options.generatedSource : void 0
+	});
 	const { css } = await options.styleHandler(userSource, {
 		...options.generatorStyleOptions,
 		...options.cssUserHandlerOptions
 	});
-	const transformedCss = removeTailwindV4GeneratedUserCssArtifacts(removeUnsupportedMiniProgramAtRules(css));
-	const bareSelectorUserCss = collectBareSelectorUserCss(userSource);
+	const transformedCss = removeTailwindV4GeneratedUserCssArtifacts(removeUnsupportedMiniProgramAtRules(stripTailwindBanners(css)), options.generatedSource);
+	const bareSelectorUserCss = collectBareSelectorUserCss(userSource, transformedCss);
 	const missingBareSelectorUserCss = bareSelectorUserCss.trim().length > 0 ? filterExistingCssRules(transformedCss, bareSelectorUserCss) : "";
 	return missingBareSelectorUserCss.trim().length > 0 ? `${transformedCss}\n${missingBareSelectorUserCss}` : transformedCss;
 }
@@ -2723,6 +2718,11 @@ function normalizeExtendLengthUnits(value) {
 function normalizeTailwindcssRuntimeOptions(options) {
 	return options;
 }
+/** 清除可选字段中的 undefined，再交给引擎候选校验与生成契约。 */
+function resolveRuntimeBareArbitraryValues(options) {
+	const value = resolveTailwindcssOptions(options)?.v4?.bareArbitraryValues;
+	return value && typeof value === "object" ? value.units === void 0 ? {} : { units: value.units } : value;
+}
 //#endregion
 //#region src/utils/object.ts
 function definedEntries(value) {
@@ -3340,4 +3340,4 @@ async function createWeappTailwindcssGeneratorFromRuntime(tailwindRuntime) {
 	return createWeappTailwindcssGenerator(await resolveTailwindSourceFromRuntime(tailwindRuntime));
 }
 //#endregion
-export { hasTailwindRootDirectives as $, resolveBooleanObjectOption as A, resolveTailwindV4CssSourceBase as At, removeUnsupportedMiniProgramAtRules as B, shouldUseUniAppWebRpxCompatibility as Bt, findWorkspacePackageDir as C, expandTailwindSourceEntries as Ct, normalizeTailwindcssRuntimeOptions as D, parseConfigParam as Dt, normalizeExtendLengthUnits as E, normalizeLegacyContentEntries as Et, stripTailwindSourceMediaFragments as F, transformTailwindV4CssByTarget as Ft, shouldFilterApplyOnlyGeneratedCss as G, removeTailwindV4GeneratedUserCssArtifacts as H, resolveValidTailwindV4Candidates$1 as Ht, stripUnmatchedTailwindSourceMediaCloseFragments as I, transformTailwindV4CssToWeapp as It, splitUserCssLayerBlocks as J, extractGeneratedCssForUserLayerSelectors as K, finalizeMiniProgramCss$1 as L, resolveCssMacroTailwindV4Source as Lt, isCommentOnlyCss as M, _defineProperty as Mt, removeMiniProgramInteractiveSelectors as N, parseCssImportSpecifier as Nt, resolveTailwindcssOptions as O, resolveCssSourceEntries as Ot, removeTailwindV4GeneratorAtRules as P, quoteCssImportSpecifier as Pt, hasTailwindNonRootGenerationDirectives as Q, hasMiniProgramCssSpecificityPlaceholders as R, getTailwindV4IncrementalGenerateCacheStats as Rt, findNearestPackageRoot as S, FULL_SOURCE_SCAN_PATTERN as St, omitUndefined as T, isFileMatchedByTailwindSourceEntries as Tt, filterApplyOnlyGeneratedCss as U, stripMiniProgramCssSpecificityPlaceholders as V, loadTailwindV4DesignSystem as Vt, normalizeEmptyTailwindCustomVariants as W, hasLocalCssImport as X, preferScopedGeneratedCssRules as Y, hasTailwindApplyDirective as Z, upsertTailwindV4CssSource as _, stripTailwindBanners as _t, resolveGeneratorRuntimeBranch as a, removeTailwindSourceDirectives as at, isTailwindV4CssEntry as b, createTailwindV4Engine$1 as bt, shouldUseNativeAppCssBranch as c, VITE_MARKER_RE as ct, resolveTailwindV4SourceFromRuntime as d, hasTailwindGeneratedCssMarkers as dt, hasTailwindSourceDirectives as et, resolveTailwindV4SourceFromRuntimeOptions as f, splitGeneratorPlaceholderCssBySourceOrder as ft, removeTailwindV4CssSource as g, stripTailwindBanner as gt, hasConfiguredTailwindV4CssRoots as h, stripGeneratorPlaceholderMarkers as ht, normalizeWeappTailwindcssGeneratorOptions as i, parseImportRequest as it, transformGeneratorUserCss as j, toPosixPath as jt, normalizeStringListOption as k, resolveSourceScanPath as kt, resolveUniUtsPlatform as l, createCssAppend as lt, filterTailwindV4CssSourceRoots as m, splitTailwindV4GeneratedCssBySourceOrder as mt, createWeappTailwindcssGeneratorFromRuntime as n, normalizeTailwindSourceDirectives as nt, resolveRuntimeBranch as o, resolveCssEntrySource as ot, resolveTailwindV4SourceOptionsFromRuntime as p, splitTailwindGeneratedCssByBanner as pt, hasUserCssLayerBlocks as q, resolveTailwindSourceFromRuntime as r, normalizeTailwindSourceForGenerator as rt, shouldUseMiniProgramCssBranch as s, GENERATOR_PLACEHOLDER_MARKER_RE as st, createWeappTailwindcssGenerator as t, normalizeTailwindConfigDirectives as tt, resolveTailwindV4Source$1 as u, hasTailwindGeneratedCss as ut, groupCssEntriesByBase as v, normalizeConfigDirective as vt, findWorkspaceRoot as w, isFileExcludedByTailwindSourceEntries as wt, normalizeCssEntries as x, FULL_SOURCE_SCAN_EXTENSION_RE as xt, guessBasedirFromEntries as y, prependConfigDirective as yt, pruneMiniProgramGeneratedCss as z, filterUnsupportedMiniProgramTailwindV4Candidates as zt };
+export { hasTailwindApplyDirective as $, normalizeStringListOption as A, resolveCssSourceEntries as At, pruneMiniProgramGeneratedCss as B, shouldUseUniAppWebRpxCompatibility as Bt, findWorkspacePackageDir as C, FULL_SOURCE_SCAN_EXTENSION_RE as Ct, normalizeTailwindcssRuntimeOptions as D, isFileMatchedByTailwindSourceEntries as Dt, normalizeExtendLengthUnits as E, isFileExcludedByTailwindSourceEntries as Et, removeTailwindV4GeneratorAtRules as F, transformTailwindV4CssByTarget as Ft, filterApplyOnlyGeneratedCss as G, stripMiniProgramCssSpecificityPlaceholders as H, resolveValidTailwindV4Candidates$1 as Ht, stripTailwindSourceMediaFragments as I, transformTailwindV4CssToWeapp as It, extractGeneratedCssForUserLayerSelectors as J, normalizeEmptyTailwindCustomVariants as K, stripUnmatchedTailwindSourceMediaCloseFragments as L, resolveCssMacroTailwindV4Source as Lt, transformGeneratorUserCss as M, resolveTailwindV4CssSourceBase as Mt, isCommentOnlyCss as N, toPosixPath as Nt, resolveRuntimeBareArbitraryValues as O, normalizeLegacyContentEntries as Ot, removeMiniProgramInteractiveSelectors as P, _defineProperty as Pt, hasLocalCssImport as Q, finalizeMiniProgramCss$1 as R, getTailwindV4IncrementalGenerateCacheStats as Rt, findNearestPackageRoot as S, createTailwindV4Engine$1 as St, omitUndefined as T, expandTailwindSourceEntries as Tt, createGeneratedThemeDeclarationResolver as U, removeUnsupportedMiniProgramAtRules as V, loadTailwindV4DesignSystem as Vt, removeTailwindV4GeneratedUserCssArtifacts as W, splitUserCssLayerBlocks as X, hasUserCssLayerBlocks as Y, preferScopedGeneratedCssRules as Z, upsertTailwindV4CssSource as _, stripGeneratorPlaceholderMarkers as _t, resolveGeneratorRuntimeBranch as a, normalizeTailwindSourceForGenerator as at, isTailwindV4CssEntry as b, normalizeConfigDirective as bt, shouldUseNativeAppCssBranch as c, resolveCssEntrySource as ct, resolveTailwindV4SourceFromRuntime as d, createCssAppend as dt, hasTailwindNonRootGenerationDirectives as et, resolveTailwindV4SourceFromRuntimeOptions as f, hasTailwindGeneratedCss as ft, removeTailwindV4CssSource as g, splitTailwindV4GeneratedCssBySourceOrder as gt, hasConfiguredTailwindV4CssRoots as h, splitTailwindGeneratedCssByBanner as ht, normalizeWeappTailwindcssGeneratorOptions as i, normalizeTailwindSourceDirectives as it, resolveBooleanObjectOption as j, resolveSourceScanPath as jt, resolveTailwindcssOptions as k, parseConfigParam as kt, resolveUniUtsPlatform as l, GENERATOR_PLACEHOLDER_MARKER_RE as lt, filterTailwindV4CssSourceRoots as m, splitGeneratorPlaceholderCssBySourceOrder as mt, createWeappTailwindcssGeneratorFromRuntime as n, hasTailwindSourceDirectives as nt, resolveRuntimeBranch as o, parseImportRequest as ot, resolveTailwindV4SourceOptionsFromRuntime as p, hasTailwindGeneratedCssMarkers as pt, shouldFilterApplyOnlyGeneratedCss as q, resolveTailwindSourceFromRuntime as r, normalizeTailwindConfigDirectives as rt, shouldUseMiniProgramCssBranch as s, removeTailwindSourceDirectives as st, createWeappTailwindcssGenerator as t, hasTailwindRootDirectives as tt, resolveTailwindV4Source$1 as u, VITE_MARKER_RE as ut, groupCssEntriesByBase as v, stripTailwindBanner as vt, findWorkspaceRoot as w, FULL_SOURCE_SCAN_PATTERN as wt, normalizeCssEntries as x, prependConfigDirective as xt, guessBasedirFromEntries as y, stripTailwindBanners as yt, hasMiniProgramCssSpecificityPlaceholders as z, filterUnsupportedMiniProgramTailwindV4Candidates as zt };

package/dist/generator.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generator = require("./generator-RK2HtgOb.cjs");
+const require_generator = require("./generator-Bvr4WmuF.cjs");
 let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
 exports.createWeappTailwindcssGenerator = require_generator.createWeappTailwindcssGenerator;
 exports.createWeappTailwindcssGeneratorFromRuntime = require_generator.createWeappTailwindcssGeneratorFromRuntime;

package/dist/generator.js

@@ -1,2 +1,2 @@
-import { Ft as transformTailwindV4CssByTarget, It as transformTailwindV4CssToWeapp, Vt as loadTailwindV4DesignSystem, d as resolveTailwindV4SourceFromRuntime, f as resolveTailwindV4SourceFromRuntimeOptions, i as normalizeWeappTailwindcssGeneratorOptions, n as createWeappTailwindcssGeneratorFromRuntime, p as resolveTailwindV4SourceOptionsFromRuntime, r as resolveTailwindSourceFromRuntime, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source } from "./generator-BgbYHNgD.js";
+import { Ft as transformTailwindV4CssByTarget, It as transformTailwindV4CssToWeapp, Vt as loadTailwindV4DesignSystem, d as resolveTailwindV4SourceFromRuntime, f as resolveTailwindV4SourceFromRuntimeOptions, i as normalizeWeappTailwindcssGeneratorOptions, n as createWeappTailwindcssGeneratorFromRuntime, p as resolveTailwindV4SourceOptionsFromRuntime, r as resolveTailwindSourceFromRuntime, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source } from "./generator-C0BJjyLM.js";
 export { createWeappTailwindcssGenerator, createWeappTailwindcssGeneratorFromRuntime, loadTailwindV4DesignSystem, normalizeWeappTailwindcssGeneratorOptions, resolveTailwindSourceFromRuntime, resolveTailwindV4Source, resolveTailwindV4SourceFromRuntime, resolveTailwindV4SourceFromRuntimeOptions, resolveTailwindV4SourceOptionsFromRuntime, transformTailwindV4CssByTarget, transformTailwindV4CssToWeapp };

package/dist/{gulp-BS7fTmyj.cjs → gulp-BExe5RBF.cjs}

@@ -1,12 +1,12 @@
 const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
-const require_generator = require("./generator-RK2HtgOb.cjs");
-const require_tailwindcss = require("./tailwindcss-B03BGeTO.cjs");
-const require_v4_generation_core = require("./v4-generation-core-BvW2aK23.cjs");
-const require_compiler = require("./compiler-DFROuh5Z.cjs");
+const require_generator = require("./generator-Bvr4WmuF.cjs");
+const require_tailwindcss = require("./tailwindcss-CBYjzRmV.cjs");
+const require_v4_generation_core = require("./v4-generation-core-Cz1D7wm1.cjs");
+const require_compiler = require("./compiler-C8FqI-P3.cjs");
 const require_runtime_state = require("./runtime-state-XYSycuGu.cjs");
 const require_cache = require("./cache-CBJFB1HN.cjs");
-const require_hmr_timing = require("./hmr-timing-D45cTIzM.cjs");
-const require_final_css_cleanup = require("./final-css-cleanup-DSjczga3.cjs");
+const require_hmr_timing = require("./hmr-timing-CoiJIqDu.cjs");
+require("./final-css-cleanup-CDTmVAye.cjs");
 let node_fs = require("node:fs");
 node_fs = require_rolldown_runtime.__toESM(node_fs, 1);
 let node_path = require("node:path");
@@ -262,7 +262,7 @@ function createGulpFileTransforms(context) {
 					const generatedCss = stage === "generate" && generated ? `${require_v4_generation_core.createBundlerGeneratedCssMarker("gulp", file.path)}\n${css}` : css;
 					const outputCss = stage === "generate" ? generatedCss : (0, _weapp_tailwindcss_postcss.rewriteLocalCssImportRequestsForOutput)(generatedCss, { styleOutputExtension });
 					debug("css handle: %s", file.path);
-					return { result: stage === "transform" ? require_final_css_cleanup.finalizeMiniProgramCssStructure(outputCss) : outputCss };
+					return { result: stage === "transform" ? (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCssStructure)(outputCss) : outputCss };
 				}
 			});
 			rememberGulpProcessCacheKey(gulpProcessCacheKeys, file.path);
@@ -286,7 +286,7 @@ function createGulpFileTransforms(context) {
 			styleOptions: cssHandlerOptions
 		}) : handled.css;
 		const outputCss = (0, _weapp_tailwindcss_postcss.rewriteLocalCssImportRequestsForOutput)(finalized, { styleOutputExtension });
-		writeGulpFileAsset(file, require_final_css_cleanup.finalizeMiniProgramCssStructure(outputCss));
+		writeGulpFileAsset(file, (0, _weapp_tailwindcss_postcss.finalizeMiniProgramCssStructure)(outputCss));
 		debug("css adapt: %s", file.path);
 	}, () => resolveGulpTransformTimingDetails("css:adapt"));
 	const transformJs = (options = {}) => createVinylTransform("js", async (file) => {

package/dist/{gulp-nl-2p5Dw.js → gulp-BhkIIk7J.js}

@@ -1,8 +1,8 @@
-import { $ as hasTailwindRootDirectives, Rt as getTailwindV4IncrementalGenerateCacheStats, _ as upsertTailwindV4CssSource, g as removeTailwindV4CssSource, h as hasConfiguredTailwindV4CssRoots, rt as normalizeTailwindSourceForGenerator, tt as normalizeTailwindConfigDirectives, yt as prependConfigDirective } from "./generator-BgbYHNgD.js";
-import { f as resolveSourceScanEntries, l as getRuntimeClassSetSignature } from "./tailwindcss-o3Xe-o7M.js";
-import { A as createCssSourceTraceCacheSignature, B as createSourceCandidateCollector, E as hasBundlerGeneratedCssMarker, L as rewriteLocalCssImportRequestsForOutput, N as createRuntimeClassSetManager, O as stripBundlerGeneratedCssMarkers, R as splitLocalCssImports, T as createBundlerGeneratedCssMarker, b as finalizeMiniProgramGeneratorCss, j as createCssTokenSourceMap, k as annotateCssSourceTrace, n as emitHmrTiming, r as generateTailwindV4Css, z as finalizeCompilerShadowRun } from "./hmr-timing-BfxWwMeT.js";
-import { C as createTailwindRuntimeReadyPromise, K as createDebug, L as createCompilationDependencyChanges, M as invalidateCompilationScope, N as recordCompilationDependencyChanges, O as AssetEmissionPlan, a as beginCompilerShadowRun, c as getCompilerShadowRunSnapshot, f as getCompilerContext, i as disposeCompilerOwner, j as getCompilationScopeDependencyRevision, n as createRuntimeAffectingSourceSignature, p as normalizeStyleHandlerMajorVersion, t as createCompilerRuntimeState, v as shouldSkipJsTransform, w as ensureRuntimeClassSet } from "./compiler-CJ5yX-on.js";
-import { i as buildRuntimeCompilationSnapshot, l as updateRuntimeCompilationBuildState, o as createRuntimeCompilationBuildState, r as processCachedTask, s as removeRuntimeCompilationBuildStateFiles, t as finalizeMiniProgramCssStructure } from "./final-css-cleanup-B0HUBtiE.js";
+import { Rt as getTailwindV4IncrementalGenerateCacheStats, _ as upsertTailwindV4CssSource, at as normalizeTailwindSourceForGenerator, g as removeTailwindV4CssSource, h as hasConfiguredTailwindV4CssRoots, rt as normalizeTailwindConfigDirectives, tt as hasTailwindRootDirectives, xt as prependConfigDirective } from "./generator-C0BJjyLM.js";
+import { f as resolveSourceScanEntries, l as getRuntimeClassSetSignature } from "./tailwindcss-B_4E52WF.js";
+import { A as annotateCssSourceTrace, B as finalizeCompilerShadowRun, D as hasBundlerGeneratedCssMarker, E as createBundlerGeneratedCssMarker, M as createCssTokenSourceMap, P as createRuntimeClassSetManager, R as rewriteLocalCssImportRequestsForOutput, V as createSourceCandidateCollector, b as finalizeMiniProgramGeneratorCss, j as createCssSourceTraceCacheSignature, k as stripBundlerGeneratedCssMarkers, n as emitHmrTiming, r as generateTailwindV4Css, z as splitLocalCssImports } from "./hmr-timing-B9Yt86-U.js";
+import { C as createTailwindRuntimeReadyPromise, K as createDebug, L as createCompilationDependencyChanges, M as invalidateCompilationScope, N as recordCompilationDependencyChanges, O as AssetEmissionPlan, a as beginCompilerShadowRun, c as getCompilerShadowRunSnapshot, f as getCompilerContext, i as disposeCompilerOwner, j as getCompilationScopeDependencyRevision, n as createRuntimeAffectingSourceSignature, p as normalizeStyleHandlerMajorVersion, t as createCompilerRuntimeState, v as shouldSkipJsTransform, w as ensureRuntimeClassSet } from "./compiler-D3GBwxoa.js";
+import { i as buildRuntimeCompilationSnapshot, l as updateRuntimeCompilationBuildState, o as createRuntimeCompilationBuildState, r as processCachedTask, s as removeRuntimeCompilationBuildStateFiles, t as finalizeMiniProgramCssStructure } from "./final-css-cleanup-u_sI2p56.js";
 import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";

package/dist/gulp.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_gulp = require("./gulp-BS7fTmyj.cjs");
+const require_gulp = require("./gulp-BExe5RBF.cjs");
 exports.WeappTailwindcss = require_gulp.createPlugins;
 exports.createPlugins = require_gulp.createPlugins;
 exports.weappTailwindcss = require_gulp.createPlugins;

package/dist/gulp.js

@@ -1,2 +1,2 @@
-import { t as createPlugins } from "./gulp-nl-2p5Dw.js";
+import { t as createPlugins } from "./gulp-BhkIIk7J.js";
 export { createPlugins as WeappTailwindcss, createPlugins, createPlugins as weappTailwindcss };