tailwindcss-patch 9.3.4 → 9.3.6

package/dist/cli.js

@@ -1,6 +1,6 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_validate = require("./validate-DmELQoI2.js");
-const require_index_bundle = require("./index.bundle-BIcthh-J.js");
+const require_validate = require("./validate-CLTQnfBI.js");
+const require_index_bundle = require("./index.bundle-BF-qTWsU.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 { N as logger, r as ValidateCommandError } from "./validate-BoTQvn7s.mjs";
-import { t as createTailwindcssPatchCli } from "./index.bundle-BU7uUzRH.mjs";
+import { P as logger, r as ValidateCommandError } from "./validate-BF0OladD.mjs";
+import { t as createTailwindcssPatchCli } from "./index.bundle-BR8XOc2F.mjs";
 import process from "node:process";
 //#region src/cli.bundle.ts
 async function main() {

package/dist/commands/cli-runtime.d.mts

@@ -1,4 +1,4 @@
-import { a as ValidateFailureSummary, c as TailwindcssPatchCliMountOptions, d as TailwindcssPatchCommandContext, f as TailwindcssPatchCommandHandler, g as tailwindcssPatchCommands, h as TailwindcssPatchCommandOptions, i as ValidateFailureReason, l as TailwindcssPatchCliOptions, m as TailwindcssPatchCommandOptionDefinition, n as VALIDATE_FAILURE_REASONS, o as ValidateJsonFailurePayload, p as TailwindcssPatchCommandHandlerMap, r as ValidateCommandError, s as ValidateJsonSuccessPayload, t as VALIDATE_EXIT_CODES, u as TailwindcssPatchCommand } from "../validate-Bd5gnHL1.mjs";
+import { a as ValidateFailureSummary, c as TailwindcssPatchCliMountOptions, d as TailwindcssPatchCommandContext, f as TailwindcssPatchCommandHandler, g as tailwindcssPatchCommands, h as TailwindcssPatchCommandOptions, i as ValidateFailureReason, l as TailwindcssPatchCliOptions, m as TailwindcssPatchCommandOptionDefinition, n as VALIDATE_FAILURE_REASONS, o as ValidateJsonFailurePayload, p as TailwindcssPatchCommandHandlerMap, r as ValidateCommandError, s as ValidateJsonSuccessPayload, t as VALIDATE_EXIT_CODES, u as TailwindcssPatchCommand } from "../validate-DoeOD2Su.mjs";
 import { CAC } from "cac";
 
 //#region src/commands/cli.d.ts

package/dist/commands/cli-runtime.d.ts

@@ -1,4 +1,4 @@
-import { a as ValidateFailureSummary, c as TailwindcssPatchCliMountOptions, d as TailwindcssPatchCommandContext, f as TailwindcssPatchCommandHandler, g as tailwindcssPatchCommands, h as TailwindcssPatchCommandOptions, i as ValidateFailureReason, l as TailwindcssPatchCliOptions, m as TailwindcssPatchCommandOptionDefinition, n as VALIDATE_FAILURE_REASONS, o as ValidateJsonFailurePayload, p as TailwindcssPatchCommandHandlerMap, r as ValidateCommandError, s as ValidateJsonSuccessPayload, t as VALIDATE_EXIT_CODES, u as TailwindcssPatchCommand } from "../validate-ZwyABmFW.js";
+import { a as ValidateFailureSummary, c as TailwindcssPatchCliMountOptions, d as TailwindcssPatchCommandContext, f as TailwindcssPatchCommandHandler, g as tailwindcssPatchCommands, h as TailwindcssPatchCommandOptions, i as ValidateFailureReason, l as TailwindcssPatchCliOptions, m as TailwindcssPatchCommandOptionDefinition, n as VALIDATE_FAILURE_REASONS, o as ValidateJsonFailurePayload, p as TailwindcssPatchCommandHandlerMap, r as ValidateCommandError, s as ValidateJsonSuccessPayload, t as VALIDATE_EXIT_CODES, u as TailwindcssPatchCommand } from "../validate-eCzgDdk_.js";
 import { CAC } from "cac";
 
 //#region src/commands/cli.d.ts

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-DmELQoI2.js");
+const require_validate = require("../validate-CLTQnfBI.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 { A as loadWorkspaceConfigModule, N as logger, S as groupTokensByFile, a as tailwindcssPatchCommands, i as classifyValidateError, k as loadPatchOptionsForWorkspace, n as VALIDATE_FAILURE_REASONS, o as migrateConfigFiles, r as ValidateCommandError, s as restoreConfigFiles, t as VALIDATE_EXIT_CODES, u as TailwindcssPatcher } from "../validate-BoTQvn7s.mjs";
+import { A as loadPatchOptionsForWorkspace, P as logger, S as groupTokensByFile, a as tailwindcssPatchCommands, i as classifyValidateError, j as loadWorkspaceConfigModule, n as VALIDATE_FAILURE_REASONS, o as migrateConfigFiles, r as ValidateCommandError, s as restoreConfigFiles, t as VALIDATE_EXIT_CODES, u as TailwindcssPatcher } from "../validate-BF0OladD.mjs";
 import process from "node:process";
 import fs from "fs-extra";
 import path from "pathe";

package/dist/{index.bundle-BIcthh-J.js → index.bundle-BF-qTWsU.js}

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_validate = require("./validate-DmELQoI2.js");
+const require_validate = require("./validate-CLTQnfBI.js");
 let node_module = require("node:module");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
@@ -7,19 +7,30 @@ let pathe = require("pathe");
 pathe = require_chunk.__toESM(pathe);
 let node_fs = require("node:fs");
 //#region src/v4/engine.ts
-function resolveScanSources(options, compiledSources) {
+function resolveScanSources(options, source, compiledRoot, compiledSources) {
 	if (Array.isArray(options?.scanSources)) return options.scanSources;
-	if (options?.scanSources === true) return compiledSources;
+	if (options?.scanSources === true) return [...(() => {
+		if (compiledRoot === "none") return [];
+		if (compiledRoot === null) return [{
+			base: source.base,
+			pattern: "**/*",
+			negated: false
+		}];
+		return [{
+			...compiledRoot,
+			negated: false
+		}];
+	})(), ...compiledSources];
 	return [];
 }
-async function collectRawCandidates(source, options, compiledSources = []) {
+async function collectRawCandidates(source, options, compiledRoot, compiledSources = []) {
 	const rawCandidates = /* @__PURE__ */ new Set();
 	for (const candidate of options?.candidates ?? []) rawCandidates.add(candidate);
 	for (const candidateSource of options?.sources ?? []) {
 		const candidates = await require_validate.extractRawCandidatesWithPositions(candidateSource.content, candidateSource.extension);
 		for (const candidate of candidates) rawCandidates.add(candidate.rawCandidate);
 	}
-	const filesystemSources = resolveScanSources(options, compiledSources);
+	const filesystemSources = resolveScanSources(options, source, compiledRoot, compiledSources);
 	if (filesystemSources.length > 0) for (const candidate of await require_validate.extractRawCandidates(filesystemSources)) rawCandidates.add(candidate);
 	const inlineSources = require_validate.extractTailwindV4InlineSourceCandidates(source.css);
 	for (const candidate of inlineSources.included) rawCandidates.add(candidate);
@@ -37,7 +48,7 @@ function createTailwindV4Engine(source) {
 		},
 		async generate(options) {
 			const { compiled, dependencies } = await require_validate.compileTailwindV4Source(source);
-			const rawCandidates = await collectRawCandidates(source, options, compiled.sources);
+			const rawCandidates = await collectRawCandidates(source, options, compiled.root, compiled.sources);
 			const classSet = require_validate.resolveValidTailwindV4Candidates(await require_validate.loadTailwindV4DesignSystem(source), rawCandidates, { ...options?.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: options.bareArbitraryValues } });
 			const inlineSources = require_validate.extractTailwindV4InlineSourceCandidates(source.css);
 			for (const candidate of inlineSources.excluded) classSet.delete(candidate);

package/dist/{index.bundle-BU7uUzRH.mjs → index.bundle-BR8XOc2F.mjs}

@@ -1,22 +1,33 @@
-import { C as compileTailwindV4Source, D as replaceBareArbitraryValueSelectors, E as extractTailwindV4InlineSourceCandidates, O as resolveValidTailwindV4Candidates, T as canonicalizeBareArbitraryValueCandidates, _ as extractRawCandidates, j as normalizeOptions, v as extractRawCandidatesWithPositions, w as loadTailwindV4DesignSystem } from "./validate-BoTQvn7s.mjs";
+import { D as extractTailwindV4InlineSourceCandidates, E as canonicalizeBareArbitraryValueCandidates, M as normalizeOptions, O as replaceBareArbitraryValueSelectors, T as loadTailwindV4DesignSystem, _ as extractRawCandidates, k as resolveValidTailwindV4Candidates, v as extractRawCandidatesWithPositions, w as compileTailwindV4Source } from "./validate-BF0OladD.mjs";
 import { createRequire } from "node:module";
 import process from "node:process";
 import path from "pathe";
 import { promises } from "node:fs";
 //#region src/v4/engine.ts
-function resolveScanSources(options, compiledSources) {
+function resolveScanSources(options, source, compiledRoot, compiledSources) {
 	if (Array.isArray(options?.scanSources)) return options.scanSources;
-	if (options?.scanSources === true) return compiledSources;
+	if (options?.scanSources === true) return [...(() => {
+		if (compiledRoot === "none") return [];
+		if (compiledRoot === null) return [{
+			base: source.base,
+			pattern: "**/*",
+			negated: false
+		}];
+		return [{
+			...compiledRoot,
+			negated: false
+		}];
+	})(), ...compiledSources];
 	return [];
 }
-async function collectRawCandidates(source, options, compiledSources = []) {
+async function collectRawCandidates(source, options, compiledRoot, compiledSources = []) {
 	const rawCandidates = /* @__PURE__ */ new Set();
 	for (const candidate of options?.candidates ?? []) rawCandidates.add(candidate);
 	for (const candidateSource of options?.sources ?? []) {
 		const candidates = await extractRawCandidatesWithPositions(candidateSource.content, candidateSource.extension);
 		for (const candidate of candidates) rawCandidates.add(candidate.rawCandidate);
 	}
-	const filesystemSources = resolveScanSources(options, compiledSources);
+	const filesystemSources = resolveScanSources(options, source, compiledRoot, compiledSources);
 	if (filesystemSources.length > 0) for (const candidate of await extractRawCandidates(filesystemSources)) rawCandidates.add(candidate);
 	const inlineSources = extractTailwindV4InlineSourceCandidates(source.css);
 	for (const candidate of inlineSources.included) rawCandidates.add(candidate);
@@ -34,7 +45,7 @@ function createTailwindV4Engine(source) {
 		},
 		async generate(options) {
 			const { compiled, dependencies } = await compileTailwindV4Source(source);
-			const rawCandidates = await collectRawCandidates(source, options, compiled.sources);
+			const rawCandidates = await collectRawCandidates(source, options, compiled.root, compiled.sources);
 			const classSet = resolveValidTailwindV4Candidates(await loadTailwindV4DesignSystem(source), rawCandidates, { ...options?.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: options.bareArbitraryValues } });
 			const inlineSources = extractTailwindV4InlineSourceCandidates(source.css);
 			for (const candidate of inlineSources.excluded) classSet.delete(candidate);

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { $ as TailwindV4GenerateResult, A as extractSourceCandidatesWithPositions, B as ExtractOptions, C as MIGRATION_REPORT_SCHEMA_VERSION, D as extractRawCandidates, E as extractProjectCandidatesWithPositions, F as ApplyOptions, G as TailwindV2Options, H as NormalizedTailwindCssPatchOptions, I as CacheOptions, J as TailwindV4CandidateSource, K as TailwindV3Options, L as CacheStrategy, M as groupTokensByFile, N as BareArbitraryValueOptions, O as extractRawCandidatesWithPositions, P as normalizeOptions, Q as TailwindV4GenerateOptions, R as ExposeContextOptions, S as MIGRATION_REPORT_KIND, St as CacheReadResult, T as TailwindcssPatcher, U as TailwindCssOptions, V as NormalizedCacheOptions, W as TailwindCssPatchOptions, X as TailwindV4DesignSystem, Y as TailwindV4CssSource, Z as TailwindV4Engine, _ as ConfigFileMigrationEntry, _t as CacheClearScope, a as ValidateFailureSummary, at as PatchName, b as RestoreConfigFilesOptions, bt as CacheIndexFileV2, c as TailwindcssPatchCliMountOptions, ct as TailwindPatchRuntime, d as TailwindcssPatchCommandContext, dt as TailwindTokenLocation, et as TailwindV4ResolvedSource, f as TailwindcssPatchCommandHandler, ft as TailwindTokenReport, g as tailwindcssPatchCommands, gt as CacheClearResult, h as TailwindcssPatchCommandOptions, ht as CacheClearOptions, i as ValidateFailureReason, it as PatchCheckStatus, j as extractValidCandidates, k as extractSourceCandidates, l as TailwindcssPatchCliOptions, lt as TailwindTokenByFileMap, m as TailwindcssPatchCommandOptionDefinition, mt as TailwindcssRuntimeContext, n as VALIDATE_FAILURE_REASONS, nt as ExtractResult, o as ValidateJsonFailurePayload, ot as PatchStatusEntry, p as TailwindcssPatchCommandHandlerMap, pt as TailwindcssClassCache, q as TailwindV4Options, r as ValidateCommandError, rt as ILengthUnitsPatchOptions, s as ValidateJsonSuccessPayload, st as PatchStatusReport, t as VALIDATE_EXIT_CODES, tt as TailwindV4SourceOptions, u as TailwindcssPatchCommand, ut as TailwindTokenFileKey, v as ConfigFileMigrationReport, vt as CacheContextDescriptor, w as logger, x as RestoreConfigFilesResult, xt as CacheReadMeta, y as MigrateConfigFilesOptions, yt as CacheContextMetadata, z as ExtendLengthUnitsOptions } from "./validate-Bd5gnHL1.mjs";
+import { $ as TailwindV4GenerateOptions, A as extractSourceCandidatesWithPositions, B as ExtendLengthUnitsOptions, C as MIGRATION_REPORT_SCHEMA_VERSION, Ct as CacheReadResult, D as extractRawCandidates, E as extractProjectCandidatesWithPositions, F as normalizeOptions, G as TailwindCssPatchOptions, H as NormalizedCacheOptions, I as ApplyOptions, J as TailwindV4Options, K as TailwindV2Options, L as CacheOptions, M as groupTokensByFile, N as resolveProjectSourceFiles, O as extractRawCandidatesWithPositions, P as BareArbitraryValueOptions, Q as TailwindV4Engine, R as CacheStrategy, S as MIGRATION_REPORT_KIND, St as CacheReadMeta, T as TailwindcssPatcher, U as NormalizedTailwindCssPatchOptions, V as ExtractOptions, W as TailwindCssOptions, X as TailwindV4CssSource, Y as TailwindV4CandidateSource, Z as TailwindV4DesignSystem, _ as ConfigFileMigrationEntry, _t as CacheClearResult, a as ValidateFailureSummary, at as PatchCheckStatus, b as RestoreConfigFilesOptions, bt as CacheContextMetadata, c as TailwindcssPatchCliMountOptions, ct as PatchStatusReport, d as TailwindcssPatchCommandContext, dt as TailwindTokenFileKey, et as TailwindV4GenerateResult, f as TailwindcssPatchCommandHandler, ft as TailwindTokenLocation, g as tailwindcssPatchCommands, gt as CacheClearOptions, h as TailwindcssPatchCommandOptions, ht as TailwindcssRuntimeContext, i as ValidateFailureReason, it as ILengthUnitsPatchOptions, j as extractValidCandidates, k as extractSourceCandidates, l as TailwindcssPatchCliOptions, lt as TailwindPatchRuntime, m as TailwindcssPatchCommandOptionDefinition, mt as TailwindcssClassCache, n as VALIDATE_FAILURE_REASONS, nt as TailwindV4SourceOptions, o as ValidateJsonFailurePayload, ot as PatchName, p as TailwindcssPatchCommandHandlerMap, pt as TailwindTokenReport, q as TailwindV3Options, r as ValidateCommandError, rt as ExtractResult, s as ValidateJsonSuccessPayload, st as PatchStatusEntry, t as VALIDATE_EXIT_CODES, tt as TailwindV4ResolvedSource, u as TailwindcssPatchCommand, ut as TailwindTokenByFileMap, v as ConfigFileMigrationReport, vt as CacheClearScope, w as logger, x as RestoreConfigFilesResult, xt as CacheIndexFileV2, y as MigrateConfigFilesOptions, yt as CacheContextDescriptor, z as ExposeContextOptions } from "./validate-DoeOD2Su.mjs";
 import { PackageInfo } from "local-pkg";
 import postcss from "postcss";
 import { CAC } from "cac";
@@ -97,4 +97,4 @@ declare function mountTailwindcssPatchCommands(cli: CAC, options?: TailwindcssPa
 declare function createTailwindcssPatchCli(options?: TailwindcssPatchCliOptions): CAC;
 declare function defineConfig<T extends TailwindcssMangleConfig>(config: T): T;
 //#endregion
-export { ApplyOptions, CacheClearOptions, CacheClearResult, CacheClearScope, CacheContextMetadata, CacheOptions, CacheReadMeta, CacheStore, CacheStrategy, type ConfigFileMigrationEntry, type ConfigFileMigrationReport, ExposeContextOptions, ExtendLengthUnitsOptions, ExtractOptions, ExtractResult, ILengthUnitsPatchOptions, MIGRATION_REPORT_KIND, MIGRATION_REPORT_SCHEMA_VERSION, type MigrateConfigFilesOptions, NormalizedTailwindCssPatchOptions, PatchCheckStatus, PatchName, PatchStatusEntry, PatchStatusReport, type RestoreConfigFilesOptions, type RestoreConfigFilesResult, TailwindCssOptions, type TailwindCssPatchOptions, TailwindPatchRuntime, TailwindTokenByFileMap, TailwindTokenFileKey, TailwindTokenLocation, TailwindTokenReport, TailwindV2Options, TailwindV3Options, type TailwindV4CandidateSource, type TailwindV4CssSource, type TailwindV4DesignSystem, type TailwindV4Engine, type TailwindV4GenerateOptions, type TailwindV4GenerateResult, TailwindV4Options, type TailwindV4ResolvedSource, type TailwindV4SourceOptions, TailwindcssClassCache, type TailwindcssPatchCliMountOptions, type TailwindcssPatchCliOptions, type TailwindcssPatchCommand, type TailwindcssPatchCommandContext, type TailwindcssPatchCommandHandler, type TailwindcssPatchCommandHandlerMap, type TailwindcssPatchCommandOptionDefinition, type TailwindcssPatchCommandOptions, TailwindcssPatcher, TailwindcssRuntimeContext, VALIDATE_EXIT_CODES, VALIDATE_FAILURE_REASONS, ValidateCommandError, type ValidateFailureReason, type ValidateFailureSummary, type ValidateJsonFailurePayload, type ValidateJsonSuccessPayload, collectClassesFromContexts, collectClassesFromTailwindV4, createTailwindV4Engine, createTailwindcssPatchCli, defineConfig, extractProjectCandidatesWithPositions, extractRawCandidates, extractRawCandidatesWithPositions, extractSourceCandidates, extractSourceCandidatesWithPositions, extractValidCandidates, getPatchStatusReport, groupTokensByFile, loadRuntimeContexts, loadTailwindV4DesignSystem, logger, migrateConfigFiles, mountTailwindcssPatchCommands, normalizeOptions, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions, resolveValidTailwindV4Candidates, restoreConfigFiles, runTailwindBuild, tailwindcssPatchCommands };
+export { ApplyOptions, CacheClearOptions, CacheClearResult, CacheClearScope, CacheContextMetadata, CacheOptions, CacheReadMeta, CacheStore, CacheStrategy, type ConfigFileMigrationEntry, type ConfigFileMigrationReport, ExposeContextOptions, ExtendLengthUnitsOptions, ExtractOptions, ExtractResult, ILengthUnitsPatchOptions, MIGRATION_REPORT_KIND, MIGRATION_REPORT_SCHEMA_VERSION, type MigrateConfigFilesOptions, NormalizedTailwindCssPatchOptions, PatchCheckStatus, PatchName, PatchStatusEntry, PatchStatusReport, type RestoreConfigFilesOptions, type RestoreConfigFilesResult, TailwindCssOptions, type TailwindCssPatchOptions, TailwindPatchRuntime, TailwindTokenByFileMap, TailwindTokenFileKey, TailwindTokenLocation, TailwindTokenReport, TailwindV2Options, TailwindV3Options, type TailwindV4CandidateSource, type TailwindV4CssSource, type TailwindV4DesignSystem, type TailwindV4Engine, type TailwindV4GenerateOptions, type TailwindV4GenerateResult, TailwindV4Options, type TailwindV4ResolvedSource, type TailwindV4SourceOptions, TailwindcssClassCache, type TailwindcssPatchCliMountOptions, type TailwindcssPatchCliOptions, type TailwindcssPatchCommand, type TailwindcssPatchCommandContext, type TailwindcssPatchCommandHandler, type TailwindcssPatchCommandHandlerMap, type TailwindcssPatchCommandOptionDefinition, type TailwindcssPatchCommandOptions, TailwindcssPatcher, TailwindcssRuntimeContext, VALIDATE_EXIT_CODES, VALIDATE_FAILURE_REASONS, ValidateCommandError, type ValidateFailureReason, type ValidateFailureSummary, type ValidateJsonFailurePayload, type ValidateJsonSuccessPayload, collectClassesFromContexts, collectClassesFromTailwindV4, createTailwindV4Engine, createTailwindcssPatchCli, defineConfig, extractProjectCandidatesWithPositions, extractRawCandidates, extractRawCandidatesWithPositions, extractSourceCandidates, extractSourceCandidatesWithPositions, extractValidCandidates, getPatchStatusReport, groupTokensByFile, loadRuntimeContexts, loadTailwindV4DesignSystem, logger, migrateConfigFiles, mountTailwindcssPatchCommands, normalizeOptions, resolveProjectSourceFiles, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions, resolveValidTailwindV4Candidates, restoreConfigFiles, runTailwindBuild, tailwindcssPatchCommands };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { $ as TailwindV4GenerateResult, A as extractSourceCandidatesWithPositions, B as ExtractOptions, C as MIGRATION_REPORT_SCHEMA_VERSION, D as extractRawCandidates, E as extractProjectCandidatesWithPositions, F as ApplyOptions, G as TailwindV2Options, H as NormalizedTailwindCssPatchOptions, I as CacheOptions, J as TailwindV4CandidateSource, K as TailwindV3Options, L as CacheStrategy, M as groupTokensByFile, N as BareArbitraryValueOptions, O as extractRawCandidatesWithPositions, P as normalizeOptions, Q as TailwindV4GenerateOptions, R as ExposeContextOptions, S as MIGRATION_REPORT_KIND, St as CacheReadResult, T as TailwindcssPatcher, U as TailwindCssOptions, V as NormalizedCacheOptions, W as TailwindCssPatchOptions, X as TailwindV4DesignSystem, Y as TailwindV4CssSource, Z as TailwindV4Engine, _ as ConfigFileMigrationEntry, _t as CacheClearScope, a as ValidateFailureSummary, at as PatchName, b as RestoreConfigFilesOptions, bt as CacheIndexFileV2, c as TailwindcssPatchCliMountOptions, ct as TailwindPatchRuntime, d as TailwindcssPatchCommandContext, dt as TailwindTokenLocation, et as TailwindV4ResolvedSource, f as TailwindcssPatchCommandHandler, ft as TailwindTokenReport, g as tailwindcssPatchCommands, gt as CacheClearResult, h as TailwindcssPatchCommandOptions, ht as CacheClearOptions, i as ValidateFailureReason, it as PatchCheckStatus, j as extractValidCandidates, k as extractSourceCandidates, l as TailwindcssPatchCliOptions, lt as TailwindTokenByFileMap, m as TailwindcssPatchCommandOptionDefinition, mt as TailwindcssRuntimeContext, n as VALIDATE_FAILURE_REASONS, nt as ExtractResult, o as ValidateJsonFailurePayload, ot as PatchStatusEntry, p as TailwindcssPatchCommandHandlerMap, pt as TailwindcssClassCache, q as TailwindV4Options, r as ValidateCommandError, rt as ILengthUnitsPatchOptions, s as ValidateJsonSuccessPayload, st as PatchStatusReport, t as VALIDATE_EXIT_CODES, tt as TailwindV4SourceOptions, u as TailwindcssPatchCommand, ut as TailwindTokenFileKey, v as ConfigFileMigrationReport, vt as CacheContextDescriptor, w as logger, x as RestoreConfigFilesResult, xt as CacheReadMeta, y as MigrateConfigFilesOptions, yt as CacheContextMetadata, z as ExtendLengthUnitsOptions } from "./validate-ZwyABmFW.js";
+import { $ as TailwindV4GenerateOptions, A as extractSourceCandidatesWithPositions, B as ExtendLengthUnitsOptions, C as MIGRATION_REPORT_SCHEMA_VERSION, Ct as CacheReadResult, D as extractRawCandidates, E as extractProjectCandidatesWithPositions, F as normalizeOptions, G as TailwindCssPatchOptions, H as NormalizedCacheOptions, I as ApplyOptions, J as TailwindV4Options, K as TailwindV2Options, L as CacheOptions, M as groupTokensByFile, N as resolveProjectSourceFiles, O as extractRawCandidatesWithPositions, P as BareArbitraryValueOptions, Q as TailwindV4Engine, R as CacheStrategy, S as MIGRATION_REPORT_KIND, St as CacheReadMeta, T as TailwindcssPatcher, U as NormalizedTailwindCssPatchOptions, V as ExtractOptions, W as TailwindCssOptions, X as TailwindV4CssSource, Y as TailwindV4CandidateSource, Z as TailwindV4DesignSystem, _ as ConfigFileMigrationEntry, _t as CacheClearResult, a as ValidateFailureSummary, at as PatchCheckStatus, b as RestoreConfigFilesOptions, bt as CacheContextMetadata, c as TailwindcssPatchCliMountOptions, ct as PatchStatusReport, d as TailwindcssPatchCommandContext, dt as TailwindTokenFileKey, et as TailwindV4GenerateResult, f as TailwindcssPatchCommandHandler, ft as TailwindTokenLocation, g as tailwindcssPatchCommands, gt as CacheClearOptions, h as TailwindcssPatchCommandOptions, ht as TailwindcssRuntimeContext, i as ValidateFailureReason, it as ILengthUnitsPatchOptions, j as extractValidCandidates, k as extractSourceCandidates, l as TailwindcssPatchCliOptions, lt as TailwindPatchRuntime, m as TailwindcssPatchCommandOptionDefinition, mt as TailwindcssClassCache, n as VALIDATE_FAILURE_REASONS, nt as TailwindV4SourceOptions, o as ValidateJsonFailurePayload, ot as PatchName, p as TailwindcssPatchCommandHandlerMap, pt as TailwindTokenReport, q as TailwindV3Options, r as ValidateCommandError, rt as ExtractResult, s as ValidateJsonSuccessPayload, st as PatchStatusEntry, t as VALIDATE_EXIT_CODES, tt as TailwindV4ResolvedSource, u as TailwindcssPatchCommand, ut as TailwindTokenByFileMap, v as ConfigFileMigrationReport, vt as CacheClearScope, w as logger, x as RestoreConfigFilesResult, xt as CacheIndexFileV2, y as MigrateConfigFilesOptions, yt as CacheContextDescriptor, z as ExposeContextOptions } from "./validate-eCzgDdk_.js";
 import { CAC } from "cac";
 import { PackageInfo } from "local-pkg";
 import postcss from "postcss";
@@ -97,4 +97,4 @@ declare function mountTailwindcssPatchCommands(cli: CAC, options?: TailwindcssPa
 declare function createTailwindcssPatchCli(options?: TailwindcssPatchCliOptions): CAC;
 declare function defineConfig<T extends TailwindcssMangleConfig>(config: T): T;
 //#endregion
-export { ApplyOptions, CacheClearOptions, CacheClearResult, CacheClearScope, CacheContextMetadata, CacheOptions, CacheReadMeta, CacheStore, CacheStrategy, type ConfigFileMigrationEntry, type ConfigFileMigrationReport, ExposeContextOptions, ExtendLengthUnitsOptions, ExtractOptions, ExtractResult, ILengthUnitsPatchOptions, MIGRATION_REPORT_KIND, MIGRATION_REPORT_SCHEMA_VERSION, type MigrateConfigFilesOptions, NormalizedTailwindCssPatchOptions, PatchCheckStatus, PatchName, PatchStatusEntry, PatchStatusReport, type RestoreConfigFilesOptions, type RestoreConfigFilesResult, TailwindCssOptions, type TailwindCssPatchOptions, TailwindPatchRuntime, TailwindTokenByFileMap, TailwindTokenFileKey, TailwindTokenLocation, TailwindTokenReport, TailwindV2Options, TailwindV3Options, type TailwindV4CandidateSource, type TailwindV4CssSource, type TailwindV4DesignSystem, type TailwindV4Engine, type TailwindV4GenerateOptions, type TailwindV4GenerateResult, TailwindV4Options, type TailwindV4ResolvedSource, type TailwindV4SourceOptions, TailwindcssClassCache, type TailwindcssPatchCliMountOptions, type TailwindcssPatchCliOptions, type TailwindcssPatchCommand, type TailwindcssPatchCommandContext, type TailwindcssPatchCommandHandler, type TailwindcssPatchCommandHandlerMap, type TailwindcssPatchCommandOptionDefinition, type TailwindcssPatchCommandOptions, TailwindcssPatcher, TailwindcssRuntimeContext, VALIDATE_EXIT_CODES, VALIDATE_FAILURE_REASONS, ValidateCommandError, type ValidateFailureReason, type ValidateFailureSummary, type ValidateJsonFailurePayload, type ValidateJsonSuccessPayload, collectClassesFromContexts, collectClassesFromTailwindV4, createTailwindV4Engine, createTailwindcssPatchCli, defineConfig, extractProjectCandidatesWithPositions, extractRawCandidates, extractRawCandidatesWithPositions, extractSourceCandidates, extractSourceCandidatesWithPositions, extractValidCandidates, getPatchStatusReport, groupTokensByFile, loadRuntimeContexts, loadTailwindV4DesignSystem, logger, migrateConfigFiles, mountTailwindcssPatchCommands, normalizeOptions, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions, resolveValidTailwindV4Candidates, restoreConfigFiles, runTailwindBuild, tailwindcssPatchCommands };
+export { ApplyOptions, CacheClearOptions, CacheClearResult, CacheClearScope, CacheContextMetadata, CacheOptions, CacheReadMeta, CacheStore, CacheStrategy, type ConfigFileMigrationEntry, type ConfigFileMigrationReport, ExposeContextOptions, ExtendLengthUnitsOptions, ExtractOptions, ExtractResult, ILengthUnitsPatchOptions, MIGRATION_REPORT_KIND, MIGRATION_REPORT_SCHEMA_VERSION, type MigrateConfigFilesOptions, NormalizedTailwindCssPatchOptions, PatchCheckStatus, PatchName, PatchStatusEntry, PatchStatusReport, type RestoreConfigFilesOptions, type RestoreConfigFilesResult, TailwindCssOptions, type TailwindCssPatchOptions, TailwindPatchRuntime, TailwindTokenByFileMap, TailwindTokenFileKey, TailwindTokenLocation, TailwindTokenReport, TailwindV2Options, TailwindV3Options, type TailwindV4CandidateSource, type TailwindV4CssSource, type TailwindV4DesignSystem, type TailwindV4Engine, type TailwindV4GenerateOptions, type TailwindV4GenerateResult, TailwindV4Options, type TailwindV4ResolvedSource, type TailwindV4SourceOptions, TailwindcssClassCache, type TailwindcssPatchCliMountOptions, type TailwindcssPatchCliOptions, type TailwindcssPatchCommand, type TailwindcssPatchCommandContext, type TailwindcssPatchCommandHandler, type TailwindcssPatchCommandHandlerMap, type TailwindcssPatchCommandOptionDefinition, type TailwindcssPatchCommandOptions, TailwindcssPatcher, TailwindcssRuntimeContext, VALIDATE_EXIT_CODES, VALIDATE_FAILURE_REASONS, ValidateCommandError, type ValidateFailureReason, type ValidateFailureSummary, type ValidateJsonFailurePayload, type ValidateJsonSuccessPayload, collectClassesFromContexts, collectClassesFromTailwindV4, createTailwindV4Engine, createTailwindcssPatchCli, defineConfig, extractProjectCandidatesWithPositions, extractRawCandidates, extractRawCandidatesWithPositions, extractSourceCandidates, extractSourceCandidatesWithPositions, extractValidCandidates, getPatchStatusReport, groupTokensByFile, loadRuntimeContexts, loadTailwindV4DesignSystem, logger, migrateConfigFiles, mountTailwindcssPatchCommands, normalizeOptions, resolveProjectSourceFiles, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions, resolveValidTailwindV4Candidates, restoreConfigFiles, runTailwindBuild, tailwindcssPatchCommands };

package/dist/index.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_validate = require("./validate-DmELQoI2.js");
-const require_index_bundle = require("./index.bundle-BIcthh-J.js");
+const require_validate = require("./validate-CLTQnfBI.js");
+const require_index_bundle = require("./index.bundle-BF-qTWsU.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;
@@ -27,6 +27,7 @@ exports.logger = require_validate.logger;
 exports.migrateConfigFiles = require_validate.migrateConfigFiles;
 exports.mountTailwindcssPatchCommands = require_index_bundle.mountTailwindcssPatchCommands;
 exports.normalizeOptions = require_validate.normalizeOptions;
+exports.resolveProjectSourceFiles = require_validate.resolveProjectSourceFiles;
 exports.resolveTailwindV4Source = require_index_bundle.resolveTailwindV4Source;
 exports.resolveTailwindV4SourceFromPatchOptions = require_index_bundle.resolveTailwindV4SourceFromPatchOptions;
 exports.resolveValidTailwindV4Candidates = require_validate.resolveValidTailwindV4Candidates;

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { M as CacheStore, N as logger, O as resolveValidTailwindV4Candidates, S as groupTokensByFile, _ as extractRawCandidates, a as tailwindcssPatchCommands, b as extractSourceCandidatesWithPositions, c as MIGRATION_REPORT_KIND, d as getPatchStatusReport, f as runTailwindBuild, g as extractProjectCandidatesWithPositions, h as collectClassesFromTailwindV4, j 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, w as loadTailwindV4DesignSystem, x as extractValidCandidates, y as extractSourceCandidates } from "./validate-BoTQvn7s.mjs";
-import { a as resolveTailwindV4SourceFromPatchOptions, i as resolveTailwindV4Source, n as defineConfig, o as createTailwindV4Engine, r as mountTailwindcssPatchCommands, t as createTailwindcssPatchCli } from "./index.bundle-BU7uUzRH.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, extractSourceCandidates, extractSourceCandidatesWithPositions, extractValidCandidates, getPatchStatusReport, groupTokensByFile, loadRuntimeContexts, loadTailwindV4DesignSystem, logger, migrateConfigFiles, mountTailwindcssPatchCommands, normalizeOptions, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions, resolveValidTailwindV4Candidates, restoreConfigFiles, runTailwindBuild, tailwindcssPatchCommands };
+import { C as resolveProjectSourceFiles, M as normalizeOptions, N as CacheStore, P as logger, S as groupTokensByFile, T as loadTailwindV4DesignSystem, _ as extractRawCandidates, a as tailwindcssPatchCommands, b as extractSourceCandidatesWithPositions, c as MIGRATION_REPORT_KIND, d as getPatchStatusReport, f as runTailwindBuild, g as extractProjectCandidatesWithPositions, h as collectClassesFromTailwindV4, k as resolveValidTailwindV4Candidates, 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, x as extractValidCandidates, y as extractSourceCandidates } from "./validate-BF0OladD.mjs";
+import { a as resolveTailwindV4SourceFromPatchOptions, i as resolveTailwindV4Source, n as defineConfig, o as createTailwindV4Engine, r as mountTailwindcssPatchCommands, t as createTailwindcssPatchCli } from "./index.bundle-BR8XOc2F.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, extractSourceCandidates, extractSourceCandidatesWithPositions, extractValidCandidates, getPatchStatusReport, groupTokensByFile, loadRuntimeContexts, loadTailwindV4DesignSystem, logger, migrateConfigFiles, mountTailwindcssPatchCommands, normalizeOptions, resolveProjectSourceFiles, resolveTailwindV4Source, resolveTailwindV4SourceFromPatchOptions, resolveValidTailwindV4Candidates, restoreConfigFiles, runTailwindBuild, tailwindcssPatchCommands };

package/dist/{validate-BoTQvn7s.mjs → validate-BF0OladD.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.4";
+var version = "9.3.6";
 //#endregion
 //#region src/constants.ts
 const pkgName = "tailwindcss-patch";
@@ -1410,7 +1410,7 @@ function normalizeOptions(options = {}) {
 	};
 }
 //#endregion
-//#region ../../node_modules/.pnpm/tsdown@0.22.0_tsx@4.21.0_typescript@6.0.3_unrun@0.2.37_synckit@0.11.12_/node_modules/tsdown/esm-shims.js
+//#region ../../node_modules/.pnpm/tsdown@0.22.0_tsx@4.22.3_typescript@6.0.3_unrun@0.2.37_synckit@0.11.12_/node_modules/tsdown/esm-shims.js
 const getFilename = () => fileURLToPath(import.meta.url);
 const getDirname = () => path$1.dirname(getFilename());
 const __dirname = /* @__PURE__ */ getDirname();
@@ -1798,7 +1798,7 @@ function canonicalizeBareArbitraryValueCandidates(candidates, options) {
 		return resolveBareArbitraryValueCandidate(candidate, options)?.canonicalCandidate ?? candidate;
 	});
 }
-function splitTopLevel(value, separator) {
+function splitTopLevel(value, separator, options) {
 	const result = [];
 	let start = 0;
 	let depth = 0;
@@ -1827,12 +1827,12 @@ function splitTopLevel(value, separator) {
 		}
 		if (depth === 0 && character === separator) {
 			const item = value.slice(start, index).trim();
-			if (item) result.push(item);
+			if (item || options?.keepEmpty) result.push(item);
 			start = index + 1;
 		}
 	}
 	const item = value.slice(start).trim();
-	if (item) result.push(item);
+	if (item || options?.keepEmpty) result.push(item);
 	return result;
 }
 const sequencePattern = /^(-?\d+)\.\.(-?\d+)(?:\.\.(-?\d+))?$/;
@@ -1873,7 +1873,7 @@ function expandInlinePattern(pattern) {
 	if (closeIndex === -1) throw new Error(`The Tailwind CSS v4 inline source pattern "${pattern}" is not balanced.`);
 	const body = rest.slice(1, closeIndex);
 	const suffix = rest.slice(closeIndex + 1);
-	const parts = sequencePattern.test(body) ? expandSequence(body) : splitTopLevel(body, ",").flatMap((part) => expandInlinePattern(part));
+	const parts = sequencePattern.test(body) ? expandSequence(body) : splitTopLevel(body, ",", { keepEmpty: true }).flatMap((part) => expandInlinePattern(part));
 	const suffixes = expandInlinePattern(suffix);
 	const result = [];
 	for (const part of parts) for (const expandedSuffix of suffixes) result.push(`${prefix}${part}${expandedSuffix}`);
@@ -2067,6 +2067,7 @@ function getOxideModule() {
 const HTML_ATTRIBUTE_NAME_CANDIDATE_RE = /^(?:class|className|hover-class|hoverClass)$/;
 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 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)$/;
@@ -2170,6 +2171,26 @@ function createLocalCandidate(candidate) {
 		end: candidate.localStart + candidate.rawCandidate.length
 	};
 }
+async function extractCssApplyCandidates(content, extension) {
+	const candidates = [];
+	CSS_APPLY_RE.lastIndex = 0;
+	let match = CSS_APPLY_RE.exec(content);
+	while (match !== null) {
+		const applyParams = match[1] ?? "";
+		const applyParamsStart = match.index + match[0].indexOf(applyParams);
+		const applyCandidates = await extractRawCandidatesWithPositions(applyParams, extension);
+		candidates.push(...applyCandidates.map((candidate) => ({
+			content: applyParams,
+			extension: "html",
+			localStart: candidate.start,
+			rawCandidate: candidate.rawCandidate,
+			start: candidate.start + applyParamsStart,
+			end: candidate.end + applyParamsStart
+		})));
+		match = CSS_APPLY_RE.exec(content);
+	}
+	return candidates;
+}
 async function extractMixedSourceScriptCandidates(content) {
 	const candidates = [];
 	SFC_SCRIPT_BLOCK_RE.lastIndex = 0;
@@ -2207,7 +2228,7 @@ async function extractRawCandidatesWithPositions(content, extension = "html") {
 }
 async function extractSourceCandidatesWithPositions(content, extension = "html") {
 	const normalizedExtension = extension.replace(/^\./, "");
-	const candidates = (await extractRawCandidatesWithPositions(content, normalizedExtension)).map((candidate) => ({
+	const candidates = CSS_LIKE_SOURCE_EXTENSION_RE.test(normalizedExtension) ? await extractCssApplyCandidates(content, normalizedExtension) : (await extractRawCandidatesWithPositions(content, normalizedExtension)).map((candidate) => ({
 		...candidate,
 		content,
 		extension: normalizedExtension,
@@ -2263,6 +2284,15 @@ async function extractValidCandidates(options) {
 	const candidateCache = designSystemCandidateCache.get(candidateCacheKey) ?? /* @__PURE__ */ new Map();
 	designSystemCandidateCache.set(candidateCacheKey, candidateCache);
 	const candidates = await extractRawCandidates(sources);
+	const inlineSources = extractTailwindV4InlineSourceCandidates(css);
+	for (const candidate of inlineSources.included) candidates.push(candidate);
+	for (const candidate of inlineSources.excluded) {
+		let index = candidates.indexOf(candidate);
+		while (index !== -1) {
+			candidates.splice(index, 1);
+			index = candidates.indexOf(candidate);
+		}
+	}
 	const validCandidates = [];
 	const uncachedCandidates = [];
 	for (const rawCandidate of candidates) {
@@ -2289,17 +2319,6 @@ async function extractValidCandidates(options) {
 	}
 	return validCandidates;
 }
-function normalizeSources(sources, cwd) {
-	return (sources?.length ? sources : [{
-		base: cwd,
-		pattern: "**/*",
-		negated: false
-	}]).map((source) => ({
-		base: source.base ?? cwd,
-		pattern: source.pattern,
-		negated: source.negated
-	}));
-}
 function buildLineOffsets(content) {
 	const offsets = [0];
 	for (let i = 0; i < content.length; i++) if (content[i] === "\n") offsets.push(i + 1);
@@ -2345,11 +2364,113 @@ function toRelativeFile(cwd, filename) {
 	const relative = path.relative(cwd, filename);
 	return relative === "" ? path.basename(filename) : relative;
 }
-async function extractProjectCandidatesWithPositions(options) {
+function expandBracePattern(pattern) {
+	const index = pattern.indexOf("{");
+	if (index === -1) return [pattern];
+	const rest = pattern.slice(index);
+	let depth = 0;
+	let endIndex = -1;
+	for (let i = 0; i < rest.length; i++) {
+		const char = rest[i];
+		if (char === "\\") {
+			i += 1;
+			continue;
+		}
+		if (char === "{") {
+			depth += 1;
+			continue;
+		}
+		if (char === "}") {
+			depth -= 1;
+			if (depth === 0) {
+				endIndex = i;
+				break;
+			}
+		}
+	}
+	if (endIndex === -1) return [pattern];
+	const prefix = pattern.slice(0, index);
+	const inner = rest.slice(1, endIndex);
+	const suffix = rest.slice(endIndex + 1);
+	const parts = [];
+	const stack = [];
+	let lastPos = 0;
+	for (let i = 0; i < inner.length; i++) {
+		const char = inner[i];
+		if (char === "\\") {
+			i += 1;
+			continue;
+		}
+		if (char === "{") {
+			stack.push("}");
+			continue;
+		}
+		if (char === "}" && stack[stack.length - 1] === "}") {
+			stack.pop();
+			continue;
+		}
+		if (char === "," && stack.length === 0) {
+			parts.push(inner.slice(lastPos, i));
+			lastPos = i + 1;
+		}
+	}
+	parts.push(inner.slice(lastPos));
+	return parts.flatMap((part) => expandBracePattern(`${prefix}${part}${suffix}`));
+}
+function normalizeScannerSources(sources, cwd, ignoredSources = []) {
+	return [...sources?.length ? sources : [{
+		base: cwd,
+		pattern: "**/*",
+		negated: false
+	}], ...ignoredSources].flatMap((source) => {
+		const base = source.base ?? cwd;
+		return expandBracePattern(source.pattern).map((pattern) => ({
+			base,
+			pattern,
+			negated: source.negated
+		}));
+	});
+}
+async function resolveScannerSources(options) {
 	const cwd = options?.cwd ? path.resolve(options.cwd) : process.cwd();
-	const normalizedSources = normalizeSources(options?.sources, cwd);
+	if (options?.sources?.length || options?.css === void 0) return {
+		cwd,
+		sources: normalizeScannerSources(options?.sources, cwd, options?.ignoredSources)
+	};
+	const base = options.base ? path.resolve(options.base) : cwd;
+	const { compiled } = await compileTailwindV4Source({
+		projectRoot: cwd,
+		base,
+		baseFallbacks: options.baseFallbacks?.map((baseFallback) => path.resolve(baseFallback)) ?? [],
+		css: options.css,
+		dependencies: []
+	});
+	return {
+		cwd,
+		sources: normalizeScannerSources([...(() => {
+			if (compiled.root === "none") return [];
+			if (compiled.root === null) return [{
+				base,
+				pattern: "**/*",
+				negated: false
+			}];
+			return [{
+				...compiled.root,
+				negated: false
+			}];
+		})(), ...compiled.sources], cwd, options.ignoredSources)
+	};
+}
+async function resolveProjectSourceFiles(options) {
+	const { sources } = await resolveScannerSources(options);
+	const { Scanner } = await getOxideModule();
+	const files = new Scanner({ sources }).files ?? [];
+	return options?.filter ? files.filter(options.filter) : files;
+}
+async function extractProjectCandidatesWithPositions(options) {
+	const { cwd, sources } = await resolveScannerSources(options);
 	const { Scanner } = await getOxideModule();
-	const scanner = new Scanner({ sources: normalizedSources });
+	const scanner = new Scanner({ sources });
 	const files = scanner.files ?? [];
 	const entries = [];
 	const skipped = [];
@@ -2393,7 +2514,7 @@ async function extractProjectCandidatesWithPositions(options) {
 		entries,
 		filesScanned: files.length,
 		skippedFiles: skipped,
-		sources: normalizedSources
+		sources
 	};
 }
 function groupTokensByFile(report, options) {
@@ -4086,4 +4207,4 @@ var ValidateCommandError = class extends Error {
 	}
 };
 //#endregion
-export { loadWorkspaceConfigModule as A, compileTailwindV4Source as C, replaceBareArbitraryValueSelectors as D, extractTailwindV4InlineSourceCandidates as E, CacheStore as M, logger as N, resolveValidTailwindV4Candidates as O, groupTokensByFile as S, canonicalizeBareArbitraryValueCandidates 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, normalizeOptions as j, loadPatchOptionsForWorkspace 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, loadTailwindV4DesignSystem as w, extractValidCandidates as x, extractSourceCandidates as y };
+export { loadPatchOptionsForWorkspace as A, resolveProjectSourceFiles as C, extractTailwindV4InlineSourceCandidates as D, canonicalizeBareArbitraryValueCandidates as E, normalizeOptions as M, CacheStore as N, replaceBareArbitraryValueSelectors as O, logger as P, groupTokensByFile as S, loadTailwindV4DesignSystem 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, loadWorkspaceConfigModule as j, resolveValidTailwindV4Candidates 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, compileTailwindV4Source as w, extractValidCandidates as x, extractSourceCandidates as y };

package/dist/{validate-DmELQoI2.js → validate-CLTQnfBI.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.4";
+var version = "9.3.6";
 //#endregion
 //#region src/constants.ts
 const pkgName = "tailwindcss-patch";
@@ -1800,7 +1800,7 @@ function canonicalizeBareArbitraryValueCandidates(candidates, options) {
 		return resolveBareArbitraryValueCandidate(candidate, options)?.canonicalCandidate ?? candidate;
 	});
 }
-function splitTopLevel(value, separator) {
+function splitTopLevel(value, separator, options) {
 	const result = [];
 	let start = 0;
 	let depth = 0;
@@ -1829,12 +1829,12 @@ function splitTopLevel(value, separator) {
 		}
 		if (depth === 0 && character === separator) {
 			const item = value.slice(start, index).trim();
-			if (item) result.push(item);
+			if (item || options?.keepEmpty) result.push(item);
 			start = index + 1;
 		}
 	}
 	const item = value.slice(start).trim();
-	if (item) result.push(item);
+	if (item || options?.keepEmpty) result.push(item);
 	return result;
 }
 const sequencePattern = /^(-?\d+)\.\.(-?\d+)(?:\.\.(-?\d+))?$/;
@@ -1875,7 +1875,7 @@ function expandInlinePattern(pattern) {
 	if (closeIndex === -1) throw new Error(`The Tailwind CSS v4 inline source pattern "${pattern}" is not balanced.`);
 	const body = rest.slice(1, closeIndex);
 	const suffix = rest.slice(closeIndex + 1);
-	const parts = sequencePattern.test(body) ? expandSequence(body) : splitTopLevel(body, ",").flatMap((part) => expandInlinePattern(part));
+	const parts = sequencePattern.test(body) ? expandSequence(body) : splitTopLevel(body, ",", { keepEmpty: true }).flatMap((part) => expandInlinePattern(part));
 	const suffixes = expandInlinePattern(suffix);
 	const result = [];
 	for (const part of parts) for (const expandedSuffix of suffixes) result.push(`${prefix}${part}${expandedSuffix}`);
@@ -2069,6 +2069,7 @@ function getOxideModule() {
 const HTML_ATTRIBUTE_NAME_CANDIDATE_RE = /^(?:class|className|hover-class|hoverClass)$/;
 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 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)$/;
@@ -2172,6 +2173,26 @@ function createLocalCandidate(candidate) {
 		end: candidate.localStart + candidate.rawCandidate.length
 	};
 }
+async function extractCssApplyCandidates(content, extension) {
+	const candidates = [];
+	CSS_APPLY_RE.lastIndex = 0;
+	let match = CSS_APPLY_RE.exec(content);
+	while (match !== null) {
+		const applyParams = match[1] ?? "";
+		const applyParamsStart = match.index + match[0].indexOf(applyParams);
+		const applyCandidates = await extractRawCandidatesWithPositions(applyParams, extension);
+		candidates.push(...applyCandidates.map((candidate) => ({
+			content: applyParams,
+			extension: "html",
+			localStart: candidate.start,
+			rawCandidate: candidate.rawCandidate,
+			start: candidate.start + applyParamsStart,
+			end: candidate.end + applyParamsStart
+		})));
+		match = CSS_APPLY_RE.exec(content);
+	}
+	return candidates;
+}
 async function extractMixedSourceScriptCandidates(content) {
 	const candidates = [];
 	SFC_SCRIPT_BLOCK_RE.lastIndex = 0;
@@ -2209,7 +2230,7 @@ async function extractRawCandidatesWithPositions(content, extension = "html") {
 }
 async function extractSourceCandidatesWithPositions(content, extension = "html") {
 	const normalizedExtension = extension.replace(/^\./, "");
-	const candidates = (await extractRawCandidatesWithPositions(content, normalizedExtension)).map((candidate) => ({
+	const candidates = CSS_LIKE_SOURCE_EXTENSION_RE.test(normalizedExtension) ? await extractCssApplyCandidates(content, normalizedExtension) : (await extractRawCandidatesWithPositions(content, normalizedExtension)).map((candidate) => ({
 		...candidate,
 		content,
 		extension: normalizedExtension,
@@ -2265,6 +2286,15 @@ async function extractValidCandidates(options) {
 	const candidateCache = designSystemCandidateCache.get(candidateCacheKey) ?? /* @__PURE__ */ new Map();
 	designSystemCandidateCache.set(candidateCacheKey, candidateCache);
 	const candidates = await extractRawCandidates(sources);
+	const inlineSources = extractTailwindV4InlineSourceCandidates(css);
+	for (const candidate of inlineSources.included) candidates.push(candidate);
+	for (const candidate of inlineSources.excluded) {
+		let index = candidates.indexOf(candidate);
+		while (index !== -1) {
+			candidates.splice(index, 1);
+			index = candidates.indexOf(candidate);
+		}
+	}
 	const validCandidates = [];
 	const uncachedCandidates = [];
 	for (const rawCandidate of candidates) {
@@ -2291,17 +2321,6 @@ async function extractValidCandidates(options) {
 	}
 	return validCandidates;
 }
-function normalizeSources(sources, cwd) {
-	return (sources?.length ? sources : [{
-		base: cwd,
-		pattern: "**/*",
-		negated: false
-	}]).map((source) => ({
-		base: source.base ?? cwd,
-		pattern: source.pattern,
-		negated: source.negated
-	}));
-}
 function buildLineOffsets(content) {
 	const offsets = [0];
 	for (let i = 0; i < content.length; i++) if (content[i] === "\n") offsets.push(i + 1);
@@ -2347,11 +2366,113 @@ function toRelativeFile(cwd, filename) {
 	const relative = pathe.default.relative(cwd, filename);
 	return relative === "" ? pathe.default.basename(filename) : relative;
 }
-async function extractProjectCandidatesWithPositions(options) {
+function expandBracePattern(pattern) {
+	const index = pattern.indexOf("{");
+	if (index === -1) return [pattern];
+	const rest = pattern.slice(index);
+	let depth = 0;
+	let endIndex = -1;
+	for (let i = 0; i < rest.length; i++) {
+		const char = rest[i];
+		if (char === "\\") {
+			i += 1;
+			continue;
+		}
+		if (char === "{") {
+			depth += 1;
+			continue;
+		}
+		if (char === "}") {
+			depth -= 1;
+			if (depth === 0) {
+				endIndex = i;
+				break;
+			}
+		}
+	}
+	if (endIndex === -1) return [pattern];
+	const prefix = pattern.slice(0, index);
+	const inner = rest.slice(1, endIndex);
+	const suffix = rest.slice(endIndex + 1);
+	const parts = [];
+	const stack = [];
+	let lastPos = 0;
+	for (let i = 0; i < inner.length; i++) {
+		const char = inner[i];
+		if (char === "\\") {
+			i += 1;
+			continue;
+		}
+		if (char === "{") {
+			stack.push("}");
+			continue;
+		}
+		if (char === "}" && stack[stack.length - 1] === "}") {
+			stack.pop();
+			continue;
+		}
+		if (char === "," && stack.length === 0) {
+			parts.push(inner.slice(lastPos, i));
+			lastPos = i + 1;
+		}
+	}
+	parts.push(inner.slice(lastPos));
+	return parts.flatMap((part) => expandBracePattern(`${prefix}${part}${suffix}`));
+}
+function normalizeScannerSources(sources, cwd, ignoredSources = []) {
+	return [...sources?.length ? sources : [{
+		base: cwd,
+		pattern: "**/*",
+		negated: false
+	}], ...ignoredSources].flatMap((source) => {
+		const base = source.base ?? cwd;
+		return expandBracePattern(source.pattern).map((pattern) => ({
+			base,
+			pattern,
+			negated: source.negated
+		}));
+	});
+}
+async function resolveScannerSources(options) {
 	const cwd = options?.cwd ? pathe.default.resolve(options.cwd) : node_process.default.cwd();
-	const normalizedSources = normalizeSources(options?.sources, cwd);
+	if (options?.sources?.length || options?.css === void 0) return {
+		cwd,
+		sources: normalizeScannerSources(options?.sources, cwd, options?.ignoredSources)
+	};
+	const base = options.base ? pathe.default.resolve(options.base) : cwd;
+	const { compiled } = await compileTailwindV4Source({
+		projectRoot: cwd,
+		base,
+		baseFallbacks: options.baseFallbacks?.map((baseFallback) => pathe.default.resolve(baseFallback)) ?? [],
+		css: options.css,
+		dependencies: []
+	});
+	return {
+		cwd,
+		sources: normalizeScannerSources([...(() => {
+			if (compiled.root === "none") return [];
+			if (compiled.root === null) return [{
+				base,
+				pattern: "**/*",
+				negated: false
+			}];
+			return [{
+				...compiled.root,
+				negated: false
+			}];
+		})(), ...compiled.sources], cwd, options.ignoredSources)
+	};
+}
+async function resolveProjectSourceFiles(options) {
+	const { sources } = await resolveScannerSources(options);
 	const { Scanner } = await getOxideModule();
-	const scanner = new Scanner({ sources: normalizedSources });
+	const files = new Scanner({ sources }).files ?? [];
+	return options?.filter ? files.filter(options.filter) : files;
+}
+async function extractProjectCandidatesWithPositions(options) {
+	const { cwd, sources } = await resolveScannerSources(options);
+	const { Scanner } = await getOxideModule();
+	const scanner = new Scanner({ sources });
 	const files = scanner.files ?? [];
 	const entries = [];
 	const skipped = [];
@@ -2395,7 +2516,7 @@ async function extractProjectCandidatesWithPositions(options) {
 		entries,
 		filesScanned: files.length,
 		skippedFiles: skipped,
-		sources: normalizedSources
+		sources
 	};
 }
 function groupTokensByFile(report, options) {
@@ -4262,6 +4383,12 @@ Object.defineProperty(exports, "replaceBareArbitraryValueSelectors", {
 		return replaceBareArbitraryValueSelectors;
 	}
 });
+Object.defineProperty(exports, "resolveProjectSourceFiles", {
+	enumerable: true,
+	get: function() {
+		return resolveProjectSourceFiles;
+	}
+});
 Object.defineProperty(exports, "resolveValidTailwindV4Candidates", {
 	enumerable: true,
 	get: function() {

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

package/dist/{validate-Bd5gnHL1.d.mts → validate-eCzgDdk_.d.ts}

@@ -1,9 +1,10 @@
-import { PackageInfo, PackageResolvingOptions } from "local-pkg";
-import * as _$consola from "consola";
-import { Node, Rule } from "postcss";
 import { CAC, Command } from "cac";
+import { PackageInfo, PackageResolvingOptions } from "local-pkg";
 import { SourceEntry } from "@tailwindcss/oxide";
+import { Node, Rule } from "postcss";
 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;
@@ -525,7 +526,20 @@ declare function extractValidCandidates(options?: ExtractValidCandidatesOption):
 interface ExtractProjectCandidatesOptions {
   cwd?: string;
   sources?: SourceEntry[];
+  base?: string;
+  baseFallbacks?: string[];
+  css?: string;
+}
+interface ResolveProjectSourceFilesOptions {
+  cwd?: string;
+  sources?: SourceEntry[];
+  ignoredSources?: SourceEntry[];
+  base?: string;
+  baseFallbacks?: string[];
+  css?: string;
+  filter?: (file: string) => boolean;
 }
+declare function resolveProjectSourceFiles(options?: ResolveProjectSourceFilesOptions): Promise<string[]>;
 declare function extractProjectCandidatesWithPositions(options?: ExtractProjectCandidatesOptions): Promise<TailwindTokenReport>;
 declare function groupTokensByFile(report: TailwindTokenReport, options?: {
   key?: TailwindTokenFileKey;
@@ -776,4 +790,4 @@ declare class ValidateCommandError extends Error {
   constructor(summary: ValidateFailureSummary, options?: ErrorOptions);
 }
 //#endregion
-export { TailwindV4GenerateResult as $, extractSourceCandidatesWithPositions as A, ExtractOptions as B, MIGRATION_REPORT_SCHEMA_VERSION as C, extractRawCandidates as D, extractProjectCandidatesWithPositions as E, ApplyOptions as F, TailwindV2Options as G, NormalizedTailwindCssPatchOptions as H, CacheOptions as I, TailwindV4CandidateSource as J, TailwindV3Options as K, CacheStrategy as L, groupTokensByFile as M, BareArbitraryValueOptions as N, extractRawCandidatesWithPositions as O, normalizeOptions as P, TailwindV4GenerateOptions as Q, ExposeContextOptions as R, MIGRATION_REPORT_KIND as S, CacheReadResult as St, TailwindcssPatcher as T, TailwindCssOptions as U, NormalizedCacheOptions as V, TailwindCssPatchOptions as W, TailwindV4DesignSystem as X, TailwindV4CssSource as Y, TailwindV4Engine as Z, ConfigFileMigrationEntry as _, CacheClearScope as _t, ValidateFailureSummary as a, PatchName as at, RestoreConfigFilesOptions as b, CacheIndexFileV2 as bt, TailwindcssPatchCliMountOptions as c, TailwindPatchRuntime as ct, TailwindcssPatchCommandContext as d, TailwindTokenLocation as dt, TailwindV4ResolvedSource as et, TailwindcssPatchCommandHandler as f, TailwindTokenReport as ft, tailwindcssPatchCommands as g, CacheClearResult as gt, TailwindcssPatchCommandOptions as h, CacheClearOptions as ht, ValidateFailureReason as i, PatchCheckStatus as it, extractValidCandidates as j, extractSourceCandidates as k, TailwindcssPatchCliOptions as l, TailwindTokenByFileMap as lt, TailwindcssPatchCommandOptionDefinition as m, TailwindcssRuntimeContext as mt, VALIDATE_FAILURE_REASONS as n, ExtractResult as nt, ValidateJsonFailurePayload as o, PatchStatusEntry as ot, TailwindcssPatchCommandHandlerMap as p, TailwindcssClassCache as pt, TailwindV4Options as q, ValidateCommandError as r, ILengthUnitsPatchOptions as rt, ValidateJsonSuccessPayload as s, PatchStatusReport as st, VALIDATE_EXIT_CODES as t, TailwindV4SourceOptions as tt, TailwindcssPatchCommand as u, TailwindTokenFileKey as ut, ConfigFileMigrationReport as v, CacheContextDescriptor as vt, logger as w, RestoreConfigFilesResult as x, CacheReadMeta as xt, MigrateConfigFilesOptions as y, CacheContextMetadata as yt, ExtendLengthUnitsOptions as z };
+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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "9.3.4",
+  "version": "9.3.6",
   "description": "patch tailwindcss for exposing context and extract classes",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -70,10 +70,10 @@
     "cac": "6.7.14",
     "consola": "^3.4.2",
     "fs-extra": "^11.3.5",
-    "local-pkg": "^1.1.2",
+    "local-pkg": "^1.2.1",
     "pathe": "^2.0.3",
-    "postcss": "^8.5.14",
-    "semver": "^7.8.0",
+    "postcss": "^8.5.15",
+    "semver": "^7.8.1",
     "tailwindcss-config": "^1.1.5",
     "@tailwindcss-mangle/config": "7.0.2"
   },

package/src/extraction/candidate-extractor.ts

@@ -12,8 +12,8 @@ import {
   type BareArbitraryValueOptions,
   resolveBareArbitraryValueCandidate,
 } from '../v4/bare-arbitrary-values'
-import { resolveValidTailwindV4Candidates } from '../v4/candidates'
-import { getTailwindV4DesignSystemCacheKey, loadTailwindV4DesignSystem } from '../v4/node-adapter'
+import { extractTailwindV4InlineSourceCandidates, resolveValidTailwindV4Candidates } from '../v4/candidates'
+import { compileTailwindV4Source, getTailwindV4DesignSystemCacheKey, loadTailwindV4DesignSystem } from '../v4/node-adapter'
 
 let oxideImportPromise: ReturnType<typeof importOxide> | undefined
 const designSystemCandidateCache = new Map<string, Map<string, boolean>>()
@@ -70,6 +70,7 @@ interface ExtractSourceCandidateWithContext extends ExtractSourceCandidate {
 const HTML_ATTRIBUTE_NAME_CANDIDATE_RE = /^(?:class|className|hover-class|hoverClass)$/
 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 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)$/
@@ -218,6 +219,27 @@ function createLocalCandidate(candidate: ExtractSourceCandidateWithContext): Ext
   }
 }
 
+async function extractCssApplyCandidates(content: string, extension: string) {
+  const candidates: ExtractSourceCandidateWithContext[] = []
+  CSS_APPLY_RE.lastIndex = 0
+  let match = CSS_APPLY_RE.exec(content)
+  while (match !== null) {
+    const applyParams = match[1] ?? ''
+    const applyParamsStart = match.index + match[0].indexOf(applyParams)
+    const applyCandidates = await extractRawCandidatesWithPositions(applyParams, extension)
+    candidates.push(...applyCandidates.map(candidate => ({
+      content: applyParams,
+      extension: 'html',
+      localStart: candidate.start,
+      rawCandidate: candidate.rawCandidate,
+      start: candidate.start + applyParamsStart,
+      end: candidate.end + applyParamsStart,
+    })))
+    match = CSS_APPLY_RE.exec(content)
+  }
+  return candidates
+}
+
 async function extractMixedSourceScriptCandidates(content: string) {
   const candidates: ExtractSourceCandidateWithContext[] = []
   SFC_SCRIPT_BLOCK_RE.lastIndex = 0
@@ -269,13 +291,15 @@ export async function extractSourceCandidatesWithPositions(
   extension: string = 'html',
 ): Promise<ExtractSourceCandidate[]> {
   const normalizedExtension = extension.replace(/^\./, '')
-  const candidates: ExtractSourceCandidateWithContext[] = (await extractRawCandidatesWithPositions(content, normalizedExtension))
-    .map(candidate => ({
-      ...candidate,
-      content,
-      extension: normalizedExtension,
-      localStart: candidate.start,
-    }))
+  const candidates: ExtractSourceCandidateWithContext[] = CSS_LIKE_SOURCE_EXTENSION_RE.test(normalizedExtension)
+    ? await extractCssApplyCandidates(content, normalizedExtension)
+    : (await extractRawCandidatesWithPositions(content, normalizedExtension))
+        .map(candidate => ({
+          ...candidate,
+          content,
+          extension: normalizedExtension,
+          localStart: candidate.start,
+        }))
   if (MIXED_TEMPLATE_SOURCE_EXTENSION_RE.test(normalizedExtension)) {
     candidates.push(...await extractMixedSourceScriptCandidates(content))
   }
@@ -343,6 +367,17 @@ export async function extractValidCandidates(options?: ExtractValidCandidatesOpt
   designSystemCandidateCache.set(candidateCacheKey, candidateCache)
 
   const candidates = await extractRawCandidates(sources)
+  const inlineSources = extractTailwindV4InlineSourceCandidates(css)
+  for (const candidate of inlineSources.included) {
+    candidates.push(candidate)
+  }
+  for (const candidate of inlineSources.excluded) {
+    let index = candidates.indexOf(candidate)
+    while (index !== -1) {
+      candidates.splice(index, 1)
+      index = candidates.indexOf(candidate)
+    }
+  }
   const validCandidates: string[] = []
   const uncachedCandidates: string[] = []
 
@@ -393,24 +428,6 @@ export async function extractValidCandidates(options?: ExtractValidCandidatesOpt
   return validCandidates
 }
 
-function normalizeSources(sources: SourceEntry[] | undefined, cwd: string) {
-  const baseSources = sources?.length
-    ? sources
-    : [
-        {
-          base: cwd,
-          pattern: '**/*',
-          negated: false,
-        },
-      ]
-
-  return baseSources.map(source => ({
-    base: source.base ?? cwd,
-    pattern: source.pattern,
-    negated: source.negated,
-  }))
-}
-
 function buildLineOffsets(content: string) {
   const offsets: number[] = [0]
   for (let i = 0; i < content.length; i++) {
@@ -475,16 +492,160 @@ function toRelativeFile(cwd: string, filename: string) {
 export interface ExtractProjectCandidatesOptions {
   cwd?: string
   sources?: SourceEntry[]
+  base?: string
+  baseFallbacks?: string[]
+  css?: string
+}
+
+export interface ResolveProjectSourceFilesOptions {
+  cwd?: string
+  sources?: SourceEntry[]
+  ignoredSources?: SourceEntry[]
+  base?: string
+  baseFallbacks?: string[]
+  css?: string
+  filter?: (file: string) => boolean
+}
+
+function expandBracePattern(pattern: string) {
+  const index = pattern.indexOf('{')
+  if (index === -1) {
+    return [pattern]
+  }
+
+  const rest = pattern.slice(index)
+  let depth = 0
+  let endIndex = -1
+  for (let i = 0; i < rest.length; i++) {
+    const char = rest[i]
+    if (char === '\\') {
+      i += 1
+      continue
+    }
+    if (char === '{') {
+      depth += 1
+      continue
+    }
+    if (char === '}') {
+      depth -= 1
+      if (depth === 0) {
+        endIndex = i
+        break
+      }
+    }
+  }
+  if (endIndex === -1) {
+    return [pattern]
+  }
+
+  const prefix = pattern.slice(0, index)
+  const inner = rest.slice(1, endIndex)
+  const suffix = rest.slice(endIndex + 1)
+  const parts: string[] = []
+  const stack: string[] = []
+  let lastPos = 0
+  for (let i = 0; i < inner.length; i++) {
+    const char = inner[i]
+    if (char === '\\') {
+      i += 1
+      continue
+    }
+    if (char === '{') {
+      stack.push('}')
+      continue
+    }
+    if (char === '}' && stack[stack.length - 1] === '}') {
+      stack.pop()
+      continue
+    }
+    if (char === ',' && stack.length === 0) {
+      parts.push(inner.slice(lastPos, i))
+      lastPos = i + 1
+    }
+  }
+  parts.push(inner.slice(lastPos))
+
+  return parts.flatMap(part =>
+    expandBracePattern(`${prefix}${part}${suffix}`))
+}
+
+function normalizeScannerSources(
+  sources: SourceEntry[] | undefined,
+  cwd: string,
+  ignoredSources: SourceEntry[] = [],
+) {
+  const baseSources = sources?.length
+    ? sources
+    : [
+        {
+          base: cwd,
+          pattern: '**/*',
+          negated: false,
+        },
+      ]
+
+  return [...baseSources, ...ignoredSources].flatMap((source) => {
+    const base = source.base ?? cwd
+    return expandBracePattern(source.pattern).map(pattern => ({
+      base,
+      pattern,
+      negated: source.negated,
+    }))
+  })
+}
+
+async function resolveScannerSources(options?: ResolveProjectSourceFilesOptions) {
+  const cwd = options?.cwd ? path.resolve(options.cwd) : process.cwd()
+  if (options?.sources?.length || options?.css === undefined) {
+    return {
+      cwd,
+      sources: normalizeScannerSources(options?.sources, cwd, options?.ignoredSources),
+    }
+  }
+
+  const base = options.base ? path.resolve(options.base) : cwd
+  const { compiled } = await compileTailwindV4Source({
+    projectRoot: cwd,
+    base,
+    baseFallbacks: options.baseFallbacks?.map(baseFallback => path.resolve(baseFallback)) ?? [],
+    css: options.css,
+    dependencies: [],
+  })
+  const rootSources = (() => {
+    if (compiled.root === 'none') {
+      return []
+    }
+    if (compiled.root === null) {
+      return [{ base, pattern: '**/*', negated: false }]
+    }
+    return [{ ...compiled.root, negated: false }]
+  })()
+
+  return {
+    cwd,
+    sources: normalizeScannerSources([...rootSources, ...compiled.sources], cwd, options.ignoredSources),
+  }
+}
+
+export async function resolveProjectSourceFiles(options?: ResolveProjectSourceFilesOptions): Promise<string[]> {
+  const { sources } = await resolveScannerSources(options)
+  const { Scanner } = await getOxideModule()
+  const scanner = new Scanner({
+    sources,
+  })
+  const files = scanner.files ?? []
+  return options?.filter
+    ? files.filter(options.filter)
+    : files
 }
 
 export async function extractProjectCandidatesWithPositions(
   options?: ExtractProjectCandidatesOptions,
 ): Promise<TailwindTokenReport> {
-  const cwd = options?.cwd ? path.resolve(options.cwd) : process.cwd()
-  const normalizedSources = normalizeSources(options?.sources, cwd)
+  const { cwd, sources } = await resolveScannerSources(options)
   const { Scanner } = await getOxideModule()
   const scanner = new Scanner({
-    sources: normalizedSources,
+    sources,
   })
 
   const files = scanner.files ?? []
@@ -539,7 +700,7 @@ export async function extractProjectCandidatesWithPositions(
     entries,
     filesScanned: files.length,
     skippedFiles: skipped,
-    sources: normalizedSources,
+    sources,
   }
 }
 

package/src/index.bundle.ts

@@ -26,6 +26,7 @@ import {
   extractSourceCandidatesWithPositions,
   extractValidCandidates,
   groupTokensByFile,
+  resolveProjectSourceFiles,
 } from './extraction/candidate-extractor'
 import {
   collectClassesFromContexts,
@@ -73,6 +74,7 @@ export {
   normalizeOptions,
   resolveTailwindV4Source,
   resolveTailwindV4SourceFromPatchOptions,
+  resolveProjectSourceFiles,
   resolveValidTailwindV4Candidates,
   restoreConfigFiles,
   runTailwindBuild,

package/src/index.ts

@@ -43,6 +43,7 @@ export {
   extractSourceCandidatesWithPositions,
   extractValidCandidates,
   groupTokensByFile,
+  resolveProjectSourceFiles,
   type ExtractSourceCandidate,
 } from './extraction/candidate-extractor'
 export {

package/src/v4/candidates.ts

@@ -126,7 +126,7 @@ export function canonicalizeBareArbitraryValueCandidates(
   })
 }
 
-function splitTopLevel(value: string, separator: string) {
+function splitTopLevel(value: string, separator: string, options?: { keepEmpty?: boolean }) {
   const result: string[] = []
   let start = 0
   let depth = 0
@@ -163,7 +163,7 @@ function splitTopLevel(value: string, separator: string) {
 
     if (depth === 0 && character === separator) {
       const item = value.slice(start, index).trim()
-      if (item) {
+      if (item || options?.keepEmpty) {
         result.push(item)
       }
       start = index + 1
@@ -171,7 +171,7 @@ function splitTopLevel(value: string, separator: string) {
   }
 
   const item = value.slice(start).trim()
-  if (item) {
+  if (item || options?.keepEmpty) {
     result.push(item)
   }
   return result
@@ -244,7 +244,7 @@ function expandInlinePattern(pattern: string): string[] {
   const suffix = rest.slice(closeIndex + 1)
   const parts = sequencePattern.test(body)
     ? expandSequence(body)
-    : splitTopLevel(body, ',').flatMap(part => expandInlinePattern(part))
+    : splitTopLevel(body, ',', { keepEmpty: true }).flatMap(part => expandInlinePattern(part))
   const suffixes = expandInlinePattern(suffix)
 
   const result: string[] = []

package/src/v4/engine.ts

@@ -16,13 +16,24 @@ import { compileTailwindV4Source, loadTailwindV4DesignSystem } from './node-adap
 
 function resolveScanSources(
   options: TailwindV4GenerateOptions | undefined,
+  source: TailwindV4ResolvedSource,
+  compiledRoot: TailwindV4GenerateResult['root'],
   compiledSources: TailwindV4SourcePattern[],
 ) {
   if (Array.isArray(options?.scanSources)) {
     return options.scanSources
   }
   if (options?.scanSources === true) {
-    return compiledSources
+    const rootSources = (() => {
+      if (compiledRoot === 'none') {
+        return []
+      }
+      if (compiledRoot === null) {
+        return [{ base: source.base, pattern: '**/*', negated: false }]
+      }
+      return [{ ...compiledRoot, negated: false }]
+    })()
+    return [...rootSources, ...compiledSources]
   }
   return []
 }
@@ -30,6 +41,7 @@ function resolveScanSources(
 async function collectRawCandidates(
   source: TailwindV4ResolvedSource,
   options: TailwindV4GenerateOptions | undefined,
+  compiledRoot: TailwindV4GenerateResult['root'],
   compiledSources: TailwindV4SourcePattern[] = [],
 ) {
   const rawCandidates = new Set<string>()
@@ -45,7 +57,7 @@ async function collectRawCandidates(
     }
   }
 
-  const filesystemSources = resolveScanSources(options, compiledSources)
+  const filesystemSources = resolveScanSources(options, source, compiledRoot, compiledSources)
   if (filesystemSources.length > 0) {
     for (const candidate of await extractRawCandidates(filesystemSources)) {
       rawCandidates.add(candidate)
@@ -75,7 +87,7 @@ export function createTailwindV4Engine(source: TailwindV4ResolvedSource): Tailwi
     },
     async generate(options): Promise<TailwindV4GenerateResult> {
       const { compiled, dependencies } = await compileTailwindV4Source(source)
-      const rawCandidates = await collectRawCandidates(source, options, compiled.sources)
+      const rawCandidates = await collectRawCandidates(source, options, compiled.root, compiled.sources)
       const designSystem = await loadTailwindV4DesignSystem(source)
       const classSet = resolveValidTailwindV4Candidates(designSystem, rawCandidates, {
         ...(options?.bareArbitraryValues === undefined ? {} : { bareArbitraryValues: options.bareArbitraryValues }),