weapp-tailwindcss 5.5.8 → 5.5.10

package/dist/{generator-CxauQbx3.cjs → generator-B1sYQpWu.cjs}

@@ -56,6 +56,23 @@ function inferGeneratorTargetFromEnv() {
 	return inferGeneratorTargetFromExplicitEnv() ?? (shouldUseWebGeneratorTargetFromEnv() ? "web" : "weapp");
 }
 //#endregion
+//#region src/utils/stable-serialize.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]";
+	if (value instanceof RegExp) return `RegExp(${JSON.stringify(value.source)},${JSON.stringify(value.flags)})`;
+	stack.add(value);
+	let serialized;
+	if (value instanceof Map) serialized = `Map(${[...value].map(([key, item]) => `[${stableSerialize(key, stack)},${stableSerialize(item, stack)}]`).sort().join(",")})`;
+	else if (Array.isArray(value)) serialized = `[${value.map((item) => stableSerialize(item, stack)).join(",")}]`;
+	else serialized = `{${Object.keys(value).sort().map((key) => `${JSON.stringify(key)}:${stableSerialize(value[key], stack)}`).join(",")}}`;
+	stack.delete(value);
+	return serialized;
+}
+//#endregion
 //#region src/tailwindcss/v4-engine/candidates.ts
 const UNSUPPORTED_MINI_PROGRAM_TAILWIND_V4_CANDIDATE_RE = /(?:^|:)(?:has-)?(?:group|peer|in|not-in)-[^\s:]*\/|(?:^|:)(?:has-)?(?:in|not-in)-\[/;
 function isUnsupportedMiniProgramTailwindV4Candidate(candidate) {
@@ -76,15 +93,6 @@ function hasRemovedCandidates(previousCandidates, nextCandidates) {
 	for (const candidate of previousCandidates) if (!nextCandidates.has(candidate)) return true;
 	return false;
 }
-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 createDependencyFingerprint(files) {
 	return files.map((file) => {
 		try {
@@ -99,7 +107,7 @@ function createTailwindV4SourceCacheKey(source) {
 	return [
 		source.projectRoot,
 		source.base,
-		createStableJson(source.baseFallbacks),
+		stableSerialize(source.baseFallbacks),
 		source.css,
 		createDependencyFingerprint(source.dependencies)
 	].join("\0");
@@ -108,7 +116,7 @@ function createIncrementalGenerateCacheKey(source, target, styleOptions) {
 	return [
 		createTailwindV4SourceCacheKey(source),
 		target,
-		createStableJson(styleOptions)
+		stableSerialize(styleOptions)
 	].join("\0");
 }
 function createIncrementalGenerateTaskCacheKey(cacheKey, requestedCandidates, scanSources) {
@@ -141,7 +149,7 @@ function resolveTargetCandidates(candidates, target) {
 	return target === "weapp" ? filterUnsupportedMiniProgramTailwindV4Candidates(collected) : collected;
 }
 function collectSeenCandidates(generated) {
-	return new Set(generated.classSet);
+	return /* @__PURE__ */ new Set([...generated.rawCandidates, ...generated.classSet]);
 }
 function createIncrementalStyleOptions(styleOptions) {
 	return {
@@ -175,8 +183,7 @@ function shouldAdmitIncrementalEntry(requestedCandidates, generated) {
 function seedIncrementalGenerateCache(options) {
 	if (!shouldAdmitIncrementalEntry(options.requestedCandidates, options.generated)) return false;
 	const cacheKey = createIncrementalGenerateCacheKey(options.compatibleSource, options.target, options.styleOptions);
-	const customPropertyValues = (0, _weapp_tailwindcss_postcss_transform.collectCustomPropertyValues)(options.compatibleSource.css);
-	(0, _weapp_tailwindcss_postcss_transform.mergeCustomPropertyValues)(customPropertyValues, options.generated.css);
+	const customPropertyValues = new Map(options.generated.customPropertyValues ?? []);
 	incrementalGenerateCache.set(cacheKey, {
 		seenCandidates: collectSeenCandidates(options.generated),
 		classSet: new Set(options.generated.classSet),
@@ -785,91 +792,133 @@ function resolveCompiledSourceRoot(source) {
 }
 //#endregion
 //#region src/tailwindcss/v4-engine/generator/style-context.ts
-function resolveGenerationStyleContext(sourceCss, generatedCss, options) {
+function hasCssCalcVariables(options) {
 	const calc = options?.cssOptions?.cssCalc ?? options?.cssCalc;
 	const include = Array.isArray(calc) ? calc : calc && typeof calc === "object" ? calc.includeCustomProperties : void 0;
-	if (calc !== true && !include?.length) return options;
-	const customPropertyValues = (0, _weapp_tailwindcss_postcss_transform.collectCustomPropertyValues)(sourceCss);
-	(0, _weapp_tailwindcss_postcss_transform.mergeCustomPropertyValues)(customPropertyValues, generatedCss);
-	for (const [name, value] of options?.customPropertyValues ?? []) customPropertyValues.set(name, value);
+	return calc === true || Boolean(include?.length);
+}
+function resolveGenerationStyleContext(sourceCss, generatedCss, options) {
+	if (!hasCssCalcVariables(options)) return options;
 	return {
 		...options,
-		customPropertyValues
+		customPropertyContextCss: [
+			options?.customPropertyContextCss,
+			sourceCss,
+			generatedCss
+		].filter(Boolean).join("\n")
+	};
+}
+/** 增量 utility 不带主题声明；兼容转换单独补齐主题值，不能将其升级成 calc 常量。 */
+function resolveIncrementalStyleContext(sourceCss, generatedCss, options) {
+	const customPropertyCompatibilityValues = (0, _weapp_tailwindcss_postcss_transform.collectCustomPropertyValues)(sourceCss);
+	(0, _weapp_tailwindcss_postcss_transform.mergeCustomPropertyValues)(customPropertyCompatibilityValues, generatedCss);
+	return {
+		...resolveGenerationStyleContext(sourceCss, generatedCss, options),
+		customPropertyCompatibilityValues
+	};
+}
+/** 新增候选改变静态变量资格时，需要重算已有规则，不能只追加新 CSS。 */
+function hasChangedCssCalcContext(previousCss, nextCss, options) {
+	if (!hasCssCalcVariables(options)) return false;
+	const calc = options?.cssOptions?.cssCalc ?? options?.cssCalc;
+	const include = Array.isArray(calc) ? calc : calc && typeof calc === "object" ? calc.includeCustomProperties : void 0;
+	const selected = (name) => calc === true || (0, _weapp_tailwindcss_postcss_transform.isCssCalcCustomPropertySelected)(name, include);
+	const values = (css) => {
+		const context = [options?.customPropertyContextCss, css].filter(Boolean).join("\n");
+		return new Map([...(0, _weapp_tailwindcss_postcss_transform.analyzeCssCalcContext)(context, options?.customPropertyValues ?? (calc && typeof calc === "object" && !Array.isArray(calc) ? calc.customPropertyValues : void 0)).customPropertyValues].filter(([name]) => selected(name)));
 	};
+	const previous = values(previousCss);
+	const next = values(nextCss);
+	return previous.size !== next.size || [...previous].some(([name, value]) => next.get(name) !== value);
 }
 //#endregion
-//#region src/tailwindcss/v4-engine/generator/engine.ts
+//#region src/tailwindcss/v4-engine/generator/raw-generation.ts
 function isCssSyntaxError(error) {
 	return error instanceof Error && error.name === "CssSyntaxError";
 }
+/** 原生生成会话负责按当前候选产出完整主题、utility 和运行时依赖。 */
+async function generateRawArtifact(generationSessions, generateSource, options = {}) {
+	const { scanSources = true, styleOptions, target = "weapp", ...patchOptions } = options;
+	const resolvedStyleOptions = resolveStyleOptions(generateSource, styleOptions);
+	const compatibleSource = createCompatibleSource(resolveCssMacroTailwindV4Source(generateSource), target);
+	const compiledScan = options.scanMode === "compiled";
+	const resolvedScanSources = compiledScan ? void 0 : await resolveScanSources(generateSource, scanSources);
+	const filesystemCandidates = Array.isArray(resolvedScanSources) ? new Set(await (0, _weapp_tailwindcss_engine.extractRawCandidates)(resolvedScanSources, { ...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues } })) : void 0;
+	const resolvedCandidates = resolveTargetCandidates(/* @__PURE__ */ new Set([...collectCandidates(patchOptions.candidates), ...filesystemCandidates ?? []]), target);
+	let normalizedCandidates = normalizeTargetRpxLengthCandidates(resolvedCandidates, target, resolvedStyleOptions);
+	const sourceId = compatibleSource.dependencies[0] ?? compatibleSource.base;
+	const generationRequest = {
+		...compiledScan ? {
+			scanSources,
+			excludeFiles: options.excludeFiles ?? [],
+			prepareCandidates: (candidates) => {
+				normalizedCandidates = normalizeTargetRpxLengthCandidates(resolveTargetCandidates(candidates, target), target, resolvedStyleOptions);
+				return normalizedCandidates.candidates;
+			}
+		} : {},
+		...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues },
+		...patchOptions.sources === void 0 ? {} : { sourceEntries: createEngineSourceEntries(patchOptions.sources, sourceId) },
+		candidates: compiledScan ? resolvedCandidates : normalizedCandidates.candidates
+	};
+	let generatedCss;
+	let classSet;
+	let rawCandidates;
+	let dependencies;
+	try {
+		const artifact = await generationSessions.generate(target, createTailwindV4SourceCacheKey(compatibleSource), compatibleSource, generationRequest);
+		generatedCss = serializeTailwindGenerationArtifact(artifact);
+		classSet = artifact.classSet;
+		rawCandidates = artifact.rawCandidates;
+		dependencies = artifact.dependencies;
+	} catch (error) {
+		if (compiledScan || !isCssSyntaxError(error)) throw error;
+		const legacyEngine = (0, _weapp_tailwindcss_engine.createTailwindV4Engine)(compatibleSource);
+		try {
+			const legacyResult = await legacyEngine.generate({
+				...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues },
+				...patchOptions.sources === void 0 ? {} : { sources: patchOptions.sources },
+				candidates: normalizedCandidates.candidates,
+				scanSources: false
+			});
+			generatedCss = legacyResult.css;
+			classSet = legacyResult.classSet;
+			rawCandidates = legacyResult.rawCandidates;
+			dependencies = legacyResult.dependencies;
+		} finally {
+			legacyEngine.dispose?.();
+		}
+	}
+	const sources = Array.isArray(resolvedScanSources) ? resolvedScanSources : [];
+	const rawCss = (0, _weapp_tailwindcss_postcss_transform.restoreRpxLengthCssSelectors)(generatedCss, normalizedCandidates.restoreCandidates);
+	return {
+		classSet: (0, _weapp_tailwindcss_postcss_transform.restoreRpxLengthCandidates)(classSet, normalizedCandidates.restoreCandidates),
+		rawCandidates: (0, _weapp_tailwindcss_postcss_transform.restoreRpxLengthCandidates)(rawCandidates, normalizedCandidates.restoreCandidates),
+		dependencies,
+		root: resolveCompiledSourceRoot(compatibleSource),
+		sources,
+		rawCss,
+		target,
+		styleContext: resolveGenerationStyleContext(compatibleSource.css, rawCss, resolvedStyleOptions)
+	};
+}
+async function transformGeneratedArtifact(artifact) {
+	const { styleContext, ...generated } = artifact;
+	const css = await transformTailwindV4CssByTarget(generated.rawCss, generated.target, styleContext);
+	return {
+		...generated,
+		css,
+		customPropertyContextCss: styleContext?.customPropertyContextCss,
+		...styleContext?.customPropertyValues ? { customPropertyValues: new Map(styleContext.customPropertyValues) } : {}
+	};
+}
+//#endregion
+//#region src/tailwindcss/v4-engine/generator/engine.ts
 function createTailwindV4Engine(source) {
 	const generationSessions = new TailwindV4NativeSessionPool();
 	const incrementalCacheKeys = /* @__PURE__ */ new Set();
 	const validationEngine = (0, _weapp_tailwindcss_engine.createTailwindV4Engine)(source);
 	async function generateOnce(generateSource, options = {}) {
-		const { scanSources = true, styleOptions, target = "weapp", ...patchOptions } = options;
-		const resolvedStyleOptions = resolveStyleOptions(generateSource, styleOptions);
-		const compatibleSource = createCompatibleSource(resolveCssMacroTailwindV4Source(generateSource), target);
-		const compiledScan = options.scanMode === "compiled";
-		const resolvedScanSources = compiledScan ? void 0 : await resolveScanSources(generateSource, scanSources);
-		const filesystemCandidates = Array.isArray(resolvedScanSources) ? new Set(await (0, _weapp_tailwindcss_engine.extractRawCandidates)(resolvedScanSources, { ...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues } })) : void 0;
-		const resolvedCandidates = resolveTargetCandidates(/* @__PURE__ */ new Set([...collectCandidates(patchOptions.candidates), ...filesystemCandidates ?? []]), target);
-		let normalizedCandidates = normalizeTargetRpxLengthCandidates(resolvedCandidates, target, resolvedStyleOptions);
-		const sourceId = compatibleSource.dependencies[0] ?? compatibleSource.base;
-		const generationRequest = {
-			...compiledScan ? {
-				scanSources,
-				excludeFiles: options.excludeFiles ?? [],
-				prepareCandidates: (candidates) => {
-					normalizedCandidates = normalizeTargetRpxLengthCandidates(resolveTargetCandidates(candidates, target), target, resolvedStyleOptions);
-					return normalizedCandidates.candidates;
-				}
-			} : {},
-			...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues },
-			...patchOptions.sources === void 0 ? {} : { sourceEntries: createEngineSourceEntries(patchOptions.sources, sourceId) },
-			candidates: compiledScan ? resolvedCandidates : normalizedCandidates.candidates
-		};
-		let generatedCss;
-		let classSet;
-		let rawCandidates;
-		let dependencies;
-		try {
-			const artifact = await generationSessions.generate(target, createTailwindV4SourceCacheKey(compatibleSource), compatibleSource, generationRequest);
-			generatedCss = serializeTailwindGenerationArtifact(artifact);
-			classSet = artifact.classSet;
-			rawCandidates = artifact.rawCandidates;
-			dependencies = artifact.dependencies;
-		} catch (error) {
-			if (compiledScan || !isCssSyntaxError(error)) throw error;
-			const legacyEngine = (0, _weapp_tailwindcss_engine.createTailwindV4Engine)(compatibleSource);
-			try {
-				const legacyResult = await legacyEngine.generate({
-					...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues },
-					...patchOptions.sources === void 0 ? {} : { sources: patchOptions.sources },
-					candidates: normalizedCandidates.candidates,
-					scanSources: false
-				});
-				generatedCss = legacyResult.css;
-				classSet = legacyResult.classSet;
-				rawCandidates = legacyResult.rawCandidates;
-				dependencies = legacyResult.dependencies;
-			} finally {
-				legacyEngine.dispose?.();
-			}
-		}
-		const sources = Array.isArray(resolvedScanSources) ? resolvedScanSources : [];
-		const rawCss = (0, _weapp_tailwindcss_postcss_transform.restoreRpxLengthCssSelectors)(generatedCss, normalizedCandidates.restoreCandidates);
-		const css = await transformTailwindV4CssByTarget(rawCss, target, resolveGenerationStyleContext(compatibleSource.css, rawCss, resolvedStyleOptions));
-		return {
-			classSet: (0, _weapp_tailwindcss_postcss_transform.restoreRpxLengthCandidates)(classSet, normalizedCandidates.restoreCandidates),
-			rawCandidates: (0, _weapp_tailwindcss_postcss_transform.restoreRpxLengthCandidates)(rawCandidates, normalizedCandidates.restoreCandidates),
-			dependencies,
-			root: resolveCompiledSourceRoot(compatibleSource),
-			sources,
-			css,
-			rawCss,
-			target
-		};
+		return transformGeneratedArtifact(await generateRawArtifact(generationSessions, generateSource, options));
 	}
 	async function generateWithIncrementalCache(options = {}) {
 		const target = options.target ?? "weapp";
@@ -912,6 +961,8 @@ function createTailwindV4Engine(source) {
 				incrementalRawCss: "",
 				classSet: new Set(cached.classSet),
 				rawCandidates: new Set(cached.seenCandidates),
+				customPropertyValues: new Map(cached.customPropertyValues),
+				customPropertyContextCss: resolveGenerationStyleContext(compatibleSource.css, cached.rawCss, styleOptions)?.customPropertyContextCss,
 				dependencies: cached.dependencies,
 				sources: cached.sources,
 				root: cached.root,
@@ -944,15 +995,25 @@ function createTailwindV4Engine(source) {
 					}
 				}
 				const rawCss = rawCssParts.join("\n");
-				const incrementalCss = rawCss.length > 0 ? await transformTailwindV4CssByTarget(rawCss, target, {
-					...createIncrementalStyleOptions(styleOptions),
-					customPropertyValues: cached.customPropertyValues
-				}) : "";
+				const fullRawCss = [cached.rawCss, rawCss].filter(Boolean).join("\n");
+				const artifact = await generateRawArtifact(generationSessions, cssMacroSource, options);
+				if ((0, _weapp_tailwindcss_postcss_transform.createCssRuntimeAffectingSignature)(fullRawCss) !== (0, _weapp_tailwindcss_postcss_transform.createCssRuntimeAffectingSignature)(artifact.rawCss) || hasChangedCssCalcContext(cached.rawCss, artifact.rawCss, styleOptions)) {
+					const generated = await transformGeneratedArtifact(artifact);
+					if (!seedIncrementalGenerateCache({
+						compatibleSource,
+						generated,
+						requestedCandidates,
+						styleOptions,
+						target
+					})) incrementalGenerateCache.delete(cacheKey);
+					return generated;
+				}
+				const styleContext = target === "weapp" ? resolveIncrementalStyleContext(compatibleSource.css, fullRawCss, styleOptions) : resolveGenerationStyleContext(compatibleSource.css, fullRawCss, styleOptions);
+				const incrementalCss = rawCss.length > 0 ? await transformTailwindV4CssByTarget(rawCss, target, { ...createIncrementalStyleOptions(styleContext) }) : "";
 				for (const candidate of missingCandidates) cached.seenCandidates.add(candidate);
 				for (const className of classSet) cached.classSet.add(className);
 				cached.css = [cached.css, incrementalCss].filter(Boolean).join("\n");
-				cached.rawCss = [cached.rawCss, rawCss].filter(Boolean).join("\n");
-				(0, _weapp_tailwindcss_postcss_transform.mergeCustomPropertyValues)(cached.customPropertyValues, incrementalCss);
+				cached.rawCss = fullRawCss;
 				return {
 					css: cached.css,
 					rawCss: cached.rawCss,
@@ -960,6 +1021,8 @@ function createTailwindV4Engine(source) {
 					incrementalRawCss: rawCss,
 					classSet: new Set(cached.classSet),
 					rawCandidates: new Set(cached.seenCandidates),
+					customPropertyValues: new Map(cached.customPropertyValues),
+					customPropertyContextCss: styleContext?.customPropertyContextCss,
 					dependencies: cached.dependencies,
 					sources: cached.sources,
 					root: cached.root,
@@ -1716,6 +1779,12 @@ Object.defineProperty(exports, "hasConfiguredTailwindV4CssRoots", {
 		return hasConfiguredTailwindV4CssRoots;
 	}
 });
+Object.defineProperty(exports, "hasCssCalcVariables", {
+	enumerable: true,
+	get: function() {
+		return hasCssCalcVariables;
+	}
+});
 Object.defineProperty(exports, "isTailwindV4CssEntry", {
 	enumerable: true,
 	get: function() {
@@ -1854,6 +1923,12 @@ Object.defineProperty(exports, "shouldUseUniAppWebRpxCompatibility", {
 		return shouldUseUniAppWebRpxCompatibility;
 	}
 });
+Object.defineProperty(exports, "stableSerialize", {
+	enumerable: true,
+	get: function() {
+		return stableSerialize;
+	}
+});
 Object.defineProperty(exports, "transformTailwindV4CssByTarget", {
 	enumerable: true,
 	get: function() {