Merge pull request dev-five-git#270 from dev-five-git/optimize-join-syntax

Optimize join

Author: owjs3901

.github/workflows/publish.yml

@@ -40,6 +40,16 @@ jobs:
       - run: |
           pnpm build
           pnpm lint
+          # rust coverage issue
+          echo 'max_width = 1000' > .rustfmt.toml
+          echo 'tab_spaces = 4' >> .rustfmt.toml
+          echo 'newline_style = "Unix"' >> .rustfmt.toml
+          echo 'fn_call_width = 1000' >> .rustfmt.toml
+          echo 'fn_params_layout = "Compressed"' >> .rustfmt.toml
+          echo 'chain_width = 1000' >> .rustfmt.toml
+          echo 'merge_derives = true' >> .rustfmt.toml
+          echo 'use_small_heuristics = "Default"' >> .rustfmt.toml
+          cargo fmt
           pnpm test
       - name: Benchmark
         run: pnpm benchmark

bindings/devup-ui-wasm/src/lib.rs

@@ -640,11 +640,11 @@ mod tests {
     #[test]
     #[serial]
     fn test_debug() {
-        assert_eq!(is_debug(), false);
+        assert!(!is_debug());
         set_debug(true);
-        assert_eq!(is_debug(), true);
+        assert!(is_debug());
         set_debug(false);
-        assert_eq!(is_debug(), false);
+        assert!(!is_debug());
     }
 
     #[test]

libs/css/src/lib.rs

@@ -454,7 +454,7 @@ mod tests {
                 "cls",
                 Some(&StyleSelector::Media {
                     query: "print".to_string(),
-                    selector: None,
+                    selector: None
                 })
             ),
             ".cls"
@@ -465,7 +465,7 @@ mod tests {
                 "cls",
                 Some(&StyleSelector::Media {
                     query: "print".to_string(),
-                    selector: Some("&:hover".to_string()),
+                    selector: Some("&:hover".to_string())
                 })
             ),
             ".cls:hover"

libs/css/src/optimize_value.rs

@@ -114,7 +114,7 @@ pub fn optimize_value(value: &str) -> String {
 }
 
 fn optimize_color(value: &str) -> String {
-    let mut ret = value.to_string().to_uppercase();
+    let mut ret = value.to_uppercase();
 
     if ret.len() == 6 {
         let ch = ret.chars().collect::<Vec<char>>();

libs/extractor/src/css_utils.rs

@@ -157,7 +157,7 @@ pub fn optimize_css_block(css: &str) -> String {
         .split(";")
         .map(|s| {
             if !s.contains(":") {
-                s.to_string().trim().to_string()
+                s.trim().to_string()
             } else {
                 let mut iter = s.split(":");
                 let property = iter.next().unwrap().trim();
@@ -470,11 +470,20 @@ mod tests {
             ("50%", vec![("color", "red"), ("background", "blue")]),
         ],
     )]
+    // error case
+    #[case(
+        "50% { color: red        ; background: blue ",
+        vec![
+        ],
+    )]
     fn test_keyframes_to_keyframes_style(
         #[case] input: &str,
         #[case] expected: Vec<(&str, Vec<(&str, &str)>)>,
     ) {
         let styles = keyframes_to_keyframes_style(input);
+        if styles.len() != expected.len() {
+            panic!("styles.len() != expected.len()");
+        }
         for (expected_key, expected_styles) in styles.iter() {
             let styles = expected_styles;
             let mut result: Vec<(&str, &str)> = styles

libs/extractor/src/extract_style/extract_dynamic_style.rs

@@ -1,6 +1,6 @@
 use css::{
-    optimize_value::optimize_value, sheet_to_classname,
-    sheet_to_variable_name, style_selector::StyleSelector,
+    optimize_value::optimize_value, sheet_to_classname, sheet_to_variable_name,
+    style_selector::StyleSelector,
 };
 
 use crate::extract_style::{ExtractStyleProperty, style_property::StyleProperty};

libs/extractor/src/extract_style/extract_static_style.rs

@@ -1,7 +1,4 @@
-use css::{
-    optimize_value::optimize_value, sheet_to_classname,
-    style_selector::StyleSelector,
-};
+use css::{optimize_value::optimize_value, sheet_to_classname, style_selector::StyleSelector};
 
 use crate::{
     extract_style::{

libs/extractor/src/extractor/extract_global_style_from_expression.rs

@@ -29,8 +29,7 @@ pub fn extract_global_style_from_expression<'a>(
                     t.quasis
                         .iter()
                         .map(|q| q.value.raw.as_str())
-                        .collect::<Vec<_>>()
-                        .join("")
+                        .collect::<String>()
                 } else {
                     continue;
                 };
@@ -46,8 +45,7 @@ pub fn extract_global_style_from_expression<'a>(
                                         t.quasis
                                             .iter()
                                             .map(|q| q.value.raw.as_str())
-                                            .collect::<Vec<_>>()
-                                            .join("")
+                                            .collect::<String>()
                                             .trim()
                                             .to_string()
                                     } else {

libs/extractor/src/extractor/extract_keyframes_from_expression.rs

@@ -27,8 +27,7 @@ pub fn extract_keyframes_from_expression<'a>(
                     t.quasis
                         .iter()
                         .map(|q| q.value.raw.as_str())
-                        .collect::<Vec<_>>()
-                        .join("")
+                        .collect::<String>()
                 } else if let PropertyKey::NumericLiteral(n) = &o.key {
                     n.value.to_string()
                 } else {

libs/extractor/src/extractor/extract_style_from_expression.rs

@@ -144,8 +144,7 @@ pub fn extract_style_from_expression<'a>(
                     &tmp.quasis
                         .iter()
                         .map(|q| q.value.raw.as_str())
-                        .collect::<Vec<_>>()
-                        .join(""),
+                        .collect::<String>(),
                     level,
                     selector,
                 ),