weapp-tailwindcss 5.2.11 → 5.2.13

package/dist/{v4-generation-core-D4zQcQqW.cjs → v4-generation-core-D-zVR2mt.cjs}

@@ -1,10 +1,10 @@
-const require_rolldown_runtime = require("./rolldown-runtime-CVvi-lCc.cjs");
-const require_generator = require("./generator-B0dCFlP1.cjs");
+const require_rolldown_runtime = require("./rolldown-runtime-Ctb5zv51.cjs");
+const require_generator = require("./generator-BXrWA7Sj.cjs");
 require("./auto-DtU6f3X6.cjs");
-const require_object = require("./object-C_Vr6_S5.cjs");
-const require_options = require("./options-zpZez7qe.cjs");
-const require_wxml = require("./wxml-DUIdXCVa.cjs");
-const require_style_options = require("./style-options-COpQc8fr.cjs");
+const require_object = require("./object-DbHtAXRk.cjs");
+const require_options = require("./options-DbYws6lr.cjs");
+const require_wxml = require("./wxml-CQmBCjOR.cjs");
+const require_style_options = require("./style-options-Cta1OP3i.cjs");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 node_path = require_rolldown_runtime.__toESM(node_path, 1);
@@ -110,6 +110,27 @@ function createDefaultIgnoredSources(root, outDirIgnore, entries, explicit) {
 		negated: true
 	}] : []];
 }
+/** 创建与文件系统 root scan 一致的增量源码资格判断器。 */
+function createSourceCandidateEligibilityMatcher(roots) {
+	const matchers = roots.map((options) => {
+		const root = node_path.default.resolve(options.root);
+		const outDirIgnore = resolveOutDirIgnorePattern(root, options.outDir);
+		const entries = options.entries;
+		const explicit = options.explicit === true;
+		const hasPositiveEntry = entries?.some((entry) => !entry.negated) === true;
+		const ignoredSources = createDefaultIgnoredSources(root, outDirIgnore, entries, explicit);
+		return (resolvedFile) => {
+			if (explicit) return hasPositiveEntry && require_generator.isFileMatchedByTailwindSourceEntries(resolvedFile, entries);
+			const relative = node_path.default.relative(root, resolvedFile);
+			if (!relative || relative.startsWith("..") || node_path.default.isAbsolute(relative)) return false;
+			return require_generator.isFileMatchedByTailwindSourceEntries(resolvedFile, entries) && !require_generator.isFileExcludedByTailwindSourceEntries(resolvedFile, ignoredSources);
+		};
+	});
+	return (file) => {
+		const resolvedFile = node_path.default.resolve(file);
+		return matchers.some((matches) => matches(resolvedFile));
+	};
+}
 function resolveSourceCandidateScanFiles(options) {
 	const resolvedRoot = node_path.default.resolve(options.root);
 	if (options.explicit && options.entries?.length && options.entries.every((entry) => entry.negated)) return Promise.resolve([]);
@@ -201,12 +222,13 @@ async function extractScriptStringCandidates(source, extension, options) {
 	if (!SCRIPT_SOURCE_CANDIDATE_EXTENSIONS.has(extension)) return [];
 	const values = /* @__PURE__ */ new Set();
 	try {
-		require_wxml.traverse(require_wxml.babelParse(source, {
+		const ast = require_wxml.babelParse(source, {
 			cache: true,
 			cacheKey: `source-candidates:${extension}`,
 			plugins: ["jsx", "typescript"],
 			sourceType: "unambiguous"
-		}), {
+		});
+		require_wxml.traverse(ast, {
 			noScope: true,
 			StringLiteral(path) {
 				values.add(path.node.value);
@@ -3511,7 +3533,8 @@ function isSameTailwindV4CssSource(a, b) {
 //#endregion
 //#region src/bundlers/shared/generator-css/source-resolver/single-source.ts
 async function resolveSingleTailwindV4CssSource(cssSource, sourceOptions, options = {}) {
-	const sourceBase = require_generator.resolveTailwindV4CssSourceBase(cssSource, sourceOptions.base ?? sourceOptions.projectRoot ?? node_process.default.cwd());
+	const sourceBaseFallback = sourceOptions.base ?? sourceOptions.projectRoot ?? node_process.default.cwd();
+	const sourceBase = require_generator.resolveTailwindV4CssSourceBase(cssSource, sourceBaseFallback);
 	const normalizedCssSource = normalizeTailwindV4CssSourceConfig(cssSource, sourceBase);
 	const source = await require_generator.resolveTailwindV4Source(createSingleTailwindV4SourceOptions(sourceOptions, {
 		base: sourceBase,
@@ -3529,7 +3552,8 @@ async function resolveSingleTailwindV4CssSource(cssSource, sourceOptions, option
 }
 async function resolveTailwindV4CssSourceEntries(cssSource, sourceOptions) {
 	if (typeof cssSource.css !== "string" || cssSource.css.length === 0) return;
-	const sourceBase = require_generator.resolveTailwindV4CssSourceBase(cssSource, sourceOptions.base ?? sourceOptions.projectRoot ?? node_process.default.cwd());
+	const sourceBaseFallback = sourceOptions.base ?? sourceOptions.projectRoot ?? node_process.default.cwd();
+	const sourceBase = require_generator.resolveTailwindV4CssSourceBase(cssSource, sourceBaseFallback);
 	return require_options.resolveTailwindV4EntriesFromCss(cssSource.css, sourceBase);
 }
 function countRuntimeCandidateHits(candidates, runtime) {
@@ -3775,7 +3799,8 @@ async function resolveGeneratorSource(_majorVersion, runtimeState, rawSource, fi
 //#endregion
 //#region src/bundlers/shared/generator-css/source-resolver/resolve-sources.ts
 async function resolveGeneratorResolvedSources(majorVersion, runtimeState, rawSource, file, cssHandlerOptions, generatorOptions, selectionOptions) {
-	const cssEntrySource = require_generator.resolveCssEntrySource(rawSource, resolveCssSourceBase(file, cssHandlerOptions), {
+	const base = resolveCssSourceBase(file, cssHandlerOptions);
+	const cssEntrySource = require_generator.resolveCssEntrySource(rawSource, base, {
 		importFallback: generatorOptions?.importFallback ?? false,
 		removeConfig: false
 	});
@@ -3992,7 +4017,9 @@ function removeTailwindApplyRules(rawSource) {
 function resolveLegacyCompatCssSource(rawSource) {
 	const cached = legacyCompatSourceCache.get(rawSource);
 	if (cached !== void 0) return cached;
-	const resolved = closeTrailingUnclosedBlocks(require_generator.removeTailwindV4GeneratedUserCssArtifacts((0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(removeTailwindApplyRules(require_generator.removeTailwindSourceDirectives(closeTrailingUnclosedBlocks(require_generator.stripTailwindBanners(rawSource)))))));
+	const parseableSource = closeTrailingUnclosedBlocks(require_generator.stripTailwindBanners(rawSource));
+	const source = require_generator.removeTailwindSourceDirectives(parseableSource);
+	const resolved = closeTrailingUnclosedBlocks(require_generator.removeTailwindV4GeneratedUserCssArtifacts((0, _weapp_tailwindcss_postcss.removeUnsupportedMiniProgramAtRules)(removeTailwindApplyRules(source))));
 	setLimitedCacheValue(legacyCompatSourceCache, rawSource, resolved);
 	return resolved;
 }
@@ -4022,7 +4049,8 @@ function hasContainerConfigToken(rawSource) {
 }
 function hasConfiguredContainerCompat(rawSource, file, cssHandlerOptions) {
 	if (hasContainerConfigToken(rawSource)) return true;
-	const cssEntrySource = require_generator.resolveCssEntrySource(rawSource, resolveCssSourceBase(file, cssHandlerOptions));
+	const base = resolveCssSourceBase(file, cssHandlerOptions);
+	const cssEntrySource = require_generator.resolveCssEntrySource(rawSource, base);
 	if (!cssEntrySource?.config) return false;
 	try {
 		return /\bcontainer\b/.test((0, node_fs.readFileSync)(cssEntrySource.config, "utf8"));
@@ -4510,13 +4538,15 @@ async function finalizeDeferredGeneratorCss(context) {
 				const cssWithBeforeUserCss = createCssSourceOrderAppend((0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, beforeUserCss), css);
 				return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend(cssWithBeforeUserCss, (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(cssWithBeforeUserCss, afterUserCss)));
 			}
-			return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend(css, (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, await transformDeferredUserCss(generatedUserCssRawSource))));
+			const userCss = await transformDeferredUserCss(generatedUserCssRawSource);
+			return reorderMarkedUserLayerComponentsCss(createCssSourceOrderAppend(css, (0, _weapp_tailwindcss_postcss.filterExistingCssRules)(css, userCss)));
 		};
 		const canAppendIncrementalCss = generated.target !== "weapp" || !require_generator.hasUserCssLayerBlocks(generatorRawSource);
 		const incrementalRawCss = generated.incrementalRawCss ?? generated.incrementalCss;
 		const shouldAppendIncrementalCss = canAppendIncrementalCss && typeof options.previousCss === "string" && typeof incrementalRawCss === "string";
 		const normalizedCss = shouldAppendIncrementalCss ? incrementalRawCss.trim().length > 0 ? require_generator.createCssAppend(options.previousCss, await normalizeDeferredGeneratedCss(incrementalRawCss)) : options.previousCss : await normalizeDeferredGeneratedCss(generated.rawCss ?? generated.css);
-		const css = (0, _weapp_tailwindcss_postcss.restoreLocalCssImports)(shouldAppendIncrementalCss ? normalizedCss : await restoreDeferredUserCss(normalizedCss), localImports, { outputFile: file });
+		const intermediateCss = shouldAppendIncrementalCss ? normalizedCss : await restoreDeferredUserCss(normalizedCss);
+		const css = (0, _weapp_tailwindcss_postcss.restoreLocalCssImports)(intermediateCss, localImports, { outputFile: file });
 		return {
 			css,
 			classSet: resolveGeneratedCssClassSet(generated.target, generated.classSet, runtimeWithCurrentCss, css, opts.escapeMap, options.previousClassSet),
@@ -4601,7 +4631,8 @@ async function finalizeFallbackGeneratorCss(context) {
 			css = createCssSourceOrderAppend(css, missingUserCss);
 		} else if (hasMatchedCssSourceFile && generated.target === "weapp" && hasGeneratedMarkers && !hasGeneratedCss) {
 			const cleanedUserCssRawSource = require_generator.removeTailwindV4GeneratedUserCssArtifacts(userCssRawSource);
-			const userCss = await require_generator.transformGeneratorUserCss(restoredDistinctUserLayerCss && require_generator.hasUserCssLayerBlocks(cleanedUserCssRawSource) ? require_generator.splitUserCssLayerBlocks(cleanedUserCssRawSource).rest : cleanedUserCssRawSource, {
+			const cleanedUserCssRestSource = restoredDistinctUserLayerCss && require_generator.hasUserCssLayerBlocks(cleanedUserCssRawSource) ? require_generator.splitUserCssLayerBlocks(cleanedUserCssRawSource).rest : cleanedUserCssRawSource;
+			const userCss = await require_generator.transformGeneratorUserCss(cleanedUserCssRestSource, {
 				generatorTarget: generated.target,
 				generatorStyleOptions,
 				cssUserHandlerOptions,
@@ -5424,6 +5455,12 @@ Object.defineProperty(exports, "createSourceCandidateCollector", {
 		return createSourceCandidateCollector;
 	}
 });
+Object.defineProperty(exports, "createSourceCandidateEligibilityMatcher", {
+	enumerable: true,
+	get: function() {
+		return createSourceCandidateEligibilityMatcher;
+	}
+});
 Object.defineProperty(exports, "createSourceCandidateStore", {
 	enumerable: true,
 	get: function() {