feat: implement format clone by clone method

Author: rajyan

rust/src/wrapper/format.rs

@@ -3,9 +3,9 @@ use std::sync::{Arc, Mutex, MutexGuard};
 use rust_xlsxwriter as xlsx;
 use wasm_bindgen::prelude::*;
 
-use crate::{error::XlsxError, wrapper::utils, DeepClone};
+use crate::{DeepClone};
 
-use super::{color::Color, WasmResult};
+use super::{color::Color};
 
 /// The `Format` struct is used to define cell formatting for data in a
 /// worksheet.
@@ -178,32 +178,15 @@ pub struct Format {
     pub(crate) inner: Arc<Mutex<xlsx::Format>>,
 }
 
-#[wasm_bindgen]
-extern "C" {
-    #[wasm_bindgen(typescript_type = "Format")]
-    pub type JsFormat;
-}
-
 #[wasm_bindgen]
 impl Format {
     /// Create a new Format object.
     ///
     /// Create a new Format object to use with worksheet formatting.
-    /// If a Format obejct is provided as an argument, it will be cloned.
     #[wasm_bindgen(constructor)]
-    pub fn new(format: Option<JsFormat>) -> WasmResult<Format> {
-        if let Some(format) = format {
-            // HACK: Since wasm-bindgen does not supports Option<&RustStruct>, we cast JsValue as Format.
-            let format = utils::format_of_jsval(&format).ok_or(XlsxError::Type(
-                "Expected a value of type Format".to_string(),
-            ))?;
-            // Clone the inner object
-            let format = format.deep_clone();
-            Ok(format)
-        } else {
-            Ok(Format {
-                inner: Arc::new(Mutex::new(xlsx::Format::new())),
-            })
+    pub fn new() -> Format {
+        Format {
+            inner: Arc::new(Mutex::new(xlsx::Format::new())),
         }
     }
 
@@ -815,6 +798,11 @@ impl Format {
             inner: Arc::clone(&self.inner),
         }
     }
+
+    #[wasm_bindgen(js_name = "clone")]
+    pub fn clone_format(&self) -> Format {
+        self.deep_clone()
+    }
 }
 
 impl DeepClone for Format {

rust/src/wrapper/utils.rs

@@ -7,7 +7,6 @@ use wasm_bindgen::convert::RefFromWasmAbi;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsCast;
 
-use super::format::Format;
 use super::formula::Formula;
 use super::url::Url;
 
@@ -85,12 +84,6 @@ pub fn formula_of_jsval(js: &JsValue) -> Option<Formula> {
         .map(|f| f.clone())
 }
 
-pub fn format_of_jsval(js: &JsValue) -> Option<Format> {
-    generic_of_jsval::<Format>(js, "Format")
-        .ok()
-        .map(|f| f.clone())
-}
-
 pub fn url_of_jsval(js: &JsValue) -> Option<Url> {
     generic_of_jsval::<Url>(js, "Url").ok().map(|f| f.clone())
 }

test/format.test.ts

@@ -213,8 +213,8 @@ describe("xlsx-wasm test", () => {
     // Act
     const worksheet = workbook.addWorksheet();
     const baseFormat = new Format().setBold();
-    const format1 = new Format(baseFormat).setItalic();
-    const format2 = new Format(baseFormat).setFontColor(Color.red());
+    const format1 = baseFormat.clone().setItalic();
+    const format2 = baseFormat.clone().setFontColor(Color.red());
 
     worksheet.writeStringWithFormat(0, 0, "bold", baseFormat);
     worksheet.writeStringWithFormat(0, 1, "bold italic", format1);