Release version 0.18.0

README.md

@@ -23,7 +23,7 @@ which emphasizes **simplicity**, **extensibility** and **productivity**.
 ## Getting started
 
 You can start with the example [`actix-app`], [`axum-app`] or [`dioxus-desktop`].
-Currently, it requires rustc **nightly** to build the project.
+It requires stable **rustc 75+** to build the project.
 
 ```shell
 cd examples/axum-app

examples/actix-app/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "actix-app"
 description = "An example for actix-web integration."
-version = "0.5.0"
+version = "0.5.1"
 rust-version = "1.75"
 edition = "2021"
 publish = false
@@ -16,18 +16,18 @@ features = ["derive"]
 
 [dependencies.zino]
 path = "../../zino"
-version = "0.16.6"
+version = "0.17.0"
 features = ["actix"]
 
 [dependencies.zino-core]
 path = "../../zino-core"
-version = "0.17.4"
+version = "0.18.0"
 features = ["orm-postgres", "view-minijinja"]
 
 [dependencies.zino-derive]
 path = "../../zino-derive"
-version = "0.14.4"
+version = "0.15.0"
 
 [dependencies.zino-model]
 path = "../../zino-model"
-version = "0.14.4"
+version = "0.15.0"

examples/axum-app/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "axum-app"
 description = "An example for axum integration."
-version = "0.11.0"
+version = "0.11.1"
 rust-version = "1.75"
 edition = "2021"
 publish = false
@@ -16,12 +16,12 @@ features = ["derive"]
 
 [dependencies.zino]
 path = "../../zino"
-version = "0.16.6"
+version = "0.17.0"
 features = ["axum"]
 
 [dependencies.zino-core]
 path = "../../zino-core"
-version = "0.17.4"
+version = "0.18.0"
 features = [
     "crypto-sm",
     "orm-mysql",
@@ -32,8 +32,8 @@ features = [
 
 [dependencies.zino-derive]
 path = "../../zino-derive"
-version = "0.14.4"
+version = "0.15.0"
 
 [dependencies.zino-model]
 path = "../../zino-model"
-version = "0.14.4"
+version = "0.15.0"

examples/dioxus-desktop/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "dioxus-desktop"
 description = "An example for Dioxus desktop integration."
-version = "0.2.0"
+version = "0.2.1"
 rust-version = "1.75"
 edition = "2021"
 publish = false
@@ -26,18 +26,18 @@ features = ["derive"]
 
 [dependencies.zino]
 path = "../../zino"
-version = "0.16.6"
+version = "0.17.0"
 features = ["dioxus-desktop"]
 
 [dependencies.zino-core]
 path = "../../zino-core"
-version = "0.17.4"
+version = "0.18.0"
 features = ["orm-sqlite"]
 
 [dependencies.zino-model]
 path = "../../zino-model"
-version = "0.14.4"
+version = "0.15.0"
 
 [dependencies.zino-dioxus]
 path = "../../zino-dioxus"
-version = "0.2.0"
+version = "0.2.1"

examples/dioxus-desktop/src/service/stargazer.rs

@@ -21,10 +21,8 @@ pub async fn list_stargazers(per_page: u8, page: usize) -> Result<Vec<Map>, Erro
     });
     let mut data: Vec<Map> = App::fetch_json(resource, options.as_object()).await?;
     for d in data.iter_mut() {
-        if let Some(user) = d.remove("user") {
-            if let Some(mut user) = user.into_map_opt() {
-                d.append(&mut user);
-            }
+        if let Some(mut user) = d.remove("user").and_then(|u| u.into_map_opt()) {
+            d.append(&mut user);
         }
     }
     Ok(data)

zino-cli/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "zino-cli"
 description = "CLI tools for zino."
-version = "0.1.4"
+version = "0.2.0"
 rust-version = "1.75"
 edition = "2021"
 license = "MIT"
@@ -25,4 +25,4 @@ features = ["color", "derive"]
 
 [dependencies.zino-core]
 path = "../zino-core"
-version = "0.17.0"
+version = "0.18.0"

zino-cli/src/lib.rs

@@ -1,6 +1,6 @@
 #![doc = include_str!("../README.md")]
-#![doc(html_favicon_url = "https://photino.github.io/zino-docs-zh/assets/zino-logo.png")]
-#![doc(html_logo_url = "https://photino.github.io/zino-docs-zh/assets/zino-logo.svg")]
+#![doc(html_favicon_url = "https://zino.cc/assets/zino-logo.png")]
+#![doc(html_logo_url = "https://zino.cc/assets/zino-logo.svg")]
 #![forbid(unsafe_code)]
 
 mod cli;

zino-core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "zino-core"
 description = "Core types and traits for zino."
-version = "0.17.4"
+version = "0.18.0"
 rust-version = "1.75"
 edition = "2021"
 license = "MIT"
@@ -369,7 +369,6 @@ criterion = "0.5.1"
 data-encoding = "2.4.0"
 libsm = "0.6.0"
 sm3 = "0.4.2"
-sonic-rs = "0.3.0"
 tinyvec = { version = "1.6.0", features = ["alloc"] }
 uuid-simd = "0.8.0"
 

zino-core/benches/json_raw_value.rs

@@ -46,18 +46,4 @@ pub fn bench(c: &mut criterion::Criterion) {
             serde_json::to_vec(&res)
         })
     });
-    c.bench_function("sonic_serialize_json_object", |b| {
-        b.iter(|| {
-            let mut res = Map::new();
-            res.upsert("status_code", 200);
-            res.upsert("request_id", Uuid::new_v4().to_string());
-
-            let mut data = Map::new();
-            data.upsert("name", "alice");
-            data.upsert("age", 18);
-            data.upsert("roles", vec!["admin", "worker"]);
-            res.upsert("data", data);
-            sonic_rs::to_vec(&res)
-        })
-    });
 }

zino-core/src/auth/authentication.rs

@@ -264,7 +264,7 @@ impl Authentication {
             validation.record("signature", "should be nonempty");
         } else if self
             .sign_with::<H>(secret_access_key)
-            .is_ok_and(|token| token != signature)
+            .is_ok_and(|s| s != signature)
         {
             validation.record("signature", "invalid signature");
         }

zino-core/src/datetime/mod.rs

@@ -617,7 +617,7 @@ impl FromStr for DateTime {
             let dt = s.parse::<chrono::DateTime<Utc>>()?;
             Ok(dt.with_timezone(&Local).into())
         } else {
-            let dt = [s, "Z"].join("").parse::<chrono::DateTime<Utc>>()?;
+            let dt = [s, "Z"].concat().parse::<chrono::DateTime<Utc>>()?;
             Ok(dt.with_timezone(&Local).into())
         }
     }

zino-core/src/file/mod.rs

@@ -184,7 +184,7 @@ impl NamedFile {
         let suffix = ".encrypted";
         let bytes = crypto::decrypt(self.as_ref(), key.as_ref())?;
         if let Some(ref mut file_name) = self.file_name {
-            if !file_name.ends_with(suffix) {
+            if file_name.ends_with(suffix) {
                 file_name.truncate(file_name.len() - suffix.len());
             }
         }

zino-core/src/lib.rs

@@ -1,6 +1,6 @@
 #![doc = include_str!("../README.md")]
-#![doc(html_favicon_url = "https://photino.github.io/zino-docs-zh/assets/zino-logo.png")]
-#![doc(html_logo_url = "https://photino.github.io/zino-docs-zh/assets/zino-logo.svg")]
+#![doc(html_favicon_url = "https://zino.cc/assets/zino-logo.png")]
+#![doc(html_logo_url = "https://zino.cc/assets/zino-logo.svg")]
 #![allow(async_fn_in_trait)]
 #![forbid(unsafe_code)]
 

zino-core/src/openapi/model.rs

@@ -9,7 +9,7 @@ pub(crate) fn translate_model_entry(model: &mut Map, model_name: &str) {
     for (key, translation) in MODEL_TRANSLATIONS.iter() {
         if let Some(field) = key.strip_prefix(&model_name_prefix) {
             if let Some(value) = model.get(field) {
-                let translated_field = [field, "translated"].join("_");
+                let translated_field = [field, "_translated"].concat();
                 let translated_value = translation
                     .translate(value)
                     .unwrap_or_else(|| value.clone());

zino-core/src/orm/schema.rs

@@ -870,7 +870,7 @@ pub trait Schema: 'static + Send + Sync + ModelHooks {
         for row in data {
             for &col in columns {
                 if let Some(vec) = row.get_array(col).filter(|vec| !vec.is_empty()) {
-                    let populated_field = [col, "populated"].join("_");
+                    let populated_field = [col, "_populated"].concat();
                     let populated_values = vec
                         .iter()
                         .map(|key| {
@@ -890,7 +890,7 @@ pub trait Schema: 'static + Send + Sync + ModelHooks {
                         .iter()
                         .find_map(|(k, v)| (key == k).then_some(v));
                     if let Some(value) = populated_value {
-                        let populated_field = [col, "populated"].join("_");
+                        let populated_field = [col, "_populated"].concat();
                         row.upsert(populated_field, value.clone());
                     }
                 }
@@ -954,7 +954,7 @@ pub trait Schema: 'static + Send + Sync + ModelHooks {
 
         for &col in columns {
             if let Some(vec) = data.get_array(col).filter(|vec| !vec.is_empty()) {
-                let populated_field = [col, "populated"].join("_");
+                let populated_field = [col, "_populated"].concat();
                 let populated_values = vec
                     .iter()
                     .map(|key| {
@@ -974,7 +974,7 @@ pub trait Schema: 'static + Send + Sync + ModelHooks {
                     .iter()
                     .find_map(|(k, v)| (key == k).then_some(v));
                 if let Some(value) = populated_value {
-                    let populated_field = [col, "populated"].join("_");
+                    let populated_field = [col, "_populated"].concat();
                     data.upsert(populated_field, value.clone());
                 }
             }

zino-derive/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "zino-derive"
 description = "Derived traits for zino."
-version = "0.14.4"
+version = "0.15.0"
 rust-version = "1.75"
 edition = "2021"
 license = "MIT"
@@ -21,5 +21,5 @@ syn = "2.0.43"
 
 [dependencies.zino-core]
 path = "../zino-core"
-version = "0.17.4"
+version = "0.18.0"
 features = ["orm"]

zino-derive/src/decode_row.rs

@@ -13,9 +13,6 @@ pub(super) fn parse_token_stream(input: DeriveInput) -> TokenStream {
     let mut decode_model_fields = Vec::new();
     for field in parser::parse_struct_fields(input.data) {
         let type_name = parser::get_type_name(&field.ty);
-        if type_name.is_empty() {
-            continue;
-        }
         if let Some(ident) = field.ident {
             let name = ident.to_string();
             let mut ignore = false;

zino-derive/src/lib.rs

@@ -1,6 +1,6 @@
 #![doc = include_str!("../README.md")]
-#![doc(html_favicon_url = "https://photino.github.io/zino-docs-zh/assets/zino-logo.png")]
-#![doc(html_logo_url = "https://photino.github.io/zino-docs-zh/assets/zino-logo.svg")]
+#![doc(html_favicon_url = "https://zino.cc/assets/zino-logo.png")]
+#![doc(html_logo_url = "https://zino.cc/assets/zino-logo.svg")]
 #![forbid(unsafe_code)]
 
 use proc_macro::TokenStream;

zino-derive/src/model.rs

@@ -26,9 +26,6 @@ pub(super) fn parse_token_stream(input: DeriveInput) -> TokenStream {
     let mut field_setters = Vec::new();
     for field in parser::parse_struct_fields(input.data) {
         let type_name = parser::get_type_name(&field.ty);
-        if type_name.is_empty() {
-            continue;
-        }
         if let Some(ident) = field.ident {
             let name = ident.to_string();
             let mut enable_setter = true;

zino-derive/src/model_accessor.rs

@@ -58,9 +58,6 @@ pub(super) fn parse_token_stream(input: DeriveInput) -> TokenStream {
     let mut model_references: HashMap<String, Vec<String>> = HashMap::new();
     for field in parser::parse_struct_fields(input.data) {
         let type_name = parser::get_type_name(&field.ty);
-        if type_name.is_empty() {
-            continue;
-        }
         if let Some(ident) = field.ident {
             let name = ident.to_string();
             let mut field_alias = None;

zino-derive/src/model_hooks.rs

@@ -14,10 +14,6 @@ pub(super) fn parse_token_stream(input: DeriveInput) -> TokenStream {
     let mut model_mappings: HashMap<String, String> = HashMap::new();
     let mut field_embeddings: HashMap<String, Vec<(String, String)>> = HashMap::new();
     for field in parser::parse_struct_fields(input.data) {
-        let type_name = parser::get_type_name(&field.ty);
-        if type_name.is_empty() {
-            continue;
-        }
         if let Some(ident) = field.ident {
             let name = ident.to_string();
             let mut correlatation_field = None;

zino-derive/src/schema.rs

@@ -74,9 +74,6 @@ pub(super) fn parse_token_stream(input: DeriveInput) -> TokenStream {
         if let Fields::Named(fields) = data.fields {
             for field in fields.named.into_iter() {
                 let mut type_name = parser::get_type_name(&field.ty);
-                if type_name.is_empty() {
-                    continue;
-                }
                 if let Some(ident) = field.ident {
                     let name = ident.to_string();
                     let mut ignore = false;

zino-dioxus/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "zino-dioxus"
 description = "Dioxus components for zino."
-version = "0.2.0"
+version = "0.2.1"
 rust-version = "1.75"
 edition = "2021"
 license = "MIT"
@@ -21,4 +21,4 @@ smallvec = "1.11.1"
 
 [dependencies.zino-core]
 path = "../zino-core"
-version = "0.17.0"
+version = "0.18.0"

zino-dioxus/src/lib.rs

@@ -1,6 +1,6 @@
 #![doc = include_str!("../README.md")]
-#![doc(html_favicon_url = "https://photino.github.io/zino-docs-zh/assets/zino-logo.png")]
-#![doc(html_logo_url = "https://photino.github.io/zino-docs-zh/assets/zino-logo.svg")]
+#![doc(html_favicon_url = "https://zino.cc/assets/zino-logo.png")]
+#![doc(html_logo_url = "https://zino.cc/assets/zino-logo.svg")]
 #![allow(non_snake_case)]
 #![forbid(unsafe_code)]
 

zino-extra/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "zino-extra"
 description = "Extra utilities for zino."
-version = "0.1.5"
+version = "0.2.0"
 rust-version = "1.75"
 edition = "2021"
 license = "MIT"
@@ -41,4 +41,4 @@ optional = true
 
 [dependencies.zino-core]
 path = "../zino-core"
-version = "0.17.0"
+version = "0.18.0"

zino-extra/src/lib.rs

@@ -1,6 +1,6 @@
 #![doc = include_str!("../README.md")]
-#![doc(html_favicon_url = "https://photino.github.io/zino-docs-zh/assets/zino-logo.png")]
-#![doc(html_logo_url = "https://photino.github.io/zino-docs-zh/assets/zino-logo.svg")]
+#![doc(html_favicon_url = "https://zino.cc/assets/zino-logo.png")]
+#![doc(html_logo_url = "https://zino.cc/assets/zino-logo.svg")]
 #![forbid(unsafe_code)]
 
 #[cfg(feature = "cache")]

zino-middleware/src/lib.rs

@@ -1,4 +1,4 @@
 #![doc = include_str!("../README.md")]
-#![doc(html_favicon_url = "https://photino.github.io/zino-docs-zh/assets/zino-logo.png")]
-#![doc(html_logo_url = "https://photino.github.io/zino-docs-zh/assets/zino-logo.svg")]
+#![doc(html_favicon_url = "https://zino.cc/assets/zino-logo.png")]
+#![doc(html_logo_url = "https://zino.cc/assets/zino-logo.svg")]
 #![forbid(unsafe_code)]