feat: 支持多类选择器、修复rgba等小问题

Author: heiazu

__test__/index.spec.mjs.md

@@ -1,11 +1,14 @@
 pub const CONVERT_STYLE_PREFIX: &'static str = "_";
 pub const CONVERT_STYLE_PX_FN: &'static str = "convertNumber2VP";
+pub const HM_STYLE: &'static str = "__hmStyle";
 pub const INNER_STYLE: &'static str = "__inner_style__";
 pub const INNER_STYLE_DATA: &'static str = "__inner_style_data__";
 pub const NESTING_STYLE: &'static str = "__nesting_style__";
 pub const COMBINE_NESTING_STYLE: &'static str = "__combine_nesting_style__";
 pub const NESTINT_STYLE_DATA: &'static str = "__nesting_style_data__";
 pub const CALC_DYMAMIC_STYLE: &'static str = "calcDynamicStyle";
+pub const CALC_STATIC_STYLE: &'static str = "calcStaticStyle";
+
 
 pub const RN_CONVERT_STYLE_PX_FN: &'static str = "scalePx2dp";
 pub const RN_CONVERT_STYLE_VU_FN: &'static str = "scaleVu2dp";

__test__/index.spec.mjs.snap

@@ -65,7 +65,6 @@ pub fn parse(component: String, styles: Vec<String>, options: ParseOptions) -> S
   let mut style_write = StyleWrite::new(
     program.clone(),
     jsx_record.clone(),
-    style_data.style_record.clone(),
     style_data.pesudo_style_record.clone(),
     style_data.all_style.clone(),
     is_enable_nesting,

src/constants.rs

@@ -9,7 +9,6 @@ use super::parse_style_properties::parse_style_properties;
 pub type StyleValue = Vec<StyleValueType>;
 
 pub struct StyleData<'i> {
-  pub style_record: Rc<RefCell<HashMap<SpanKey, Vec<(String, Property<'i>)>>>>,
   pub pesudo_style_record: Rc<RefCell<HashMap<SpanKey, Vec<(String, Vec<(String, Property<'i>)>)>>>>,
   pub all_style: Rc<RefCell<HashMap<String, StyleValue>>>,
   pub has_nesting: bool
@@ -46,7 +45,7 @@ impl<'i> Visitor<'i> for StyleVisitor<'i> {
         let selectors_str = style.selectors.to_string();
         let selectors: Vec<&str> = selectors_str.split(",").collect::<Vec<&str>>();
         for index in 0..selectors.len() {
-          let selector = selectors[index].trim().replace(".", "");
+          let selector = selectors[index].trim().to_string();
           let mut all_style = self.all_style.borrow_mut();
           let decorations = all_style.iter_mut().find(|(id, _)| id == &selector);
           if let Some((_, declarations)) = decorations {
@@ -118,7 +117,7 @@ impl<'i> StyleParser<'i> {
       })
       .collect::<Vec<(_, _)>>(); // Specify the lifetime of the tuple elements to match the input data
       // 判断是否含有嵌套选择器
-      if selector.contains(" ") {
+      if selector.contains(" ") || selector.chars().filter(|&c| c == '.').count() > 1 {
         has_nesting = true
       }
       (selector.to_owned(), properties)
@@ -168,35 +167,9 @@ impl<'i> StyleParser<'i> {
     })
     .collect::<HashMap<_, _>>();
 
-
-    let final_style_record = style_record
-      .iter_mut()
-      .map(|(selector, style_value)| {
-        (
-          selector.to_owned(),
-          style_value
-            .iter_mut()
-            .reduce(|a, b| {
-              for (key, value) in b.iter() {
-                let has_property_index = a.iter().position(|property| property.0 == key.to_owned());
-                if let Some(index) = has_property_index {
-                  a[index] = (key.to_owned(), value.clone());
-                } else {
-                  a.push((key.to_owned(), value.clone()));
-                }
-              }
-              a
-            })
-            .unwrap()
-            .to_owned()
-        )
-      })
-      .collect::<HashMap<_, _>>();
-
-      let final_pesudo_style_record = pesudo_style_record;
+    let final_pesudo_style_record = pesudo_style_record;
 
     StyleData {
-      style_record: Rc::new(RefCell::new(final_style_record)),
       pesudo_style_record: Rc::new(RefCell::new(final_pesudo_style_record)),
       all_style: Rc::new(RefCell::new(final_all_style)),
       has_nesting

src/lib.rs

@@ -22,7 +22,7 @@ use swc_ecma_ast::{
 
 use crate::generate_invalid_expr;
 
-use super::{linear_gradient::{LinearGradientDirection, LinearGradientItem}, traits::ToExpr, unit::PropertyTuple};
+use super::{linear_gradient::{LinearGradientDirection, LinearGradientItem}, traits::ToExpr, unit::{convert_color_keywords_to_hex, PropertyTuple}};
 
 pub fn parse_background_image_item(image: &Image) -> Option<BackgroundImageKind> {
   match image {
@@ -40,7 +40,7 @@ pub fn parse_background_image_item(image: &Image) -> Option<BackgroundImageKind>
                 .clone()
                 .unwrap_or(DimensionPercentage::Dimension(LengthValue::Px(0.0)));
               color_stops.push((
-                color_stop
+                convert_color_keywords_to_hex(color_stop
                   .color
                   .to_css_string(PrinterOptions {
                     minify: false,
@@ -50,7 +50,7 @@ pub fn parse_background_image_item(image: &Image) -> Option<BackgroundImageKind>
                     },
                     ..PrinterOptions::default()
                   })
-                  .unwrap(),
+                  .unwrap()),
                 match &color_stop_position {
                   DimensionPercentage::Dimension(length) => {
                     length.to_css_string(PrinterOptions::default()).unwrap()

src/style_parser.rs

@@ -48,7 +48,7 @@ impl LinearGradientItem {
               expr: Expr::Array(ArrayLit {
                 span: DUMMY_SP,
                 elems: vec![
-                  Some(Expr::Lit(Lit::Str(Str::from(fix_rgba(&item.0)))).into()),
+                  Some(Expr::Lit(Lit::Str(Str::from(fix_rgba(item.0.clone())))).into()),
                   Some(Expr::Lit(Lit::Str(Str::from(item.1.to_string()))).into()),
                 ],
               })

src/style_propetries/background_image.rs

@@ -116,6 +116,8 @@ macro_rules! generate_expr_based_on_platform {
 #[macro_export]
 macro_rules! generate_color_property {
   ($class:ident, $( $property_name:ident ), *) => {
+    use $crate::utils::fix_rgba;
+
     #[derive(Debug, Clone)]
     pub struct $class {
       pub id: String,
@@ -126,7 +128,7 @@ macro_rules! generate_color_property {
       fn to_expr(&self) -> PropertyTuple {
         PropertyTuple::One(
           self.id.clone(),
-          swc_ecma_ast::Expr::Lit(swc_ecma_ast::Lit::Str(self.value.clone().into())).into()
+          swc_ecma_ast::Expr::Lit(swc_ecma_ast::Lit::Str(fix_rgba(self.value.clone()).into())).into()
         )
       }
       fn to_rn_expr(&self) -> PropertyTuple {

src/style_propetries/linear_gradient.rs

@@ -4,7 +4,7 @@ use swc_ecma_ast::{Expr, Ident, KeyValueProp, MemberExpr, MemberProp, ObjectLit,
 
 use crate::{style_propetries::traits::ToExpr, generate_invalid_expr, generate_expr_lit_str, generate_prop_name};
 
-use super::unit::PropertyTuple;
+use super::unit::{convert_color_keywords_to_hex, PropertyTuple};
 
 
 #[derive(Debug, Clone)]
@@ -142,7 +142,7 @@ impl From<(String, &Property<'_>)> for TextDecoration {
           if c == "currentColor" {
             color = None
           } else {
-            color = Some(TextDecorationColor(c));
+            color = Some(TextDecorationColor(convert_color_keywords_to_hex(c)));
           }
         } else {
           color = None
@@ -198,7 +198,7 @@ impl From<(String, &Property<'_>)> for TextDecoration {
           if c == "currentColor" {
             color = None
           } else {
-            color = Some(TextDecorationColor(c));
+            color = Some(TextDecorationColor(convert_color_keywords_to_hex(c)));
           }
         } else {
           color = None

src/style_propetries/macros.rs

@@ -1,7 +1,7 @@
 use std::vec;
 
 use lightningcss::properties::{transform::Transform as LNTransform, Property};
-use swc_ecma_ast::{ArrayLit, Expr, ExprOrSpread};
+use swc_ecma_ast::{ArrayLit, Expr, ExprOrSpread, ObjectLit};
 
 use crate::style_propetries::traits::ToExpr;
 
@@ -29,32 +29,25 @@ impl ToExpr for Transform {
       self.value.iter().for_each(|item| {
         match item {
           Matrix4::Translates(value) => {
-            props.extend(value.to_expr());
+            props.push(value.to_expr());
           },
           Matrix4::Rotates(value) => {
-            props.extend(value.to_expr());
+            props.push(value.to_expr());
           }
           Matrix4::Scales(value) => {
-            props.extend(value.to_expr());
+            props.push(value.to_expr());
           }
-          Matrix4::Matrix(value) => {
-            props.extend(value.to_expr());
-          },
+          // Matrix4::Matrix(value) => {
+          //   props.extend(value.to_expr());
+          // },
           _ => {}
         }
       });
       PropertyTuple::One(
           "transform".to_string(),
-          Expr::Array(ArrayLit {
+          Expr::Object(ObjectLit {
             span: Default::default(),
-            elems: props.into_iter().map(Some).map(
-              |item| {
-                Some(ExprOrSpread {
-                  spread: None,
-                  expr: Box::new(item.unwrap()),
-                })
-              }
-            ).collect::<Vec<_>>(),
+            props:props,
           })
         )
     }