tailwindcss-patch 9.4.0 → 9.4.2

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/extraction/split-candidate-tokens.ts

@@ -36,6 +36,9 @@ function splitBracketAware(code: string) {
 
   for (let index = 0; index < code.length; index++) {
     const char = code[index]
+    if (char === undefined) {
+      continue
+    }
     if (bracketDepth > 0 && char === '\\') {
       index++
       continue

package/src/index.bundle.ts

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

package/src/index.ts

@@ -1,104 +1,5 @@
-import type { TailwindcssMangleConfig } from '@tailwindcss-mangle/config'
-
-export { TailwindcssPatcher } from './api/tailwindcss-patcher'
-export { CacheStore } from './cache/store'
 export {
   createTailwindcssPatchCli,
   mountTailwindcssPatchCommands,
-  type TailwindcssPatchCliMountOptions,
-  type TailwindcssPatchCliOptions,
-  type TailwindcssPatchCommand,
-  type TailwindcssPatchCommandContext,
-  type TailwindcssPatchCommandHandler,
-  type TailwindcssPatchCommandHandlerMap,
-  type TailwindcssPatchCommandOptionDefinition,
-  type TailwindcssPatchCommandOptions,
-  tailwindcssPatchCommands,
-  VALIDATE_EXIT_CODES,
-  VALIDATE_FAILURE_REASONS,
-  ValidateCommandError,
-  type ValidateFailureReason,
-  type ValidateFailureSummary,
-  type ValidateJsonFailurePayload,
-  type ValidateJsonSuccessPayload,
 } from './commands/cli'
-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,
-  extractSourceCandidates,
-  extractSourceCandidatesWithPositions,
-  extractValidCandidates,
-  groupTokensByFile,
-  resolveProjectSourceFiles,
-  type ExtractSourceCandidate,
-} from './extraction/candidate-extractor'
-export {
-  isValidCandidateToken,
-  splitCandidateTokens,
-  validateCandidateTokenRE,
-} from './extraction/split-candidate-tokens'
-export {
-  collectClassesFromContexts,
-  collectClassesFromTailwindV4,
-  getPatchStatusReport,
-  loadRuntimeContexts,
-  runTailwindBuild,
-} from './install'
-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,
-  TailwindV4GenerateOptions,
-  TailwindV4GenerateResult,
-  TailwindV4ResolvedSource,
-  TailwindV4SourceOptions,
-  TailwindV4SourcePattern,
-} from './v4'
-
-export function defineConfig<T extends TailwindcssMangleConfig>(config: T): T {
-  return config
-}
+export * from './public-api'

package/src/public-api.ts

@@ -0,0 +1,111 @@
+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,
+  type TailwindcssPatchCommand,
+  type TailwindcssPatchCommandContext,
+  type TailwindcssPatchCommandHandler,
+  type TailwindcssPatchCommandHandlerMap,
+  type TailwindcssPatchCommandOptionDefinition,
+  type TailwindcssPatchCommandOptions,
+  tailwindcssPatchCommands,
+} from './commands/types'
+export {
+  VALIDATE_EXIT_CODES,
+  VALIDATE_FAILURE_REASONS,
+  ValidateCommandError,
+  type ValidateFailureReason,
+  type ValidateFailureSummary,
+  type ValidateJsonFailurePayload,
+  type ValidateJsonSuccessPayload,
+} from './commands/validate'
+export { normalizeOptions } from './config'
+export type { TailwindCssPatchOptions } from './config'
+export {
+  extractProjectCandidatesWithPositions,
+  extractRawCandidates,
+  extractRawCandidatesWithPositions,
+  type ExtractSourceCandidate,
+  extractSourceCandidates,
+  extractSourceCandidatesWithPositions,
+  extractValidCandidates,
+  groupTokensByFile,
+  resolveProjectSourceFiles,
+} from './extraction/candidate-extractor'
+export {
+  isValidCandidateToken,
+  splitCandidateTokens,
+  validateCandidateTokenRE,
+} from './extraction/split-candidate-tokens'
+export {
+  collectClassesFromContexts,
+  collectClassesFromTailwindV4,
+  getPatchStatusReport,
+  loadRuntimeContexts,
+  runTailwindBuild,
+} from './install'
+export { default as logger } from './logger'
+export * from './types'
+export {
+  canonicalizeBareArbitraryValueCandidates,
+  createTailwindV4CompiledSourceEntries,
+  createTailwindV4DefaultIgnoreSources,
+  createTailwindV4Engine,
+  createTailwindV4RootSources,
+  createTailwindV4SourceEntryMatcher,
+  createTailwindV4SourceExclusionMatcher,
+  escapeCssClassName,
+  expandTailwindV4SourceEntries,
+  expandTailwindV4SourceEntryBraces,
+  extractBareArbitraryValueSourceCandidates,
+  extractBareArbitraryValueSourceCandidatesWithPositions,
+  isFileExcludedByTailwindV4SourceEntries,
+  isFileMatchedByTailwindV4SourceEntries,
+  isBareArbitraryValuesEnabled,
+  loadTailwindV4DesignSystem,
+  mergeTailwindV4SourceEntries,
+  normalizeTailwindV4ScannerSources,
+  normalizeTailwindV4SourceEntries,
+  resolveSourceScanPath,
+  replaceBareArbitraryValueSelectors,
+  resolveBareArbitraryValueCandidate,
+  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,
+  TailwindV4GenerateOptions,
+  TailwindV4GenerateResult,
+  TailwindV4ResolvedSource,
+  TailwindV4SourceOptions,
+  TailwindV4SourcePattern,
+} from './v4'
+
+export function defineConfig<T extends TailwindcssMangleConfig>(config: T): T {
+  return config
+}