feat: 生成二进制文件时支持伪类

Author: luckyadam

__test__/fixure/style.bin

@@ -77,6 +77,7 @@ table Selector {
 table Style {
   declarations:[DeclarationTuple];
   media:uint8;
+  pseudo:uint8;
   selector:[Selector];
 }
 

__test__/index.spec.mjs.snap

@@ -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"]}]}).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"]}]}).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(), 4); // 根据实际情况调整
+    assert_eq!(styles.len(), 5); // 根据实际情况调整
     let first_style = styles.get(0);
     assert_eq!(first_style.declarations().unwrap().len(), 2);
 
@@ -149,6 +149,20 @@ mod tests {
     assert_eq!(first_selector.string_value().unwrap(), "tit");
     let second_selector = selector.get(1);
     assert_eq!(second_selector.integer_value(), 2);
-    
+
+    let fourth_style = styles.get(3);
+    assert_eq!(fourth_style.declarations().unwrap().len(), 2);
+    let selector = fourth_style.selector().unwrap();
+    assert_eq!(selector.len(), 1);
+    let first_selector = selector.get(0);
+    assert_eq!(first_selector.string_value().unwrap(), "img");
+
+    let fifth_style = styles.get(4);
+    assert_eq!(fifth_style.declarations().unwrap().len(), 1);
+    let selector = fifth_style.selector().unwrap();
+    assert_eq!(selector.len(), 1);
+    let first_selector = selector.get(0);
+    assert_eq!(first_selector.string_value().unwrap(), "hello");
+    assert_eq!(fifth_style.pseudo(), 1);
   }
 }

flatbuffers/stylesheet.fbs

@@ -2236,7 +2236,8 @@ impl<'a> flatbuffers::Follow<'a> for Style<'a> {
 impl<'a> Style<'a> {
   pub const VT_DECLARATIONS: flatbuffers::VOffsetT = 4;
   pub const VT_MEDIA: flatbuffers::VOffsetT = 6;
-  pub const VT_SELECTOR: flatbuffers::VOffsetT = 8;
+  pub const VT_PSEUDO: flatbuffers::VOffsetT = 8;
+  pub const VT_SELECTOR: flatbuffers::VOffsetT = 10;
 
   #[inline]
   pub unsafe fn init_from_table(table: flatbuffers::Table<'a>) -> Self {
@@ -2250,6 +2251,7 @@ impl<'a> Style<'a> {
     let mut builder = StyleBuilder::new(_fbb);
     if let Some(x) = args.selector { builder.add_selector(x); }
     if let Some(x) = args.declarations { builder.add_declarations(x); }
+    builder.add_pseudo(args.pseudo);
     builder.add_media(args.media);
     builder.finish()
   }
@@ -2270,6 +2272,13 @@ impl<'a> Style<'a> {
     unsafe { self._tab.get::<u8>(Style::VT_MEDIA, Some(0)).unwrap()}
   }
   #[inline]
+  pub fn pseudo(&self) -> u8 {
+    // Safety:
+    // Created from valid Table for this object
+    // which contains a valid value in this slot
+    unsafe { self._tab.get::<u8>(Style::VT_PSEUDO, Some(0)).unwrap()}
+  }
+  #[inline]
   pub fn selector(&self) -> Option<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<Selector<'a>>>> {
     // Safety:
     // Created from valid Table for this object
@@ -2287,6 +2296,7 @@ impl flatbuffers::Verifiable for Style<'_> {
     v.visit_table(pos)?
      .visit_field::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'_, flatbuffers::ForwardsUOffset<DeclarationTuple>>>>("declarations", Self::VT_DECLARATIONS, false)?
      .visit_field::<u8>("media", Self::VT_MEDIA, false)?
+     .visit_field::<u8>("pseudo", Self::VT_PSEUDO, false)?
      .visit_field::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'_, flatbuffers::ForwardsUOffset<Selector>>>>("selector", Self::VT_SELECTOR, false)?
      .finish();
     Ok(())
@@ -2295,6 +2305,7 @@ impl flatbuffers::Verifiable for Style<'_> {
 pub struct StyleArgs<'a> {
     pub declarations: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<DeclarationTuple<'a>>>>>,
     pub media: u8,
+    pub pseudo: u8,
     pub selector: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<Selector<'a>>>>>,
 }
 impl<'a> Default for StyleArgs<'a> {
@@ -2303,6 +2314,7 @@ impl<'a> Default for StyleArgs<'a> {
     StyleArgs {
       declarations: None,
       media: 0,
+      pseudo: 0,
       selector: None,
     }
   }
@@ -2322,6 +2334,10 @@ impl<'a: 'b, 'b, A: flatbuffers::Allocator + 'a> StyleBuilder<'a, 'b, A> {
     self.fbb_.push_slot::<u8>(Style::VT_MEDIA, media, 0);
   }
   #[inline]
+  pub fn add_pseudo(&mut self, pseudo: u8) {
+    self.fbb_.push_slot::<u8>(Style::VT_PSEUDO, pseudo, 0);
+  }
+  #[inline]
   pub fn add_selector(&mut self, selector: flatbuffers::WIPOffset<flatbuffers::Vector<'b , flatbuffers::ForwardsUOffset<Selector<'b >>>>) {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(Style::VT_SELECTOR, selector);
   }
@@ -2345,6 +2361,7 @@ impl core::fmt::Debug for Style<'_> {
     let mut ds = f.debug_struct("Style");
       ds.field("declarations", &self.declarations());
       ds.field("media", &self.media());
+      ds.field("pseudo", &self.pseudo());
       ds.field("selector", &self.selector());
       ds.finish()
   }

src/lib.rs

@@ -520,6 +520,7 @@ pub fn convert_json_to_flatbuffer(json_str: &str) -> Result<Vec<u8>, serde_json:
         styles::Style::create(&mut builder, &styles::StyleArgs {
           declarations: Some(declarations),
           media: style["media"].as_u64().unwrap() as u8,
+          pseudo: style["pseudo"].as_u64().unwrap_or(0) as u8,
           selector: Some(selector),
         })
     }).collect();