Bump Specta & fix trailing comma's

Author: oscartbeaumont

Cargo.lock

@@ -62,9 +62,9 @@ panic_in_result_fn = { level = "warn", priority = -1 }
 
 [workspace.dependencies]
 tauri = { version = "=2.0.0-rc.0" }
-specta = { version = "=2.0.0-rc.19" }
-specta-typescript = { version = "0.0.6" }
-specta-jsdoc = { version = "0.0.6" }
+specta = { version = "=2.0.0-rc.20" }
+specta-typescript = { version = "0.0.7" }
+specta-jsdoc = { version = "0.0.7" }
 
 # [patch.crates-io]
 # tauri = { git = "https://github.com/oscartbeaumont/tauri.git", rev = "ddc64b706a7f2db271d40e9b216187b1aa153efa" }

Cargo.toml

@@ -125,7 +125,7 @@ fn main() {
             generic::<tauri::Wry>,
             deprecated,
             typesafe_errors_using_thiserror,
-            typesafe_errors_using_thiserror_with_value
+            typesafe_errors_using_thiserror_with_value,
         ])
         .events(tauri_specta::collect_events![crate::DemoEvent, EmptyEvent])
         .ty::<Custom>()

examples/app/src-tauri/src/main.rs

@@ -14,14 +14,14 @@
 //!
 //! ```sh
 //! # Always required
-//! cargo add tauri@=2.0.0-rc.0 specta@=2.0.0-rc.19
+//! cargo add tauri@=2.0.0-rc.0 specta@=2.0.0-rc.20
 //!
 //! # Typescript
-//! cargo add specta-typescript@0.0.6
+//! cargo add specta-typescript@0.0.7
 //! cargo add tauri-specta@=2.0.0-rc.12 --features derive,typescript
 //!
 //! # JSDoc
-//! cargo add specta-jsdoc@0.0.6
+//! cargo add specta-jsdoc@0.0.7
 //! cargo add tauri-specta@=2.0.0-rc.12 --features derive,javascript
 //! ```
 //!

src/lib.rs

@@ -13,11 +13,11 @@
 ///
 #[macro_export]
 macro_rules! collect_commands {
-    ($($b:tt $(:: $($p:ident)? $(<$g:path>)? )* ),*) => {
+    ($($b:ident $(:: $($p:ident)? $(<$($g:path),*>)? )* ),* $(,)?) => {
         // We strip generics (::<...>) from being parsed to Tauri as it doesn't support them.
         $crate::internal::command(
             ::tauri::generate_handler![$($b $($(::$p)? )* ),*],
-            ::specta::function::collect_functions![$($b $($(::$p)? $(::<$g>)? )* ),*],
+            ::specta::function::collect_functions![$($b $($(::$p)? $(::<$($g),*>)? )* ),*],
         )
     };
 }