tailwindcss-patch 9.3.6 → 9.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-patch",
-  "version": "9.3.6",
+  "version": "9.4.0",
   "description": "patch tailwindcss for exposing context and extract classes",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -71,6 +71,7 @@
     "consola": "^3.4.2",
     "fs-extra": "^11.3.5",
     "local-pkg": "^1.2.1",
+    "micromatch": "^4.0.8",
     "pathe": "^2.0.3",
     "postcss": "^8.5.15",
     "semver": "^7.8.1",

package/src/extraction/candidate-extractor.ts

@@ -14,6 +14,10 @@ import {
 } from '../v4/bare-arbitrary-values'
 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>>()
@@ -507,99 +511,12 @@ export interface ResolveProjectSourceFilesOptions {
   filter?: (file: string) => boolean
 }
 
-function expandBracePattern(pattern: string) {
-  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: string[] = []
-  const stack: string[] = []
-  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 normalizeScannerSources(
-  sources: SourceEntry[] | undefined,
-  cwd: string,
-  ignoredSources: SourceEntry[] = [],
-) {
-  const baseSources = sources?.length
-    ? sources
-    : [
-        {
-          base: cwd,
-          pattern: '**/*',
-          negated: false,
-        },
-      ]
-
-  return [...baseSources, ...ignoredSources].flatMap((source) => {
-    const base = source.base ?? cwd
-    return expandBracePattern(source.pattern).map(pattern => ({
-      base,
-      pattern,
-      negated: source.negated,
-    }))
-  })
-}
-
 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: normalizeScannerSources(options?.sources, cwd, options?.ignoredSources),
+      sources: normalizeTailwindV4ScannerSources(options?.sources, cwd, options?.ignoredSources),
     }
   }
 
@@ -611,19 +528,13 @@ async function resolveScannerSources(options?: ResolveProjectSourceFilesOptions)
     css: options.css,
     dependencies: [],
   })
-  const rootSources = (() => {
-    if (compiled.root === 'none') {
-      return []
-    }
-    if (compiled.root === null) {
-      return [{ base, pattern: '**/*', negated: false }]
-    }
-    return [{ ...compiled.root, negated: false }]
-  })()
-
   return {
     cwd,
-    sources: normalizeScannerSources([...rootSources, ...compiled.sources], cwd, options.ignoredSources),
+    sources: normalizeTailwindV4ScannerSources(
+      createTailwindV4CompiledSourceEntries(compiled.root, compiled.sources, base),
+      cwd,
+      options.ignoredSources,
+    ),
   }
 }
 

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

@@ -0,0 +1,98 @@
+// 参考链接：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 (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
+}

package/src/index.ts

@@ -46,6 +46,11 @@ export {
   resolveProjectSourceFiles,
   type ExtractSourceCandidate,
 } from './extraction/candidate-extractor'
+export {
+  isValidCandidateToken,
+  splitCandidateTokens,
+  validateCandidateTokenRE,
+} from './extraction/split-candidate-tokens'
 export {
   collectClassesFromContexts,
   collectClassesFromTailwindV4,
@@ -56,14 +61,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,
@@ -71,6 +96,7 @@ export type {
   TailwindV4GenerateResult,
   TailwindV4ResolvedSource,
   TailwindV4SourceOptions,
+  TailwindV4SourcePattern,
 } from './v4'
 
 export function defineConfig<T extends TailwindcssMangleConfig>(config: T): T {

package/src/v4/engine.ts

@@ -13,6 +13,7 @@ import {
   resolveValidTailwindV4Candidates,
 } from './candidates'
 import { compileTailwindV4Source, loadTailwindV4DesignSystem } from './node-adapter'
+import { createTailwindV4CompiledSourceEntries } from './source-scan'
 
 function resolveScanSources(
   options: TailwindV4GenerateOptions | undefined,
@@ -24,16 +25,7 @@ function resolveScanSources(
     return options.scanSources
   }
   if (options?.scanSources === true) {
-    const rootSources = (() => {
-      if (compiledRoot === 'none') {
-        return []
-      }
-      if (compiledRoot === null) {
-        return [{ base: source.base, pattern: '**/*', negated: false }]
-      }
-      return [{ ...compiledRoot, negated: false }]
-    })()
-    return [...rootSources, ...compiledSources]
+    return createTailwindV4CompiledSourceEntries(compiledRoot, compiledSources, source.base)
   }
   return []
 }

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
 }