tailwindcss-patch 9.4.1 → 9.4.2

package/dist/{migrate-config-Dn9OTXpO.js → validate-5eUbRAzl.js}

@@ -26,7 +26,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.4.1";
+var version = "9.4.2";
 //#endregion
 //#region src/constants.ts
 const pkgName = "tailwindcss-patch";
@@ -1492,6 +1492,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;
@@ -1611,6 +1613,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++) {
@@ -1652,13 +1657,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;
@@ -1686,7 +1695,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
@@ -1709,6 +1718,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++) {
@@ -2370,7 +2438,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;
@@ -2386,7 +2454,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);
@@ -2473,7 +2541,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);
@@ -2489,11 +2576,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);
@@ -2509,6 +2597,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;
@@ -2517,9 +2606,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 }) => ({
@@ -2527,16 +2616,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;
@@ -2550,13 +2641,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 node_fs.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 ?? {};
@@ -2585,7 +2685,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) {
@@ -3813,78 +3913,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;
@@ -4431,6 +4459,78 @@ async function restoreConfigFiles(options) {
 	};
 }
 //#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
 Object.defineProperty(exports, "CacheStore", {
 	enumerable: true,
 	get: function() {
@@ -4557,6 +4657,12 @@ Object.defineProperty(exports, "createTailwindV4SourceExclusionMatcher", {
 		return createTailwindV4SourceExclusionMatcher;
 	}
 });
+Object.defineProperty(exports, "escapeCssClassName", {
+	enumerable: true,
+	get: function() {
+		return escapeCssClassName;
+	}
+});
 Object.defineProperty(exports, "expandTailwindV4SourceEntries", {
 	enumerable: true,
 	get: function() {
@@ -4569,6 +4675,18 @@ Object.defineProperty(exports, "expandTailwindV4SourceEntryBraces", {
 		return expandTailwindV4SourceEntryBraces;
 	}
 });
+Object.defineProperty(exports, "extractBareArbitraryValueSourceCandidates", {
+	enumerable: true,
+	get: function() {
+		return extractBareArbitraryValueSourceCandidates;
+	}
+});
+Object.defineProperty(exports, "extractBareArbitraryValueSourceCandidatesWithPositions", {
+	enumerable: true,
+	get: function() {
+		return extractBareArbitraryValueSourceCandidatesWithPositions;
+	}
+});
 Object.defineProperty(exports, "extractProjectCandidatesWithPositions", {
 	enumerable: true,
 	get: function() {
@@ -4623,6 +4741,12 @@ Object.defineProperty(exports, "groupTokensByFile", {
 		return groupTokensByFile;
 	}
 });
+Object.defineProperty(exports, "isBareArbitraryValuesEnabled", {
+	enumerable: true,
+	get: function() {
+		return isBareArbitraryValuesEnabled;
+	}
+});
 Object.defineProperty(exports, "isFileExcludedByTailwindV4SourceEntries", {
 	enumerable: true,
 	get: function() {
@@ -4701,6 +4825,12 @@ Object.defineProperty(exports, "replaceBareArbitraryValueSelectors", {
 		return replaceBareArbitraryValueSelectors;
 	}
 });
+Object.defineProperty(exports, "resolveBareArbitraryValueCandidate", {
+	enumerable: true,
+	get: function() {
+		return resolveBareArbitraryValueCandidate;
+	}
+});
 Object.defineProperty(exports, "resolveProjectSourceFiles", {
 	enumerable: true,
 	get: function() {