weapp-tailwindcss 5.1.16 → 5.2.1

package/dist/{generator-B91GhUJQ.js → generator-BE34PYSC.cjs}

@@ -1,21 +1,21 @@
-const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.js");
-const require_framework = require("./framework.js");
-require("./auto-DtU6f3X6.js");
-const require_object = require("./object-COs_Mw6p.js");
-require("./utils-CuKLf1Zv.js");
+const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
+const require_framework = require("./framework.cjs");
+require("./auto-DtU6f3X6.cjs");
+const require_object = require("./object-C_Vr6_S5.cjs");
+require("./utils-CuKLf1Zv.cjs");
 let node_fs = require("node:fs");
-node_fs = require_rolldown_runtime.__toESM(node_fs);
+node_fs = require_rolldown_runtime.__toESM(node_fs, 1);
 let node_path = require("node:path");
-node_path = require_rolldown_runtime.__toESM(node_path);
+node_path = require_rolldown_runtime.__toESM(node_path, 1);
 let node_process = require("node:process");
-node_process = require_rolldown_runtime.__toESM(node_process);
+node_process = require_rolldown_runtime.__toESM(node_process, 1);
 let _tailwindcss_mangle_engine = require("@tailwindcss-mangle/engine");
 let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
 let lru_cache = require("lru-cache");
 let node_module = require("node:module");
 let node_fs_promises = require("node:fs/promises");
 let micromatch = require("micromatch");
-micromatch = require_rolldown_runtime.__toESM(micromatch);
+micromatch = require_rolldown_runtime.__toESM(micromatch, 1);
 //#region src/runtime-branch/generator-target-env.ts
 const explicitGeneratorTargetEnvKeys = ["WEAPP_TW_TARGET", "WEAPP_TAILWINDCSS_TARGET"];
 const uniWebPlatformEnvKeys = ["UNI_PLATFORM", "UNI_UTS_PLATFORM"];
@@ -49,6 +49,9 @@ function inferGeneratorTargetFromExplicitEnv() {
 function shouldUseWebGeneratorTargetFromEnv() {
 	return uniWebPlatformEnvKeys.some((key) => isUniWebPlatform(getEnvValue(key))) || isUniAppWebViewPlatform(getEnvValue("UNI_PLATFORM")) && !isUniNativeAppPlatform(getEnvValue("UNI_UTS_PLATFORM")) || mpxWebPlatformEnvKeys.some((key) => isMpxWebPlatform(getEnvValue(key))) || getEnvValue("TARO_ENV") === "h5";
 }
+function shouldUseUniAppWebRpxCompatibility(appType) {
+	return appType === "uni-app-vite" || appType === "uni-app-x" || shouldUseWebGeneratorTargetFromEnv();
+}
 function shouldUseUniAppViteWebViewGeneratorTarget(appType, platform = getEnvValue("UNI_PLATFORM")) {
 	return appType === "uni-app-vite" && isUniAppWebViewPlatform(platform);
 }
@@ -136,13 +139,18 @@ function createDependencyFingerprint(files) {
 		}
 	}).join("|");
 }
-function createIncrementalGenerateCacheKey(source, target, styleOptions) {
+function createTailwindV4SourceCacheKey(source) {
 	return [
 		source.projectRoot,
 		source.base,
 		createStableJson(source.baseFallbacks),
 		source.css,
-		createDependencyFingerprint(source.dependencies),
+		createDependencyFingerprint(source.dependencies)
+	].join("\0");
+}
+function createIncrementalGenerateCacheKey(source, target, styleOptions) {
+	return [
+		createTailwindV4SourceCacheKey(source),
 		target,
 		createStableJson(styleOptions)
 	].join("\0");
@@ -179,9 +187,6 @@ function resolveTargetCandidates(candidates, target) {
 function collectSeenCandidates(generated) {
 	return new Set(generated.classSet);
 }
-function shouldDelegateWebSourceScanToTailwind(target, scanSources) {
-	return target === "web" && scanSources !== false;
-}
 function createIncrementalStyleOptions(styleOptions) {
 	return {
 		...styleOptions,
@@ -244,7 +249,7 @@ function seedIncrementalGenerateCache(options) {
 }
 function shouldNormalizeRpxLengthCandidatesForTarget(target, styleOptions) {
 	if (target !== "web") return true;
-	return styleOptions?.appType === "uni-app-vite" || shouldUseWebGeneratorTargetFromEnv();
+	return shouldUseUniAppWebRpxCompatibility(styleOptions?.appType);
 }
 function normalizeTargetRpxLengthCandidates(candidates, target, styleOptions) {
 	return shouldNormalizeRpxLengthCandidatesForTarget(target, styleOptions) ? normalizeRpxLengthCandidates(candidates) : {
@@ -252,9 +257,6 @@ function normalizeTargetRpxLengthCandidates(candidates, target, styleOptions) {
 		restoreCandidates: /* @__PURE__ */ new Map()
 	};
 }
-function resolveGeneratedSourcePatterns(generatedSources, scanSources) {
-	return Array.isArray(scanSources) ? scanSources : generatedSources;
-}
 //#endregion
 //#region src/tailwindcss/v4-engine/generator/cache-stats.ts
 function getTailwindV4IncrementalGenerateCacheStats() {
@@ -304,7 +306,9 @@ function normalizeTailwindV4GeneratedUrlValues(css) {
 	});
 }
 async function transformTailwindV4CssToWeapp(css, options) {
-	const protectedCss = (0, _weapp_tailwindcss_postcss.protectDynamicColorMixAlpha)(normalizeTailwindV4GeneratedUrlValues((0, _weapp_tailwindcss_postcss.hasCssMacroStyleOptions)(options) ? await (0, _weapp_tailwindcss_postcss.transformCssMacroCss)(css, options) : css), { customPropertyValues: options && "customPropertyValues" in options ? options.customPropertyValues : void 0 });
+	const compatibleCss = normalizeTailwindV4GeneratedUrlValues((0, _weapp_tailwindcss_postcss.hasCssMacroStyleOptions)(options) ? await (0, _weapp_tailwindcss_postcss.transformCssMacroCss)(css, options) : css);
+	const customPropertyValues = options?.customPropertyValues;
+	const protectedCss = (0, _weapp_tailwindcss_postcss.protectDynamicColorMixAlpha)(compatibleCss, { customPropertyValues });
 	const result = await defaultStyleHandler(protectedCss.css, {
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		cssRemoveHoverPseudoClass: true,
@@ -313,6 +317,7 @@ async function transformTailwindV4CssToWeapp(css, options) {
 		...options
 	});
 	const pruneOptions = {
+		preserveContentInit: options?.uniAppX === true && options.uniAppXCssTarget === "uvue" ? false : void 0,
 		preservePreflight: true,
 		preserveConditionalComments: (0, _weapp_tailwindcss_postcss.hasCssMacroStyleOptions)(options)
 	};
@@ -327,13 +332,10 @@ function transformTailwindV4WebRpxCss(css) {
 		return css;
 	}
 }
-function shouldTransformWebRpxCss(options) {
-	return options?.appType === "uni-app-vite" || shouldUseWebGeneratorTargetFromEnv();
-}
 async function transformTailwindV4CssByTarget(css, target, options) {
 	if (target === "weapp") return transformTailwindV4CssToWeapp(css, options);
 	const resolvedWebCss = await ((0, _weapp_tailwindcss_postcss.hasCssMacroStyleOptions)(options) ? (0, _weapp_tailwindcss_postcss.transformCssMacroCss)(css, options) : css);
-	return shouldTransformWebRpxCss(options) ? transformTailwindV4WebRpxCss(resolvedWebCss) : resolvedWebCss;
+	return shouldUseUniAppWebRpxCompatibility(options?.appType) ? transformTailwindV4WebRpxCss(resolvedWebCss) : resolvedWebCss;
 }
 //#endregion
 //#region src/tailwindcss/v4-engine/tailwind-v4-default-colors.ts
@@ -822,6 +824,55 @@ function createCompatibleSource(source, target) {
 	};
 }
 //#endregion
+//#region src/tailwindcss/v4-engine/generator/native-session.ts
+var TailwindV4NativeSessionPool = class {
+	constructor(createSession = _tailwindcss_mangle_engine.createTailwindGenerationSession) {
+		this.createSession = createSession;
+		require_object._defineProperty(this, "sessions", /* @__PURE__ */ new Map());
+		require_object._defineProperty(this, "disposed", false);
+	}
+	generate(target, sourceKey, source, request) {
+		const entry = this.getSession(target, sourceKey, source);
+		const generated = entry.pending.then(() => entry.session.generate(request));
+		entry.pending = generated.then(() => void 0, () => void 0);
+		return generated;
+	}
+	dispose() {
+		for (const entry of this.sessions.values()) this.disposeEntry(entry);
+		this.sessions.clear();
+		this.disposed = true;
+	}
+	get size() {
+		return this.sessions.size;
+	}
+	getSession(target, sourceKey, source) {
+		if (this.disposed) throw new Error("TailwindV4NativeSessionPool 已释放。");
+		const cached = this.sessions.get(target);
+		if (cached?.sourceKey === sourceKey) return cached;
+		if (cached) this.disposeEntry(cached);
+		const session = this.createSession(source);
+		const entry = {
+			pending: Promise.resolve(),
+			session,
+			sourceKey
+		};
+		this.sessions.set(target, entry);
+		return entry;
+	}
+	disposeEntry(entry) {
+		entry.pending.then(() => entry.session.dispose());
+	}
+};
+function createEngineSourceEntries(sources, sourceId) {
+	return sources.map((source, index) => ({
+		id: `${sourceId}:candidate-source:${index}`,
+		...source
+	}));
+}
+function serializeTailwindGenerationArtifact(artifact) {
+	return [...artifact.fragments].sort((left, right) => left.order - right.order).map((fragment) => fragment.root.toString()).join("\n");
+}
+//#endregion
 //#region src/tailwindcss/source-scan.ts
 const DEFAULT_SOURCE_SCAN_EXTENSIONS = [
 	"html",
@@ -1182,30 +1233,81 @@ async function resolveScanSources(source, scanSources) {
 	if (scanSources !== true) return scanSources;
 	return await resolveCssDefinedScanSources(source) ?? false;
 }
+function resolveCompiledSourceRoot(source) {
+	let root = null;
+	try {
+		_weapp_tailwindcss_postcss.postcss.parse(source.css).walkAtRules("import", (rule) => {
+			if (!isTailwindCssImport(rule.params)) return;
+			const sourceParam = parseImportSourceParam(rule.params);
+			if (sourceParam?.none) {
+				root = "none";
+				return false;
+			}
+			if (sourceParam?.sourcePath) {
+				root = {
+					base: source.base,
+					pattern: sourceParam.sourcePath
+				};
+				return false;
+			}
+		});
+	} catch {}
+	return root;
+}
 //#endregion
 //#region src/tailwindcss/v4-engine/generator/engine.ts
+function isCssSyntaxError(error) {
+	return error instanceof Error && error.name === "CssSyntaxError";
+}
 function createTailwindV4Engine(source) {
+	const generationSessions = new TailwindV4NativeSessionPool();
+	const incrementalCacheKeys = /* @__PURE__ */ new Set();
+	const validationEngine = (0, _tailwindcss_mangle_engine.createTailwindV4Engine)(source);
 	async function generateOnce(generateSource, options = {}) {
 		const { scanSources = true, styleOptions, target = "weapp", ...patchOptions } = options;
 		const resolvedStyleOptions = resolveStyleOptions(generateSource, styleOptions);
-		const engine = (0, _tailwindcss_mangle_engine.createTailwindV4Engine)(createCompatibleSource(resolveCssMacroTailwindV4Source(generateSource), target));
+		const compatibleSource = createCompatibleSource(resolveCssMacroTailwindV4Source(generateSource), target);
 		const resolvedScanSources = await resolveScanSources(generateSource, scanSources);
-		const delegateSourceScan = shouldDelegateWebSourceScanToTailwind(target, resolvedScanSources);
-		const filesystemCandidates = !delegateSourceScan && Array.isArray(resolvedScanSources) ? new Set(await (0, _tailwindcss_mangle_engine.extractRawCandidates)(resolvedScanSources, { ...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues } })) : void 0;
+		const filesystemCandidates = Array.isArray(resolvedScanSources) ? new Set(await (0, _tailwindcss_mangle_engine.extractRawCandidates)(resolvedScanSources, { ...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues } })) : void 0;
 		const normalizedCandidates = normalizeTargetRpxLengthCandidates(resolveTargetCandidates(/* @__PURE__ */ new Set([...collectCandidates(patchOptions.candidates), ...filesystemCandidates ?? []]), target), target, resolvedStyleOptions);
-		const result = await engine.generate(require_object.omitUndefined({
-			scanSources: delegateSourceScan ? resolvedScanSources : false,
-			...patchOptions,
+		const sourceId = compatibleSource.dependencies[0] ?? compatibleSource.base;
+		const generationRequest = {
+			...patchOptions.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: patchOptions.bareArbitraryValues },
+			...patchOptions.sources === void 0 ? {} : { sourceEntries: createEngineSourceEntries(patchOptions.sources, sourceId) },
 			candidates: normalizedCandidates.candidates
-		}));
-		const sources = resolveGeneratedSourcePatterns(result.sources, resolvedScanSources);
-		const rawCss = restoreRpxLengthCssSelectors(result.css, normalizedCandidates.restoreCandidates);
+		};
+		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 (!isCssSyntaxError(error)) throw error;
+			const legacyResult = await (0, _tailwindcss_mangle_engine.createTailwindV4Engine)(compatibleSource).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;
+		}
+		const sources = Array.isArray(resolvedScanSources) ? resolvedScanSources : [];
+		const rawCss = restoreRpxLengthCssSelectors(generatedCss, normalizedCandidates.restoreCandidates);
 		const css = await transformTailwindV4CssByTarget(rawCss, target, resolvedStyleOptions);
 		return {
-			...result,
+			classSet: restoreRpxLengthCandidates(classSet, normalizedCandidates.restoreCandidates),
+			rawCandidates: restoreRpxLengthCandidates(rawCandidates, normalizedCandidates.restoreCandidates),
+			dependencies,
+			root: resolveCompiledSourceRoot(compatibleSource),
 			sources,
-			classSet: restoreRpxLengthCandidates(result.classSet, normalizedCandidates.restoreCandidates),
-			rawCandidates: restoreRpxLengthCandidates(result.rawCandidates, normalizedCandidates.restoreCandidates),
 			css,
 			rawCss,
 			target
@@ -1219,6 +1321,7 @@ function createTailwindV4Engine(source) {
 		const styleOptions = resolveStyleOptions(source, options.styleOptions);
 		if ((options.sources?.length ?? 0) > 0 || options.bareArbitraryValues !== void 0 || Array.isArray(options.scanSources)) return generateOnce(cssMacroSource, options);
 		const cacheKey = createIncrementalGenerateCacheKey(compatibleSource, target, styleOptions);
+		incrementalCacheKeys.add(cacheKey);
 		if (options.scanSources === true) return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
 			const generated = await generateOnce(cssMacroSource, options);
 			if (!seedIncrementalGenerateCache({
@@ -1323,9 +1426,14 @@ function createTailwindV4Engine(source) {
 	}
 	return {
 		source,
-		loadDesignSystem: (0, _tailwindcss_mangle_engine.createTailwindV4Engine)(source).loadDesignSystem,
-		validateCandidates: (0, _tailwindcss_mangle_engine.createTailwindV4Engine)(source).validateCandidates,
-		generate
+		loadDesignSystem: validationEngine.loadDesignSystem,
+		validateCandidates: validationEngine.validateCandidates,
+		generate,
+		dispose() {
+			generationSessions.dispose();
+			for (const cacheKey of incrementalCacheKeys) incrementalGenerateCache.delete(cacheKey);
+			incrementalCacheKeys.clear();
+		}
 	};
 }
 //#endregion
@@ -2694,6 +2802,23 @@ function upsertTailwindV4CssSource(opts, source) {
 	};
 	return true;
 }
+function removeTailwindV4CssSource(opts, file) {
+	const tailwindcss = opts.tailwindcss;
+	const v4 = tailwindcss?.v4;
+	const cssSources = v4?.cssSources;
+	if (!cssSources || cssSources.length === 0) return false;
+	const sourceFile = normalizeCssSourceFile(file);
+	const nextCssSources = cssSources.filter((source) => normalizeCssSourceFile(source.file) !== sourceFile);
+	if (nextCssSources.length === cssSources.length) return false;
+	opts.tailwindcss = {
+		...tailwindcss,
+		v4: {
+			...v4,
+			cssSources: nextCssSources
+		}
+	};
+	return true;
+}
 //#endregion
 //#region src/tailwindcss/v4-engine/source.ts
 const require$1 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
@@ -3363,6 +3488,12 @@ Object.defineProperty(exports, "removeTailwindSourceDirectives", {
 		return removeTailwindSourceDirectives;
 	}
 });
+Object.defineProperty(exports, "removeTailwindV4CssSource", {
+	enumerable: true,
+	get: function() {
+		return removeTailwindV4CssSource;
+	}
+});
 Object.defineProperty(exports, "removeTailwindV4GeneratedUserCssArtifacts", {
 	enumerable: true,
 	get: function() {
@@ -3483,6 +3614,12 @@ Object.defineProperty(exports, "shouldUseNativeAppCssBranch", {
 		return shouldUseNativeAppCssBranch;
 	}
 });
+Object.defineProperty(exports, "shouldUseUniAppWebRpxCompatibility", {
+	enumerable: true,
+	get: function() {
+		return shouldUseUniAppWebRpxCompatibility;
+	}
+});
 Object.defineProperty(exports, "splitGeneratorPlaceholderCssBySourceOrder", {
 	enumerable: true,
 	get: function() {