fix(geo/haptics)!: specta version and feature flag (#2316)

plugins/haptics/src/commands.rs

@@ -7,13 +7,11 @@ use tauri::{command, AppHandle, Runtime};
 use crate::{HapticsExt, ImpactFeedbackStyle, NotificationFeedbackType, Result};
 
 #[command]
-#[specta::specta]
 pub(crate) async fn vibrate<R: Runtime>(app: AppHandle<R>, duration: u32) -> Result<()> {
     app.haptics().vibrate(duration)
 }
 
 #[command]
-#[specta::specta]
 pub(crate) async fn impact_feedback<R: Runtime>(
     app: AppHandle<R>,
     style: ImpactFeedbackStyle,
@@ -22,7 +20,6 @@ pub(crate) async fn impact_feedback<R: Runtime>(
 }
 
 #[command]
-#[specta::specta]
 pub(crate) async fn notification_feedback<R: Runtime>(
     app: AppHandle<R>,
     r#type: NotificationFeedbackType,
@@ -31,7 +28,6 @@ pub(crate) async fn notification_feedback<R: Runtime>(
 }
 
 #[command]
-#[specta::specta]
 pub(crate) async fn selection_feedback<R: Runtime>(app: AppHandle<R>) -> Result<()> {
     app.haptics().selection_feedback()
 }

plugins/haptics/src/error.rs

@@ -3,13 +3,13 @@
 // SPDX-License-Identifier: MIT
 
 use serde::{ser::Serializer, Serialize};
-use specta::Type;
 
 pub type Result<T> = std::result::Result<T, Error>;
 
 // TODO: Improve Error handling (different typed errors instead of one (stringified) PluginInvokeError for all mobile errors)
 
-#[derive(Debug, thiserror::Error, Type)]
+#[derive(Debug, thiserror::Error)]
+#[cfg_attr(feature = "specta", derive(specta::Type))]
 pub enum Error {
     #[cfg(mobile)]
     #[error(transparent)]

plugins/haptics/src/lib.rs

@@ -7,8 +7,6 @@ use tauri::{
     Manager, Runtime,
 };
 
-//use tauri_specta::*;
-
 pub use models::*;
 
 #[cfg(desktop)]
@@ -27,23 +25,6 @@ use desktop::Haptics;
 #[cfg(mobile)]
 use mobile::Haptics;
 
-/* macro_rules! specta_builder {
-    () => {
-        ts::builder()
-            .commands(collect_commands![
-                commands::vibrate,
-                commands::impact_feedback,
-                commands::notification_feedback,
-                commands::selection_feedback
-            ])
-            .header("// @ts-nocheck")
-            .config(
-                specta::ts::ExportConfig::default()
-                    .bigint(specta::ts::BigIntExportBehavior::Number),
-            )
-    };
-} */
-
 /// Extensions to [`tauri::App`], [`tauri::AppHandle`], [`tauri::WebviewWindow`], [`tauri::Webview`] and [`tauri::Window`] to access the haptics APIs.
 pub trait HapticsExt<R: Runtime> {
     fn haptics(&self) -> &Haptics<R>;
@@ -57,9 +38,6 @@ impl<R: Runtime, T: Manager<R>> crate::HapticsExt<R> for T {
 
 /// Initializes the plugin.
 pub fn init<R: Runtime>() -> TauriPlugin<R> {
-    /* let (invoke_handler, register_events) =
-    specta_builder!().build_plugin_utils("haptics").unwrap(); */
-
     Builder::new("haptics")
         .invoke_handler(tauri::generate_handler![
             commands::vibrate,
@@ -77,22 +55,3 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
         })
         .build()
 }
-
-/* #[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn export_types() {
-        specta_builder!()
-            .path("./guest-js/bindings.ts")
-            .config(
-                specta::ts::ExportConfig::default()
-                    .formatter(specta::ts::formatter::prettier)
-                    .bigint(specta::ts::BigIntExportBehavior::Number),
-            )
-            .export_for_plugin("haptics")
-            .expect("failed to export specta types");
-    }
-}
- */

plugins/haptics/src/models.rs

@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: MIT
 
 use serde::{Deserialize, Serialize};
-use specta::Type;
 /*
-#[derive(Debug, Clone, Default, Serialize, Deserialize, Type)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[cfg_attr(feature = "specta", derive(specta::Type))]
 #[serde(rename_all = "camelCase")]
 pub struct HapticsOptions {
     // TODO: support array to match web api
@@ -13,7 +13,8 @@ pub struct HapticsOptions {
 }
  */
 
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[cfg_attr(feature = "specta", derive(specta::Type))]
 #[serde(rename_all = "camelCase")]
 pub enum ImpactFeedbackStyle {
     Light,
@@ -24,7 +25,8 @@ pub enum ImpactFeedbackStyle {
     Rigid,
 }
 
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[cfg_attr(feature = "specta", derive(specta::Type))]
 #[serde(rename_all = "camelCase")]
 pub enum NotificationFeedbackType {
     #[default]