Refactor code

Author: owjs3901

libs/extractor/src/lib.rs

@@ -3672,6 +3672,9 @@ e(o, { className: "a", bg: variable, style: { color: "blue" }, ...props })
 
         reset_class_map();
         assert_debug_snapshot!(ToBTreeSet::from(extract("test.js", r#""use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("react/jsx-runtime"),r=require("@devup-ui/react");function t(){return e.jsxs("div",{children:[e.jsx(r.Box,{_hover:{bg:"blue"},bg:"$text",color:"red",children:"hello"}),e.jsx(r.Text,{typography:`header`,children:"typo"}),e.jsx(r.Flex,{as:"section",mt:2,children:"section"})]})}exports.Lib=t;"#, ExtractOption { package: "@devup-ui/react".to_string(), css_dir: "@devup-ui/react".to_string(), single_css: true, import_main_css: false }).unwrap()));
+
+        reset_class_map();
+        assert_debug_snapshot!(ToBTreeSet::from(extract("test.js", r#""use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("react/jsx-runtime"),{Box,Text,Flex}=require("@devup-ui/react");function t(){return e.jsxs("div",{children:[e.jsx(Box,{_hover:{bg:"blue"},bg:"$text",color:"red",children:"hello"}),e.jsx(Text,{typography:`header`,children:"typo"}),e.jsx(Flex,{as:"section",mt:2,children:"section"})]})}exports.Lib=t;"#, ExtractOption { package: "@devup-ui/react".to_string(), css_dir: "@devup-ui/react".to_string(), single_css: true, import_main_css: false }).unwrap()));
     }
 
     #[test]

libs/extractor/src/prop_modify_utils.rs

@@ -31,14 +31,14 @@ pub fn modify_prop_object<'a>(
                     let name = ident.name.as_str();
                     if name == "className" {
                         class_name_prop = Some(attr.value.clone_in(ast_builder.allocator));
-                        continue;
-                    }
-                    if name == "style" {
+                    } else if name == "style" {
                         style_prop = Some(attr.value.clone_in(ast_builder.allocator));
-                        continue;
+                    } else {
+                        props.insert(idx, ObjectPropertyKind::ObjectProperty(attr));
                     }
+                } else {
+                    props.insert(idx, ObjectPropertyKind::ObjectProperty(attr));
                 }
-                props.insert(idx, ObjectPropertyKind::ObjectProperty(attr));
             }
             ObjectPropertyKind::SpreadProperty(spread) => {
                 spread_props.push(spread.argument.clone_in(ast_builder.allocator));
@@ -111,26 +111,26 @@ pub fn modify_props<'a>(
                     && let Some(value) = &attr.value
                     && (ident.name == "className" || ident.name == "style")
                 {
-                    let value = match &value {
-                        JSXAttributeValue::ExpressionContainer(container) => container
+                    let mut res = None;
+
+                    if let JSXAttributeValue::ExpressionContainer(container) = &value {
+                        res = container
                             .expression
                             .as_expression()
-                            .map(|expression| expression.clone_in(ast_builder.allocator)),
-                        JSXAttributeValue::StringLiteral(literal) => {
-                            Some(ast_builder.expression_string_literal(SPAN, literal.value, None))
-                        }
-                        _ => None,
-                    };
+                            .map(|expression| expression.clone_in(ast_builder.allocator));
+                    } else if let JSXAttributeValue::StringLiteral(literal) = &value {
+                        res =
+                            Some(ast_builder.expression_string_literal(SPAN, literal.value, None));
+                    }
                     let name = ident.name.as_str();
                     if name == "className" {
-                        class_name_prop = value;
+                        class_name_prop = res;
                     } else if name == "style" {
-                        style_prop = value;
+                        style_prop = res;
                     }
-
-                    continue;
+                } else {
+                    props.insert(idx, JSXAttributeItem::Attribute(attr));
                 }
-                props.insert(idx, JSXAttributeItem::Attribute(attr));
             }
             JSXAttributeItem::SpreadAttribute(spread) => {
                 spread_props.push(spread.argument.clone_in(ast_builder.allocator));

libs/extractor/src/snapshots/extractor__tests__support_transpile_cjs-5.snap

@@ -0,0 +1,63 @@
+---
+source: libs/extractor/src/lib.rs
+expression: "ToBTreeSet::from(extract(\"test.js\",\nr#\"\"use strict\";Object.defineProperty(exports,Symbol.toStringTag,{value:\"Module\"});const e=require(\"react/jsx-runtime\"),{Box,Text,Flex}=require(\"@devup-ui/react\");function t(){return e.jsxs(\"div\",{children:[e.jsx(Box,{_hover:{bg:\"blue\"},bg:\"$text\",color:\"red\",children:\"hello\"}),e.jsx(Text,{typography:`header`,children:\"typo\"}),e.jsx(Flex,{as:\"section\",mt:2,children:\"section\"})]})}exports.Lib=t;\"#,\nExtractOption\n{\n    package: \"@devup-ui/react\".to_string(), css_dir:\n    \"@devup-ui/react\".to_string(), single_css: true, import_main_css: false\n}).unwrap())"
+---
+ToBTreeSet {
+    styles: {
+        Static(
+            ExtractStaticStyle {
+                property: "background",
+                value: "$text",
+                level: 0,
+                selector: None,
+                style_order: None,
+            },
+        ),
+        Static(
+            ExtractStaticStyle {
+                property: "background",
+                value: "blue",
+                level: 0,
+                selector: Some(
+                    Selector(
+                        "&:hover",
+                    ),
+                ),
+                style_order: None,
+            },
+        ),
+        Static(
+            ExtractStaticStyle {
+                property: "color",
+                value: "red",
+                level: 0,
+                selector: None,
+                style_order: None,
+            },
+        ),
+        Static(
+            ExtractStaticStyle {
+                property: "display",
+                value: "flex",
+                level: 0,
+                selector: None,
+                style_order: Some(
+                    0,
+                ),
+            },
+        ),
+        Static(
+            ExtractStaticStyle {
+                property: "margin-top",
+                value: "8px",
+                level: 0,
+                selector: None,
+                style_order: None,
+            },
+        ),
+        Typography(
+            "header",
+        ),
+    },
+    code: "\"use strict\";\nimport \"@devup-ui/react/devup-ui.css\";\nObject.defineProperty(exports, Symbol.toStringTag, { value: \"Module\" });\nconst e = require(\"react/jsx-runtime\"), { Box, Text, Flex } = require(\"@devup-ui/react\");\nfunction t() {\n\treturn e.jsxs(\"div\", { children: [\n\t\te.jsx(\"div\", {\n\t\t\tchildren: \"hello\",\n\t\t\tclassName: \"a b c\"\n\t\t}),\n\t\te.jsx(\"span\", {\n\t\t\tchildren: \"typo\",\n\t\t\tclassName: \"typo-header\"\n\t\t}),\n\t\te.jsx(\"section\", {\n\t\t\tchildren: \"section\",\n\t\t\tclassName: \"d e\"\n\t\t})\n\t] });\n}\nexports.Lib = t;\n",
+}

libs/extractor/src/visit.rs

@@ -448,10 +448,7 @@ impl<'a> VisitMut<'a> for DevupVisitor<'a> {
                         .insert(import.local.to_string(), import.imported.to_string());
                 }
             }
-            return;
-        }
-
-        if it.source.value == self.package
+        } else if it.source.value == self.package
             && let Some(specifiers) = &mut it.specifiers
         {
             for i in (0..specifiers.len()).rev() {
@@ -506,10 +503,9 @@ impl<'a> VisitMut<'a> for DevupVisitor<'a> {
                     }
                 }
             }
-            return;
+        } else {
+            walk_import_declaration(self, it);
         }
-
-        walk_import_declaration(self, it);
     }
     fn visit_jsx_element(&mut self, elem: &mut JSXElement<'a>) {
         walk_jsx_element(self, elem);