tailwindcss-patch 9.3.1 → 9.3.2

package/dist/cli.js

@@ -1,6 +1,6 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_validate = require("./validate-Bd1fbQsd.js");
-const require_index_bundle = require("./index.bundle-Y1jzXpYx.js");
+const require_validate = require("./validate-CF0M_7KH.js");
+const require_index_bundle = require("./index.bundle-CcVIAfDb.js");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 //#region src/cli.bundle.ts

package/dist/cli.mjs

@@ -1,5 +1,5 @@
-import { j as logger, r as ValidateCommandError } from "./validate-CVInpab6.mjs";
-import { t as createTailwindcssPatchCli } from "./index.bundle-BKRsKEHP.mjs";
+import { j as logger, r as ValidateCommandError } from "./validate-Sq_yuh3r.mjs";
+import { t as createTailwindcssPatchCli } from "./index.bundle-DjS24i5r.mjs";
 import process from "node:process";
 //#region src/cli.bundle.ts
 async function main() {

package/dist/commands/cli-runtime.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("../chunk-8l464Juk.js");
-const require_validate = require("../validate-Bd1fbQsd.js");
+const require_validate = require("../validate-CF0M_7KH.js");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 let fs_extra = require("fs-extra");

package/dist/commands/cli-runtime.mjs

@@ -1,4 +1,4 @@
-import { D as loadPatchOptionsForWorkspace, O as loadWorkspaceConfigModule, a as tailwindcssPatchCommands, b as groupTokensByFile, i as classifyValidateError, j as logger, n as VALIDATE_FAILURE_REASONS, o as migrateConfigFiles, r as ValidateCommandError, s as restoreConfigFiles, t as VALIDATE_EXIT_CODES, u as TailwindcssPatcher } from "../validate-CVInpab6.mjs";
+import { D as loadPatchOptionsForWorkspace, O as loadWorkspaceConfigModule, a as tailwindcssPatchCommands, b as groupTokensByFile, i as classifyValidateError, j as logger, n as VALIDATE_FAILURE_REASONS, o as migrateConfigFiles, r as ValidateCommandError, s as restoreConfigFiles, t as VALIDATE_EXIT_CODES, u as TailwindcssPatcher } from "../validate-Sq_yuh3r.mjs";
 import process from "node:process";
 import fs from "fs-extra";
 import path from "pathe";

package/dist/{index.bundle-Y1jzXpYx.js → index.bundle-CcVIAfDb.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_validate = require("./validate-Bd1fbQsd.js");
+const require_validate = require("./validate-CF0M_7KH.js");
 let node_module = require("node:module");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);

package/dist/{index.bundle-BKRsKEHP.mjs → index.bundle-DjS24i5r.mjs}

@@ -1,4 +1,4 @@
-import { C as canonicalizeBareArbitraryValueCandidates, E as resolveValidTailwindV4Candidates, S as loadTailwindV4DesignSystem, T as replaceBareArbitraryValueSelectors, _ as extractRawCandidates, k as normalizeOptions, v as extractRawCandidatesWithPositions, w as extractTailwindV4InlineSourceCandidates, x as compileTailwindV4Source } from "./validate-CVInpab6.mjs";
+import { C as canonicalizeBareArbitraryValueCandidates, E as resolveValidTailwindV4Candidates, S as loadTailwindV4DesignSystem, T as replaceBareArbitraryValueSelectors, _ as extractRawCandidates, k as normalizeOptions, v as extractRawCandidatesWithPositions, w as extractTailwindV4InlineSourceCandidates, x as compileTailwindV4Source } from "./validate-Sq_yuh3r.mjs";
 import { createRequire } from "node:module";
 import process from "node:process";
 import path from "pathe";

package/dist/index.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_validate = require("./validate-Bd1fbQsd.js");
-const require_index_bundle = require("./index.bundle-Y1jzXpYx.js");
+const require_validate = require("./validate-CF0M_7KH.js");
+const require_index_bundle = require("./index.bundle-CcVIAfDb.js");
 exports.CacheStore = require_validate.CacheStore;
 exports.MIGRATION_REPORT_KIND = require_validate.MIGRATION_REPORT_KIND;
 exports.MIGRATION_REPORT_SCHEMA_VERSION = require_validate.MIGRATION_REPORT_SCHEMA_VERSION;

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { A as CacheStore, E as resolveValidTailwindV4Candidates, S as loadTailwindV4DesignSystem, _ as extractRawCandidates, a as tailwindcssPatchCommands, b as groupTokensByFile, c as MIGRATION_REPORT_KIND, d as getPatchStatusReport, f as runTailwindBuild, g as extractProjectCandidatesWithPositions, h as collectClassesFromTailwindV4, j as logger, k as normalizeOptions, l as MIGRATION_REPORT_SCHEMA_VERSION, m as collectClassesFromContexts, n as VALIDATE_FAILURE_REASONS, o as migrateConfigFiles, p as loadRuntimeContexts, r as ValidateCommandError, s as restoreConfigFiles, t as VALIDATE_EXIT_CODES, u as TailwindcssPatcher, v as extractRawCandidatesWithPositions, y as extractValidCandidates } from "./validate-CVInpab6.mjs";
-import { a as resolveTailwindV4SourceFromPatchOptions, i as resolveTailwindV4Source, n as defineConfig, o as createTailwindV4Engine, r as mountTailwindcssPatchCommands, t as createTailwindcssPatchCli } from "./index.bundle-BKRsKEHP.mjs";
+import { A as CacheStore, E as resolveValidTailwindV4Candidates, S as loadTailwindV4DesignSystem, _ as extractRawCandidates, a as tailwindcssPatchCommands, b as groupTokensByFile, c as MIGRATION_REPORT_KIND, d as getPatchStatusReport, f as runTailwindBuild, g as extractProjectCandidatesWithPositions, h as collectClassesFromTailwindV4, j as logger, k as normalizeOptions, l as MIGRATION_REPORT_SCHEMA_VERSION, m as collectClassesFromContexts, n as VALIDATE_FAILURE_REASONS, o as migrateConfigFiles, p as loadRuntimeContexts, r as ValidateCommandError, s as restoreConfigFiles, t as VALIDATE_EXIT_CODES, u as TailwindcssPatcher, v as extractRawCandidatesWithPositions, y as extractValidCandidates } from "./validate-Sq_yuh3r.mjs";
+import { a as resolveTailwindV4SourceFromPatchOptions, i as resolveTailwindV4Source, n as defineConfig, o as createTailwindV4Engine, r as mountTailwindcssPatchCommands, t as createTailwindcssPatchCli } from "./index.bundle-DjS24i5r.mjs";
 export { CacheStore, MIGRATION_REPORT_KIND, MIGRATION_REPORT_SCHEMA_VERSION, TailwindcssPatcher, VALIDATE_EXIT_CODES, VALIDATE_FAILURE_REASONS, ValidateCommandError, collectClassesFromContexts, collectClassesFromTailwindV4, createTailwindV4Engine, createTailwindcssPatchCli, defineConfig, extractProjectCandidatesWithPositions, extractRawCandidates, extractRawCandidatesWithPositions, extractValidCandidates, getPatchStatusReport, groupTokensByFile, loadRuntimeContexts, loadTailwindV4DesignSystem, logger, migrateConfigFiles, mountTailwindcssPatchCommands, normalizeOptions, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions, resolveValidTailwindV4Candidates, restoreConfigFiles, runTailwindBuild, tailwindcssPatchCommands };

package/dist/{validate-Bd1fbQsd.js → validate-CF0M_7KH.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.1";
+var version = "9.3.2";
 //#endregion
 //#region src/constants.ts
 const pkgName = "tailwindcss-patch";
@@ -1479,7 +1479,8 @@ const DEFAULT_BARE_ARBITRARY_VALUE_UNITS = [
 	"ms"
 ];
 const NUMBER_RE = /^-?(?:\d+|\d*\.\d+)$/;
-const FUNCTION_VALUE_RE = /^[a-zA-Z_-][a-zA-Z0-9_-]*\(/;
+const FUNCTION_VALUE_RE = /^[a-z_-][\w-]*\(/i;
+const HEX_ESCAPE_RE = /^[\da-f]$/i;
 function splitVariantPrefix(candidate) {
 	let depth = 0;
 	let quote;
@@ -1545,8 +1546,38 @@ function isBalancedFunctionValue(value) {
 	}
 	return depth === 0 && quote === void 0;
 }
+function isEscapedAt(value, index) {
+	let slashCount = 0;
+	for (let slashIndex = index - 1; slashIndex >= 0 && value[slashIndex] === "\\"; slashIndex--) slashCount++;
+	return slashCount % 2 === 1;
+}
+function isBalancedBareArbitraryBody(value) {
+	let depth = 0;
+	let quote;
+	for (let index = 0; index < value.length; index++) {
+		const character = value[index];
+		if (isEscapedAt(value, index)) continue;
+		if (quote) {
+			if (character === quote) quote = void 0;
+			continue;
+		}
+		if (character === "\"" || character === "'") {
+			quote = character;
+			continue;
+		}
+		if (character === "(" || character === "{") {
+			depth++;
+			continue;
+		}
+		if (character === ")" || character === "}") {
+			depth--;
+			if (depth < 0) return false;
+		}
+	}
+	return depth === 0 && quote === void 0;
+}
 function isHexColorValue(value) {
-	return /^#(?:[0-9a-fA-F]{3,4}|[0-9a-fA-F]{6,8})$/.test(value);
+	return /^#(?:[0-9a-f]{3,4}|[0-9a-f]{6,8})$/i.test(value);
 }
 function isQuotedValue(value) {
 	const quote = value[0];
@@ -1569,29 +1600,61 @@ function normalizeBareArbitraryValueOptions(options) {
 	if (normalizedUnits.length === 0) return;
 	return { units: normalizedUnits.sort((a, b) => b.length - a.length) };
 }
+function normalizeEscapedValue(value) {
+	let result = "";
+	for (let index = 0; index < value.length; index++) {
+		const character = value[index];
+		if (character !== "\\") {
+			result += character;
+			continue;
+		}
+		const nextCharacter = value[index + 1];
+		if (nextCharacter === void 0) {
+			result += character;
+			continue;
+		}
+		if (HEX_ESCAPE_RE.test(nextCharacter)) {
+			let hex = "";
+			let nextIndex = index + 1;
+			while (nextIndex < value.length && hex.length < 6) {
+				const hexCharacter = value[nextIndex];
+				if (hexCharacter === void 0 || !HEX_ESCAPE_RE.test(hexCharacter)) break;
+				hex += hexCharacter;
+				nextIndex++;
+			}
+			if (/[\t\n\f\r ]/.test(value[nextIndex] ?? "")) nextIndex++;
+			const decoded = String.fromCodePoint(Number.parseInt(hex, 16));
+			result += decoded === "_" ? "\\_" : decoded;
+			index = nextIndex - 1;
+			continue;
+		}
+		result += nextCharacter === "_" ? "\\_" : nextCharacter;
+		index++;
+	}
+	return result;
+}
 function resolveValueWithUnit(body, units) {
+	const value = normalizeEscapedValue(body);
 	for (const unit of units) {
-		if (!body.endsWith(unit)) continue;
-		const numberPart = body.slice(0, -unit.length);
+		if (!value.endsWith(unit)) continue;
+		const numberPart = value.slice(0, -unit.length);
 		if (NUMBER_RE.test(numberPart)) return `${numberPart}${unit}`;
 	}
 }
 function resolveArbitraryValue(body, units) {
-	const withUnit = resolveValueWithUnit(body, units);
+	const value = normalizeEscapedValue(body);
+	const withUnit = resolveValueWithUnit(value, units);
 	if (withUnit) return withUnit;
-	if (isHexColorValue(body)) return body;
-	if (isQuotedValue(body)) return body;
-	if (FUNCTION_VALUE_RE.test(body) && body.endsWith(")") && isBalancedFunctionValue(body)) return body;
+	if (isHexColorValue(value)) return value;
+	if (isQuotedValue(value)) return value;
+	if (FUNCTION_VALUE_RE.test(value) && value.endsWith(")") && isBalancedFunctionValue(value)) return value;
 }
 function resolveUtilityAndValue(body, units) {
 	let depth = 0;
 	let quote;
-	for (let index = 1; index < body.length; index++) {
+	for (let index = body.length - 1; index > 0; index--) {
 		const character = body[index];
-		if (character === "\\") {
-			index++;
-			continue;
-		}
+		if (isEscapedAt(body, index)) continue;
 		if (quote) {
 			if (character === quote) quote = void 0;
 			continue;
@@ -1600,11 +1663,11 @@ function resolveUtilityAndValue(body, units) {
 			quote = character;
 			continue;
 		}
-		if (character === "(" || character === "{") {
+		if (character === ")" || character === "}") {
 			depth++;
 			continue;
 		}
-		if (character === ")" || character === "}") {
+		if (character === "(" || character === "{") {
 			depth = Math.max(0, depth - 1);
 			continue;
 		}
@@ -1627,6 +1690,7 @@ function resolveBareArbitraryValueCandidate(candidate, options) {
 	let normalizedBody = important ? body.slice(1) : body;
 	const negative = normalizedBody.startsWith("-") ? "-" : "";
 	if (negative) normalizedBody = normalizedBody.slice(1);
+	if (!isBalancedBareArbitraryBody(normalizedBody)) return;
 	const resolved = resolveUtilityAndValue(normalizedBody, normalizedOptions.units);
 	if (!resolved) return;
 	return {
@@ -1660,23 +1724,32 @@ function escapeCssClassName(value) {
 function resolveValidTailwindV4Candidates(designSystem, candidates, options) {
 	const validCandidates = /* @__PURE__ */ new Set();
 	const parsedCandidates = [];
-	const originalCandidateByCanonical = /* @__PURE__ */ new Map();
+	const originalCandidatesByCanonical = /* @__PURE__ */ new Map();
 	for (const candidate of candidates) {
 		if (!candidate) continue;
 		const bareArbitrary = resolveBareArbitraryValueCandidate(candidate, options?.bareArbitraryValues);
 		const candidateToCheck = bareArbitrary?.canonicalCandidate ?? candidate;
-		if (parsedCandidates.includes(candidateToCheck)) continue;
-		if (designSystem.parseCandidate(candidateToCheck).length > 0) {
-			parsedCandidates.push(candidateToCheck);
-			if (bareArbitrary) originalCandidateByCanonical.set(candidateToCheck, candidate);
+		if (bareArbitrary) {
+			const originalCandidates = originalCandidatesByCanonical.get(candidateToCheck) ?? /* @__PURE__ */ new Set();
+			originalCandidates.add(candidate);
+			originalCandidatesByCanonical.set(candidateToCheck, originalCandidates);
 		}
+		if (parsedCandidates.includes(candidateToCheck)) continue;
+		if (designSystem.parseCandidate(candidateToCheck).length > 0) parsedCandidates.push(candidateToCheck);
 	}
 	if (parsedCandidates.length === 0) return validCandidates;
 	const cssByCandidate = designSystem.candidatesToCss(parsedCandidates);
 	for (let index = 0; index < parsedCandidates.length; index++) {
 		const candidate = parsedCandidates[index];
 		const candidateCss = cssByCandidate[index];
-		if (candidate && typeof candidateCss === "string" && candidateCss.trim().length > 0) validCandidates.add(originalCandidateByCanonical.get(candidate) ?? candidate);
+		if (candidate && typeof candidateCss === "string" && candidateCss.trim().length > 0) {
+			const originalCandidates = originalCandidatesByCanonical.get(candidate);
+			if (originalCandidates) {
+				for (const originalCandidate of originalCandidates) validCandidates.add(originalCandidate);
+				continue;
+			}
+			validCandidates.add(candidate);
+		}
 	}
 	return validCandidates;
 }
@@ -1685,16 +1758,34 @@ function createSelectorAliasMap(candidates, options) {
 	for (const candidate of candidates) {
 		const bareArbitrary = resolveBareArbitraryValueCandidate(candidate, options);
 		if (!bareArbitrary) continue;
-		aliases.set(escapeCssClassName(bareArbitrary.canonicalCandidate), escapeCssClassName(bareArbitrary.candidate));
+		const canonicalSelector = escapeCssClassName(bareArbitrary.canonicalCandidate);
+		const bareSelectors = aliases.get(canonicalSelector) ?? /* @__PURE__ */ new Set();
+		bareSelectors.add(escapeCssClassName(bareArbitrary.candidate));
+		aliases.set(canonicalSelector, bareSelectors);
 	}
 	return aliases;
 }
 function replaceBareArbitraryValueSelectors(css, candidates, options) {
 	const aliases = createSelectorAliasMap(candidates, options);
 	if (aliases.size === 0) return css;
-	let result = css;
-	for (const [canonicalSelector, bareSelector] of aliases) result = result.replaceAll(canonicalSelector, bareSelector);
-	return result;
+	if (Array.from(aliases.values()).every((bareSelectors) => bareSelectors.size === 1)) {
+		let result = css;
+		for (const [canonicalSelector, bareSelectors] of aliases) {
+			const bareSelector = Array.from(bareSelectors)[0];
+			if (bareSelector !== void 0) result = result.replaceAll(canonicalSelector, bareSelector);
+		}
+		return result;
+	}
+	const root = postcss.default.parse(css);
+	root.walkRules((rule) => {
+		let selectors = rule.selectors;
+		for (const [canonicalSelector, bareSelectors] of aliases) selectors = selectors.flatMap((selector) => {
+			if (!selector.includes(canonicalSelector)) return selector;
+			return Array.from(bareSelectors, (bareSelector) => selector.replaceAll(canonicalSelector, bareSelector));
+		});
+		rule.selectors = selectors;
+	});
+	return root.toString();
 }
 function canonicalizeBareArbitraryValueCandidates(candidates, options) {
 	return Array.from(candidates, (candidate) => {

package/dist/{validate-CVInpab6.mjs → validate-Sq_yuh3r.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.1";
+var version = "9.3.2";
 //#endregion
 //#region src/constants.ts
 const pkgName = "tailwindcss-patch";
@@ -1477,7 +1477,8 @@ const DEFAULT_BARE_ARBITRARY_VALUE_UNITS = [
 	"ms"
 ];
 const NUMBER_RE = /^-?(?:\d+|\d*\.\d+)$/;
-const FUNCTION_VALUE_RE = /^[a-zA-Z_-][a-zA-Z0-9_-]*\(/;
+const FUNCTION_VALUE_RE = /^[a-z_-][\w-]*\(/i;
+const HEX_ESCAPE_RE = /^[\da-f]$/i;
 function splitVariantPrefix(candidate) {
 	let depth = 0;
 	let quote;
@@ -1543,8 +1544,38 @@ function isBalancedFunctionValue(value) {
 	}
 	return depth === 0 && quote === void 0;
 }
+function isEscapedAt(value, index) {
+	let slashCount = 0;
+	for (let slashIndex = index - 1; slashIndex >= 0 && value[slashIndex] === "\\"; slashIndex--) slashCount++;
+	return slashCount % 2 === 1;
+}
+function isBalancedBareArbitraryBody(value) {
+	let depth = 0;
+	let quote;
+	for (let index = 0; index < value.length; index++) {
+		const character = value[index];
+		if (isEscapedAt(value, index)) continue;
+		if (quote) {
+			if (character === quote) quote = void 0;
+			continue;
+		}
+		if (character === "\"" || character === "'") {
+			quote = character;
+			continue;
+		}
+		if (character === "(" || character === "{") {
+			depth++;
+			continue;
+		}
+		if (character === ")" || character === "}") {
+			depth--;
+			if (depth < 0) return false;
+		}
+	}
+	return depth === 0 && quote === void 0;
+}
 function isHexColorValue(value) {
-	return /^#(?:[0-9a-fA-F]{3,4}|[0-9a-fA-F]{6,8})$/.test(value);
+	return /^#(?:[0-9a-f]{3,4}|[0-9a-f]{6,8})$/i.test(value);
 }
 function isQuotedValue(value) {
 	const quote = value[0];
@@ -1567,29 +1598,61 @@ function normalizeBareArbitraryValueOptions(options) {
 	if (normalizedUnits.length === 0) return;
 	return { units: normalizedUnits.sort((a, b) => b.length - a.length) };
 }
+function normalizeEscapedValue(value) {
+	let result = "";
+	for (let index = 0; index < value.length; index++) {
+		const character = value[index];
+		if (character !== "\\") {
+			result += character;
+			continue;
+		}
+		const nextCharacter = value[index + 1];
+		if (nextCharacter === void 0) {
+			result += character;
+			continue;
+		}
+		if (HEX_ESCAPE_RE.test(nextCharacter)) {
+			let hex = "";
+			let nextIndex = index + 1;
+			while (nextIndex < value.length && hex.length < 6) {
+				const hexCharacter = value[nextIndex];
+				if (hexCharacter === void 0 || !HEX_ESCAPE_RE.test(hexCharacter)) break;
+				hex += hexCharacter;
+				nextIndex++;
+			}
+			if (/[\t\n\f\r ]/.test(value[nextIndex] ?? "")) nextIndex++;
+			const decoded = String.fromCodePoint(Number.parseInt(hex, 16));
+			result += decoded === "_" ? "\\_" : decoded;
+			index = nextIndex - 1;
+			continue;
+		}
+		result += nextCharacter === "_" ? "\\_" : nextCharacter;
+		index++;
+	}
+	return result;
+}
 function resolveValueWithUnit(body, units) {
+	const value = normalizeEscapedValue(body);
 	for (const unit of units) {
-		if (!body.endsWith(unit)) continue;
-		const numberPart = body.slice(0, -unit.length);
+		if (!value.endsWith(unit)) continue;
+		const numberPart = value.slice(0, -unit.length);
 		if (NUMBER_RE.test(numberPart)) return `${numberPart}${unit}`;
 	}
 }
 function resolveArbitraryValue(body, units) {
-	const withUnit = resolveValueWithUnit(body, units);
+	const value = normalizeEscapedValue(body);
+	const withUnit = resolveValueWithUnit(value, units);
 	if (withUnit) return withUnit;
-	if (isHexColorValue(body)) return body;
-	if (isQuotedValue(body)) return body;
-	if (FUNCTION_VALUE_RE.test(body) && body.endsWith(")") && isBalancedFunctionValue(body)) return body;
+	if (isHexColorValue(value)) return value;
+	if (isQuotedValue(value)) return value;
+	if (FUNCTION_VALUE_RE.test(value) && value.endsWith(")") && isBalancedFunctionValue(value)) return value;
 }
 function resolveUtilityAndValue(body, units) {
 	let depth = 0;
 	let quote;
-	for (let index = 1; index < body.length; index++) {
+	for (let index = body.length - 1; index > 0; index--) {
 		const character = body[index];
-		if (character === "\\") {
-			index++;
-			continue;
-		}
+		if (isEscapedAt(body, index)) continue;
 		if (quote) {
 			if (character === quote) quote = void 0;
 			continue;
@@ -1598,11 +1661,11 @@ function resolveUtilityAndValue(body, units) {
 			quote = character;
 			continue;
 		}
-		if (character === "(" || character === "{") {
+		if (character === ")" || character === "}") {
 			depth++;
 			continue;
 		}
-		if (character === ")" || character === "}") {
+		if (character === "(" || character === "{") {
 			depth = Math.max(0, depth - 1);
 			continue;
 		}
@@ -1625,6 +1688,7 @@ function resolveBareArbitraryValueCandidate(candidate, options) {
 	let normalizedBody = important ? body.slice(1) : body;
 	const negative = normalizedBody.startsWith("-") ? "-" : "";
 	if (negative) normalizedBody = normalizedBody.slice(1);
+	if (!isBalancedBareArbitraryBody(normalizedBody)) return;
 	const resolved = resolveUtilityAndValue(normalizedBody, normalizedOptions.units);
 	if (!resolved) return;
 	return {
@@ -1658,23 +1722,32 @@ function escapeCssClassName(value) {
 function resolveValidTailwindV4Candidates(designSystem, candidates, options) {
 	const validCandidates = /* @__PURE__ */ new Set();
 	const parsedCandidates = [];
-	const originalCandidateByCanonical = /* @__PURE__ */ new Map();
+	const originalCandidatesByCanonical = /* @__PURE__ */ new Map();
 	for (const candidate of candidates) {
 		if (!candidate) continue;
 		const bareArbitrary = resolveBareArbitraryValueCandidate(candidate, options?.bareArbitraryValues);
 		const candidateToCheck = bareArbitrary?.canonicalCandidate ?? candidate;
-		if (parsedCandidates.includes(candidateToCheck)) continue;
-		if (designSystem.parseCandidate(candidateToCheck).length > 0) {
-			parsedCandidates.push(candidateToCheck);
-			if (bareArbitrary) originalCandidateByCanonical.set(candidateToCheck, candidate);
+		if (bareArbitrary) {
+			const originalCandidates = originalCandidatesByCanonical.get(candidateToCheck) ?? /* @__PURE__ */ new Set();
+			originalCandidates.add(candidate);
+			originalCandidatesByCanonical.set(candidateToCheck, originalCandidates);
 		}
+		if (parsedCandidates.includes(candidateToCheck)) continue;
+		if (designSystem.parseCandidate(candidateToCheck).length > 0) parsedCandidates.push(candidateToCheck);
 	}
 	if (parsedCandidates.length === 0) return validCandidates;
 	const cssByCandidate = designSystem.candidatesToCss(parsedCandidates);
 	for (let index = 0; index < parsedCandidates.length; index++) {
 		const candidate = parsedCandidates[index];
 		const candidateCss = cssByCandidate[index];
-		if (candidate && typeof candidateCss === "string" && candidateCss.trim().length > 0) validCandidates.add(originalCandidateByCanonical.get(candidate) ?? candidate);
+		if (candidate && typeof candidateCss === "string" && candidateCss.trim().length > 0) {
+			const originalCandidates = originalCandidatesByCanonical.get(candidate);
+			if (originalCandidates) {
+				for (const originalCandidate of originalCandidates) validCandidates.add(originalCandidate);
+				continue;
+			}
+			validCandidates.add(candidate);
+		}
 	}
 	return validCandidates;
 }
@@ -1683,16 +1756,34 @@ function createSelectorAliasMap(candidates, options) {
 	for (const candidate of candidates) {
 		const bareArbitrary = resolveBareArbitraryValueCandidate(candidate, options);
 		if (!bareArbitrary) continue;
-		aliases.set(escapeCssClassName(bareArbitrary.canonicalCandidate), escapeCssClassName(bareArbitrary.candidate));
+		const canonicalSelector = escapeCssClassName(bareArbitrary.canonicalCandidate);
+		const bareSelectors = aliases.get(canonicalSelector) ?? /* @__PURE__ */ new Set();
+		bareSelectors.add(escapeCssClassName(bareArbitrary.candidate));
+		aliases.set(canonicalSelector, bareSelectors);
 	}
 	return aliases;
 }
 function replaceBareArbitraryValueSelectors(css, candidates, options) {
 	const aliases = createSelectorAliasMap(candidates, options);
 	if (aliases.size === 0) return css;
-	let result = css;
-	for (const [canonicalSelector, bareSelector] of aliases) result = result.replaceAll(canonicalSelector, bareSelector);
-	return result;
+	if (Array.from(aliases.values()).every((bareSelectors) => bareSelectors.size === 1)) {
+		let result = css;
+		for (const [canonicalSelector, bareSelectors] of aliases) {
+			const bareSelector = Array.from(bareSelectors)[0];
+			if (bareSelector !== void 0) result = result.replaceAll(canonicalSelector, bareSelector);
+		}
+		return result;
+	}
+	const root = postcss.parse(css);
+	root.walkRules((rule) => {
+		let selectors = rule.selectors;
+		for (const [canonicalSelector, bareSelectors] of aliases) selectors = selectors.flatMap((selector) => {
+			if (!selector.includes(canonicalSelector)) return selector;
+			return Array.from(bareSelectors, (bareSelector) => selector.replaceAll(canonicalSelector, bareSelector));
+		});
+		rule.selectors = selectors;
+	});
+	return root.toString();
 }
 function canonicalizeBareArbitraryValueCandidates(candidates, options) {
 	return Array.from(candidates, (candidate) => {

package/package.json

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

package/src/v4/bare-arbitrary-values.ts

@@ -39,7 +39,8 @@ const DEFAULT_BARE_ARBITRARY_VALUE_UNITS = [
 ]
 
 const NUMBER_RE = /^-?(?:\d+|\d*\.\d+)$/
-const FUNCTION_VALUE_RE = /^[a-zA-Z_-][a-zA-Z0-9_-]*\(/
+const FUNCTION_VALUE_RE = /^[a-z_-][\w-]*\(/i
+const HEX_ESCAPE_RE = /^[\da-f]$/i
 
 function splitVariantPrefix(candidate: string) {
   let depth = 0
@@ -133,8 +134,55 @@ function isBalancedFunctionValue(value: string) {
   return depth === 0 && quote === undefined
 }
 
+function isEscapedAt(value: string, index: number) {
+  let slashCount = 0
+  for (let slashIndex = index - 1; slashIndex >= 0 && value[slashIndex] === '\\'; slashIndex--) {
+    slashCount++
+  }
+  return slashCount % 2 === 1
+}
+
+function isBalancedBareArbitraryBody(value: string) {
+  let depth = 0
+  let quote: string | undefined
+
+  for (let index = 0; index < value.length; index++) {
+    const character = value[index]
+
+    if (isEscapedAt(value, index)) {
+      continue
+    }
+
+    if (quote) {
+      if (character === quote) {
+        quote = undefined
+      }
+      continue
+    }
+
+    if (character === '"' || character === '\'') {
+      quote = character
+      continue
+    }
+
+    if (character === '(' || character === '{') {
+      depth++
+      continue
+    }
+
+    if (character === ')' || character === '}') {
+      depth--
+      if (depth < 0) {
+        return false
+      }
+    }
+  }
+
+  return depth === 0 && quote === undefined
+}
+
 function isHexColorValue(value: string) {
-  return /^#(?:[0-9a-fA-F]{3,4}|[0-9a-fA-F]{6,8})$/.test(value)
+  return /^#(?:[0-9a-f]{3,4}|[0-9a-f]{6,8})$/i.test(value)
 }
 
 function isQuotedValue(value: string) {
@@ -173,12 +221,55 @@ function normalizeBareArbitraryValueOptions(options: boolean | BareArbitraryValu
   }
 }
 
+function normalizeEscapedValue(value: string) {
+  let result = ''
+  for (let index = 0; index < value.length; index++) {
+    const character = value[index]
+    if (character !== '\\') {
+      result += character
+      continue
+    }
+
+    const nextCharacter = value[index + 1]
+    if (nextCharacter === undefined) {
+      result += character
+      continue
+    }
+
+    if (HEX_ESCAPE_RE.test(nextCharacter)) {
+      let hex = ''
+      let nextIndex = index + 1
+      while (nextIndex < value.length && hex.length < 6) {
+        const hexCharacter = value[nextIndex]
+        if (hexCharacter === undefined || !HEX_ESCAPE_RE.test(hexCharacter)) {
+          break
+        }
+        hex += hexCharacter
+        nextIndex++
+      }
+      if (/[\t\n\f\r ]/.test(value[nextIndex] ?? '')) {
+        nextIndex++
+      }
+
+      const decoded = String.fromCodePoint(Number.parseInt(hex, 16))
+      result += decoded === '_' ? '\\_' : decoded
+      index = nextIndex - 1
+      continue
+    }
+
+    result += nextCharacter === '_' ? '\\_' : nextCharacter
+    index++
+  }
+  return result
+}
+
 function resolveValueWithUnit(body: string, units: string[]) {
+  const value = normalizeEscapedValue(body)
   for (const unit of units) {
-    if (!body.endsWith(unit)) {
+    if (!value.endsWith(unit)) {
       continue
     }
-    const numberPart = body.slice(0, -unit.length)
+    const numberPart = value.slice(0, -unit.length)
     if (NUMBER_RE.test(numberPart)) {
       return `${numberPart}${unit}`
     }
@@ -186,21 +277,22 @@ function resolveValueWithUnit(body: string, units: string[]) {
 }
 
 function resolveArbitraryValue(body: string, units: string[]) {
-  const withUnit = resolveValueWithUnit(body, units)
+  const value = normalizeEscapedValue(body)
+  const withUnit = resolveValueWithUnit(value, units)
   if (withUnit) {
     return withUnit
   }
 
-  if (isHexColorValue(body)) {
-    return body
+  if (isHexColorValue(value)) {
+    return value
   }
 
-  if (isQuotedValue(body)) {
-    return body
+  if (isQuotedValue(value)) {
+    return value
   }
 
-  if (FUNCTION_VALUE_RE.test(body) && body.endsWith(')') && isBalancedFunctionValue(body)) {
-    return body
+  if (FUNCTION_VALUE_RE.test(value) && value.endsWith(')') && isBalancedFunctionValue(value)) {
+    return value
   }
 }
 
@@ -208,11 +300,10 @@ function resolveUtilityAndValue(body: string, units: string[]) {
   let depth = 0
   let quote: string | undefined
 
-  for (let index = 1; index < body.length; index++) {
+  for (let index = body.length - 1; index > 0; index--) {
     const character = body[index]
 
-    if (character === '\\') {
-      index++
+    if (isEscapedAt(body, index)) {
       continue
     }
 
@@ -228,12 +319,12 @@ function resolveUtilityAndValue(body: string, units: string[]) {
       continue
     }
 
-    if (character === '(' || character === '{') {
+    if (character === ')' || character === '}') {
       depth++
       continue
     }
 
-    if (character === ')' || character === '}') {
+    if (character === '(' || character === '{') {
       depth = Math.max(0, depth - 1)
       continue
     }
@@ -274,6 +365,9 @@ export function resolveBareArbitraryValueCandidate(
   if (negative) {
     normalizedBody = normalizedBody.slice(1)
   }
+  if (!isBalancedBareArbitraryBody(normalizedBody)) {
+    return
+  }
 
   const resolved = resolveUtilityAndValue(normalizedBody, normalizedOptions.units)
   if (!resolved) {

package/src/v4/candidates.ts

@@ -1,10 +1,7 @@
+import type { BareArbitraryValueOptions } from './bare-arbitrary-values'
 import type { TailwindV4DesignSystem } from './types'
 import postcss from 'postcss'
-import {
-  escapeCssClassName,
-  type BareArbitraryValueOptions,
-  resolveBareArbitraryValueCandidate,
-} from './bare-arbitrary-values'
+import { escapeCssClassName, resolveBareArbitraryValueCandidate } from './bare-arbitrary-values'
 
 export function resolveValidTailwindV4Candidates(
   designSystem: TailwindV4DesignSystem,
@@ -15,7 +12,7 @@ export function resolveValidTailwindV4Candidates(
 ): Set<string> {
   const validCandidates = new Set<string>()
   const parsedCandidates: string[] = []
-  const originalCandidateByCanonical = new Map<string, string>()
+  const originalCandidatesByCanonical = new Map<string, Set<string>>()
 
   for (const candidate of candidates) {
     if (!candidate) {
@@ -25,15 +22,19 @@ export function resolveValidTailwindV4Candidates(
     const bareArbitrary = resolveBareArbitraryValueCandidate(candidate, options?.bareArbitraryValues)
     const candidateToCheck = bareArbitrary?.canonicalCandidate ?? candidate
 
-    if (parsedCandidates.includes(candidateToCheck)) {
+    if (bareArbitrary) {
+      const originalCandidates = originalCandidatesByCanonical.get(candidateToCheck) ?? new Set<string>()
+      originalCandidates.add(candidate)
+      originalCandidatesByCanonical.set(candidateToCheck, originalCandidates)
+    }
+
+    const alreadyParsed = parsedCandidates.includes(candidateToCheck)
+    if (alreadyParsed) {
       continue
     }
 
     if (designSystem.parseCandidate(candidateToCheck).length > 0) {
       parsedCandidates.push(candidateToCheck)
-      if (bareArbitrary) {
-        originalCandidateByCanonical.set(candidateToCheck, candidate)
-      }
     }
   }
 
@@ -46,7 +47,14 @@ export function resolveValidTailwindV4Candidates(
     const candidate = parsedCandidates[index]
     const candidateCss = cssByCandidate[index]
     if (candidate && typeof candidateCss === 'string' && candidateCss.trim().length > 0) {
-      validCandidates.add(originalCandidateByCanonical.get(candidate) ?? candidate)
+      const originalCandidates = originalCandidatesByCanonical.get(candidate)
+      if (originalCandidates) {
+        for (const originalCandidate of originalCandidates) {
+          validCandidates.add(originalCandidate)
+        }
+        continue
+      }
+      validCandidates.add(candidate)
     }
   }
 
@@ -57,16 +65,16 @@ function createSelectorAliasMap(
   candidates: Iterable<string>,
   options?: boolean | BareArbitraryValueOptions,
 ) {
-  const aliases = new Map<string, string>()
+  const aliases = new Map<string, Set<string>>()
   for (const candidate of candidates) {
     const bareArbitrary = resolveBareArbitraryValueCandidate(candidate, options)
     if (!bareArbitrary) {
       continue
     }
-    aliases.set(
-      escapeCssClassName(bareArbitrary.canonicalCandidate),
-      escapeCssClassName(bareArbitrary.candidate),
-    )
+    const canonicalSelector = escapeCssClassName(bareArbitrary.canonicalCandidate)
+    const bareSelectors = aliases.get(canonicalSelector) ?? new Set<string>()
+    bareSelectors.add(escapeCssClassName(bareArbitrary.candidate))
+    aliases.set(canonicalSelector, bareSelectors)
   }
   return aliases
 }
@@ -81,11 +89,31 @@ export function replaceBareArbitraryValueSelectors(
     return css
   }
 
-  let result = css
-  for (const [canonicalSelector, bareSelector] of aliases) {
-    result = result.replaceAll(canonicalSelector, bareSelector)
+  if (Array.from(aliases.values()).every(bareSelectors => bareSelectors.size === 1)) {
+    let result = css
+    for (const [canonicalSelector, bareSelectors] of aliases) {
+      const bareSelector = Array.from(bareSelectors)[0]
+      if (bareSelector !== undefined) {
+        result = result.replaceAll(canonicalSelector, bareSelector)
+      }
+    }
+    return result
   }
-  return result
+
+  const root = postcss.parse(css)
+  root.walkRules((rule) => {
+    let selectors = rule.selectors
+    for (const [canonicalSelector, bareSelectors] of aliases) {
+      selectors = selectors.flatMap((selector) => {
+        if (!selector.includes(canonicalSelector)) {
+          return selector
+        }
+        return Array.from(bareSelectors, bareSelector => selector.replaceAll(canonicalSelector, bareSelector))
+      })
+    }
+    rule.selectors = selectors
+  })
+  return root.toString()
 }
 
 export function canonicalizeBareArbitraryValueCandidates(