tailwindcss-patch 9.4.4 → 9.5.0

package/src/extraction/split-candidate-tokens.ts

@@ -1,101 +1,5 @@
-// 参考链接：https://github.com/tailwindlabs/tailwindcss/blob/master/src/lib/regex.js
-// eslint-disable-next-line regexp/no-obscure-range
-export const validateCandidateTokenRE = /[\w\u00A0-\uFFFF%-?]/
-
-export function isValidCandidateToken(token = ''): token is string {
-  return validateCandidateTokenRE.test(token)
-}
-
-const SPLIT_CACHE_LIMIT = 8192
-const ESCAPED_WHITESPACE_RE = /\\[nrt]/g
-const splitCache = new Map<string, string[]>()
-
-function isSplitter(char: string, bracketDepth: number) {
-  return bracketDepth === 0 && (char === '"' || /\s/.test(char))
-}
-
-function hasClosingQuotedArbitraryValue(code: string, start: number, quote: string) {
-  for (let index = start; index < code.length; index++) {
-    if (code[index] === '\\') {
-      index++
-      continue
-    }
-    if (code[index] === quote) {
-      return code.includes(']', index + 1)
-    }
-  }
-
-  return false
-}
-
-function splitBracketAware(code: string) {
-  const result: string[] = []
-  let bracketDepth = 0
-  let bracketQuote: string | undefined
-  let start = 0
-
-  for (let index = 0; index < code.length; index++) {
-    const char = code[index]
-    if (char === undefined) {
-      continue
-    }
-    if (bracketDepth > 0 && char === '\\') {
-      index++
-      continue
-    }
-
-    if (bracketDepth > 0 && (char === '"' || char === '\'')) {
-      if (bracketQuote === char) {
-        bracketQuote = undefined
-      }
-      else if (bracketQuote === undefined && hasClosingQuotedArbitraryValue(code, index + 1, char)) {
-        bracketQuote = char
-      }
-    }
-
-    if (bracketQuote === undefined) {
-      if (char === '[' && code.includes(']', index + 1)) {
-        bracketDepth++
-      }
-      else if (char === ']' && bracketDepth > 0) {
-        bracketDepth--
-      }
-    }
-
-    if (!isSplitter(char, bracketDepth)) {
-      continue
-    }
-
-    const candidate = code.slice(start, index)
-    if (isValidCandidateToken(candidate)) {
-      result.push(candidate)
-    }
-    start = index + 1
-  }
-
-  const candidate = code.slice(start)
-  if (isValidCandidateToken(candidate)) {
-    result.push(candidate)
-  }
-
-  return result
-}
-
-export function splitCandidateTokens(code: string) {
-  const cached = splitCache.get(code)
-  if (cached) {
-    return cached
-  }
-
-  // 把压缩产物中的转义空白字符(\n \r \t)先还原成空格，避免被粘连到类名上。
-  const normalized = code.includes('\\') ? code.replace(ESCAPED_WHITESPACE_RE, ' ') : code
-  const result = splitBracketAware(normalized)
-
-  // 防止缓存无限增长。
-  if (splitCache.size >= SPLIT_CACHE_LIMIT) {
-    splitCache.clear()
-  }
-  splitCache.set(code, result)
-
-  return result
-}
+export {
+  isValidCandidateToken,
+  splitCandidateTokens,
+  validateCandidateTokenRE,
+} from '@tailwindcss-mangle/engine'

package/src/options/types.ts

@@ -1,7 +1,6 @@
-import type { SourceEntry } from '@tailwindcss/oxide'
+import type { TailwindV4SourcePattern as SourceEntry, TailwindV4CssSource } from '@tailwindcss-mangle/engine/v4'
 import type { PackageResolvingOptions } from 'local-pkg'
 import type { ILengthUnitsPatchOptions } from '../types'
-import type { TailwindV4CssSource } from '../v4/types'
 
 export type CacheStrategy = 'merge' | 'overwrite'
 export type CacheDriver = 'file' | 'memory' | 'noop'

package/src/style-candidates.ts

@@ -1,35 +1,5 @@
-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
-}
+export { collectTailwindStyleCandidates } from '@tailwindcss-mangle/engine'
+export type {
+  TailwindStyleCandidateOptions,
+  TailwindStyleSource,
+} from '@tailwindcss-mangle/engine'

package/src/style-generator.ts

@@ -1,80 +1,11 @@
-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)
-}
+export {
+  generateCustomStyle,
+  generateTailwindStyle,
+} from '@tailwindcss-mangle/engine'
+export type {
+  CustomTailwindStyleGenerateContext,
+  CustomTailwindStyleGenerateOptions,
+  CustomTailwindStyleGenerateResult,
+  TailwindStyleGenerateOptions,
+  TailwindStyleGenerateResult,
+} from '@tailwindcss-mangle/engine'

package/src/types.ts

@@ -1,6 +1,3 @@
-import type { SourceEntry } from '@tailwindcss/oxide'
-import type { Node, Rule } from 'postcss'
-import type { Config } from 'tailwindcss'
 import type {
   ApplyOptions,
   CacheOptions,
@@ -16,96 +13,19 @@ import type {
   TailwindV4Options,
 } from './options/types'
 
-type TailwindcssClassCacheEntry = Rule | {
-  layer: string
-  options: Record<string, any>
-  sort: Record<string, any>
-}
-
-export type TailwindcssClassCache = Map<string, TailwindcssClassCacheEntry[]>
-
-export interface TailwindcssRuntimeContext {
-  applyClassCache: Map<any, any>
-  candidateRuleCache: Map<
-    string,
-    Set<
-      [
-        {
-          arbitrary: any
-          index: any
-          layer: string
-          options: any[]
-          parallelIndex: any
-          parentLayer: string
-          variants: any
-        },
-        Node,
-      ]
-    >
-  >
-  candidateRuleMap: Map<string | string, [object, Node][]>
-  changedContent: any[]
-  classCache: TailwindcssClassCache
-  disposables: any[]
-  getClassList: (...args: any[]) => any
-  getClassOrder: (...args: any[]) => any
-  getVariants: (...args: any[]) => any
-  markInvalidUtilityCandidate: (...args: any[]) => any
-  markInvalidUtilityNode: (...args: any[]) => any
-  notClassCache: Set<string>
-  offsets: {
-    layerPositions: object
-    offsets: object
-    reservedVariantBits: any
-    variantOffsets: Map<string, any>
-  }
-  postCssNodeCache: Map<object, [Node]>
-  ruleCache: Set<[object, Node]>
-  stylesheetCache: Record<string, Set<any>>
-  tailwindConfig: Config
-  userConfigPath: string | null
-  variantMap: Map<string, [[object, (...args: any[]) => unknown]]>
-  variantOptions: Map<string, object>
-}
-
-export interface ExtractResult {
-  classList: string[]
-  classSet: Set<string>
-  filename?: string
-}
-
-export interface TailwindTokenLocation {
-  rawCandidate: string
-  file: string
-  relativeFile: string
-  extension: string
-  start: number
-  end: number
-  length: number
-  line: number
-  column: number
-  lineText: string
-}
-
-export type TailwindTokenFileKey = 'relative' | 'absolute'
-
-export interface TailwindTokenReport {
-  entries: TailwindTokenLocation[]
-  filesScanned: number
-  sources: SourceEntry[]
-  skippedFiles: {
-    file: string
-    reason: string
-  }[]
-}
-
-export type TailwindTokenByFileMap = Record<string, TailwindTokenLocation[]>
-
 export interface TailwindPatchRuntime {
   options: NormalizedTailwindCssPatchOptions
   majorVersion: 2 | 3 | 4
 }
 
+export type {
+  CacheClearOptions,
+  CacheClearResult,
+  CacheClearScope,
+  CacheContextMetadata,
+  CacheReadMeta,
+} from './cache/types'
+
 export type {
   ApplyOptions,
   CacheOptions,
@@ -129,7 +49,11 @@ export interface ILengthUnitsPatchOptions {
   destPath?: string
 }
 
-export type PatchCheckStatus = 'applied' | 'not-applied' | 'skipped' | 'unsupported'
+export type PatchCheckStatus
+  = | 'applied'
+    | 'not-applied'
+    | 'skipped'
+    | 'unsupported'
 
 export type PatchName = 'exposeContext' | 'extendLengthUnits'
 
@@ -151,9 +75,11 @@ export interface PatchStatusReport {
 }
 
 export type {
-  CacheClearOptions,
-  CacheClearResult,
-  CacheClearScope,
-  CacheContextMetadata,
-  CacheReadMeta,
-} from './cache/types'
+  ExtractResult,
+  TailwindcssClassCache,
+  TailwindcssRuntimeContext,
+  TailwindTokenByFileMap,
+  TailwindTokenFileKey,
+  TailwindTokenLocation,
+  TailwindTokenReport,
+} from '@tailwindcss-mangle/engine'

package/src/v3/index.ts

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

package/src/v4/index.ts

@@ -1,53 +1,60 @@
-export {
-  escapeCssClassName,
-  extractBareArbitraryValueSourceCandidates,
-  extractBareArbitraryValueSourceCandidatesWithPositions,
-  isBareArbitraryValuesEnabled,
-  resolveBareArbitraryValueCandidate,
-} from './bare-arbitrary-values'
+import type {
+  TailwindV4ResolvedSource,
+  TailwindV4SourceOptions,
+} from '@tailwindcss-mangle/engine/v4'
+import type {
+  NormalizedTailwindCssPatchOptions,
+  TailwindCssPatchOptions,
+} from '../config'
+import { resolveTailwindV4Source } from '@tailwindcss-mangle/engine/v4'
+import path from 'pathe'
+import { normalizeOptions } from '../config'
+
 export {
   canonicalizeBareArbitraryValueCandidates,
-  extractTailwindV4InlineSourceCandidates,
-  replaceBareArbitraryValueSelectors,
-  resolveValidTailwindV4Candidates,
-} from './candidates'
-export { createTailwindV4Engine } from './engine'
-export {
+  collectTailwindV4StyleCandidates,
   compileTailwindV4Source,
-  loadTailwindV4DesignSystem,
-  loadTailwindV4NodeModule,
-} from './node-adapter'
-export {
-  resolveTailwindV4Source,
-  resolveTailwindV4SourceFromPatchOptions,
-  tailwindV4SourceOptionsFromPatchOptions,
-} from './source'
-export {
   createTailwindV4CompiledSourceEntries,
   createTailwindV4DefaultIgnoreSources,
+  createTailwindV4Engine,
   createTailwindV4RootSources,
   createTailwindV4SourceEntryMatcher,
   createTailwindV4SourceExclusionMatcher,
+  escapeCssClassName,
   expandTailwindV4SourceEntries,
   expandTailwindV4SourceEntryBraces,
+  extractBareArbitraryValueSourceCandidates,
+  extractBareArbitraryValueSourceCandidatesWithPositions,
+  extractTailwindV4InlineSourceCandidates,
+  generateTailwindV4Style,
+  getTailwindV4DesignSystemCacheKey,
+  groupTailwindV4SourceEntriesByBase,
+  isBareArbitraryValuesEnabled,
   isFileExcludedByTailwindV4SourceEntries,
   isFileMatchedByTailwindV4SourceEntries,
+  loadTailwindV4DesignSystem,
+  loadTailwindV4NodeModule,
   mergeTailwindV4SourceEntries,
+  normalizeGlobPattern,
   normalizeTailwindV4ScannerSources,
   normalizeTailwindV4SourceEntries,
+  replaceBareArbitraryValueSelectors,
+  resolveBareArbitraryValueCandidate,
   resolveSourceScanPath,
+  resolveTailwindV4Source,
   resolveTailwindV4SourceBaseCandidates,
   resolveTailwindV4SourceEntry,
+  resolveValidTailwindV4Candidates,
   TAILWIND_V4_AUTO_SOURCE_SCAN_PATTERN,
   TAILWIND_V4_IGNORED_CONTENT_DIRS,
   TAILWIND_V4_IGNORED_EXTENSIONS,
   TAILWIND_V4_IGNORED_FILES,
-} from './source-scan'
-export {
-  collectTailwindV4StyleCandidates,
-  generateTailwindV4Style,
-} from './style-generator'
+  toPosixPath,
+} from '@tailwindcss-mangle/engine/v4'
 export type {
+  BareArbitraryValueOptions,
+  BareArbitraryValueResolveResult,
+  BareArbitraryValueSourceCandidate,
   TailwindV4CandidateSource,
   TailwindV4CompiledSourceRoot,
   TailwindV4CssSource,
@@ -61,4 +68,73 @@ export type {
   TailwindV4StyleGenerateOptions,
   TailwindV4StyleGenerateResult,
   TailwindV4StyleSource,
-} from './types'
+} from '@tailwindcss-mangle/engine/v4'
+
+function uniquePaths(values: Iterable<string | undefined>) {
+  const result: string[] = []
+  for (const value of values) {
+    if (!value) {
+      continue
+    }
+    const resolved = path.resolve(value)
+    if (!result.includes(resolved)) {
+      result.push(resolved)
+    }
+  }
+  return result
+}
+
+function resolveConfigDir(config: string | undefined, projectRoot: string) {
+  if (!config) {
+    return undefined
+  }
+  const configPath = path.isAbsolute(config)
+    ? config
+    : path.resolve(projectRoot, config)
+  return path.dirname(configPath)
+}
+
+function createSourceOptionsFromNormalizedPatchOptions(
+  options: NormalizedTailwindCssPatchOptions,
+): TailwindV4SourceOptions {
+  const v4 = options.tailwind.v4
+  const configDir = resolveConfigDir(
+    options.tailwind.config,
+    options.projectRoot,
+  )
+  const baseFallbacks = uniquePaths([
+    v4?.configuredBase,
+    options.tailwind.cwd,
+    options.projectRoot,
+    configDir,
+  ])
+
+  return {
+    projectRoot: options.projectRoot,
+    ...(options.tailwind.cwd === undefined
+      ? {}
+      : { cwd: options.tailwind.cwd }),
+    ...(v4?.configuredBase === undefined ? {} : { base: v4.configuredBase }),
+    baseFallbacks,
+    ...(v4?.css === undefined ? {} : { css: v4.css }),
+    ...(v4?.cssSources === undefined ? {} : { cssSources: v4.cssSources }),
+    ...(v4?.cssEntries === undefined ? {} : { cssEntries: v4.cssEntries }),
+    packageName: options.tailwind.packageName,
+  }
+}
+
+export function tailwindV4SourceOptionsFromPatchOptions(
+  options: TailwindCssPatchOptions,
+): TailwindV4SourceOptions {
+  return createSourceOptionsFromNormalizedPatchOptions(
+    normalizeOptions(options),
+  )
+}
+
+export async function resolveTailwindV4SourceFromPatchOptions(
+  options: TailwindCssPatchOptions,
+): Promise<TailwindV4ResolvedSource> {
+  return resolveTailwindV4Source(
+    tailwindV4SourceOptionsFromPatchOptions(options),
+  )
+}