Prelude for imports

Changed files (7)

• modified Cargo.lock
• modified Cargo.toml
• modified examples/callbacks/Cargo.lock
• modified examples/callbacks/src/lib.rs
• modified examples/clickcounter/src/lib.rs
• modified src/lib.rs
• added src/prelude.rs

Diff

diff --git a/Cargo.lock b/Cargo.lockindex c943492..70ca280 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -88,7 +88,7 @@ checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [  "proc-macro2",  "quote",- "syn",+ "syn 2.0.117", ]  [[package]]@@ -324,7 +324,7 @@ dependencies = [  "proc-macro-crate",  "proc-macro2",  "quote",- "syn",+ "syn 2.0.117", ]  [[package]]@@ -387,7 +387,19 @@ dependencies = [  "gloo",  "proc-macro2",  "quote",- "syn",+ "syn 2.0.117",+]++[[package]]+name = "kaja-html-macro"+version = "1.0.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "46133dd45e19d67a03f37f98e356c3851845cec889434a6f928c1403f6abac02"+dependencies = [+ "proc-macro-error",+ "proc-macro2",+ "quote",+ "syn 2.0.117", ]  [[package]]@@ -399,6 +411,7 @@ dependencies = [  "inventory",  "js-sys",  "kaja-callback-macro",+ "kaja-html-macro",  "serde",  "serde-wasm-bindgen 0.5.0",  "wasm-bindgen",@@ -446,7 +459,7 @@ checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b" dependencies = [  "proc-macro2",  "quote",- "syn",+ "syn 2.0.117", ]  [[package]]@@ -476,6 +489,30 @@ dependencies = [ ]  [[package]]+name = "proc-macro-error"+version = "1.0.4"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"+dependencies = [+ "proc-macro-error-attr",+ "proc-macro2",+ "quote",+ "syn 1.0.109",+ "version_check",+]++[[package]]+name = "proc-macro-error-attr"+version = "1.0.4"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"+dependencies = [+ "proc-macro2",+ "quote",+ "version_check",+]++[[package]] name = "proc-macro2" version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index"@@ -554,7 +591,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [  "proc-macro2",  "quote",- "syn",+ "syn 2.0.117", ]  [[package]]@@ -590,6 +627,16 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"  [[package]] name = "syn"+version = "1.0.109"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"+dependencies = [+ "proc-macro2",+ "unicode-ident",+]++[[package]]+name = "syn" version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"@@ -625,7 +672,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [  "proc-macro2",  "quote",- "syn",+ "syn 2.0.117", ]  [[package]]@@ -636,7 +683,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [  "proc-macro2",  "quote",- "syn",+ "syn 2.0.117", ]  [[package]]@@ -663,6 +710,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"  [[package]]+name = "version_check"+version = "0.9.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"++[[package]] name = "wasi" version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index"@@ -710,7 +763,7 @@ dependencies = [  "bumpalo",  "proc-macro2",  "quote",- "syn",+ "syn 2.0.117",  "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.tomlindex d251a18..bcd89a1 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -6,6 +6,7 @@ edition = "2021" [dependencies] gloo = "0.12.0" gloo-console = "0.4.0"+kaja-html-macro = "1.0.3" kaja-callback-macro = { version = "0.1.0", path = "../kaja-callback-macro" } wasm-bindgen = "0.2.122" web-sys = { version = "0.3.99", features = ["Element", "HtmlElement", "NodeList"] }diff --git a/examples/callbacks/Cargo.lock b/examples/callbacks/Cargo.lockindex c6c7671..b8b94b7 100644--- a/examples/callbacks/Cargo.lock+++ b/examples/callbacks/Cargo.lock@@ -475,6 +475,7 @@ dependencies = [  "inventory",  "js-sys",  "kaja-callback-macro",+ "kaja-html-macro",  "serde",  "serde-wasm-bindgen 0.5.0",  "wasm-bindgen",diff --git a/examples/callbacks/src/lib.rs b/examples/callbacks/src/lib.rsindex f9838a3..4a67b7a 100644--- a/examples/callbacks/src/lib.rs+++ b/examples/callbacks/src/lib.rs@@ -1,11 +1,7 @@ #![cfg(target_arch = "wasm32")]-use gloo::console::log;-use kaja_callback_macro::callback;-use kaja_html_macro::html;-use kaja_web::*;+use kaja_web::prelude::*; use serde::Deserialize; use std::sync::RwLock;-use wasm_bindgen::prelude::*;  pub struct AppData {     current_count: isize,diff --git a/examples/clickcounter/src/lib.rs b/examples/clickcounter/src/lib.rsindex c840763..e900963 100644--- a/examples/clickcounter/src/lib.rs+++ b/examples/clickcounter/src/lib.rs@@ -1,10 +1,6 @@ #![cfg(target_arch = "wasm32")]-use gloo::console::log;-use kaja_callback_macro::callback;-use kaja_html_macro::html;-use kaja_web::*;+use kaja_web::prelude::*; use std::sync::RwLock;-use wasm_bindgen::prelude::*;  struct AppData {     current_count: isize,@@ -57,5 +53,6 @@ pub fn init() {      let mut app_data = APP_DATA.read().unwrap();     update_counter_display(&app_data);+     init_callbacks(); }diff --git a/src/lib.rs b/src/lib.rsindex cc62093..d23b337 100644--- a/src/lib.rs+++ b/src/lib.rs@@ -2,13 +2,15 @@ use gloo::console::log; use wasm_bindgen::JsCast; use web_sys::{Element, HtmlElement, NodeList}; +pub mod prelude;+ pub struct InitFn(pub fn()); inventory::collect!(InitFn);  #[derive(Debug, Clone, Copy)] pub struct Error; -type Result<T> = std::result::Result<T, Error>;+pub type Result<T> = std::result::Result<T, Error>;  pub struct JsCallItem {     pub name: &'static str,diff --git a/src/prelude.rs b/src/prelude.rsnew file mode 100644index 0000000..a434df6--- /dev/null+++ b/src/prelude.rs@@ -0,0 +1,14 @@+pub use crate::{+    get_element, get_elements, init_callbacks, inner_html, inner_text, node_list_to_vec,+    try_inner_html, try_inner_text, App, CallbackRegistration, Error, InitFn, JsCallItem, Result,+};++pub use gloo::console::log;+pub use serde_wasm_bindgen;++pub use wasm_bindgen::prelude::wasm_bindgen;+pub use wasm_bindgen::JsCast;+pub use wasm_bindgen::JsValue;++pub use kaja_callback_macro::callback;+pub use kaja_html_macro::html;