fix: 🐛 themes structure in manifest file

Makefile

@@ -256,7 +256,7 @@ cpp_link_args = [
 	'-sDYNAMIC_EXECUTION=0',
 	'--no-entry',
 	'--strip-all',
-	# '--embind-emit-tsd=${WASM_MODULE}.d.ts',
+	'--embind-emit-tsd=${WASM_MODULE}.d.ts',
 	'--minify=0']
 
 [host_machine]
@@ -430,8 +430,8 @@ define WASM_RELEASE
 	mkdir -p $(RELEASE)/$(WASM)
 	cp $(RUNTIME_FFI)/$(WASM_BUILD)/$(BUILD)/$(WASM_MODULE).wasm \
 		$(RELEASE)/$(WASM)
-	# cp $(RUNTIME_FFI)/$(WASM_BUILD)/$(BUILD)/$(WASM_MODULE).d.ts \
-	# 	$(RELEASE)/$(WASM)
+	cp $(RUNTIME_FFI)/$(WASM_BUILD)/$(BUILD)/$(WASM_MODULE).d.ts \
+		$(RELEASE)/$(WASM)
 	cp $(RUNTIME_FFI)/$(WASM_BUILD)/$(BUILD)/$(WASM_MODULE).js \
 		$(RELEASE)/$(WASM)/$(WASM_MODULE).mjs
 	cd $(RELEASE)/$(WASM) && \

dotlottie-ffi/Cargo.toml

@@ -13,12 +13,11 @@ name = "uniffi-bindgen"
 path = "uniffi-bindgen.rs"
 
 [dependencies]
-uniffi = { version = "0.26.0", features = ["cli"] }
-# Core runtime
+uniffi = { version = "0.25.3", features = ["cli"] }
 dotlottie_player = { path = "../dotlottie-rs" }
 dotlottie_fms = { path = "../dotlottie-fms" }
 cfg-if = "1.0"
 
 [build-dependencies]
-uniffi = { version = "0.26.0", features = ["build"] }
+uniffi = { version = "0.25.3", features = ["build"] }
 lazy_static = "1.4"

dotlottie-ffi/emscripten_bindings.cpp

@@ -23,6 +23,9 @@ EMSCRIPTEN_BINDINGS(DotLottiePlayer)
 
     // Register std::vector<float> as VectorFloat for the Config::segments field
     register_vector<float>("VectorFloat");
+    // register_vector<std::string>("VectorString");
+    // register_vector<ManifestTheme>("VectorManifestTheme");
+    // register_vector<ManifestAnimation>("VectorManifestAnimation");
 
     enum_<Mode>("Mode")
         .value("Forward", Mode::FORWARD)
@@ -41,10 +44,7 @@ EMSCRIPTEN_BINDINGS(DotLottiePlayer)
 
     // value_object<ManifestTheme>("ManifestTheme")
     //     .field("id", &ManifestTheme::id)
-    //     .field("values", &ManifestTheme::values);
-
-    // value_object<ManifestThemes>("ManifestThemes")
-    //     .field("value", &ManifestThemes::value);
+    //     .field("animations", &ManifestTheme::animations);
 
     // value_object<ManifestAnimation>("ManifestAnimation")
     //     .field("autoplay", &ManifestAnimation::autoplay)
@@ -71,7 +71,19 @@ EMSCRIPTEN_BINDINGS(DotLottiePlayer)
     //     .field("states", &Manifest::states)
     //     .field("version", &Manifest::version);
 
+    // class_<Observer>("Observer")
+    //     .smart_ptr<std::shared_ptr<Observer>>("Observer")
+    //     .function("onFrame", &Observer::on_frame)
+    //     .function("onLoad", &Observer::on_load)
+    //     .function("onLoop", &Observer::on_loop)
+    //     .function("onPause", &Observer::on_pause)
+    //     .function("onPlay", &Observer::on_play)
+    //     .function("onRender", &Observer::on_render)
+    //     .function("onComplete", &Observer::on_complete)
+    //     .function("onStop", &Observer::on_stop);
+
     class_<DotLottiePlayer>("DotLottiePlayer")
+        .smart_ptr<std::shared_ptr<DotLottiePlayer>>("DotLottiePlayer")
         .constructor(&DotLottiePlayer::init, allow_raw_pointers())
         .function("buffer", &buffer)
         .function("clear", &DotLottiePlayer::clear)
@@ -86,7 +98,7 @@ EMSCRIPTEN_BINDINGS(DotLottiePlayer)
         .function("loadAnimationPath", &DotLottiePlayer::load_animation_path, allow_raw_pointers())
         .function("loadDotLottieData", &load_dotlottie_data, allow_raw_pointers())
         .function("loadAnimation", &DotLottiePlayer::load_animation, allow_raw_pointers())
-        // FIXME: .function("manifest", &DotLottiePlayer::manifest)
+        // .function("manifest", &DotLottiePlayer::manifest)
         .function("manifestString", &DotLottiePlayer::manifest_string)
         .function("loopCount", &DotLottiePlayer::loop_count)
         .function("pause", &DotLottiePlayer::pause)
@@ -98,7 +110,7 @@ EMSCRIPTEN_BINDINGS(DotLottiePlayer)
         .function("setFrame", &DotLottiePlayer::set_frame)
         .function("stop", &DotLottiePlayer::stop)
         .function("totalFrames", &DotLottiePlayer::total_frames)
-        .function("subscribe", &DotLottiePlayer::subscribe)
-        .function("unsubscribe", &DotLottiePlayer::unsubscribe)
+        // .function("subscribe", &DotLottiePlayer::subscribe)
+        // .function("unsubscribe", &DotLottiePlayer::unsubscribe)
         .function("isComplete", &DotLottiePlayer::is_complete);
-}
+}

dotlottie-ffi/src/dotlottie_player.udl

@@ -32,11 +32,7 @@ dictionary Config {
 
 dictionary ManifestTheme {
     string id;
-    sequence<string> values;
-};
-
-dictionary ManifestThemes {
-    sequence<ManifestTheme>? value;
+    sequence<string> animations;
 };
 
 dictionary ManifestAnimation {
@@ -61,7 +57,7 @@ dictionary Manifest {
     string? generator;
     string? keywords;
     u32? revision;
-    ManifestThemes? themes;
+    sequence<ManifestTheme>? themes;
     sequence<string>? states;
     string? version;
 };

dotlottie-ffi/src/dotlottie_player_cpp.udl

@@ -1,17 +1,17 @@
 namespace dotlottie_player {
 };
 
-[Trait]
-interface Observer {
-    void on_load();
-    void on_play();
-    void on_pause();
-    void on_stop();
-    void on_frame(f32 frame_no);
-    void on_render(f32 frame_no);
-    void on_loop(u32 loop_count);
-    void on_complete();
-};
+/// [Trait]
+/// interface Observer {
+///    void on_load();
+///    void on_play();
+///    void on_pause();
+///    void on_stop();
+///    void on_frame(f32 frame_no);
+///    void on_render(f32 frame_no);
+///    void on_loop(u32 loop_count);
+///    void on_complete();
+/// };
 
 enum Mode {
     "Forward",
@@ -32,11 +32,7 @@ dictionary Config {
 
 dictionary ManifestTheme {
     string id;
-    sequence<string> values;
-};
-
-dictionary ManifestThemes {
-    sequence<ManifestTheme>? value;
+    sequence<string> animations;
 };
 
 dictionary ManifestAnimation {
@@ -61,7 +57,7 @@ dictionary Manifest {
     string? generator;
     string? keywords;
     u32? revision;
-    ManifestThemes? themes;
+    sequence<ManifestTheme>? themes;
     sequence<string>? states;
     string? version;
 };
@@ -72,7 +68,7 @@ interface DotLottiePlayer {
     boolean load_animation_path([ByRef] string animation_path, u32 width, u32 height);
     boolean load_dotlottie_data([ByRef] bytes file_data, u32 width, u32 height);
     boolean load_animation([ByRef] string animation_id, u32 width, u32 height);
-    Manifest? manifest();
+    /// Manifest? manifest();
     string manifest_string();
     u64 buffer_ptr();
     u64 buffer_len();
@@ -94,7 +90,7 @@ interface DotLottiePlayer {
     boolean render();
     boolean resize(u32 width, u32 height);
     void clear();
-    void subscribe(Observer observer);
-    void unsubscribe([ByRef] Observer observer);
+    /// void subscribe(Observer observer);
+    /// void unsubscribe([ByRef] Observer observer);
     boolean is_complete();
 };

dotlottie-fms/src/manifest.rs

@@ -1,6 +1,6 @@
 use json::{self, array, object};
 
-use crate::{ManifestAnimation, ManifestThemes};
+use crate::{ManifestAnimation, ManifestTheme};
 use serde::{Deserialize, Serialize};
 
 use std::fmt::Display;
@@ -15,7 +15,7 @@ pub struct Manifest {
     pub generator: Option<String>,
     pub keywords: Option<String>,
     pub revision: Option<u32>,
-    pub themes: Option<ManifestThemes>,
+    pub themes: Option<Vec<ManifestTheme>>,
     pub states: Option<Vec<String>>,
     pub version: Option<String>,
 }
@@ -28,7 +28,7 @@ impl Manifest {
             author: Some("LottieFiles".to_string()),
             // custom,
             description: None,
-            generator: Some("dotLottie-utils".to_string()),
+            generator: Some("dotLottie-fms".to_string()),
             keywords: Some("dotLottie".to_string()),
             revision: Some(1),
             themes: None,
@@ -54,9 +54,10 @@ impl Manifest {
             json["description"] = self.description.clone().into();
         }
         if let Some(themes) = &self.themes {
-            if !themes.clone().value.unwrap().is_empty() {
-                json["themes"] = themes.to_json();
-            }
+            json["themes"] = array!(themes
+                .iter()
+                .map(|t| t.to_json())
+                .collect::<Vec<json::JsonValue>>());
         }
         if let Some(states) = &self.states {
             json["states"] = array!(states

dotlottie-fms/src/manifest_themes.rs

@@ -2,72 +2,17 @@ use json::{self, object};
 
 use serde::{Deserialize, Serialize};
 
-use std::fmt::Display;
-
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct ManifestTheme {
     pub id: String,
-    pub values: Vec<String>,
+    pub animations: Vec<String>,
 }
 
 impl ManifestTheme {
     pub fn to_json(&self) -> json::JsonValue {
         object! {
             "id" => self.id.clone(),
-            "values" => self.values.clone(),
-        }
-    }
-}
-
-impl Display for ManifestTheme {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        let json_value = object! {
-            "id" => self.id.clone(),
-            "values" => self.values.clone(),
-        };
-        write!(f, "{}", json_value)
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ManifestThemes {
-    pub value: Option<Vec<ManifestTheme>>,
-}
-
-impl ManifestThemes {
-    pub fn to_json(&self) -> json::JsonValue {
-        if self.value.is_none() {
-            return json::JsonValue::Array(vec![]);
-        }
-
-        let animations_json: Vec<json::JsonValue> = self
-            .value
-            .as_ref()
-            .unwrap()
-            .iter()
-            .map(|themes| themes.to_json())
-            .collect();
-
-        json::JsonValue::Array(animations_json)
-    }
-}
-
-impl std::fmt::Display for ManifestThemes {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        match &self.value {
-            Some(themes) => {
-                let themes_json = themes
-                    .iter()
-                    .map(|theme| theme.to_json()) // Assuming ManifestTheme implements Display
-                    .collect::<Vec<json::JsonValue>>();
-
-                write!(
-                    f,
-                    "[{}]",
-                    json::stringify(json::JsonValue::Array(themes_json))
-                )
-            }
-            None => write!(f, "[]"),
+            "animations" => self.animations.clone(),
         }
     }
 }