tailwindcss-patch 9.4.1 → 9.4.3

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

@@ -1,5 +1,4 @@
 import { PackageInfo, PackageResolvingOptions } from "local-pkg";
-import * as _$consola from "consola";
 import { Node, Rule } from "postcss";
 import { CAC, Command } from "cac";
 import { SourceEntry } from "@tailwindcss/oxide";
@@ -158,6 +157,44 @@ interface PatchStatusReport {
   entries: PatchStatusEntry[];
 }
 //#endregion
+//#region src/v4/bare-arbitrary-values.d.ts
+interface BareArbitraryValueOptions {
+  /**
+   * 允许作为无方括号任意值的单位列表。
+   */
+  units?: string[];
+}
+interface BareArbitraryValueResolveResult {
+  candidate: string;
+  canonicalCandidate: string;
+}
+interface BareArbitraryValueSourceCandidate {
+  rawCandidate: string;
+  start: number;
+  end: number;
+}
+declare function isBareArbitraryValuesEnabled(options: boolean | BareArbitraryValueOptions | undefined): boolean;
+declare function resolveBareArbitraryValueCandidate(candidate: string, options?: boolean | BareArbitraryValueOptions): BareArbitraryValueResolveResult | undefined;
+declare function extractBareArbitraryValueSourceCandidatesWithPositions(content: string, options?: boolean | BareArbitraryValueOptions): BareArbitraryValueSourceCandidate[];
+declare function extractBareArbitraryValueSourceCandidates(content: string, options?: boolean | BareArbitraryValueOptions): string[];
+declare function escapeCssClassName(value: string): string;
+//#endregion
+//#region src/style-candidates.d.ts
+interface TailwindStyleSource {
+  content: string;
+  extension?: string;
+  file?: string;
+}
+interface TailwindStyleCandidateOptions {
+  candidates?: Iterable<string>;
+  sources?: TailwindStyleSource[];
+  /**
+   * Enables UnoCSS-style bare arbitrary values such as `p-10%` and `p-2.5px`.
+   */
+  bareArbitraryValues?: boolean | BareArbitraryValueOptions;
+}
+declare function collectTailwindStyleCandidates(options?: TailwindStyleCandidateOptions): Promise<Set<string>>;
+//#endregion
 //#region src/v4/types.d.ts
 interface TailwindV4SourceOptions {
   projectRoot?: string;
@@ -186,6 +223,7 @@ interface TailwindV4CandidateSource {
   content: string;
   extension?: string;
 }
+interface TailwindV4StyleSource extends TailwindStyleSource {}
 interface TailwindV4GenerateOptions {
   candidates?: Iterable<string>;
   sources?: TailwindV4CandidateSource[];
@@ -220,6 +258,23 @@ interface TailwindV4GenerateResult {
   sources: TailwindV4SourcePattern[];
   root: TailwindV4CompiledSourceRoot;
 }
+interface TailwindV4StyleGenerateOptions extends TailwindV4SourceOptions {
+  source?: TailwindV4ResolvedSource;
+  candidates?: Iterable<string>;
+  sources?: TailwindV4StyleSource[];
+  /**
+   * Enables UnoCSS-style bare arbitrary values such as `p-10%` and `p-2.5px`.
+   */
+  bareArbitraryValues?: TailwindV4GenerateOptions['bareArbitraryValues'];
+  /**
+   * Scans the compiled Tailwind CSS v4 source entries in addition to in-memory sources.
+   */
+  scanSources?: TailwindV4GenerateOptions['scanSources'];
+}
+interface TailwindV4StyleGenerateResult extends TailwindV4GenerateResult {
+  tokens: Set<string>;
+  source: TailwindV4ResolvedSource;
+}
 interface TailwindV4DesignSystem {
   parseCandidate: (candidate: string) => unknown[];
   candidatesToCss: (candidates: string[]) => Array<string | null | undefined>;
@@ -496,14 +551,6 @@ type TailwindcssConfigResult = Awaited<ReturnType<TailwindcssConfigModule['getCo
 //#region src/runtime/collector.d.ts
 type TailwindMajorVersion = 2 | 3 | 4;
 //#endregion
-//#region src/v4/bare-arbitrary-values.d.ts
-interface BareArbitraryValueOptions {
-  /**
-   * 允许作为无方括号任意值的单位列表。
-   */
-  units?: string[];
-}
-//#endregion
 //#region src/extraction/candidate-extractor.d.ts
 interface ExtractValidCandidatesOption {
   sources?: SourceEntry[];
@@ -513,15 +560,18 @@ interface ExtractValidCandidatesOption {
   cwd?: string;
   bareArbitraryValues?: boolean | BareArbitraryValueOptions;
 }
+interface ExtractCandidateOptions {
+  bareArbitraryValues?: boolean | BareArbitraryValueOptions;
+}
 interface ExtractSourceCandidate {
   rawCandidate: string;
   start: number;
   end: number;
 }
-declare function extractRawCandidatesWithPositions(content: string, extension?: string): Promise<ExtractSourceCandidate[]>;
-declare function extractSourceCandidatesWithPositions(content: string, extension?: string): Promise<ExtractSourceCandidate[]>;
-declare function extractSourceCandidates(content: string, extension?: string): Promise<string[]>;
-declare function extractRawCandidates(sources?: SourceEntry[]): Promise<string[]>;
+declare function extractRawCandidatesWithPositions(content: string, extension?: string, options?: ExtractCandidateOptions): Promise<ExtractSourceCandidate[]>;
+declare function extractSourceCandidatesWithPositions(content: string, extension?: string, options?: ExtractCandidateOptions): Promise<ExtractSourceCandidate[]>;
+declare function extractSourceCandidates(content: string, extension?: string, options?: ExtractCandidateOptions): Promise<string[]>;
+declare function extractRawCandidates(sources?: SourceEntry[], options?: ExtractCandidateOptions): Promise<string[]>;
 declare function extractValidCandidates(options?: ExtractValidCandidatesOption): Promise<string[]>;
 interface ExtractProjectCandidatesOptions {
   cwd?: string;
@@ -586,7 +636,7 @@ declare class TailwindcssPatcher {
 }
 //#endregion
 //#region src/logger.d.ts
-declare const logger: _$consola.ConsolaInstance;
+declare const logger: import("consola").ConsolaInstance;
 //#endregion
 //#region src/commands/migration-report.d.ts
 declare const MIGRATION_REPORT_KIND = "tw-patch-migrate-report";
@@ -790,4 +840,4 @@ declare class ValidateCommandError extends Error {
   constructor(summary: ValidateFailureSummary, options?: ErrorOptions);
 }
 //#endregion
-export { TailwindV4DesignSystem as $, extractSourceCandidates as A, ExposeContextOptions as B, MIGRATION_REPORT_SCHEMA_VERSION as C, CacheContextMetadata as Ct, extractProjectCandidatesWithPositions as D, ExtractSourceCandidate as E, CacheReadResult as Et, BareArbitraryValueOptions as F, TailwindCssOptions as G, ExtractOptions as H, normalizeOptions as I, TailwindV3Options as J, TailwindCssPatchOptions as K, ApplyOptions as L, extractValidCandidates as M, groupTokensByFile as N, extractRawCandidates as O, resolveProjectSourceFiles as P, TailwindV4CssSource as Q, CacheOptions as R, MIGRATION_REPORT_KIND as S, CacheContextDescriptor as St, TailwindcssPatcher as T, CacheReadMeta as Tt, NormalizedCacheOptions as U, ExtendLengthUnitsOptions as V, NormalizedTailwindCssPatchOptions as W, TailwindV4CandidateSource as X, TailwindV4Options as Y, TailwindV4CompiledSourceRoot as Z, ConfigFileMigrationEntry as _, TailwindcssClassCache as _t, ValidateFailureSummary as a, TailwindV4SourcePattern as at, RestoreConfigFilesOptions as b, CacheClearResult as bt, TailwindcssPatchCliMountOptions as c, PatchCheckStatus as ct, TailwindcssPatchCommandContext as d, PatchStatusReport as dt, TailwindV4Engine as et, TailwindcssPatchCommandHandler as f, TailwindPatchRuntime as ft, tailwindcssPatchCommands as g, TailwindTokenReport as gt, TailwindcssPatchCommandOptions as h, TailwindTokenLocation as ht, ValidateFailureReason as i, TailwindV4SourceOptions as it, extractSourceCandidatesWithPositions as j, extractRawCandidatesWithPositions as k, TailwindcssPatchCliOptions as l, PatchName as lt, TailwindcssPatchCommandOptionDefinition as m, TailwindTokenFileKey as mt, VALIDATE_FAILURE_REASONS as n, TailwindV4GenerateResult as nt, ValidateJsonFailurePayload as o, ExtractResult as ot, TailwindcssPatchCommandHandlerMap as p, TailwindTokenByFileMap as pt, TailwindV2Options as q, ValidateCommandError as r, TailwindV4ResolvedSource as rt, ValidateJsonSuccessPayload as s, ILengthUnitsPatchOptions as st, VALIDATE_EXIT_CODES as t, TailwindV4GenerateOptions as tt, TailwindcssPatchCommand as u, PatchStatusEntry as ut, ConfigFileMigrationReport as v, TailwindcssRuntimeContext as vt, logger as w, CacheIndexFileV2 as wt, RestoreConfigFilesResult as x, CacheClearScope as xt, MigrateConfigFilesOptions as y, CacheClearOptions as yt, CacheStrategy as z };
+export { TailwindV4Engine as $, extractSourceCandidates as A, CacheClearOptions as At, ExtendLengthUnitsOptions as B, MIGRATION_REPORT_SCHEMA_VERSION as C, TailwindPatchRuntime as Ct, extractProjectCandidatesWithPositions as D, TailwindTokenReport as Dt, ExtractSourceCandidate as E, TailwindTokenLocation as Et, normalizeOptions as F, CacheIndexFileV2 as Ft, TailwindCssPatchOptions as G, NormalizedCacheOptions as H, ApplyOptions as I, CacheReadMeta as It, TailwindV4Options as J, TailwindV2Options as K, CacheOptions as L, CacheReadResult as Lt, extractValidCandidates as M, CacheClearScope as Mt, groupTokensByFile as N, CacheContextDescriptor as Nt, extractRawCandidates as O, TailwindcssClassCache as Ot, resolveProjectSourceFiles as P, CacheContextMetadata as Pt, TailwindV4DesignSystem as Q, CacheStrategy as R, MIGRATION_REPORT_KIND as S, PatchStatusReport as St, TailwindcssPatcher as T, TailwindTokenFileKey as Tt, NormalizedTailwindCssPatchOptions as U, ExtractOptions as V, TailwindCssOptions as W, TailwindV4CompiledSourceRoot as X, TailwindV4CandidateSource as Y, TailwindV4CssSource as Z, ConfigFileMigrationEntry as _, ExtractResult as _t, ValidateFailureSummary as a, TailwindV4StyleGenerateOptions as at, RestoreConfigFilesOptions as b, PatchName as bt, TailwindcssPatchCliMountOptions as c, TailwindStyleCandidateOptions as ct, TailwindcssPatchCommandContext as d, BareArbitraryValueOptions as dt, TailwindV4GenerateOptions as et, TailwindcssPatchCommandHandler as f, escapeCssClassName as ft, tailwindcssPatchCommands as g, resolveBareArbitraryValueCandidate as gt, TailwindcssPatchCommandOptions as h, isBareArbitraryValuesEnabled as ht, ValidateFailureReason as i, TailwindV4SourcePattern as it, extractSourceCandidatesWithPositions as j, CacheClearResult as jt, extractRawCandidatesWithPositions as k, TailwindcssRuntimeContext as kt, TailwindcssPatchCliOptions as l, TailwindStyleSource as lt, TailwindcssPatchCommandOptionDefinition as m, extractBareArbitraryValueSourceCandidatesWithPositions as mt, VALIDATE_FAILURE_REASONS as n, TailwindV4ResolvedSource as nt, ValidateJsonFailurePayload as o, TailwindV4StyleGenerateResult as ot, TailwindcssPatchCommandHandlerMap as p, extractBareArbitraryValueSourceCandidates as pt, TailwindV3Options as q, ValidateCommandError as r, TailwindV4SourceOptions as rt, ValidateJsonSuccessPayload as s, TailwindV4StyleSource as st, VALIDATE_EXIT_CODES as t, TailwindV4GenerateResult as tt, TailwindcssPatchCommand as u, collectTailwindStyleCandidates as ut, ConfigFileMigrationReport as v, ILengthUnitsPatchOptions as vt, logger as w, TailwindTokenByFileMap as wt, RestoreConfigFilesResult as x, PatchStatusEntry as xt, MigrateConfigFilesOptions as y, PatchCheckStatus as yt, ExposeContextOptions as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "9.4.1",
+  "version": "9.4.3",
   "description": "patch tailwindcss for exposing context and extract classes",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -61,10 +61,10 @@
     }
   },
   "dependencies": {
-    "@babel/generator": "^7.29.1",
-    "@babel/parser": "^7.29.3",
-    "@babel/traverse": "^7.29.0",
-    "@babel/types": "^7.29.0",
+    "@babel/generator": "^7.29.7",
+    "@babel/parser": "^7.29.7",
+    "@babel/traverse": "^7.29.7",
+    "@babel/types": "^7.29.7",
     "@tailwindcss/node": "^4.3.0",
     "@tailwindcss/oxide": "^4.3.0",
     "cac": "6.7.14",
@@ -74,16 +74,16 @@
     "micromatch": "^4.0.8",
     "pathe": "^2.0.3",
     "postcss": "^8.5.15",
-    "semver": "^7.8.1",
-    "tailwindcss-config": "^1.1.5",
+    "semver": "^7.8.4",
+    "tailwindcss-config": "^2.0.0",
     "@tailwindcss-mangle/config": "7.0.2"
   },
   "devDependencies": {
     "@tailwindcss/postcss": "^4.3.0",
     "@tailwindcss/vite": "^4.3.0",
-    "tailwindcss": "^4.1.18",
+    "tailwindcss": "^4.3.0",
     "tailwindcss-3": "npm:tailwindcss@^3.4.19",
-    "tailwindcss-4": "npm:tailwindcss@^4.1.18"
+    "tailwindcss-4": "npm:tailwindcss@^4.3.0"
   },
   "scripts": {
     "dev": "tsdown --watch --sourcemap",

package/src/extraction/candidate-extractor.ts

@@ -5,11 +5,12 @@ import type {
   TailwindTokenLocation,
   TailwindTokenReport,
 } from '../types'
+import type { BareArbitraryValueOptions } from '../v4/bare-arbitrary-values'
 import { promises as fs } from 'node:fs'
 import process from 'node:process'
 import path from 'pathe'
 import {
-  type BareArbitraryValueOptions,
+  extractBareArbitraryValueSourceCandidatesWithPositions,
   resolveBareArbitraryValueCandidate,
 } from '../v4/bare-arbitrary-values'
 import { extractTailwindV4InlineSourceCandidates, resolveValidTailwindV4Candidates } from '../v4/candidates'
@@ -59,6 +60,10 @@ export interface ExtractValidCandidatesOption {
   bareArbitraryValues?: boolean | BareArbitraryValueOptions
 }
 
+export interface ExtractCandidateOptions {
+  bareArbitraryValues?: boolean | BareArbitraryValueOptions
+}
+
 export interface ExtractSourceCandidate {
   rawCandidate: string
   start: number
@@ -75,7 +80,7 @@ const HTML_ATTRIBUTE_NAME_CANDIDATE_RE = /^(?:class|className|hover-class|hoverC
 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 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)$/
 const SFC_SCRIPT_BLOCK_RE = /<script\b[^>]*>([\s\S]*?)<\/script>/gi
@@ -102,7 +107,7 @@ function isInsideHtmlTagText(content: string, candidate: ExtractSourceCandidate)
     return false
   }
   const nextOpen = content.indexOf('<', candidate.end)
-  return nextOpen !== -1 && (nextOpen < content.indexOf('>', candidate.end) || content.indexOf('>', candidate.end) === -1)
+  return nextOpen !== -1 && (nextOpen < content.indexOf('>', candidate.end) || !content.includes('>', candidate.end))
 }
 
 function isCssDirectiveCandidate(candidate: string) {
@@ -223,7 +228,36 @@ function createLocalCandidate(candidate: ExtractSourceCandidateWithContext): Ext
   }
 }
 
-async function extractCssApplyCandidates(content: string, extension: string) {
+function dedupeCandidatesWithPositions(candidates: ExtractSourceCandidate[]) {
+  const seen = new Set<string>()
+  return candidates.filter((candidate) => {
+    const key = `${candidate.start}:${candidate.end}:${candidate.rawCandidate}`
+    if (seen.has(key)) {
+      return false
+    }
+    seen.add(key)
+    return true
+  })
+}
+
+function createBareArbitraryValueCandidateContexts(
+  content: string,
+  extension: string,
+  offset: number,
+  options?: ExtractCandidateOptions,
+): ExtractSourceCandidateWithContext[] {
+  return extractBareArbitraryValueSourceCandidatesWithPositions(content, options?.bareArbitraryValues)
+    .map(candidate => ({
+      content,
+      extension,
+      localStart: candidate.start,
+      rawCandidate: candidate.rawCandidate,
+      start: candidate.start + offset,
+      end: candidate.end + offset,
+    }))
+}
+
+async function extractCssApplyCandidates(content: string, extension: string, options?: ExtractCandidateOptions) {
   const candidates: ExtractSourceCandidateWithContext[] = []
   CSS_APPLY_RE.lastIndex = 0
   let match = CSS_APPLY_RE.exec(content)
@@ -239,12 +273,13 @@ async function extractCssApplyCandidates(content: string, extension: string) {
       start: candidate.start + applyParamsStart,
       end: candidate.end + applyParamsStart,
     })))
+    candidates.push(...createBareArbitraryValueCandidateContexts(applyParams, 'html', applyParamsStart, options))
     match = CSS_APPLY_RE.exec(content)
   }
   return candidates
 }
 
-async function extractMixedSourceScriptCandidates(content: string) {
+async function extractMixedSourceScriptCandidates(content: string, options?: ExtractCandidateOptions) {
   const candidates: ExtractSourceCandidateWithContext[] = []
   SFC_SCRIPT_BLOCK_RE.lastIndex = 0
   let match = SFC_SCRIPT_BLOCK_RE.exec(content)
@@ -260,6 +295,7 @@ async function extractMixedSourceScriptCandidates(content: string) {
       start: candidate.start + scriptStart,
       end: candidate.end + scriptStart,
     })))
+    candidates.push(...createBareArbitraryValueCandidateContexts(scriptContent, 'js', scriptStart, options))
     match = SFC_SCRIPT_BLOCK_RE.exec(content)
   }
   return candidates
@@ -278,26 +314,30 @@ function createCandidateCacheKey(
 export async function extractRawCandidatesWithPositions(
   content: string,
   extension: string = 'html',
+  options?: ExtractCandidateOptions,
 ): Promise<ExtractSourceCandidate[]> {
   const { Scanner } = await getOxideModule()
   const scanner = new Scanner({})
   const result = scanner.getCandidatesWithPositions({ content, extension })
 
-  return result.map(({ candidate, position }) => ({
+  const candidates = result.map(({ candidate, position }) => ({
     rawCandidate: candidate,
     start: position,
     end: position + candidate.length,
   }))
+  candidates.push(...extractBareArbitraryValueSourceCandidatesWithPositions(content, options?.bareArbitraryValues))
+  return dedupeCandidatesWithPositions(candidates)
 }
 
 export async function extractSourceCandidatesWithPositions(
   content: string,
   extension: string = 'html',
+  options?: ExtractCandidateOptions,
 ): Promise<ExtractSourceCandidate[]> {
   const normalizedExtension = extension.replace(/^\./, '')
   const candidates: ExtractSourceCandidateWithContext[] = CSS_LIKE_SOURCE_EXTENSION_RE.test(normalizedExtension)
-    ? await extractCssApplyCandidates(content, normalizedExtension)
-    : (await extractRawCandidatesWithPositions(content, normalizedExtension))
+    ? await extractCssApplyCandidates(content, normalizedExtension, options)
+    : (await extractRawCandidatesWithPositions(content, normalizedExtension, options))
         .map(candidate => ({
           ...candidate,
           content,
@@ -305,7 +345,7 @@ export async function extractSourceCandidatesWithPositions(
           localStart: candidate.start,
         }))
   if (MIXED_TEMPLATE_SOURCE_EXTENSION_RE.test(normalizedExtension)) {
-    candidates.push(...await extractMixedSourceScriptCandidates(content))
+    candidates.push(...await extractMixedSourceScriptCandidates(content, options))
   }
   const seen = new Set<string>()
   return candidates.filter((candidate) => {
@@ -324,18 +364,37 @@ export async function extractSourceCandidatesWithPositions(
 export async function extractSourceCandidates(
   content: string,
   extension: string = 'html',
+  options?: ExtractCandidateOptions,
 ): Promise<string[]> {
-  const candidates = await extractSourceCandidatesWithPositions(content, extension)
+  const candidates = await extractSourceCandidatesWithPositions(content, extension, options)
   return [...new Set(candidates.map(candidate => candidate.rawCandidate))]
 }
 
 export async function extractRawCandidates(
   sources?: SourceEntry[],
+  options?: ExtractCandidateOptions,
 ): Promise<string[]> {
   const { Scanner } = await getOxideModule()
   const scanner = new Scanner(sources === undefined ? {} : { sources })
 
-  return scanner.scan()
+  const candidates = new Set(scanner.scan())
+  if (options?.bareArbitraryValues !== undefined && options.bareArbitraryValues !== false) {
+    await Promise.all((scanner.files ?? []).map(async (file) => {
+      try {
+        const content = await fs.readFile(file, 'utf8')
+        const extension = toExtension(file)
+        for (const candidate of extractBareArbitraryValueSourceCandidatesWithPositions(content, options.bareArbitraryValues)) {
+          if (shouldKeepSourceCandidate(content, extension, candidate)) {
+            candidates.add(candidate.rawCandidate)
+          }
+        }
+      }
+      catch {
+        // 文件可能在扫描和读取之间被移除，保持与 Tailwind 原扫描结果一致。
+      }
+    }))
+  }
+  return [...candidates]
 }
 
 export async function extractValidCandidates(options?: ExtractValidCandidatesOption) {
@@ -370,7 +429,12 @@ export async function extractValidCandidates(options?: ExtractValidCandidatesOpt
   const candidateCache = designSystemCandidateCache.get(candidateCacheKey) ?? new Map<string, boolean>()
   designSystemCandidateCache.set(candidateCacheKey, candidateCache)
 
-  const candidates = await extractRawCandidates(sources)
+  const candidates = await extractRawCandidates(
+    sources,
+    providedOptions.bareArbitraryValues === undefined
+      ? undefined
+      : { bareArbitraryValues: providedOptions.bareArbitraryValues },
+  )
   const inlineSources = extractTailwindV4InlineSourceCandidates(css)
   for (const candidate of inlineSources.included) {
     candidates.push(candidate)

package/src/public-api.ts

@@ -2,6 +2,17 @@ import type { TailwindcssMangleConfig } from '@tailwindcss-mangle/config'
 
 export { TailwindcssPatcher } from './api/tailwindcss-patcher'
 export { CacheStore } from './cache/store'
+export {
+  type ConfigFileMigrationEntry,
+  type ConfigFileMigrationReport,
+  migrateConfigFiles,
+  type MigrateConfigFilesOptions,
+  MIGRATION_REPORT_KIND,
+  MIGRATION_REPORT_SCHEMA_VERSION,
+  restoreConfigFiles,
+  type RestoreConfigFilesOptions,
+  type RestoreConfigFilesResult,
+} from './commands/migrate-config'
 export {
   type TailwindcssPatchCliMountOptions,
   type TailwindcssPatchCliOptions,
@@ -22,29 +33,18 @@ export {
   type ValidateJsonFailurePayload,
   type ValidateJsonSuccessPayload,
 } from './commands/validate'
-export {
-  type ConfigFileMigrationEntry,
-  type ConfigFileMigrationReport,
-  migrateConfigFiles,
-  type MigrateConfigFilesOptions,
-  MIGRATION_REPORT_KIND,
-  MIGRATION_REPORT_SCHEMA_VERSION,
-  restoreConfigFiles,
-  type RestoreConfigFilesOptions,
-  type RestoreConfigFilesResult,
-} from './commands/migrate-config'
 export { normalizeOptions } from './config'
 export type { TailwindCssPatchOptions } from './config'
 export {
   extractProjectCandidatesWithPositions,
   extractRawCandidates,
   extractRawCandidatesWithPositions,
+  type ExtractSourceCandidate,
   extractSourceCandidates,
   extractSourceCandidatesWithPositions,
   extractValidCandidates,
   groupTokensByFile,
   resolveProjectSourceFiles,
-  type ExtractSourceCandidate,
 } from './extraction/candidate-extractor'
 export {
   isValidCandidateToken,
@@ -59,22 +59,60 @@ export {
   runTailwindBuild,
 } from './install'
 export { default as logger } from './logger'
+export {
+  collectTailwindStyleCandidates,
+} from './style-candidates'
+export type {
+  TailwindStyleCandidateOptions,
+  TailwindStyleSource,
+} from './style-candidates'
+export {
+  generateCustomStyle,
+  generateTailwindStyle,
+} from './style-generator'
+export type {
+  CustomTailwindStyleGenerateContext,
+  CustomTailwindStyleGenerateOptions,
+  CustomTailwindStyleGenerateResult,
+  TailwindStyleGenerateOptions,
+  TailwindStyleGenerateResult,
+} from './style-generator'
 export * from './types'
 export {
+  generateTailwindV3RawStyle,
+  generateTailwindV3Style,
+} from './v3'
+export type {
+  TailwindV3RawStyleGenerateOptions,
+  TailwindV3RawStyleGenerateResult,
+  TailwindV3StyleGenerateOptions,
+  TailwindV3StyleGenerateResult,
+  TailwindV3StyleLayer,
+} from './v3'
+export {
+  canonicalizeBareArbitraryValueCandidates,
+  collectTailwindV4StyleCandidates,
   createTailwindV4CompiledSourceEntries,
-  createTailwindV4Engine,
   createTailwindV4DefaultIgnoreSources,
+  createTailwindV4Engine,
   createTailwindV4RootSources,
   createTailwindV4SourceEntryMatcher,
   createTailwindV4SourceExclusionMatcher,
+  escapeCssClassName,
   expandTailwindV4SourceEntries,
   expandTailwindV4SourceEntryBraces,
+  extractBareArbitraryValueSourceCandidates,
+  extractBareArbitraryValueSourceCandidatesWithPositions,
+  generateTailwindV4Style,
+  isBareArbitraryValuesEnabled,
   isFileExcludedByTailwindV4SourceEntries,
   isFileMatchedByTailwindV4SourceEntries,
   loadTailwindV4DesignSystem,
   mergeTailwindV4SourceEntries,
   normalizeTailwindV4ScannerSources,
   normalizeTailwindV4SourceEntries,
+  replaceBareArbitraryValueSelectors,
+  resolveBareArbitraryValueCandidate,
   resolveSourceScanPath,
   resolveTailwindV4Source,
   resolveTailwindV4SourceBaseCandidates,
@@ -97,6 +135,9 @@ export type {
   TailwindV4ResolvedSource,
   TailwindV4SourceOptions,
   TailwindV4SourcePattern,
+  TailwindV4StyleGenerateOptions,
+  TailwindV4StyleGenerateResult,
+  TailwindV4StyleSource,
 } from './v4'
 
 export function defineConfig<T extends TailwindcssMangleConfig>(config: T): T {

package/src/style-candidates.ts

@@ -0,0 +1,35 @@
+import type { BareArbitraryValueOptions } from './v4/bare-arbitrary-values'
+import { extractSourceCandidates } from './extraction/candidate-extractor'
+
+export interface TailwindStyleSource {
+  content: string
+  extension?: string
+  file?: string
+}
+
+export interface TailwindStyleCandidateOptions {
+  candidates?: Iterable<string>
+  sources?: TailwindStyleSource[]
+  /**
+   * Enables UnoCSS-style bare arbitrary values such as `p-10%` and `p-2.5px`.
+   */
+  bareArbitraryValues?: boolean | BareArbitraryValueOptions
+}
+
+export async function collectTailwindStyleCandidates(
+  options: TailwindStyleCandidateOptions = {},
+): Promise<Set<string>> {
+  const candidates = new Set<string>()
+  for (const candidate of options.candidates ?? []) {
+    candidates.add(candidate)
+  }
+  for (const source of options.sources ?? []) {
+    const sourceCandidates = await extractSourceCandidates(source.content, source.extension, {
+      bareArbitraryValues: options.bareArbitraryValues,
+    })
+    for (const candidate of sourceCandidates) {
+      candidates.add(candidate)
+    }
+  }
+  return candidates
+}

package/src/style-generator.ts

@@ -0,0 +1,80 @@
+import type {
+  TailwindStyleCandidateOptions,
+  TailwindStyleSource,
+} from './style-candidates'
+import type {
+  TailwindV3StyleGenerateOptions,
+  TailwindV3StyleGenerateResult,
+} from './v3'
+import type {
+  TailwindV4StyleGenerateOptions,
+  TailwindV4StyleGenerateResult,
+} from './v4'
+import { collectTailwindStyleCandidates } from './style-candidates'
+import { generateTailwindV3Style } from './v3'
+import { generateTailwindV4Style } from './v4'
+
+export interface CustomTailwindStyleGenerateContext {
+  tokens: Set<string>
+  classSet: Set<string>
+  sources: TailwindStyleSource[]
+}
+
+export interface CustomTailwindStyleGenerateOptions extends TailwindStyleCandidateOptions {
+  generate: (context: CustomTailwindStyleGenerateContext) => string | Promise<string>
+}
+
+export interface CustomTailwindStyleGenerateResult {
+  version: 'custom'
+  css: string
+  tokens: Set<string>
+  classSet: Set<string>
+  sources: TailwindStyleSource[]
+}
+
+export type TailwindStyleGenerateOptions
+  = | ({ version: 3 } & TailwindV3StyleGenerateOptions)
+    | ({ version: 4 } & TailwindV4StyleGenerateOptions)
+    | ({ version: 'custom' } & CustomTailwindStyleGenerateOptions)
+
+export type TailwindStyleGenerateResult
+  = | TailwindV3StyleGenerateResult
+    | (TailwindV4StyleGenerateResult & { version: 4 })
+    | CustomTailwindStyleGenerateResult
+
+export async function generateCustomStyle(
+  options: CustomTailwindStyleGenerateOptions,
+): Promise<CustomTailwindStyleGenerateResult> {
+  const tokens = await collectTailwindStyleCandidates(options)
+  const classSet = new Set(tokens)
+  const sources = options.sources ?? []
+  const css = await options.generate({
+    tokens,
+    classSet,
+    sources,
+  })
+
+  return {
+    version: 'custom',
+    css,
+    tokens,
+    classSet,
+    sources,
+  }
+}
+
+export async function generateTailwindStyle(
+  options: TailwindStyleGenerateOptions,
+): Promise<TailwindStyleGenerateResult> {
+  if (options.version === 3) {
+    return generateTailwindV3Style(options)
+  }
+  if (options.version === 4) {
+    const result = await generateTailwindV4Style(options)
+    return {
+      ...result,
+      version: 4,
+    }
+  }
+  return generateCustomStyle(options)
+}

package/src/v3/index.ts

@@ -0,0 +1,11 @@
+export {
+  generateTailwindV3RawStyle,
+  generateTailwindV3Style,
+} from './style-generator'
+export type {
+  TailwindV3RawStyleGenerateOptions,
+  TailwindV3RawStyleGenerateResult,
+  TailwindV3StyleGenerateOptions,
+  TailwindV3StyleGenerateResult,
+  TailwindV3StyleLayer,
+} from './style-generator'