tailwindcss-patch 9.3.1 → 9.3.3

package/dist/{validate-Bd1fbQsd.js → validate-DABvQ44V.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.3";
 //#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,
@@ -1479,7 +1487,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 +1554,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 +1608,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 +1671,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 +1698,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 +1732,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 +1766,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) => {
@@ -2226,6 +2325,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;
@@ -2234,7 +2352,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),
@@ -2242,19 +2360,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;
 }

package/dist/{validate-Bqych-z9.d.ts → validate-DDJnolx2.d.mts}

@@ -1,10 +1,9 @@
-import { CAC, Command } from "cac";
 import { PackageInfo, PackageResolvingOptions } from "local-pkg";
-import { SourceEntry } from "@tailwindcss/oxide";
+import * as _$consola from "consola";
 import { Node, Rule } from "postcss";
+import { CAC, Command } from "cac";
+import { SourceEntry } from "@tailwindcss/oxide";
 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;
@@ -159,6 +158,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';
@@ -246,6 +317,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. */
@@ -328,6 +401,7 @@ interface NormalizedTailwindV4Options {
   base: string;
   configuredBase?: string;
   css?: string;
+  cssSources: TailwindV4CssSource[];
   cssEntries: string[];
   sources: SourceEntry[];
   hasUserDefinedSources: boolean;
@@ -699,4 +773,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 { TailwindV4SourceOptions 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, TailwindV4DesignSystem as J, TailwindV4CandidateSource as K, ExtendLengthUnitsOptions as L, normalizeOptions as M, ApplyOptions as N, extractRawCandidatesWithPositions as O, CacheOptions as P, TailwindV4ResolvedSource as Q, ExtractOptions as R, MIGRATION_REPORT_KIND as S, TailwindcssPatcher as T, TailwindV2Options as U, TailwindCssOptions as V, TailwindV3Options as W, TailwindV4GenerateOptions as X, TailwindV4Engine as Y, TailwindV4GenerateResult as Z, ConfigFileMigrationEntry as _, CacheContextMetadata as _t, ValidateFailureSummary as a, PatchStatusReport as at, RestoreConfigFilesOptions as b, CacheReadResult as bt, TailwindcssPatchCliMountOptions as c, TailwindTokenFileKey as ct, TailwindcssPatchCommandContext as d, TailwindcssClassCache as dt, ExtractResult as et, TailwindcssPatchCommandHandler as f, TailwindcssRuntimeContext as ft, tailwindcssPatchCommands as g, CacheContextDescriptor as gt, TailwindcssPatchCommandOptions as h, CacheClearScope as ht, ValidateFailureReason as i, PatchStatusEntry as it, BareArbitraryValueOptions as j, extractValidCandidates as k, TailwindcssPatchCliOptions as l, TailwindTokenLocation as lt, TailwindcssPatchCommandOptionDefinition as m, CacheClearResult as mt, VALIDATE_FAILURE_REASONS as n, PatchCheckStatus as nt, ValidateJsonFailurePayload as o, TailwindPatchRuntime as ot, TailwindcssPatchCommandHandlerMap as p, CacheClearOptions as pt, TailwindV4CssSource as q, ValidateCommandError as r, PatchName as rt, ValidateJsonSuccessPayload as s, TailwindTokenByFileMap as st, VALIDATE_EXIT_CODES as t, ILengthUnitsPatchOptions as tt, TailwindcssPatchCommand as u, TailwindTokenReport as ut, ConfigFileMigrationReport as v, CacheIndexFileV2 as vt, logger as w, RestoreConfigFilesResult as x, MigrateConfigFilesOptions as y, CacheReadMeta as yt, NormalizedCacheOptions as z };