Merge branch 'main' into feat/resource

Cargo.toml

@@ -19,7 +19,7 @@ rust-version = "1.70"
 thiserror = "1.0.48"
 bitflags = { version = "2.4.0", features = ["serde"] }
 heck =  { version = "0.4", features = ["unicode"] }
-clap = { version = "4.4.2", features = ["derive"] }
+clap = { version = "4.4.3", features = ["derive"] }
 tauri-bindgen-core = { path = "crates/core" }
 tauri-bindgen-gen-host = { path = "crates/gen-host", features = ['cli'] }
 tauri-bindgen-gen-markdown = { path = "crates/gen-markdown", features = ['cli'] }
@@ -31,8 +31,8 @@ miette = { version = "5.10.0", features = ["fancy"] }
 log = { version = "0.4.20", features = [ "kv_unstable", "kv_unstable_std" ] }
 serde = "1.0.188"
 quote = "1.0.33"
-proc-macro2 = "1.0.66"
-syn = "2.0.31"
+proc-macro2 = "1.0.67"
+syn = "2.0.33"
 
 [dependencies]
 clap.workspace = true

crates/gen-guest-rust/Cargo.toml

@@ -20,7 +20,7 @@ log.workspace = true
 [dev-dependencies]
 wasm-bindgen = { version = "0.2.87", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4.37"
-serde-wasm-bindgen = "0.5.0"
+serde-wasm-bindgen = "0.6.0"
 js-sys = "0.3.64" 
 tauri-bindgen-guest-rust = { path = "../guest-rust" }
 serde = { version = "1.0.188", features = ["derive"] }

crates/wit-parser/src/lex.rs

@@ -38,16 +38,16 @@ fn block_comment(lex: &mut Lexer<Token>) -> FilterResult<(), Error> {
 #[derive(Logos, Debug, Copy, Clone, PartialEq, Eq, Hash)]
 #[logos(error = Error)]
 pub enum Token {
-    #[regex(r"[ \t\n\f]+", logos::skip)]
+    #[regex(r"[ \t\r\n\f]+", logos::skip)]
     Whitespace,
-    #[regex("(//[^\n]*)", logos::skip)]
+    #[regex("(//[^\r\n]*)", logos::skip)]
     Comment,
     #[regex(r#"/\*"#, |lex| match block_comment(lex) {
         FilterResult::Emit(_) => FilterResult::Skip,
         v => v
     })]
     BlockComment,
-    #[regex("(///[^\n]*)")]
+    #[regex("(///[^\r\n]*)")]
     DocComment,
     #[regex(r#"/\*\*"#, block_comment)]
     BlockDocComment,