feat: 增加 pseudo_key

Author: luckyadam

Cargo.lock

@@ -17,7 +17,6 @@ html5ever = "0.26.0"
 indexmap = "2.2.3"
 lightningcss = {version = "1.0.0-alpha.45", features = ["visitor", "into_owned"]}
 once_cell = "1.18.0"
-selectors = "0.25.0"
 smallvec = "1.11.0"
 serde = { version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.68"
@@ -29,6 +28,7 @@ flatbuffers = "24.3.25"
 rust_decimal = "1.36.0"
 rust_decimal_macros = "1.36.0"
 bitflags = "2.4.1"
+parcel_selectors = "0.26.5"
 
 [build-dependencies]
 napi-build = "2.0.1"

Cargo.toml

@@ -6,4 +6,13 @@
 
 .bbb {
     margin-top: 30px;
+}
+
+.hello .bbb:nth-child(-n + 3) {
+    border: 2px solid orange;
+    margin-bottom: 1px;
+}
+
+.bbb:nth-child(even) {
+    background-color: lightyellow;
 }

__test__/fixure/pesudo.scss

@@ -74,10 +74,18 @@ table Selector {
   is_string:bool;
 }
 
+table PseudoKey {
+  integer_value:int8;
+  bool_value:bool;
+  is_int:bool;
+}
+
 table Style {
   declarations:[DeclarationTuple];
   media:uint8;
   pseudo:uint8;
+  pseudo_key:[PseudoKey];
+  pseudo_val:string;
   selector:[Selector];
 }
 

__test__/fixure/style.bin

@@ -18,14 +18,14 @@ pub const RN_CONVERT_STYLE_PX_FN: &'static str = "scalePx2dp";
 pub const RN_CONVERT_STYLE_VU_FN: &'static str = "scaleVu2dp";
 
 #[repr(u32)]
-#[derive(Hash, PartialEq, Eq, Debug, Clone)]
+#[derive(Hash, PartialEq, Eq, Debug, Clone, Copy)]
 pub enum Pseudo {
   None,
   Before,
   After,
   FirstChild,
   LastChild,
-  NthChild(String),
+  NthChild(i32, i32, bool),
   Empty,
 }
 
@@ -38,7 +38,7 @@ impl Pseudo {
       Pseudo::After => 2,
       Pseudo::FirstChild => 3,
       Pseudo::LastChild => 4,
-      Pseudo::NthChild(_) => 5,
+      Pseudo::NthChild(_, _, _) => 5,
       Pseudo::Empty => 6,
     }) as f64
   }

flatbuffers/stylesheet.fbs

@@ -45,18 +45,10 @@ impl JsonWriter {
       .filter_map(|rule_item| {
         Some({
           // 识别伪类
-          let mut new_selector = rule_item.selector.clone();
-          let mut pseudo_key = String::new();
-
-          if SUPPORT_PSEUDO_KEYS
-            .into_iter()
-            .any(|s| rule_item.selector.contains(s))
-          {
-            let key_arr = rule_item.selector.split(":").collect::<Vec<&str>>();
-            if key_arr.len() == 2 {
-              new_selector = key_arr[0].to_string();
-              pseudo_key = key_arr[1].to_string();
-            }
+          let mut new_selector = rule_item.selector.selector.clone();
+          let key_arr = new_selector.split(":").collect::<Vec<&str>>();
+          if key_arr.len() == 2 {
+            new_selector = key_arr[0].to_string();
           }
 
           let nesting_selector = utils::split_selector(&new_selector);
@@ -147,35 +139,50 @@ impl JsonWriter {
             );
           }
 
-          if pseudo_key.len() > 0 {
-            let mut pseudo_enum = None;
-            if pseudo_key == "before" {
-              pseudo_enum = Some(Pseudo::Before);
-            } else if pseudo_key == "after" {
-              pseudo_enum = Some(Pseudo::After);
-            } else if pseudo_key == "first-child" {
-              pseudo_enum = Some(Pseudo::FirstChild);
-            } else if pseudo_key == "last-child" {
-              pseudo_enum = Some(Pseudo::LastChild);
-            } else if pseudo_key == "empty" {
-              pseudo_enum = Some(Pseudo::Empty);
-            } else if pseudo_key.starts_with("nth-child") {
-              let key_arr = pseudo_key.split("(").collect::<Vec<&str>>();
-              if key_arr.len() == 2 {
-                let value = key_arr[1].trim_end_matches(")");
-                pseudo_enum = Some(Pseudo::NthChild(value.to_string()));
-              }
-            }
-            if let Some(pseudo_enum) = pseudo_enum {
-              if let Pseudo::NthChild(str) = &pseudo_enum {
+          if rule_item.selector.is_pseudo {
+            if let Some(pseudo_enum) = &rule_item.selector.pseudo_type {
+              if let Pseudo::NthChild(a, b, is_first) = &pseudo_enum {
+                let value: String = if *a == 0 && *b == 0 {
+                  "".to_string()
+                } else if *a == 0 {
+                  format!("{}", *b)
+                } else if *b == 0 {
+                  format!("{}n", *a)
+                } else {
+                  if *a == 1 {
+                    format!("n+{}", *b)
+                  } else {
+                    format!("{}n+{}", *a, *b)
+                  }
+                };
                 lit_props.push(PropOrSpread::Prop(Box::new(Prop::KeyValue(KeyValueProp {
                   key: PropName::Ident(Ident::new("pseudo_val".into(), DUMMY_SP)),
                   value: Box::new(Expr::Lit(Lit::Str(Str {
                     span: DUMMY_SP,
-                    value: str.clone().into(),
+                    value: value.into(),
                     raw: None,
                   }))),
                 }))));
+                lit_props.push(PropOrSpread::Prop(Box::new(Prop::KeyValue(KeyValueProp {
+                  key: PropName::Ident(Ident::new("pseudo_key".into(), DUMMY_SP)),
+                  value: Box::new(Expr::Array(ArrayLit {
+                    span: DUMMY_SP,
+                    elems: vec![
+                      Some(ExprOrSpread {
+                        spread: None,
+                        expr: Box::new(Expr::Lit(Lit::Num(Number::from(*a as f64)))),
+                      }),
+                      Some(ExprOrSpread {
+                        spread: None,
+                        expr: Box::new(Expr::Lit(Lit::Num(Number::from(*b as f64)))),
+                      }),
+                      Some(ExprOrSpread {
+                        spread: None,
+                        expr: Box::new(Expr::Lit(Lit::Bool(Bool { span: DUMMY_SP, value: *is_first }))),
+                      }),
+                    ],
+                  })),
+                }))));
               };
               lit_props.push(PropOrSpread::Prop(Box::new(Prop::KeyValue(KeyValueProp {
                 key: PropName::Ident(Ident::new("pseudo".into(), DUMMY_SP)),

src/constants.rs

@@ -105,7 +105,7 @@ mod tests {
 
   #[test]
   fn test_valid_input() {
-    let json_input = json!({"fonts":[],"keyframes":[],"medias":[],"styles":[{"declarations":[[22,293],[42,4278753764u32]],"media":0,"selector":["app"]},{"declarations":[[41,4294901760u32]],"media":0,"selector":["tit"]},{"declarations":[[29,24],[41,4291979550u32]],"media":0,"selector":["tit",2,"app"]},{"declarations":[[22,100],[25,100]],"media":0,"selector":["img"]}, {"declarations":[[79,"hello"]],"media":0,"pseudo":1,"selector":["hello"]}]}).to_string();
+    let json_input = json!({"fonts":[],"keyframes":[],"medias":[],"styles":[{"declarations":[[22,293],[42,4278753764u32]],"media":0,"selector":["app"]},{"declarations":[[41,4294901760u32]],"media":0,"selector":["tit"]},{"declarations":[[29,24],[41,4291979550u32]],"media":0,"selector":["tit",2,"app"]},{"declarations":[[22,100],[25,100]],"media":0,"selector":["img"]}, {"declarations":[[79,"hello"]],"media":0,"pseudo":1,"selector":["hello"]},{"declarations":[[42,4294967264u32]],"media":0,"pseudo":5,"pseudo_key":[2,0,true],"pseudo_val":"2n","selector":["bbb"]}]}).to_string();
 
     let result = convert_json_to_flatbuffer(&json_input);
     assert!(result.is_ok());
@@ -124,7 +124,7 @@ mod tests {
 
     // 验证 styles
     let styles = style_sheet.styles().unwrap();
-    assert_eq!(styles.len(), 5); // 根据实际情况调整
+    assert_eq!(styles.len(), 6); // 根据实际情况调整
     let first_style = styles.get(0);
     assert_eq!(first_style.declarations().unwrap().len(), 2);
 
@@ -164,5 +164,27 @@ mod tests {
     let first_selector = selector.get(0);
     assert_eq!(first_selector.string_value().unwrap(), "hello");
     assert_eq!(fifth_style.pseudo(), 1);
+
+    let sixth_style = styles.get(5);
+    assert_eq!(sixth_style.declarations().unwrap().len(), 1);
+    let selector = sixth_style.selector().unwrap();
+    assert_eq!(selector.len(), 1);
+    let first_selector = selector.get(0);
+    assert_eq!(first_selector.string_value().unwrap(), "bbb");
+    assert_eq!(sixth_style.pseudo(), 5);
+    assert_eq!(sixth_style.pseudo_key().unwrap().len(), 3);
+    let first_pseudo_key = sixth_style.pseudo_key().unwrap().get(0);
+    assert_eq!(first_pseudo_key.integer_value(), 2);
+    assert_eq!(first_pseudo_key.bool_value(), false);
+    assert_eq!(first_pseudo_key.is_int(), true);
+    let second_pseudo_key = sixth_style.pseudo_key().unwrap().get(1);
+    assert_eq!(second_pseudo_key.integer_value(), 0);
+    assert_eq!(second_pseudo_key.bool_value(), false);
+    assert_eq!(second_pseudo_key.is_int(), true);
+    let third_pseudo_key = sixth_style.pseudo_key().unwrap().get(2);
+    assert_eq!(third_pseudo_key.integer_value(), 0);
+    assert_eq!(third_pseudo_key.bool_value(), true);
+    assert_eq!(third_pseudo_key.is_int(), false);
+    assert_eq!(sixth_style.pseudo_val().unwrap(), "2n");
   }
 }