weapp-tailwindcss 5.2.13 → 5.3.0

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

@@ -111,9 +111,10 @@ function createDefaultIgnoredSources(root, outDirIgnore, entries, explicit) {
 	}] : []];
 }
 /** 创建与文件系统 root scan 一致的增量源码资格判断器。 */
-function createSourceCandidateEligibilityMatcher(roots) {
+function createSourceCandidateEligibilityMatcher(roots, eligibleFiles) {
+	const eligibleFileSet = eligibleFiles === void 0 ? void 0 : new Set([...eligibleFiles].map(require_generator.resolveSourceScanPath));
 	const matchers = roots.map((options) => {
-		const root = node_path.default.resolve(options.root);
+		const root = require_generator.resolveSourceScanPath(options.root);
 		const outDirIgnore = resolveOutDirIgnorePattern(root, options.outDir);
 		const entries = options.entries;
 		const explicit = options.explicit === true;
@@ -123,11 +124,11 @@ function createSourceCandidateEligibilityMatcher(roots) {
 			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 require_generator.isFileMatchedByTailwindSourceEntries(resolvedFile, entries) && !require_generator.isFileExcludedByTailwindSourceEntries(resolvedFile, ignoredSources) && (eligibleFileSet?.has(resolvedFile) ?? true);
 		};
 	});
 	return (file) => {
-		const resolvedFile = node_path.default.resolve(file);
+		const resolvedFile = require_generator.resolveSourceScanPath(file);
 		return matchers.some((matches) => matches(resolvedFile));
 	};
 }
@@ -387,15 +388,19 @@ function createSourceCandidateStore(options = {}) {
 			throw error;
 		}
 	}
-	async function scanRoot({ entries, explicit, root, outDir }) {
-		const files = await resolveSourceCandidateScanFiles({
+	async function resolveScanFiles({ entries, explicit, root, outDir }) {
+		return (await resolveSourceCandidateScanFiles({
 			entries,
 			explicit,
 			filter: isSourceCandidateRequest,
 			outDir,
 			root
-		});
-		await Promise.all(files.map((file) => syncFile(require_generator.resolveSourceScanPath(file))));
+		})).map(require_generator.resolveSourceScanPath);
+	}
+	async function scanRoot(options) {
+		const resolvedFiles = await resolveScanFiles(options);
+		options.onFilesResolved?.(resolvedFiles);
+		await Promise.all(resolvedFiles.map(syncFile));
 	}
 	function replaceFinal(id, nextCandidates) {
 		const normalizedId = cleanUrl(id);
@@ -581,6 +586,7 @@ function createSourceCandidateStore(options = {}) {
 		syncFile,
 		syncCurrentSource,
 		syncCurrentFile,
+		resolveScanFiles,
 		scanRoot,
 		syncInline,
 		remove,
@@ -4842,9 +4848,9 @@ function resolveCompilationDependencies(dependencies) {
 	}));
 }
 async function executeGeneratorPipeline(context) {
-	return runCompilerOwnerActivity(context.runtimeState, () => executeGeneratorPipelineWithOwner(context));
+	return runCompilerOwnerActivity(context.runtimeState, () => executeGeneratorPipelineWithOwner(context, getCompilationSessionPool(context.runtimeState), getTailwindGenerationSessionPool(context.runtimeState)));
 }
-async function executeGeneratorPipelineWithOwner(context) {
+async function executeGeneratorPipelineWithOwner(context, compilationPool, generationSession) {
 	const { cssHandlerOptions, debug, file, generatorBranch, generatorOptions, generatorRawSource, getSourceCandidatesForEntries, hasGeneratedCss, hasGeneratedMarkers, localImports, majorVersion, normalizeGeneratorSource, normalizedCssSources, options, opts, runtime, runtimeState, useMiniProgramCssBranch } = context;
 	await runtimeState.readyPromise;
 	const currentCssCandidates = collectGeneratorCssCandidates(generatorRawSource);
@@ -4867,7 +4873,6 @@ async function executeGeneratorPipelineWithOwner(context) {
 	const generatorStyleOptions = resolveGeneratorStyleOptions(opts, cssHandlerOptions, generatorOptions.styleOptions);
 	const configuredContainerCompat = hasConfiguredContainerCompatSources(generatorSourceRecords.map((record) => record.source));
 	const sourceConcurrency = resolveGeneratorSourceConcurrency();
-	const generationSession = getTailwindGenerationSessionPool(runtimeState);
 	const preparedGenerationInputs = (await runWithConcurrency(generatorSourceRecords.map((record, index) => async () => {
 		const { metadata: sourceMetadata, source } = record;
 		const sourceCss = options.deferCssAdaptation ? (0, _weapp_tailwindcss_postcss.removeMatchingLocalCssImports)(source.css, localImports) : source.css;
@@ -4927,7 +4932,7 @@ async function executeGeneratorPipelineWithOwner(context) {
 	let compilationRevision;
 	let generated;
 	if (options.compilation?.enabled) {
-		const execution = await getCompilationSessionPool(runtimeState).run({
+		const execution = await compilationPool.run({
 			scope: options.compilation.scope,
 			outputId: options.outputFile ?? file,
 			changes: options.compilation.changes,
@@ -5183,9 +5188,9 @@ async function generateCssByGenerator(options) {
 //#endregion
 //#region src/bundlers/shared/generator-css/validate.ts
 async function validateCandidatesByGenerator(options) {
-	return runCompilerOwnerActivity(options.runtimeState, () => validateCandidatesByGeneratorWithOwner(options));
+	return runCompilerOwnerActivity(options.runtimeState, () => validateCandidatesByGeneratorWithOwner(options, getTailwindGenerationSessionPool(options.runtimeState)));
 }
-async function validateCandidatesByGeneratorWithOwner(options) {
+async function validateCandidatesByGeneratorWithOwner(options, generationSession) {
 	const { candidates, cssHandlerOptions, debug, file, opts, rawSource, runtimeState } = options;
 	const majorVersion = runtimeState.tailwindRuntime.majorVersion;
 	if (majorVersion !== 4 || candidates.size === 0) return /* @__PURE__ */ new Set();
@@ -5200,7 +5205,6 @@ async function validateCandidatesByGeneratorWithOwner(options) {
 				cssEntries: opts.cssEntries,
 				runtime: candidates
 			});
-			const generationSession = getTailwindGenerationSessionPool(runtimeState);
 			const classSets = await Promise.all(sourceRecords.map(async ({ source }) => {
 				return generationSession.validateCandidates(source, candidates);
 			}));