Merge pull request #161 from dev-five-git/ts-as

Support TsAsExpression

Author: owjs3901

.changeset/some-adults-build.md

@@ -0,0 +1,5 @@
+---
+"@devup-ui/wasm": patch
+---
+
+Support TsAsExpression

libs/extractor/src/lib.rs

@@ -540,6 +540,49 @@ mod tests {
         .unwrap());
     }
 
+    #[test]
+    #[serial]
+    fn extract_dynamic_style_props_with_type() {
+        reset_class_map();
+        assert_debug_snapshot!(extract(
+            "test.tsx",
+            r#"import { Box } from "@devup-ui/core";
+<Box padding={a as A} />;
+"#,
+            ExtractOption {
+                package: "@devup-ui/core".to_string(),
+                css_file: None
+            }
+        )
+        .unwrap());
+
+        reset_class_map();
+        assert_debug_snapshot!(extract(
+            "test.tsx",
+            r#"import { Box } from "@devup-ui/core";
+<Box padding={data[d as A] as B} />;
+"#,
+            ExtractOption {
+                package: "@devup-ui/core".to_string(),
+                css_file: None
+            }
+        )
+        .unwrap());
+
+        reset_class_map();
+        assert_debug_snapshot!(extract(
+            "test.tsx",
+            r#"import { Box } from "@devup-ui/core";
+<Box padding={"10px" as B} />;
+"#,
+            ExtractOption {
+                package: "@devup-ui/core".to_string(),
+                css_file: None
+            }
+        )
+        .unwrap());
+    }
+
     #[test]
     #[serial]
     fn extract_dynamic_responsive_style_props() {

libs/extractor/src/snapshots/extractor__tests__extract_dynamic_style_props_with_type-2.snap

@@ -0,0 +1,18 @@
+---
+source: libs/extractor/src/lib.rs
+expression: "extract(\"test.tsx\",\nr#\"import { Box } from \"@devup-ui/core\";\n<Box padding={data[d as A] as B} />;\n\"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap()"
+---
+ExtractOutput {
+    styles: [
+        Dynamic(
+            ExtractDynamicStyle {
+                property: "padding",
+                level: 0,
+                identifier: "data[d as A]",
+                selector: None,
+                style_order: None,
+            },
+        ),
+    ],
+    code: "import \"@devup-ui/core/devup-ui.css\";\n<div className=\"d0\" style={{ \"--d1\": data[d as A] }} />;\n",
+}

libs/extractor/src/snapshots/extractor__tests__extract_dynamic_style_props_with_type-3.snap

@@ -0,0 +1,18 @@
+---
+source: libs/extractor/src/lib.rs
+expression: "extract(\"test.tsx\",\nr#\"import { Box } from \"@devup-ui/core\";\n<Box padding={\"10px\" as B} />;\n\"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap()"
+---
+ExtractOutput {
+    styles: [
+        Static(
+            ExtractStaticStyle {
+                property: "padding",
+                value: "10px",
+                level: 0,
+                selector: None,
+                style_order: None,
+            },
+        ),
+    ],
+    code: "import \"@devup-ui/core/devup-ui.css\";\n<div className=\"d0\" />;\n",
+}

libs/extractor/src/snapshots/extractor__tests__extract_dynamic_style_props_with_type.snap

@@ -0,0 +1,18 @@
+---
+source: libs/extractor/src/lib.rs
+expression: "extract(\"test.tsx\",\nr#\"import { Box } from \"@devup-ui/core\";\n<Box padding={a as A} />;\n\"#,\nExtractOption\n{ package: \"@devup-ui/core\".to_string(), css_file: None }).unwrap()"
+---
+ExtractOutput {
+    styles: [
+        Dynamic(
+            ExtractDynamicStyle {
+                property: "padding",
+                level: 0,
+                identifier: "a",
+                selector: None,
+                style_order: None,
+            },
+        ),
+    ],
+    code: "import \"@devup-ui/core/devup-ui.css\";\n<div className=\"d0\" style={{ \"--d1\": a }} />;\n",
+}

libs/extractor/src/style_extractor.rs

@@ -72,6 +72,7 @@ pub fn extract_style_from_expression<'a>(
     level: u8,
     selector: Option<&StyleSelector>,
 ) -> ExtractResult<'a> {
+    println!("extract_style_from_expression: {:?}", expression);
     let mut typo = false;
 
     if name.is_none() && selector.is_none() {
@@ -342,6 +343,13 @@ pub fn extract_style_from_expression<'a>(
                 tag: None,
                 style_order: None,
             },
+            Expression::TSAsExpression(exp) => extract_style_from_expression(
+                ast_builder,
+                name,
+                &mut exp.expression,
+                level,
+                selector,
+            ),
             Expression::ComputedMemberExpression(mem) => {
                 extract_style_from_member_expression(ast_builder, name, mem, level, selector)
             }