Skip to content

Minify arbitrary values when printing candidates #14720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RobinMalfait merged 8 commits into from
Oct 18, 2024
Merged

Minify arbitrary values when printing candidates #14720

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2de3ddc
simplify candidate printing
RobinMalfait Oct 18, 2024
7896030
update changelog
RobinMalfait Oct 18, 2024
e3147f2
add additional test with `to-zero`
RobinMalfait Oct 18, 2024
8500630
merge `escapeArbitrary` and `trimWhitespace` into `printArbitraryValue`
RobinMalfait Oct 18, 2024
1c77a2a
move escape to the end
RobinMalfait Oct 18, 2024
b634416
add failing test
RobinMalfait Oct 18, 2024
2ead108
fix typo + add missing check
RobinMalfait Oct 18, 2024
fff30ce
ensure we handle ` / ` correctly
RobinMalfait Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge escapeArbitrary and trimWhitespace into printArbitraryValue
  • Loading branch information
@RobinMalfait
RobinMalfait committed Oct 18, 2024
commit 850063096822bab531c47320af01bb13b146c5a9
27 changes: 13 additions & 14 deletions packages/@tailwindcss-upgrade/src/template/candidates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ export function printCandidate(designSystem: DesignSystem, candidate: Candidate)
if (candidate.value === null) {
base += ''
} else if (candidate.value.dataType) {
base += `-[${candidate.value.dataType}:${escapeArbitrary(trimWhitespace(candidate.value.value))}]`
base += `-[${candidate.value.dataType}:${printArbitraryValue(candidate.value.value)}]`
} else {
base += `-[${escapeArbitrary(trimWhitespace(candidate.value.value))}]`
base += `-[${printArbitraryValue(candidate.value.value)}]`
}
} else if (candidate.value.kind === 'named') {
base += `-${candidate.value.value}`
Expand All @@ -64,14 +64,14 @@ export function printCandidate(designSystem: DesignSystem, candidate: Candidate)

// Handle arbitrary
if (candidate.kind === 'arbitrary') {
base += `[${candidate.property}:${escapeArbitrary(trimWhitespace(candidate.value))}]`
base += `[${candidate.property}:${printArbitraryValue(candidate.value)}]`
}

// Handle modifier
if (candidate.kind === 'arbitrary' || candidate.kind === 'functional') {
if (candidate.modifier) {
if (candidate.modifier.kind === 'arbitrary') {
base += `/[${escapeArbitrary(trimWhitespace(candidate.modifier.value))}]`
base += `/[${printArbitraryValue(candidate.modifier.value)}]`
} else if (candidate.modifier.kind === 'named') {
base += `/${candidate.modifier.value}`
}
Expand All @@ -96,7 +96,7 @@ function printVariant(variant: Variant) {

// Handle arbitrary variants
if (variant.kind === 'arbitrary') {
return `[${escapeArbitrary(trimWhitespace(simplifyArbitraryVariant(variant.selector)))}]`
return `[${printArbitraryValue(simplifyArbitraryVariant(variant.selector))}]`
}

let base: string = ''
Expand All @@ -106,7 +106,7 @@ function printVariant(variant: Variant) {
base += variant.root
if (variant.value) {
if (variant.value.kind === 'arbitrary') {
base += `-[${escapeArbitrary(trimWhitespace(variant.value.value))}]`
base += `-[${printArbitraryValue(variant.value.value)}]`
} else if (variant.value.kind === 'named') {
base += `-${variant.value.value}`
}
Expand All @@ -124,7 +124,7 @@ function printVariant(variant: Variant) {
if (variant.kind === 'functional' || variant.kind === 'compound') {
if (variant.modifier) {
if (variant.modifier.kind === 'arbitrary') {
base += `/[${escapeArbitrary(trimWhitespace(variant.modifier.value))}]`
base += `/[${printArbitraryValue(variant.modifier.value)}]`
} else if (variant.modifier.kind === 'named') {
base += `/${variant.modifier.value}`
}
Expand All @@ -134,14 +134,13 @@ function printVariant(variant: Variant) {
return base
}

function escapeArbitrary(input: string) {
return input
.replaceAll('_', String.raw`\_`) // Escape underscores to keep them as-is
.replaceAll(' ', '_') // Replace spaces with underscores
}
function printArbitraryValue(input: string) {
let ast = ValueParser.parse(
input
.replaceAll('_', String.raw`\_`) // Escape underscores to keep them as-is
.replaceAll(' ', '_'), // Replace spaces with underscores
)

function trimWhitespace(input: string) {
let ast = ValueParser.parse(input)
let drop = new Set<ValueParser.ValueAstNode>()

ValueParser.walk(ast, (node, { parent }) => {
Expand Down