Trying a new css system

Cargo.toml

@@ -59,6 +59,8 @@ clap = { version = "4.5.4", features = ["derive"] }
 simple_logger = "4.2.0"
 cookie = { version = "0.18.1", features = ["secure", "private"] }
 url = "2.5.0"
+nom = "7.1.3"
+nom-trace = "0.2.1"
 
 [dev-dependencies]
 criterion = { version = "0.5", features = ["html_reports"] }

crates/gosub_css3/Cargo.toml

@@ -11,3 +11,4 @@ lazy_static = "1.4"
 log = "0.4.21"
 simple_logger = "4.2.0"
 anyhow = { version = "1.0.82", features = [] }
+colors-transform = "0.2.11"

crates/gosub_styling/src/css_colors.rs → crates/gosub_css3/src/colors.rs

@@ -51,6 +51,11 @@ impl From<&str> for RgbColor {
         if value.is_empty() {
             return RgbColor::default();
         }
+        if value == "currentcolor" {
+            // @todo: implement currentcolor
+            return RgbColor::default();
+        }
+
         if value.starts_with('#') {
             return parse_hex(value);
         }
@@ -86,6 +91,7 @@ impl From<&str> for RgbColor {
             return RgbColor::new(rgb.get_red(), rgb.get_green(), rgb.get_blue(), 255.0);
         }
         if value.starts_with("hsla(") {
+            // @TODO: hsla() does not work properly
             // HSLA function
             let hsl = Hsl::from_str(value);
             if hsl.is_err() {
@@ -105,7 +111,7 @@ impl From<&str> for RgbColor {
 }
 
 fn get_hex_color_from_name(color_name: &str) -> Option<&str> {
-    for entry in crate::css_colors::CSS_COLORNAMES.iter() {
+    for entry in crate::colors::CSS_COLORNAMES.iter() {
         if entry.name == color_name {
             return Some(entry.value);
         }
@@ -905,4 +911,36 @@ mod tests {
         assert_eq!(color.b, 0x99 as f32);
         assert_eq!(color.a, 255.0);
     }
+
+    #[test]
+    fn rgb_func_colors() {
+        let color = super::RgbColor::from("rgb(10, 20, 30)");
+        assert_eq!(color.r, 10.0);
+        assert_eq!(color.g, 20.0);
+        assert_eq!(color.b, 30.0);
+        assert_eq!(color.a, 255.0);
+
+        // invalid color
+        let color = super::RgbColor::from("rgb(10)");
+        assert_eq!(color.r, 0.0);
+        assert_eq!(color.g, 0.0);
+        assert_eq!(color.b, 0.0);
+        assert_eq!(color.a, 255.0);
+    }
+
+    #[test]
+    fn hsl_func_colors() {
+        let color = super::RgbColor::from("hsl(10, 20%, 30%)");
+        assert_eq!(color.r, 91.8);
+        assert_eq!(color.g, 66.3);
+        assert_eq!(color.b, 61.2);
+        assert_eq!(color.a, 255.0);
+
+        // invalid color
+        let color = super::RgbColor::from("hsl(10)");
+        assert_eq!(color.r, 0.0);
+        assert_eq!(color.g, 0.0);
+        assert_eq!(color.b, 0.0);
+        assert_eq!(color.a, 255.0);
+    }
 }

crates/gosub_css3/src/convert/ast_converter.rs

@@ -1,7 +1,7 @@
 use crate::node::{Node as CssNode, NodeType};
 use crate::stylesheet::{
     CssDeclaration, CssOrigin, CssRule, CssSelector, CssSelectorPart, CssSelectorType,
-    CssStylesheet, MatcherType,
+    CssStylesheet, MatcherType, CssValue
 };
 use anyhow::anyhow;
 use gosub_shared::types::Result;
@@ -56,7 +56,6 @@ in css:
 vs
     h3 { color: rebeccapurple; }
     h4 { color: rebeccapurple; }
-
 */
 
 /// Converts a CSS AST to a CSS stylesheet structure
@@ -92,7 +91,6 @@ pub fn convert_ast_to_stylesheet(
             }
 
             let mut selector = CssSelector { parts: vec![] };
-
             for node in node.as_selector_list().iter() {
                 if !node.is_selector() {
                     continue;
@@ -170,16 +168,126 @@ pub fn convert_ast_to_stylesheet(
                     continue;
                 }
 
-                let (property, value, important) = declaration.as_declaration();
-                rule.declarations.push(CssDeclaration {
-                    property: property.clone(),
-                    value: value[0].to_string(),
-                    important: *important,
-                });
+                let (property, nodes, important) = declaration.as_declaration();
+
+                // Convert the nodes into CSS Values
+                let mut css_values = vec!();
+                for node in nodes.iter() {
+                    if let Ok(value) = CssValue::parse_ast_node(node) {
+                        css_values.push(value);
+                    }
+                }
+
+                if css_values.is_empty() {
+                    continue;
+                }
+
+                if css_values.len() > 1 {
+                    rule.declarations.push(CssDeclaration {
+                        property: property.clone(),
+                        value: CssValue::List(css_values.to_vec()),
+                        important: *important,
+                    });
+                } else {
+                    rule.declarations.push(CssDeclaration {
+                        property: property.clone(),
+                        value: css_values.first().expect("").clone(),
+                        important: *important,
+                    });
+                }
             }
         }
 
         sheet.rules.push(rule);
     }
     Ok(sheet)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::parser_config::ParserConfig;
+    use crate::Css3;
+
+    #[test]
+    fn convert_font_family() {
+        let ast = Css3::parse(
+            r#"
+              body {
+                border: 1px solid black;
+                color: #ffffff;
+                background-color: #121212;
+                font-family: "Arial", sans-serif;
+                margin: 0;
+                padding: 0;
+              }
+            "#,
+            ParserConfig::default(),
+        )
+        .unwrap();
+
+        let tree = convert_ast_to_stylesheet(&ast, CssOrigin::UserAgent, "test.css").unwrap();
+
+        dbg!(&tree);
+    }
+
+    #[test]
+    fn convert_test() {
+        let ast = Css3::parse(
+            r#"
+            h1 { color: red; }
+            h3, h4 { border: 1px solid black; }
+            "#,
+            ParserConfig::default(),
+        )
+        .unwrap();
+
+        let tree = convert_ast_to_stylesheet(&ast, CssOrigin::UserAgent, "test.css").unwrap();
+
+        assert_eq!(
+            tree.rules
+                .first()
+                .unwrap()
+                .declarations
+                .first()
+                .unwrap()
+                .property,
+            "color"
+        );
+        assert_eq!(
+            tree.rules
+                .first()
+                .unwrap()
+                .declarations
+                .first()
+                .unwrap()
+                .value,
+            CssValue::String("red".into())
+        );
+
+        assert_eq!(
+            tree.rules
+                .get(1)
+                .unwrap()
+                .declarations
+                .first()
+                .unwrap()
+                .property,
+            "border"
+        );
+        assert_eq!(
+            tree.rules
+                .get(1)
+                .unwrap()
+                .declarations
+                .first()
+                .unwrap()
+                .value,
+            CssValue::List(vec![
+                CssValue::Unit(1.0, "px".into()),
+                CssValue::String("solid".into()),
+                CssValue::String("black".into())
+            ])
+        );
+    }
+}

crates/gosub_css3/src/lib.rs

@@ -5,6 +5,7 @@ use crate::tokenizer::Tokenizer;
 use gosub_shared::byte_stream::{ByteStream, Encoding, Stream};
 use gosub_shared::{timing_start, timing_stop};
 
+pub mod colors;
 pub mod convert;
 pub mod location;
 mod node;