push new update

Author: ahqsoftwares

src-ahqstore-types/Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "ahqstore-types"
 description = "Standard types used by AHQ Store"
-version = "3.14.0"
+version = "3.14.1"
 edition = "2021"
 license-file = "../LICENSE.md"
 repository = "https://github.com/ahqstore/client"
@@ -19,7 +19,7 @@ reqwest = { version = "0.12", features = [
 serde = { version = "1", features = ["derive"] }
 serde-wasm-bindgen = { version = "0.6", optional = true }
 serde_json = "1"
-tsify = { version = "0.4", optional = true }
+tsify = { version = "0.5", optional = true }
 wasm-bindgen = { version = "0.2", optional = true }
 wasm-bindgen-futures = { version = "0.4", optional = true }
 kfghdfghdfkgh_js_macros = { version = "1", optional = true }

src-ahqstore-types/Cargo.toml

@@ -4,6 +4,7 @@ use proc_macro::TokenStream;
 use quote::quote;
 use syn;
 
+
 #[proc_macro_derive(TsifyAsync)]
 pub fn tsify_async_macro_derive(input: TokenStream) -> TokenStream {
     // Construct a representation of Rust code as a syntax tree
@@ -16,12 +17,12 @@ pub fn tsify_async_macro_derive(input: TokenStream) -> TokenStream {
 
 fn impl_tsify_async_macro(ast: &syn::DeriveInput) -> TokenStream {
     let name = &ast.ident;
-    let gen = quote! {
+    let r#gen = quote! {
         impl From<#name> for JsValue {
             fn from(value: #name) -> Self {
                 serde_wasm_bindgen::to_value(&value).unwrap()
             }
         }
     };
-    gen.into()
+    r#gen.into()
 }

src-ahqstore-types/js_macros/src/lib.rs

@@ -17,7 +17,8 @@ pub static FDROID_APP_ASSET_URL: LazyLock<String> =
   LazyLock::new(|| format!("{FDROID_BASE_URL}/db/res/{{APP_ID}}/{{ASSET}}"));
 
 pub static FDROID_TOTAL: LazyLock<String> = LazyLock::new(|| format!("{FDROID_BASE_URL}/db/total"));
-pub static FDROID_HOME: LazyLock<String> = LazyLock::new(|| format!("{FDROID_BASE_URL}/db/home.json"));
+pub static FDROID_HOME: LazyLock<String> =
+  LazyLock::new(|| format!("{FDROID_BASE_URL}/db/home.json"));
 
 pub static FDROID_SEARCH: LazyLock<String> =
   LazyLock::new(|| format!("{FDROID_BASE_URL}/db/search/{{ID}}.json"));

src-ahqstore-types/src/api/fdroid.rs

@@ -16,21 +16,25 @@ use super::{
     AHQSTORE_MAP, AHQSTORE_SEARCH, AHQSTORE_TOTAL,
   },
   fdroid::{
-    FDROID_APPS_DEV, FDROID_APP_ASSET_URL, FDROID_APP_URL, FDROID_DEV_DATA, FDROID_HOME, FDROID_MAP, FDROID_SEARCH, FDROID_TOTAL
+    FDROID_APPS_DEV, FDROID_APP_ASSET_URL, FDROID_APP_URL, FDROID_DEV_DATA, FDROID_HOME,
+    FDROID_MAP, FDROID_SEARCH, FDROID_TOTAL,
   },
   linux::{
-    self, LINUX_APPS_DEV, LINUX_APP_ASSET_URL, LINUX_APP_URL, LINUX_DEV_DATA, LINUX_HOME, LINUX_MAP, LINUX_SEARCH, LINUX_TOTAL
+    self, LINUX_APPS_DEV, LINUX_APP_ASSET_URL, LINUX_APP_URL, LINUX_DEV_DATA, LINUX_HOME,
+    LINUX_MAP, LINUX_SEARCH, LINUX_TOTAL,
   },
   methods::{self, OfficialManifestSource, Store},
   winget::{
-    WINGET_APPS_DEV, WINGET_APP_ASSET_URL, WINGET_APP_URL, WINGET_DEV_DATA, WINGET_HOME, WINGET_MAP, WINGET_SEARCH, WINGET_TOTAL
+    WINGET_APPS_DEV, WINGET_APP_ASSET_URL, WINGET_APP_URL, WINGET_DEV_DATA, WINGET_HOME,
+    WINGET_MAP, WINGET_SEARCH, WINGET_TOTAL,
   },
-  SearchEntry,
+  Home, SearchEntry,
 };
 use anyhow::{anyhow, Context, Result};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "js", derive(tsify::Tsify))]
 pub struct Commits {
   pub ahqstore: String,
   pub alt: String,
@@ -59,7 +63,7 @@ pub async fn get_all_commits(token: Option<String>) -> Result<Commits> {
   Ok(Commits {
     ahqstore,
     #[cfg(feature = "js")]
-    alt: "".into(),
+    alt: "".to_string(),
     #[cfg(windows)]
     alt: winget,
     #[cfg(target_os = "android")]
@@ -87,7 +91,7 @@ pub async fn get_total_maps_by_source(
 }
 
 #[allow(unreachable_patterns)]
-pub async fn get_home(source: OfficialManifestSource, commit: &str) -> Result<Vec<(String, Vec<String>)>> {
+pub async fn get_home(source: OfficialManifestSource, commit: &str) -> Result<Home> {
   let home = match source {
     OfficialManifestSource::AHQStore => &*AHQSTORE_HOME,
     OfficialManifestSource::WinGet => &*WINGET_HOME,
@@ -98,9 +102,7 @@ pub async fn get_home(source: OfficialManifestSource, commit: &str) -> Result<Ve
     }
   };
 
-  methods::get_home(home, commit)
-    .await
-    .context("")
+  methods::get_home(home, commit).await.context("")
 }
 
 pub async fn get_search_by_source(

src-ahqstore-types/src/api/internet.rs

@@ -15,7 +15,7 @@ use crate::AHQStoreApplication;
 
 use super::{
   ahqstore::AHQSTORE_COMMIT_URL, fdroid::FDROID_COMMIT_URL, linux::LINUX_COMMIT_URL,
-  winget::WINGET_COMMIT_URL, RepoHomeData, CLIENT,
+  winget::WINGET_COMMIT_URL, Home, CLIENT,
 };
 
 #[derive(Serialize, Deserialize)]
@@ -72,33 +72,15 @@ pub async fn get_total_maps(total: &str, commit: &str) -> Option<usize> {
     .ok()
 }
 
-pub async fn get_home(home: &str, commit: &str) -> Option<Vec<(String, Vec<String>)>> {
-  let home: RepoHomeData = CLIENT
+pub async fn get_home(home: &str, commit: &str) -> Option<Home> {
+  CLIENT
     .get(home.replace("{COMMIT}", commit))
     .send()
     .await
     .ok()?
     .json()
     .await
-    .ok()?;
-
-  let mut resp_home = vec![];
-
-  for (title, data) in home {
-    let mut resp_data = vec![];
-
-    for item in data {
-      let id = item.get_id();
-
-      if let Some(id) = id {
-        resp_data.push(id);
-      }
-    }
-
-    resp_home.push((title, resp_data));
-  }
-
-  Some(resp_home)
+    .ok()
 }
 
 pub async fn get_search(search: &str, commit: &str, id: &str) -> Option<Vec<super::SearchEntry>> {