tailwindcss-patch 9.3.7 → 9.4.1

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

@@ -8,16 +8,17 @@ import { createHash } from "node:crypto";
 import { createConsola } from "consola";
 import path$1 from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { promises } from "node:fs";
+import { promises, realpathSync } from "node:fs";
 import postcss from "postcss";
-import "micromatch";
+import { stat } from "node:fs/promises";
+import micromatch from "micromatch";
 import * as t from "@babel/types";
 import generate from "@babel/generator";
 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.7";
+var version = "9.4.1";
 //#endregion
 //#region src/constants.ts
 const pkgName = "tailwindcss-patch";
@@ -2042,7 +2043,110 @@ async function compileTailwindV4Source(source) {
 }
 //#endregion
 //#region src/v4/source-scan.ts
+const TAILWIND_V4_IGNORED_CONTENT_DIRS = [
+	".git",
+	".hg",
+	".jj",
+	".next",
+	".parcel-cache",
+	".pnpm-store",
+	".svelte-kit",
+	".svn",
+	".turbo",
+	".venv",
+	".vercel",
+	".yarn",
+	"__pycache__",
+	"node_modules",
+	"venv"
+];
+const TAILWIND_V4_IGNORED_EXTENSIONS = [
+	"less",
+	"lock",
+	"sass",
+	"scss",
+	"styl",
+	"log"
+];
+const TAILWIND_V4_IGNORED_FILES = [
+	"package-lock.json",
+	"pnpm-lock.yaml",
+	"bun.lockb",
+	".gitignore",
+	".env",
+	".env.*"
+];
 const TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN = "**/*";
+function uniqueResolvedPaths(values) {
+	const result = [];
+	for (const value of values) {
+		if (!value) continue;
+		const resolved = path.resolve(value);
+		if (!result.includes(resolved)) result.push(resolved);
+	}
+	return result;
+}
+function toPosixPath(value) {
+	return value.replaceAll(path.sep, "/");
+}
+function resolveSourceScanPath(value) {
+	const resolved = path.resolve(value);
+	try {
+		return realpathSync.native(resolved);
+	} catch {
+		return resolved;
+	}
+}
+function normalizeGlobPattern(pattern) {
+	return pattern.startsWith("./") ? pattern.slice(2) : pattern;
+}
+function hasGlobMagic(value) {
+	return /[*?[\]{}()!+@]/.test(value);
+}
+function splitStaticGlobPrefix(pattern) {
+	const segments = normalizeGlobPattern(pattern).split(/[\\/]+/);
+	const prefix = [];
+	const rest = [];
+	let reachedGlob = false;
+	for (const segment of segments) {
+		if (!reachedGlob && segment && !hasGlobMagic(segment)) {
+			prefix.push(segment);
+			continue;
+		}
+		reachedGlob = true;
+		rest.push(segment);
+	}
+	return {
+		prefix,
+		rest
+	};
+}
+async function pathExistsAsDirectory(file) {
+	try {
+		return (await stat(file)).isDirectory();
+	} catch {
+		return false;
+	}
+}
+function createTailwindV4DefaultIgnoreSources(base) {
+	return [
+		...TAILWIND_V4_IGNORED_CONTENT_DIRS.map((pattern) => ({
+			base,
+			pattern: `**/${pattern}/**`,
+			negated: true
+		})),
+		...TAILWIND_V4_IGNORED_EXTENSIONS.map((extension) => ({
+			base,
+			pattern: `**/*.${extension}`,
+			negated: true
+		})),
+		...TAILWIND_V4_IGNORED_FILES.map((pattern) => ({
+			base,
+			pattern: `**/${pattern}`,
+			negated: true
+		}))
+	];
+}
 function createTailwindV4RootSources(root, fallbackBase) {
 	if (root === "none") return [];
 	if (root === null) return [{
@@ -2058,6 +2162,34 @@ function createTailwindV4RootSources(root, fallbackBase) {
 function createTailwindV4CompiledSourceEntries(root, sources, fallbackBase) {
 	return [...createTailwindV4RootSources(root, fallbackBase), ...sources];
 }
+async function resolveTailwindV4SourceEntry(sourcePath, base, negated, defaultPattern = TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN) {
+	const absoluteSource = path.isAbsolute(sourcePath) ? path.resolve(sourcePath) : path.resolve(base, sourcePath);
+	if (await pathExistsAsDirectory(absoluteSource)) return {
+		base: absoluteSource,
+		negated,
+		pattern: normalizeGlobPattern(defaultPattern)
+	};
+	if (path.isAbsolute(sourcePath)) return {
+		base: path.dirname(absoluteSource),
+		negated,
+		pattern: normalizeGlobPattern(path.basename(absoluteSource))
+	};
+	const { prefix, rest } = splitStaticGlobPrefix(sourcePath);
+	if (prefix.length > 0 && rest.length > 0) return {
+		base: path.resolve(base, ...prefix),
+		negated,
+		pattern: normalizeGlobPattern(rest.join("/"))
+	};
+	return {
+		base,
+		negated,
+		pattern: normalizeGlobPattern(sourcePath)
+	};
+}
+async function normalizeTailwindV4SourceEntries(sources, options = {}) {
+	const cwd = options.cwd ? path.resolve(options.cwd) : process.cwd();
+	return Promise.all(sources.map((source) => resolveTailwindV4SourceEntry(source.pattern, source.base ? path.resolve(source.base) : cwd, source.negated, options.defaultPattern)));
+}
 function expandBracePattern(pattern) {
 	const index = pattern.indexOf("{");
 	if (index === -1) return [pattern];
@@ -2128,6 +2260,84 @@ function normalizeTailwindV4ScannerSources(sources, cwd, ignoredSources = []) {
 		negated: false
 	}], ...ignoredSources]);
 }
+function normalizeEntryPattern(entry) {
+	return path.isAbsolute(entry.pattern) ? toPosixPath(path.relative(resolveSourceScanPath(entry.base), entry.pattern)) : normalizeGlobPattern(entry.pattern);
+}
+function isFileMatchedByTailwindV4SourceEntry(file, entry) {
+	const relative = toPosixPath(path.relative(resolveSourceScanPath(entry.base), file));
+	return Boolean(relative) && !relative.startsWith("../") && !path.isAbsolute(relative) && micromatch.isMatch(relative, normalizeEntryPattern(entry));
+}
+function isFileExcludedByTailwindV4SourceEntries(file, entries) {
+	if (!entries?.length) return false;
+	const resolvedFile = resolveSourceScanPath(file);
+	return entries.some((entry) => entry.negated && isFileMatchedByTailwindV4SourceEntry(resolvedFile, entry));
+}
+function isFileMatchedByTailwindV4SourceEntries(file, entries) {
+	if (!entries?.length) return true;
+	const positiveEntries = entries.filter((entry) => !entry.negated);
+	const negativeEntries = entries.filter((entry) => entry.negated);
+	if (positiveEntries.length === 0) return false;
+	const resolvedFile = resolveSourceScanPath(file);
+	if (!positiveEntries.some((entry) => isFileMatchedByTailwindV4SourceEntry(resolvedFile, entry))) return false;
+	return !negativeEntries.some((entry) => isFileMatchedByTailwindV4SourceEntry(resolvedFile, entry));
+}
+function createTailwindV4SourceEntryMatcher(entries) {
+	if (!entries?.length) return;
+	return (file) => isFileMatchedByTailwindV4SourceEntries(file, entries);
+}
+function createTailwindV4SourceExclusionMatcher(entries) {
+	if (!entries?.length) return;
+	return (file) => isFileExcludedByTailwindV4SourceEntries(file, entries);
+}
+function groupTailwindV4SourceEntriesByBase(entries) {
+	const entriesByBase = /* @__PURE__ */ new Map();
+	for (const entry of entries) {
+		const base = path.resolve(entry.base);
+		const group = entriesByBase.get(base) ?? [];
+		group.push({
+			...entry,
+			base,
+			pattern: normalizeGlobPattern(entry.pattern)
+		});
+		entriesByBase.set(base, group);
+	}
+	return entriesByBase;
+}
+async function expandTailwindV4SourceEntries(entries, resolveFiles) {
+	if (entries.length === 0) return [];
+	const files = /* @__PURE__ */ new Set();
+	await Promise.all([...groupTailwindV4SourceEntriesByBase(entries).entries()].map(async ([base, group]) => {
+		const matched = await resolveFiles({
+			cwd: base,
+			sources: group
+		});
+		for (const file of matched) files.add(path.resolve(file));
+	}));
+	return [...files].filter((file) => !isFileExcludedByTailwindV4SourceEntries(file, entries));
+}
+function mergeTailwindV4SourceEntries(...entries) {
+	const result = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const group of entries) for (const entry of group ?? []) {
+		const normalized = {
+			base: path.resolve(entry.base),
+			pattern: normalizeGlobPattern(entry.pattern),
+			negated: entry.negated
+		};
+		const key = JSON.stringify(normalized);
+		if (seen.has(key)) continue;
+		seen.add(key);
+		result.push(normalized);
+	}
+	return result;
+}
+function resolveTailwindV4SourceBaseCandidates(projectRoot, base, baseFallbacks) {
+	return uniqueResolvedPaths([
+		base,
+		projectRoot,
+		...baseFallbacks
+	]);
+}
 //#endregion
 //#region src/extraction/candidate-extractor.ts
 let oxideImportPromise;
@@ -3600,6 +3810,78 @@ 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;
@@ -4146,76 +4428,4 @@ 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
-export { resolveValidTailwindV4Candidates as A, resolveProjectSourceFiles as C, canonicalizeBareArbitraryValueCandidates as D, loadTailwindV4DesignSystem as E, logger as F, loadWorkspaceConfigModule as M, normalizeOptions as N, extractTailwindV4InlineSourceCandidates as O, CacheStore as P, groupTokensByFile as S, compileTailwindV4Source as T, extractRawCandidates as _, tailwindcssPatchCommands as a, extractSourceCandidatesWithPositions as b, MIGRATION_REPORT_KIND as c, getPatchStatusReport as d, runTailwindBuild as f, extractProjectCandidatesWithPositions as g, collectClassesFromTailwindV4 as h, classifyValidateError as i, loadPatchOptionsForWorkspace as j, replaceBareArbitraryValueSelectors as k, MIGRATION_REPORT_SCHEMA_VERSION as l, collectClassesFromContexts as m, VALIDATE_FAILURE_REASONS as n, migrateConfigFiles as o, loadRuntimeContexts as p, ValidateCommandError as r, restoreConfigFiles as s, VALIDATE_EXIT_CODES as t, TailwindcssPatcher as u, extractRawCandidatesWithPositions as v, createTailwindV4CompiledSourceEntries as w, extractValidCandidates as x, extractSourceCandidates as y };
+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 };

package/dist/{validate-DFiRmBtJ.d.ts → validate-CaJv2g5K.d.ts}

@@ -791,4 +791,4 @@ declare class ValidateCommandError extends Error {
   constructor(summary: ValidateFailureSummary, options?: ErrorOptions);
 }
 //#endregion
-export { TailwindV4GenerateOptions as $, extractSourceCandidatesWithPositions as A, ExtendLengthUnitsOptions as B, MIGRATION_REPORT_SCHEMA_VERSION as C, CacheReadResult as Ct, extractRawCandidates as D, extractProjectCandidatesWithPositions as E, normalizeOptions as F, TailwindCssPatchOptions as G, NormalizedCacheOptions as H, ApplyOptions as I, TailwindV4Options as J, TailwindV2Options as K, CacheOptions as L, groupTokensByFile as M, resolveProjectSourceFiles as N, extractRawCandidatesWithPositions as O, BareArbitraryValueOptions as P, TailwindV4Engine as Q, CacheStrategy as R, MIGRATION_REPORT_KIND as S, CacheReadMeta as St, TailwindcssPatcher as T, NormalizedTailwindCssPatchOptions as U, ExtractOptions as V, TailwindCssOptions as W, TailwindV4CssSource as X, TailwindV4CandidateSource as Y, TailwindV4DesignSystem as Z, ConfigFileMigrationEntry as _, CacheClearResult as _t, ValidateFailureSummary as a, PatchCheckStatus as at, RestoreConfigFilesOptions as b, CacheContextMetadata as bt, TailwindcssPatchCliMountOptions as c, PatchStatusReport as ct, TailwindcssPatchCommandContext as d, TailwindTokenFileKey as dt, TailwindV4GenerateResult as et, TailwindcssPatchCommandHandler as f, TailwindTokenLocation as ft, tailwindcssPatchCommands as g, CacheClearOptions as gt, TailwindcssPatchCommandOptions as h, TailwindcssRuntimeContext as ht, ValidateFailureReason as i, ILengthUnitsPatchOptions as it, extractValidCandidates as j, extractSourceCandidates as k, TailwindcssPatchCliOptions as l, TailwindPatchRuntime as lt, TailwindcssPatchCommandOptionDefinition as m, TailwindcssClassCache as mt, VALIDATE_FAILURE_REASONS as n, TailwindV4SourceOptions as nt, ValidateJsonFailurePayload as o, PatchName as ot, TailwindcssPatchCommandHandlerMap as p, TailwindTokenReport as pt, TailwindV3Options as q, ValidateCommandError as r, ExtractResult as rt, ValidateJsonSuccessPayload as s, PatchStatusEntry as st, VALIDATE_EXIT_CODES as t, TailwindV4ResolvedSource as tt, TailwindcssPatchCommand as u, TailwindTokenByFileMap as ut, ConfigFileMigrationReport as v, CacheClearScope as vt, logger as w, RestoreConfigFilesResult as x, CacheIndexFileV2 as xt, MigrateConfigFilesOptions as y, CacheContextDescriptor as yt, ExposeContextOptions as z };
+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 };

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

@@ -790,4 +790,4 @@ declare class ValidateCommandError extends Error {
   constructor(summary: ValidateFailureSummary, options?: ErrorOptions);
 }
 //#endregion
-export { TailwindV4GenerateOptions as $, extractSourceCandidatesWithPositions as A, ExtendLengthUnitsOptions as B, MIGRATION_REPORT_SCHEMA_VERSION as C, CacheReadResult as Ct, extractRawCandidates as D, extractProjectCandidatesWithPositions as E, normalizeOptions as F, TailwindCssPatchOptions as G, NormalizedCacheOptions as H, ApplyOptions as I, TailwindV4Options as J, TailwindV2Options as K, CacheOptions as L, groupTokensByFile as M, resolveProjectSourceFiles as N, extractRawCandidatesWithPositions as O, BareArbitraryValueOptions as P, TailwindV4Engine as Q, CacheStrategy as R, MIGRATION_REPORT_KIND as S, CacheReadMeta as St, TailwindcssPatcher as T, NormalizedTailwindCssPatchOptions as U, ExtractOptions as V, TailwindCssOptions as W, TailwindV4CssSource as X, TailwindV4CandidateSource as Y, TailwindV4DesignSystem as Z, ConfigFileMigrationEntry as _, CacheClearResult as _t, ValidateFailureSummary as a, PatchCheckStatus as at, RestoreConfigFilesOptions as b, CacheContextMetadata as bt, TailwindcssPatchCliMountOptions as c, PatchStatusReport as ct, TailwindcssPatchCommandContext as d, TailwindTokenFileKey as dt, TailwindV4GenerateResult as et, TailwindcssPatchCommandHandler as f, TailwindTokenLocation as ft, tailwindcssPatchCommands as g, CacheClearOptions as gt, TailwindcssPatchCommandOptions as h, TailwindcssRuntimeContext as ht, ValidateFailureReason as i, ILengthUnitsPatchOptions as it, extractValidCandidates as j, extractSourceCandidates as k, TailwindcssPatchCliOptions as l, TailwindPatchRuntime as lt, TailwindcssPatchCommandOptionDefinition as m, TailwindcssClassCache as mt, VALIDATE_FAILURE_REASONS as n, TailwindV4SourceOptions as nt, ValidateJsonFailurePayload as o, PatchName as ot, TailwindcssPatchCommandHandlerMap as p, TailwindTokenReport as pt, TailwindV3Options as q, ValidateCommandError as r, ExtractResult as rt, ValidateJsonSuccessPayload as s, PatchStatusEntry as st, VALIDATE_EXIT_CODES as t, TailwindV4ResolvedSource as tt, TailwindcssPatchCommand as u, TailwindTokenByFileMap as ut, ConfigFileMigrationReport as v, CacheClearScope as vt, logger as w, RestoreConfigFilesResult as x, CacheIndexFileV2 as xt, MigrateConfigFilesOptions as y, CacheContextDescriptor as yt, ExposeContextOptions as z };
+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 };

package/package.json

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

package/src/extraction/split-candidate-tokens.ts

@@ -0,0 +1,101 @@
+// 参考链接：https://github.com/tailwindlabs/tailwindcss/blob/master/src/lib/regex.js
+// eslint-disable-next-line regexp/no-obscure-range
+export const validateCandidateTokenRE = /[\w\u00A0-\uFFFF%-?]/
+
+export function isValidCandidateToken(token = ''): token is string {
+  return validateCandidateTokenRE.test(token)
+}
+
+const SPLIT_CACHE_LIMIT = 8192
+const ESCAPED_WHITESPACE_RE = /\\[nrt]/g
+const splitCache = new Map<string, string[]>()
+
+function isSplitter(char: string, bracketDepth: number) {
+  return bracketDepth === 0 && (char === '"' || /\s/.test(char))
+}
+
+function hasClosingQuotedArbitraryValue(code: string, start: number, quote: string) {
+  for (let index = start; index < code.length; index++) {
+    if (code[index] === '\\') {
+      index++
+      continue
+    }
+    if (code[index] === quote) {
+      return code.includes(']', index + 1)
+    }
+  }
+
+  return false
+}
+
+function splitBracketAware(code: string) {
+  const result: string[] = []
+  let bracketDepth = 0
+  let bracketQuote: string | undefined
+  let start = 0
+
+  for (let index = 0; index < code.length; index++) {
+    const char = code[index]
+    if (char === undefined) {
+      continue
+    }
+    if (bracketDepth > 0 && char === '\\') {
+      index++
+      continue
+    }
+
+    if (bracketDepth > 0 && (char === '"' || char === '\'')) {
+      if (bracketQuote === char) {
+        bracketQuote = undefined
+      }
+      else if (bracketQuote === undefined && hasClosingQuotedArbitraryValue(code, index + 1, char)) {
+        bracketQuote = char
+      }
+    }
+
+    if (bracketQuote === undefined) {
+      if (char === '[' && code.includes(']', index + 1)) {
+        bracketDepth++
+      }
+      else if (char === ']' && bracketDepth > 0) {
+        bracketDepth--
+      }
+    }
+
+    if (!isSplitter(char, bracketDepth)) {
+      continue
+    }
+
+    const candidate = code.slice(start, index)
+    if (isValidCandidateToken(candidate)) {
+      result.push(candidate)
+    }
+    start = index + 1
+  }
+
+  const candidate = code.slice(start)
+  if (isValidCandidateToken(candidate)) {
+    result.push(candidate)
+  }
+
+  return result
+}
+
+export function splitCandidateTokens(code: string) {
+  const cached = splitCache.get(code)
+  if (cached) {
+    return cached
+  }
+
+  // 把压缩产物中的转义空白字符(\n \r \t)先还原成空格，避免被粘连到类名上。
+  const normalized = code.includes('\\') ? code.replace(ESCAPED_WHITESPACE_RE, ' ') : code
+  const result = splitBracketAware(normalized)
+
+  // 防止缓存无限增长。
+  if (splitCache.size >= SPLIT_CACHE_LIMIT) {
+    splitCache.clear()
+  }
+  splitCache.set(code, result)
+
+  return result
+}

package/src/index.bundle.ts

@@ -1,48 +1,7 @@
-import type { TailwindcssMangleConfig } from '@tailwindcss-mangle/config'
 import type { CAC } from 'cac'
 import type { TailwindcssPatchCliMountOptions, TailwindcssPatchCliOptions } from './commands/types'
 
 import { createRequire } from 'node:module'
-import { TailwindcssPatcher } from './api/tailwindcss-patcher'
-import { CacheStore } from './cache/store'
-import {
-  migrateConfigFiles,
-  MIGRATION_REPORT_KIND,
-  MIGRATION_REPORT_SCHEMA_VERSION,
-  restoreConfigFiles,
-} from './commands/migrate-config'
-import { tailwindcssPatchCommands } from './commands/types'
-import {
-  VALIDATE_EXIT_CODES,
-  VALIDATE_FAILURE_REASONS,
-  ValidateCommandError,
-} from './commands/validate'
-import { normalizeOptions } from './config'
-import {
-  extractProjectCandidatesWithPositions,
-  extractRawCandidates,
-  extractRawCandidatesWithPositions,
-  extractSourceCandidates,
-  extractSourceCandidatesWithPositions,
-  extractValidCandidates,
-  groupTokensByFile,
-  resolveProjectSourceFiles,
-} from './extraction/candidate-extractor'
-import {
-  collectClassesFromContexts,
-  collectClassesFromTailwindV4,
-  getPatchStatusReport,
-  loadRuntimeContexts,
-  runTailwindBuild,
-} from './install'
-import logger from './logger'
-import {
-  createTailwindV4Engine,
-  loadTailwindV4DesignSystem,
-  resolveTailwindV4Source,
-  resolveTailwindV4SourceFromPatchOptions,
-  resolveValidTailwindV4Candidates,
-} from './v4'
 
 const require = createRequire(import.meta.url)
 
@@ -52,73 +11,7 @@ function loadCliModule(): CliModule {
   return require('./commands/cli-runtime.js') as CliModule
 }
 
-export {
-  CacheStore,
-  collectClassesFromContexts,
-  collectClassesFromTailwindV4,
-  createTailwindV4Engine,
-  extractProjectCandidatesWithPositions,
-  extractRawCandidates,
-  extractRawCandidatesWithPositions,
-  extractSourceCandidates,
-  extractSourceCandidatesWithPositions,
-  extractValidCandidates,
-  getPatchStatusReport,
-  groupTokensByFile,
-  loadRuntimeContexts,
-  loadTailwindV4DesignSystem,
-  logger,
-  migrateConfigFiles,
-  MIGRATION_REPORT_KIND,
-  MIGRATION_REPORT_SCHEMA_VERSION,
-  normalizeOptions,
-  resolveTailwindV4Source,
-  resolveTailwindV4SourceFromPatchOptions,
-  resolveProjectSourceFiles,
-  resolveValidTailwindV4Candidates,
-  restoreConfigFiles,
-  runTailwindBuild,
-  tailwindcssPatchCommands,
-  TailwindcssPatcher,
-  VALIDATE_EXIT_CODES,
-  VALIDATE_FAILURE_REASONS,
-  ValidateCommandError,
-}
-export type {
-  ConfigFileMigrationEntry,
-  ConfigFileMigrationReport,
-  MigrateConfigFilesOptions,
-  RestoreConfigFilesOptions,
-  RestoreConfigFilesResult,
-} from './commands/migrate-config'
-export type {
-  TailwindcssPatchCliMountOptions,
-  TailwindcssPatchCliOptions,
-  TailwindcssPatchCommand,
-  TailwindcssPatchCommandContext,
-  TailwindcssPatchCommandHandler,
-  TailwindcssPatchCommandHandlerMap,
-  TailwindcssPatchCommandOptionDefinition,
-  TailwindcssPatchCommandOptions,
-} from './commands/types'
-export type {
-  ValidateFailureReason,
-  ValidateFailureSummary,
-  ValidateJsonFailurePayload,
-  ValidateJsonSuccessPayload,
-} from './commands/validate'
-export type { TailwindCssPatchOptions } from './config'
-export * from './types'
-export type {
-  TailwindV4CandidateSource,
-  TailwindV4CssSource,
-  TailwindV4DesignSystem,
-  TailwindV4Engine,
-  TailwindV4GenerateOptions,
-  TailwindV4GenerateResult,
-  TailwindV4ResolvedSource,
-  TailwindV4SourceOptions,
-} from './v4'
+export * from './public-api'
 
 export function mountTailwindcssPatchCommands(cli: CAC, options: TailwindcssPatchCliMountOptions = {}) {
   return loadCliModule().mountTailwindcssPatchCommands(cli, options)
@@ -127,7 +20,3 @@ export function mountTailwindcssPatchCommands(cli: CAC, options: TailwindcssPatc
 export function createTailwindcssPatchCli(options: TailwindcssPatchCliOptions = {}) {
   return loadCliModule().createTailwindcssPatchCli(options)
 }
-
-export function defineConfig<T extends TailwindcssMangleConfig>(config: T): T {
-  return config
-}