* fix incorrect comment
Probably messed this up in another PR, so just a bit of cleaning.
* implement a formatVariantSelector function
This will be used to eventually simplify the addVariant API.
The idea is that it can take a list of strings that define a certain
format. Then it squashes everything to a single format how you would
expect it.
E.g.:
Input:
- '&:hover'
- '&:focus'
- '.dark &'
- ':merge(.group):hover &'
- ':merge(.group):focus &'
Output:
- ':merge(.group):focus:hover .dark &:focus:hover'
The API here is:
- `&`, this means "The parent" or "The previous selector" (you can
think of it like if you are using nested selectors)
- `:merge(.group)`, this means insert a `.group` if it doesn't exist
yet, but if it does exist already, then merge the new value with the
old value. This allows us to merge group-focus, group-hover into a
single `.group:focus:hover ...`
* add new `format`, `withRule` and `wrap` API for addVariant
* implement backwards compatibility
This will ensure that the backwards compatibility for `modifySelectors`
and direct mutations to the `container` will still work.
We will try to capture the changes made to the `rule.selector`, we will
also "backup" the existing selector. This allows us to diff the old and
new selectors and determine what actually happened.
Once we know this, we can restore the selector to the "old" selector and
add the diffed string e.g.: `.foo &`, to the `collectedFormats` as if
you called `format()` directly. This is a bunch of extra work, but it
allows us to be backwards compatible.
In the future we could also warn if you are using `modifySelectors`, but
it is going to be a little bit tricky, because usually that's
implemented by plugin authors and therefore you don't have direct
control over this. Maybe we can figure out the plugin this is used in
and change the warning somehow?
* fix incorrect test
This was clearly a bug, keyframes should not include escaped variants at
all. The reason this is here in the first place is because the nodes in
a keyframe are also "rule" nodes.
* swap the order of pseudo states
The current implementation had a strange side effect, that resulted in
incorrect class definitions. When you are combining the `:hover` and
`:focus` event, then there is no difference between `:hover:focus` and
`:focus:hover`.
However, when you use `:hover::file-selector-button` or `::file-selector-button:hover`,
then there is a big difference. In the first place, you can hover over the full file input
to apply changes to the `File selector button`.
In the second scenario you have to hover over the `File selector button` itself to apply changes.
You can think of it as function calls:
- focus(hover(text-center))
What you would expect is something like this:
`.focus\:hover\:text-center:hover:focus`, where `hover` is on the
inside, and `focus` is on the outside. However in the current
implementation this is implemented as
`.focus\:hover\:text-cener:focus:hover`
* add more variant tests for the new API
* update parallel variants tests to make use of new API
* implement core variants with new API
* simplify/cleanup existing plugin utils
We can get rid of this because we drastically simplified the new
addVariant API.
* add addVariant shorthand signature
The current API looks like this:
```js
addVariant('name', ({ format, wrap }) => {
// Wrap in an atRule
wrap(postcss.atRule({ name: 'media', params: '(prefers-reduced-motion: reduce)' }))
// "Mutate" the selector, for example prepend `.dark`
format('.dark &')
})
```
It is also pretty common to have this:
```js
addVariant('name', ({ format }) => format('.dark &'))
```
So we simplified this to:
```js
addVariant('name', '.dark &')
```
It is also pretty common to have this:
```js
addVariant('name', ({ wrap }) => wrap(postcss.atRule({ name: 'media', params: '(prefers-reduced-motion: reduce)' })))
```
So we simplified this to:
```js
addVariant('name', '@media (prefers-reduced-motion: reduce)')
```
* improve fontVariantNumeric implementation
We will use `@defaults`, so that only the resets are injected for the
utilities we actually use.
* fix typo
* allow for nested addVariant shorthand
This will allow to write something like:
```js
addVariant('name', `
@supports (hover: hover) {
@media (print) {
&:hover
}
}
`)
// Or as a one-liner
addVariant('name', '@supports (hover: hover) { @media (print) { &:hover } }')
```
* update changelog
476 lines
14 KiB
JavaScript
476 lines
14 KiB
JavaScript
import postcss from 'postcss'
|
|
import selectorParser from 'postcss-selector-parser'
|
|
import parseObjectStyles from '../util/parseObjectStyles'
|
|
import isPlainObject from '../util/isPlainObject'
|
|
import prefixSelector from '../util/prefixSelector'
|
|
import { updateAllClasses } from '../util/pluginUtils'
|
|
import log from '../util/log'
|
|
import { formatVariantSelector, finalizeSelector } from '../util/formatVariantSelector'
|
|
|
|
let classNameParser = selectorParser((selectors) => {
|
|
return selectors.first.filter(({ type }) => type === 'class').pop().value
|
|
})
|
|
|
|
function getClassNameFromSelector(selector) {
|
|
return classNameParser.transformSync(selector)
|
|
}
|
|
|
|
// Generate match permutations for a class candidate, like:
|
|
// ['ring-offset-blue', '100']
|
|
// ['ring-offset', 'blue-100']
|
|
// ['ring', 'offset-blue-100']
|
|
// Example with dynamic classes:
|
|
// ['grid-cols', '[[linename],1fr,auto]']
|
|
// ['grid', 'cols-[[linename],1fr,auto]']
|
|
function* candidatePermutations(candidate, lastIndex = Infinity) {
|
|
if (lastIndex < 0) {
|
|
return
|
|
}
|
|
|
|
let dashIdx
|
|
|
|
if (lastIndex === Infinity && candidate.endsWith(']')) {
|
|
let bracketIdx = candidate.indexOf('[')
|
|
|
|
// If character before `[` isn't a dash or a slash, this isn't a dynamic class
|
|
// eg. string[]
|
|
dashIdx = ['-', '/'].includes(candidate[bracketIdx - 1]) ? bracketIdx - 1 : -1
|
|
} else {
|
|
dashIdx = candidate.lastIndexOf('-', lastIndex)
|
|
}
|
|
|
|
if (dashIdx < 0) {
|
|
return
|
|
}
|
|
|
|
let prefix = candidate.slice(0, dashIdx)
|
|
let modifier = candidate.slice(dashIdx + 1)
|
|
|
|
yield [prefix, modifier]
|
|
|
|
yield* candidatePermutations(candidate, dashIdx - 1)
|
|
}
|
|
|
|
function applyPrefix(matches, context) {
|
|
if (matches.length === 0 || context.tailwindConfig.prefix === '') {
|
|
return matches
|
|
}
|
|
|
|
for (let match of matches) {
|
|
let [meta] = match
|
|
if (meta.options.respectPrefix) {
|
|
let container = postcss.root({ nodes: [match[1].clone()] })
|
|
container.walkRules((r) => {
|
|
r.selector = prefixSelector(context.tailwindConfig.prefix, r.selector)
|
|
})
|
|
match[1] = container.nodes[0]
|
|
}
|
|
}
|
|
|
|
return matches
|
|
}
|
|
|
|
function applyImportant(matches) {
|
|
if (matches.length === 0) {
|
|
return matches
|
|
}
|
|
let result = []
|
|
|
|
for (let [meta, rule] of matches) {
|
|
let container = postcss.root({ nodes: [rule.clone()] })
|
|
container.walkRules((r) => {
|
|
r.selector = updateAllClasses(r.selector, (className) => {
|
|
return `!${className}`
|
|
})
|
|
r.walkDecls((d) => (d.important = true))
|
|
})
|
|
result.push([{ ...meta, important: true }, container.nodes[0]])
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
// Takes a list of rule tuples and applies a variant like `hover`, sm`,
|
|
// whatever to it. We used to do some extra caching here to avoid generating
|
|
// a variant of the same rule more than once, but this was never hit because
|
|
// we cache at the entire selector level further up the tree.
|
|
//
|
|
// Technically you can get a cache hit if you have `hover:focus:text-center`
|
|
// and `focus:hover:text-center` in the same project, but it doesn't feel
|
|
// worth the complexity for that case.
|
|
|
|
function applyVariant(variant, matches, context) {
|
|
if (matches.length === 0) {
|
|
return matches
|
|
}
|
|
|
|
if (context.variantMap.has(variant)) {
|
|
let variantFunctionTuples = context.variantMap.get(variant)
|
|
let result = []
|
|
|
|
for (let [meta, rule] of matches) {
|
|
let container = postcss.root({ nodes: [rule.clone()] })
|
|
|
|
for (let [variantSort, variantFunction] of variantFunctionTuples) {
|
|
let clone = container.clone()
|
|
let collectedFormats = []
|
|
|
|
let originals = new Map()
|
|
|
|
function prepareBackup() {
|
|
if (originals.size > 0) return // Already prepared, chicken out
|
|
clone.walkRules((rule) => originals.set(rule, rule.selector))
|
|
}
|
|
|
|
function modifySelectors(modifierFunction) {
|
|
prepareBackup()
|
|
clone.each((rule) => {
|
|
if (rule.type !== 'rule') {
|
|
return
|
|
}
|
|
|
|
rule.selectors = rule.selectors.map((selector) => {
|
|
return modifierFunction({
|
|
get className() {
|
|
return getClassNameFromSelector(selector)
|
|
},
|
|
selector,
|
|
})
|
|
})
|
|
})
|
|
|
|
return clone
|
|
}
|
|
|
|
let ruleWithVariant = variantFunction({
|
|
get container() {
|
|
prepareBackup()
|
|
return clone
|
|
},
|
|
separator: context.tailwindConfig.separator,
|
|
modifySelectors,
|
|
wrap(wrapper) {
|
|
let nodes = clone.nodes
|
|
clone.removeAll()
|
|
wrapper.append(nodes)
|
|
clone.append(wrapper)
|
|
},
|
|
withRule(modify) {
|
|
clone.walkRules(modify)
|
|
},
|
|
format(selectorFormat) {
|
|
collectedFormats.push(selectorFormat)
|
|
},
|
|
})
|
|
|
|
if (ruleWithVariant === null) {
|
|
continue
|
|
}
|
|
|
|
// We filled the `originals`, therefore we assume that somebody touched
|
|
// `container` or `modifySelectors`. Let's see if they did, so that we
|
|
// can restore the selectors, and collect the format strings.
|
|
if (originals.size > 0) {
|
|
clone.walkRules((rule) => {
|
|
if (!originals.has(rule)) return
|
|
let before = originals.get(rule)
|
|
if (before === rule.selector) return // No mutation happened
|
|
|
|
let modified = rule.selector
|
|
|
|
// Rebuild the base selector, this is what plugin authors would do
|
|
// as well. E.g.: `${variant}${separator}${className}`.
|
|
// However, plugin authors probably also prepend or append certain
|
|
// classes, pseudos, ids, ...
|
|
let rebuiltBase = selectorParser((selectors) => {
|
|
selectors.walkClasses((classNode) => {
|
|
classNode.value = `${variant}${context.tailwindConfig.separator}${classNode.value}`
|
|
})
|
|
}).processSync(before)
|
|
|
|
// Now that we know the original selector, the new selector, and
|
|
// the rebuild part in between, we can replace the part that plugin
|
|
// authors need to rebuild with `&`, and eventually store it in the
|
|
// collectedFormats. Similar to what `format('...')` would do.
|
|
//
|
|
// E.g.:
|
|
// variant: foo
|
|
// selector: .markdown > p
|
|
// modified (by plugin): .foo .foo\\:markdown > p
|
|
// rebuiltBase (internal): .foo\\:markdown > p
|
|
// format: .foo &
|
|
collectedFormats.push(modified.replace(rebuiltBase, '&'))
|
|
rule.selector = before
|
|
})
|
|
}
|
|
|
|
let withOffset = [
|
|
{
|
|
...meta,
|
|
sort: variantSort | meta.sort,
|
|
collectedFormats: (meta.collectedFormats ?? []).concat(collectedFormats),
|
|
},
|
|
clone.nodes[0],
|
|
]
|
|
result.push(withOffset)
|
|
}
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
return []
|
|
}
|
|
|
|
function parseRules(rule, cache, options = {}) {
|
|
// PostCSS node
|
|
if (!isPlainObject(rule) && !Array.isArray(rule)) {
|
|
return [[rule], options]
|
|
}
|
|
|
|
// Tuple
|
|
if (Array.isArray(rule)) {
|
|
return parseRules(rule[0], cache, rule[1])
|
|
}
|
|
|
|
// Simple object
|
|
if (!cache.has(rule)) {
|
|
cache.set(rule, parseObjectStyles(rule))
|
|
}
|
|
|
|
return [cache.get(rule), options]
|
|
}
|
|
|
|
function* resolveMatchedPlugins(classCandidate, context) {
|
|
if (context.candidateRuleMap.has(classCandidate)) {
|
|
yield [context.candidateRuleMap.get(classCandidate), 'DEFAULT']
|
|
}
|
|
|
|
let candidatePrefix = classCandidate
|
|
let negative = false
|
|
|
|
const twConfigPrefix = context.tailwindConfig.prefix || ''
|
|
const twConfigPrefixLen = twConfigPrefix.length
|
|
if (candidatePrefix[twConfigPrefixLen] === '-') {
|
|
negative = true
|
|
candidatePrefix = twConfigPrefix + candidatePrefix.slice(twConfigPrefixLen + 1)
|
|
}
|
|
|
|
if (negative && context.candidateRuleMap.has(candidatePrefix)) {
|
|
yield [context.candidateRuleMap.get(candidatePrefix), '-DEFAULT']
|
|
}
|
|
|
|
for (let [prefix, modifier] of candidatePermutations(candidatePrefix)) {
|
|
if (context.candidateRuleMap.has(prefix)) {
|
|
yield [context.candidateRuleMap.get(prefix), negative ? `-${modifier}` : modifier]
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
function splitWithSeparator(input, separator) {
|
|
return input.split(new RegExp(`\\${separator}(?![^[]*\\])`, 'g'))
|
|
}
|
|
|
|
function* resolveMatches(candidate, context) {
|
|
let separator = context.tailwindConfig.separator
|
|
let [classCandidate, ...variants] = splitWithSeparator(candidate, separator).reverse()
|
|
let important = false
|
|
|
|
if (classCandidate.startsWith('!')) {
|
|
important = true
|
|
classCandidate = classCandidate.slice(1)
|
|
}
|
|
|
|
// TODO: Reintroduce this in ways that doesn't break on false positives
|
|
// function sortAgainst(toSort, against) {
|
|
// return toSort.slice().sort((a, z) => {
|
|
// return bigSign(against.get(a)[0] - against.get(z)[0])
|
|
// })
|
|
// }
|
|
// let sorted = sortAgainst(variants, context.variantMap)
|
|
// if (sorted.toString() !== variants.toString()) {
|
|
// let corrected = sorted.reverse().concat(classCandidate).join(':')
|
|
// throw new Error(`Class ${candidate} should be written as ${corrected}`)
|
|
// }
|
|
|
|
for (let matchedPlugins of resolveMatchedPlugins(classCandidate, context)) {
|
|
let matches = []
|
|
let typesByMatches = new Map()
|
|
|
|
let [plugins, modifier] = matchedPlugins
|
|
let isOnlyPlugin = plugins.length === 1
|
|
|
|
for (let [sort, plugin] of plugins) {
|
|
let matchesPerPlugin = []
|
|
|
|
if (typeof plugin === 'function') {
|
|
for (let ruleSet of [].concat(plugin(modifier, { isOnlyPlugin }))) {
|
|
let [rules, options] = parseRules(ruleSet, context.postCssNodeCache)
|
|
for (let rule of rules) {
|
|
matchesPerPlugin.push([{ ...sort, options: { ...sort.options, ...options } }, rule])
|
|
}
|
|
}
|
|
}
|
|
// Only process static plugins on exact matches
|
|
else if (modifier === 'DEFAULT' || modifier === '-DEFAULT') {
|
|
let ruleSet = plugin
|
|
let [rules, options] = parseRules(ruleSet, context.postCssNodeCache)
|
|
for (let rule of rules) {
|
|
matchesPerPlugin.push([{ ...sort, options: { ...sort.options, ...options } }, rule])
|
|
}
|
|
}
|
|
|
|
if (matchesPerPlugin.length > 0) {
|
|
typesByMatches.set(matchesPerPlugin, sort.options?.type)
|
|
matches.push(matchesPerPlugin)
|
|
}
|
|
}
|
|
|
|
// Only keep the result of the very first plugin if we are dealing with
|
|
// arbitrary values, to protect against ambiguity.
|
|
if (isArbitraryValue(modifier) && matches.length > 1) {
|
|
let typesPerPlugin = matches.map((match) => new Set([...(typesByMatches.get(match) ?? [])]))
|
|
|
|
// Remove duplicates, so that we can detect proper unique types for each plugin.
|
|
for (let pluginTypes of typesPerPlugin) {
|
|
for (let type of pluginTypes) {
|
|
let removeFromOwnGroup = false
|
|
|
|
for (let otherGroup of typesPerPlugin) {
|
|
if (pluginTypes === otherGroup) continue
|
|
|
|
if (otherGroup.has(type)) {
|
|
otherGroup.delete(type)
|
|
removeFromOwnGroup = true
|
|
}
|
|
}
|
|
|
|
if (removeFromOwnGroup) pluginTypes.delete(type)
|
|
}
|
|
}
|
|
|
|
let messages = []
|
|
|
|
for (let [idx, group] of typesPerPlugin.entries()) {
|
|
for (let type of group) {
|
|
let rules = matches[idx]
|
|
.map(([, rule]) => rule)
|
|
.flat()
|
|
.map((rule) =>
|
|
rule
|
|
.toString()
|
|
.split('\n')
|
|
.slice(1, -1) // Remove selector and closing '}'
|
|
.map((line) => line.trim())
|
|
.map((x) => ` ${x}`) // Re-indent
|
|
.join('\n')
|
|
)
|
|
.join('\n\n')
|
|
|
|
messages.push(` Use \`${candidate.replace('[', `[${type}:`)}\` for \`${rules.trim()}\``)
|
|
break
|
|
}
|
|
}
|
|
|
|
log.warn([
|
|
`The class \`${candidate}\` is ambiguous and matches multiple utilities.`,
|
|
...messages,
|
|
`If this is content and not a class, replace it with \`${candidate
|
|
.replace('[', '[')
|
|
.replace(']', ']')}\` to silence this warning.`,
|
|
])
|
|
continue
|
|
}
|
|
|
|
matches = applyPrefix(matches.flat(), context)
|
|
|
|
if (important) {
|
|
matches = applyImportant(matches, context)
|
|
}
|
|
|
|
for (let variant of variants) {
|
|
matches = applyVariant(variant, matches, context)
|
|
}
|
|
|
|
for (let match of matches) {
|
|
// Apply final format selector
|
|
if (match[0].collectedFormats) {
|
|
let finalFormat = formatVariantSelector('&', ...match[0].collectedFormats)
|
|
let container = postcss.root({ nodes: [match[1].clone()] })
|
|
container.walkRules((rule) => {
|
|
if (inKeyframes(rule)) return
|
|
|
|
rule.selector = finalizeSelector(finalFormat, {
|
|
selector: rule.selector,
|
|
candidate,
|
|
context,
|
|
})
|
|
})
|
|
match[1] = container.nodes[0]
|
|
}
|
|
|
|
yield match
|
|
}
|
|
}
|
|
}
|
|
|
|
function inKeyframes(rule) {
|
|
return rule.parent && rule.parent.type === 'atrule' && rule.parent.name === 'keyframes'
|
|
}
|
|
|
|
function generateRules(candidates, context) {
|
|
let allRules = []
|
|
|
|
for (let candidate of candidates) {
|
|
if (context.notClassCache.has(candidate)) {
|
|
continue
|
|
}
|
|
|
|
if (context.classCache.has(candidate)) {
|
|
allRules.push(context.classCache.get(candidate))
|
|
continue
|
|
}
|
|
|
|
let matches = Array.from(resolveMatches(candidate, context))
|
|
|
|
if (matches.length === 0) {
|
|
context.notClassCache.add(candidate)
|
|
continue
|
|
}
|
|
|
|
context.classCache.set(candidate, matches)
|
|
allRules.push(matches)
|
|
}
|
|
|
|
return allRules.flat(1).map(([{ sort, layer, options }, rule]) => {
|
|
if (options.respectImportant) {
|
|
if (context.tailwindConfig.important === true) {
|
|
rule.walkDecls((d) => {
|
|
if (d.parent.type === 'rule' && !inKeyframes(d.parent)) {
|
|
d.important = true
|
|
}
|
|
})
|
|
} else if (typeof context.tailwindConfig.important === 'string') {
|
|
let container = postcss.root({ nodes: [rule.clone()] })
|
|
container.walkRules((r) => {
|
|
if (inKeyframes(r)) {
|
|
return
|
|
}
|
|
|
|
r.selectors = r.selectors.map((selector) => {
|
|
return `${context.tailwindConfig.important} ${selector}`
|
|
})
|
|
})
|
|
rule = container.nodes[0]
|
|
}
|
|
}
|
|
return [sort | context.layerOrder[layer], rule]
|
|
})
|
|
}
|
|
|
|
function isArbitraryValue(input) {
|
|
return input.startsWith('[') && input.endsWith(']')
|
|
}
|
|
|
|
export { resolveMatches, generateRules }
|