weapp-tailwindcss 5.0.11 → 5.0.13

package/dist/{v3-engine-D0yA9ZkF.js → v3-engine-2rrgylhn.js}

@@ -1,15 +1,16 @@
 const require_chunk = require("./chunk-emK7D4bc.js");
 const require_auto = require("./auto-CTp6wE5a.js");
-let node_module = require("node:module");
-let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
-let tailwindcss_patch = require("tailwindcss-patch");
-tailwindcss_patch = require_chunk.__toESM(tailwindcss_patch);
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
+let node_module = require("node:module");
+let _weapp_tailwindcss_postcss = require("@weapp-tailwindcss/postcss");
+let lru_cache = require("lru-cache");
+let tailwindcss_patch = require("tailwindcss-patch");
+tailwindcss_patch = require_chunk.__toESM(tailwindcss_patch);
 let _weapp_tailwindcss_logger = require("@weapp-tailwindcss/logger");
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
 let node_url = require("node:url");
@@ -1884,8 +1885,12 @@ async function transformTailwindV4CssByTarget(css, target, options) {
 }
 //#endregion
 //#region src/tailwindcss/v4-engine/generator.ts
-const incrementalGenerateCache$1 = /* @__PURE__ */ new Map();
-const incrementalGenerateTaskCache = /* @__PURE__ */ new Map();
+const INCREMENTAL_GENERATE_CACHE_MAX$1 = 8;
+const INCREMENTAL_GENERATE_TASK_CACHE_MAX = 32;
+const INCREMENTAL_GENERATE_ENTRY_CANDIDATES_MAX$1 = 128;
+const INCREMENTAL_GENERATE_ENTRY_CSS_BYTES_MAX$1 = 256 * 1024;
+const incrementalGenerateCache$1 = new lru_cache.LRUCache({ max: INCREMENTAL_GENERATE_CACHE_MAX$1 });
+const incrementalGenerateTaskCache = new lru_cache.LRUCache({ max: INCREMENTAL_GENERATE_TASK_CACHE_MAX });
 function collectCandidates(candidates) {
 	return new Set(candidates ?? []);
 }
@@ -1981,6 +1986,9 @@ function collectCustomPropertyValues(css) {
 function mergeCustomPropertyValues(target, css) {
 	for (const [prop, value] of collectCustomPropertyValues(css)) target.set(prop, value);
 }
+function shouldRebuildIncrementalEntry$1(cached, requestedCandidates, missingCandidates) {
+	return cached.seenCandidates.size + missingCandidates.length > INCREMENTAL_GENERATE_ENTRY_CANDIDATES_MAX$1 || cached.css.length > INCREMENTAL_GENERATE_ENTRY_CSS_BYTES_MAX$1 || cached.rawCss.length > INCREMENTAL_GENERATE_ENTRY_CSS_BYTES_MAX$1 || requestedCandidates.size > INCREMENTAL_GENERATE_ENTRY_CANDIDATES_MAX$1;
+}
 function seedIncrementalGenerateCache(options) {
 	const cacheKey = createIncrementalGenerateCacheKey(options.compatibleSource, options.target, options.styleOptions, options.tailwindcssV3Compatibility);
 	const customPropertyValues = collectCustomPropertyValues(options.compatibleSource.css);
@@ -2068,6 +2076,18 @@ function createTailwindV4Engine(source) {
 				root: cached.root,
 				target: cached.target
 			};
+			if (shouldRebuildIncrementalEntry$1(cached, requestedCandidates, missingCandidates)) return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
+				const generated = await generateOnce(source, options);
+				seedIncrementalGenerateCache({
+					compatibleSource,
+					generated,
+					requestedCandidates,
+					styleOptions,
+					tailwindcssV3Compatibility: options.tailwindcssV3Compatibility,
+					target
+				});
+				return generated;
+			});
 			return runIncrementalGenerateTask(cacheKey, requestedCandidates, options.scanSources, async () => {
 				const designSystem = await cached.designSystemPromise;
 				const normalizedMissing = normalizeRpxTextCandidates(missingCandidates);
@@ -2130,6 +2150,25 @@ function createTailwindV4Engine(source) {
 		generate
 	};
 }
+function getTailwindV4IncrementalGenerateCacheStats() {
+	return {
+		max: INCREMENTAL_GENERATE_CACHE_MAX$1,
+		entryCandidatesMax: INCREMENTAL_GENERATE_ENTRY_CANDIDATES_MAX$1,
+		entryCssBytesMax: INCREMENTAL_GENERATE_ENTRY_CSS_BYTES_MAX$1,
+		size: incrementalGenerateCache$1.size,
+		taskMax: INCREMENTAL_GENERATE_TASK_CACHE_MAX,
+		taskSize: incrementalGenerateTaskCache.size,
+		entries: [...incrementalGenerateCache$1.entries()].map(([key, entry]) => ({
+			key,
+			candidates: entry.seenCandidates.size,
+			classSet: entry.classSet.size,
+			cssBytes: entry.css.length,
+			rawCssBytes: entry.rawCss.length
+		})),
+		keys: [...incrementalGenerateCache$1.keys()],
+		taskKeys: [...incrementalGenerateTaskCache.keys()]
+	};
+}
 //#endregion
 //#region src/bundlers/shared/generator-css/config-directive.ts
 function quoteCssString(value) {
@@ -3053,6 +3092,7 @@ function addSourceScanDependencies(dependencies, files) {
 const VITE_SOURCE_CANDIDATE_PATTERN = FULL_SOURCE_SCAN_PATTERN;
 const VITE_TAILWIND_CSS_ENTRY_PATTERN = "**/*.{css,less,sass,scss,styl,stylus,pcss,postcss}";
 const tailwindV4CssEntriesCache = /* @__PURE__ */ new Map();
+const tailwindConfigCssEntriesCache = /* @__PURE__ */ new Map();
 function parseImportSourceParam(params) {
 	const match = /\bsource\(\s*(none|(['"])(.*?)\2)\s*\)/.exec(params);
 	if (!match) return;
@@ -3086,6 +3126,13 @@ function createCssEntriesCacheKey(css, base, dependencies) {
 		dependencies
 	});
 }
+function createDependencyExcludeEntries(files) {
+	return [...files].map((file) => ({
+		base: node_path.default.dirname(file),
+		negated: true,
+		pattern: node_path.default.basename(file)
+	}));
+}
 async function statConfigDependency(file) {
 	try {
 		const stats = await (0, node_fs_promises.stat)(file);
@@ -3234,6 +3281,12 @@ async function resolveTailwindV3CssEntryScan(options, patcher) {
 		} catch {
 			return;
 		}
+		const cssConfigEntries = await resolveTailwindConfigEntriesFromCssCached(css, node_path.default.dirname(cssEntry));
+		if (cssConfigEntries) {
+			addSourceScanDependencies(dependencies, cssConfigEntries.dependencies);
+			entries.push(...cssConfigEntries.entries);
+			return;
+		}
 		const source = await resolveTailwindV3Source({
 			...sourceOptions,
 			base: node_path.default.dirname(cssEntry),
@@ -3269,6 +3322,32 @@ async function resolveTailwindV4EntriesFromCssCached(css, base) {
 	tailwindV4CssEntriesCache.set(cacheKey, task);
 	return task;
 }
+async function resolveTailwindConfigEntriesFromCssCached(css, base) {
+	let root;
+	try {
+		root = _weapp_tailwindcss_postcss.postcss.parse(css);
+	} catch {
+		return;
+	}
+	const dependencies = await collectConfigDependencySignatures(root, base);
+	if (dependencies.length === 0) return;
+	const cacheKey = createCssEntriesCacheKey(css, base, dependencies);
+	const cached = tailwindConfigCssEntriesCache.get(cacheKey);
+	if (cached) return cached;
+	const task = resolveConfigContentEntries(root, base).then((resolved) => {
+		return {
+			entries: [...resolved.entries, ...createDependencyExcludeEntries(resolved.dependencies)],
+			explicit: true,
+			inlineCandidates: {
+				excluded: /* @__PURE__ */ new Set(),
+				included: /* @__PURE__ */ new Set()
+			},
+			dependencies: resolved.dependencies
+		};
+	});
+	tailwindConfigCssEntriesCache.set(cacheKey, task);
+	return task;
+}
 async function discoverTailwindV4CssEntries(root, outDir) {
 	const resolvedRoot = node_path.default.resolve(root);
 	const ignore = ["**/node_modules/**", "**/.git/**"];
@@ -3397,10 +3476,11 @@ async function resolveViteSourceScanEntries(options, patcher, scanOptions = {})
 		addSourceScanDependency(dependencies, source.file);
 		addSourceScanDependencies(dependencies, source.dependencies);
 		const resolved = await resolveTailwindV4EntriesFromCssCached(source.css, source.base);
-		return resolved ? createResolvedViteSourceScan(createResolvedV4CssScanInput(resolved.entries, resolved.inlineCandidates, resolved.explicit), new Set([...dependencies, ...resolved.dependencies])) : void 0;
+		return resolved ? createResolvedViteSourceScan(createResolvedV4CssScanInput(resolved.entries.length > 0 ? resolved.entries : [], resolved.inlineCandidates, resolved.entries.length > 0 ? resolved.explicit : false), new Set([...dependencies, ...resolved.dependencies])) : void 0;
 	}
 }
 function createViteSourceScanMatcher(entries) {
+	if (entries?.length === 0) return;
 	return createTailwindSourceEntryMatcher(entries);
 }
 //#endregion
@@ -3726,7 +3806,10 @@ async function transformTailwindV3CssByTarget(css, target, options) {
 }
 //#endregion
 //#region src/tailwindcss/v3-engine/generator.ts
-const incrementalGenerateCache = /* @__PURE__ */ new Map();
+const INCREMENTAL_GENERATE_CACHE_MAX = 8;
+const INCREMENTAL_GENERATE_ENTRY_CANDIDATES_MAX = 128;
+const INCREMENTAL_GENERATE_ENTRY_CSS_BYTES_MAX = 256 * 1024;
+const incrementalGenerateCache = new lru_cache.LRUCache({ max: INCREMENTAL_GENERATE_CACHE_MAX });
 const patchRawStyleGenerator = typeof tailwindcss_patch.generateTailwindV3RawStyle === "function" ? tailwindcss_patch.generateTailwindV3RawStyle : void 0;
 function isTailwindV3PatchResolutionError(error, packageName) {
 	if (!error || typeof error !== "object") return false;
@@ -3850,6 +3933,48 @@ function sortCandidates(candidates) {
 		return a < z ? -1 : 1;
 	});
 }
+function createRequestedCandidatesCacheKey(candidates) {
+	return sortCandidates(candidates).join("\n");
+}
+function createIncrementalResultsCache() {
+	return new lru_cache.LRUCache({ max: 16 });
+}
+function replaceIncrementalEntry(entry, candidates, generated) {
+	if (!generated.context) return;
+	entry.context = generated.context;
+	entry.seenCandidates = new Set(candidates);
+	entry.classSet = new Set(generated.classSet);
+	entry.css = generated.css;
+	entry.rawCss = generated.rawCss;
+	entry.dependencies = generated.dependencies;
+	entry.resultsByCandidates.clear();
+}
+function seedIncrementalResult(entry, candidates, result) {
+	entry.resultsByCandidates.set(createRequestedCandidatesCacheKey(candidates), {
+		classSet: new Set(result.classSet),
+		css: result.css,
+		rawCss: result.rawCss,
+		dependencies: result.dependencies
+	});
+}
+function createGenerateResultFromCache(cached, result, candidates) {
+	return {
+		css: result.css,
+		rawCss: result.rawCss,
+		incrementalCss: "",
+		incrementalRawCss: "",
+		classSet: new Set(result.classSet),
+		rawCandidates: new Set(candidates),
+		dependencies: result.dependencies,
+		sources: [],
+		root: null,
+		target: cached.target,
+		version: 3
+	};
+}
+function shouldRebuildIncrementalEntry(cached, requestedCandidates, missingCandidates) {
+	return cached.seenCandidates.size + missingCandidates.length > INCREMENTAL_GENERATE_ENTRY_CANDIDATES_MAX || cached.css.length > INCREMENTAL_GENERATE_ENTRY_CSS_BYTES_MAX || cached.rawCss.length > INCREMENTAL_GENERATE_ENTRY_CSS_BYTES_MAX || requestedCandidates.size > INCREMENTAL_GENERATE_ENTRY_CANDIDATES_MAX;
+}
 function appendUtilityRules(root, context, rules) {
 	const sortedRules = context.offsets.sort(rules);
 	for (const [sort, rule] of sortedRules) {
@@ -3979,38 +4104,31 @@ function createTailwindV3Engine(source) {
 		if (cached) {
 			if (hasRemovedCandidates(cached.seenCandidates, requestedCandidates)) {
 				const generated = await generateOnce(source, options);
-				incrementalGenerateCache.set(cacheKey, {
-					context: generated.context,
-					seenCandidates: new Set(requestedCandidates),
-					classSet: new Set(generated.classSet),
-					css: generated.css,
-					rawCss: generated.rawCss,
-					dependencies: generated.dependencies,
-					target: generated.target
-				});
+				replaceIncrementalEntry(cached, requestedCandidates, generated);
+				seedIncrementalResult(cached, requestedCandidates, generated);
 				return generated;
 			}
+			const requestedCacheKey = createRequestedCandidatesCacheKey(requestedCandidates);
+			const cachedResult = cached.resultsByCandidates.get(requestedCacheKey);
+			if (cachedResult) return createGenerateResultFromCache(cached, cachedResult, requestedCandidates);
 			const missingCandidates = [...requestedCandidates].filter((candidate) => !cached.seenCandidates.has(candidate));
-			if (missingCandidates.length === 0) return {
-				css: cached.css,
-				rawCss: cached.rawCss,
-				incrementalCss: "",
-				incrementalRawCss: "",
-				classSet: new Set(cached.classSet),
-				rawCandidates: new Set(cached.seenCandidates),
-				dependencies: cached.dependencies,
-				sources: [],
-				root: null,
-				target: cached.target,
-				version: 3
-			};
+			if (missingCandidates.length === 0) {
+				seedIncrementalResult(cached, requestedCandidates, cached);
+				return createGenerateResultFromCache(cached, cached, requestedCandidates);
+			}
+			if (shouldRebuildIncrementalEntry(cached, requestedCandidates, missingCandidates)) {
+				const generated = await generateOnce(source, options);
+				replaceIncrementalEntry(cached, requestedCandidates, generated);
+				seedIncrementalResult(cached, requestedCandidates, generated);
+				return generated;
+			}
 			const generated = await generateIncrementalMissingUtilities(cached.context, missingCandidates, target, styleOptions, options.bareArbitraryValues);
 			for (const candidate of missingCandidates) cached.seenCandidates.add(candidate);
 			for (const className of generated.classSet) cached.classSet.add(className);
 			cached.css = [cached.css, generated.css].filter(Boolean).join("\n");
 			cached.rawCss = [cached.rawCss, generated.rawCss].filter(Boolean).join("\n");
 			cached.dependencies = [...new Set([...cached.dependencies, ...generated.dependencies])];
-			return {
+			const result = {
 				css: cached.css,
 				rawCss: cached.rawCss,
 				incrementalCss: generated.css,
@@ -4023,17 +4141,23 @@ function createTailwindV3Engine(source) {
 				target: cached.target,
 				version: 3
 			};
+			seedIncrementalResult(cached, requestedCandidates, result);
+			return result;
 		}
 		const generated = await generateOnce(source, options);
-		incrementalGenerateCache.set(cacheKey, {
+		const resultsByCandidates = createIncrementalResultsCache();
+		const entry = {
 			context: generated.context,
 			seenCandidates: new Set(requestedCandidates),
 			classSet: new Set(generated.classSet),
 			css: generated.css,
 			rawCss: generated.rawCss,
 			dependencies: generated.dependencies,
+			resultsByCandidates,
 			target: generated.target
-		});
+		};
+		seedIncrementalResult(entry, requestedCandidates, generated);
+		incrementalGenerateCache.set(cacheKey, entry);
 		return generated;
 	}
 	async function generate(options = {}) {
@@ -4051,6 +4175,23 @@ function createTailwindV3Engine(source) {
 		generate
 	};
 }
+function getTailwindV3IncrementalGenerateCacheStats() {
+	return {
+		max: INCREMENTAL_GENERATE_CACHE_MAX,
+		entryCandidatesMax: INCREMENTAL_GENERATE_ENTRY_CANDIDATES_MAX,
+		entryCssBytesMax: INCREMENTAL_GENERATE_ENTRY_CSS_BYTES_MAX,
+		size: incrementalGenerateCache.size,
+		entries: [...incrementalGenerateCache.entries()].map(([key, entry]) => ({
+			key,
+			candidates: entry.seenCandidates.size,
+			classSet: entry.classSet.size,
+			cssBytes: entry.css.length,
+			rawCssBytes: entry.rawCss.length,
+			exactResults: entry.resultsByCandidates.size
+		})),
+		keys: [...incrementalGenerateCache.keys()]
+	};
+}
 //#endregion
 //#region src/tailwindcss/v3-engine/source.ts
 const DEFAULT_TAILWIND_V3_CSS = [
@@ -4102,6 +4243,7 @@ async function resolveTailwindV3Source(options = {}) {
 	const cssConfig = resolveCssConfig(options.css, base);
 	const config = resolveOptionalPath(options.config, base) ?? cssConfig.config;
 	const cwd = options.cwd ?? (config ? node_path.default.dirname(config) : projectRoot);
+	const explicitConfigObject = normalizeLoadedConfig(options.configObject);
 	const loaded = await (0, tailwindcss_config.loadConfig)(omitUndefined({
 		config,
 		cwd
@@ -4113,7 +4255,7 @@ async function resolveTailwindV3Source(options = {}) {
 		base,
 		css: cssConfig.css ?? options.css ?? DEFAULT_TAILWIND_V3_CSS,
 		config: loaded?.filepath ?? config,
-		configObject: normalizeLoadedConfig(loaded?.config),
+		configObject: explicitConfigObject ?? normalizeLoadedConfig(loaded?.config),
 		dependencies: loaded?.filepath ? [loaded.filepath] : [],
 		packageName: options.packageName ?? "tailwindcss",
 		postcssPlugin: options.postcssPlugin ?? options.packageName ?? "tailwindcss"
@@ -4242,6 +4384,18 @@ Object.defineProperty(exports, "getRuntimeClassSetSignatureWithSources", {
 		return getRuntimeClassSetSignatureWithSources;
 	}
 });
+Object.defineProperty(exports, "getTailwindV3IncrementalGenerateCacheStats", {
+	enumerable: true,
+	get: function() {
+		return getTailwindV3IncrementalGenerateCacheStats;
+	}
+});
+Object.defineProperty(exports, "getTailwindV4IncrementalGenerateCacheStats", {
+	enumerable: true,
+	get: function() {
+		return getTailwindV4IncrementalGenerateCacheStats;
+	}
+});
 Object.defineProperty(exports, "hasLocalCssImport", {
 	enumerable: true,
 	get: function() {
@@ -4380,6 +4534,12 @@ Object.defineProperty(exports, "resolveSourceScanPath", {
 		return resolveSourceScanPath;
 	}
 });
+Object.defineProperty(exports, "resolveTailwindConfigEntriesFromCssCached", {
+	enumerable: true,
+	get: function() {
+		return resolveTailwindConfigEntriesFromCssCached;
+	}
+});
 Object.defineProperty(exports, "resolveTailwindV3Source", {
 	enumerable: true,
 	get: function() {