@weapp-tailwindcss/postcss 3.3.7 → 3.3.9

package/dist/{transform-DpFypcaN.cjs → transform-CmPPSR36.cjs}

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-VH7oDXx4.cjs");
-const require_resolve = require("./resolve-BFphwPip.cjs");
+const require_resolve = require("./resolve-DcV8mpsu.cjs");
 const require_shared = require("./shared-CELzerNo.cjs");
 const require_postcss = require("./postcss-CfbYRXJi.cjs");
 const require_preflight = require("./preflight-BTZL2nvC.cjs");
@@ -295,19 +295,236 @@ function normalizeTailwindV4RuntimeCss(css) {
 	return root.toString();
 }
 //#endregion
+//#region src/utils/css-custom-property.ts
+function decodeCssIdentifier(source) {
+	if (/^[-_a-z][\w-]*$/i.test(source)) return source;
+	const tokens = require_resolve.tokenize({ css: source }).filter((token) => token[0] !== require_resolve.u.Whitespace && token[0] !== require_resolve.u.Comment && token[0] !== require_resolve.u.EOF);
+	const token = tokens[0];
+	return tokens.length === 1 && token?.[0] === require_resolve.u.Ident ? token[4].value : void 0;
+}
+/** PostCSS 可能把十六进制转义的终止空白拆入 params，需要按原始前导 token 还原。 */
+function getCssAtRulePrelude(rule) {
+	if (!rule.name.includes("\\") && !(rule.raws.afterName === "" && rule.params.startsWith("\\"))) return {
+		name: rule.name,
+		params: rule.params
+	};
+	const source = `@${rule.name}${rule.raws.afterName ?? " "}${rule.params}`;
+	const token = require_resolve.tokenize({ css: source })[0];
+	return token?.[0] === require_resolve.u.AtKeyword ? {
+		name: token[4].value,
+		params: source.slice(token[3] + 1).trimStart()
+	} : {
+		name: rule.name,
+		params: rule.params
+	};
+}
+/** 按 CSS token 解码名称，保留自定义属性的大小写及转义终止空白语义。 */
+function getCssCustomPropertyName(source) {
+	if (/^--[\w-]+$/.test(source)) return source;
+	if (!source.trimStart().startsWith("--") && !source.includes("\\")) return;
+	const name = decodeCssIdentifier(source);
+	return name?.startsWith("--") && name.length > 2 ? name : void 0;
+}
+function isCssVarFunction(name) {
+	return (name.includes("\\") ? decodeCssIdentifier(name) : name)?.toLowerCase() === "var";
+}
+/** 同时保留引用处的原始拼写，供底层 calc 匹配；安全判断只使用解码后的身份。 */
+function getCssCalcVariableReferences(value) {
+	const references = /* @__PURE__ */ new Map();
+	if (!value.includes("(")) return references;
+	(0, postcss_value_parser.default)(value).walk((node) => {
+		if (node.type !== "function" || !isCssVarFunction(node.value)) return;
+		const comma = node.nodes.findIndex((child) => child.type === "div" && child.value === ",");
+		const raw = postcss_value_parser.default.stringify(comma < 0 ? node.nodes : node.nodes.slice(0, comma));
+		references.set(raw.trim(), getCssCustomPropertyName(raw) ?? raw.trim());
+	});
+	return references;
+}
+/** 内部共享匹配入口：字符串按 CSS 名称解码，正则匹配解码后的身份。 */
+function isCssCalcCustomPropertySelected(name, includes) {
+	return includes?.some((entry) => typeof entry === "string" ? getCssCustomPropertyName(entry) === name : new RegExp(entry.source, entry.flags).test(name)) ?? false;
+}
+//#endregion
+//#region src/utils/css-calc-context.ts
+/** 只接受无条件主题根；层叠层允许提供候选值，冲突统一在后续排除。 */
+function isCssCalcThemeDeclaration(decl) {
+	const rule = decl.parent;
+	if (rule?.type !== "rule" || !rule.selectors.length || !rule.selectors.every((selector) => require_resolve.MINI_PROGRAM_THEME_SCOPE_SELECTORS.has(selector.trim()))) return false;
+	if (!rule.selectors.some((selector) => [":root", "page"].includes(selector.trim()))) return false;
+	let parent = rule.parent;
+	while (parent && parent.type !== "root") {
+		if (parent.type !== "atrule" || getCssAtRulePrelude(parent).name.toLowerCase() !== "layer") return false;
+		parent = parent.parent;
+	}
+	return parent?.type === "root";
+}
+function isSourceThemeDeclaration(decl) {
+	let parent = decl.parent;
+	while (parent && parent.type !== "root") {
+		if (parent.type === "atrule" && getCssAtRulePrelude(parent).name.toLowerCase() === "theme") return true;
+		parent = parent.parent;
+	}
+	return false;
+}
+function getDependencies(value) {
+	return new Set(getCssCalcVariableReferences(value).values());
+}
+function isCssWideValue(value) {
+	return /^(?:initial|inherit|unset|revert|revert-layer)$/i.test(decodeCssIdentifier(value) ?? value);
+}
+/**
+* 推导可供 calc 静态化的主题变量；局部、条件、冲突及未解析依赖一律保留运行时语义。
+* 原始 @theme 由编译器处理，此处只消费其生成的有效主题根。
+*/
+function analyzeCssCalcContext(css, explicitValues) {
+	const customPropertyValues = /* @__PURE__ */ new Map();
+	const unsafeCustomProperties = /* @__PURE__ */ new Set();
+	try {
+		const root = postcss.default.parse(css);
+		root.walkAtRules((rule) => {
+			const prelude = getCssAtRulePrelude(rule);
+			if (prelude.name.toLowerCase() === "property") unsafeCustomProperties.add(getCssCustomPropertyName(prelude.params) ?? prelude.params.trim());
+		});
+		root.walkDecls((decl) => {
+			const name = getCssCustomPropertyName(decl.prop);
+			if (!name || isSourceThemeDeclaration(decl)) return;
+			const value = decl.value.trim();
+			if (!isCssCalcThemeDeclaration(decl) || isCssWideValue(value) || customPropertyValues.has(name) && customPropertyValues.get(name) !== value) unsafeCustomProperties.add(name);
+			else customPropertyValues.set(name, value);
+		});
+	} catch {
+		return {
+			customPropertyValues,
+			unsafeCustomProperties
+		};
+	}
+	const dependencies = new Map([...customPropertyValues].map(([name, value]) => [name, getDependencies(value)]));
+	for (const [rawName, value] of explicitValues ?? []) {
+		const name = getCssCustomPropertyName(rawName);
+		if (name && !unsafeCustomProperties.has(name)) {
+			customPropertyValues.set(name, value);
+			dependencies.set(name, /* @__PURE__ */ new Set([...dependencies.get(name) ?? [], ...getDependencies(value)]));
+		}
+	}
+	const visiting = /* @__PURE__ */ new Set();
+	const resolved = /* @__PURE__ */ new Set();
+	function isSafe(name) {
+		if (unsafeCustomProperties.has(name)) return false;
+		if (resolved.has(name)) return true;
+		const value = customPropertyValues.get(name);
+		if (value === void 0 || isCssWideValue(value) || visiting.has(name) || visiting.size >= 256) {
+			unsafeCustomProperties.add(name);
+			return false;
+		}
+		visiting.add(name);
+		for (const dependency of dependencies.get(name) ?? []) if (!isSafe(dependency)) {
+			visiting.delete(name);
+			unsafeCustomProperties.add(name);
+			return false;
+		}
+		visiting.delete(name);
+		if (dependencies.get(name)?.size) {
+			const parsed = (0, postcss_value_parser.default)(value);
+			parsed.walk((node, index, nodes) => {
+				if (node.type !== "function" || !isCssVarFunction(node.value)) return;
+				const comma = node.nodes.findIndex((child) => child.type === "div" && child.value === ",");
+				const rawDependency = postcss_value_parser.default.stringify(comma < 0 ? node.nodes : node.nodes.slice(0, comma));
+				const dependency = getCssCustomPropertyName(rawDependency) ?? rawDependency.trim();
+				nodes[index] = {
+					type: "word",
+					value: customPropertyValues.get(dependency),
+					sourceIndex: node.sourceIndex,
+					sourceEndIndex: node.sourceEndIndex
+				};
+				return false;
+			});
+			customPropertyValues.set(name, parsed.toString());
+		}
+		resolved.add(name);
+		return true;
+	}
+	for (const name of customPropertyValues.keys()) if (!isSafe(name)) customPropertyValues.delete(name);
+	return {
+		customPropertyValues,
+		unsafeCustomProperties
+	};
+}
+//#endregion
+//#region src/plugins/getCalcPlugin.ts
+function getCalcPlugin(options) {
+	if (!options.cssCalc) return null;
+	const configured = typeof options.cssCalc === "object" && !Array.isArray(options.cssCalc) ? { ...options.cssCalc } : {};
+	const includes = [...(Array.isArray(options.cssCalc) ? options.cssCalc : configured.includeCustomProperties) ?? []];
+	const inputValues = options.customPropertyValues ?? configured.customPropertyValues;
+	const explicitValues = inputValues ? new Map(inputValues) : void 0;
+	const contextCss = options.customPropertyContextCss ?? "";
+	const selectAll = options.cssCalc === true;
+	return {
+		postcssPlugin: "postcss-calc",
+		Once(root, helpers) {
+			const context = analyzeCssCalcContext([contextCss, root.toString()].join("\n"), explicitValues);
+			const selectedValues = new Map([...context.customPropertyValues].filter(([name]) => selectAll || isCssCalcCustomPropertySelected(name, includes)));
+			const customPropertyValues = /* @__PURE__ */ new Map();
+			root.walk((node) => {
+				const value = node.type === "decl" ? node.value : node.type === "atrule" && configured.mediaQueries ? node.params : node.type === "rule" && configured.selectors ? node.selector : void 0;
+				if (!value) return;
+				for (const [rawName, name] of getCssCalcVariableReferences(value)) {
+					const resolved = selectedValues.get(name);
+					if (resolved !== void 0) customPropertyValues.set(rawName, resolved);
+				}
+			});
+			return (0, _weapp_tailwindcss_postcss_calc.default)({
+				...configured,
+				customPropertyValues,
+				includeCustomProperties: [...customPropertyValues.keys()]
+			}).OnceExit?.(root, helpers);
+		}
+	};
+}
+//#endregion
+//#region src/plugins/applyConfiguredCssCalc.ts
+function resolveCssCalcOption(options) {
+	return options.cssOptions?.cssCalc ?? options.cssCalc;
+}
+/**
+* 仅按 `cssCalc` 配置预计算 `calc()` / `var()`，不跑小程序选择器替换或单位转换。
+*/
+async function applyConfiguredCssCalc(css, options = {}) {
+	const cssCalc = resolveCssCalcOption(options);
+	if (!cssCalc || !css.includes("calc(")) return css;
+	const plugin = getCalcPlugin({
+		cssCalc,
+		customPropertyValues: options.customPropertyValues,
+		customPropertyContextCss: [options.customPropertyContextCss ?? "", options.contextCss ?? ""].join("\n")
+	});
+	if (!plugin) return css;
+	try {
+		return (await (0, postcss.default)([plugin]).process(css, { from: void 0 })).css;
+	} catch {
+		return css;
+	}
+}
+//#endregion
 //#region src/compat/mini-program-css/prune-generated.ts
 const DEFAULT_WEAPP_VARIABLE_SCOPE = "page,.tw-root,wx-root-portal-content,:host";
 const MINI_PROGRAM_PSEUDO_CONTENT_SCOPE_SELECTOR = "::before,\n::after";
 const CLASS_SELECTOR_RE$2 = /(?:^|[^\w-])\.[_a-z\u00A0-\uFFFF\\-]/i;
 /**
-* 在交给框架 PostCSS 前展开 Tailwind 生成的嵌套规则，并裁剪 Web-only 结构。
+* 在主题作用域改写前按配置预计算 calc，再展开 Tailwind 生成的嵌套规则并裁剪 Web-only 结构。
 */
 async function normalizeMiniProgramGeneratedCssForPostcss(css, options = {}) {
+	const calculatedCss = await applyConfiguredCssCalc(css, {
+		cssCalc: options.cssCalc,
+		cssOptions: options.cssOptions,
+		customPropertyValues: options.customPropertyValues,
+		customPropertyContextCss: options.customPropertyContextCss,
+		contextCss: options.contextCss ?? css
+	});
 	return pruneMiniProgramGeneratedCss((await (0, postcss.default)([(0, postcss_preset_env.default)({
 		stage: false,
 		features: { "nesting-rules": true },
 		autoprefixer: false
-	})]).process(css, { from: void 0 })).css, options);
+	})]).process(calculatedCss, { from: void 0 })).css, options);
 }
 function isConditionalCompilationComment(text) {
 	return /#(?:ifn?def|endif)\b/.test(text);
@@ -1066,7 +1283,7 @@ function applyUniAppXUvueCompatibility(result, options) {
 	const sfcStyleRequest = options?.isMainChunk !== true && isUvueSfcStyleRequest(result);
 	let root = result.root;
 	let calcMessages = [];
-	consumeUniAppXSystemRootTheme(root, options?.customPropertyValues);
+	consumeUniAppXSystemRootTheme(root, new Map([...options?.customPropertyCompatibilityValues ?? [], ...options?.customPropertyValues ?? []]));
 	if (root.type === "root" && Array.isArray(root.nodes) && typeof root.walkDecls === "function") {
 		root.walkDecls((decl) => {
 			require_resolve.normalizeTailwindcssV4Declaration(decl);
@@ -4466,7 +4683,7 @@ function getDefaultOptions(options) {
 				"oklab-function": true,
 				"color-mix": true,
 				"color-functional-notation": options?.cssPresetEnv?.features?.["color-functional-notation"] ?? { preserve: false },
-				"custom-properties": options?.cssPresetEnv?.features?.["custom-properties"] ?? options?.cssCalc ? { preserve: true } : false
+				"custom-properties": options?.cssPresetEnv?.features?.["custom-properties"] ?? false
 			},
 			autoprefixer: { add: false }
 		},
@@ -4499,12 +4716,17 @@ function fingerprintOptions(value, state = {
 	const marker = `ref:${state.counter++}`;
 	state.map.set(objectValue, marker);
 	if (Array.isArray(objectValue)) return `[${objectValue.map((entry) => fingerprintOptions(entry, state)).join(",")}]`;
+	if (objectValue instanceof RegExp) return `regexp:${objectValue.source}/${objectValue.flags}`;
 	if (objectValue instanceof Map) return `map:{${[...objectValue.entries()].map(([key, entry]) => [fingerprintOptions(key, state), fingerprintOptions(entry, state)]).sort(([left], [right]) => left.localeCompare(right)).map(([key, entry]) => `${key}:${entry}`).join(",")}}@${marker}`;
 	return `{${Object.keys(objectValue).sort().map((key) => `${key}:${fingerprintOptions(objectValue[key], state)}`).join(",")}}@${marker}`;
 }
+/** 处理器运行时状态不参与输入签名，其余选项每次按实际内容计算。 */
+function fingerprintStyleOptions(options) {
+	const { ctx: _ctx, ...inputs } = options;
+	return fingerprintOptions(inputs);
+}
 //#endregion
 //#region src/options-resolver.ts
-const BASE_CACHE_KEY = "base";
 const SIMPLE_OVERRIDE_UNSET = "__unset__";
 const CSS_OPTION_KEYS = [
 	"cssPreflight",
@@ -4679,32 +4901,17 @@ function normalizeCssOptions(options, mirrorTopLevel = false) {
 function createOptionsResolver(baseOptions) {
 	const normalizedBaseOptions = normalizeCssOptions(baseOptions);
 	const cacheByKey = /* @__PURE__ */ new Map();
-	const cacheByRef = /* @__PURE__ */ new WeakMap();
-	const cacheKeyByRef = /* @__PURE__ */ new WeakMap();
-	const emptyOverrideRefs = /* @__PURE__ */ new WeakSet();
-	cacheByKey.set(BASE_CACHE_KEY, normalizedBaseOptions);
 	const resolve = (overrides) => {
 		if (!overrides) return normalizedBaseOptions;
-		const refCached = cacheByRef.get(overrides);
-		if (refCached) return refCached;
-		if (emptyOverrideRefs.has(overrides)) return normalizedBaseOptions;
-		if (!hasOverrides(overrides)) {
-			emptyOverrideRefs.add(overrides);
-			return normalizedBaseOptions;
-		}
-		let key = cacheKeyByRef.get(overrides);
-		if (!key) {
-			key = getSimpleOverrideCacheKey(overrides) ?? fingerprintOptions(overrides);
-			cacheKeyByRef.set(overrides, key);
-		}
+		if (!hasOverrides(overrides)) return normalizedBaseOptions;
+		const key = getSimpleOverrideCacheKey(overrides) ?? fingerprintOptions(overrides);
 		const cached = cacheByKey.get(key);
-		if (cached) {
-			cacheByRef.set(overrides, cached);
-			return cached;
-		}
+		if (cached && fingerprintStyleOptions(cached.options) === cached.fingerprint) return cached.options;
 		const normalized = normalizeCssOptions((0, _weapp_tailwindcss_shared.defuOverrideArray)(normalizeCssOptions({ ...overrides }, true), normalizedBaseOptions));
-		cacheByKey.set(key, normalized);
-		cacheByRef.set(overrides, normalized);
+		cacheByKey.set(key, {
+			options: normalized,
+			fingerprint: fingerprintStyleOptions(normalized)
+		});
 		return normalized;
 	};
 	return { resolve };
@@ -4855,70 +5062,15 @@ function getCalcDuplicateCleaner(options) {
 	return calcDuplicateCleanerPlugin;
 }
 //#endregion
-//#region src/plugins/getCalcPlugin.ts
-const EMPTY_CALC_OPTIONS = {};
-function getCalcPlugin(options) {
-	if (!options.cssCalc) return null;
-	if (options.cssCalc === true || Array.isArray(options.cssCalc)) {
-		const calcOptions = Array.isArray(options.cssCalc) ? {
-			includeCustomProperties: options.cssCalc,
-			...options.customPropertyValues ? { customPropertyValues: options.customPropertyValues } : {}
-		} : options.customPropertyValues ? {
-			customPropertyValues: options.customPropertyValues,
-			includeCustomProperties: [...options.customPropertyValues.keys()]
-		} : EMPTY_CALC_OPTIONS;
-		return (0, _weapp_tailwindcss_postcss_calc.default)(calcOptions);
-	}
-	return (0, _weapp_tailwindcss_postcss_calc.default)({
-		...options.cssCalc,
-		...options.customPropertyValues ? { customPropertyValues: options.customPropertyValues } : {}
-	});
-}
-//#endregion
 //#region src/plugins/getCustomPropertyCleaner.ts
 function getCustomPropertyCleaner(options) {
-	const includeCustomProperties = Array.isArray(options.cssCalc) ? options.cssCalc : typeof options.cssCalc === "object" ? options.cssCalc.includeCustomProperties : [];
-	if (!(Array.isArray(includeCustomProperties) && includeCustomProperties.length > 0)) return null;
-	const shouldInspectValue = (value) => value.includes("var(") && value.includes("--");
-	const containsIncludedCustomProperty = (value) => {
-		if (!shouldInspectValue(value)) return false;
-		const parsed = (0, postcss_value_parser.default)(value);
-		let containsIncludedCustomProperty = false;
-		parsed.walk((node) => {
-			if (node.type !== "function" || node.value !== "var" || containsIncludedCustomProperty) return;
-			if (node.nodes.find((x) => {
-				return x.type === "word" && (0, _weapp_tailwindcss_shared.regExpTest)(includeCustomProperties, x.value);
-			})) containsIncludedCustomProperty = true;
-		});
-		return containsIncludedCustomProperty;
-	};
-	const hasSameSourceRange = (left, right) => {
-		const leftSource = left.source;
-		const rightSource = right.source;
-		if (!leftSource?.start || !leftSource.end || !rightSource?.start || !rightSource.end || leftSource.input !== rightSource.input) return false;
-		return leftSource.start.line === rightSource.start.line && leftSource.start.column === rightSource.start.column && leftSource.end.line === rightSource.end.line && leftSource.end.column === rightSource.end.column;
-	};
+	if (!(Array.isArray(options.cssCalc) ? options.cssCalc : typeof options.cssCalc === "object" ? options.cssCalc.includeCustomProperties : void 0)?.length) return null;
 	return {
 		postcssPlugin: "postcss-remove-include-custom-properties",
 		OnceExit(root) {
 			root.walkDecls((decl) => {
-				const prevNode = decl.prev();
-				if (prevNode && prevNode.type === "decl" && prevNode.prop === decl.prop && prevNode.important === decl.important && prevNode.value === decl.value) {
-					decl.remove();
-					return;
-				}
-				if (!containsIncludedCustomProperty(decl.value)) return;
-				let fallbackDecl;
-				let node = prevNode;
-				while (node) {
-					if (node.type === "decl" && node.prop === decl.prop) {
-						fallbackDecl = node;
-						break;
-					}
-					node = node.prev();
-				}
-				if (!fallbackDecl || fallbackDecl.important !== decl.important || fallbackDecl !== prevNode && !hasSameSourceRange(fallbackDecl, decl) || containsIncludedCustomProperty(fallbackDecl.value)) return;
-				decl.remove();
+				const previous = decl.prev();
+				if (previous?.type === "decl" && previous.prop === decl.prop && previous.important === decl.important && previous.value === decl.value) decl.remove();
 			});
 		}
 	};
@@ -6320,11 +6472,12 @@ function removeTailwindV4EmptyContentInit(node) {
 		if (isEmptyContentInitDeclaration(decl)) decl.remove();
 	});
 }
-function injectPreflightDeclarations(node, options) {
+function injectPreflightDeclarations(node, options, contentUsage) {
 	const preflightDeclarations = options.cssInjectPreflight?.();
 	if (!preflightDeclarations || preflightDeclarations.length === 0) return;
 	node.prepend(...preflightDeclarations);
 	node.raws.semicolon = true;
+	contentUsage?.invalidate();
 }
 function hasClassSelector$1(node) {
 	return node.selectors.some((selector) => selector.includes("."));
@@ -6350,7 +6503,7 @@ function resolveUniAppXVariableScopeSelectors(options) {
 	if (typeof universal === "string" && universal.length > 0) return [universal];
 	return ["view", "text"];
 }
-function commonChunkPreflight(node, options) {
+function commonChunkPreflight(node, options, contentUsage) {
 	const { ctx, injectAdditionalCssVarScope } = options;
 	const uniAppXEnabled = isUniAppXEnabled(options);
 	const isTailwindcss4 = require_resolve.isTailwindcssV4(options);
@@ -6363,14 +6516,16 @@ function commonChunkPreflight(node, options) {
 		phase: "pre",
 		reason: "append-host-selector"
 	});
-	if (isTailwindcss4 && !require_resolve.usesTailwindcssV4ContentVariable(node.root()) && (!hasClassSelector$1(node) || isRootThemeScopeRule(node))) removeTailwindV4EmptyContentInit(node);
+	if (isTailwindcss4 && (!hasClassSelector$1(node) || isRootThemeScopeRule(node))) {
+		if (!(contentUsage?.read() ?? require_resolve.usesTailwindcssV4ContentVariable(node.root()))) removeTailwindV4EmptyContentInit(node);
+	}
 	if (testIfVariablesScope(node) || uniAppXEnabled && node.selectors.includes("*") && hasTwVars(node, 2)) {
 		ctx?.markVariablesScope(node);
 		assignRuleSelectors(node, uniAppXEnabled ? resolveUniAppXVariableScopeSelectors(options) : remakeCssVarSelector(node.selectors, options), {
 			phase: "pre",
 			reason: "rewrite-variable-scope"
 		});
-		injectPreflightDeclarations(node, options);
+		injectPreflightDeclarations(node, options, contentUsage);
 	}
 	if (injectAdditionalCssVarScope && isTailwindcss4 && require_resolve.testIfRootHostForV4(node)) {
 		const nodes = require_resolve.createUsedCssVarsV4Nodes(require_resolve.collectUsedTailwindcssV4Variables(node.root()));
@@ -6388,7 +6543,8 @@ function commonChunkPreflight(node, options) {
 			reason: "rewrite-synthetic-variable-scope"
 		});
 		node.before(syntheticRule);
-		injectPreflightDeclarations(syntheticRule, options);
+		contentUsage?.invalidate();
+		injectPreflightDeclarations(syntheticRule, options, contentUsage);
 	}
 }
 //#endregion
@@ -6454,14 +6610,39 @@ const postcssWeappTailwindcssPrePlugin = (options) => {
 			}
 		});
 		require_resolve.consumeCascadeLayers(root);
+		let contentVariableUsedInRoot = require_resolve.isTailwindcssV4(opts) ? require_resolve.usesTailwindcssV4ContentVariable(root) : void 0;
+		const contentUsage = {
+			read: () => contentVariableUsedInRoot ??= require_resolve.usesTailwindcssV4ContentVariable(root),
+			invalidate: () => {
+				contentVariableUsedInRoot = void 0;
+			}
+		};
 		root.walkRules((rule) => {
-			commonChunkPreflight(rule, opts);
+			commonChunkPreflight(rule, opts, contentUsage);
 		});
 	};
 	return p;
 };
 postcssWeappTailwindcssPrePlugin.postcss = true;
 //#endregion
+//#region src/plugins/user-plugin-stage.ts
+/** 完成作者插件的全部 visitor 后再进入平台适配，避免 calc 读取中间态。 */
+function createUserPluginStage(plugins) {
+	const processor = (0, postcss.default)(plugins);
+	return {
+		postcssPlugin: "weapp-tailwindcss-author-stage",
+		async Once(root, { result }) {
+			const processed = await processor.process(root, {
+				...result.opts,
+				map: false
+			}).async();
+			result.messages.push(...processed.messages);
+			root.markDirty();
+			root.walk((node) => node.markDirty());
+		}
+	};
+}
+//#endregion
 //#region src/pipeline.ts
 function normalizeUserPlugins(plugins) {
 	if (!plugins) return [];
@@ -6497,11 +6678,11 @@ function isUniAppXNativeAuthorStyle(options) {
 function appendUniAppXNativeAuthorDeclarationNodes(preparedNodes, options) {
 	if (options.uniAppXCssSource !== "author-apply") return;
 	const declarationPlugins = [
+		["normal:calc", getCalcPlugin(options)],
 		["normal:units-to-px", getUnitsToPxPlugin(options)],
 		["normal:px-transform", getPxTransformPlugin(options)],
 		["normal:rem-transform", getRemTransformPlugin(options)],
-		["normal:unit-conversion", getUnitConversionPlugin(options)],
-		["normal:calc", getCalcPlugin(options)]
+		["normal:unit-conversion", getUnitConversionPlugin(options)]
 	];
 	for (const [id, plugin] of declarationPlugins) if (plugin) preparedNodes.push(createPreparedNode(id, "normal", () => plugin));
 }
@@ -6519,9 +6700,11 @@ function createPreparedNodes(options, signal) {
 			"cascade-layers": false
 		}
 	};
-	userPlugins.forEach((plugin, index) => {
+	(options.cssCalc && userPlugins.length > 0 ? [createUserPluginStage(userPlugins)] : userPlugins).forEach((plugin, index) => {
 		preparedNodes.push(createPreparedNode(`pre:user-${index}`, "pre", () => plugin));
 	});
+	const calcPlugin = getCalcPlugin(options);
+	if (calcPlugin) preparedNodes.push(createPreparedNode("pre:calc", "pre", () => calcPlugin));
 	preparedNodes.push(createPreparedNode("pre:core", "pre", () => postcssWeappTailwindcssPrePlugin(options)));
 	if (!signal || signal.hasPresetEnvFeatures) preparedNodes.push(createPreparedNode("normal:preset-env", "normal", () => (0, postcss_preset_env.default)(presetEnvOptions)));
 	if (!signal || signal.hasModernColorFunction) preparedNodes.push(createPreparedNode("normal:color-functional-fallback", "normal", () => createColorFunctionalFallback()));
@@ -6533,8 +6716,6 @@ function createPreparedNodes(options, signal) {
 	if (remTransformPlugin) preparedNodes.push(createPreparedNode("normal:rem-transform", "normal", () => remTransformPlugin));
 	const unitConversionPlugin = getUnitConversionPlugin(options);
 	if (unitConversionPlugin) preparedNodes.push(createPreparedNode("normal:unit-conversion", "normal", () => unitConversionPlugin));
-	const calcPlugin = getCalcPlugin(options);
-	if (calcPlugin) preparedNodes.push(createPreparedNode("normal:calc", "normal", () => calcPlugin));
 	const calcDuplicateCleaner = getCalcDuplicateCleaner(options);
 	if (calcDuplicateCleaner) preparedNodes.push(createPreparedNode("normal:calc-duplicate-cleaner", "normal", () => calcDuplicateCleaner));
 	const customPropertyCleaner = getCustomPropertyCleaner(options);
@@ -6643,10 +6824,9 @@ var StyleProcessorCache = class {
 	pipelineCacheByKey = /* @__PURE__ */ new Map();
 	processOptionsCache = /* @__PURE__ */ new WeakMap();
 	processorCacheByKey = /* @__PURE__ */ new Map();
-	processorKeyCache = /* @__PURE__ */ new WeakMap();
 	createProcessorCacheKey(options) {
-		if (options.postcssOptions?.options?.from == null) return fingerprintOptions(options);
-		return fingerprintOptions({
+		if (options.postcssOptions?.options?.from == null) return fingerprintStyleOptions(options);
+		return fingerprintStyleOptions({
 			...options,
 			postcssOptions: {
 				...options.postcssOptions ?? {},
@@ -6665,11 +6845,7 @@ var StyleProcessorCache = class {
 		return `${optionsFingerprint}|${signalToCacheKey(signal)}`;
 	}
 	getPipeline(options, signal) {
-		let optionsKey = this.processorKeyCache.get(options);
-		if (!optionsKey) {
-			optionsKey = this.createProcessorCacheKey(options);
-			this.processorKeyCache.set(options, optionsKey);
-		}
+		const optionsKey = this.createProcessorCacheKey(options);
 		const compositeKey = this.createCompositeCacheKey(optionsKey, signal);
 		let pipeline = this.pipelineCacheByKey.get(compositeKey);
 		if (!pipeline) {
@@ -6693,11 +6869,7 @@ var StyleProcessorCache = class {
 		return { ...cached.value };
 	}
 	getProcessor(options, signal) {
-		let optionsKey = this.processorKeyCache.get(options);
-		if (!optionsKey) {
-			optionsKey = this.createProcessorCacheKey(options);
-			this.processorKeyCache.set(options, optionsKey);
-		}
+		const optionsKey = this.createProcessorCacheKey(options);
 		const compositeKey = this.createCompositeCacheKey(optionsKey, signal);
 		let processor = this.processorCacheByKey.get(compositeKey);
 		if (!processor) {
@@ -6725,25 +6897,14 @@ function simpleHash(str) {
 	return (hash >>> 0).toString(36);
 }
 function createStyleHandler(options) {
-	const cachedOptions = (0, _weapp_tailwindcss_shared.defuOverrideArray)(options, getDefaultOptions(options));
+	const normalizedOptions = normalizeCssOptions(options ?? {});
+	const cachedOptions = (0, _weapp_tailwindcss_shared.defuOverrideArray)(normalizedOptions, normalizeCssOptions(getDefaultOptions(normalizedOptions), normalizedOptions.cssOptions !== void 0));
 	cachedOptions.cssInjectPreflight = require_preflight.createInjectPreflight(cachedOptions.cssPreflight);
 	const resolver = createOptionsResolver(cachedOptions);
 	const processorCache = new StyleProcessorCache();
 	const base = resolver.resolve();
 	processorCache.getProcessor(base);
 	processorCache.getProcessOptions(base);
-	/** 选项指纹缓存，避免重复序列化 */
-	const optionsFingerprintCache = /* @__PURE__ */ new WeakMap();
-	/**
-	* 获取选项指纹（带缓存）
-	*/
-	function getOptionsFingerprint(opts) {
-		const cached = optionsFingerprintCache.get(opts);
-		if (cached) return cached;
-		const fp = fingerprintOptions(opts);
-		optionsFingerprintCache.set(opts, fp);
-		return fp;
-	}
 	/** CSS 处理结果 LRU 缓存 */
 	const resultCache = new lru_cache.LRUCache({ max: CSS_RESULT_CACHE_MAX });
 	/** 检测是否配置了用户 postcss 插件（如 tailwindcss），有用户插件时不做内容探测 */
@@ -6771,7 +6932,7 @@ function createStyleHandler(options) {
 		} catch {
 			signal = void 0;
 		}
-		const cacheKey = `${getOptionsFingerprint(resolvedOptions)}|${signal ? signalToCacheKey(signal) : ""}|${simpleHash(source)}`;
+		const cacheKey = `${fingerprintStyleOptions(resolvedOptions)}|${signal ? signalToCacheKey(signal) : ""}|${simpleHash(source)}`;
 		const cachedResult = resultCache.get(cacheKey);
 		if (cachedResult) {
 			resolvedOptions.onDiagnostic?.({
@@ -6860,51 +7021,6 @@ function assertRootResult(result) {
 	if (result.root.type !== "root") throw new TypeError("StyleHandler.transformRoot must return a single PostCSS Root.");
 }
 //#endregion
-//#region src/utils/custom-property-values.ts
-/** 按声明顺序收集构建期上下文，不推断级联或运行时作用域。 */
-function collectCustomPropertyValues(css) {
-	const values = /* @__PURE__ */ new Map();
-	mergeCustomPropertyValues$1(values, css);
-	return values;
-}
-/** 直接合并到调用方上下文，避免中间 Map；后出现的声明覆盖旧值。 */
-function mergeCustomPropertyValues$1(target, css) {
-	if (!css.includes("--")) return;
-	try {
-		postcss.default.parse(css).walkDecls((decl) => {
-			if (decl.prop.startsWith("--")) target.set(decl.prop, decl.value.trim());
-		});
-	} catch {}
-}
-//#endregion
-//#region src/plugins/applyConfiguredCssCalc.ts
-function resolveCssCalcOption(options) {
-	return options.cssOptions?.cssCalc ?? options.cssCalc;
-}
-function mergeCustomPropertyValues(css, options) {
-	const values = collectCustomPropertyValues(options.contextCss ?? "");
-	mergeCustomPropertyValues$1(values, css);
-	for (const [name, value] of options.customPropertyValues ?? []) values.set(name, value);
-	return values;
-}
-/**
-* 仅按 `cssCalc` 配置预计算 `calc()` / `var()`，不跑小程序选择器替换或单位转换。
-*/
-async function applyConfiguredCssCalc(css, options = {}) {
-	const cssCalc = resolveCssCalcOption(options);
-	if (!cssCalc || !css.includes("calc(")) return css;
-	const plugin = getCalcPlugin({
-		cssCalc,
-		customPropertyValues: mergeCustomPropertyValues(css, options)
-	});
-	if (!plugin) return css;
-	try {
-		return (await (0, postcss.default)([plugin]).process(css, { from: void 0 })).css;
-	} catch {
-		return css;
-	}
-}
-//#endregion
 //#region src/compat/tailwindcss-v4/generated-output.ts
 const defaultStyleHandler = createStyleHandler({
 	cssChildCombinatorReplaceValue: ["view", "text"],
@@ -6926,7 +7042,7 @@ function normalizeTailwindV4GeneratedUrlValues(css) {
 }
 async function transformTailwindV4CssToWeapp(css, options) {
 	const compatibleCss = normalizeTailwindV4GeneratedUrlValues(hasCssMacroStyleOptions(options) ? await transformCssMacroCss(css, options) : css);
-	const customPropertyValues = options?.customPropertyValues;
+	const customPropertyValues = new Map([...options?.customPropertyCompatibilityValues ?? [], ...options?.customPropertyValues ?? []]);
 	const protectedCss = require_resolve.protectDynamicColorMixAlpha(compatibleCss, { customPropertyValues });
 	const result = await defaultStyleHandler(protectedCss.css, {
 		cssChildCombinatorReplaceValue: ["view", "text"],
@@ -8083,6 +8199,7 @@ async function transformGeneratorUserCss(source, options) {
 	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,
+		customPropertyContextCss: options.generatorStyleOptions.customPropertyContextCss ?? options.cssUserHandlerOptions.customPropertyContextCss,
 		contextCss: typeof options.generatedSource === "string" ? options.generatedSource : void 0
 	});
 	const { css } = await options.styleHandler(userSource, {
@@ -8655,6 +8772,27 @@ function isWebpackTailwindGeneratedUtilitySelector(selector, includePrefix) {
 	return WEBPACK_TAILWIND_UTILITY_RULE_MARKER_RE.test(selector) || includePrefix && WEBPACK_TAILWIND_UTILITY_PREFIX_RE.test(selector);
 }
 //#endregion
+//#region src/utils/deferred-css-source.ts
+const marker = /\/\*!?\s*weapp-tailwindcss deferred-source:([^\s*]+)\s*\*\//g;
+/** 为延后生成的入口保留来源身份，供构建器在合并后查询生命周期缓存。 */
+function createDeferredCssSourceMarker(file) {
+	return `/*! weapp-tailwindcss deferred-source:${encodeURIComponent(file).replace(/\*/g, "%2A")} */`;
+}
+/** 按产物中的出现顺序读取来源，不把标记当作文件系统读取授权。 */
+function readDeferredCssSourceMarkers(css) {
+	return [...new Set([...css.matchAll(marker)].flatMap((match) => {
+		try {
+			return [decodeURIComponent(match[1])];
+		} catch {
+			return [];
+		}
+	}))];
+}
+/** 最终产物不保留构建期来源标记。 */
+function stripDeferredCssSourceMarkers(css) {
+	return css.replace(marker, "");
+}
+//#endregion
 //#region src/utils/generated-css-marker.ts
 const BUNDLER_GENERATED_CSS_MARKER_RE = /\/\*!?\s*weapp-tailwindcss (?:gulp|vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/i;
 const BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE = /\/\*!?\s*weapp-tailwindcss (?:gulp|vite|webpack)-generated-css(?:\s*:\s*[^\s*]+)?\s*\*\/\s*/gi;
@@ -8671,7 +8809,7 @@ function hasBundlerGeneratedCssMarker(source) {
 	return typeof source === "string" && BUNDLER_GENERATED_CSS_MARKER_RE.test(source);
 }
 function stripBundlerGeneratedCssMarkers(source) {
-	return source.replace(BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE, "").replace(BUNDLER_GENERATED_CSS_END_MARKER_GLOBAL_RE, "").replace(VITE_INTERNAL_CSS_MARKER_GLOBAL_RE, "");
+	return stripDeferredCssSourceMarkers(source).replace(BUNDLER_GENERATED_CSS_MARKER_GLOBAL_RE, "").replace(BUNDLER_GENERATED_CSS_END_MARKER_GLOBAL_RE, "").replace(VITE_INTERNAL_CSS_MARKER_GLOBAL_RE, "");
 }
 function parseBundlerGeneratedCssMarkerBlocks(source) {
 	const blocks = [];
@@ -9080,6 +9218,27 @@ async function processFrameworkCss(css, options) {
 	});
 }
 //#endregion
+//#region src/plugins/applyConfiguredCssUnits.ts
+/** 在跨资产 calc 求值之后按原管线顺序转换单位，不重复选择器和框架兼容变换。 */
+async function applyConfiguredCssUnits(css, options = {}) {
+	const resolved = {
+		...options,
+		platform: options.cssOptions?.platform ?? options.platform,
+		rem2rpx: options.cssOptions?.rem2rpx ?? options.rem2rpx,
+		px2rpx: options.cssOptions?.px2rpx ?? options.px2rpx,
+		unitsToPx: options.cssOptions?.unitsToPx ?? options.unitsToPx,
+		unitConversion: options.cssOptions?.unitConversion ?? options.unitConversion
+	};
+	const plugins = [
+		getUnitsToPxPlugin(resolved),
+		getPxTransformPlugin(resolved),
+		getRemTransformPlugin(resolved),
+		getUnitConversionPlugin(resolved)
+	].filter((plugin) => plugin !== null);
+	if (plugins.length === 0) return css;
+	return (await (0, postcss.default)(plugins).process(css, { from: options.postcssOptions?.options?.from })).css;
+}
+//#endregion
 //#region src/source-scan/tailwind-v4/entry-source.ts
 function collectSourceDirectives(root) {
 	const descriptor = require_resolve.describeCssSources(root, isTailwindV4CssImportParam);
@@ -9388,6 +9547,23 @@ function annotateCssTokenSources(css, tokenSources) {
 	}
 }
 //#endregion
+//#region src/utils/custom-property-values.ts
+/** 按声明顺序收集构建期上下文，不推断级联或运行时作用域。 */
+function collectCustomPropertyValues(css) {
+	const values = /* @__PURE__ */ new Map();
+	mergeCustomPropertyValues(values, css);
+	return values;
+}
+/** 直接合并到调用方上下文，避免中间 Map；后出现的声明覆盖旧值。 */
+function mergeCustomPropertyValues(target, css) {
+	if (!css.includes("--")) return;
+	try {
+		postcss.default.parse(css).walkDecls((decl) => {
+			if (decl.prop.startsWith("--")) target.set(decl.prop, decl.value.trim());
+		});
+	} catch {}
+}
+//#endregion
 Object.defineProperty(exports, "CSS_MACRO_STYLE_OPTIONS_MARKER", {
 	enumerable: true,
 	get: function() {
@@ -9460,6 +9636,12 @@ Object.defineProperty(exports, "VITE_MARKER_RE", {
 		return VITE_MARKER_RE;
 	}
 });
+Object.defineProperty(exports, "analyzeCssCalcContext", {
+	enumerable: true,
+	get: function() {
+		return analyzeCssCalcContext;
+	}
+});
 Object.defineProperty(exports, "analyzeTailwindV4EntrySource", {
 	enumerable: true,
 	get: function() {
@@ -9484,6 +9666,12 @@ Object.defineProperty(exports, "applyConfiguredCssCalc", {
 		return applyConfiguredCssCalc;
 	}
 });
+Object.defineProperty(exports, "applyConfiguredCssUnits", {
+	enumerable: true,
+	get: function() {
+		return applyConfiguredCssUnits;
+	}
+});
 Object.defineProperty(exports, "canProcessSourceStyleAsCss", {
 	enumerable: true,
 	get: function() {
@@ -9706,6 +9894,12 @@ Object.defineProperty(exports, "createCssSourceOrderAppend", {
 		return createCssSourceOrderAppend;
 	}
 });
+Object.defineProperty(exports, "createDeferredCssSourceMarker", {
+	enumerable: true,
+	get: function() {
+		return createDeferredCssSourceMarker;
+	}
+});
 Object.defineProperty(exports, "createFallbackPlaceholderReplacer", {
 	enumerable: true,
 	get: function() {
@@ -10066,6 +10260,12 @@ Object.defineProperty(exports, "isCssAlreadyRepresentedByMarkers", {
 		return isCssAlreadyRepresentedByMarkers;
 	}
 });
+Object.defineProperty(exports, "isCssCalcCustomPropertySelected", {
+	enumerable: true,
+	get: function() {
+		return isCssCalcCustomPropertySelected;
+	}
+});
 Object.defineProperty(exports, "isCssImportOnly", {
 	enumerable: true,
 	get: function() {
@@ -10207,7 +10407,7 @@ Object.defineProperty(exports, "mergeCoveredCssRuleDeclarations", {
 Object.defineProperty(exports, "mergeCustomPropertyValues", {
 	enumerable: true,
 	get: function() {
-		return mergeCustomPropertyValues$1;
+		return mergeCustomPropertyValues;
 	}
 });
 Object.defineProperty(exports, "mergeMarkedUserLayerComponentsCss", {
@@ -10444,6 +10644,12 @@ Object.defineProperty(exports, "pruneMiniProgramGeneratedCss", {
 		return pruneMiniProgramGeneratedCss;
 	}
 });
+Object.defineProperty(exports, "readDeferredCssSourceMarkers", {
+	enumerable: true,
+	get: function() {
+		return readDeferredCssSourceMarkers;
+	}
+});
 Object.defineProperty(exports, "removeBalancedAtRuleBlock", {
 	enumerable: true,
 	get: function() {
@@ -10846,6 +11052,12 @@ Object.defineProperty(exports, "stripBundlerGeneratedCssMarkers", {
 		return stripBundlerGeneratedCssMarkers;
 	}
 });
+Object.defineProperty(exports, "stripDeferredCssSourceMarkers", {
+	enumerable: true,
+	get: function() {
+		return stripDeferredCssSourceMarkers;
+	}
+});
 Object.defineProperty(exports, "stripGeneratorPlaceholderMarkers", {
 	enumerable: true,
 	get: function() {