tailwindcss-patch 9.4.1 → 9.4.2

package/dist/{migrate-config-DqknZpUe.mjs → validate-CInDiiYy.mjs}

@@ -18,7 +18,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.4.1";
+var version = "9.4.2";
 //#endregion
 //#region src/constants.ts
 const pkgName = "tailwindcss-patch";
@@ -1489,6 +1489,8 @@ const DEFAULT_BARE_ARBITRARY_VALUE_UNITS = [
 const NUMBER_RE = /^-?(?:\d+|\d*\.\d+)$/;
 const FUNCTION_VALUE_RE = /^[a-z_-][\w-]*\(/i;
 const HEX_ESCAPE_RE = /^[\da-f]$/i;
+const ASPECT_RATIO_RE = /^\d+\/\d+$/;
+const ESCAPED_WHITESPACE_RE = /\\[nrt]/g;
 function splitVariantPrefix(candidate) {
 	let depth = 0;
 	let quote;
@@ -1608,6 +1610,9 @@ function normalizeBareArbitraryValueOptions(options) {
 	if (normalizedUnits.length === 0) return;
 	return { units: normalizedUnits.sort((a, b) => b.length - a.length) };
 }
+function isBareArbitraryValuesEnabled(options) {
+	return normalizeBareArbitraryValueOptions(options) !== void 0;
+}
 function normalizeEscapedValue(value) {
 	let result = "";
 	for (let index = 0; index < value.length; index++) {
@@ -1649,13 +1654,17 @@ function resolveValueWithUnit(body, units) {
 		if (NUMBER_RE.test(numberPart)) return `${numberPart}${unit}`;
 	}
 }
-function resolveArbitraryValue(body, units) {
+function resolveArbitraryValue(utility, body, units) {
 	const value = normalizeEscapedValue(body);
 	const withUnit = resolveValueWithUnit(value, units);
 	if (withUnit) return withUnit;
+	if (utility === "aspect" && ASPECT_RATIO_RE.test(value)) return value;
 	if (isHexColorValue(value)) return value;
 	if (isQuotedValue(value)) return value;
-	if (FUNCTION_VALUE_RE.test(value) && value.endsWith(")") && isBalancedFunctionValue(value)) return value;
+	if (FUNCTION_VALUE_RE.test(value) && value.endsWith(")") && isBalancedFunctionValue(value)) {
+		if (utility === "text" && /^var\(/i.test(value)) return `color:${value}`;
+		return value;
+	}
 }
 function resolveUtilityAndValue(body, units) {
 	let depth = 0;
@@ -1683,7 +1692,7 @@ function resolveUtilityAndValue(body, units) {
 		const utility = body.slice(0, index);
 		const rawValue = body.slice(index + 1);
 		if (!utility || !rawValue) continue;
-		const value = resolveArbitraryValue(rawValue, units);
+		const value = resolveArbitraryValue(utility, rawValue, units);
 		if (value) return {
 			utility,
 			value
@@ -1706,6 +1715,65 @@ function resolveBareArbitraryValueCandidate(candidate, options) {
 		canonicalCandidate: `${prefix}${important}${negative}${resolved.utility}-[${resolved.value}]`
 	};
 }
+function isBareArbitrarySourceSplitter(char) {
+	return /\s/.test(char);
+}
+function isQuoteBoundary(content, start, index) {
+	const tokenPrefix = content.slice(start, index);
+	return tokenPrefix.length === 0 || !tokenPrefix.endsWith("-");
+}
+function trimBareArbitrarySourceToken(token, start) {
+	let nextToken = token;
+	let nextStart = start;
+	while (nextToken.length > 0 && /^[<{([]$/.test(nextToken[0])) {
+		nextToken = nextToken.slice(1);
+		nextStart++;
+	}
+	while (nextToken.length > 0 && /^[>\],;]$/.test(nextToken[nextToken.length - 1])) nextToken = nextToken.slice(0, -1);
+	return {
+		token: nextToken,
+		start: nextStart
+	};
+}
+function pushBareArbitrarySourceCandidate(result, token, start, options) {
+	const trimmed = trimBareArbitrarySourceToken(token, start);
+	if (!trimmed.token || trimmed.token.includes("=") || trimmed.token.includes("[") || trimmed.token.includes("]")) return;
+	if (!resolveBareArbitraryValueCandidate(trimmed.token, options)) return;
+	result.push({
+		rawCandidate: trimmed.token,
+		start: trimmed.start,
+		end: trimmed.start + trimmed.token.length
+	});
+}
+function extractBareArbitraryValueSourceCandidatesWithPositions(content, options) {
+	if (!isBareArbitraryValuesEnabled(options)) return [];
+	const normalized = content.includes("\\") ? content.replace(ESCAPED_WHITESPACE_RE, " ") : content;
+	const result = [];
+	let depth = 0;
+	let quote;
+	let start = 0;
+	for (let index = 0; index < normalized.length; index++) {
+		const char = normalized[index];
+		if (char === void 0) continue;
+		if (char === "\\") {
+			index++;
+			continue;
+		}
+		if (quote) {
+			if (char === quote) quote = void 0;
+		} else if ((char === "\"" || char === "'" || char === "`") && !isQuoteBoundary(normalized, start, index)) quote = char;
+		else if (char === "(" || char === "{" || char === "[") depth++;
+		else if (char === ")" || char === "}" || char === "]") depth = Math.max(0, depth - 1);
+		if (!isBareArbitrarySourceSplitter(char) && !((char === "\"" || char === "'" || char === "`") && depth === 0 && isQuoteBoundary(normalized, start, index))) continue;
+		pushBareArbitrarySourceCandidate(result, normalized.slice(start, index), start, options);
+		start = index + 1;
+	}
+	pushBareArbitrarySourceCandidate(result, normalized.slice(start), start, options);
+	return result;
+}
+function extractBareArbitraryValueSourceCandidates(content, options) {
+	return [...new Set(extractBareArbitraryValueSourceCandidatesWithPositions(content, options).map((candidate) => candidate.rawCandidate))];
+}
 function escapeCssClassName(value) {
 	let result = "";
 	for (let index = 0; index < value.length; index++) {
@@ -2367,7 +2435,7 @@ const HTML_ATTRIBUTE_NAME_CANDIDATE_RE = /^(?:class|className|hover-class|hoverC
 const CSS_DIRECTIVE_CANDIDATE_RE = /^@(?:apply|tailwind|source|config|plugin|theme|utility|custom-variant|variant)$/;
 const CSS_APPLY_IMPORTANT = "!important";
 const CSS_APPLY_RE = /@apply\s+([^;{}]+)/g;
-const JS_LIKE_SOURCE_EXTENSION_RE = /^(?:[cm]?[jt]sx?)$/;
+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;
@@ -2383,7 +2451,7 @@ function isHtmlAttributeNameCandidate(content, candidate) {
 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);
+	return nextOpen !== -1 && (nextOpen < content.indexOf(">", candidate.end) || !content.includes(">", candidate.end));
 }
 function isCssDirectiveCandidate(candidate) {
 	return candidate === CSS_APPLY_IMPORTANT || CSS_DIRECTIVE_CANDIDATE_RE.test(candidate);
@@ -2470,7 +2538,26 @@ function createLocalCandidate(candidate) {
 		end: candidate.localStart + candidate.rawCandidate.length
 	};
 }
-async function extractCssApplyCandidates(content, extension) {
+function dedupeCandidatesWithPositions(candidates) {
+	const seen = /* @__PURE__ */ new Set();
+	return candidates.filter((candidate) => {
+		const key = `${candidate.start}:${candidate.end}:${candidate.rawCandidate}`;
+		if (seen.has(key)) return false;
+		seen.add(key);
+		return true;
+	});
+}
+function createBareArbitraryValueCandidateContexts(content, extension, offset, options) {
+	return extractBareArbitraryValueSourceCandidatesWithPositions(content, options?.bareArbitraryValues).map((candidate) => ({
+		content,
+		extension,
+		localStart: candidate.start,
+		rawCandidate: candidate.rawCandidate,
+		start: candidate.start + offset,
+		end: candidate.end + offset
+	}));
+}
+async function extractCssApplyCandidates(content, extension, options) {
 	const candidates = [];
 	CSS_APPLY_RE.lastIndex = 0;
 	let match = CSS_APPLY_RE.exec(content);
@@ -2486,11 +2573,12 @@ async function extractCssApplyCandidates(content, extension) {
 			start: candidate.start + applyParamsStart,
 			end: candidate.end + applyParamsStart
 		})));
+		candidates.push(...createBareArbitraryValueCandidateContexts(applyParams, "html", applyParamsStart, options));
 		match = CSS_APPLY_RE.exec(content);
 	}
 	return candidates;
 }
-async function extractMixedSourceScriptCandidates(content) {
+async function extractMixedSourceScriptCandidates(content, options) {
 	const candidates = [];
 	SFC_SCRIPT_BLOCK_RE.lastIndex = 0;
 	let match = SFC_SCRIPT_BLOCK_RE.exec(content);
@@ -2506,6 +2594,7 @@ async function extractMixedSourceScriptCandidates(content) {
 			start: candidate.start + scriptStart,
 			end: candidate.end + scriptStart
 		})));
+		candidates.push(...createBareArbitraryValueCandidateContexts(scriptContent, "js", scriptStart, options));
 		match = SFC_SCRIPT_BLOCK_RE.exec(content);
 	}
 	return candidates;
@@ -2514,9 +2603,9 @@ function createCandidateCacheKey(designSystemKey, options) {
 	if (options.bareArbitraryValues == null || options.bareArbitraryValues === false) return designSystemKey;
 	return `${designSystemKey}:bare-arbitrary:${JSON.stringify(options.bareArbitraryValues)}`;
 }
-async function extractRawCandidatesWithPositions(content, extension = "html") {
+async function extractRawCandidatesWithPositions(content, extension = "html", options) {
 	const { Scanner } = await getOxideModule();
-	return new Scanner({}).getCandidatesWithPositions({
+	const candidates = new Scanner({}).getCandidatesWithPositions({
 		content,
 		extension
 	}).map(({ candidate, position }) => ({
@@ -2524,16 +2613,18 @@ async function extractRawCandidatesWithPositions(content, extension = "html") {
 		start: position,
 		end: position + candidate.length
 	}));
+	candidates.push(...extractBareArbitraryValueSourceCandidatesWithPositions(content, options?.bareArbitraryValues));
+	return dedupeCandidatesWithPositions(candidates);
 }
-async function extractSourceCandidatesWithPositions(content, extension = "html") {
+async function extractSourceCandidatesWithPositions(content, extension = "html", options) {
 	const normalizedExtension = extension.replace(/^\./, "");
-	const candidates = CSS_LIKE_SOURCE_EXTENSION_RE.test(normalizedExtension) ? await extractCssApplyCandidates(content, normalizedExtension) : (await extractRawCandidatesWithPositions(content, normalizedExtension)).map((candidate) => ({
+	const candidates = CSS_LIKE_SOURCE_EXTENSION_RE.test(normalizedExtension) ? await extractCssApplyCandidates(content, normalizedExtension, options) : (await extractRawCandidatesWithPositions(content, normalizedExtension, options)).map((candidate) => ({
 		...candidate,
 		content,
 		extension: normalizedExtension,
 		localStart: candidate.start
 	}));
-	if (MIXED_TEMPLATE_SOURCE_EXTENSION_RE.test(normalizedExtension)) candidates.push(...await extractMixedSourceScriptCandidates(content));
+	if (MIXED_TEMPLATE_SOURCE_EXTENSION_RE.test(normalizedExtension)) candidates.push(...await extractMixedSourceScriptCandidates(content, options));
 	const seen = /* @__PURE__ */ new Set();
 	return candidates.filter((candidate) => {
 		if (!shouldKeepSourceCandidate(candidate.content, candidate.extension, createLocalCandidate(candidate))) return false;
@@ -2547,13 +2638,22 @@ async function extractSourceCandidatesWithPositions(content, extension = "html")
 		end
 	}));
 }
-async function extractSourceCandidates(content, extension = "html") {
-	const candidates = await extractSourceCandidatesWithPositions(content, extension);
+async function extractSourceCandidates(content, extension = "html", options) {
+	const candidates = await extractSourceCandidatesWithPositions(content, extension, options);
 	return [...new Set(candidates.map((candidate) => candidate.rawCandidate))];
 }
-async function extractRawCandidates(sources) {
+async function extractRawCandidates(sources, options) {
 	const { Scanner } = await getOxideModule();
-	return new Scanner(sources === void 0 ? {} : { sources }).scan();
+	const scanner = new Scanner(sources === void 0 ? {} : { sources });
+	const candidates = new Set(scanner.scan());
+	if (options?.bareArbitraryValues !== void 0 && options.bareArbitraryValues !== false) await Promise.all((scanner.files ?? []).map(async (file) => {
+		try {
+			const content = await promises.readFile(file, "utf8");
+			const extension = toExtension(file);
+			for (const candidate of extractBareArbitraryValueSourceCandidatesWithPositions(content, options.bareArbitraryValues)) if (shouldKeepSourceCandidate(content, extension, candidate)) candidates.add(candidate.rawCandidate);
+		} catch {}
+	}));
+	return [...candidates];
 }
 async function extractValidCandidates(options) {
 	const providedOptions = options ?? {};
@@ -2582,7 +2682,7 @@ async function extractValidCandidates(options) {
 	const candidateCacheKey = createCandidateCacheKey(designSystemKey, providedOptions);
 	const candidateCache = designSystemCandidateCache.get(candidateCacheKey) ?? /* @__PURE__ */ new Map();
 	designSystemCandidateCache.set(candidateCacheKey, candidateCache);
-	const candidates = await extractRawCandidates(sources);
+	const candidates = await extractRawCandidates(sources, providedOptions.bareArbitraryValues === void 0 ? void 0 : { bareArbitraryValues: providedOptions.bareArbitraryValues });
 	const inlineSources = extractTailwindV4InlineSourceCandidates(css);
 	for (const candidate of inlineSources.included) candidates.push(candidate);
 	for (const candidate of inlineSources.excluded) {
@@ -3810,78 +3910,6 @@ var TailwindcssPatcher = class {
 	}
 };
 //#endregion
-//#region src/commands/types.ts
-const tailwindcssPatchCommands = [
-	"install",
-	"extract",
-	"tokens",
-	"init",
-	"migrate",
-	"restore",
-	"validate",
-	"status"
-];
-//#endregion
-//#region src/commands/validate.ts
-const VALIDATE_EXIT_CODES = {
-	OK: 0,
-	REPORT_INCOMPATIBLE: 21,
-	MISSING_BACKUPS: 22,
-	IO_ERROR: 23,
-	UNKNOWN_ERROR: 24
-};
-const VALIDATE_FAILURE_REASONS = [
-	"report-incompatible",
-	"missing-backups",
-	"io-error",
-	"unknown-error"
-];
-const IO_ERROR_CODES = new Set([
-	"ENOENT",
-	"EACCES",
-	"EPERM",
-	"EISDIR",
-	"ENOTDIR",
-	"EMFILE",
-	"ENFILE"
-]);
-function isNodeError(error) {
-	return !!error && typeof error === "object" && ("code" in error || "message" in error);
-}
-function classifyValidateError(error) {
-	const message = error instanceof Error ? error.message : String(error);
-	if (message.startsWith("Unsupported report kind") || message.startsWith("Unsupported report schema version")) return {
-		reason: "report-incompatible",
-		exitCode: VALIDATE_EXIT_CODES.REPORT_INCOMPATIBLE,
-		message
-	};
-	if (message.startsWith("Restore failed:")) return {
-		reason: "missing-backups",
-		exitCode: VALIDATE_EXIT_CODES.MISSING_BACKUPS,
-		message
-	};
-	if (isNodeError(error) && typeof error.code === "string" && IO_ERROR_CODES.has(error.code)) return {
-		reason: "io-error",
-		exitCode: VALIDATE_EXIT_CODES.IO_ERROR,
-		message
-	};
-	return {
-		reason: "unknown-error",
-		exitCode: VALIDATE_EXIT_CODES.UNKNOWN_ERROR,
-		message
-	};
-}
-var ValidateCommandError = class extends Error {
-	reason;
-	exitCode;
-	constructor(summary, options) {
-		super(summary.message, options);
-		this.name = "ValidateCommandError";
-		this.reason = summary.reason;
-		this.exitCode = summary.exitCode;
-	}
-};
-//#endregion
 //#region src/commands/migration-report.ts
 const MIGRATION_REPORT_KIND = "tw-patch-migrate-report";
 const MIGRATION_REPORT_SCHEMA_VERSION = 1;
@@ -4428,4 +4456,76 @@ async function restoreConfigFiles(options) {
 	};
 }
 //#endregion
-export { logger as $, createTailwindV4RootSources as A, resolveSourceScanPath as B, resolveProjectSourceFiles as C, TAILWIND_V4_IGNORED_FILES as D, TAILWIND_V4_IGNORED_EXTENSIONS as E, isFileExcludedByTailwindV4SourceEntries as F, canonicalizeBareArbitraryValueCandidates as G, resolveTailwindV4SourceEntry as H, isFileMatchedByTailwindV4SourceEntries as I, resolveValidTailwindV4Candidates as J, extractTailwindV4InlineSourceCandidates as K, mergeTailwindV4SourceEntries as L, createTailwindV4SourceExclusionMatcher as M, expandTailwindV4SourceEntries as N, createTailwindV4CompiledSourceEntries as O, expandTailwindV4SourceEntryBraces as P, CacheStore as Q, normalizeTailwindV4ScannerSources as R, groupTokensByFile as S, TAILWIND_V4_IGNORED_CONTENT_DIRS as T, compileTailwindV4Source as U, resolveTailwindV4SourceBaseCandidates as V, loadTailwindV4DesignSystem as W, loadWorkspaceConfigModule as X, loadPatchOptionsForWorkspace as Y, normalizeOptions as Z, extractRawCandidates as _, VALIDATE_EXIT_CODES as a, extractSourceCandidatesWithPositions as b, classifyValidateError as c, getPatchStatusReport as d, runTailwindBuild as f, extractProjectCandidatesWithPositions as g, collectClassesFromTailwindV4 as h, MIGRATION_REPORT_SCHEMA_VERSION as i, createTailwindV4SourceEntryMatcher as j, createTailwindV4DefaultIgnoreSources as k, tailwindcssPatchCommands as l, collectClassesFromContexts as m, restoreConfigFiles as n, VALIDATE_FAILURE_REASONS as o, loadRuntimeContexts as p, replaceBareArbitraryValueSelectors as q, MIGRATION_REPORT_KIND as r, ValidateCommandError as s, migrateConfigFiles as t, TailwindcssPatcher as u, extractRawCandidatesWithPositions as v, TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN as w, extractValidCandidates as x, extractSourceCandidates as y, normalizeTailwindV4SourceEntries as z };
+//#region src/commands/types.ts
+const tailwindcssPatchCommands = [
+	"install",
+	"extract",
+	"tokens",
+	"init",
+	"migrate",
+	"restore",
+	"validate",
+	"status"
+];
+//#endregion
+//#region src/commands/validate.ts
+const VALIDATE_EXIT_CODES = {
+	OK: 0,
+	REPORT_INCOMPATIBLE: 21,
+	MISSING_BACKUPS: 22,
+	IO_ERROR: 23,
+	UNKNOWN_ERROR: 24
+};
+const VALIDATE_FAILURE_REASONS = [
+	"report-incompatible",
+	"missing-backups",
+	"io-error",
+	"unknown-error"
+];
+const IO_ERROR_CODES = new Set([
+	"ENOENT",
+	"EACCES",
+	"EPERM",
+	"EISDIR",
+	"ENOTDIR",
+	"EMFILE",
+	"ENFILE"
+]);
+function isNodeError(error) {
+	return !!error && typeof error === "object" && ("code" in error || "message" in error);
+}
+function classifyValidateError(error) {
+	const message = error instanceof Error ? error.message : String(error);
+	if (message.startsWith("Unsupported report kind") || message.startsWith("Unsupported report schema version")) return {
+		reason: "report-incompatible",
+		exitCode: VALIDATE_EXIT_CODES.REPORT_INCOMPATIBLE,
+		message
+	};
+	if (message.startsWith("Restore failed:")) return {
+		reason: "missing-backups",
+		exitCode: VALIDATE_EXIT_CODES.MISSING_BACKUPS,
+		message
+	};
+	if (isNodeError(error) && typeof error.code === "string" && IO_ERROR_CODES.has(error.code)) return {
+		reason: "io-error",
+		exitCode: VALIDATE_EXIT_CODES.IO_ERROR,
+		message
+	};
+	return {
+		reason: "unknown-error",
+		exitCode: VALIDATE_EXIT_CODES.UNKNOWN_ERROR,
+		message
+	};
+}
+var ValidateCommandError = class extends Error {
+	reason;
+	exitCode;
+	constructor(summary, options) {
+		super(summary.message, options);
+		this.name = "ValidateCommandError";
+		this.reason = summary.reason;
+		this.exitCode = summary.exitCode;
+	}
+};
+//#endregion
+export { resolveBareArbitraryValueCandidate as $, createTailwindV4RootSources as A, resolveSourceScanPath as B, resolveProjectSourceFiles as C, TAILWIND_V4_IGNORED_FILES as D, TAILWIND_V4_IGNORED_EXTENSIONS as E, isFileExcludedByTailwindV4SourceEntries as F, canonicalizeBareArbitraryValueCandidates as G, resolveTailwindV4SourceEntry as H, isFileMatchedByTailwindV4SourceEntries as I, resolveValidTailwindV4Candidates as J, extractTailwindV4InlineSourceCandidates as K, mergeTailwindV4SourceEntries as L, createTailwindV4SourceExclusionMatcher as M, expandTailwindV4SourceEntries as N, createTailwindV4CompiledSourceEntries as O, expandTailwindV4SourceEntryBraces as P, isBareArbitraryValuesEnabled as Q, normalizeTailwindV4ScannerSources as R, groupTokensByFile as S, TAILWIND_V4_IGNORED_CONTENT_DIRS as T, compileTailwindV4Source as U, resolveTailwindV4SourceBaseCandidates as V, loadTailwindV4DesignSystem as W, extractBareArbitraryValueSourceCandidates as X, escapeCssClassName as Y, extractBareArbitraryValueSourceCandidatesWithPositions as Z, extractRawCandidates as _, tailwindcssPatchCommands as a, extractSourceCandidatesWithPositions as b, MIGRATION_REPORT_KIND as c, getPatchStatusReport as d, loadPatchOptionsForWorkspace as et, runTailwindBuild as f, extractProjectCandidatesWithPositions as g, collectClassesFromTailwindV4 as h, classifyValidateError as i, logger as it, createTailwindV4SourceEntryMatcher as j, createTailwindV4DefaultIgnoreSources as k, MIGRATION_REPORT_SCHEMA_VERSION as l, collectClassesFromContexts as m, VALIDATE_FAILURE_REASONS as n, normalizeOptions as nt, migrateConfigFiles as o, loadRuntimeContexts as p, replaceBareArbitraryValueSelectors as q, ValidateCommandError as r, CacheStore as rt, restoreConfigFiles as s, VALIDATE_EXIT_CODES as t, loadWorkspaceConfigModule as tt, TailwindcssPatcher as u, extractRawCandidatesWithPositions as v, TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN as w, extractValidCandidates as x, extractSourceCandidates as y, normalizeTailwindV4SourceEntries as z };

package/dist/{validate-CaJv2g5K.d.ts → validate-CYB-90BG.d.ts}

@@ -504,6 +504,20 @@ interface BareArbitraryValueOptions {
    */
   units?: string[];
 }
+interface BareArbitraryValueResolveResult {
+  candidate: string;
+  canonicalCandidate: string;
+}
+interface BareArbitraryValueSourceCandidate {
+  rawCandidate: string;
+  start: number;
+  end: number;
+}
+declare function isBareArbitraryValuesEnabled(options: boolean | BareArbitraryValueOptions | undefined): boolean;
+declare function resolveBareArbitraryValueCandidate(candidate: string, options?: boolean | BareArbitraryValueOptions): BareArbitraryValueResolveResult | undefined;
+declare function extractBareArbitraryValueSourceCandidatesWithPositions(content: string, options?: boolean | BareArbitraryValueOptions): BareArbitraryValueSourceCandidate[];
+declare function extractBareArbitraryValueSourceCandidates(content: string, options?: boolean | BareArbitraryValueOptions): string[];
+declare function escapeCssClassName(value: string): string;
 //#endregion
 //#region src/extraction/candidate-extractor.d.ts
 interface ExtractValidCandidatesOption {
@@ -514,15 +528,18 @@ interface ExtractValidCandidatesOption {
   cwd?: string;
   bareArbitraryValues?: boolean | BareArbitraryValueOptions;
 }
+interface ExtractCandidateOptions {
+  bareArbitraryValues?: boolean | BareArbitraryValueOptions;
+}
 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 extractRawCandidatesWithPositions(content: string, extension?: string, options?: ExtractCandidateOptions): Promise<ExtractSourceCandidate[]>;
+declare function extractSourceCandidatesWithPositions(content: string, extension?: string, options?: ExtractCandidateOptions): Promise<ExtractSourceCandidate[]>;
+declare function extractSourceCandidates(content: string, extension?: string, options?: ExtractCandidateOptions): Promise<string[]>;
+declare function extractRawCandidates(sources?: SourceEntry[], options?: ExtractCandidateOptions): Promise<string[]>;
 declare function extractValidCandidates(options?: ExtractValidCandidatesOption): Promise<string[]>;
 interface ExtractProjectCandidatesOptions {
   cwd?: string;
@@ -791,4 +808,4 @@ declare class ValidateCommandError extends Error {
   constructor(summary: ValidateFailureSummary, options?: ErrorOptions);
 }
 //#endregion
-export { TailwindV4DesignSystem as $, extractSourceCandidates as A, ExposeContextOptions as B, MIGRATION_REPORT_SCHEMA_VERSION as C, CacheContextMetadata as Ct, extractProjectCandidatesWithPositions as D, ExtractSourceCandidate as E, CacheReadResult as Et, BareArbitraryValueOptions as F, TailwindCssOptions as G, ExtractOptions as H, normalizeOptions as I, TailwindV3Options as J, TailwindCssPatchOptions as K, ApplyOptions as L, extractValidCandidates as M, groupTokensByFile as N, extractRawCandidates as O, resolveProjectSourceFiles as P, TailwindV4CssSource as Q, CacheOptions as R, MIGRATION_REPORT_KIND as S, CacheContextDescriptor as St, TailwindcssPatcher as T, CacheReadMeta as Tt, NormalizedCacheOptions as U, ExtendLengthUnitsOptions as V, NormalizedTailwindCssPatchOptions as W, TailwindV4CandidateSource as X, TailwindV4Options as Y, TailwindV4CompiledSourceRoot as Z, ConfigFileMigrationEntry as _, TailwindcssClassCache as _t, ValidateFailureSummary as a, TailwindV4SourcePattern as at, RestoreConfigFilesOptions as b, CacheClearResult as bt, TailwindcssPatchCliMountOptions as c, PatchCheckStatus as ct, TailwindcssPatchCommandContext as d, PatchStatusReport as dt, TailwindV4Engine as et, TailwindcssPatchCommandHandler as f, TailwindPatchRuntime as ft, tailwindcssPatchCommands as g, TailwindTokenReport as gt, TailwindcssPatchCommandOptions as h, TailwindTokenLocation as ht, ValidateFailureReason as i, TailwindV4SourceOptions as it, extractSourceCandidatesWithPositions as j, extractRawCandidatesWithPositions as k, TailwindcssPatchCliOptions as l, PatchName as lt, TailwindcssPatchCommandOptionDefinition as m, TailwindTokenFileKey as mt, VALIDATE_FAILURE_REASONS as n, TailwindV4GenerateResult as nt, ValidateJsonFailurePayload as o, ExtractResult as ot, TailwindcssPatchCommandHandlerMap as p, TailwindTokenByFileMap as pt, TailwindV2Options as q, ValidateCommandError as r, TailwindV4ResolvedSource as rt, ValidateJsonSuccessPayload as s, ILengthUnitsPatchOptions as st, VALIDATE_EXIT_CODES as t, TailwindV4GenerateOptions as tt, TailwindcssPatchCommand as u, PatchStatusEntry as ut, ConfigFileMigrationReport as v, TailwindcssRuntimeContext as vt, logger as w, CacheIndexFileV2 as wt, RestoreConfigFilesResult as x, CacheClearScope as xt, MigrateConfigFilesOptions as y, CacheClearOptions as yt, CacheStrategy as z };
+export { TailwindV3Options as $, extractSourceCandidates as A, CacheReadMeta as At, resolveBareArbitraryValueCandidate as B, MIGRATION_REPORT_SCHEMA_VERSION as C, TailwindcssRuntimeContext as Ct, extractProjectCandidatesWithPositions as D, CacheContextDescriptor as Dt, ExtractSourceCandidate as E, CacheClearScope as Et, BareArbitraryValueOptions as F, ExposeContextOptions as G, ApplyOptions as H, escapeCssClassName as I, NormalizedCacheOptions as J, ExtendLengthUnitsOptions as K, extractBareArbitraryValueSourceCandidates as L, extractValidCandidates as M, groupTokensByFile as N, extractRawCandidates as O, CacheContextMetadata as Ot, resolveProjectSourceFiles as P, TailwindV2Options as Q, extractBareArbitraryValueSourceCandidatesWithPositions as R, MIGRATION_REPORT_KIND as S, TailwindcssClassCache as St, TailwindcssPatcher as T, CacheClearResult as Tt, CacheOptions as U, normalizeOptions as V, CacheStrategy as W, TailwindCssOptions as X, NormalizedTailwindCssPatchOptions as Y, TailwindCssPatchOptions as Z, ConfigFileMigrationEntry as _, TailwindPatchRuntime as _t, ValidateFailureSummary as a, TailwindV4Engine as at, RestoreConfigFilesOptions as b, TailwindTokenLocation as bt, TailwindcssPatchCliMountOptions as c, TailwindV4ResolvedSource as ct, TailwindcssPatchCommandContext as d, ExtractResult as dt, TailwindV4Options as et, TailwindcssPatchCommandHandler as f, ILengthUnitsPatchOptions as ft, tailwindcssPatchCommands as g, PatchStatusReport as gt, TailwindcssPatchCommandOptions as h, PatchStatusEntry as ht, ValidateFailureReason as i, TailwindV4DesignSystem as it, extractSourceCandidatesWithPositions as j, CacheReadResult as jt, extractRawCandidatesWithPositions as k, CacheIndexFileV2 as kt, TailwindcssPatchCliOptions as l, TailwindV4SourceOptions as lt, TailwindcssPatchCommandOptionDefinition as m, PatchName as mt, VALIDATE_FAILURE_REASONS as n, TailwindV4CompiledSourceRoot as nt, ValidateJsonFailurePayload as o, TailwindV4GenerateOptions as ot, TailwindcssPatchCommandHandlerMap as p, PatchCheckStatus as pt, ExtractOptions as q, ValidateCommandError as r, TailwindV4CssSource as rt, ValidateJsonSuccessPayload as s, TailwindV4GenerateResult as st, VALIDATE_EXIT_CODES as t, TailwindV4CandidateSource as tt, TailwindcssPatchCommand as u, TailwindV4SourcePattern as ut, ConfigFileMigrationReport as v, TailwindTokenByFileMap as vt, logger as w, CacheClearOptions as wt, RestoreConfigFilesResult as x, TailwindTokenReport as xt, MigrateConfigFilesOptions as y, TailwindTokenFileKey as yt, isBareArbitraryValuesEnabled as z };

package/dist/{validate-Dr7IkGU8.d.mts → validate-D6MO6lZo.d.mts}

@@ -503,6 +503,20 @@ interface BareArbitraryValueOptions {
    */
   units?: string[];
 }
+interface BareArbitraryValueResolveResult {
+  candidate: string;
+  canonicalCandidate: string;
+}
+interface BareArbitraryValueSourceCandidate {
+  rawCandidate: string;
+  start: number;
+  end: number;
+}
+declare function isBareArbitraryValuesEnabled(options: boolean | BareArbitraryValueOptions | undefined): boolean;
+declare function resolveBareArbitraryValueCandidate(candidate: string, options?: boolean | BareArbitraryValueOptions): BareArbitraryValueResolveResult | undefined;
+declare function extractBareArbitraryValueSourceCandidatesWithPositions(content: string, options?: boolean | BareArbitraryValueOptions): BareArbitraryValueSourceCandidate[];
+declare function extractBareArbitraryValueSourceCandidates(content: string, options?: boolean | BareArbitraryValueOptions): string[];
+declare function escapeCssClassName(value: string): string;
 //#endregion
 //#region src/extraction/candidate-extractor.d.ts
 interface ExtractValidCandidatesOption {
@@ -513,15 +527,18 @@ interface ExtractValidCandidatesOption {
   cwd?: string;
   bareArbitraryValues?: boolean | BareArbitraryValueOptions;
 }
+interface ExtractCandidateOptions {
+  bareArbitraryValues?: boolean | BareArbitraryValueOptions;
+}
 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 extractRawCandidatesWithPositions(content: string, extension?: string, options?: ExtractCandidateOptions): Promise<ExtractSourceCandidate[]>;
+declare function extractSourceCandidatesWithPositions(content: string, extension?: string, options?: ExtractCandidateOptions): Promise<ExtractSourceCandidate[]>;
+declare function extractSourceCandidates(content: string, extension?: string, options?: ExtractCandidateOptions): Promise<string[]>;
+declare function extractRawCandidates(sources?: SourceEntry[], options?: ExtractCandidateOptions): Promise<string[]>;
 declare function extractValidCandidates(options?: ExtractValidCandidatesOption): Promise<string[]>;
 interface ExtractProjectCandidatesOptions {
   cwd?: string;
@@ -790,4 +807,4 @@ declare class ValidateCommandError extends Error {
   constructor(summary: ValidateFailureSummary, options?: ErrorOptions);
 }
 //#endregion
-export { TailwindV4DesignSystem as $, extractSourceCandidates as A, ExposeContextOptions as B, MIGRATION_REPORT_SCHEMA_VERSION as C, CacheContextMetadata as Ct, extractProjectCandidatesWithPositions as D, ExtractSourceCandidate as E, CacheReadResult as Et, BareArbitraryValueOptions as F, TailwindCssOptions as G, ExtractOptions as H, normalizeOptions as I, TailwindV3Options as J, TailwindCssPatchOptions as K, ApplyOptions as L, extractValidCandidates as M, groupTokensByFile as N, extractRawCandidates as O, resolveProjectSourceFiles as P, TailwindV4CssSource as Q, CacheOptions as R, MIGRATION_REPORT_KIND as S, CacheContextDescriptor as St, TailwindcssPatcher as T, CacheReadMeta as Tt, NormalizedCacheOptions as U, ExtendLengthUnitsOptions as V, NormalizedTailwindCssPatchOptions as W, TailwindV4CandidateSource as X, TailwindV4Options as Y, TailwindV4CompiledSourceRoot as Z, ConfigFileMigrationEntry as _, TailwindcssClassCache as _t, ValidateFailureSummary as a, TailwindV4SourcePattern as at, RestoreConfigFilesOptions as b, CacheClearResult as bt, TailwindcssPatchCliMountOptions as c, PatchCheckStatus as ct, TailwindcssPatchCommandContext as d, PatchStatusReport as dt, TailwindV4Engine as et, TailwindcssPatchCommandHandler as f, TailwindPatchRuntime as ft, tailwindcssPatchCommands as g, TailwindTokenReport as gt, TailwindcssPatchCommandOptions as h, TailwindTokenLocation as ht, ValidateFailureReason as i, TailwindV4SourceOptions as it, extractSourceCandidatesWithPositions as j, extractRawCandidatesWithPositions as k, TailwindcssPatchCliOptions as l, PatchName as lt, TailwindcssPatchCommandOptionDefinition as m, TailwindTokenFileKey as mt, VALIDATE_FAILURE_REASONS as n, TailwindV4GenerateResult as nt, ValidateJsonFailurePayload as o, ExtractResult as ot, TailwindcssPatchCommandHandlerMap as p, TailwindTokenByFileMap as pt, TailwindV2Options as q, ValidateCommandError as r, TailwindV4ResolvedSource as rt, ValidateJsonSuccessPayload as s, ILengthUnitsPatchOptions as st, VALIDATE_EXIT_CODES as t, TailwindV4GenerateOptions as tt, TailwindcssPatchCommand as u, PatchStatusEntry as ut, ConfigFileMigrationReport as v, TailwindcssRuntimeContext as vt, logger as w, CacheIndexFileV2 as wt, RestoreConfigFilesResult as x, CacheClearScope as xt, MigrateConfigFilesOptions as y, CacheClearOptions as yt, CacheStrategy as z };
+export { TailwindV3Options as $, extractSourceCandidates as A, CacheReadMeta as At, resolveBareArbitraryValueCandidate as B, MIGRATION_REPORT_SCHEMA_VERSION as C, TailwindcssRuntimeContext as Ct, extractProjectCandidatesWithPositions as D, CacheContextDescriptor as Dt, ExtractSourceCandidate as E, CacheClearScope as Et, BareArbitraryValueOptions as F, ExposeContextOptions as G, ApplyOptions as H, escapeCssClassName as I, NormalizedCacheOptions as J, ExtendLengthUnitsOptions as K, extractBareArbitraryValueSourceCandidates as L, extractValidCandidates as M, groupTokensByFile as N, extractRawCandidates as O, CacheContextMetadata as Ot, resolveProjectSourceFiles as P, TailwindV2Options as Q, extractBareArbitraryValueSourceCandidatesWithPositions as R, MIGRATION_REPORT_KIND as S, TailwindcssClassCache as St, TailwindcssPatcher as T, CacheClearResult as Tt, CacheOptions as U, normalizeOptions as V, CacheStrategy as W, TailwindCssOptions as X, NormalizedTailwindCssPatchOptions as Y, TailwindCssPatchOptions as Z, ConfigFileMigrationEntry as _, TailwindPatchRuntime as _t, ValidateFailureSummary as a, TailwindV4Engine as at, RestoreConfigFilesOptions as b, TailwindTokenLocation as bt, TailwindcssPatchCliMountOptions as c, TailwindV4ResolvedSource as ct, TailwindcssPatchCommandContext as d, ExtractResult as dt, TailwindV4Options as et, TailwindcssPatchCommandHandler as f, ILengthUnitsPatchOptions as ft, tailwindcssPatchCommands as g, PatchStatusReport as gt, TailwindcssPatchCommandOptions as h, PatchStatusEntry as ht, ValidateFailureReason as i, TailwindV4DesignSystem as it, extractSourceCandidatesWithPositions as j, CacheReadResult as jt, extractRawCandidatesWithPositions as k, CacheIndexFileV2 as kt, TailwindcssPatchCliOptions as l, TailwindV4SourceOptions as lt, TailwindcssPatchCommandOptionDefinition as m, PatchName as mt, VALIDATE_FAILURE_REASONS as n, TailwindV4CompiledSourceRoot as nt, ValidateJsonFailurePayload as o, TailwindV4GenerateOptions as ot, TailwindcssPatchCommandHandlerMap as p, PatchCheckStatus as pt, ExtractOptions as q, ValidateCommandError as r, TailwindV4CssSource as rt, ValidateJsonSuccessPayload as s, TailwindV4GenerateResult as st, VALIDATE_EXIT_CODES as t, TailwindV4CandidateSource as tt, TailwindcssPatchCommand as u, TailwindV4SourcePattern as ut, ConfigFileMigrationReport as v, TailwindTokenByFileMap as vt, logger as w, CacheClearOptions as wt, RestoreConfigFilesResult as x, TailwindTokenReport as xt, MigrateConfigFilesOptions as y, TailwindTokenFileKey as yt, isBareArbitraryValuesEnabled as z };

package/package.json

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