tailwindcss-patch 9.3.5 → 9.3.7

package/dist/{validate-5TFH6ktk.js → validate-D7h8SP0T.js}

@@ -14,6 +14,7 @@ let node_url = require("node:url");
 let node_fs = require("node:fs");
 let postcss = require("postcss");
 postcss = require_chunk.__toESM(postcss);
+require("micromatch");
 let _babel_types = require("@babel/types");
 _babel_types = require_chunk.__toESM(_babel_types);
 let _babel_generator = require("@babel/generator");
@@ -23,7 +24,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.5";
+var version = "9.3.7";
 //#endregion
 //#region src/constants.ts
 const pkgName = "tailwindcss-patch";
@@ -1800,7 +1801,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 +1830,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 +1876,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}`);
@@ -2042,6 +2043,94 @@ async function compileTailwindV4Source(source) {
 	throw new Error("Failed to compile Tailwind CSS v4 source.");
 }
 //#endregion
+//#region src/v4/source-scan.ts
+const TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN = "**/*";
+function createTailwindV4RootSources(root, fallbackBase) {
+	if (root === "none") return [];
+	if (root === null) return [{
+		base: fallbackBase,
+		pattern: TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN,
+		negated: false
+	}];
+	return [{
+		...root,
+		negated: false
+	}];
+}
+function createTailwindV4CompiledSourceEntries(root, sources, fallbackBase) {
+	return [...createTailwindV4RootSources(root, fallbackBase), ...sources];
+}
+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 expandTailwindV4SourceEntryBraces(sources) {
+	return sources.flatMap((source) => {
+		const base = pathe.default.resolve(source.base);
+		return expandBracePattern(source.pattern).map((pattern) => ({
+			base,
+			pattern,
+			negated: source.negated
+		}));
+	});
+}
+function normalizeTailwindV4ScannerSources(sources, cwd, ignoredSources = []) {
+	return expandTailwindV4SourceEntryBraces([...sources?.length ? sources : [{
+		base: cwd,
+		pattern: TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN,
+		negated: false
+	}], ...ignoredSources]);
+}
+//#endregion
 //#region src/extraction/candidate-extractor.ts
 let oxideImportPromise;
 const designSystemCandidateCache = /* @__PURE__ */ new Map();
@@ -2286,6 +2375,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) {
@@ -2312,17 +2410,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);
@@ -2368,11 +2455,35 @@ function toRelativeFile(cwd, filename) {
 	const relative = pathe.default.relative(cwd, filename);
 	return relative === "" ? pathe.default.basename(filename) : relative;
 }
-async function extractProjectCandidatesWithPositions(options) {
+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: normalizeTailwindV4ScannerSources(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: normalizeTailwindV4ScannerSources(createTailwindV4CompiledSourceEntries(compiled.root, compiled.sources, base), 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 = [];
@@ -2416,7 +2527,7 @@ async function extractProjectCandidatesWithPositions(options) {
 		entries,
 		filesScanned: files.length,
 		skippedFiles: skipped,
-		sources: normalizedSources
+		sources
 	};
 }
 function groupTokensByFile(report, options) {
@@ -4181,6 +4292,12 @@ Object.defineProperty(exports, "compileTailwindV4Source", {
 		return compileTailwindV4Source;
 	}
 });
+Object.defineProperty(exports, "createTailwindV4CompiledSourceEntries", {
+	enumerable: true,
+	get: function() {
+		return createTailwindV4CompiledSourceEntries;
+	}
+});
 Object.defineProperty(exports, "extractProjectCandidatesWithPositions", {
 	enumerable: true,
 	get: function() {
@@ -4283,6 +4400,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-Bd5gnHL1.d.mts → validate-DFiRmBtJ.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;
@@ -203,6 +204,10 @@ interface TailwindV4GenerateOptions {
    */
   scanSources?: boolean | TailwindV4SourcePattern[];
 }
+type TailwindV4CompiledSourceRoot = null | 'none' | {
+  base: string;
+  pattern: string;
+};
 interface TailwindV4SourcePattern {
   base: string;
   pattern: string;
@@ -214,10 +219,7 @@ interface TailwindV4GenerateResult {
   rawCandidates: Set<string>;
   dependencies: string[];
   sources: TailwindV4SourcePattern[];
-  root: null | 'none' | {
-    base: string;
-    pattern: string;
-  };
+  root: TailwindV4CompiledSourceRoot;
 }
 interface TailwindV4DesignSystem {
   parseCandidate: (candidate: string) => unknown[];
@@ -525,7 +527,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 +791,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.5",
+  "version": "9.3.7",
   "description": "patch tailwindcss for exposing context and extract classes",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -70,10 +70,11 @@
     "cac": "6.7.14",
     "consola": "^3.4.2",
     "fs-extra": "^11.3.5",
-    "local-pkg": "^1.1.2",
+    "local-pkg": "^1.2.1",
+    "micromatch": "^4.0.8",
     "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,12 @@ 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'
+import {
+  createTailwindV4CompiledSourceEntries,
+  normalizeTailwindV4ScannerSources,
+} from '../v4/source-scan'
 
 let oxideImportPromise: ReturnType<typeof importOxide> | undefined
 const designSystemCandidateCache = new Map<string, Map<string, boolean>>()
@@ -367,6 +371,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[] = []
 
@@ -417,24 +432,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++) {
@@ -499,16 +496,67 @@ 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
+}
+
+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: normalizeTailwindV4ScannerSources(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: normalizeTailwindV4ScannerSources(
+      createTailwindV4CompiledSourceEntries(compiled.root, compiled.sources, base),
+      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 ?? []
@@ -563,7 +611,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 {
@@ -55,14 +56,34 @@ export {
 export { default as logger } from './logger'
 export * from './types'
 export {
+  createTailwindV4CompiledSourceEntries,
   createTailwindV4Engine,
+  createTailwindV4DefaultIgnoreSources,
+  createTailwindV4RootSources,
+  createTailwindV4SourceEntryMatcher,
+  createTailwindV4SourceExclusionMatcher,
+  expandTailwindV4SourceEntries,
+  expandTailwindV4SourceEntryBraces,
+  isFileExcludedByTailwindV4SourceEntries,
+  isFileMatchedByTailwindV4SourceEntries,
   loadTailwindV4DesignSystem,
+  mergeTailwindV4SourceEntries,
+  normalizeTailwindV4ScannerSources,
+  normalizeTailwindV4SourceEntries,
+  resolveSourceScanPath,
   resolveTailwindV4Source,
+  resolveTailwindV4SourceBaseCandidates,
+  resolveTailwindV4SourceEntry,
   resolveTailwindV4SourceFromPatchOptions,
   resolveValidTailwindV4Candidates,
+  TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN,
+  TAILWIND_V4_IGNORED_CONTENT_DIRS,
+  TAILWIND_V4_IGNORED_EXTENSIONS,
+  TAILWIND_V4_IGNORED_FILES,
 } from './v4'
 export type {
   TailwindV4CandidateSource,
+  TailwindV4CompiledSourceRoot,
   TailwindV4CssSource,
   TailwindV4DesignSystem,
   TailwindV4Engine,
@@ -70,6 +91,7 @@ export type {
   TailwindV4GenerateResult,
   TailwindV4ResolvedSource,
   TailwindV4SourceOptions,
+  TailwindV4SourcePattern,
 } from './v4'
 
 export function defineConfig<T extends TailwindcssMangleConfig>(config: T): T {

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

@@ -13,16 +13,19 @@ import {
   resolveValidTailwindV4Candidates,
 } from './candidates'
 import { compileTailwindV4Source, loadTailwindV4DesignSystem } from './node-adapter'
+import { createTailwindV4CompiledSourceEntries } from './source-scan'
 
 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
+    return createTailwindV4CompiledSourceEntries(compiledRoot, compiledSources, source.base)
   }
   return []
 }
@@ -30,6 +33,7 @@ function resolveScanSources(
 async function collectRawCandidates(
   source: TailwindV4ResolvedSource,
   options: TailwindV4GenerateOptions | undefined,
+  compiledRoot: TailwindV4GenerateResult['root'],
   compiledSources: TailwindV4SourcePattern[] = [],
 ) {
   const rawCandidates = new Set<string>()
@@ -45,7 +49,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 +79,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 }),

package/src/v4/index.ts

@@ -8,6 +8,27 @@ export {
   loadTailwindV4DesignSystem,
   loadTailwindV4NodeModule,
 } from './node-adapter'
+export {
+  createTailwindV4CompiledSourceEntries,
+  createTailwindV4DefaultIgnoreSources,
+  createTailwindV4RootSources,
+  createTailwindV4SourceEntryMatcher,
+  createTailwindV4SourceExclusionMatcher,
+  expandTailwindV4SourceEntries,
+  expandTailwindV4SourceEntryBraces,
+  isFileExcludedByTailwindV4SourceEntries,
+  isFileMatchedByTailwindV4SourceEntries,
+  mergeTailwindV4SourceEntries,
+  normalizeTailwindV4ScannerSources,
+  normalizeTailwindV4SourceEntries,
+  resolveSourceScanPath,
+  resolveTailwindV4SourceBaseCandidates,
+  resolveTailwindV4SourceEntry,
+  TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN,
+  TAILWIND_V4_IGNORED_CONTENT_DIRS,
+  TAILWIND_V4_IGNORED_EXTENSIONS,
+  TAILWIND_V4_IGNORED_FILES,
+} from './source-scan'
 export {
   resolveTailwindV4Source,
   resolveTailwindV4SourceFromPatchOptions,
@@ -15,6 +36,7 @@ export {
 } from './source'
 export type {
   TailwindV4CandidateSource,
+  TailwindV4CompiledSourceRoot,
   TailwindV4CssSource,
   TailwindV4DesignSystem,
   TailwindV4Engine,

package/src/v4/node-adapter.ts

@@ -1,6 +1,7 @@
 import type {
   TailwindV4DesignSystem,
   TailwindV4ResolvedSource,
+  TailwindV4CompiledSourceRoot,
   TailwindV4SourcePattern,
 } from './types'
 import { createRequire } from 'node:module'
@@ -9,10 +10,7 @@ import path from 'pathe'
 
 interface TailwindV4CompiledSource {
   sources: TailwindV4SourcePattern[]
-  root: null | 'none' | {
-    base: string
-    pattern: string
-  }
+  root: TailwindV4CompiledSourceRoot
   build: (candidates: string[]) => string
 }