Refactor code

Author: owjs3901

libs/extractor/src/visit.rs

@@ -531,45 +531,37 @@ impl<'a> VisitMut<'a> for DevupVisitor<'a> {
                 {
                     let property_name = name.name.to_string();
                     for name in disassemble_property(&property_name) {
-                        if duplicate_set.contains(&name) {
-                            continue;
-                        }
-                        duplicate_set.insert(name.clone());
-                        if property_name == "styleOrder" {
-                            style_order = jsx_expression_to_number(attr.value.as_ref().unwrap())
-                                .map(|n| n as u8);
-                            continue;
-                        }
-                        if property_name == "props" {
-                            if let Some(value) = attr.value.as_ref()
-                                && let JSXAttributeValue::ExpressionContainer(expr) = value
-                                && let Some(expression) = expr.expression.as_expression()
-                            {
-                                props = Some(expression.clone_in(self.ast.allocator));
-                            }
-                            continue;
-                        }
-                        if property_name == "styleVars" {
-                            if let Some(value) = attr.value.as_ref()
-                                && let JSXAttributeValue::ExpressionContainer(expr) = value
-                                && let Some(expression) = expr.expression.as_expression()
-                            {
-                                style_vars = Some(expression.clone_in(self.ast.allocator));
+                        if !duplicate_set.contains(&name) {
+                            duplicate_set.insert(name.clone());
+                            if property_name == "styleOrder" {
+                                style_order =
+                                    jsx_expression_to_number(attr.value.as_ref().unwrap())
+                                        .map(|n| n as u8);
+                            } else if property_name == "props" {
+                                if let Some(value) = attr.value.as_ref()
+                                    && let JSXAttributeValue::ExpressionContainer(expr) = value
+                                    && let Some(expression) = expr.expression.as_expression()
+                                {
+                                    props = Some(expression.clone_in(self.ast.allocator));
+                                }
+                            } else if property_name == "styleVars" {
+                                if let Some(value) = attr.value.as_ref()
+                                    && let JSXAttributeValue::ExpressionContainer(expr) = value
+                                    && let Some(expression) = expr.expression.as_expression()
+                                {
+                                    style_vars = Some(expression.clone_in(self.ast.allocator));
+                                }
+                            } else if let Some(at) = &mut attr.value {
+                                let ExtractResult { styles, tag, .. } =
+                                    extract_style_from_jsx(&self.ast, &name, at);
+                                props_styles.extend(styles.into_iter().rev());
+                                tag_name = tag.unwrap_or(tag_name);
                             }
-                            continue;
-                        }
-
-                        if let Some(at) = &mut attr.value {
-                            let ExtractResult { styles, tag, .. } =
-                                extract_style_from_jsx(&self.ast, &name, at);
-                            props_styles.extend(styles.into_iter().rev());
-                            tag_name = tag.unwrap_or(tag_name);
-                            continue;
                         }
                     }
-                    continue;
+                } else {
+                    attrs.insert(i, attr);
                 }
-                attrs.insert(i, attr);
             }
 
             kind.extract()

libs/sheet/src/lib.rs

@@ -683,6 +683,7 @@ mod tests {
     use crate::theme::{ColorTheme, Typography};
 
     use super::*;
+    use extractor::{ExtractOption, extract};
     use insta::assert_debug_snapshot;
 
     #[test]
@@ -786,6 +787,12 @@ mod tests {
         assert_debug_snapshot!(sheet.create_css(None, false).split("*/").nth(1).unwrap());
     }
 
+    #[test]
+    fn test_import_css() {
+        let sheet = StyleSheet::default();
+        assert_debug_snapshot!(sheet.create_css(Some("index.tsx"), true));
+    }
+
     #[test]
     fn test_create_css() {
         let mut sheet = StyleSheet::default();
@@ -1731,4 +1738,16 @@ mod tests {
 
         assert_debug_snapshot!(css.split("*/").nth(1).unwrap());
     }
+
+    #[test]
+    fn test_update_styles() {
+        let mut sheet = StyleSheet::default();
+        sheet.update_styles(&HashSet::new(), "index.tsx", true);
+        assert_debug_snapshot!(sheet.create_css(Some("index.tsx"), true));
+
+        let mut sheet = StyleSheet::default();
+        let output = extract("index.tsx", "import {Box,globalCss} from '@devup-ui/core';<Box w={1} h={variable} />;globalCss`div{color:red}`;globalCss({div:{display:flex},fontFaces:[{fontFamily:'Roboto',src:'url(/fonts/Roboto-Regular.ttf)'}]})", ExtractOption { package: "@devup-ui/core".to_string(), css_dir: "@devup-ui/core".to_string(), single_css: true, import_main_css: false }).unwrap();
+        sheet.update_styles(&output.styles, "index.tsx", true);
+        assert_debug_snapshot!(sheet.create_css(None, true).split("*/").nth(1).unwrap());
+    }
 }

libs/sheet/src/snapshots/sheet__tests__import_css.snap

@@ -0,0 +1,5 @@
+---
+source: libs/sheet/src/lib.rs
+expression: "sheet.create_css(Some(\"index.tsx\"), true)"
+---
+"@import \"./devup-ui.css\";"

libs/sheet/src/snapshots/sheet__tests__update_styles-2.snap

@@ -0,0 +1,5 @@
+---
+source: libs/sheet/src/lib.rs
+expression: "sheet.create_css(None, true).split(\"*/\").nth(1).unwrap()"
+---
+"@layer b;@font-face{font-family:Roboto;src:url(/fonts/Roboto-Regular.ttf)}div{color:red}@layer b{div{display:var(--e)}}.b{height:var(--c)}.a{width:4px}"

libs/sheet/src/snapshots/sheet__tests__update_styles.snap

@@ -0,0 +1,5 @@
+---
+source: libs/sheet/src/lib.rs
+expression: "sheet.create_css(Some(\"index.tsx\"), true)"
+---
+"@import \"./devup-ui.css\";"