@weapp-tailwindcss/postcss 3.3.2 → 3.3.4

package/README.md

@@ -4,6 +4,10 @@
 
 This package is the CSS processing core of weapp-tailwindcss. It handles PostCSS AST transforms, selector compatibility, platform differences, and Tailwind output post-processing for mini programs.
 
+## Repeated CSS Comparisons
+
+For repeated comparisons against one CSS string, `createCssRuleMatcher(baseCss)` provides `contains(css)` and `filter(css)` with reusable, lazy comparison indexes. It preserves the semantics of `containsCssAfterMinify` and `filterExistingCssRules`. Create a new matcher when the base CSS changes; release it after the batch.
+
 ## Website
 
 For setup guides, configuration references, and framework examples, see the [official weapp-tailwindcss documentation](https://tw.weapp.dev).

package/README.zh-CN.md

@@ -4,6 +4,10 @@
 
 这个包是 weapp-tailwindcss 的 CSS 处理核心，负责小程序端的 PostCSS AST 转换、选择器兼容、平台差异处理和 Tailwind 输出后处理。
 
+## 批量 CSS 比较
+
+对同一份 CSS 连续比较时，`createCssRuleMatcher(baseCss)` 提供 `contains(css)` 和 `filter(css)`，按需构建并复用比较索引，语义与 `containsCssAfterMinify`、`filterExistingCssRules` 相同。主样式变化后应创建新的 matcher，批量比较结束后释放引用。
+
 ## 官网
 
 更多接入方式、配置说明和框架示例见 [weapp-tailwindcss 官方文档](https://tw.weapp.dev)。

package/dist/compat/tailwindcss-v4/infinity-radius.d.ts

@@ -0,0 +1,2 @@
+/** 在下游 PostCSS 解析前，仅将圆角声明中的完整正无限长度收敛为有限值。 */
+export declare function normalizeTailwindcssV4InfinityRadiusCss(css: string): string;

package/dist/index.cjs

@@ -29,11 +29,11 @@ let node_fs_promises = require("node:fs/promises");
 let micromatch = require("micromatch");
 micromatch = require_rolldown_runtime.__toESM(micromatch, 1);
 let tailwindcss_config = require("tailwindcss-config");
+let node_perf_hooks = require("node:perf_hooks");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 let lru_cache = require("lru-cache");
 let autoprefixer = require("autoprefixer");
 autoprefixer = require_rolldown_runtime.__toESM(autoprefixer, 1);
-let es_toolkit = require("es-toolkit");
 let postcss_pxtrans = require("postcss-pxtrans");
 postcss_pxtrans = require_rolldown_runtime.__toESM(postcss_pxtrans, 1);
 let postcss_rem_to_responsive_pixel = require("postcss-rem-to-responsive-pixel");
@@ -81,10 +81,7 @@ function rewriteApplyParams(params, marker) {
 /** 将 Sass 不可直接解析的 important utility 改写成跨预处理器中间形式。 */
 function normalizeUniAppXImportantApplyForSass(css) {
 	try {
-		const root = postcss.default.parse(css, {
-			from: void 0,
-			syntax: postcss_scss.default
-		});
+		const root = postcss_scss.default.parse(css, { from: void 0 });
 		let changed = false;
 		root.walkAtRules("apply", (rule) => {
 			const params = rewriteApplyParams(rule.params, UNI_APP_X_IMPORTANT_APPLY_MARKER);
@@ -93,7 +90,7 @@ function normalizeUniAppXImportantApplyForSass(css) {
 				changed = true;
 			}
 		});
-		return changed ? root.toString() : css;
+		return changed ? root.toString(postcss_scss.default.stringify) : css;
 	} catch {
 		return css;
 	}
@@ -521,7 +518,7 @@ function createCssVarNodes(definitions) {
 	}));
 }
 const CLAMP_PX = 9999;
-const INFINITY_CALC_VALUE_REGEXP = /^calc\(\s*infinity\s*\*\s*(?:\d+(?:\.\d*)?|\.\d+)r?px\s*\)$/i;
+const INFINITY_CALC_VALUE_REGEXP = /^calc\(\s*infinity\s*\*\s*(\d+(?:\.\d*)?|\.\d+)r?px\s*\)$/i;
 const MODERN_CHECK_WEBKIT_HYPHENS_RE = /-webkit-hyphens\s*:\s*none/;
 const MODERN_CHECK_MARGIN_TRIM_RE = /margin-trim\s*:\s*inline/;
 const MODERN_CHECK_MOZ_ORIENT_RE = /-moz-orient\s*:\s*inline/;
@@ -3230,6 +3227,20 @@ function normalizeTailwindcssWebRpxDeclarations(root, options) {
 	return normalized || converted;
 }
 //#endregion
+//#region src/compat/tailwindcss-v4/infinity-radius.ts
+const BORDER_RADIUS_PROPERTY_RE = /^border-(?:radius|(?:top-left|top-right|bottom-left|bottom-right|start-start|start-end|end-start|end-end)-radius)$/i;
+/** 在下游 PostCSS 解析前，仅将圆角声明中的完整正无限长度收敛为有限值。 */
+function normalizeTailwindcssV4InfinityRadiusCss(css) {
+	if (!/infinity/i.test(css)) return css;
+	const root = (0, postcss.parse)(css);
+	root.walkDecls((decl) => {
+		if (!BORDER_RADIUS_PROPERTY_RE.test(decl.prop) && decl.prop !== "--radius" && !decl.prop.startsWith("--radius-")) return;
+		const match = INFINITY_CALC_VALUE_REGEXP.exec(decl.value.trim());
+		if (match && Number.parseFloat(match[1]) > 0) decl.value = `${CLAMP_PX}px`;
+	});
+	return root.toString();
+}
+//#endregion
 //#region src/shared.ts
 const escapeOptionsCache = /* @__PURE__ */ new WeakMap();
 function getEscapeOptions(escapeMap) {
@@ -5322,8 +5333,20 @@ function getCalcDuplicateCleaner(options) {
 const EMPTY_CALC_OPTIONS = {};
 function getCalcPlugin(options) {
 	if (!options.cssCalc) return null;
-	if (options.cssCalc === true || Array.isArray(options.cssCalc)) return (0, _weapp_tailwindcss_postcss_calc.default)(EMPTY_CALC_OPTIONS);
-	return (0, _weapp_tailwindcss_postcss_calc.default)((0, es_toolkit.omit)(options.cssCalc, ["includeCustomProperties"]));
+	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
@@ -7224,10 +7247,21 @@ function createStyleHandler(options) {
 		}
 		const cacheKey = `${getOptionsFingerprint(resolvedOptions)}|${signal ? signalToCacheKey(signal) : ""}|${simpleHash(source)}`;
 		const cachedResult = resultCache.get(cacheKey);
-		if (cachedResult) return Promise.resolve(cloneOutput ? cloneResult(cachedResult) : cachedResult);
+		if (cachedResult) {
+			resolvedOptions.onDiagnostic?.({
+				phase: "postcss",
+				durationMs: 0,
+				cache: {
+					hit: true,
+					key: cacheKey
+				}
+			});
+			return Promise.resolve(cloneOutput ? cloneResult(cachedResult) : cachedResult);
+		}
 		const processor = processorCache.getProcessor(resolvedOptions, signal);
 		const processOptions = processorCache.getProcessOptions(resolvedOptions);
-		return processor.process(processInput, processOptions).async().then((result) => {
+		const startedAt = node_perf_hooks.performance.now();
+		return processor.process(processInput, processOptions).async().then(async (result) => {
 			let finalResult = resolvePostcssFrameworkProfile(resolvedOptions).postprocess(result, resolvedOptions);
 			if (resolvedOptions.isMainChunk !== false && finalResult.root) {
 				let removed = 0;
@@ -7256,7 +7290,29 @@ function createStyleHandler(options) {
 				if (splitUnresolvedAuthorVariableFallbacks(finalResult.root, /* @__PURE__ */ new Map())) finalResult.css = finalResult.root.toString();
 			}
 			resultCache.set(cacheKey, finalResult);
+			await resolvedOptions.onDiagnostic?.({
+				phase: "postcss",
+				durationMs: node_perf_hooks.performance.now() - startedAt,
+				cache: {
+					hit: false,
+					key: cacheKey
+				}
+			});
 			return cloneOutput ? cloneResult(finalResult) : finalResult;
+		}).catch(async (error) => {
+			await resolvedOptions.onDiagnostic?.({
+				phase: "postcss",
+				durationMs: node_perf_hooks.performance.now() - startedAt,
+				cache: {
+					hit: false,
+					key: cacheKey
+				},
+				error: {
+					name: error instanceof Error ? error.name : void 0,
+					message: error instanceof Error ? error.message : String(error)
+				}
+			});
+			throw error;
 		});
 	}
 	const handler = ((rawSource, opt) => {
@@ -7368,17 +7424,24 @@ function getCssRuleStructuralKey(rule) {
 function getCssRuleStructuralKeyWithSelectorKey(rule, selectorKey) {
 	return [...getRuleAtRuleChain(rule), selectorKey].join("|");
 }
-function getCssRuleContentKey(rule) {
+function getCssRuleContentKey(rule, content = normalizeCssForContainment(rule.toString())) {
 	const structuralKey = getCssRuleStructuralKey(rule);
 	if (!structuralKey) return;
-	return [structuralKey, normalizeCssForContainment(rule.toString())].join("|");
+	return [structuralKey, content].join("|");
 }
-function collectCssRuleContentKeys(css) {
+function collectCssRuleContentKeys(css, requiredBaseContent) {
 	const keys = /* @__PURE__ */ new Set();
 	try {
 		postcss.default.parse(css).walkRules((rule) => {
-			const key = getCssRuleContentKey(rule);
-			if (key) keys.add(key);
+			const content = normalizeCssForContainment(rule.toString());
+			const key = getCssRuleContentKey(rule, content);
+			if (key) {
+				if (requiredBaseContent !== void 0 && !requiredBaseContent.includes(content)) {
+					keys.clear();
+					return false;
+				}
+				keys.add(key);
+			}
 		});
 	} catch {}
 	return keys;
@@ -7590,12 +7653,12 @@ function removeEmptyAtRules$1(root) {
 }
 //#endregion
 //#region src/vite-css-rules/containment.ts
-function filterExistingCssRules(baseCss, css) {
-	const baseRuleKeys = collectCssRuleContentKeys(baseCss);
+function filterCssRules(base, css) {
+	const baseRuleKeys = base.ruleKeys();
 	if (baseRuleKeys.size === 0) return css;
 	try {
 		const root = postcss.default.parse(css);
-		const baseRuleDeclarationKeys = collectCssRuleDeclarationKeyMap(baseCss);
+		const baseRuleDeclarationKeys = base.declarations();
 		let changed = false;
 		root.walkRules((rule) => {
 			const key = getCssRuleContentKey(rule);
@@ -7611,16 +7674,40 @@ function filterExistingCssRules(baseCss, css) {
 		return css;
 	}
 }
-function containsCssAfterMinify(baseCss, css) {
-	if (baseCss.includes(css)) return true;
-	const normalizedBaseCss = normalizeCssForContainment(baseCss);
+function containsCss(base, css) {
+	if (base.css.includes(css)) return true;
+	const normalizedBaseCss = base.normalized();
 	const normalizedCss = normalizeCssForContainment(css);
 	if (normalizedCss.length > 0 && normalizedBaseCss.includes(normalizedCss)) return true;
 	const normalizedNodes = collectNormalizedCssNodes(css);
 	if (normalizedNodes.length > 0 && normalizedNodes.every((node) => normalizedBaseCss.includes(node))) return true;
-	const baseRuleKeys = collectCssRuleContentKeys(baseCss);
-	const ruleKeys = collectCssRuleContentKeys(css);
-	return ruleKeys.size > 0 && [...ruleKeys].every((key) => baseRuleKeys.has(key));
+	const ruleKeys = collectCssRuleContentKeys(css, normalizedBaseCss);
+	return ruleKeys.size > 0 && [...ruleKeys].every((key) => base.ruleKeys().has(key));
+}
+function prepareCssBase(css) {
+	let normalized;
+	let ruleKeys;
+	let declarations;
+	return {
+		css,
+		normalized: () => normalized ??= normalizeCssForContainment(css),
+		ruleKeys: () => ruleKeys ??= collectCssRuleContentKeys(css),
+		declarations: () => declarations ??= collectCssRuleDeclarationKeyMap(css)
+	};
+}
+/** 对同一份不可变主样式复用比较索引；调用方在主样式更新后创建新的 matcher。 */
+function createCssRuleMatcher(baseCss) {
+	const base = prepareCssBase(baseCss);
+	return {
+		contains: (css) => containsCss(base, css),
+		filter: (css) => filterCssRules(base, css)
+	};
+}
+function filterExistingCssRules(baseCss, css) {
+	return filterCssRules(prepareCssBase(baseCss), css);
+}
+function containsCssAfterMinify(baseCss, css) {
+	return containsCss(prepareCssBase(baseCss), css);
 }
 //#endregion
 //#region src/vite-css-rules/mini-program.ts
@@ -7786,6 +7873,7 @@ exports.containsCssAfterMinify = containsCssAfterMinify;
 exports.convertTailwindcssRpxDeclarationToRem = convertTailwindcssRpxDeclarationToRem;
 exports.convertTailwindcssRpxDeclarationsToRem = convertTailwindcssRpxDeclarationsToRem;
 exports.convertTailwindcssRpxValueToRem = convertTailwindcssRpxValueToRem;
+exports.createCssRuleMatcher = createCssRuleMatcher;
 exports.createCssSourceOrderAppend = createCssSourceOrderAppend;
 exports.createFallbackPlaceholderReplacer = createFallbackPlaceholderReplacer;
 exports.createInjectPreflight = createInjectPreflight;
@@ -7836,6 +7924,7 @@ exports.normalizeTailwindCssImportRequest = normalizeTailwindCssImportRequest;
 exports.normalizeTailwindcssRpxDeclaration = normalizeTailwindcssRpxDeclaration;
 exports.normalizeTailwindcssRpxDeclarations = normalizeTailwindcssRpxDeclarations;
 exports.normalizeTailwindcssV4InfinityCalcCss = normalizeTailwindcssV4InfinityCalcCss;
+exports.normalizeTailwindcssV4InfinityRadiusCss = normalizeTailwindcssV4InfinityRadiusCss;
 exports.normalizeTailwindcssWebRpxDeclarations = normalizeTailwindcssWebRpxDeclarations;
 exports.normalizeUniAppXImportantApplyForSass = normalizeUniAppXImportantApplyForSass;
 exports.normalizeWebCssCompatOptions = normalizeWebCssCompatOptions;

package/dist/index.d.ts

@@ -5,6 +5,7 @@ export { consumeCascadeLayers, finalizeMiniProgramCss, type FinalizeMiniProgramC
 export { normalizeMiniProgramPrefixedDeclaration, removeUnsupportedMiniProgramPrefixedAtRule, } from './compat/mini-program-prefixes.js';
 export { convertTailwindcssRpxDeclarationsToRem, convertTailwindcssRpxDeclarationToRem, convertTailwindcssRpxValueToRem, normalizeTailwindcssRpxDeclaration, normalizeTailwindcssRpxDeclarations, normalizeTailwindcssWebRpxDeclarations, type TailwindcssRpxToRemOptions, } from './compat/tailwindcss-rpx.js';
 export { normalizeTailwindcssV4InfinityCalcCss } from './compat/tailwindcss-v4.js';
+export { normalizeTailwindcssV4InfinityRadiusCss } from './compat/tailwindcss-v4/infinity-radius.js';
 export { normalizeUniAppXImportantApplyForSass, restoreUniAppXImportantApplyMarker, UNI_APP_X_IMPORTANT_APPLY_MARKER, } from './compat/uni-app-x.js';
 export { type NormalizedWebCssCompatOptions, normalizeWebCssCompatOptions, transformWebCssCompat, transformWebCssSafeSelectors, } from './compat/web-css.js';
 export { compileCssMacroConditionalComments, CSS_MACRO_STYLE_OPTIONS_MARKER, hasCssMacroStyleOptions, hasCssMacroTailwindV4CustomVariantConditionalComments, hasCssMacroTailwindV4Directive, hasCssMacroTailwindV4InternalAtRules, hasCssMacroTailwindV4Source, transformCssMacroCss, transformCssMacroTailwindV4Source, withCssMacroStyleOptions, } from './css-macro/auto.js';
@@ -28,5 +29,5 @@ export { internalCssSelectorReplacer } from './shared.js';
 export { collectCssInlineSourceCandidates, createSourceScanPattern, createTailwindSourceEntryMatcher, expandInlineSourceCandidatePattern, expandTailwindSourceEntries, FULL_SOURCE_SCAN_EXTENSION_RE, FULL_SOURCE_SCAN_EXTENSIONS, FULL_SOURCE_SCAN_PATTERN, isFileExcludedByTailwindSourceEntries, isFileMatchedByTailwindSourceEntries, normalizeLegacyContentEntries, parseConfigParam, parseSourceFileParam, resolveCssSourceEntries, resolveSourceScanPath, resolveTailwindSourceEntry, type TailwindInlineSourceCandidates, type TailwindSourceEntry, toPosixPath, } from './source-scan.js';
 export { createPostcssStyleTargetProfile, type PostcssStyleTarget, type PostcssStyleTargetProfile, } from './style-targets/index.js';
 export * from './types.js';
-export { containsCssAfterMinify, dedupeCoveredCssRules, filterExistingCssRules, mergeCoveredCssRuleDeclarations, mergeMiniProgramPreflightRuleDeclarations, mergeMiniProgramThemeScopeRuleDeclarations, } from './vite-css-rules.js';
+export { containsCssAfterMinify, createCssRuleMatcher, dedupeCoveredCssRules, filterExistingCssRules, mergeCoveredCssRuleDeclarations, mergeMiniProgramPreflightRuleDeclarations, mergeMiniProgramThemeScopeRuleDeclarations, } from './vite-css-rules.js';
 export { composeRules as unitConversionComposeRules, presets as unitConversionPresets, } from 'postcss-rule-unit-converter';

package/dist/index.js

@@ -2,7 +2,7 @@ import { CSS_MACRO_POSTCSS_PLUGIN_NAME, creator, ifdefAtRule, ifndefAtRule } fro
 import postcssHtmlTransform from "./html-transform.js";
 import "./types.js";
 import { extractValidCandidates, resolveProjectSourceFiles, splitCandidateTokens } from "@tailwindcss-mangle/engine";
-import postcss, { Declaration, Rule, rule, default as postcss$1 } from "postcss";
+import postcss, { Declaration, Rule, parse, rule, default as postcss$1 } from "postcss";
 import scssSyntax from "postcss-scss";
 import postcssCalc from "@weapp-tailwindcss/postcss-calc";
 import selectorParser from "postcss-selector-parser";
@@ -18,10 +18,10 @@ import { realpathSync } from "node:fs";
 import { readFile, stat } from "node:fs/promises";
 import micromatch from "micromatch";
 import { loadConfig } from "tailwindcss-config";
+import { performance } from "node:perf_hooks";
 import { defu, defuOverrideArray, regExpTest } from "@weapp-tailwindcss/shared";
 import { LRUCache } from "lru-cache";
 import autoprefixerPlugin from "autoprefixer";
-import { omit } from "es-toolkit";
 import postcssPxtrans from "postcss-pxtrans";
 import postcssRem2rpx from "postcss-rem-to-responsive-pixel";
 import postcssUnitConverter, { composeRules as unitConversionComposeRules, presets, presets as unitConversionPresets } from "postcss-rule-unit-converter";
@@ -65,10 +65,7 @@ function rewriteApplyParams(params, marker) {
 /** 将 Sass 不可直接解析的 important utility 改写成跨预处理器中间形式。 */
 function normalizeUniAppXImportantApplyForSass(css) {
 	try {
-		const root = postcss$1.parse(css, {
-			from: void 0,
-			syntax: scssSyntax
-		});
+		const root = scssSyntax.parse(css, { from: void 0 });
 		let changed = false;
 		root.walkAtRules("apply", (rule) => {
 			const params = rewriteApplyParams(rule.params, UNI_APP_X_IMPORTANT_APPLY_MARKER);
@@ -77,7 +74,7 @@ function normalizeUniAppXImportantApplyForSass(css) {
 				changed = true;
 			}
 		});
-		return changed ? root.toString() : css;
+		return changed ? root.toString(scssSyntax.stringify) : css;
 	} catch {
 		return css;
 	}
@@ -505,7 +502,7 @@ function createCssVarNodes(definitions) {
 	}));
 }
 const CLAMP_PX = 9999;
-const INFINITY_CALC_VALUE_REGEXP = /^calc\(\s*infinity\s*\*\s*(?:\d+(?:\.\d*)?|\.\d+)r?px\s*\)$/i;
+const INFINITY_CALC_VALUE_REGEXP = /^calc\(\s*infinity\s*\*\s*(\d+(?:\.\d*)?|\.\d+)r?px\s*\)$/i;
 const MODERN_CHECK_WEBKIT_HYPHENS_RE = /-webkit-hyphens\s*:\s*none/;
 const MODERN_CHECK_MARGIN_TRIM_RE = /margin-trim\s*:\s*inline/;
 const MODERN_CHECK_MOZ_ORIENT_RE = /-moz-orient\s*:\s*inline/;
@@ -3214,6 +3211,20 @@ function normalizeTailwindcssWebRpxDeclarations(root, options) {
 	return normalized || converted;
 }
 //#endregion
+//#region src/compat/tailwindcss-v4/infinity-radius.ts
+const BORDER_RADIUS_PROPERTY_RE = /^border-(?:radius|(?:top-left|top-right|bottom-left|bottom-right|start-start|start-end|end-start|end-end)-radius)$/i;
+/** 在下游 PostCSS 解析前，仅将圆角声明中的完整正无限长度收敛为有限值。 */
+function normalizeTailwindcssV4InfinityRadiusCss(css) {
+	if (!/infinity/i.test(css)) return css;
+	const root = parse(css);
+	root.walkDecls((decl) => {
+		if (!BORDER_RADIUS_PROPERTY_RE.test(decl.prop) && decl.prop !== "--radius" && !decl.prop.startsWith("--radius-")) return;
+		const match = INFINITY_CALC_VALUE_REGEXP.exec(decl.value.trim());
+		if (match && Number.parseFloat(match[1]) > 0) decl.value = `${CLAMP_PX}px`;
+	});
+	return root.toString();
+}
+//#endregion
 //#region src/shared.ts
 const escapeOptionsCache = /* @__PURE__ */ new WeakMap();
 function getEscapeOptions(escapeMap) {
@@ -5306,8 +5317,20 @@ function getCalcDuplicateCleaner(options) {
 const EMPTY_CALC_OPTIONS = {};
 function getCalcPlugin(options) {
 	if (!options.cssCalc) return null;
-	if (options.cssCalc === true || Array.isArray(options.cssCalc)) return postcssCalc(EMPTY_CALC_OPTIONS);
-	return postcssCalc(omit(options.cssCalc, ["includeCustomProperties"]));
+	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 postcssCalc(calcOptions);
+	}
+	return postcssCalc({
+		...options.cssCalc,
+		...options.customPropertyValues ? { customPropertyValues: options.customPropertyValues } : {}
+	});
 }
 //#endregion
 //#region src/plugins/getCustomPropertyCleaner.ts
@@ -7208,10 +7231,21 @@ function createStyleHandler(options) {
 		}
 		const cacheKey = `${getOptionsFingerprint(resolvedOptions)}|${signal ? signalToCacheKey(signal) : ""}|${simpleHash(source)}`;
 		const cachedResult = resultCache.get(cacheKey);
-		if (cachedResult) return Promise.resolve(cloneOutput ? cloneResult(cachedResult) : cachedResult);
+		if (cachedResult) {
+			resolvedOptions.onDiagnostic?.({
+				phase: "postcss",
+				durationMs: 0,
+				cache: {
+					hit: true,
+					key: cacheKey
+				}
+			});
+			return Promise.resolve(cloneOutput ? cloneResult(cachedResult) : cachedResult);
+		}
 		const processor = processorCache.getProcessor(resolvedOptions, signal);
 		const processOptions = processorCache.getProcessOptions(resolvedOptions);
-		return processor.process(processInput, processOptions).async().then((result) => {
+		const startedAt = performance.now();
+		return processor.process(processInput, processOptions).async().then(async (result) => {
 			let finalResult = resolvePostcssFrameworkProfile(resolvedOptions).postprocess(result, resolvedOptions);
 			if (resolvedOptions.isMainChunk !== false && finalResult.root) {
 				let removed = 0;
@@ -7240,7 +7274,29 @@ function createStyleHandler(options) {
 				if (splitUnresolvedAuthorVariableFallbacks(finalResult.root, /* @__PURE__ */ new Map())) finalResult.css = finalResult.root.toString();
 			}
 			resultCache.set(cacheKey, finalResult);
+			await resolvedOptions.onDiagnostic?.({
+				phase: "postcss",
+				durationMs: performance.now() - startedAt,
+				cache: {
+					hit: false,
+					key: cacheKey
+				}
+			});
 			return cloneOutput ? cloneResult(finalResult) : finalResult;
+		}).catch(async (error) => {
+			await resolvedOptions.onDiagnostic?.({
+				phase: "postcss",
+				durationMs: performance.now() - startedAt,
+				cache: {
+					hit: false,
+					key: cacheKey
+				},
+				error: {
+					name: error instanceof Error ? error.name : void 0,
+					message: error instanceof Error ? error.message : String(error)
+				}
+			});
+			throw error;
 		});
 	}
 	const handler = ((rawSource, opt) => {
@@ -7352,17 +7408,24 @@ function getCssRuleStructuralKey(rule) {
 function getCssRuleStructuralKeyWithSelectorKey(rule, selectorKey) {
 	return [...getRuleAtRuleChain(rule), selectorKey].join("|");
 }
-function getCssRuleContentKey(rule) {
+function getCssRuleContentKey(rule, content = normalizeCssForContainment(rule.toString())) {
 	const structuralKey = getCssRuleStructuralKey(rule);
 	if (!structuralKey) return;
-	return [structuralKey, normalizeCssForContainment(rule.toString())].join("|");
+	return [structuralKey, content].join("|");
 }
-function collectCssRuleContentKeys(css) {
+function collectCssRuleContentKeys(css, requiredBaseContent) {
 	const keys = /* @__PURE__ */ new Set();
 	try {
 		postcss.parse(css).walkRules((rule) => {
-			const key = getCssRuleContentKey(rule);
-			if (key) keys.add(key);
+			const content = normalizeCssForContainment(rule.toString());
+			const key = getCssRuleContentKey(rule, content);
+			if (key) {
+				if (requiredBaseContent !== void 0 && !requiredBaseContent.includes(content)) {
+					keys.clear();
+					return false;
+				}
+				keys.add(key);
+			}
 		});
 	} catch {}
 	return keys;
@@ -7574,12 +7637,12 @@ function removeEmptyAtRules$1(root) {
 }
 //#endregion
 //#region src/vite-css-rules/containment.ts
-function filterExistingCssRules(baseCss, css) {
-	const baseRuleKeys = collectCssRuleContentKeys(baseCss);
+function filterCssRules(base, css) {
+	const baseRuleKeys = base.ruleKeys();
 	if (baseRuleKeys.size === 0) return css;
 	try {
 		const root = postcss.parse(css);
-		const baseRuleDeclarationKeys = collectCssRuleDeclarationKeyMap(baseCss);
+		const baseRuleDeclarationKeys = base.declarations();
 		let changed = false;
 		root.walkRules((rule) => {
 			const key = getCssRuleContentKey(rule);
@@ -7595,16 +7658,40 @@ function filterExistingCssRules(baseCss, css) {
 		return css;
 	}
 }
-function containsCssAfterMinify(baseCss, css) {
-	if (baseCss.includes(css)) return true;
-	const normalizedBaseCss = normalizeCssForContainment(baseCss);
+function containsCss(base, css) {
+	if (base.css.includes(css)) return true;
+	const normalizedBaseCss = base.normalized();
 	const normalizedCss = normalizeCssForContainment(css);
 	if (normalizedCss.length > 0 && normalizedBaseCss.includes(normalizedCss)) return true;
 	const normalizedNodes = collectNormalizedCssNodes(css);
 	if (normalizedNodes.length > 0 && normalizedNodes.every((node) => normalizedBaseCss.includes(node))) return true;
-	const baseRuleKeys = collectCssRuleContentKeys(baseCss);
-	const ruleKeys = collectCssRuleContentKeys(css);
-	return ruleKeys.size > 0 && [...ruleKeys].every((key) => baseRuleKeys.has(key));
+	const ruleKeys = collectCssRuleContentKeys(css, normalizedBaseCss);
+	return ruleKeys.size > 0 && [...ruleKeys].every((key) => base.ruleKeys().has(key));
+}
+function prepareCssBase(css) {
+	let normalized;
+	let ruleKeys;
+	let declarations;
+	return {
+		css,
+		normalized: () => normalized ??= normalizeCssForContainment(css),
+		ruleKeys: () => ruleKeys ??= collectCssRuleContentKeys(css),
+		declarations: () => declarations ??= collectCssRuleDeclarationKeyMap(css)
+	};
+}
+/** 对同一份不可变主样式复用比较索引；调用方在主样式更新后创建新的 matcher。 */
+function createCssRuleMatcher(baseCss) {
+	const base = prepareCssBase(baseCss);
+	return {
+		contains: (css) => containsCss(base, css),
+		filter: (css) => filterCssRules(base, css)
+	};
+}
+function filterExistingCssRules(baseCss, css) {
+	return filterCssRules(prepareCssBase(baseCss), css);
+}
+function containsCssAfterMinify(baseCss, css) {
+	return containsCss(prepareCssBase(baseCss), css);
 }
 //#endregion
 //#region src/vite-css-rules/mini-program.ts
@@ -7751,4 +7838,4 @@ function mergeMiniProgramThemeScopeRuleDeclarations(baseCss, css) {
 	}
 }
 //#endregion
-export { CSS_MACRO_POSTCSS_PLUGIN_NAME, CSS_MACRO_STYLE_OPTIONS_MARKER, FULL_SOURCE_SCAN_EXTENSIONS, FULL_SOURCE_SCAN_EXTENSION_RE, FULL_SOURCE_SCAN_PATTERN, UNI_APP_X_IMPORTANT_APPLY_MARKER, analyzeTailwindCssDirectives, cleanLocalCssImportWrapperTailwindDirectives, cleanLocalCssImportWrapperTailwindDirectivesRoot, collectApplyOnlyCssSelectors, collectApplyOnlyCssSelectorsRoot, collectCssImportRequestsRoot, collectCssInlineSourceCandidates, compileCssMacroConditionalComments, consumeCascadeLayers, containsCssAfterMinify, convertTailwindcssRpxDeclarationToRem, convertTailwindcssRpxDeclarationsToRem, convertTailwindcssRpxValueToRem, createCssSourceOrderAppend, createFallbackPlaceholderReplacer, createInjectPreflight, createPostcssStyleTargetProfile, createSourceScanPattern, createStyleHandler, createStylePipeline, createTailwindSourceEntryMatcher, createWeappTailwindcssPostcssPlugin, creator as cssMacroPostcssPlugin, dedupeCoveredCssRules, expandInlineSourceCandidatePattern, expandTailwindSourceEntries, filterApplyOnlyGeneratedCss, filterApplyOnlyGeneratedCssRoot, filterExistingCssRules, finalizeMiniProgramCss, finalizeMiniProgramCssRoot, getPostcssPluginName, hasCssMacroStyleOptions, hasCssMacroTailwindV4CustomVariantConditionalComments, hasCssMacroTailwindV4Directive, hasCssMacroTailwindV4InternalAtRules, hasCssMacroTailwindV4Source, hasMiniProgramCssSpecificityPlaceholders, hoistTailwindPreflightBase, internalCssSelectorReplacer, isFileExcludedByTailwindSourceEntries, isFileMatchedByTailwindSourceEntries, isLocalCssImportRequest, isMiniProgramLocalCssImportRequest, isPureLocalCssImportWrapper, isPureLocalCssImportWrapperRoot, isTailwindCssGenerationDirective, isTailwindCssImportAtRule, isTailwindCssImportRequest, isTailwindCssPackageJsonImportRequest, isWeappTailwindcssImportRequest, mergeCoveredCssRuleDeclarations, mergeMiniProgramPreflightRuleDeclarations, mergeMiniProgramThemeScopeRuleDeclarations, normalizeLegacyContentEntries, normalizeMiniProgramGeneratedCssForPostcss, normalizeMiniProgramPrefixedDeclaration, normalizeModernColorValue, normalizeOutputImportRequest, normalizeTailwindCssImportRequest, normalizeTailwindcssRpxDeclaration, normalizeTailwindcssRpxDeclarations, normalizeTailwindcssV4InfinityCalcCss, normalizeTailwindcssWebRpxDeclarations, normalizeUniAppXImportantApplyForSass, normalizeWebCssCompatOptions, parseConfigParam, parseSourceFileParam, parseTailwindCssConfigRequest, parseTailwindCssDirectiveRequest, postcss, postcssHtmlTransform, prefixLocalCssImportsWithWebpackIgnoreRoot, protectDynamicColorMixAlpha, protectDynamicVarFallbacks, pruneMiniProgramGeneratedCss, removeEmptyAtRules, removeEmptyRules, removeMatchingLocalCssImports, removeMatchingLocalCssImportsRoot, removeTailwindPostcssPlugins, removeTailwindSourceDirectivesRoot, removeUnsupportedAtSupports, removeUnsupportedCascadeLayers, removeUnsupportedMiniProgramAtRules, removeUnsupportedMiniProgramCssImportsRoot, removeUnsupportedMiniProgramPrefixedAtRule, repairTrailingUnclosedTailwindSourceMedia, resolveCssSourceEntries, resolveFilteredPostcssConfig, resolvePostcssConfig, resolvePostcssFrameworkProfile, resolvePostcssFrameworkStrategy, resolvePostcssStyleBranch, resolvePostcssStyleBranchProfile, resolvePostcssStyleTarget, resolveSourceScanPath, resolveTailwindSourceEntry, restoreLocalCssImports, restoreUniAppXImportantApplyMarker, rewriteLocalCssImportRequestsForOutput, rewriteLocalCssImportRequestsForOutputRoot, selectorContainsPseudoClass, splitLocalCssImports, splitLocalCssImportsRoot, stripMiniProgramCssSpecificityPlaceholders, toPosixPath, transformCssMacroCss, transformCssMacroTailwindV4Source, transformLynxCssCompat, transformWebCssCompat, transformWebCssSafeSelectors, unitConversionComposeRules, unitConversionPresets, unwrapUnsupportedCascadeLayers, withCssMacroStyleOptions };
+export { CSS_MACRO_POSTCSS_PLUGIN_NAME, CSS_MACRO_STYLE_OPTIONS_MARKER, FULL_SOURCE_SCAN_EXTENSIONS, FULL_SOURCE_SCAN_EXTENSION_RE, FULL_SOURCE_SCAN_PATTERN, UNI_APP_X_IMPORTANT_APPLY_MARKER, analyzeTailwindCssDirectives, cleanLocalCssImportWrapperTailwindDirectives, cleanLocalCssImportWrapperTailwindDirectivesRoot, collectApplyOnlyCssSelectors, collectApplyOnlyCssSelectorsRoot, collectCssImportRequestsRoot, collectCssInlineSourceCandidates, compileCssMacroConditionalComments, consumeCascadeLayers, containsCssAfterMinify, convertTailwindcssRpxDeclarationToRem, convertTailwindcssRpxDeclarationsToRem, convertTailwindcssRpxValueToRem, createCssRuleMatcher, createCssSourceOrderAppend, createFallbackPlaceholderReplacer, createInjectPreflight, createPostcssStyleTargetProfile, createSourceScanPattern, createStyleHandler, createStylePipeline, createTailwindSourceEntryMatcher, createWeappTailwindcssPostcssPlugin, creator as cssMacroPostcssPlugin, dedupeCoveredCssRules, expandInlineSourceCandidatePattern, expandTailwindSourceEntries, filterApplyOnlyGeneratedCss, filterApplyOnlyGeneratedCssRoot, filterExistingCssRules, finalizeMiniProgramCss, finalizeMiniProgramCssRoot, getPostcssPluginName, hasCssMacroStyleOptions, hasCssMacroTailwindV4CustomVariantConditionalComments, hasCssMacroTailwindV4Directive, hasCssMacroTailwindV4InternalAtRules, hasCssMacroTailwindV4Source, hasMiniProgramCssSpecificityPlaceholders, hoistTailwindPreflightBase, internalCssSelectorReplacer, isFileExcludedByTailwindSourceEntries, isFileMatchedByTailwindSourceEntries, isLocalCssImportRequest, isMiniProgramLocalCssImportRequest, isPureLocalCssImportWrapper, isPureLocalCssImportWrapperRoot, isTailwindCssGenerationDirective, isTailwindCssImportAtRule, isTailwindCssImportRequest, isTailwindCssPackageJsonImportRequest, isWeappTailwindcssImportRequest, mergeCoveredCssRuleDeclarations, mergeMiniProgramPreflightRuleDeclarations, mergeMiniProgramThemeScopeRuleDeclarations, normalizeLegacyContentEntries, normalizeMiniProgramGeneratedCssForPostcss, normalizeMiniProgramPrefixedDeclaration, normalizeModernColorValue, normalizeOutputImportRequest, normalizeTailwindCssImportRequest, normalizeTailwindcssRpxDeclaration, normalizeTailwindcssRpxDeclarations, normalizeTailwindcssV4InfinityCalcCss, normalizeTailwindcssV4InfinityRadiusCss, normalizeTailwindcssWebRpxDeclarations, normalizeUniAppXImportantApplyForSass, normalizeWebCssCompatOptions, parseConfigParam, parseSourceFileParam, parseTailwindCssConfigRequest, parseTailwindCssDirectiveRequest, postcss, postcssHtmlTransform, prefixLocalCssImportsWithWebpackIgnoreRoot, protectDynamicColorMixAlpha, protectDynamicVarFallbacks, pruneMiniProgramGeneratedCss, removeEmptyAtRules, removeEmptyRules, removeMatchingLocalCssImports, removeMatchingLocalCssImportsRoot, removeTailwindPostcssPlugins, removeTailwindSourceDirectivesRoot, removeUnsupportedAtSupports, removeUnsupportedCascadeLayers, removeUnsupportedMiniProgramAtRules, removeUnsupportedMiniProgramCssImportsRoot, removeUnsupportedMiniProgramPrefixedAtRule, repairTrailingUnclosedTailwindSourceMedia, resolveCssSourceEntries, resolveFilteredPostcssConfig, resolvePostcssConfig, resolvePostcssFrameworkProfile, resolvePostcssFrameworkStrategy, resolvePostcssStyleBranch, resolvePostcssStyleBranchProfile, resolvePostcssStyleTarget, resolveSourceScanPath, resolveTailwindSourceEntry, restoreLocalCssImports, restoreUniAppXImportantApplyMarker, rewriteLocalCssImportRequestsForOutput, rewriteLocalCssImportRequestsForOutputRoot, selectorContainsPseudoClass, splitLocalCssImports, splitLocalCssImportsRoot, stripMiniProgramCssSpecificityPlaceholders, toPosixPath, transformCssMacroCss, transformCssMacroTailwindV4Source, transformLynxCssCompat, transformWebCssCompat, transformWebCssSafeSelectors, unitConversionComposeRules, unitConversionPresets, unwrapUnsupportedCascadeLayers, withCssMacroStyleOptions };

package/dist/types.d.ts

@@ -140,6 +140,19 @@ export interface CssOptions {
     tailwindcssV4GradientFallback?: boolean | undefined;
 }
 export type IStyleHandlerOptions = {
+    /** 编译诊断回调；由上层 bundler 注入，保持 PostCSS 包与 compiler 解耦。 */
+    onDiagnostic?: (event: {
+        phase: 'postcss';
+        durationMs: number;
+        cache?: {
+            hit: boolean;
+            key?: string;
+        };
+        error?: {
+            name?: string;
+            message: string;
+        };
+    }) => void | Promise<void>;
     appType?: PostcssAppType | undefined;
     ctx?: PostcssContext | undefined;
     /**

package/dist/vite-css-rules/containment.d.ts

@@ -1,2 +1,7 @@
+/** 对同一份不可变主样式复用比较索引；调用方在主样式更新后创建新的 matcher。 */
+export declare function createCssRuleMatcher(baseCss: string): {
+    contains: (css: string) => boolean;
+    filter: (css: string) => string;
+};
 export declare function filterExistingCssRules(baseCss: string, css: string): string;
 export declare function containsCssAfterMinify(baseCss: string, css: string): boolean;

package/dist/vite-css-rules/structure.d.ts

@@ -7,8 +7,8 @@ export declare function normalizeCssForContainment(css: string): string;
 export declare function collectNormalizedCssNodes(css: string): string[];
 export declare function getCssRuleStructuralKey(rule: postcss.Rule): string | undefined;
 export declare function getCssRuleStructuralKeyWithSelectorKey(rule: postcss.Rule, selectorKey: string): string;
-export declare function getCssRuleContentKey(rule: postcss.Rule): string | undefined;
-export declare function collectCssRuleContentKeys(css: string): Set<string>;
+export declare function getCssRuleContentKey(rule: postcss.Rule, content?: string): string | undefined;
+export declare function collectCssRuleContentKeys(css: string, requiredBaseContent?: string): Set<string>;
 export declare function normalizeCssDeclarationKey(decl: postcss.Declaration): string;
 export declare function parseVarReferenceValue(value: string): string | undefined;
 export declare function isEquivalentVarFallbackDeclaration(incoming: postcss.Declaration, baseDeclarations: Set<string>): boolean;

package/dist/vite-css-rules.d.ts

@@ -1,3 +1,3 @@
-export { containsCssAfterMinify, filterExistingCssRules } from './vite-css-rules/containment.js';
+export { containsCssAfterMinify, createCssRuleMatcher, filterExistingCssRules } from './vite-css-rules/containment.js';
 export { dedupeCoveredCssRules, mergeCoveredCssRuleDeclarations } from './vite-css-rules/coverage.js';
 export { mergeMiniProgramPreflightRuleDeclarations, mergeMiniProgramThemeScopeRuleDeclarations } from './vite-css-rules/mini-program.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-tailwindcss/postcss",
   "type": "module",
-  "version": "3.3.2",
+  "version": "3.3.4",
   "description": "PostCSS transforms that bring Tailwind CSS compatibility to every platform. 将 Tailwind CSS 兼容能力带到全端的 PostCSS 转换工具。",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -71,27 +71,26 @@
     "@csstools/css-tokenizer": "^4.0.0",
     "@tailwindcss-mangle/engine": "0.2.0",
     "@weapp-core/escape": "~8.0.0",
-    "@weapp-tailwindcss/postcss-calc": "1.0.5",
+    "@weapp-tailwindcss/postcss-calc": "1.0.7",
     "@weapp-tailwindcss/shared": "2.0.3",
-    "autoprefixer": "^10.5.4",
+    "autoprefixer": "^10.5.6",
     "es-toolkit": "^1.52.0",
     "lru-cache": "11.5.2",
     "micromatch": "^4.0.8",
-    "postcss": "^8.5.26",
+    "postcss": "^8.5.28",
     "postcss-load-config": "^6.0.1",
-    "postcss-preset-env": "^11.5.1",
+    "postcss-preset-env": "^11.5.2",
     "postcss-pxtrans": "^1.0.4",
     "postcss-rem-to-responsive-pixel": "^7.0.5",
     "postcss-rule-unit-converter": "^0.2.3",
     "postcss-scss": "^4.0.9",
-    "postcss-selector-parser": "^7.1.5",
+    "postcss-selector-parser": "^7.1.6",
     "postcss-value-parser": "^4.2.0",
     "tailwindcss-config": "2.0.4"
   },
   "devDependencies": {
     "@csstools/postcss-is-pseudo-class": "^6.0.0",
-    "fast-check": "^4.9.0",
-    "postcss-calc": "link:../postcss-calc",
+    "fast-check": "^4.10.0",
     "postcss-custom-properties": "^15.0.1"
   },
   "scripts": {