feat: 生成样式中增加 design_width 设计稿宽度

Author: luckyadam

flatbuffers/stylesheet.fbs

@@ -85,6 +85,7 @@ table StyleSheet {
   keyframes:[string];
   medias:[string];
   styles:[Style];
+  design_width:uint16;
 }
 
 root_type StyleSheet;

package.json

@@ -24,8 +24,8 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@napi-rs/cli": "^2.16.3",
-    "ava": "^5.1.1",
+    "@napi-rs/cli": "^2.18.4",
+    "ava": "^5.3.1",
     "conventional-changelog-cli": "2.2.2",
     "npm-run-all": "4.1.5",
     "prettier": "2.8.8",

pnpm-lock.yaml

@@ -17,6 +17,7 @@ pub struct JsonWriter {
   keyframes: IndexMap<(u32, String), Vec<KeyFrameItem>>,
   medias: Vec<StyleMedia>,
   fonts: Vec<FontFaceItem>,
+  design_width: Option<i32>,
 }
 
 impl JsonWriter {
@@ -25,12 +26,14 @@ impl JsonWriter {
     keyframes: IndexMap<(u32, String), Vec<KeyFrameItem>>,
     medias: Vec<StyleMedia>,
     fonts: Vec<FontFaceItem>,
+    design_width: Option<i32>,
   ) -> Self {
     Self {
       styles,
       keyframes,
       medias,
       fonts,
+      design_width,
     }
   }
 
@@ -208,7 +211,7 @@ impl JsonWriter {
 
     // fonts
 
-    let json_value = expr_to_json(&Expr::Object(ObjectLit {
+    let mut json_value = expr_to_json(&Expr::Object(ObjectLit {
       span: DUMMY_SP,
       props: vec![
         PropOrSpread::Prop(Box::new(Prop::KeyValue(KeyValueProp {
@@ -281,6 +284,11 @@ impl JsonWriter {
         }))),
       ],
     }));
+    // 如果 design_width 存在，则添加 design_width 到 json_value
+    if let Some(design_width) = self.design_width {
+      let map = json_value.as_object_mut().unwrap();
+      map.insert("design_width".to_string(), Value::Number(serde_json::Number::from(design_width)));
+    }
 
     // 打印 JSON 值
 

src/json_writer.rs

@@ -35,6 +35,7 @@ pub struct OutputOptions {
 #[derive(Deserialize)]
 pub struct ParseOptions {
   pub platform_string: String,
+  pub design_width: Option<i32>,
   pub output: Option<OutputOptions>,
 }
 
@@ -51,6 +52,7 @@ pub fn parse(styles: Vec<String>, options: ParseOptions) -> ParseResult {
     "Harmony" => Platform::Harmony,
     _ => Platform::Harmony,
   };
+  let design_width = options.design_width;
   let output = options.output.unwrap_or(OutputOptions {
     is_bin: Some(false)
   });
@@ -70,6 +72,7 @@ pub fn parse(styles: Vec<String>, options: ParseOptions) -> ParseResult {
     style_data.all_keyframes.borrow().clone(),
     style_data.all_medias.borrow().clone(),
     style_data.all_fonts.borrow().clone(),
+    design_width,
   );
 
   let style_json = style_map.to_json();

src/lib.rs

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

src/main.rs

@@ -2278,6 +2278,7 @@ impl<'a> StyleSheet<'a> {
   pub const VT_KEYFRAMES: flatbuffers::VOffsetT = 6;
   pub const VT_MEDIAS: flatbuffers::VOffsetT = 8;
   pub const VT_STYLES: flatbuffers::VOffsetT = 10;
+  pub const VT_DESIGN_WIDTH: flatbuffers::VOffsetT = 12;
 
   #[inline]
   pub unsafe fn init_from_table(table: flatbuffers::Table<'a>) -> Self {
@@ -2293,6 +2294,7 @@ impl<'a> StyleSheet<'a> {
     if let Some(x) = args.medias { builder.add_medias(x); }
     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.finish()
   }
 
@@ -2325,6 +2327,13 @@ impl<'a> StyleSheet<'a> {
     // which contains a valid value in this slot
     unsafe { self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<Style>>>>(StyleSheet::VT_STYLES, None)}
   }
+  #[inline]
+  pub fn design_width(&self) -> u16 {
+    // Safety:
+    // Created from valid Table for this object
+    // which contains a valid value in this slot
+    unsafe { self._tab.get::<u16>(StyleSheet::VT_DESIGN_WIDTH, Some(0)).unwrap()}
+  }
 }
 
 impl flatbuffers::Verifiable for StyleSheet<'_> {
@@ -2338,6 +2347,7 @@ impl flatbuffers::Verifiable for StyleSheet<'_> {
      .visit_field::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'_, flatbuffers::ForwardsUOffset<&'_ str>>>>("keyframes", Self::VT_KEYFRAMES, false)?
      .visit_field::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'_, flatbuffers::ForwardsUOffset<&'_ str>>>>("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)?
      .finish();
     Ok(())
   }
@@ -2347,6 +2357,7 @@ pub struct StyleSheetArgs<'a> {
     pub keyframes: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<&'a str>>>>,
     pub medias: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<&'a str>>>>,
     pub styles: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a, flatbuffers::ForwardsUOffset<Style<'a>>>>>,
+    pub design_width: u16,
 }
 impl<'a> Default for StyleSheetArgs<'a> {
   #[inline]
@@ -2356,6 +2367,7 @@ impl<'a> Default for StyleSheetArgs<'a> {
       keyframes: None,
       medias: None,
       styles: None,
+      design_width: 0,
     }
   }
 }
@@ -2382,6 +2394,10 @@ impl<'a: 'b, 'b, A: flatbuffers::Allocator + 'a> StyleSheetBuilder<'a, 'b, A> {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(StyleSheet::VT_STYLES, styles);
   }
   #[inline]
+  pub fn add_design_width(&mut self, design_width: u16) {
+    self.fbb_.push_slot::<u16>(StyleSheet::VT_DESIGN_WIDTH, design_width, 0);
+  }
+  #[inline]
   pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a, A>) -> StyleSheetBuilder<'a, 'b, A> {
     let start = _fbb.start_table();
     StyleSheetBuilder {
@@ -2403,6 +2419,7 @@ impl core::fmt::Debug for StyleSheet<'_> {
       ds.field("keyframes", &self.keyframes());
       ds.field("medias", &self.medias());
       ds.field("styles", &self.styles());
+      ds.field("design_width", &self.design_width());
       ds.finish()
   }
 }

src/stylesheet_generated.rs

@@ -442,11 +442,13 @@ 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 stylesheet = styles::StyleSheet::create(&mut builder, &styles::StyleSheetArgs {
       fonts: None,
       keyframes: None,
       medias: None,
       styles: Some(styles),
+      design_width: design_width,
     });
 
     builder.finish(stylesheet, None);