reuse Commands type and collect_commands! macro

Author: amrbashir

examples/tanstack-query/src-tauri/src/main.rs

@@ -147,10 +147,10 @@ fn delete_todo(state: tauri::State<AppStateMutex>, id: u32) -> Result<(), ApiErr
 
 fn main() {
     let builder = Builder::<tauri::Wry>::new()
-        .queries(tauri_specta::collect_queries![
+        .queries(tauri_specta::collect_commands![
             get_user, list_users, list_todos,
         ])
-        .mutations(tauri_specta::collect_mutations![
+        .mutations(tauri_specta::collect_commands![
             create_user,
             create_todo,
             delete_user,

src/builder.rs

@@ -6,7 +6,8 @@ use std::{
 };
 
 use crate::{
-    Commands, EventRegistry, Events, LanguageExt, Mutations, Queries, TanstackFramework,
+    Commands, EventRegistry, Events, LanguageExt, TanstackFramework,
+    commands::{Mutations, Queries},
     event::EventRegistryMeta,
 };
 use serde::Serialize;

src/commands.rs

@@ -12,6 +12,12 @@ pub struct Commands<R: Runtime>(
     pub(crate) fn(&mut Types) -> Vec<datatype::Function>,
 );
 
+/// A tanstack query type alias for `Commands`.
+pub type Queries<R> = Commands<R>;
+
+/// A tanstack mutation type alias for `Commands`.
+pub type Mutations<R> = Commands<R>;
+
 impl<R: Runtime> fmt::Debug for Commands<R> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Commands").finish()

src/lib.rs

@@ -186,13 +186,13 @@ mod commands;
 mod event;
 mod lang;
 mod macros;
-mod queries;
+mod tanstack;
 
 pub use builder::{Builder, BuilderConfiguration, ErrorHandlingMode};
 pub use commands::Commands;
 pub use event::{Event, Events, TypedEvent};
 pub use lang::LanguageExt;
-pub use queries::{Mutations, Queries, TanstackFramework};
+pub use tanstack::TanstackFramework;
 
 /// Implements the [`Event`](trait@crate::Event) trait for a struct.
 ///
@@ -231,28 +231,6 @@ pub mod internal {
         Commands(Arc::new(f), types)
     }
 
-    /// called by `collect_queries` to construct `Queries`
-    pub fn query<R: Runtime, F>(
-        f: F,
-        types: fn(&mut Types) -> Vec<datatype::Function>,
-    ) -> Queries<R>
-    where
-        F: Fn(Invoke<R>) -> bool + Send + Sync + 'static,
-    {
-        Queries(Arc::new(f), types)
-    }
-
-    /// called by `collect_mutations` to construct `Mutations`
-    pub fn mutation<R: Runtime, F>(
-        f: F,
-        types: fn(&mut Types) -> Vec<datatype::Function>,
-    ) -> Mutations<R>
-    where
-        F: Fn(Invoke<R>) -> bool + Send + Sync + 'static,
-    {
-        Mutations(Arc::new(f), types)
-    }
-
     /// called by `collect_events` to register events to an `Events`
     #[allow(clippy::panic)]
     pub fn register_event<E: Event>(Events(events): &mut Events) {

src/macros.rs

@@ -49,58 +49,6 @@ macro_rules! collect_commands {
     };
 }
 
-/// Collect queries for TanStack Query integration.
-///
-/// Like [`collect_commands!`] but marks functions as queries, generating
-/// `queryOptions` wrappers in TypeScript output.
-///
-/// # Usage
-/// ```rust,ignore
-/// use tauri_specta::{collect_queries, Builder};
-///
-/// #[tauri::command]
-/// #[specta::specta]
-/// fn get_user(id: u32) -> User { /* ... */ }
-///
-/// let builder = Builder::<tauri::Wry>::new()
-///     .queries(collect_queries![get_user]);
-/// ```
-#[macro_export]
-macro_rules! collect_queries {
-    ($($b:ident $(:: $($p:ident)? $(<$($g:path),*>)? )* ),* $(,)?) => {
-        $crate::internal::query(
-            ::tauri::generate_handler![$($b $($(::$p)? )* ),*],
-            ::specta::function::collect_functions![$($b $($(::$p)? $(::<$($g),*>)? )* ),*],
-        )
-    };
-}
-
-/// Collect mutations for TanStack Query integration.
-///
-/// Like [`collect_commands!`] but marks functions as mutations, generating
-/// `mutationOptions` wrappers in TypeScript output.
-///
-/// # Usage
-/// ```rust,ignore
-/// use tauri_specta::{collect_mutations, Builder};
-///
-/// #[tauri::command]
-/// #[specta::specta]
-/// fn create_user(name: String) -> User { /* ... */ }
-///
-/// let builder = Builder::<tauri::Wry>::new()
-///     .mutations(collect_mutations![create_user]);
-/// ```
-#[macro_export]
-macro_rules! collect_mutations {
-    ($($b:ident $(:: $($p:ident)? $(<$($g:path),*>)? )* ),* $(,)?) => {
-        $crate::internal::mutation(
-            ::tauri::generate_handler![$($b $($(::$p)? )* ),*],
-            ::specta::function::collect_functions![$($b $($(::$p)? $(::<$($g),*>)? )* ),*],
-        )
-    };
-}
-
 /// Collect events and their types.
 ///
 /// This returns a [`Events`](crate::Events) struct that can be passed to [`Builder::events`](crate::Builder::events).

src/queries.rs

@@ -0,0 +1,24 @@
+/// Which TanStack Query framework to target for imports.
+#[derive(Debug, Clone, Copy)]
+pub enum TanstackFramework {
+    /// `@tanstack/react-query`
+    React,
+    /// `@tanstack/solid-query`
+    Solid,
+    /// `@tanstack/vue-query`
+    Vue,
+    /// `@tanstack/svelte-query`
+    Svelte,
+}
+
+impl TanstackFramework {
+    /// Returns the npm package name for this framework.
+    pub fn package_name(&self) -> &'static str {
+        match self {
+            Self::React => "@tanstack/react-query",
+            Self::Solid => "@tanstack/solid-query",
+            Self::Vue => "@tanstack/vue-query",
+            Self::Svelte => "@tanstack/svelte-query",
+        }
+    }
+}