Refactor to use wrapped printer

Author: devongovett

src/lib.rs

@@ -11,10 +11,12 @@ mod parser;
 mod media_query;
 mod properties;
 mod values;
+mod printer;
 
 use napi::{CallContext, JsObject, JsUndefined};
 use serde::{Deserialize, Serialize};
-use cssparser::{Parser, ParserInput, RuleListParser, ToCss};
+use cssparser::{Parser, ParserInput, RuleListParser};
+use values::traits::ToCss;
 
 use parser::TopLevelRuleParser;
 

src/parser.rs

@@ -5,6 +5,8 @@ use std::cell::RefCell;
 use crate::media_query::*;
 use crate::properties::*;
 use crate::values::traits::PropertyHandler;
+use crate::printer::Printer;
+use crate::values::traits::ToCss;
 
 #[derive(Debug, Clone)]
 pub struct Selectors;
@@ -18,7 +20,7 @@ impl CssString {
   }
 }
 
-impl ToCss for CssString {
+impl cssparser::ToCss for CssString {
   fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
     dest.write_str(self.0.borrow().as_ref())
   }
@@ -82,7 +84,7 @@ impl selectors::parser::NonTSPseudoClass for PseudoClass {
   }
 }
 
-impl ToCss for PseudoClass {
+impl cssparser::ToCss for PseudoClass {
   fn to_css<W>(&self, dest: &mut W) -> fmt::Result
   where
       W: fmt::Write,
@@ -94,13 +96,13 @@ impl ToCss for PseudoClass {
 #[derive(PartialEq, Eq, Clone, Debug, Hash)]
 pub enum PseudoElement {}
 
-impl ToCss for PseudoElement {
-    fn to_css<W>(&self, _dest: &mut W) -> fmt::Result
-    where
-        W: fmt::Write,
-    {
-        match *self {}
-    }
+impl cssparser::ToCss for PseudoElement {
+  fn to_css<W>(&self, _dest: &mut W) -> fmt::Result
+  where
+      W: fmt::Write,
+  {
+      match *self {}
+  }
 }
 
 impl selectors::parser::PseudoElement for PseudoElement {
@@ -329,7 +331,7 @@ pub struct MediaRule {
 }
 
 impl ToCss for MediaRule {
-  fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> fmt::Result where W: fmt::Write {
     dest.write_str("@media ")?;
     // serialize_string(&self.query, dest)?;
     // dest.write_str(";")
@@ -349,7 +351,7 @@ pub struct ImportRule {
 }
 
 impl ToCss for ImportRule {
-  fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> fmt::Result where W: fmt::Write {
     dest.write_str("@import ")?;
     serialize_string(&self.url, dest)?;
     // dest.write_str(&self.media)?;
@@ -364,8 +366,9 @@ pub struct StyleRule {
 }
 
 impl ToCss for StyleRule {
-  fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> fmt::Result where W: fmt::Write {
     // dest.write_str(&self.selectors)?;
+    use crate::cssparser::ToCss;
     self.selectors.to_css(dest)?;
     dest.write_str(" {")?;
     for prop in self.declarations.iter() {
@@ -430,7 +433,7 @@ pub enum CssRule {
 }
 
 impl ToCss for CssRule {
-  fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> fmt::Result where W: fmt::Write {
     match self {
       CssRule::Media(media) => media.to_css(dest),
       CssRule::Import(import) => import.to_css(dest),

src/printer.rs

@@ -0,0 +1,21 @@
+use std::fmt::*;
+
+pub struct Printer<'a, W> {
+  dest: &'a mut W
+}
+
+impl<'a, W: Write + Sized> Printer<'a, W> {
+  pub fn new(dest: &mut W) -> Printer<W> {
+    Printer { dest }
+  }
+
+  pub fn write_str(&mut self, s: &str) -> Result {
+    self.dest.write_str(s)
+  }
+}
+
+impl<'a, W: Write + Sized> Write for Printer<'a, W> {
+  fn write_str(&mut self, s: &str) -> Result {
+    self.dest.write_str(s)
+  }
+}

src/properties/align.rs

@@ -3,6 +3,7 @@ use crate::values::macros::*;
 use crate::values::length::{LengthPercentageOrAuto, LengthPercentage, Length, Percentage};
 use crate::values::traits::{Parse, ToCss, PropertyHandler};
 use super::Property;
+use crate::printer::Printer;
 
 /// https://www.w3.org/TR/2020/WD-css-align-3-20200421/#typedef-baseline-position
 #[derive(Debug, Clone, PartialEq)]
@@ -33,7 +34,7 @@ impl Parse for BaselinePosition {
 }
 
 impl ToCss for BaselinePosition {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     match self {
       BaselinePosition::First => dest.write_str("baseline"),
       BaselinePosition::Last => dest.write_str("last baseline")
@@ -94,7 +95,7 @@ impl Parse for AlignContent {
 }
 
 impl ToCss for AlignContent {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     match self {
       AlignContent::Normal => dest.write_str("normal"),
       AlignContent::BaselinePosition(val) => val.to_css(dest),
@@ -149,7 +150,7 @@ impl Parse for JustifyContent {
 }
 
 impl ToCss for JustifyContent {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     match self {
       JustifyContent::Normal => dest.write_str("normal"),
       JustifyContent::ContentDistribution(val) => val.to_css(dest),
@@ -211,7 +212,7 @@ impl Parse for PlaceContent {
 }
 
 impl ToCss for PlaceContent {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     self.align.to_css(dest)?;
     let is_equal = match self.justify {
       JustifyContent::Normal if self.align == AlignContent::Normal => true,
@@ -275,7 +276,7 @@ impl Parse for AlignSelf {
 }
 
 impl ToCss for AlignSelf {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     match self {
       AlignSelf::Auto => dest.write_str("auto"),
       AlignSelf::Normal => dest.write_str("normal"),
@@ -341,7 +342,7 @@ impl Parse for JustifySelf {
 }
 
 impl ToCss for JustifySelf {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     match self {
       JustifySelf::Auto => dest.write_str("auto"),
       JustifySelf::Normal => dest.write_str("normal"),
@@ -404,7 +405,7 @@ impl Parse for PlaceSelf {
 }
 
 impl ToCss for PlaceSelf {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     self.align.to_css(dest)?;
     let is_equal = match &self.justify {
       JustifySelf::Auto => true,
@@ -454,7 +455,7 @@ impl Parse for AlignItems {
 }
 
 impl ToCss for AlignItems {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     match self {
       AlignItems::Normal => dest.write_str("normal"),
       AlignItems::Stretch => dest.write_str("stretch"),
@@ -515,7 +516,7 @@ impl Parse for LegacyJustify {
 }
 
 impl ToCss for LegacyJustify {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     dest.write_str("legacy ")?;
     match self {
       LegacyJustify::Left => dest.write_str("left"),
@@ -573,7 +574,7 @@ impl Parse for JustifyItems {
 }
 
 impl ToCss for JustifyItems {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     match self {
       JustifyItems::Normal => dest.write_str("normal"),
       JustifyItems::Stretch => dest.write_str("stretch"),
@@ -635,7 +636,7 @@ impl Parse for PlaceItems {
 }
 
 impl ToCss for PlaceItems {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     self.align.to_css(dest)?;
     let is_equal = match &self.justify {
       JustifyItems::Normal => self.align == AlignItems::Normal,
@@ -673,7 +674,7 @@ impl Parse for GapValue {
 }
 
 impl ToCss for GapValue {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     match self {
       GapValue::Normal => dest.write_str("normal"),
       GapValue::LengthPercentage(lp) => lp.to_css(dest)
@@ -697,7 +698,7 @@ impl Parse for Gap {
 }
 
 impl ToCss for Gap {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     self.row.to_css(dest)?;
     if self.column != self.row {
       dest.write_str(" ")?;

src/properties/background.rs

@@ -5,6 +5,7 @@ use crate::values::macros::*;
 use crate::values::{color::CssColor, image::Image};
 use crate::properties::Property;
 use itertools::izip;
+use crate::printer::Printer;
 
 /// https://www.w3.org/TR/css-backgrounds-3/#background-position
 #[derive(Debug, Clone, PartialEq)]
@@ -108,7 +109,7 @@ impl Parse for BackgroundPosition {
 }
 
 impl ToCss for BackgroundPosition {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     match (&self.x, &self.y) {
       (
         x_pos @ &HorizontalPosition::Side(_, Some(_)),
@@ -190,7 +191,7 @@ impl Parse for BackgroundSize {
 }
 
 impl ToCss for BackgroundSize {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     use BackgroundSize::*;
 
     match &self {
@@ -253,7 +254,7 @@ impl Parse for BackgroundRepeat {
 }
 
 impl ToCss for BackgroundRepeat {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     use BackgroundRepeatKeyword::*;
     match (&self.x, &self.y) {
       (Repeat, NoRepeat) => dest.write_str("repeat-x"),
@@ -394,7 +395,7 @@ impl Parse for Background {
 }
 
 impl ToCss for Background {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     let mut needs_space = false;
 
     if self.color != CssColor::default() {

src/properties/flex.rs

@@ -3,6 +3,7 @@ use crate::values::macros::*;
 use crate::values::length::{LengthPercentageOrAuto, LengthPercentage, Length, Percentage};
 use crate::values::traits::{Parse, ToCss, PropertyHandler};
 use super::Property;
+use crate::printer::Printer;
 
 // https://www.w3.org/TR/2018/CR-css-flexbox-1-20181119/#propdef-flex-direction
 enum_property!(FlexDirection,
@@ -66,7 +67,7 @@ impl Parse for FlexFlow {
 }
 
 impl ToCss for FlexFlow {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     let mut needs_space = false;
     if self.direction != FlexDirection::default() || self.wrap == FlexWrap::default() {
       self.direction.to_css(dest)?;
@@ -133,7 +134,7 @@ impl Parse for Flex {
 }
 
 impl ToCss for Flex {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     if self.grow == 0.0 && self.shrink == 0.0 && self.basis == LengthPercentageOrAuto::Auto {
       dest.write_str("none")?;
       return Ok(())

src/properties/mod.rs

@@ -13,6 +13,7 @@ use flex::*;
 use align::*;
 use crate::values::{image::*, length::*, border::*, border_image::*, border_radius::*, rect::*, color::*};
 use super::values::traits::{Parse, ToCss};
+use crate::printer::Printer;
 
 #[derive(Debug, Clone)]
 pub enum Property {
@@ -394,7 +395,7 @@ impl Property {
     return Ok(Property::Custom(CustomProperty::parse(name, input)?))
   }
 
-  pub fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  pub fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     use Property::*;
 
     macro_rules! property {

src/properties/outline.rs

@@ -3,6 +3,7 @@ use crate::values::border::{BorderStyle, GenericBorder, BorderSideWidth};
 use crate::values::traits::{Parse, ToCss, PropertyHandler};
 use crate::values::color::CssColor;
 use super::Property;
+use crate::printer::Printer;
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum OutlineStyle {
@@ -22,7 +23,7 @@ impl Parse for OutlineStyle {
 }
 
 impl ToCss for OutlineStyle {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     match self {
       OutlineStyle::Auto => dest.write_str("auto"),
       OutlineStyle::BorderStyle(border_style) => border_style.to_css(dest)

src/values/border.rs

@@ -7,6 +7,7 @@ use super::rect::Rect;
 use super::macros::*;
 use super::border_image::*;
 use super::border_radius::*;
+use crate::printer::Printer;
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum BorderSideWidth {
@@ -42,7 +43,7 @@ impl Parse for BorderSideWidth {
 }
 
 impl ToCss for BorderSideWidth {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     use BorderSideWidth::*;
     match self {
       Thin => dest.write_str("thin"),
@@ -132,7 +133,7 @@ impl<S: Parse + Default> Parse for GenericBorder<S> {
 }
 
 impl<S: ToCss + Default + PartialEq> ToCss for GenericBorder<S> {
-  fn to_css<W>(&self, dest: &mut W) -> std::fmt::Result where W: std::fmt::Write {
+  fn to_css<W>(&self, dest: &mut Printer<W>) -> std::fmt::Result where W: std::fmt::Write {
     if self.width != BorderSideWidth::default() {
       self.width.to_css(dest)?;
       dest.write_str(" ")?;