tailwindcss-patch 9.4.1 → 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/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,
@@ -61,21 +61,28 @@ export {
 export { default as logger } from './logger'
 export * from './types'
 export {
+  canonicalizeBareArbitraryValueCandidates,
   createTailwindV4CompiledSourceEntries,
-  createTailwindV4Engine,
   createTailwindV4DefaultIgnoreSources,
+  createTailwindV4Engine,
   createTailwindV4RootSources,
   createTailwindV4SourceEntryMatcher,
   createTailwindV4SourceExclusionMatcher,
+  escapeCssClassName,
   expandTailwindV4SourceEntries,
   expandTailwindV4SourceEntryBraces,
+  extractBareArbitraryValueSourceCandidates,
+  extractBareArbitraryValueSourceCandidatesWithPositions,
   isFileExcludedByTailwindV4SourceEntries,
   isFileMatchedByTailwindV4SourceEntries,
+  isBareArbitraryValuesEnabled,
   loadTailwindV4DesignSystem,
   mergeTailwindV4SourceEntries,
   normalizeTailwindV4ScannerSources,
   normalizeTailwindV4SourceEntries,
   resolveSourceScanPath,
+  replaceBareArbitraryValueSelectors,
+  resolveBareArbitraryValueCandidate,
   resolveTailwindV4Source,
   resolveTailwindV4SourceBaseCandidates,
   resolveTailwindV4SourceEntry,

package/src/v4/bare-arbitrary-values.ts

@@ -10,6 +10,12 @@ export interface BareArbitraryValueResolveResult {
   canonicalCandidate: string
 }
 
+export interface BareArbitraryValueSourceCandidate {
+  rawCandidate: string
+  start: number
+  end: number
+}
+
 const DEFAULT_BARE_ARBITRARY_VALUE_UNITS = [
   '%',
   'px',
@@ -41,6 +47,8 @@ const DEFAULT_BARE_ARBITRARY_VALUE_UNITS = [
 const NUMBER_RE = /^-?(?:\d+|\d*\.\d+)$/
 const FUNCTION_VALUE_RE = /^[a-z_-][\w-]*\(/i
 const HEX_ESCAPE_RE = /^[\da-f]$/i
+const ASPECT_RATIO_RE = /^\d+\/\d+$/
+const ESCAPED_WHITESPACE_RE = /\\[nrt]/g
 
 function splitVariantPrefix(candidate: string) {
   let depth = 0
@@ -221,6 +229,10 @@ function normalizeBareArbitraryValueOptions(options: boolean | BareArbitraryValu
   }
 }
 
+export function isBareArbitraryValuesEnabled(options: boolean | BareArbitraryValueOptions | undefined) {
+  return normalizeBareArbitraryValueOptions(options) !== undefined
+}
+
 function normalizeEscapedValue(value: string) {
   let result = ''
   for (let index = 0; index < value.length; index++) {
@@ -276,13 +288,17 @@ function resolveValueWithUnit(body: string, units: string[]) {
   }
 }
 
-function resolveArbitraryValue(body: string, units: string[]) {
+function resolveArbitraryValue(utility: string, body: string, units: string[]) {
   const value = normalizeEscapedValue(body)
   const withUnit = resolveValueWithUnit(value, units)
   if (withUnit) {
     return withUnit
   }
 
+  if (utility === 'aspect' && ASPECT_RATIO_RE.test(value)) {
+    return value
+  }
+
   if (isHexColorValue(value)) {
     return value
   }
@@ -292,6 +308,9 @@ function resolveArbitraryValue(body: string, units: string[]) {
   }
 
   if (FUNCTION_VALUE_RE.test(value) && value.endsWith(')') && isBalancedFunctionValue(value)) {
+    if (utility === 'text' && /^var\(/i.test(value)) {
+      return `color:${value}`
+    }
     return value
   }
 }
@@ -339,7 +358,7 @@ function resolveUtilityAndValue(body: string, units: string[]) {
       continue
     }
 
-    const value = resolveArbitraryValue(rawValue, units)
+    const value = resolveArbitraryValue(utility, rawValue, units)
     if (value) {
       return {
         utility,
@@ -380,6 +399,112 @@ export function resolveBareArbitraryValueCandidate(
   }
 }
 
+function isBareArbitrarySourceSplitter(char: string) {
+  return /\s/.test(char)
+}
+
+function isQuoteBoundary(content: string, start: number, index: number) {
+  const tokenPrefix = content.slice(start, index)
+  return tokenPrefix.length === 0 || !tokenPrefix.endsWith('-')
+}
+
+function trimBareArbitrarySourceToken(token: string, start: number) {
+  let nextToken = token
+  let nextStart = start
+  while (nextToken.length > 0 && /^[<{([]$/.test(nextToken[0]!)) {
+    nextToken = nextToken.slice(1)
+    nextStart++
+  }
+  while (nextToken.length > 0 && /^[>\],;]$/.test(nextToken[nextToken.length - 1]!)) {
+    nextToken = nextToken.slice(0, -1)
+  }
+  return {
+    token: nextToken,
+    start: nextStart,
+  }
+}
+
+function pushBareArbitrarySourceCandidate(
+  result: BareArbitraryValueSourceCandidate[],
+  token: string,
+  start: number,
+  options: boolean | BareArbitraryValueOptions | undefined,
+) {
+  const trimmed = trimBareArbitrarySourceToken(token, start)
+  if (!trimmed.token || trimmed.token.includes('=') || trimmed.token.includes('[') || trimmed.token.includes(']')) {
+    return
+  }
+  if (!resolveBareArbitraryValueCandidate(trimmed.token, options)) {
+    return
+  }
+  result.push({
+    rawCandidate: trimmed.token,
+    start: trimmed.start,
+    end: trimmed.start + trimmed.token.length,
+  })
+}
+
+export function extractBareArbitraryValueSourceCandidatesWithPositions(
+  content: string,
+  options?: boolean | BareArbitraryValueOptions,
+): BareArbitraryValueSourceCandidate[] {
+  if (!isBareArbitraryValuesEnabled(options)) {
+    return []
+  }
+
+  const normalized = content.includes('\\') ? content.replace(ESCAPED_WHITESPACE_RE, ' ') : content
+  const result: BareArbitraryValueSourceCandidate[] = []
+  let depth = 0
+  let quote: string | undefined
+  let start = 0
+
+  for (let index = 0; index < normalized.length; index++) {
+    const char = normalized[index]
+    if (char === undefined) {
+      continue
+    }
+    if (char === '\\') {
+      index++
+      continue
+    }
+
+    if (quote) {
+      if (char === quote) {
+        quote = undefined
+      }
+    }
+    else if ((char === '"' || char === '\'' || char === '`') && !isQuoteBoundary(normalized, start, index)) {
+      quote = char
+    }
+    else if (char === '(' || char === '{' || char === '[') {
+      depth++
+    }
+    else if (char === ')' || char === '}' || char === ']') {
+      depth = Math.max(0, depth - 1)
+    }
+
+    if (!isBareArbitrarySourceSplitter(char) && !((char === '"' || char === '\'' || char === '`') && depth === 0 && isQuoteBoundary(normalized, start, index))) {
+      continue
+    }
+
+    pushBareArbitrarySourceCandidate(result, normalized.slice(start, index), start, options)
+    start = index + 1
+  }
+
+  pushBareArbitrarySourceCandidate(result, normalized.slice(start), start, options)
+  return result
+}
+
+export function extractBareArbitraryValueSourceCandidates(
+  content: string,
+  options?: boolean | BareArbitraryValueOptions,
+) {
+  return [...new Set(
+    extractBareArbitraryValueSourceCandidatesWithPositions(content, options)
+      .map(candidate => candidate.rawCandidate),
+  )]
+}
+
 // Based on the CSS.escape algorithm, scoped to class selector escaping.
 export function escapeCssClassName(value: string) {
   let result = ''

package/src/v4/engine.ts

@@ -37,13 +37,16 @@ async function collectRawCandidates(
   compiledSources: TailwindV4SourcePattern[] = [],
 ) {
   const rawCandidates = new Set<string>()
+  const extractOptions = options?.bareArbitraryValues === undefined
+    ? undefined
+    : { bareArbitraryValues: options.bareArbitraryValues }
 
   for (const candidate of options?.candidates ?? []) {
     rawCandidates.add(candidate)
   }
 
   for (const candidateSource of options?.sources ?? []) {
-    const candidates = await extractRawCandidatesWithPositions(candidateSource.content, candidateSource.extension)
+    const candidates = await extractRawCandidatesWithPositions(candidateSource.content, candidateSource.extension, extractOptions)
     for (const candidate of candidates) {
       rawCandidates.add(candidate.rawCandidate)
     }
@@ -51,7 +54,7 @@ async function collectRawCandidates(
 
   const filesystemSources = resolveScanSources(options, source, compiledRoot, compiledSources)
   if (filesystemSources.length > 0) {
-    for (const candidate of await extractRawCandidates(filesystemSources)) {
+    for (const candidate of await extractRawCandidates(filesystemSources, extractOptions)) {
       rawCandidates.add(candidate)
     }
   }

package/src/v4/index.ts

@@ -1,13 +1,27 @@
 export {
+  canonicalizeBareArbitraryValueCandidates,
   extractTailwindV4InlineSourceCandidates,
+  replaceBareArbitraryValueSelectors,
   resolveValidTailwindV4Candidates,
 } from './candidates'
+export {
+  escapeCssClassName,
+  extractBareArbitraryValueSourceCandidates,
+  extractBareArbitraryValueSourceCandidatesWithPositions,
+  isBareArbitraryValuesEnabled,
+  resolveBareArbitraryValueCandidate,
+} from './bare-arbitrary-values'
 export { createTailwindV4Engine } from './engine'
 export {
   compileTailwindV4Source,
   loadTailwindV4DesignSystem,
   loadTailwindV4NodeModule,
 } from './node-adapter'
+export {
+  resolveTailwindV4Source,
+  resolveTailwindV4SourceFromPatchOptions,
+  tailwindV4SourceOptionsFromPatchOptions,
+} from './source'
 export {
   createTailwindV4CompiledSourceEntries,
   createTailwindV4DefaultIgnoreSources,
@@ -29,11 +43,6 @@ export {
   TAILWIND_V4_IGNORED_EXTENSIONS,
   TAILWIND_V4_IGNORED_FILES,
 } from './source-scan'
-export {
-  resolveTailwindV4Source,
-  resolveTailwindV4SourceFromPatchOptions,
-  tailwindV4SourceOptionsFromPatchOptions,
-} from './source'
 export type {
   TailwindV4CandidateSource,
   TailwindV4CompiledSourceRoot,

package/src/v4/node-adapter.ts

@@ -1,7 +1,7 @@
 import type {
+  TailwindV4CompiledSourceRoot,
   TailwindV4DesignSystem,
   TailwindV4ResolvedSource,
-  TailwindV4CompiledSourceRoot,
   TailwindV4SourcePattern,
 } from './types'
 import { createRequire } from 'node:module'

package/src/v4/source-scan.ts

@@ -3,8 +3,8 @@ import type { TailwindV4CompiledSourceRoot, TailwindV4SourcePattern } from './ty
 import { realpathSync } from 'node:fs'
 import { stat } from 'node:fs/promises'
 import process from 'node:process'
-import path from 'pathe'
 import micromatch from 'micromatch'
+import path from 'pathe'
 
 export const TAILWIND_V4_IGNORED_CONTENT_DIRS = [
   '.git',