Add Coverage

Author: owjs3901

libs/extractor/src/extractor/extract_global_style_from_expression.rs

@@ -56,18 +56,18 @@ pub fn extract_global_style_from_expression<'a>(
                             )));
                         }
                     }
-                    continue;
+                } else {
+                    styles.extend(
+                        extract_style_from_expression(
+                            ast_builder,
+                            None,
+                            &mut o.value,
+                            0,
+                            &Some(StyleSelector::Global(name.clone(), file.to_string())),
+                        )
+                        .styles,
+                    );
                 }
-                styles.extend(
-                    extract_style_from_expression(
-                        ast_builder,
-                        None,
-                        &mut o.value,
-                        0,
-                        &Some(StyleSelector::Global(name.clone(), file.to_string())),
-                    )
-                    .styles,
-                );
             }
         }
     }

libs/extractor/src/extractor/extract_keyframes_from_expression.rs

@@ -19,7 +19,7 @@ pub fn extract_keyframes_from_expression<'a>(
     if let Expression::ObjectExpression(obj) = expression {
         for p in obj.properties.iter_mut() {
             if let ObjectPropertyKind::ObjectProperty(o) = p {
-                let mut name = if let PropertyKey::StaticIdentifier(ident) = &o.key {
+                let name = if let PropertyKey::StaticIdentifier(ident) = &o.key {
                     ident.name.to_string()
                 } else if let PropertyKey::StringLiteral(s) = &o.key {
                     s.value.to_string()
@@ -33,10 +33,6 @@ pub fn extract_keyframes_from_expression<'a>(
                 } else {
                     continue;
                 };
-                // convert number
-                if let Ok(num) = name.parse::<f64>() {
-                    name = format!("{num}%");
-                }
                 let mut styles =
                     extract_style_from_expression(ast_builder, None, &mut o.value, 0, &None)
                         .styles
@@ -47,7 +43,10 @@ pub fn extract_keyframes_from_expression<'a>(
                         })
                         .collect::<Vec<_>>();
                 styles.sort_by_key(|a| a.property().to_string());
-                keyframes.keyframes.insert(name, styles);
+                keyframes.keyframes.insert(
+                    name.parse::<f64>().map(|v| format!("{v}%")).unwrap_or(name),
+                    styles,
+                );
             }
         }
     }

libs/extractor/src/extractor/extract_style_from_member_expression.rs

@@ -40,9 +40,7 @@ pub(super) fn extract_style_from_member_expression<'a>(
                 for (idx, p) in array.elements.iter_mut().enumerate() {
                     if let ArrayExpressionElement::SpreadElement(sp) = p {
                         etc = Some(sp.argument.clone_in(ast_builder.allocator));
-                        continue;
-                    }
-                    if idx as f64 == num {
+                    } else if idx as f64 == num {
                         return extract_style_from_expression(
                             ast_builder,
                             name,
@@ -193,25 +191,21 @@ pub(super) fn extract_style_from_member_expression<'a>(
                 map,
             });
         }
-        Expression::Identifier(_) => {
-            if let Some(name) = name {
-                ret.push(ExtractStyleProp::Static(ExtractStyleValue::Dynamic(
-                    ExtractDynamicStyle::new(
-                        name,
-                        level,
-                        &expression_to_code(&Expression::ComputedMemberExpression(
-                            ast_builder.alloc_computed_member_expression(
-                                SPAN,
-                                mem.object.clone_in(ast_builder.allocator),
-                                mem_expression.clone_in(ast_builder.allocator),
-                                false,
-                            ),
-                        )),
-                        selector.clone(),
+        Expression::Identifier(_) => ret.push(ExtractStyleProp::Static(
+            ExtractStyleValue::Dynamic(ExtractDynamicStyle::new(
+                name.unwrap(),
+                level,
+                &expression_to_code(&Expression::ComputedMemberExpression(
+                    ast_builder.alloc_computed_member_expression(
+                        SPAN,
+                        mem.object.clone_in(ast_builder.allocator),
+                        mem_expression.clone_in(ast_builder.allocator),
+                        false,
                     ),
-                )))
-            }
-        }
+                )),
+                selector.clone(),
+            )),
+        )),
         _ => {}
     };
 

libs/extractor/src/lib.rs

@@ -3667,6 +3667,25 @@ export default function Card({
             .unwrap()
         ));
     }
+
+    #[test]
+    #[serial]
+    fn props_direct_wrong() {
+        reset_class_map();
+        assert_debug_snapshot!(ToBTreeSet::from(
+            extract(
+                "test.jsx",
+                r#"import {Flex} from '@devup-ui/core'
+;<Flex gap={true[1]} />
+        "#,
+                ExtractOption {
+                    package: "@devup-ui/core".to_string(),
+                    css_file: None
+                }
+            )
+            .unwrap()
+        ));
+    }
     #[test]
     #[serial]
     fn test_component_in_func() {

libs/extractor/src/snapshots/extractor__tests__props_direct_wrong.snap

@@ -0,0 +1,20 @@
+---
+source: libs/extractor/src/lib.rs
+expression: "ToBTreeSet::from(extract(\"test.jsx\",\nr#\"import {Flex} from '@devup-ui/core'\n;<Flex gap={true[1]} />\n        \"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap())"
+---
+ToBTreeSet {
+    styles: {
+        Static(
+            ExtractStaticStyle {
+                property: "display",
+                value: "flex",
+                level: 0,
+                selector: None,
+                style_order: Some(
+                    0,
+                ),
+            },
+        ),
+    },
+    code: "import \"@devup-ui/core/devup-ui.css\";\n<div className=\"d0\" />;\n",
+}