Refactor code

Author: owjs3901

libs/extractor/src/lib.rs

@@ -5590,6 +5590,23 @@ export {
             )
             .unwrap()
         ));
+
+        reset_class_map();
+        assert_debug_snapshot!(ToBTreeSet::from(
+            extract(
+                "test.jsx",
+                r#"import {Box} from '@devup-ui/core'
+        <Box styleVars={{...styleVars}} />
+                "#,
+                ExtractOption {
+                    package: "@devup-ui/core".to_string(),
+                    css_dir: "@devup-ui/core".to_string(),
+                    single_css: true,
+                    import_main_css: false
+                }
+            )
+            .unwrap()
+        ));
     }
 
     #[test]

libs/extractor/src/prop_modify_utils.rs

@@ -347,23 +347,24 @@ fn merge_string_expressions<'a>(
         ));
     }
 
+    let q = oxc_allocator::Vec::from_iter_in(
+        string_literals.iter().enumerate().map(|(idx, s)| {
+            let tail = idx == string_literals.len() - 1;
+            ast_builder.template_element(
+                SPAN,
+                TemplateElementValue {
+                    raw: ast_builder.atom(s),
+                    cooked: None,
+                },
+                tail,
+            )
+        }),
+        ast_builder.allocator,
+    );
     Some(
         ast_builder.expression_template_literal(
             SPAN,
-            oxc_allocator::Vec::from_iter_in(
-                string_literals.iter().enumerate().map(|(idx, s)| {
-                    let tail = idx == string_literals.len() - 1;
-                    ast_builder.template_element(
-                        SPAN,
-                        TemplateElementValue {
-                            raw: ast_builder.atom(s),
-                            cooked: None,
-                        },
-                        tail,
-                    )
-                }),
-                ast_builder.allocator,
-            ),
+            q,
             oxc_allocator::Vec::from_iter_in(
                 other_expressions
                     .into_iter()
@@ -432,7 +433,7 @@ pub fn convert_style_vars<'a>(
                 let name = match &p.key {
                     PropertyKey::StaticIdentifier(ident) => Some(ident.name),
                     PropertyKey::StringLiteral(ident) => Some(ident.value),
-                    etc => {
+                    _ => {
                         obj.properties.insert(
                             idx,
                             ast_builder.object_property_kind_object_property(
@@ -462,7 +463,7 @@ pub fn convert_style_vars<'a>(
                                         ast_builder.allocator,
                                     ),
                                     oxc_allocator::Vec::from_array_in(
-                                        [etc.to_expression().clone_in(ast_builder.allocator)],
+                                        [p.key.to_expression().clone_in(ast_builder.allocator)],
                                         ast_builder.allocator,
                                     ),
                                 )),

libs/extractor/src/snapshots/extractor__tests__style_variables-11.snap

@@ -0,0 +1,8 @@
+---
+source: libs/extractor/src/lib.rs
+expression: "ToBTreeSet::from(extract(\"test.jsx\",\nr#\"import {Box} from '@devup-ui/core'\n        <Box styleVars={{...styleVars}} />\n                \"#,\nExtractOption\n{\n    package: \"@devup-ui/core\".to_string(), css_dir:\n    \"@devup-ui/core\".to_string(), single_css: true, import_main_css: false\n}).unwrap())"
+---
+ToBTreeSet {
+    styles: {},
+    code: "<div style={{ ...styleVars }} />;\n",
+}