tailwindcss-patch 9.4.0 → 9.4.2

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',

package/dist/index.bundle-CGaLDIgy.js

@@ -1,259 +0,0 @@
-const require_chunk = require("./chunk-8l464Juk.js");
-const require_validate = require("./validate-D9fDrE9I.js");
-let node_module = require("node:module");
-let node_process = require("node:process");
-node_process = require_chunk.__toESM(node_process);
-let pathe = require("pathe");
-pathe = require_chunk.__toESM(pathe);
-let node_fs = require("node:fs");
-//#region src/v4/engine.ts
-function resolveScanSources(options, source, compiledRoot, compiledSources) {
-	if (Array.isArray(options?.scanSources)) return options.scanSources;
-	if (options?.scanSources === true) return require_validate.createTailwindV4CompiledSourceEntries(compiledRoot, compiledSources, source.base);
-	return [];
-}
-async function collectRawCandidates(source, options, compiledRoot, compiledSources = []) {
-	const rawCandidates = /* @__PURE__ */ new Set();
-	for (const candidate of options?.candidates ?? []) rawCandidates.add(candidate);
-	for (const candidateSource of options?.sources ?? []) {
-		const candidates = await require_validate.extractRawCandidatesWithPositions(candidateSource.content, candidateSource.extension);
-		for (const candidate of candidates) rawCandidates.add(candidate.rawCandidate);
-	}
-	const filesystemSources = resolveScanSources(options, source, compiledRoot, compiledSources);
-	if (filesystemSources.length > 0) for (const candidate of await require_validate.extractRawCandidates(filesystemSources)) rawCandidates.add(candidate);
-	const inlineSources = require_validate.extractTailwindV4InlineSourceCandidates(source.css);
-	for (const candidate of inlineSources.included) rawCandidates.add(candidate);
-	for (const candidate of inlineSources.excluded) rawCandidates.delete(candidate);
-	return rawCandidates;
-}
-function createTailwindV4Engine(source) {
-	return {
-		source,
-		loadDesignSystem() {
-			return require_validate.loadTailwindV4DesignSystem(source);
-		},
-		async validateCandidates(candidates) {
-			return require_validate.resolveValidTailwindV4Candidates(await require_validate.loadTailwindV4DesignSystem(source), candidates);
-		},
-		async generate(options) {
-			const { compiled, dependencies } = await require_validate.compileTailwindV4Source(source);
-			const rawCandidates = await collectRawCandidates(source, options, compiled.root, compiled.sources);
-			const classSet = require_validate.resolveValidTailwindV4Candidates(await require_validate.loadTailwindV4DesignSystem(source), rawCandidates, { ...options?.bareArbitraryValues === void 0 ? {} : { bareArbitraryValues: options.bareArbitraryValues } });
-			const inlineSources = require_validate.extractTailwindV4InlineSourceCandidates(source.css);
-			for (const candidate of inlineSources.excluded) classSet.delete(candidate);
-			const buildCandidates = require_validate.canonicalizeBareArbitraryValueCandidates(classSet, options?.bareArbitraryValues);
-			return {
-				css: require_validate.replaceBareArbitraryValueSelectors(compiled.build(buildCandidates), classSet, options?.bareArbitraryValues),
-				classSet,
-				rawCandidates,
-				dependencies: Array.from(dependencies),
-				sources: compiled.sources,
-				root: compiled.root
-			};
-		}
-	};
-}
-//#endregion
-//#region src/v4/source.ts
-function resolveBase(value, fallback) {
-	return value === void 0 ? fallback : pathe.default.isAbsolute(value) ? pathe.default.resolve(value) : pathe.default.resolve(fallback, value);
-}
-function uniquePaths(values) {
-	const result = [];
-	for (const value of values) {
-		if (!value) continue;
-		const resolved = pathe.default.resolve(value);
-		if (!result.includes(resolved)) result.push(resolved);
-	}
-	return result;
-}
-function toCssImportPath(value) {
-	return value.replaceAll("\\", "/");
-}
-function quoteCssImport(value) {
-	return value.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"");
-}
-function isPostcssPluginSpecifier(packageName) {
-	return packageName === "@tailwindcss/postcss" || /(?:^|[/\\])@tailwindcss[/\\]postcss(?:[/\\]|$)/.test(packageName) || /(?:^|[/\\])postcss(?:[/\\]|$)/i.test(packageName) || /postcss\.config\.[cm]?[jt]s$/i.test(packageName);
-}
-function createDefaultCss(packageName) {
-	return `@import "${quoteCssImport(toCssImportPath(packageName && !isPostcssPluginSpecifier(packageName) ? packageName : "tailwindcss"))}";`;
-}
-async function pathExists(filePath) {
-	try {
-		await node_fs.promises.access(filePath);
-		return true;
-	} catch {
-		return false;
-	}
-}
-async function resolveCssEntries(entries, projectRoot, base) {
-	const resolvedEntries = entries.map((entry) => ({
-		original: entry,
-		absolute: pathe.default.isAbsolute(entry) ? pathe.default.resolve(entry) : pathe.default.resolve(projectRoot, entry)
-	}));
-	const resolvedBase = base ?? pathe.default.dirname(resolvedEntries[0]?.absolute ?? projectRoot);
-	const dependencies = resolvedEntries.map((entry) => entry.absolute);
-	const cssParts = [];
-	for (const entry of resolvedEntries) {
-		if (await pathExists(entry.absolute)) {
-			cssParts.push(await node_fs.promises.readFile(entry.absolute, "utf8"));
-			continue;
-		}
-		const importPath = pathe.default.isAbsolute(entry.original) ? entry.absolute : pathe.default.relative(resolvedBase, entry.absolute);
-		cssParts.push(`@import "${quoteCssImport(toCssImportPath(importPath))}";`);
-	}
-	return {
-		base: resolvedBase,
-		css: cssParts.join("\n"),
-		dependencies
-	};
-}
-function resolveCssSources(sources, projectRoot, base) {
-	const resolvedSources = sources.map((source) => ({
-		...source,
-		base: source.base === void 0 ? void 0 : resolveBase(source.base, projectRoot),
-		file: source.file === void 0 ? void 0 : pathe.default.isAbsolute(source.file) ? pathe.default.resolve(source.file) : pathe.default.resolve(projectRoot, source.file),
-		dependencies: source.dependencies?.map((dependency) => pathe.default.isAbsolute(dependency) ? pathe.default.resolve(dependency) : pathe.default.resolve(projectRoot, dependency)) ?? []
-	}));
-	const firstSource = resolvedSources[0];
-	const resolvedBase = base ?? firstSource?.base ?? (firstSource?.file ? pathe.default.dirname(firstSource.file) : projectRoot);
-	const dependencies = resolvedSources.flatMap((source) => [source.file, ...source.dependencies]).filter((dependency) => Boolean(dependency));
-	return {
-		base: resolvedBase,
-		css: resolvedSources.map((source) => source.css).join("\n"),
-		dependencies
-	};
-}
-function normalizeResolvedSource(source) {
-	const baseFallbacks = uniquePaths([
-		...source.baseFallbacks,
-		source.projectRoot,
-		source.cwd
-	]).filter((base) => base !== source.base);
-	return {
-		projectRoot: source.projectRoot,
-		base: source.base,
-		baseFallbacks,
-		css: source.css,
-		dependencies: Array.from(new Set(source.dependencies.map((dependency) => pathe.default.resolve(dependency))))
-	};
-}
-async function resolveTailwindV4Source(options = {}) {
-	const projectRoot = resolveBase(options.projectRoot, node_process.default.cwd());
-	const cwd = resolveBase(options.cwd, projectRoot);
-	const configuredBase = options.base === void 0 ? void 0 : resolveBase(options.base, projectRoot);
-	const baseFallbacks = uniquePaths(options.baseFallbacks?.map((base) => resolveBase(base, projectRoot)) ?? []);
-	if (options.css !== void 0) return normalizeResolvedSource({
-		projectRoot,
-		cwd,
-		base: configuredBase ?? cwd,
-		baseFallbacks,
-		css: options.css,
-		dependencies: []
-	});
-	if (options.cssEntries?.length || options.cssSources?.length) {
-		const entries = options.cssEntries?.length ? await resolveCssEntries(options.cssEntries, projectRoot, configuredBase) : void 0;
-		const sources = options.cssSources?.length ? resolveCssSources(options.cssSources, projectRoot, configuredBase) : void 0;
-		const css = [entries?.css, sources?.css].filter(Boolean).join("\n");
-		return normalizeResolvedSource({
-			projectRoot,
-			cwd,
-			base: configuredBase ?? entries?.base ?? sources?.base ?? cwd,
-			baseFallbacks,
-			css,
-			dependencies: [...entries?.dependencies ?? [], ...sources?.dependencies ?? []]
-		});
-	}
-	return normalizeResolvedSource({
-		projectRoot,
-		cwd,
-		base: configuredBase ?? cwd,
-		baseFallbacks,
-		css: createDefaultCss(options.packageName),
-		dependencies: []
-	});
-}
-function resolveConfigDir(config, projectRoot) {
-	if (!config) return;
-	const configPath = pathe.default.isAbsolute(config) ? config : pathe.default.resolve(projectRoot, config);
-	return pathe.default.dirname(configPath);
-}
-function createSourceOptionsFromNormalizedPatchOptions(options) {
-	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 === void 0 ? {} : { cwd: options.tailwind.cwd },
-		...v4?.configuredBase === void 0 ? {} : { base: v4.configuredBase },
-		baseFallbacks,
-		...v4?.css === void 0 ? {} : { css: v4.css },
-		...v4?.cssSources === void 0 ? {} : { cssSources: v4.cssSources },
-		...v4?.cssEntries === void 0 ? {} : { cssEntries: v4.cssEntries },
-		packageName: options.tailwind.packageName
-	};
-}
-function tailwindV4SourceOptionsFromPatchOptions(options) {
-	return createSourceOptionsFromNormalizedPatchOptions(require_validate.normalizeOptions(options));
-}
-async function resolveTailwindV4SourceFromPatchOptions(options) {
-	return resolveTailwindV4Source(tailwindV4SourceOptionsFromPatchOptions(options));
-}
-//#endregion
-//#region src/index.bundle.ts
-const require$1 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
-function loadCliModule() {
-	return require$1("./commands/cli-runtime.js");
-}
-function mountTailwindcssPatchCommands(cli, options = {}) {
-	return loadCliModule().mountTailwindcssPatchCommands(cli, options);
-}
-function createTailwindcssPatchCli(options = {}) {
-	return loadCliModule().createTailwindcssPatchCli(options);
-}
-function defineConfig(config) {
-	return config;
-}
-//#endregion
-Object.defineProperty(exports, "createTailwindV4Engine", {
-	enumerable: true,
-	get: function() {
-		return createTailwindV4Engine;
-	}
-});
-Object.defineProperty(exports, "createTailwindcssPatchCli", {
-	enumerable: true,
-	get: function() {
-		return createTailwindcssPatchCli;
-	}
-});
-Object.defineProperty(exports, "defineConfig", {
-	enumerable: true,
-	get: function() {
-		return defineConfig;
-	}
-});
-Object.defineProperty(exports, "mountTailwindcssPatchCommands", {
-	enumerable: true,
-	get: function() {
-		return mountTailwindcssPatchCommands;
-	}
-});
-Object.defineProperty(exports, "resolveTailwindV4Source", {
-	enumerable: true,
-	get: function() {
-		return resolveTailwindV4Source;
-	}
-});
-Object.defineProperty(exports, "resolveTailwindV4SourceFromPatchOptions", {
-	enumerable: true,
-	get: function() {
-		return resolveTailwindV4SourceFromPatchOptions;
-	}
-});