Skip to content

Update relative color parsing to latest spec #465

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
devongovett merged 5 commits into from
May 11, 2025
Merged

Update relative color parsing to latest spec #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
134125d
Update relative color parsing to latest spec
devongovett Apr 14, 2023
8a61b16
Merge branch 'master' of github.com:parcel-bundler/parcel-css into re…
devongovett Apr 15, 2023
643a008
Revert "Revert "Support number or percentage in lab, lch, oklab, and …
devongovett Apr 15, 2023
25bf9e0
Merge branch 'master' of github.com:parcel-bundler/parcel-css into re…
devongovett May 11, 2025
b8d6feb
fixes
devongovett May 11, 2025
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
158 changes: 115 additions & 43 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17514,6 +17514,7 @@ mod tests {
minify_test(".foo { color: hsl(100deg, 100%, 50%) }", ".foo{color:#5f0}");
minify_test(".foo { color: hsl(100, 100%, 50%) }", ".foo{color:#5f0}");
minify_test(".foo { color: hsl(100 100% 50%) }", ".foo{color:#5f0}");
minify_test(".foo { color: hsl(100 100 50) }", ".foo{color:#5f0}");
minify_test(".foo { color: hsl(100, 100%, 50%, .8) }", ".foo{color:#5f0c}");
minify_test(".foo { color: hsl(100 100% 50% / .8) }", ".foo{color:#5f0c}");
minify_test(".foo { color: hsla(100, 100%, 50%, .8) }", ".foo{color:#5f0c}");
Expand All @@ -17525,12 +17526,21 @@ mod tests {
minify_test(".foo { color: hwb(194 0% 0% / 50%) }", ".foo{color:#00c4ff80}");
minify_test(".foo { color: hwb(194 0% 50%) }", ".foo{color:#006280}");
minify_test(".foo { color: hwb(194 50% 0%) }", ".foo{color:#80e1ff}");
minify_test(".foo { color: hwb(194 50 0) }", ".foo{color:#80e1ff}");
minify_test(".foo { color: hwb(194 50% 50%) }", ".foo{color:gray}");
// minify_test(".foo { color: ActiveText }", ".foo{color:ActiveTet}");
minify_test(
".foo { color: lab(29.2345% 39.3825 20.0664); }",
".foo{color:lab(29.2345% 39.3825 20.0664)}",
);
minify_test(
".foo { color: lab(29.2345 39.3825 20.0664); }",
".foo{color:lab(29.2345% 39.3825 20.0664)}",
);
minify_test(
".foo { color: lab(29.2345% 39.3825% 20.0664%); }",
".foo{color:lab(29.2345% 49.2281 25.083)}",
);
minify_test(
".foo { color: lab(29.2345% 39.3825 20.0664 / 100%); }",
".foo{color:lab(29.2345% 39.3825 20.0664)}",
Expand All @@ -17543,6 +17553,14 @@ mod tests {
".foo { color: lch(29.2345% 44.2 27); }",
".foo{color:lch(29.2345% 44.2 27)}",
);
minify_test(
".foo { color: lch(29.2345 44.2 27); }",
".foo{color:lch(29.2345% 44.2 27)}",
);
minify_test(
".foo { color: lch(29.2345% 44.2% 27deg); }",
".foo{color:lch(29.2345% 66.3 27)}",
);
minify_test(
".foo { color: lch(29.2345% 44.2 45deg); }",
".foo{color:lch(29.2345% 44.2 45)}",
Expand All @@ -17563,10 +17581,26 @@ mod tests {
".foo { color: oklab(40.101% 0.1147 0.0453); }",
".foo{color:oklab(40.101% .1147 .0453)}",
);
minify_test(
".foo { color: oklab(.40101 0.1147 0.0453); }",
".foo{color:oklab(40.101% .1147 .0453)}",
);
minify_test(
".foo { color: oklab(40.101% 0.1147% 0.0453%); }",
".foo{color:oklab(40.101% .0004588 .0001812)}",
);
minify_test(
".foo { color: oklch(40.101% 0.12332 21.555); }",
".foo{color:oklch(40.101% .12332 21.555)}",
);
minify_test(
".foo { color: oklch(.40101 0.12332 21.555); }",
".foo{color:oklch(40.101% .12332 21.555)}",
);
minify_test(
".foo { color: oklch(40.101% 0.12332% 21.555); }",
".foo{color:oklch(40.101% .00049328 21.555)}",
);
minify_test(
".foo { color: oklch(40.101% 0.12332 .5turn); }",
".foo{color:oklch(40.101% .12332 180)}",
Expand Down Expand Up @@ -18431,7 +18465,7 @@ mod tests {
}

test("lab(from indianred calc(l * .8) a b)", "lab(43.1402% 45.7516 23.1557)");
test("lch(from indianred calc(l + 10%) c h)", "lch(63.9252% 51.2776 26.8448)");
test("lch(from indianred calc(l + 10) c h)", "lch(63.9252% 51.2776 26.8448)");
test("lch(from indianred l calc(c - 50) h)", "lch(53.9252% 1.27763 26.8448)");
test(
"lch(from indianred l c calc(h + 180deg))",
Expand All @@ -18447,12 +18481,23 @@ mod tests {
"rgba(205, 92, 92, .7)",
);
test(
"rgb(from rgba(205, 92, 92, .5) r g b / calc(alpha + 20%))",
"rgb(from rgba(205, 92, 92, .5) r g b / calc(alpha + .2))",
"rgba(205, 92, 92, .7)",
);
test("lch(from indianred l sin(c) h)", "lch(53.9252% .84797 26.8448)");
test("lch(from indianred l sqrt(c) h)", "lch(53.9252% 7.16084 26.8448)");
test("lch(from indianred l c sin(h))", "lch(53.9252% 51.2776 .990043)");
test("lch(from indianred l c sin(h))", "lch(53.9252% 51.2776 .451575)");
test("lch(from indianred calc(10% + 20%) c h)", "lch(30% 51.2776 26.8448)");
test("lch(from indianred calc(10 + 20) c h)", "lch(30% 51.2776 26.8448)");
test("lch(from indianred l c calc(10 + 20))", "lch(53.9252% 51.2776 30)");
test(
"lch(from indianred l c calc(10deg + 20deg))",
"lch(53.9252% 51.2776 30)",
);
test(
"lch(from indianred l c calc(10deg + 0.35rad))",
"lch(53.9252% 51.2776 30.0535)",
);
minify_test(
".foo{color:lch(from currentColor l c sin(h))}",
".foo{color:lch(from currentColor l c sin(h))}",
Expand Down Expand Up @@ -18566,21 +18611,15 @@ mod tests {

// Testing permutation.
test("rgb(from rebeccapurple g b r)", "rgb(51, 153, 102)");
test("rgb(from rebeccapurple b alpha r / g)", "rgba(153, 255, 102, 0.2)");
test("rgb(from rebeccapurple r r r / r)", "rgba(102, 102, 102, 0.4)");
test(
"rgb(from rebeccapurple alpha alpha alpha / alpha)",
"rgb(255, 255, 255)",
);
test("rgb(from rebeccapurple b alpha r / g)", "rgba(153, 1, 102, 1)");
test("rgb(from rebeccapurple r r r / r)", "rgba(102, 102, 102, 1)");
test("rgb(from rebeccapurple alpha alpha alpha / alpha)", "rgb(1, 1, 1)");
test("rgb(from rgb(20%, 40%, 60%, 80%) g b r)", "rgb(102, 153, 51)");
test(
"rgb(from rgb(20%, 40%, 60%, 80%) b alpha r / g)",
"rgba(153, 204, 51, 0.4)",
);
test("rgb(from rgb(20%, 40%, 60%, 80%) r r r / r)", "rgba(51, 51, 51, 0.2)");
test("rgb(from rgb(20%, 40%, 60%, 80%) b alpha r / g)", "rgba(153, 1, 51, 1)");
test("rgb(from rgb(20%, 40%, 60%, 80%) r r r / r)", "rgba(51, 51, 51, 1)");
test(
"rgb(from rgb(20%, 40%, 60%, 80%) alpha alpha alpha / alpha)",
"rgba(204, 204, 204, 0.8)",
"rgba(1, 1, 1, 0.8)",
);

// Testing mixes of number and percentage. (These would not be allowed in the non-relative syntax).
Expand Down Expand Up @@ -18704,17 +18743,29 @@ mod tests {

// Testing valid permutation (types match).
test("hsl(from rebeccapurple h l s)", "rgb(128, 77, 179)");
test("hsl(from rebeccapurple h alpha l / s)", "rgba(102, 0, 204, 0.5)");
test("hsl(from rebeccapurple h l l / l)", "rgba(102, 61, 143, 0.4)");
test("hsl(from rebeccapurple h alpha alpha / alpha)", "rgb(255, 255, 255)");
test(
"hsl(from rebeccapurple h calc(alpha * 100) l / calc(s / 100))",
"rgba(102, 0, 204, 0.5)",
);
test(
"hsl(from rebeccapurple h l l / calc(l / 100))",
"rgba(102, 61, 143, 0.4)",
);
test(
"hsl(from rebeccapurple h calc(alpha * 100) calc(alpha * 100) / calc(alpha * 100))",
"rgb(255, 255, 255)",
);
test("hsl(from rgb(20%, 40%, 60%, 80%) h l s)", "rgb(77, 128, 179)");
test(
"hsl(from rgb(20%, 40%, 60%, 80%) h alpha l / s)",
"hsl(from rgb(20%, 40%, 60%, 80%) h calc(alpha * 100) l / calc(s / 100))",
"rgba(20, 102, 184, 0.5)",
);
test("hsl(from rgb(20%, 40%, 60%, 80%) h l l / l)", "rgba(61, 102, 143, 0.4)");
test(
"hsl(from rgb(20%, 40%, 60%, 80%) h alpha alpha / alpha)",
"hsl(from rgb(20%, 40%, 60%, 80%) h l l / calc(l / 100))",
"rgba(61, 102, 143, 0.4)",
);
test(
"hsl(from rgb(20%, 40%, 60%, 80%) h calc(alpha * 100) calc(alpha * 100) / alpha)",
"rgba(163, 204, 245, 0.8)",
);

Expand Down Expand Up @@ -18842,17 +18893,29 @@ mod tests {

// Testing valid permutation (types match).
test("hwb(from rebeccapurple h b w)", "rgb(153, 102, 204)");
test("hwb(from rebeccapurple h alpha w / b)", "rgba(213, 213, 213, 0.4)");
test("hwb(from rebeccapurple h w w / w)", "rgba(128, 51, 204, 0.2)");
test("hwb(from rebeccapurple h alpha alpha / alpha)", "rgb(128, 128, 128)");
test(
"hwb(from rebeccapurple h calc(alpha * 100) w / calc(b / 100))",
"rgba(213, 213, 213, 0.4)",
);
test(
"hwb(from rebeccapurple h w w / calc(w / 100))",
"rgba(128, 51, 204, 0.2)",
);
test(
"hwb(from rebeccapurple h calc(alpha * 100) calc(alpha * 100) / alpha)",
"rgb(128, 128, 128)",
);
test("hwb(from rgb(20%, 40%, 60%, 80%) h b w)", "rgb(102, 153, 204)");
test(
"hwb(from rgb(20%, 40%, 60%, 80%) h alpha w / b)",
"hwb(from rgb(20%, 40%, 60%, 80%) h calc(alpha * 100) w / calc(b / 100))",
"rgba(204, 204, 204, 0.4)",
);
test("hwb(from rgb(20%, 40%, 60%, 80%) h w w / w)", "rgba(51, 128, 204, 0.2)");
test(
"hwb(from rgb(20%, 40%, 60%, 80%) h alpha alpha / alpha)",
"hwb(from rgb(20%, 40%, 60%, 80%) h w w / calc(w / 100))",
"rgba(51, 128, 204, 0.2)",
);
test(
"hwb(from rgb(20%, 40%, 60%, 80%) h calc(alpha * 100) calc(alpha * 100) / alpha)",
"rgba(128, 128, 128, 0.8)",
);

Expand Down Expand Up @@ -19305,23 +19368,31 @@ mod tests {
// NOTE: 'c' is a valid hue, as hue is <angle>|<number>.
test(
&format!("{}(from {}(70% 45 30) alpha c h / l)", color_space, color_space),
&format!("{}(100% 45 30 / 0.7)", color_space),
&format!(
"{}(1 45 30 / {})",
color_space,
if *color_space == "lch" { "1" } else { ".7" }
),
);
test(
&format!("{}(from {}(70% 45 30) l c c / alpha)", color_space, color_space),
&format!("{}(70% 45 45)", color_space),
);
test(
&format!("{}(from {}(70% 45 30) alpha c h / alpha)", color_space, color_space),
&format!("{}(100% 45 30)", color_space),
&format!("{}(1 45 30)", color_space),
);
test(
&format!("{}(from {}(70% 45 30) alpha c c / alpha)", color_space, color_space),
&format!("{}(100% 45 45)", color_space),
&format!("{}(1 45 45)", color_space),
);
test(
&format!("{}(from {}(70% 45 30 / 40%) alpha c h / l)", color_space, color_space),
&format!("{}(40% 45 30 / 0.7)", color_space),
&format!(
"{}(.4 45 30 / {})",
color_space,
if *color_space == "lch" { "1" } else { ".7" }
),
);
test(
&format!("{}(from {}(70% 45 30 / 40%) l c c / alpha)", color_space, color_space),
Expand All @@ -19332,14 +19403,14 @@ mod tests {
"{}(from {}(70% 45 30 / 40%) alpha c h / alpha)",
color_space, color_space
),
&format!("{}(40% 45 30 / 0.4)", color_space),
&format!("{}(.4 45 30 / 0.4)", color_space),
);
test(
&format!(
"{}(from {}(70% 45 30 / 40%) alpha c c / alpha)",
color_space, color_space
),
&format!("{}(40% 45 45 / 0.4)", color_space),
&format!("{}(.4 45 45 / 0.4)", color_space),
);

// Testing with calc().
Expand Down Expand Up @@ -20201,13 +20272,10 @@ mod tests {
".foo{color:hsl(from rebeccapurple s h l)}",
".foo{color:hsl(from rebeccapurple s h l)}",
);
minify_test(".foo{color:hsl(from rebeccapurple s s s / s)}", ".foo{color:#bfaa40}");
minify_test(
".foo{color:hsl(from rebeccapurple s s s / s)}",
".foo{color:hsl(from rebeccapurple s s s/s)}",
);
minify_test(
".foo{color:hsl(from rebeccapurple alpha alpha alpha / alpha)}",
".foo{color:hsl(from rebeccapurple alpha alpha alpha/alpha)}",
".foo{color:hsl(from rebeccapurple calc(alpha * 100) calc(alpha * 100) calc(alpha * 100) / alpha)}",
".foo{color:#fff}",
);
}
}
Expand Down Expand Up @@ -28761,10 +28829,14 @@ mod tests {
let source_index = sm.add_source("input.css");
sm.set_source_content(source_index as usize, source).unwrap();

let mut stylesheet = StyleSheet::parse(&source, ParserOptions {
source_index,
..Default::default()
}).unwrap();
let mut stylesheet = StyleSheet::parse(
&source,
ParserOptions {
source_index,
..Default::default()
},
)
.unwrap();
stylesheet.minify(MinifyOptions::default()).unwrap();
stylesheet
.to_css(PrinterOptions {
Expand Down
29 changes: 12 additions & 17 deletions src/properties/custom.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use crate::traits::{Parse, ParseWithOptions, ToCss};
use crate::values::angle::Angle;
use crate::values::color::{
parse_hsl_hwb_components, parse_rgb_components, ColorFallbackKind, ComponentParser, CssColor, LightDarkColor,
HSL, RGBA, SRGB,
HSL, RGB, RGBA,
};
use crate::values::ident::{CustomIdent, DashedIdent, DashedIdentReference, Ident};
use crate::values::length::{serialize_dimension, LengthValue};
Expand Down Expand Up @@ -1594,7 +1594,7 @@ impl<'i> UnresolvedColor<'i> {
match_ignore_ascii_case! { &*f,
"rgb" => {
input.parse_nested_block(|input| {
parser.parse_relative::<SRGB, _, _>(input, |input, parser| {
parser.parse_relative::<RGB, _, _>(input, |input, parser| {
let (r, g, b, is_legacy) = parse_rgb_components(input, parser)?;
if is_legacy {
return Err(input.new_custom_error(ParserError::InvalidValue))
Expand Down Expand Up @@ -1636,32 +1636,27 @@ impl<'i> UnresolvedColor<'i> {
where
W: std::fmt::Write,
{
#[inline]
fn c(c: &f32) -> i32 {
(c * 255.0).round().clamp(0.0, 255.0) as i32
}

match self {
UnresolvedColor::RGB { r, g, b, alpha } => {
if should_compile!(dest.targets.current, SpaceSeparatedColorNotation) {
dest.write_str("rgba(")?;
c(r).to_css(dest)?;
r.to_css(dest)?;
dest.delim(',', false)?;
c(g).to_css(dest)?;
g.to_css(dest)?;
dest.delim(',', false)?;
c(b).to_css(dest)?;
b.to_css(dest)?;
dest.delim(',', false)?;
alpha.to_css(dest, is_custom_property)?;
dest.write_char(')')?;
return Ok(());
}

dest.write_str("rgb(")?;
c(r).to_css(dest)?;
r.to_css(dest)?;
dest.write_char(' ')?;
c(g).to_css(dest)?;
g.to_css(dest)?;
dest.write_char(' ')?;
c(b).to_css(dest)?;
b.to_css(dest)?;
dest.delim('/', true)?;
alpha.to_css(dest, is_custom_property)?;
dest.write_char(')')
Expand All @@ -1671,9 +1666,9 @@ impl<'i> UnresolvedColor<'i> {
dest.write_str("hsla(")?;
h.to_css(dest)?;
dest.delim(',', false)?;
Percentage(*s).to_css(dest)?;
Percentage(*s / 100.0).to_css(dest)?;
dest.delim(',', false)?;
Percentage(*l).to_css(dest)?;
Percentage(*l / 100.0).to_css(dest)?;
dest.delim(',', false)?;
alpha.to_css(dest, is_custom_property)?;
dest.write_char(')')?;
Expand All @@ -1683,9 +1678,9 @@ impl<'i> UnresolvedColor<'i> {
dest.write_str("hsl(")?;
h.to_css(dest)?;
dest.write_char(' ')?;
Percentage(*s).to_css(dest)?;
Percentage(*s / 100.0).to_css(dest)?;
dest.write_char(' ')?;
Percentage(*l).to_css(dest)?;
Percentage(*l / 100.0).to_css(dest)?;
dest.delim('/', true)?;
alpha.to_css(dest, is_custom_property)?;
dest.write_char(')')
Expand Down
Loading
Loading