feat: 修复bg的转义词，增加allow_inherit的配置

Author: heiazu

__test__/fixure/pesudo.scss

@@ -1,18 +1,21 @@
 .hello {
-    margin-top: 10px !important;
-    margin: 24px auto;
-    margin-bottom: env(safe-area-inset-bottom);
+    height: 100px;
+    width: 50%;
+    flex-direction: column;
+    flex-grow: 1;
+    color: #00f;
 }
 
-.bbb {
-    margin-top: 30px;
+.child {
+    background-size: contain;
+    background-image: linear-gradient(to bottom, #f00, #00f 10%, #0f0);
 }
 
-.hello .bbb:nth-child(-n + 3) {
-    border: 2px solid orange;
-    margin-bottom: 1px;
-}
-
-.bbb:nth-child(even) {
-    background-color: lightyellow;
+@media screen and (max-width: 100px) {
+    .hello {
+        height: 200px;
+        width: 100%;
+        color: #f00;
+        background-image: radial-gradient(circle, #f00, #00f 10%, #0f0);
+    }
 }

__test__/fixure/style.bin

@@ -132,6 +132,7 @@ table StyleSheet {
   medias:[Media];
   styles:[Style];
   design_width:uint16;
+  allow_inherit:bool;
 }
 
 root_type StyleSheet;

flatbuffers/stylesheet.fbs

@@ -1834,7 +1834,8 @@ struct StyleSheet FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
     VT_KEYFRAMES = 6,
     VT_MEDIAS = 8,
     VT_STYLES = 10,
-    VT_DESIGN_WIDTH = 12
+    VT_DESIGN_WIDTH = 12,
+    VT_ALLOW_INHERIT = 14
   };
   const ::flatbuffers::Vector<::flatbuffers::Offset<Styles::Font>> *fonts() const {
     return GetPointer<const ::flatbuffers::Vector<::flatbuffers::Offset<Styles::Font>> *>(VT_FONTS);
@@ -1851,6 +1852,9 @@ struct StyleSheet FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
   uint16_t design_width() const {
     return GetField<uint16_t>(VT_DESIGN_WIDTH, 0);
   }
+  bool allow_inherit() const {
+    return GetField<uint8_t>(VT_ALLOW_INHERIT, 0) != 0;
+  }
   bool Verify(::flatbuffers::Verifier &verifier) const {
     return VerifyTableStart(verifier) &&
            VerifyOffset(verifier, VT_FONTS) &&
@@ -1866,6 +1870,7 @@ struct StyleSheet FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
            verifier.VerifyVector(styles()) &&
            verifier.VerifyVectorOfTables(styles()) &&
            VerifyField<uint16_t>(verifier, VT_DESIGN_WIDTH, 2) &&
+           VerifyField<uint8_t>(verifier, VT_ALLOW_INHERIT, 1) &&
            verifier.EndTable();
   }
 };
@@ -1889,6 +1894,9 @@ struct StyleSheetBuilder {
   void add_design_width(uint16_t design_width) {
     fbb_.AddElement<uint16_t>(StyleSheet::VT_DESIGN_WIDTH, design_width, 0);
   }
+  void add_allow_inherit(bool allow_inherit) {
+    fbb_.AddElement<uint8_t>(StyleSheet::VT_ALLOW_INHERIT, static_cast<uint8_t>(allow_inherit), 0);
+  }
   explicit StyleSheetBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
         : fbb_(_fbb) {
     start_ = fbb_.StartTable();
@@ -1906,13 +1914,15 @@ inline ::flatbuffers::Offset<StyleSheet> CreateStyleSheet(
     ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<::flatbuffers::String>>> keyframes = 0,
     ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<Styles::Media>>> medias = 0,
     ::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<Styles::Style>>> styles = 0,
-    uint16_t design_width = 0) {
+    uint16_t design_width = 0,
+    bool allow_inherit = false) {
   StyleSheetBuilder builder_(_fbb);
   builder_.add_styles(styles);
   builder_.add_medias(medias);
   builder_.add_keyframes(keyframes);
   builder_.add_fonts(fonts);
   builder_.add_design_width(design_width);
+  builder_.add_allow_inherit(allow_inherit);
   return builder_.Finish();
 }
 
@@ -1922,7 +1932,8 @@ inline ::flatbuffers::Offset<StyleSheet> CreateStyleSheetDirect(
     const std::vector<::flatbuffers::Offset<::flatbuffers::String>> *keyframes = nullptr,
     const std::vector<::flatbuffers::Offset<Styles::Media>> *medias = nullptr,
     const std::vector<::flatbuffers::Offset<Styles::Style>> *styles = nullptr,
-    uint16_t design_width = 0) {
+    uint16_t design_width = 0,
+    bool allow_inherit = false) {
   auto fonts__ = fonts ? _fbb.CreateVector<::flatbuffers::Offset<Styles::Font>>(*fonts) : 0;
   auto keyframes__ = keyframes ? _fbb.CreateVector<::flatbuffers::Offset<::flatbuffers::String>>(*keyframes) : 0;
   auto medias__ = medias ? _fbb.CreateVector<::flatbuffers::Offset<Styles::Media>>(*medias) : 0;
@@ -1933,7 +1944,8 @@ inline ::flatbuffers::Offset<StyleSheet> CreateStyleSheetDirect(
       keyframes__,
       medias__,
       styles__,
-      design_width);
+      design_width,
+      allow_inherit);
 }
 
 inline bool VerifyValue(::flatbuffers::Verifier &verifier, const void *obj, Value type) {

flatbuffers/stylesheet_generated.h

@@ -19,6 +19,7 @@ pub struct JsonWriter {
   medias: Vec<StyleMedia>,
   fonts: Vec<FontFaceItem>,
   design_width: Option<i32>,
+  allow_inherit: Option<bool>,
 }
 
 impl JsonWriter {
@@ -28,13 +29,15 @@ impl JsonWriter {
     medias: Vec<StyleMedia>,
     fonts: Vec<FontFaceItem>,
     design_width: Option<i32>,
+    allow_inherit: Option<bool>,
   ) -> Self {
     Self {
       styles,
       keyframes,
       medias,
       fonts,
       design_width,
+      allow_inherit,
     }
   }
 
@@ -325,6 +328,10 @@ impl JsonWriter {
       let map = json_value.as_object_mut().unwrap();
       map.insert("design_width".to_string(), Value::Number(serde_json::Number::from(design_width)));
     }
+    if let Some(allow_inherit) = self.allow_inherit {
+      let map = json_value.as_object_mut().unwrap();
+      map.insert("allow_inherit".to_string(), Value::Bool(allow_inherit));
+    }
 
     // 打印 JSON 值
 

src/json_writer.rs

@@ -37,6 +37,7 @@ pub struct ParseOptions {
   pub platform_string: String,
   pub design_width: Option<i32>,
   pub output: Option<OutputOptions>,
+  pub allow_inherit: Option<bool>,
 }
 
 #[napi(object)]
@@ -53,6 +54,7 @@ pub fn parse(styles: Vec<String>, options: ParseOptions) -> ParseResult {
     _ => Platform::Harmony,
   };
   let design_width = options.design_width;
+  let allow_inherit = options.allow_inherit;
   let output = options.output.unwrap_or(OutputOptions {
     is_bin: Some(false)
   });
@@ -73,6 +75,7 @@ pub fn parse(styles: Vec<String>, options: ParseOptions) -> ParseResult {
     style_data.all_medias.borrow().clone(),
     style_data.all_fonts.borrow().clone(),
     design_width,
+    allow_inherit,
   );
 
   let style_json = style_map.to_json();

src/lib.rs

@@ -31,7 +31,8 @@ pub fn main() {
     style_data.all_keyframes.borrow().clone(),
     style_data.all_medias.borrow().clone(),
     style_data.all_fonts.borrow().clone(),
-    None
+    None,
+    None,
   );
 
   let style_json = style_map.to_json();

src/main.rs

@@ -197,7 +197,11 @@ impl ToExpr for BackgroundImage {
         span: DUMMY_SP,
         props: vec![PropOrSpread::Prop(Box::new(Prop::KeyValue(KeyValueProp {
           key: PropName::Ident(Ident::new("src".into(), DUMMY_SP)),
-          value: Expr::Lit(Lit::Str(Str::from(src.to_string()))).into(),
+          value: Expr::Lit(Lit::Str(Str {
+            span: DUMMY_SP,
+            value: src.as_str().into(),
+            raw: None,
+          })).into(),
         })))]
         .into(),
       }),

src/style_propetries/background_image.rs

@@ -3619,6 +3619,7 @@ impl<'a> StyleSheet<'a> {
   pub const VT_MEDIAS: flatbuffers::VOffsetT = 8;
   pub const VT_STYLES: flatbuffers::VOffsetT = 10;
   pub const VT_DESIGN_WIDTH: flatbuffers::VOffsetT = 12;
+  pub const VT_ALLOW_INHERIT: flatbuffers::VOffsetT = 14;
 
   #[inline]
   pub unsafe fn init_from_table(table: flatbuffers::Table<'a>) -> Self {
@@ -3635,6 +3636,7 @@ impl<'a> StyleSheet<'a> {
     if let Some(x) = args.keyframes { builder.add_keyframes(x); }
     if let Some(x) = args.fonts { builder.add_fonts(x); }
     builder.add_design_width(args.design_width);
+    builder.add_allow_inherit(args.allow_inherit);
     builder.finish()
   }
 
@@ -3674,6 +3676,13 @@ impl<'a> StyleSheet<'a> {
     // which contains a valid value in this slot
     unsafe { self._tab.get::<u16>(StyleSheet::VT_DESIGN_WIDTH, Some(0)).unwrap()}
   }
+  #[inline]
+  pub fn allow_inherit(&self) -> bool {
+    // Safety:
+    // Created from valid Table for this object
+    // which contains a valid value in this slot
+    unsafe { self._tab.get::<bool>(StyleSheet::VT_ALLOW_INHERIT, Some(false)).unwrap()}
+  }
 }
 
 impl flatbuffers::Verifiable for StyleSheet<'_> {
@@ -3688,6 +3697,7 @@ impl flatbuffers::Verifiable for StyleSheet<'_> {
      .visit_field::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'_, flatbuffers::ForwardsUOffset<Media>>>>("medias", Self::VT_MEDIAS, false)?
      .visit_field::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'_, flatbuffers::ForwardsUOffset<Style>>>>("styles", Self::VT_STYLES, false)?
      .visit_field::<u16>("design_width", Self::VT_DESIGN_WIDTH, false)?
+     .visit_field::<bool>("allow_inherit", Self::VT_ALLOW_INHERIT, false)?
      .finish();
     Ok(())
   }
@@ -3698,6 +3708,7 @@ pub struct StyleSheetArgs<'a> {
     pub medias: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<Media<'a>>>>>,
     pub styles: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<Style<'a>>>>>,
     pub design_width: u16,
+    pub allow_inherit: bool,
 }
 impl<'a> Default for StyleSheetArgs<'a> {
   #[inline]
@@ -3708,6 +3719,7 @@ impl<'a> Default for StyleSheetArgs<'a> {
       medias: None,
       styles: None,
       design_width: 0,
+      allow_inherit: false,
     }
   }
 }
@@ -3738,6 +3750,10 @@ impl<'a: 'b, 'b, A: flatbuffers::Allocator + 'a> StyleSheetBuilder<'a, 'b, A> {
     self.fbb_.push_slot::<u16>(StyleSheet::VT_DESIGN_WIDTH, design_width, 0);
   }
   #[inline]
+  pub fn add_allow_inherit(&mut self, allow_inherit: bool) {
+    self.fbb_.push_slot::<bool>(StyleSheet::VT_ALLOW_INHERIT, allow_inherit, false);
+  }
+  #[inline]
   pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a, A>) -> StyleSheetBuilder<'a, 'b, A> {
     let start = _fbb.start_table();
     StyleSheetBuilder {
@@ -3760,6 +3776,7 @@ impl core::fmt::Debug for StyleSheet<'_> {
       ds.field("medias", &self.medias());
       ds.field("styles", &self.styles());
       ds.field("design_width", &self.design_width());
+      ds.field("allow_inherit", &self.allow_inherit());
       ds.finish()
   }
 }

src/stylesheet_generated.rs

@@ -596,12 +596,14 @@ pub fn convert_json_to_flatbuffer(json_str: &str) -> Result<Vec<u8>, serde_json:
     }).collect();
     let styles = builder.create_vector(&styles);
     let design_width = json["design_width"].as_u64().unwrap_or(0) as u16;
+    let allow_inherit = json["allow_inherit"].as_bool().unwrap_or(false);
     let stylesheet = styles::StyleSheet::create(&mut builder, &styles::StyleSheetArgs {
       fonts: Some(fonts),
       keyframes: None,
       medias: Some(medias),
       styles: Some(styles),
       design_width: design_width,
+      allow_inherit: allow_inherit,
     });
 
     builder.finish(stylesheet, None);