Implement @font-palette-values rule and font-palette property

Closes parcel-bundler#118

Author: devongovett

src/lib.rs

@@ -6591,6 +6591,61 @@ mod tests {
     minify_test("@font-face {unicode-range: u+????, U+1????, U+10????;}", "@font-face{unicode-range:U+????,U+1????,U+10????}");
   }
 
+  #[test]
+  fn test_font_palette_values() {
+    minify_test(r#"@font-palette-values --Cooler {
+      font-family: Bixa;
+      base-palette: 1;
+      override-colors: 1 #7EB7E4;
+    }"#, "@font-palette-values --Cooler{font-family:Bixa;base-palette:1;override-colors:1 #7eb7e4}");
+    minify_test(r#"@font-palette-values --Cooler {
+      font-family: Handover Sans;
+      base-palette: 3;
+      override-colors: 1 rgb(43, 12, 9), 3 lime;
+    }"#, "@font-palette-values --Cooler{font-family:Handover Sans;base-palette:3;override-colors:1 #2b0c09,3 #0f0}");
+    minify_test(r#"@font-palette-values --Cooler {
+      font-family: Handover Sans;
+      base-palette: 3;
+      override-colors: 1 rgb(43, 12, 9), 3 var(--highlight);
+    }"#, "@font-palette-values --Cooler{font-family:Handover Sans;base-palette:3;override-colors:1 #2b0c09,3 var(--highlight)}");
+    prefix_test(r#"@font-palette-values --Cooler {
+      font-family: Handover Sans;
+      base-palette: 3;
+      override-colors: 1 rgb(43, 12, 9), 3 lch(50.998% 135.363 338);
+    }"#, indoc! {r#"@font-palette-values --Cooler {
+      font-family: Handover Sans;
+      base-palette: 3;
+      override-colors: 1 #2b0c09, 3 #ee00be;
+      override-colors: 1 #2b0c09, 3 lch(50.998% 135.363 338);
+    }
+    "#}, Browsers {
+      chrome: Some(90 << 16),
+      ..Browsers::default()
+    });
+    prefix_test(r#"@font-palette-values --Cooler {
+      font-family: Handover Sans;
+      base-palette: 3;
+      override-colors: 1 var(--foo), 3 lch(50.998% 135.363 338);
+    }"#, indoc! {r#"@font-palette-values --Cooler {
+      font-family: Handover Sans;
+      base-palette: 3;
+      override-colors: 1 var(--foo), 3 #ee00be;
+    }
+
+    @supports (color: lab(0% 0 0)) {
+      @font-palette-values --Cooler {
+        font-family: Handover Sans;
+        base-palette: 3;
+        override-colors: 1 var(--foo), 3 lab(50.998% 125.506 -50.7078);
+      }
+    }
+    "#}, Browsers {
+      chrome: Some(90 << 16),
+      ..Browsers::default()
+    });
+    minify_test(".foo { font-palette: --Custom; }", ".foo{font-palette:--Custom}");
+  }
+
   #[test]
   fn test_page_rule() {
     minify_test("@page {margin: 0.5cm}", "@page{margin:.5cm}");

src/parser.rs

@@ -1,3 +1,4 @@
+use crate::rules::font_palette_values::FontPaletteValuesRule;
 use crate::rules::layer::{LayerBlockRule, LayerStatementRule};
 use crate::rules::property::PropertyRule;
 use crate::values::string::CowArcStr;
@@ -25,7 +26,7 @@ use crate::rules::{
   custom_media::CustomMediaRule,
   layer::{LayerName}
 };
-use crate::values::ident::CustomIdent;
+use crate::values::ident::{CustomIdent, DashedIdent};
 use crate::declaration::{DeclarationBlock, DeclarationList, parse_declaration};
 use crate::vendor_prefix::VendorPrefix;
 use std::collections::HashMap;
@@ -83,12 +84,14 @@ pub enum AtRulePrelude<'i> {
   FontFace,
   /// A @font-feature-values rule prelude, with its FamilyName list.
   FontFeatureValues,//(Vec<FamilyName>),
+  /// A @font-palette-values rule prelude, with its name.
+  FontPaletteValues(DashedIdent<'i>),
   /// A @counter-style rule prelude, with its counter style name.
   CounterStyle(CustomIdent<'i>),
   /// A @media rule prelude, with its media queries.
   Media(MediaList<'i>),
   /// A @custom-media rule prelude.
-  CustomMedia(CowRcStr<'i>, MediaList<'i>),
+  CustomMedia(DashedIdent<'i>, MediaList<'i>),
   /// An @supports rule, with its conditional
   Supports(SupportsCondition<'i>),
   /// A @viewport rule prelude.
@@ -110,7 +113,7 @@ pub enum AtRulePrelude<'i> {
   /// An @layer prelude.
   Layer(Vec<LayerName<'i>>),
   /// An @property prelude.
-  Property(CowRcStr<'i>)
+  Property(DashedIdent<'i>)
 }
 
 impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a, 'i> {
@@ -168,18 +171,12 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a, 'i> {
           return Ok(AtRulePrelude::Charset)
         },
         "custom-media" if self.options.custom_media => {
-          let name = input.expect_ident_cloned()?;
-          if !name.starts_with("--") {
-            return Err(input.new_unexpected_token_error(Token::Ident(name.into())));
-          }
+          let name = DashedIdent::parse(input)?;
           let media = MediaList::parse(input)?;
           return Ok(AtRulePrelude::CustomMedia(name, media))
         },
         "property" => {
-          let name = input.expect_ident_cloned()?;
-          if !name.starts_with("--") {
-            return Err(input.new_unexpected_token_error(Token::Ident(name.into())));
-          }
+          let name = DashedIdent::parse(input)?;
           return Ok(AtRulePrelude::Property(name))
         },  
         _ => {}
@@ -242,7 +239,7 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a, 'i> {
         AtRulePrelude::CustomMedia(name, query) => {
           self.state = State::Body;
           CssRule::CustomMedia(CustomMediaRule {
-            name: name.into(),
+            name,
             query,
             loc
           })
@@ -360,6 +357,10 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'i> {
       //     let family_names = parse_family_name_list(self.context, input)?;
       //     Ok(AtRuleType::WithBlock(AtRuleBlockPrelude::FontFeatureValues(family_names)))
       // },
+      "font-palette-values" => {
+        let name = DashedIdent::parse(input)?;
+        return Ok(AtRulePrelude::FontPaletteValues(name))
+      },
       "counter-style" => {
         let name = CustomIdent::parse(input)?;
         Ok(AtRulePrelude::CounterStyle(name))
@@ -455,6 +456,10 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'i> {
       //         ),
       //     ))))
       // },
+      AtRulePrelude::FontPaletteValues(name) => {
+        let rule = FontPaletteValuesRule::parse(name, input, loc)?;
+        Ok(CssRule::FontPaletteValues(rule))
+      },
       AtRulePrelude::CounterStyle(name) => {
         Ok(CssRule::CounterStyle(CounterStyleRule {
           name,
@@ -523,7 +528,7 @@ impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'i> {
         }))
       },
       AtRulePrelude::Property(name) => {
-        Ok(CssRule::Property(PropertyRule::parse(name.into(), input, loc)?))
+        Ok(CssRule::Property(PropertyRule::parse(name, input, loc)?))
       },
       AtRulePrelude::Import(..) | 
       AtRulePrelude::Namespace(..) | 

src/properties/custom.rs

@@ -257,7 +257,7 @@ impl<'i> TokenList<'i> {
             }
             Token::CloseParenthesis | Token::CloseSquareBracket | Token::CloseCurlyBracket => {
               token.to_css(dest)?;
-              if !dest.minify && i != self.0.len() - 1 {
+              if !dest.minify && i != self.0.len() - 1 && !matches!(self.0[i + 1], TokenOrValue::Token(Token::Comma)) {
                 // Whitespace is removed during parsing, so add it back if we aren't minifying.
                 dest.write_char(' ')?;
               }

src/properties/mod.rs

@@ -54,7 +54,7 @@ use size::*;
 use svg::*;
 use masking::*;
 use effects::*;
-use crate::values::{image::*, length::*, position::*, alpha::*, size::Size2D, rect::*, color::*, time::Time, easing::EasingFunction, shape::FillRule};
+use crate::values::{image::*, length::*, position::*, alpha::*, size::Size2D, rect::*, color::*, time::Time, easing::EasingFunction, shape::FillRule, ident::DashedIdent};
 use crate::traits::{Parse, ToCss};
 use crate::printer::Printer;
 use smallvec::{SmallVec, smallvec};
@@ -727,6 +727,7 @@ define_properties! {
   "line-height": LineHeight(LineHeight),
   "font": Font(Font<'i>),
   "vertical-align": VerticalAlign(VerticalAlign),
+  "font-palette": FontPalette(DashedIdent<'i>),
 
   "transition-property": TransitionProperty(SmallVec<[PropertyId<'i>; 1]>, VendorPrefix) / WebKit / Moz / Ms,
   "transition-duration": TransitionDuration(SmallVec<[Time; 1]>, VendorPrefix) / WebKit / Moz / Ms,

src/rules/custom_media.rs

@@ -1,14 +1,13 @@
-use crate::values::string::CowArcStr;
+use crate::values::ident::DashedIdent;
 use super::Location;
-use cssparser::serialize_identifier;
 use crate::media_query::MediaList;
 use crate::traits::ToCss;
 use crate::printer::Printer;
 use crate::error::PrinterError;
 
 #[derive(Debug, PartialEq, Clone)]
 pub struct CustomMediaRule<'i> {
-  pub name: CowArcStr<'i>,
+  pub name: DashedIdent<'i>,
   pub query: MediaList<'i>,
   pub loc: Location
 }
@@ -17,7 +16,7 @@ impl<'i> ToCss for CustomMediaRule<'i> {
   fn to_css<W>(&self, dest: &mut Printer<W>) -> Result<(), PrinterError> where W: std::fmt::Write {
     dest.add_mapping(self.loc);
     dest.write_str("@custom-media ")?;
-    serialize_identifier(&self.name, dest)?;
+    self.name.to_css(dest)?;
     dest.write_char(' ')?;
     self.query.to_css(dest)
   }