tailwindcss-patch 9.3.2 → 9.3.4

package/dist/{validate-Sq_yuh3r.mjs → validate-BoTQvn7s.mjs}

@@ -16,7 +16,7 @@ import _babelTraverse from "@babel/traverse";
 import { parse, parse as parse$1 } from "@babel/parser";
 import { loadConfig } from "tailwindcss-config";
 //#region package.json
-var version = "9.3.2";
+var version = "9.3.4";
 //#endregion
 //#region src/constants.ts
 const pkgName = "tailwindcss-patch";
@@ -1323,6 +1323,13 @@ function normalizeExtendLengthUnitsOptions(extend) {
 function normalizeTailwindV4Options(v4, fallbackBase) {
 	const configuredBase = v4?.base ? path.resolve(v4.base) : void 0;
 	const base = configuredBase ?? fallbackBase;
+	const resolveV4Path = (value) => path.isAbsolute(value) ? path.resolve(value) : path.resolve(fallbackBase, value);
+	const cssSources = Array.isArray(v4?.cssSources) ? v4.cssSources.filter((source) => typeof source?.css === "string").map((source) => ({
+		css: source.css,
+		...source.base === void 0 ? {} : { base: resolveV4Path(source.base) },
+		...source.file === void 0 ? {} : { file: resolveV4Path(source.file) },
+		...source.dependencies === void 0 ? {} : { dependencies: source.dependencies.filter(Boolean).map(resolveV4Path) }
+	})) : [];
 	const cssEntries = Array.isArray(v4?.cssEntries) ? v4.cssEntries.filter((entry) => Boolean(entry)).map((entry) => path.resolve(entry)) : [];
 	const userSources = v4?.sources;
 	const hasUserDefinedSources = Boolean(userSources?.length);
@@ -1335,6 +1342,7 @@ function normalizeTailwindV4Options(v4, fallbackBase) {
 		base,
 		...configuredBase === void 0 ? {} : { configuredBase },
 		...v4?.css === void 0 ? {} : { css: v4.css },
+		cssSources,
 		cssEntries,
 		sources,
 		hasUserDefinedSources,
@@ -2056,6 +2064,132 @@ function getOxideModule() {
 	});
 	return oxideImportPromise;
 }
+const HTML_ATTRIBUTE_NAME_CANDIDATE_RE = /^(?:class|className|hover-class|hoverClass)$/;
+const CSS_DIRECTIVE_CANDIDATE_RE = /^@(?:apply|tailwind|source|config|plugin|theme|utility|custom-variant|variant)$/;
+const CSS_APPLY_IMPORTANT = "!important";
+const JS_LIKE_SOURCE_EXTENSION_RE = /^(?:[cm]?[jt]sx?)$/;
+const MIXED_TEMPLATE_SOURCE_EXTENSION_RE = /^(?:vue|uvue|nvue|svelte|mpx)$/;
+const CSS_LIKE_SOURCE_EXTENSION_RE = /^(?:css|wxss|acss|jxss|ttss|qss|tyss|scss|sass|less|styl|stylus)$/;
+const SFC_SCRIPT_BLOCK_RE = /<script\b[^>]*>([\s\S]*?)<\/script>/gi;
+function isWhitespace(value) {
+	return value === " " || value === "\n" || value === "\r" || value === "	" || value === "\f";
+}
+function isHtmlAttributeNameCandidate(content, candidate) {
+	if (!HTML_ATTRIBUTE_NAME_CANDIDATE_RE.test(candidate.rawCandidate)) return false;
+	let index = candidate.end;
+	while (isWhitespace(content[index])) index++;
+	return content[index] === "=";
+}
+function isInsideHtmlTagText(content, candidate) {
+	if (content.lastIndexOf("<", candidate.start) > content.lastIndexOf(">", candidate.start)) return false;
+	const nextOpen = content.indexOf("<", candidate.end);
+	return nextOpen !== -1 && (nextOpen < content.indexOf(">", candidate.end) || content.indexOf(">", candidate.end) === -1);
+}
+function isCssDirectiveCandidate(candidate) {
+	return candidate === CSS_APPLY_IMPORTANT || CSS_DIRECTIVE_CANDIDATE_RE.test(candidate);
+}
+function isCandidateInCssApplyParams(content, candidate) {
+	const apply = content.lastIndexOf("@apply", candidate.start);
+	if (apply === -1) return false;
+	const boundary = content.slice(apply + 6, candidate.start);
+	return !/[;{}]/.test(boundary);
+}
+function isCandidateInsideJsStringStaticContent(content, start) {
+	let quote;
+	let templateExpressionDepth = 0;
+	for (let index = 0; index < start; index++) {
+		const char = content[index];
+		const next = content[index + 1];
+		if (quote && char === "\\") {
+			index++;
+			continue;
+		}
+		if (quote === "`" && templateExpressionDepth > 0) {
+			if (char === "\"" || char === "'") {
+				const nestedQuote = char;
+				index++;
+				while (index < start) {
+					const nestedChar = content[index];
+					if (nestedChar === "\\") {
+						index += 2;
+						continue;
+					}
+					if (nestedChar === nestedQuote) break;
+					index++;
+				}
+				continue;
+			}
+			if (char === "`") {
+				index++;
+				while (index < start) {
+					const nestedChar = content[index];
+					if (nestedChar === "\\") {
+						index += 2;
+						continue;
+					}
+					if (nestedChar === "`") break;
+					index++;
+				}
+				continue;
+			}
+			if (char === "{") {
+				templateExpressionDepth++;
+				continue;
+			}
+			if (char === "}") {
+				templateExpressionDepth--;
+				continue;
+			}
+			continue;
+		}
+		if (quote) {
+			if (quote === "`" && char === "$" && next === "{") {
+				templateExpressionDepth = 1;
+				index++;
+				continue;
+			}
+			if (char === quote) quote = void 0;
+			continue;
+		}
+		if (char === "\"" || char === "'" || char === "`") quote = char;
+	}
+	return quote !== void 0 && templateExpressionDepth === 0;
+}
+function shouldKeepSourceCandidate(content, extension, candidate) {
+	if (!candidate.rawCandidate || isCssDirectiveCandidate(candidate.rawCandidate)) return false;
+	if (CSS_LIKE_SOURCE_EXTENSION_RE.test(extension) && !isCandidateInCssApplyParams(content, candidate)) return false;
+	if (isHtmlAttributeNameCandidate(content, candidate)) return false;
+	if (isInsideHtmlTagText(content, candidate)) return false;
+	if (JS_LIKE_SOURCE_EXTENSION_RE.test(extension) && !isCandidateInsideJsStringStaticContent(content, candidate.start)) return false;
+	return true;
+}
+function createLocalCandidate(candidate) {
+	return {
+		rawCandidate: candidate.rawCandidate,
+		start: candidate.localStart,
+		end: candidate.localStart + candidate.rawCandidate.length
+	};
+}
+async function extractMixedSourceScriptCandidates(content) {
+	const candidates = [];
+	SFC_SCRIPT_BLOCK_RE.lastIndex = 0;
+	let match = SFC_SCRIPT_BLOCK_RE.exec(content);
+	while (match !== null) {
+		const scriptContent = match[1] ?? "";
+		const scriptStart = match.index + match[0].indexOf(scriptContent);
+		const scriptCandidates = await extractRawCandidatesWithPositions(scriptContent, "js");
+		candidates.push(...scriptCandidates.map((candidate) => ({
+			content: scriptContent,
+			extension: "js",
+			localStart: candidate.start,
+			rawCandidate: candidate.rawCandidate,
+			start: candidate.start + scriptStart,
+			end: candidate.end + scriptStart
+		})));
+		match = SFC_SCRIPT_BLOCK_RE.exec(content);
+	}
+	return candidates;
+}
 function createCandidateCacheKey(designSystemKey, options) {
 	if (options.bareArbitraryValues == null || options.bareArbitraryValues === false) return designSystemKey;
 	return `${designSystemKey}:bare-arbitrary:${JSON.stringify(options.bareArbitraryValues)}`;
@@ -2071,6 +2205,32 @@ async function extractRawCandidatesWithPositions(content, extension = "html") {
 		end: position + candidate.length
 	}));
 }
+async function extractSourceCandidatesWithPositions(content, extension = "html") {
+	const normalizedExtension = extension.replace(/^\./, "");
+	const candidates = (await extractRawCandidatesWithPositions(content, normalizedExtension)).map((candidate) => ({
+		...candidate,
+		content,
+		extension: normalizedExtension,
+		localStart: candidate.start
+	}));
+	if (MIXED_TEMPLATE_SOURCE_EXTENSION_RE.test(normalizedExtension)) candidates.push(...await extractMixedSourceScriptCandidates(content));
+	const seen = /* @__PURE__ */ new Set();
+	return candidates.filter((candidate) => {
+		if (!shouldKeepSourceCandidate(candidate.content, candidate.extension, createLocalCandidate(candidate))) return false;
+		const key = `${candidate.start}:${candidate.end}:${candidate.rawCandidate}`;
+		if (seen.has(key)) return false;
+		seen.add(key);
+		return true;
+	}).map(({ rawCandidate, start, end }) => ({
+		rawCandidate,
+		start,
+		end
+	}));
+}
+async function extractSourceCandidates(content, extension = "html") {
+	const candidates = await extractSourceCandidatesWithPositions(content, extension);
+	return [...new Set(candidates.map((candidate) => candidate.rawCandidate))];
+}
 async function extractRawCandidates(sources) {
 	const { Scanner } = await getOxideModule();
 	return new Scanner(sources === void 0 ? {} : { sources }).scan();
@@ -2315,6 +2475,25 @@ async function collectClassesFromTailwindV4(options) {
 			negated: source.negated
 		}));
 	};
+	const addCandidates = async (extractOptions) => {
+		const candidates = await extractValidCandidates(extractOptions);
+		for (const candidate of candidates) if (options.filter(candidate)) set.add(candidate);
+	};
+	if (v4Options.cssSources.length > 0) for (const source of v4Options.cssSources) {
+		const sourceFile = toAbsolute(source.file);
+		const sourceBase = toAbsolute(source.base) ?? (sourceFile ? path.dirname(sourceFile) : resolvedDefaultBase);
+		const designSystemBases = resolvedConfiguredBase && resolvedConfiguredBase !== sourceBase ? [sourceBase, resolvedConfiguredBase] : [sourceBase];
+		const sources = resolveSources(sourceBase);
+		const firstBase = designSystemBases[0] ?? sourceBase;
+		await addCandidates({
+			cwd: options.projectRoot,
+			base: firstBase,
+			baseFallbacks: designSystemBases.slice(1),
+			css: source.css,
+			...v4Options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: v4Options.bareArbitraryValues },
+			...sources === void 0 ? {} : { sources }
+		});
+	}
 	if (v4Options.cssEntries.length > 0) for (const entry of v4Options.cssEntries) {
 		const filePath = path.isAbsolute(entry) ? entry : path.resolve(options.projectRoot, entry);
 		if (!await fs.pathExists(filePath)) continue;
@@ -2323,7 +2502,7 @@ async function collectClassesFromTailwindV4(options) {
 		const designSystemBases = resolvedConfiguredBase && resolvedConfiguredBase !== entryDir ? [entryDir, resolvedConfiguredBase] : [entryDir];
 		const sources = resolveSources(resolvedConfiguredBase ?? entryDir);
 		const firstBase = designSystemBases[0] ?? entryDir;
-		const candidates = await extractValidCandidates({
+		await addCandidates({
 			cwd: options.projectRoot,
 			base: firstBase,
 			baseFallbacks: designSystemBases.slice(1),
@@ -2331,19 +2510,17 @@ async function collectClassesFromTailwindV4(options) {
 			...v4Options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: v4Options.bareArbitraryValues },
 			...sources === void 0 ? {} : { sources }
 		});
-		for (const candidate of candidates) if (options.filter(candidate)) set.add(candidate);
 	}
-	else {
+	else if (v4Options.cssSources.length === 0) {
 		const baseForCss = resolvedConfiguredBase ?? resolvedDefaultBase;
 		const sources = resolveSources(baseForCss);
-		const candidates = await extractValidCandidates({
+		await addCandidates({
 			cwd: options.projectRoot,
 			base: baseForCss,
 			...v4Options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: v4Options.bareArbitraryValues },
 			...v4Options.css === void 0 ? {} : { css: v4Options.css },
 			...sources === void 0 ? {} : { sources }
 		});
-		for (const candidate of candidates) if (options.filter(candidate)) set.add(candidate);
 	}
 	return set;
 }
@@ -3909,4 +4086,4 @@ var ValidateCommandError = class extends Error {
 	}
 };
 //#endregion
-export { CacheStore as A, canonicalizeBareArbitraryValueCandidates as C, loadPatchOptionsForWorkspace as D, resolveValidTailwindV4Candidates as E, loadWorkspaceConfigModule as O, loadTailwindV4DesignSystem as S, replaceBareArbitraryValueSelectors as T, extractRawCandidates as _, tailwindcssPatchCommands as a, groupTokensByFile as b, MIGRATION_REPORT_KIND as c, getPatchStatusReport as d, runTailwindBuild as f, extractProjectCandidatesWithPositions as g, collectClassesFromTailwindV4 as h, classifyValidateError as i, logger as j, normalizeOptions as k, MIGRATION_REPORT_SCHEMA_VERSION as l, collectClassesFromContexts as m, VALIDATE_FAILURE_REASONS as n, migrateConfigFiles as o, loadRuntimeContexts as p, ValidateCommandError as r, restoreConfigFiles as s, VALIDATE_EXIT_CODES as t, TailwindcssPatcher as u, extractRawCandidatesWithPositions as v, extractTailwindV4InlineSourceCandidates as w, compileTailwindV4Source as x, extractValidCandidates as y };
+export { loadWorkspaceConfigModule as A, compileTailwindV4Source as C, replaceBareArbitraryValueSelectors as D, extractTailwindV4InlineSourceCandidates as E, CacheStore as M, logger as N, resolveValidTailwindV4Candidates as O, groupTokensByFile as S, canonicalizeBareArbitraryValueCandidates as T, extractRawCandidates as _, tailwindcssPatchCommands as a, extractSourceCandidatesWithPositions as b, MIGRATION_REPORT_KIND as c, getPatchStatusReport as d, runTailwindBuild as f, extractProjectCandidatesWithPositions as g, collectClassesFromTailwindV4 as h, classifyValidateError as i, normalizeOptions as j, loadPatchOptionsForWorkspace as k, MIGRATION_REPORT_SCHEMA_VERSION as l, collectClassesFromContexts as m, VALIDATE_FAILURE_REASONS as n, migrateConfigFiles as o, loadRuntimeContexts as p, ValidateCommandError as r, restoreConfigFiles as s, VALIDATE_EXIT_CODES as t, TailwindcssPatcher as u, extractRawCandidatesWithPositions as v, loadTailwindV4DesignSystem as w, extractValidCandidates as x, extractSourceCandidates as y };

package/dist/{validate-CF0M_7KH.js → validate-DmELQoI2.js}

@@ -23,7 +23,7 @@ _babel_traverse = require_chunk.__toESM(_babel_traverse);
 let _babel_parser = require("@babel/parser");
 let tailwindcss_config = require("tailwindcss-config");
 //#region package.json
-var version = "9.3.2";
+var version = "9.3.4";
 //#endregion
 //#region src/constants.ts
 const pkgName = "tailwindcss-patch";
@@ -1330,6 +1330,13 @@ function normalizeExtendLengthUnitsOptions(extend) {
 function normalizeTailwindV4Options(v4, fallbackBase) {
 	const configuredBase = v4?.base ? pathe.default.resolve(v4.base) : void 0;
 	const base = configuredBase ?? fallbackBase;
+	const resolveV4Path = (value) => pathe.default.isAbsolute(value) ? pathe.default.resolve(value) : pathe.default.resolve(fallbackBase, value);
+	const cssSources = Array.isArray(v4?.cssSources) ? v4.cssSources.filter((source) => typeof source?.css === "string").map((source) => ({
+		css: source.css,
+		...source.base === void 0 ? {} : { base: resolveV4Path(source.base) },
+		...source.file === void 0 ? {} : { file: resolveV4Path(source.file) },
+		...source.dependencies === void 0 ? {} : { dependencies: source.dependencies.filter(Boolean).map(resolveV4Path) }
+	})) : [];
 	const cssEntries = Array.isArray(v4?.cssEntries) ? v4.cssEntries.filter((entry) => Boolean(entry)).map((entry) => pathe.default.resolve(entry)) : [];
 	const userSources = v4?.sources;
 	const hasUserDefinedSources = Boolean(userSources?.length);
@@ -1342,6 +1349,7 @@ function normalizeTailwindV4Options(v4, fallbackBase) {
 		base,
 		...configuredBase === void 0 ? {} : { configuredBase },
 		...v4?.css === void 0 ? {} : { css: v4.css },
+		cssSources,
 		cssEntries,
 		sources,
 		hasUserDefinedSources,
@@ -2058,6 +2066,132 @@ function getOxideModule() {
 	});
 	return oxideImportPromise;
 }
+const HTML_ATTRIBUTE_NAME_CANDIDATE_RE = /^(?:class|className|hover-class|hoverClass)$/;
+const CSS_DIRECTIVE_CANDIDATE_RE = /^@(?:apply|tailwind|source|config|plugin|theme|utility|custom-variant|variant)$/;
+const CSS_APPLY_IMPORTANT = "!important";
+const JS_LIKE_SOURCE_EXTENSION_RE = /^(?:[cm]?[jt]sx?)$/;
+const MIXED_TEMPLATE_SOURCE_EXTENSION_RE = /^(?:vue|uvue|nvue|svelte|mpx)$/;
+const CSS_LIKE_SOURCE_EXTENSION_RE = /^(?:css|wxss|acss|jxss|ttss|qss|tyss|scss|sass|less|styl|stylus)$/;
+const SFC_SCRIPT_BLOCK_RE = /<script\b[^>]*>([\s\S]*?)<\/script>/gi;
+function isWhitespace(value) {
+	return value === " " || value === "\n" || value === "\r" || value === "	" || value === "\f";
+}
+function isHtmlAttributeNameCandidate(content, candidate) {
+	if (!HTML_ATTRIBUTE_NAME_CANDIDATE_RE.test(candidate.rawCandidate)) return false;
+	let index = candidate.end;
+	while (isWhitespace(content[index])) index++;
+	return content[index] === "=";
+}
+function isInsideHtmlTagText(content, candidate) {
+	if (content.lastIndexOf("<", candidate.start) > content.lastIndexOf(">", candidate.start)) return false;
+	const nextOpen = content.indexOf("<", candidate.end);
+	return nextOpen !== -1 && (nextOpen < content.indexOf(">", candidate.end) || content.indexOf(">", candidate.end) === -1);
+}
+function isCssDirectiveCandidate(candidate) {
+	return candidate === CSS_APPLY_IMPORTANT || CSS_DIRECTIVE_CANDIDATE_RE.test(candidate);
+}
+function isCandidateInCssApplyParams(content, candidate) {
+	const apply = content.lastIndexOf("@apply", candidate.start);
+	if (apply === -1) return false;
+	const boundary = content.slice(apply + 6, candidate.start);
+	return !/[;{}]/.test(boundary);
+}
+function isCandidateInsideJsStringStaticContent(content, start) {
+	let quote;
+	let templateExpressionDepth = 0;
+	for (let index = 0; index < start; index++) {
+		const char = content[index];
+		const next = content[index + 1];
+		if (quote && char === "\\") {
+			index++;
+			continue;
+		}
+		if (quote === "`" && templateExpressionDepth > 0) {
+			if (char === "\"" || char === "'") {
+				const nestedQuote = char;
+				index++;
+				while (index < start) {
+					const nestedChar = content[index];
+					if (nestedChar === "\\") {
+						index += 2;
+						continue;
+					}
+					if (nestedChar === nestedQuote) break;
+					index++;
+				}
+				continue;
+			}
+			if (char === "`") {
+				index++;
+				while (index < start) {
+					const nestedChar = content[index];
+					if (nestedChar === "\\") {
+						index += 2;
+						continue;
+					}
+					if (nestedChar === "`") break;
+					index++;
+				}
+				continue;
+			}
+			if (char === "{") {
+				templateExpressionDepth++;
+				continue;
+			}
+			if (char === "}") {
+				templateExpressionDepth--;
+				continue;
+			}
+			continue;
+		}
+		if (quote) {
+			if (quote === "`" && char === "$" && next === "{") {
+				templateExpressionDepth = 1;
+				index++;
+				continue;
+			}
+			if (char === quote) quote = void 0;
+			continue;
+		}
+		if (char === "\"" || char === "'" || char === "`") quote = char;
+	}
+	return quote !== void 0 && templateExpressionDepth === 0;
+}
+function shouldKeepSourceCandidate(content, extension, candidate) {
+	if (!candidate.rawCandidate || isCssDirectiveCandidate(candidate.rawCandidate)) return false;
+	if (CSS_LIKE_SOURCE_EXTENSION_RE.test(extension) && !isCandidateInCssApplyParams(content, candidate)) return false;
+	if (isHtmlAttributeNameCandidate(content, candidate)) return false;
+	if (isInsideHtmlTagText(content, candidate)) return false;
+	if (JS_LIKE_SOURCE_EXTENSION_RE.test(extension) && !isCandidateInsideJsStringStaticContent(content, candidate.start)) return false;
+	return true;
+}
+function createLocalCandidate(candidate) {
+	return {
+		rawCandidate: candidate.rawCandidate,
+		start: candidate.localStart,
+		end: candidate.localStart + candidate.rawCandidate.length
+	};
+}
+async function extractMixedSourceScriptCandidates(content) {
+	const candidates = [];
+	SFC_SCRIPT_BLOCK_RE.lastIndex = 0;
+	let match = SFC_SCRIPT_BLOCK_RE.exec(content);
+	while (match !== null) {
+		const scriptContent = match[1] ?? "";
+		const scriptStart = match.index + match[0].indexOf(scriptContent);
+		const scriptCandidates = await extractRawCandidatesWithPositions(scriptContent, "js");
+		candidates.push(...scriptCandidates.map((candidate) => ({
+			content: scriptContent,
+			extension: "js",
+			localStart: candidate.start,
+			rawCandidate: candidate.rawCandidate,
+			start: candidate.start + scriptStart,
+			end: candidate.end + scriptStart
+		})));
+		match = SFC_SCRIPT_BLOCK_RE.exec(content);
+	}
+	return candidates;
+}
 function createCandidateCacheKey(designSystemKey, options) {
 	if (options.bareArbitraryValues == null || options.bareArbitraryValues === false) return designSystemKey;
 	return `${designSystemKey}:bare-arbitrary:${JSON.stringify(options.bareArbitraryValues)}`;
@@ -2073,6 +2207,32 @@ async function extractRawCandidatesWithPositions(content, extension = "html") {
 		end: position + candidate.length
 	}));
 }
+async function extractSourceCandidatesWithPositions(content, extension = "html") {
+	const normalizedExtension = extension.replace(/^\./, "");
+	const candidates = (await extractRawCandidatesWithPositions(content, normalizedExtension)).map((candidate) => ({
+		...candidate,
+		content,
+		extension: normalizedExtension,
+		localStart: candidate.start
+	}));
+	if (MIXED_TEMPLATE_SOURCE_EXTENSION_RE.test(normalizedExtension)) candidates.push(...await extractMixedSourceScriptCandidates(content));
+	const seen = /* @__PURE__ */ new Set();
+	return candidates.filter((candidate) => {
+		if (!shouldKeepSourceCandidate(candidate.content, candidate.extension, createLocalCandidate(candidate))) return false;
+		const key = `${candidate.start}:${candidate.end}:${candidate.rawCandidate}`;
+		if (seen.has(key)) return false;
+		seen.add(key);
+		return true;
+	}).map(({ rawCandidate, start, end }) => ({
+		rawCandidate,
+		start,
+		end
+	}));
+}
+async function extractSourceCandidates(content, extension = "html") {
+	const candidates = await extractSourceCandidatesWithPositions(content, extension);
+	return [...new Set(candidates.map((candidate) => candidate.rawCandidate))];
+}
 async function extractRawCandidates(sources) {
 	const { Scanner } = await getOxideModule();
 	return new Scanner(sources === void 0 ? {} : { sources }).scan();
@@ -2317,6 +2477,25 @@ async function collectClassesFromTailwindV4(options) {
 			negated: source.negated
 		}));
 	};
+	const addCandidates = async (extractOptions) => {
+		const candidates = await extractValidCandidates(extractOptions);
+		for (const candidate of candidates) if (options.filter(candidate)) set.add(candidate);
+	};
+	if (v4Options.cssSources.length > 0) for (const source of v4Options.cssSources) {
+		const sourceFile = toAbsolute(source.file);
+		const sourceBase = toAbsolute(source.base) ?? (sourceFile ? pathe.default.dirname(sourceFile) : resolvedDefaultBase);
+		const designSystemBases = resolvedConfiguredBase && resolvedConfiguredBase !== sourceBase ? [sourceBase, resolvedConfiguredBase] : [sourceBase];
+		const sources = resolveSources(sourceBase);
+		const firstBase = designSystemBases[0] ?? sourceBase;
+		await addCandidates({
+			cwd: options.projectRoot,
+			base: firstBase,
+			baseFallbacks: designSystemBases.slice(1),
+			css: source.css,
+			...v4Options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: v4Options.bareArbitraryValues },
+			...sources === void 0 ? {} : { sources }
+		});
+	}
 	if (v4Options.cssEntries.length > 0) for (const entry of v4Options.cssEntries) {
 		const filePath = pathe.default.isAbsolute(entry) ? entry : pathe.default.resolve(options.projectRoot, entry);
 		if (!await fs_extra.default.pathExists(filePath)) continue;
@@ -2325,7 +2504,7 @@ async function collectClassesFromTailwindV4(options) {
 		const designSystemBases = resolvedConfiguredBase && resolvedConfiguredBase !== entryDir ? [entryDir, resolvedConfiguredBase] : [entryDir];
 		const sources = resolveSources(resolvedConfiguredBase ?? entryDir);
 		const firstBase = designSystemBases[0] ?? entryDir;
-		const candidates = await extractValidCandidates({
+		await addCandidates({
 			cwd: options.projectRoot,
 			base: firstBase,
 			baseFallbacks: designSystemBases.slice(1),
@@ -2333,19 +2512,17 @@ async function collectClassesFromTailwindV4(options) {
 			...v4Options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: v4Options.bareArbitraryValues },
 			...sources === void 0 ? {} : { sources }
 		});
-		for (const candidate of candidates) if (options.filter(candidate)) set.add(candidate);
 	}
-	else {
+	else if (v4Options.cssSources.length === 0) {
 		const baseForCss = resolvedConfiguredBase ?? resolvedDefaultBase;
 		const sources = resolveSources(baseForCss);
-		const candidates = await extractValidCandidates({
+		await addCandidates({
 			cwd: options.projectRoot,
 			base: baseForCss,
 			...v4Options.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: v4Options.bareArbitraryValues },
 			...v4Options.css === void 0 ? {} : { css: v4Options.css },
 			...sources === void 0 ? {} : { sources }
 		});
-		for (const candidate of candidates) if (options.filter(candidate)) set.add(candidate);
 	}
 	return set;
 }
@@ -4001,6 +4178,18 @@ Object.defineProperty(exports, "extractRawCandidatesWithPositions", {
 		return extractRawCandidatesWithPositions;
 	}
 });
+Object.defineProperty(exports, "extractSourceCandidates", {
+	enumerable: true,
+	get: function() {
+		return extractSourceCandidates;
+	}
+});
+Object.defineProperty(exports, "extractSourceCandidatesWithPositions", {
+	enumerable: true,
+	get: function() {
+		return extractSourceCandidatesWithPositions;
+	}
+});
 Object.defineProperty(exports, "extractTailwindV4InlineSourceCandidates", {
 	enumerable: true,
 	get: function() {

package/dist/{validate-C8-qsOWo.d.mts → validate-ZwyABmFW.d.ts}

@@ -1,9 +1,10 @@
-import { PackageInfo, PackageResolvingOptions } from "local-pkg";
-import * as _$consola from "consola";
-import { Node, Rule } from "postcss";
 import { CAC, Command } from "cac";
+import { PackageInfo, PackageResolvingOptions } from "local-pkg";
 import { SourceEntry } from "@tailwindcss/oxide";
+import { Node, Rule } from "postcss";
 import { Config } from "tailwindcss";
+import * as _$consola from "consola";
+
 //#region src/cache/types.d.ts
 declare const CACHE_SCHEMA_VERSION = 2;
 declare const CACHE_FINGERPRINT_VERSION = 1;
@@ -158,6 +159,78 @@ interface PatchStatusReport {
   entries: PatchStatusEntry[];
 }
 //#endregion
+//#region src/v4/types.d.ts
+interface TailwindV4SourceOptions {
+  projectRoot?: string;
+  cwd?: string;
+  base?: string;
+  baseFallbacks?: string[];
+  css?: string;
+  cssSources?: TailwindV4CssSource[];
+  cssEntries?: string[];
+  packageName?: string;
+}
+interface TailwindV4CssSource {
+  css: string;
+  base?: string;
+  file?: string;
+  dependencies?: string[];
+}
+interface TailwindV4ResolvedSource {
+  projectRoot: string;
+  base: string;
+  baseFallbacks: string[];
+  css: string;
+  dependencies: string[];
+}
+interface TailwindV4CandidateSource {
+  content: string;
+  extension?: string;
+}
+interface TailwindV4GenerateOptions {
+  candidates?: Iterable<string>;
+  sources?: TailwindV4CandidateSource[];
+  /**
+   * Enables UnoCSS-style bare arbitrary values such as `p-10%` and `p-2.5px`.
+   */
+  bareArbitraryValues?: boolean | {
+    units?: string[];
+  };
+  /**
+   * 扫描文件系统 source entries 中的候选类名。
+   *
+   * - `true`：使用 Tailwind v4 编译入口解析出的 `@source` 列表。
+   * - `TailwindV4SourcePattern[]`：使用调用方显式传入的 source 列表。
+   */
+  scanSources?: boolean | TailwindV4SourcePattern[];
+}
+interface TailwindV4SourcePattern {
+  base: string;
+  pattern: string;
+  negated: boolean;
+}
+interface TailwindV4GenerateResult {
+  css: string;
+  classSet: Set<string>;
+  rawCandidates: Set<string>;
+  dependencies: string[];
+  sources: TailwindV4SourcePattern[];
+  root: null | 'none' | {
+    base: string;
+    pattern: string;
+  };
+}
+interface TailwindV4DesignSystem {
+  parseCandidate: (candidate: string) => unknown[];
+  candidatesToCss: (candidates: string[]) => Array<string | null | undefined>;
+}
+interface TailwindV4Engine {
+  source: TailwindV4ResolvedSource;
+  loadDesignSystem: () => Promise<TailwindV4DesignSystem>;
+  validateCandidates: (candidates: Iterable<string>) => Promise<Set<string>>;
+  generate: (options?: TailwindV4GenerateOptions) => Promise<TailwindV4GenerateResult>;
+}
+//#endregion
 //#region src/options/types.d.ts
 type CacheStrategy = 'merge' | 'overwrite';
 type CacheDriver = 'file' | 'memory' | 'noop';
@@ -245,6 +318,8 @@ interface TailwindV4Options {
   base?: string;
   /** Raw CSS passed directly to the v4 design system. */
   css?: string;
+  /** 构建器在 CSS 落盘前捕获的内存 CSS 入口。 */
+  cssSources?: TailwindV4CssSource[];
   /** Set of CSS entry files that should be scanned for `@config` directives. */
   cssEntries?: string[];
   /** Overrides the content sources scanned by the oxide scanner. */
@@ -327,6 +402,7 @@ interface NormalizedTailwindV4Options {
   base: string;
   configuredBase?: string;
   css?: string;
+  cssSources: TailwindV4CssSource[];
   cssEntries: string[];
   sources: SourceEntry[];
   hasUserDefinedSources: boolean;
@@ -437,11 +513,14 @@ interface ExtractValidCandidatesOption {
   cwd?: string;
   bareArbitraryValues?: boolean | BareArbitraryValueOptions;
 }
-declare function extractRawCandidatesWithPositions(content: string, extension?: string): Promise<{
+interface ExtractSourceCandidate {
   rawCandidate: string;
   start: number;
   end: number;
-}[]>;
+}
+declare function extractRawCandidatesWithPositions(content: string, extension?: string): Promise<ExtractSourceCandidate[]>;
+declare function extractSourceCandidatesWithPositions(content: string, extension?: string): Promise<ExtractSourceCandidate[]>;
+declare function extractSourceCandidates(content: string, extension?: string): Promise<string[]>;
 declare function extractRawCandidates(sources?: SourceEntry[]): Promise<string[]>;
 declare function extractValidCandidates(options?: ExtractValidCandidatesOption): Promise<string[]>;
 interface ExtractProjectCandidatesOptions {
@@ -698,4 +777,4 @@ declare class ValidateCommandError extends Error {
   constructor(summary: ValidateFailureSummary, options?: ErrorOptions);
 }
 //#endregion
-export { TailwindTokenByFileMap as $, groupTokensByFile as A, NormalizedTailwindCssPatchOptions as B, MIGRATION_REPORT_SCHEMA_VERSION as C, extractRawCandidates as D, extractProjectCandidatesWithPositions as E, CacheStrategy as F, TailwindV4Options as G, TailwindCssPatchOptions as H, ExposeContextOptions as I, PatchCheckStatus as J, ExtractResult as K, ExtendLengthUnitsOptions as L, normalizeOptions as M, ApplyOptions as N, extractRawCandidatesWithPositions as O, CacheOptions as P, TailwindPatchRuntime as Q, ExtractOptions as R, MIGRATION_REPORT_KIND as S, TailwindcssPatcher as T, TailwindV2Options as U, TailwindCssOptions as V, TailwindV3Options as W, PatchStatusEntry as X, PatchName as Y, PatchStatusReport as Z, ConfigFileMigrationEntry as _, ValidateFailureSummary as a, CacheClearOptions as at, RestoreConfigFilesOptions as b, TailwindcssPatchCliMountOptions as c, CacheContextDescriptor as ct, TailwindcssPatchCommandContext as d, CacheReadMeta as dt, TailwindTokenFileKey as et, TailwindcssPatchCommandHandler as f, CacheReadResult as ft, tailwindcssPatchCommands as g, TailwindcssPatchCommandOptions as h, ValidateFailureReason as i, TailwindcssRuntimeContext as it, BareArbitraryValueOptions as j, extractValidCandidates as k, TailwindcssPatchCliOptions as l, CacheContextMetadata as lt, TailwindcssPatchCommandOptionDefinition as m, VALIDATE_FAILURE_REASONS as n, TailwindTokenReport as nt, ValidateJsonFailurePayload as o, CacheClearResult as ot, TailwindcssPatchCommandHandlerMap as p, ILengthUnitsPatchOptions as q, ValidateCommandError as r, TailwindcssClassCache as rt, ValidateJsonSuccessPayload as s, CacheClearScope as st, VALIDATE_EXIT_CODES as t, TailwindTokenLocation as tt, TailwindcssPatchCommand as u, CacheIndexFileV2 as ut, ConfigFileMigrationReport as v, logger as w, RestoreConfigFilesResult as x, MigrateConfigFilesOptions as y, NormalizedCacheOptions as z };
+export { TailwindV4GenerateResult as $, extractSourceCandidatesWithPositions as A, ExtractOptions as B, MIGRATION_REPORT_SCHEMA_VERSION as C, extractRawCandidates as D, extractProjectCandidatesWithPositions as E, ApplyOptions as F, TailwindV2Options as G, NormalizedTailwindCssPatchOptions as H, CacheOptions as I, TailwindV4CandidateSource as J, TailwindV3Options as K, CacheStrategy as L, groupTokensByFile as M, BareArbitraryValueOptions as N, extractRawCandidatesWithPositions as O, normalizeOptions as P, TailwindV4GenerateOptions as Q, ExposeContextOptions as R, MIGRATION_REPORT_KIND as S, CacheReadResult as St, TailwindcssPatcher as T, TailwindCssOptions as U, NormalizedCacheOptions as V, TailwindCssPatchOptions as W, TailwindV4DesignSystem as X, TailwindV4CssSource as Y, TailwindV4Engine as Z, ConfigFileMigrationEntry as _, CacheClearScope as _t, ValidateFailureSummary as a, PatchName as at, RestoreConfigFilesOptions as b, CacheIndexFileV2 as bt, TailwindcssPatchCliMountOptions as c, TailwindPatchRuntime as ct, TailwindcssPatchCommandContext as d, TailwindTokenLocation as dt, TailwindV4ResolvedSource as et, TailwindcssPatchCommandHandler as f, TailwindTokenReport as ft, tailwindcssPatchCommands as g, CacheClearResult as gt, TailwindcssPatchCommandOptions as h, CacheClearOptions as ht, ValidateFailureReason as i, PatchCheckStatus as it, extractValidCandidates as j, extractSourceCandidates as k, TailwindcssPatchCliOptions as l, TailwindTokenByFileMap as lt, TailwindcssPatchCommandOptionDefinition as m, TailwindcssRuntimeContext as mt, VALIDATE_FAILURE_REASONS as n, ExtractResult as nt, ValidateJsonFailurePayload as o, PatchStatusEntry as ot, TailwindcssPatchCommandHandlerMap as p, TailwindcssClassCache as pt, TailwindV4Options as q, ValidateCommandError as r, ILengthUnitsPatchOptions as rt, ValidateJsonSuccessPayload as s, PatchStatusReport as st, VALIDATE_EXIT_CODES as t, TailwindV4SourceOptions as tt, TailwindcssPatchCommand as u, TailwindTokenFileKey as ut, ConfigFileMigrationReport as v, CacheContextDescriptor as vt, logger as w, RestoreConfigFilesResult as x, CacheReadMeta as xt, MigrateConfigFilesOptions as y, CacheContextMetadata as yt, ExtendLengthUnitsOptions as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "9.3.2",
+  "version": "9.3.4",
   "description": "patch tailwindcss for exposing context and extract classes",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",