weapp-tailwindcss 5.5.8 → 5.5.9

package/dist/bundlers/vite/css-calc-stage.d.ts

@@ -0,0 +1,8 @@
+import type { IStyleHandlerOptions } from '@weapp-tailwindcss/postcss/types';
+import type { InternalUserDefinedOptions } from '../../types/index.js';
+export interface ViteCssCalcStage {
+    options: InternalUserDefinedOptions;
+    getFinalOptions: () => Partial<IStyleHandlerOptions> | undefined;
+    shouldDefer: () => boolean;
+}
+export declare function createViteCssCalcStage(original: InternalUserDefinedOptions, isBuild: () => boolean, getPlatform?: () => string | undefined): ViteCssCalcStage;

package/dist/bundlers/vite/css-finalizer/css-calc.d.ts

@@ -1,3 +1,4 @@
 import type { OutputBundle } from 'rollup';
 import type { CssFinalizerContext } from './options.js';
+export declare function finalizeCssCalc(bundle: OutputBundle, context: CssFinalizerContext, convertUnits?: boolean): Promise<void>;
 export declare function finalizeWebCssCalc(bundle: OutputBundle, context: CssFinalizerContext): Promise<void>;

package/dist/bundlers/vite/css-finalizer/css-scope-graph.d.ts

@@ -0,0 +1,5 @@
+import type { OutputBundle } from 'rollup';
+export declare function collectCssCalcScopes(bundle: OutputBundle, options: {
+    matchesCss: (file: string) => boolean;
+    onConditionalSource?: (file: string) => void;
+}): Map<string, Set<string>>;

package/dist/bundlers/vite/css-finalizer/final-assets.d.ts

@@ -1,3 +1,3 @@
 import type { OutputBundle } from 'rollup';
 import type { CssFinalizerContext } from './options.js';
-export declare function finalizeCssAssets(bundle: OutputBundle, context: CssFinalizerContext, isWebGeneratorTarget: boolean, files: ReadonlySet<string>): Promise<void> | undefined;
+export declare function finalizeCssAssets(bundle: OutputBundle, context: CssFinalizerContext, isWebGeneratorTarget: boolean, files: ReadonlySet<string>): Promise<void>;

package/dist/bundlers/vite/css-finalizer/options.d.ts

@@ -13,6 +13,7 @@ interface RememberedMainCssSource {
 export interface CssFinalizerContext {
     frameworkName?: string | undefined;
     opts: InternalUserDefinedOptions;
+    getFinalCssCalcOptions?: (() => Partial<IStyleHandlerOptions> | undefined) | undefined;
     runtimeState: {
         tailwindRuntime: InternalUserDefinedOptions['tailwindRuntime'];
         readyPromise: Promise<void>;

package/dist/{compiler-DbwS3329.cjs → compiler-TvqqdOMD.cjs}

@@ -1,8 +1,8 @@
 const require_rolldown_runtime = require("./rolldown-runtime-fg3euq-1.cjs");
 const require_framework = require("./framework.cjs");
-const require_generator = require("./generator-CxauQbx3.cjs");
+const require_generator = require("./generator-B1sYQpWu.cjs");
 require("./utils-CuKLf1Zv.cjs");
-const require_tailwindcss = require("./tailwindcss-U3KIUegn.cjs");
+const require_tailwindcss = require("./tailwindcss-uf04Iolj.cjs");
 const require_defaults = require("./defaults-CyX5iO9y.cjs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
@@ -59,21 +59,11 @@ function createGenerationArtifact(fragments, options) {
 }
 //#endregion
 //#region src/core/compiler/source-fingerprint.ts
-function stableSerialize(value, stack = /* @__PURE__ */ new WeakSet()) {
-	if (value == null || typeof value === "number" || typeof value === "boolean" || typeof value === "string") return JSON.stringify(value);
-	if (typeof value === "function") return `[Function:${value.name}]`;
-	if (typeof value !== "object") return String(value);
-	if (stack.has(value)) return "[Circular]";
-	stack.add(value);
-	const serialized = Array.isArray(value) ? `[${value.map((item) => stableSerialize(item, stack)).join(",")}]` : `{${Object.keys(value).sort().map((key) => `${JSON.stringify(key)}:${stableSerialize(value[key], stack)}`).join(",")}}`;
-	stack.delete(value);
-	return serialized;
-}
 function createSourceFingerprint(source) {
 	return createCompilerValueFingerprint(source);
 }
 function createCompilerValueFingerprint(value) {
-	return (0, _weapp_tailwindcss_shared_node.md5)(stableSerialize(value));
+	return (0, _weapp_tailwindcss_shared_node.md5)(require_generator.stableSerialize(value));
 }
 //#endregion
 //#region src/compiler/candidate-index.ts
@@ -871,10 +861,10 @@ var AssetEmissionPlan = class {
 //#region src/core/compiler/generation-cache.ts
 function createCompilerGenerationCacheKey(request, candidates, target) {
 	return {
-		bareArbitraryValues: request.bareArbitraryValues,
+		bareArbitraryValuesFingerprint: request.bareArbitraryValues === void 0 ? void 0 : createCompilerValueFingerprint(request.bareArbitraryValues),
 		candidateSignature: [...candidates].sort().join("\0"),
 		incrementalCache: request.incrementalCache,
-		scanSources: request.scanSources,
+		scanSourcesFingerprint: request.scanSources === void 0 ? void 0 : createCompilerValueFingerprint(request.scanSources),
 		scanMode: request.scanMode,
 		excludeFilesFingerprint: request.excludeFiles === void 0 ? void 0 : createCompilerValueFingerprint(request.excludeFiles),
 		sourcesFingerprint: request.sources === void 0 ? void 0 : createCompilerValueFingerprint(request.sources),
@@ -883,7 +873,7 @@ function createCompilerGenerationCacheKey(request, candidates, target) {
 	};
 }
 function isSameCompilerGenerationCacheKey(left, right) {
-	return left.bareArbitraryValues === right.bareArbitraryValues && left.candidateSignature === right.candidateSignature && left.incrementalCache === right.incrementalCache && left.scanSources === right.scanSources && left.scanMode === right.scanMode && left.excludeFilesFingerprint === right.excludeFilesFingerprint && left.sourcesFingerprint === right.sourcesFingerprint && left.styleOptionsFingerprint === right.styleOptionsFingerprint && left.target === right.target;
+	return left.bareArbitraryValuesFingerprint === right.bareArbitraryValuesFingerprint && left.candidateSignature === right.candidateSignature && left.incrementalCache === right.incrementalCache && left.scanSourcesFingerprint === right.scanSourcesFingerprint && left.scanMode === right.scanMode && left.excludeFilesFingerprint === right.excludeFilesFingerprint && left.sourcesFingerprint === right.sourcesFingerprint && left.styleOptionsFingerprint === right.styleOptionsFingerprint && left.target === right.target;
 }
 function reuseCompilerGenerationResult(result) {
 	return {
@@ -1051,7 +1041,7 @@ var CompilerRootStore = class {
 			entry.generationCache = void 0;
 			entry.latestSnapshot = void 0;
 			entry.source = void 0;
-			entry.sourceInput = void 0;
+			entry.sourceInputFingerprint = void 0;
 			entry.sourceFingerprint = void 0;
 			entry.sources = [];
 			if (notifyEvicted) this.onRootEvicted?.(id);
@@ -1229,6 +1219,28 @@ function createImmutableSet(values) {
 	return new ImmutableSetView(values);
 }
 //#endregion
+//#region src/core/compiler/source.ts
+async function resolveCompilerSource(entry, request, invalidation) {
+	if (request.source && request.sourceOptions) throw new Error("generate() 的 source 与 sourceOptions 互斥。");
+	if (!request.source && !request.sourceOptions) throw new Error("generate() 必须提供 source 或 sourceOptions。");
+	const input = structuredClone(request.source ? { source: request.source } : {
+		sourceOptions: request.sourceOptions,
+		cwd: node_process.default.cwd()
+	});
+	const sourceInputFingerprint = createCompilerValueFingerprint(input);
+	if (entry.source !== void 0 && entry.sourceFingerprint !== void 0 && entry.sourceInputFingerprint === sourceInputFingerprint && entry.appliedInvalidation === invalidation) return {
+		source: entry.source,
+		sourceFingerprint: entry.sourceFingerprint,
+		sourceInputFingerprint
+	};
+	const source = input.source ?? await require_generator.resolveTailwindV4Source(input.sourceOptions);
+	return {
+		source,
+		sourceFingerprint: createSourceFingerprint(source),
+		sourceInputFingerprint
+	};
+}
+//#endregion
 //#region src/cache/index.ts
 function isProcessResult(value) {
 	return typeof value === "object" && value !== null && "result" in value;
@@ -35863,7 +35875,7 @@ function babelParse(code, opts = {}) {
 	return result;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/magic-string@1.4.1/node_modules/magic-string/dist/index.mjs
+//#region ../../node_modules/.pnpm/magic-string@1.4.2/node_modules/magic-string/dist/index.mjs
 var BitSet = class BitSet {
 	constructor(arg) {
 		this.bits = arg instanceof BitSet ? arg.bits.slice() : [];
@@ -35957,7 +35969,7 @@ var Chunk = class Chunk {
 		this.outro = "";
 		this.end = index;
 		if (this.edited) {
-			newChunk.edit("", false);
+			newChunk.edit("", false, true);
 			this.content = "";
 		} else this.content = originalBefore;
 		newChunk.next = this.next;
@@ -36919,7 +36931,7 @@ var MagicString = class MagicString {
 	* Content appended or prepended at positions strictly inside the range is removed with it, while
 	* content attached at `start` or `end` is preserved — use `s.overwrite(start, end, '')` to remove
 	* the range including its edge inserts.
-	* Removing the same content twice, or making removals that partially overlap, will cause an error.
+	* Repeated removals and removals with partially overlapping ranges are allowed.
 	*/
 	remove(start, end) {
 		start = start + this.offset;
@@ -37201,10 +37213,16 @@ var MagicString = class MagicString {
 	* @internal
 	*/
 	_hasRemovedContent(start, end) {
-		let chunk = this.firstChunk;
-		while (chunk) {
-			if (chunk.content === "" && chunk.start < end && chunk.end > start) return true;
-			chunk = chunk.next;
+		let chunk = this.byStart.get(start);
+		if (!chunk) {
+			chunk = this.lastSearchedChunk;
+			const searchForward = start >= chunk.end;
+			while (chunk && !chunk.contains(start)) chunk = searchForward ? this.byStart.get(chunk.end) : this.byEnd.get(chunk.start);
+			if (chunk) this.lastSearchedChunk = chunk;
+		}
+		while (chunk && chunk.start < end) {
+			if (chunk.content === "") return true;
+			chunk = this.byStart.get(chunk.end);
 		}
 		return false;
 	}
@@ -37268,6 +37286,7 @@ var MagicString = class MagicString {
 		const stringLength = string.length;
 		if (stringLength === 0) {
 			for (let index = 0; index <= original.length; index += 1) {
+				if (this._hasRemovedContent(index, index)) continue;
 				const _replacement = typeof replacement === "function" ? replacement("", index, original) : expandReplacement(replacement, "", index, original, [], void 0);
 				if (_replacement !== "") this.appendRight(index, _replacement);
 			}
@@ -41312,20 +41331,10 @@ function createCompiler(options = {}) {
 		track,
 		userOptions
 	});
-	async function resolveRequestSource(entry, request) {
-		if (request.source && request.sourceOptions) throw new Error("generate() 的 source 与 sourceOptions 互斥。");
-		if (!request.source && !request.sourceOptions) throw new Error("generate() 必须提供 source 或 sourceOptions。");
-		const sourceInput = request.source ?? request.sourceOptions;
-		return {
-			source: entry.source !== void 0 && entry.sourceInput === sourceInput && entry.appliedInvalidation === entry.invalidation ? entry.source : request.source ?? await require_generator.resolveTailwindV4Source(request.sourceOptions),
-			sourceInput
-		};
-	}
 	async function runGenerate(entry, request) {
 		if (!entry.active) throw new Error(`Compiler root 已被移除：${entry.id}`);
 		const invalidation = entry.invalidation;
-		const { source, sourceInput } = await resolveRequestSource(entry, request);
-		const sourceFingerprint = entry.sourceInput === sourceInput && entry.sourceFingerprint !== void 0 && entry.appliedInvalidation === invalidation ? entry.sourceFingerprint : createSourceFingerprint(source);
+		const { source, sourceFingerprint, sourceInputFingerprint } = await resolveCompilerSource(entry, request, invalidation);
 		const sourceReused = entry.sourceFingerprint === sourceFingerprint;
 		const engineReused = sourceReused && entry.generator !== void 0 && entry.appliedInvalidation === invalidation;
 		const generator = engineReused ? entry.generator : require_generator.createWeappTailwindcssGenerator(source);
@@ -41372,15 +41381,18 @@ function createCompiler(options = {}) {
 			entry.generator = generator;
 			entry.generationCache = {
 				key: generationCacheKey,
-				result: generated
+				result: {
+					...generated,
+					sources: [...snapshot.sources]
+				}
 			};
 			entry.source = source;
 			entry.sourceFingerprint = sourceFingerprint;
-			entry.sourceInput = sourceInput;
+			entry.sourceInputFingerprint = sourceInputFingerprint;
 			entry.appliedInvalidation = invalidation;
 			entry.latestSnapshot = snapshot;
 			rootStore.attachDependencies(entry, dependencies);
-			rootStore.attachSources(entry, sources);
+			rootStore.attachSources(entry, snapshot.sources);
 			if (!engineReused && previousGenerator !== generator) previousGenerator?.dispose?.();
 			const css = target === "tailwind" ? generated.rawCss : generated.css;
 			const incrementalCss = target === "tailwind" ? generated.incrementalRawCss : generated.incrementalCss;

package/dist/{compiler-CThodfGH.js → compiler-v9sYta8W.js}

@@ -1,6 +1,6 @@
-import { c as getRuntimeClassSetCacheEntry, d as invalidateRuntimeClassSet, i as resolveUniAppXOptions, o as applyV4CssCalcDefaults, s as warnMissingCssEntries, t as createTailwindcssRuntimeFromContext, u as getRuntimeClassSetSignatureWithSources, v as source_scan_exports } from "./tailwindcss-kSd0ykiX.js";
+import { c as getRuntimeClassSetCacheEntry, d as invalidateRuntimeClassSet, i as resolveUniAppXOptions, o as applyV4CssCalcDefaults, s as warnMissingCssEntries, t as createTailwindcssRuntimeFromContext, u as getRuntimeClassSetSignatureWithSources, v as source_scan_exports } from "./tailwindcss-XNfJSlhp.js";
 import { resolveMpxPlatform } from "./framework.js";
-import { B as loadTailwindV4DesignSystem, I as resolveCssMacroTailwindV4Source, M as createTailwindV4Engine$1, N as _defineProperty, O as resolveRuntimeBareArbitraryValues, T as omitUndefined, V as resolveValidTailwindV4Candidates$1, a as resolveGeneratorRuntimeBranch, d as resolveTailwindV4SourceFromRuntime, i as normalizeWeappTailwindcssGeneratorOptions, j as resolveBooleanObjectOption, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source$1, z as shouldUseUniAppWebRpxCompatibility } from "./generator-oKZ5mCJ5.js";
+import { B as stableSerialize, H as loadTailwindV4DesignSystem, L as resolveCssMacroTailwindV4Source, M as createTailwindV4Engine$1, O as resolveRuntimeBareArbitraryValues, P as _defineProperty, T as omitUndefined, U as resolveValidTailwindV4Candidates$1, V as shouldUseUniAppWebRpxCompatibility, a as resolveGeneratorRuntimeBranch, d as resolveTailwindV4SourceFromRuntime, i as normalizeWeappTailwindcssGeneratorOptions, j as resolveBooleanObjectOption, t as createWeappTailwindcssGenerator, u as resolveTailwindV4Source$1 } from "./generator-LqofzXgr.js";
 import { i as isMap, n as defuOverrideArray$1 } from "./utils-MVwpU07P.js";
 import { a as DEFAULT_PARSE_CACHE_MAX_SOURCE_LENGTH, i as resolveDefaultCssPreflight, o as HARD_PARSE_CACHE_MAX_ENTRIES, r as getDefaultOptions } from "./defaults-AQuvJS-h.js";
 import { createRequire } from "node:module";
@@ -59,16 +59,6 @@ function createGenerationArtifact(fragments, options) {
 }
 //#endregion
 //#region src/core/compiler/source-fingerprint.ts
-function stableSerialize(value, stack = /* @__PURE__ */ new WeakSet()) {
-	if (value == null || typeof value === "number" || typeof value === "boolean" || typeof value === "string") return JSON.stringify(value);
-	if (typeof value === "function") return `[Function:${value.name}]`;
-	if (typeof value !== "object") return String(value);
-	if (stack.has(value)) return "[Circular]";
-	stack.add(value);
-	const serialized = Array.isArray(value) ? `[${value.map((item) => stableSerialize(item, stack)).join(",")}]` : `{${Object.keys(value).sort().map((key) => `${JSON.stringify(key)}:${stableSerialize(value[key], stack)}`).join(",")}}`;
-	stack.delete(value);
-	return serialized;
-}
 function createSourceFingerprint(source) {
 	return createCompilerValueFingerprint(source);
 }
@@ -895,10 +885,10 @@ function createCompilationEventBus() {
 //#region src/core/compiler/generation-cache.ts
 function createCompilerGenerationCacheKey(request, candidates, target) {
 	return {
-		bareArbitraryValues: request.bareArbitraryValues,
+		bareArbitraryValuesFingerprint: request.bareArbitraryValues === void 0 ? void 0 : createCompilerValueFingerprint(request.bareArbitraryValues),
 		candidateSignature: [...candidates].sort().join("\0"),
 		incrementalCache: request.incrementalCache,
-		scanSources: request.scanSources,
+		scanSourcesFingerprint: request.scanSources === void 0 ? void 0 : createCompilerValueFingerprint(request.scanSources),
 		scanMode: request.scanMode,
 		excludeFilesFingerprint: request.excludeFiles === void 0 ? void 0 : createCompilerValueFingerprint(request.excludeFiles),
 		sourcesFingerprint: request.sources === void 0 ? void 0 : createCompilerValueFingerprint(request.sources),
@@ -907,7 +897,7 @@ function createCompilerGenerationCacheKey(request, candidates, target) {
 	};
 }
 function isSameCompilerGenerationCacheKey(left, right) {
-	return left.bareArbitraryValues === right.bareArbitraryValues && left.candidateSignature === right.candidateSignature && left.incrementalCache === right.incrementalCache && left.scanSources === right.scanSources && left.scanMode === right.scanMode && left.excludeFilesFingerprint === right.excludeFilesFingerprint && left.sourcesFingerprint === right.sourcesFingerprint && left.styleOptionsFingerprint === right.styleOptionsFingerprint && left.target === right.target;
+	return left.bareArbitraryValuesFingerprint === right.bareArbitraryValuesFingerprint && left.candidateSignature === right.candidateSignature && left.incrementalCache === right.incrementalCache && left.scanSourcesFingerprint === right.scanSourcesFingerprint && left.scanMode === right.scanMode && left.excludeFilesFingerprint === right.excludeFilesFingerprint && left.sourcesFingerprint === right.sourcesFingerprint && left.styleOptionsFingerprint === right.styleOptionsFingerprint && left.target === right.target;
 }
 function reuseCompilerGenerationResult(result) {
 	return {
@@ -1075,7 +1065,7 @@ var CompilerRootStore = class {
 			entry.generationCache = void 0;
 			entry.latestSnapshot = void 0;
 			entry.source = void 0;
-			entry.sourceInput = void 0;
+			entry.sourceInputFingerprint = void 0;
 			entry.sourceFingerprint = void 0;
 			entry.sources = [];
 			if (notifyEvicted) this.onRootEvicted?.(id);
@@ -1253,6 +1243,28 @@ function createImmutableSet(values) {
 	return new ImmutableSetView(values);
 }
 //#endregion
+//#region src/core/compiler/source.ts
+async function resolveCompilerSource(entry, request, invalidation) {
+	if (request.source && request.sourceOptions) throw new Error("generate() 的 source 与 sourceOptions 互斥。");
+	if (!request.source && !request.sourceOptions) throw new Error("generate() 必须提供 source 或 sourceOptions。");
+	const input = structuredClone(request.source ? { source: request.source } : {
+		sourceOptions: request.sourceOptions,
+		cwd: process.cwd()
+	});
+	const sourceInputFingerprint = createCompilerValueFingerprint(input);
+	if (entry.source !== void 0 && entry.sourceFingerprint !== void 0 && entry.sourceInputFingerprint === sourceInputFingerprint && entry.appliedInvalidation === invalidation) return {
+		source: entry.source,
+		sourceFingerprint: entry.sourceFingerprint,
+		sourceInputFingerprint
+	};
+	const source = input.source ?? await resolveTailwindV4Source$1(input.sourceOptions);
+	return {
+		source,
+		sourceFingerprint: createSourceFingerprint(source),
+		sourceInputFingerprint
+	};
+}
+//#endregion
 //#region src/cache/index.ts
 function isProcessResult(value) {
 	return typeof value === "object" && value !== null && "result" in value;
@@ -4427,20 +4439,10 @@ function createCompiler(options = {}) {
 		track,
 		userOptions
 	});
-	async function resolveRequestSource(entry, request) {
-		if (request.source && request.sourceOptions) throw new Error("generate() 的 source 与 sourceOptions 互斥。");
-		if (!request.source && !request.sourceOptions) throw new Error("generate() 必须提供 source 或 sourceOptions。");
-		const sourceInput = request.source ?? request.sourceOptions;
-		return {
-			source: entry.source !== void 0 && entry.sourceInput === sourceInput && entry.appliedInvalidation === entry.invalidation ? entry.source : request.source ?? await resolveTailwindV4Source$1(request.sourceOptions),
-			sourceInput
-		};
-	}
 	async function runGenerate(entry, request) {
 		if (!entry.active) throw new Error(`Compiler root 已被移除：${entry.id}`);
 		const invalidation = entry.invalidation;
-		const { source, sourceInput } = await resolveRequestSource(entry, request);
-		const sourceFingerprint = entry.sourceInput === sourceInput && entry.sourceFingerprint !== void 0 && entry.appliedInvalidation === invalidation ? entry.sourceFingerprint : createSourceFingerprint(source);
+		const { source, sourceFingerprint, sourceInputFingerprint } = await resolveCompilerSource(entry, request, invalidation);
 		const sourceReused = entry.sourceFingerprint === sourceFingerprint;
 		const engineReused = sourceReused && entry.generator !== void 0 && entry.appliedInvalidation === invalidation;
 		const generator = engineReused ? entry.generator : createWeappTailwindcssGenerator(source);
@@ -4487,15 +4489,18 @@ function createCompiler(options = {}) {
 			entry.generator = generator;
 			entry.generationCache = {
 				key: generationCacheKey,
-				result: generated
+				result: {
+					...generated,
+					sources: [...snapshot.sources]
+				}
 			};
 			entry.source = source;
 			entry.sourceFingerprint = sourceFingerprint;
-			entry.sourceInput = sourceInput;
+			entry.sourceInputFingerprint = sourceInputFingerprint;
 			entry.appliedInvalidation = invalidation;
 			entry.latestSnapshot = snapshot;
 			rootStore.attachDependencies(entry, dependencies);
-			rootStore.attachSources(entry, sources);
+			rootStore.attachSources(entry, snapshot.sources);
 			if (!engineReused && previousGenerator !== generator) previousGenerator?.dispose?.();
 			const css = target === "tailwind" ? generated.rawCss : generated.css;
 			const incrementalCss = target === "tailwind" ? generated.incrementalRawCss : generated.incrementalCss;

package/dist/core/compiler/generation-cache.d.ts

@@ -5,10 +5,10 @@ export interface CompilerGenerationCacheEntry {
     result: WeappTailwindcssGenerateResult;
 }
 interface CompilerGenerationCacheKey {
-    bareArbitraryValues: CompilerGenerateRequest['bareArbitraryValues'];
+    bareArbitraryValuesFingerprint: string | undefined;
     candidateSignature: string;
     incrementalCache: CompilerGenerateRequest['incrementalCache'];
-    scanSources: CompilerGenerateRequest['scanSources'];
+    scanSourcesFingerprint: string | undefined;
     scanMode: CompilerGenerateRequest['scanMode'];
     excludeFilesFingerprint: string | undefined;
     sourcesFingerprint: string | undefined;
@@ -22,6 +22,8 @@ export declare function reuseCompilerGenerationResult(result: WeappTailwindcssGe
     incrementalRawCss: string;
     css: string;
     rawCss: string;
+    customPropertyValues?: ReadonlyMap<string, string> | undefined;
+    customPropertyContextCss?: string | undefined;
     target: "weapp" | "web";
     root: import("@weapp-tailwindcss/engine").TailwindV4CompiledSourceRoot;
     sources: import("@weapp-tailwindcss/engine").TailwindV4SourcePattern[];

package/dist/core/compiler/root-store.d.ts

@@ -20,7 +20,7 @@ export interface CompilerRootSession {
     pendingCount: number;
     source?: TailwindV4ResolvedSource | undefined;
     sourceFingerprint?: string | undefined;
-    sourceInput?: object | undefined;
+    sourceInputFingerprint?: string | undefined;
     sources: CompilerSourcePattern[];
 }
 export declare class CompilerRootStore {

package/dist/core/compiler/source.d.ts

@@ -0,0 +1,7 @@
+import type { CompilerRootSession } from './root-store.js';
+import type { CompilerGenerateRequest } from './types.js';
+export declare function resolveCompilerSource(entry: CompilerRootSession, request: CompilerGenerateRequest, invalidation: number): Promise<{
+    source: import("../../generator/index.js").TailwindV4ResolvedSource;
+    sourceFingerprint: string;
+    sourceInputFingerprint: string;
+}>;

package/dist/core.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_compiler = require("./compiler-DbwS3329.cjs");
+const require_compiler = require("./compiler-TvqqdOMD.cjs");
 const require_runtime_state = require("./runtime-state-BOzuVoKl.cjs");
 let _weapp_tailwindcss_postcss_transform = require("@weapp-tailwindcss/postcss/transform");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");

package/dist/core.js

@@ -1,4 +1,4 @@
-import { A as createTailwindRuntimeReadyPromise, F as createCompilationEventBus, d as createCompiler, f as getCompilerContext, j as ensureRuntimeClassSet, t as createCompilerRuntimeState, y as shouldSkipJsTransform } from "./compiler-CThodfGH.js";
+import { A as createTailwindRuntimeReadyPromise, F as createCompilationEventBus, d as createCompiler, f as getCompilerContext, j as ensureRuntimeClassSet, t as createCompilerRuntimeState, y as shouldSkipJsTransform } from "./compiler-v9sYta8W.js";
 import { finalizeMiniProgramCss, finalizeMiniProgramCssRoot, postcss, removeTailwindSourceDirectivesRoot } from "@weapp-tailwindcss/postcss/transform";
 import { defuOverrideArray } from "@weapp-tailwindcss/shared";
 import { performance } from "node:perf_hooks";

package/dist/{generated-css-marker-B0RyziOH.cjs → generated-css-marker-C21q8hGM.cjs}

@@ -1,8 +1,8 @@
 const require_rolldown_runtime = require("./rolldown-runtime-fg3euq-1.cjs");
-const require_generator = require("./generator-CxauQbx3.cjs");
+const require_generator = require("./generator-B1sYQpWu.cjs");
 require("./auto-B1OyRrE8.cjs");
-const require_compiler = require("./compiler-DbwS3329.cjs");
-const require_tailwindcss = require("./tailwindcss-U3KIUegn.cjs");
+const require_compiler = require("./compiler-TvqqdOMD.cjs");
+const require_tailwindcss = require("./tailwindcss-uf04Iolj.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
@@ -1171,15 +1171,24 @@ function mergeGeneratorResults(generatedResults) {
 	if (generatedResults.length === 1) return firstGenerated;
 	const incrementalCssResults = generatedResults.map((item) => item.incrementalCss).filter((css) => typeof css === "string");
 	const incrementalRawCssResults = generatedResults.map((item) => item.incrementalRawCss).filter((css) => typeof css === "string");
+	const customPropertyValues = /* @__PURE__ */ new Map();
+	const conflictingProperties = /* @__PURE__ */ new Set();
+	for (const result of generatedResults) for (const [name, value] of result.customPropertyValues ?? []) {
+		if (customPropertyValues.has(name) && customPropertyValues.get(name) !== value) conflictingProperties.add(name);
+		customPropertyValues.set(name, value);
+	}
+	for (const name of conflictingProperties) customPropertyValues.delete(name);
 	return {
 		...firstGenerated,
 		css: (0, _weapp_tailwindcss_postcss_transform.deduplicateGeneratedCssRules)(generatedResults.map((item) => item.css).join("\n")),
 		rawCss: (0, _weapp_tailwindcss_postcss_transform.deduplicateGeneratedCssRules)(generatedResults.map((item) => item.rawCss).join("\n")),
+		customPropertyContextCss: generatedResults.map((item) => item.customPropertyContextCss ?? item.rawCss).join("\n"),
 		incrementalCss: incrementalCssResults.length === generatedResults.length ? incrementalCssResults.filter(Boolean).join("\n") : void 0,
 		incrementalRawCss: incrementalRawCssResults.length === generatedResults.length ? incrementalRawCssResults.filter(Boolean).join("\n") : void 0,
 		classSet: new Set(generatedResults.flatMap((item) => [...item.classSet])),
 		dependencies: [...new Set(generatedResults.flatMap((item) => item.dependencies))],
-		sources: generatedResults.flatMap((item) => item.sources)
+		sources: generatedResults.flatMap((item) => item.sources),
+		customPropertyValues
 	};
 }
 //#endregion
@@ -1244,12 +1253,12 @@ function collectRpxThemeRiskSources(sources) {
 	for (const css of new Set(sources)) for (const name of (0, _weapp_tailwindcss_postcss_transform.collectRpxThemeVariables)(css)) variables.add(name);
 	return [...variables];
 }
-function warnRpxThemeRisk(session, variables, outputCss) {
+function warnRpxThemeRisk(session, variables, generatedCss) {
 	if (warnedSessions.has(session) || variables.length === 0) return;
-	const usage = (0, _weapp_tailwindcss_postcss_transform.inspectRpxCalcUsage)(outputCss, new Set(variables));
-	const runtimeHint = usage === void 0 ? "当前 CSS 无法完成诊断，请检查最终 WXSS。" : usage.variables.length > 0 || usage.inlineRpx ? `当前输出仍含运行时 calc：${[...usage.variables, ...usage.inlineRpx ? ["内联 rpx"] : []].join(", ")}。` : "当前输出未检测到相关运行时 calc；这不代表已验证所有作用域和设备。";
+	const usage = (0, _weapp_tailwindcss_postcss_transform.inspectRpxCalcUsage)(generatedCss, new Set(variables));
+	const generationHint = usage === void 0 ? "当前生成阶段的 CSS 无法完成诊断，请检查最终 WXSS。" : usage.variables.length > 0 || usage.inlineRpx ? `当前生成阶段仍含 calc：${[...usage.variables, ...usage.inlineRpx ? ["内联 rpx"] : []].join(", ")}；后续构建处理可能将其静态化，最终状态以 WXSS 为准。` : "当前生成阶段未检测到相关 calc；这不代表已验证最终产物、所有作用域和设备。";
 	warnedSessions.add(session);
-	_weapp_tailwindcss_logger.logger.warn(`[tailwindcss@4][rpx-theme] @theme 中使用 rpx 的主题变量：${variables.join(", ")}。${runtimeHint} 微信 WXSS 可能先独立换算或量化基数再乘法，造成尺寸偏差，具体取整算法尚未确认。固定像素尺寸优先使用 px，需要缩放时在构建期输出最终静态 rpx；偶数或较大 rpx 也不保证准确。请检查最终 WXSS 并在目标设备验证：https://tw.weapp.dev/docs/issues/spacing-rpx`);
+	_weapp_tailwindcss_logger.logger.warn(`[tailwindcss@4][rpx-theme] @theme 中使用 rpx 的主题变量：${variables.join(", ")}。${generationHint} 微信 WXSS 可能先独立换算或量化基数再乘法，造成尺寸偏差，具体取整算法尚未确认。固定像素尺寸优先使用 px，需要缩放时在构建期输出最终静态 rpx；偶数或较大 rpx 也不保证准确。请检查最终 WXSS 并在目标设备验证：https://tw.weapp.dev/docs/issues/spacing-rpx`);
 }
 //#endregion
 //#region src/generation/framework-postcss.ts
@@ -2331,17 +2340,8 @@ function setLimitedCacheValue(cache, key, value) {
 	}
 	cache.set(key, value);
 }
-function createStableJson(value) {
-	if (value === void 0) return "undefined";
-	if (value === null || typeof value !== "object") return JSON.stringify(value);
-	if (Array.isArray(value)) return `[${value.map((item) => createStableJson(item)).join(",")}]`;
-	return `{${Object.keys(value).sort().map((key) => {
-		const record = value;
-		return `${JSON.stringify(key)}:${createStableJson(record[key])}`;
-	}).join(",")}}`;
-}
 function createLegacyCompatTransformCacheKey(source, options) {
-	return `${createStableJson(options)}\0${source}`;
+	return `${require_generator.stableSerialize(options)}\0${source}`;
 }
 function resolveLegacyCompatCssSource(rawSource) {
 	const cached = legacyCompatSourceCache.get(rawSource);
@@ -2535,6 +2535,10 @@ async function finalizeDeferredGeneratorCss(context) {
 			const rawCss = (0, _weapp_tailwindcss_postcss_transform.stripTailwindBanner)(css);
 			const generationCss = generated.target === "weapp" && ((0, _weapp_tailwindcss_postcss_transform.hasCssMacroStyleOptions)(generatorStyleOptions) || (0, _weapp_tailwindcss_postcss_transform.hasCssMacroTailwindV4InternalAtRules)(rawCss)) ? await (0, _weapp_tailwindcss_postcss_transform.transformCssMacroCss)(rawCss, generatorStyleOptions) : rawCss;
 			const normalizedCss = generated.target === "weapp" ? await (0, _weapp_tailwindcss_postcss_transform.normalizeMiniProgramGeneratedCssForPostcss)(generationCss, {
+				cssCalc: generatorStyleOptions.cssCalc,
+				cssOptions: generatorStyleOptions.cssOptions,
+				customPropertyValues: generatorStyleOptions.customPropertyValues,
+				contextCss: generated.customPropertyContextCss ?? generated.rawCss,
 				preservePreflight: true,
 				preserveRawClassRules: true
 			}) : generationCss;
@@ -2973,6 +2977,23 @@ async function prepareGeneratorInputs(context) {
 	};
 }
 //#endregion
+//#region src/generation/pipeline/style-context.ts
+/** 先确定同一输出的完整级联，再从原始声明生成兼容 CSS。 */
+async function mergeGeneratorResultsForOutput(results, options) {
+	const merged = mergeGeneratorResults(results);
+	if (!merged || results.length < 2 || merged.target === "tailwind" || !require_generator.hasCssCalcVariables(options)) return merged;
+	const css = await require_generator.transformTailwindV4CssByTarget(merged.rawCss, merged.target, {
+		...options,
+		customPropertyContextCss: [options.customPropertyContextCss, merged.customPropertyContextCss].filter(Boolean).join("\n")
+	});
+	return {
+		...merged,
+		css,
+		incrementalCss: void 0,
+		incrementalRawCss: void 0
+	};
+}
+//#endregion
 //#region src/generation/pipeline/execution.ts
 async function executeGeneratorPipeline(context) {
 	return require_compiler.runCompilerOwnerActivity(context.runtimeState, () => executeGeneratorPipelineWithOwner(context, require_compiler.getCompilationSessionPool(context.runtimeState), require_compiler.getTailwindGenerationSessionPool(context.runtimeState)));
@@ -2982,6 +3003,12 @@ async function executeGeneratorPipelineWithOwner(context, compilationPool, gener
 	await runtimeState.readyPromise;
 	const compilerSession = options.compilation?.enabled ? require_compiler.getFrameworkCompilerSession(runtimeState, opts) : void 0;
 	const { isolateCurrentCssCandidates, runtimeWithCurrentCss, generatorSourceRecords, generatorStyleOptions, configuredContainerCompat, sourceConcurrency, preparedGenerationInputs } = await prepareGeneratorInputs(context);
+	if (require_generator.hasCssCalcVariables(generatorStyleOptions)) generatorStyleOptions.customPropertyContextCss = [
+		generatorStyleOptions.customPropertyContextCss,
+		context.generatedUserCssRawSource,
+		options.frameworkProcessedUserCss,
+		...preparedGenerationInputs.map((input) => input.generatorSource.css)
+	].filter(Boolean).join("\n");
 	const generatePreparedInputs = async (candidateSets) => {
 		return runWithConcurrency(preparedGenerationInputs.map((input) => async () => {
 			const projectedCandidates = candidateSets?.get(input.sourceId);
@@ -3027,7 +3054,7 @@ async function executeGeneratorPipelineWithOwner(context, compilationPool, gener
 			if (compilerSession && options.compilation?.changes) compilerSession.invalidate(options.compilation.changes.map((change) => change.id));
 			await compilerSession?.syncScope(options.compilation?.scope.id ?? options.outputFile ?? file, preparedGenerationInputs.map((input) => input.sourceId));
 			const results = await generatePreparedInputs(compilation.candidatesBySource);
-			const merged = mergeGeneratorResults(results.map((result) => result.generated));
+			const merged = await mergeGeneratorResultsForOutput(results.map((result) => result.generated), generatorStyleOptions);
 			return merged ? {
 				classSet: merged.classSet,
 				dependenciesBySource: results.map((result) => [result.sourceId, resolveCompilationDependencies(result.generated.dependencies)]),
@@ -3048,8 +3075,9 @@ async function executeGeneratorPipelineWithOwner(context, compilationPool, gener
 			snapshot: execution.value.snapshot
 		};
 		compilationRevision = execution.compilation.revision;
-	} else generated = mergeGeneratorResults((await generatePreparedInputs()).map((result) => result.generated));
+	} else generated = await mergeGeneratorResultsForOutput((await generatePreparedInputs()).map((result) => result.generated), generatorStyleOptions);
 	if (!generated) return;
+	if (generated.customPropertyContextCss) generatorStyleOptions.customPropertyContextCss = generated.customPropertyContextCss;
 	debug("tailwind generator result: %s rawBytes=%d cssBytes=%d candidates=%d", file, generated.rawCss.length, generated.css.length, generated.classSet.size);
 	const hasMatchedCssSourceFile = generatorSourceRecords.some((record) => record.metadata.matchedCssSourceFile);
 	const hasExplicitCssSource = generatorSourceRecords.some(({ metadata }) => {

package/dist/generation/pipeline/style-context.d.ts

@@ -0,0 +1,3 @@
+import type { IStyleHandlerOptions } from '@weapp-tailwindcss/postcss/types';
+import type { GeneratorResult } from '../generation-helpers/results.js';
+export declare function mergeGeneratorResultsForOutput(results: GeneratorResult[], options: Partial<IStyleHandlerOptions>): Promise<GeneratorResult | undefined>;