Handle raw function arguments property

macros/src/specta.rs

@@ -1,5 +1,8 @@
 // inspired by https://github.com/tauri-apps/tauri/blob/2901145c497299f033ba7120af5f2e7ead16c75a/core/tauri-macros/src/command/handler.rs
 
+use std::str::FromStr;
+
+use proc_macro2::TokenStream;
 use quote::{quote, ToTokens};
 use syn::{parse_macro_input, FnArg, ItemFn, Pat, Visibility};
 
@@ -39,16 +42,28 @@ pub fn attribute(item: proc_macro::TokenStream) -> syn::Result<proc_macro::Token
         None => false,
     };
 
-    let arg_names = function.sig.inputs.iter().map(|input| match input {
-        FnArg::Receiver(_) => unreachable!("Commands cannot take 'self'"),
-        FnArg::Typed(arg) => match &*arg.pat {
-            Pat::Ident(ident) => ident.ident.to_token_stream(),
-            Pat::Macro(m) => m.mac.tokens.to_token_stream(),
-            Pat::Struct(s) => s.path.to_token_stream(),
-            Pat::Slice(s) => s.attrs[0].to_token_stream(),
-            Pat::Tuple(s) => s.elems[0].to_token_stream(),
-            _ => unreachable!("Commands must take named arguments"),
-        },
+    let arg_names = function.sig.inputs.iter().map(|input| {
+        let arg = match input {
+            FnArg::Receiver(_) => unreachable!("Commands cannot take 'self'"),
+            FnArg::Typed(arg) => match &*arg.pat {
+                Pat::Ident(ident) => ident.ident.to_token_stream(),
+                Pat::Macro(m) => m.mac.tokens.to_token_stream(),
+                Pat::Struct(s) => s.path.to_token_stream(),
+                Pat::Slice(s) => s.attrs[0].to_token_stream(),
+                Pat::Tuple(s) => s.elems[0].to_token_stream(),
+                _ => unreachable!("Commands must take named arguments"),
+            },
+        };
+
+        let mut s = arg.to_string();
+
+        let s = if s.starts_with("r#") {
+            s.split_off(2)
+        } else {
+            s
+        };
+
+        TokenStream::from_str(&s).unwrap()
     });
 
     let arg_signatures = function.sig.inputs.iter().map(|_| quote!(_));

tests/functions.rs

@@ -90,6 +90,9 @@ mod test {
         pub fn nested() {}
     }
 
+    #[specta]
+    fn raw(r#type: i32) {}
+
     // TODO: Finish fixing these
 
     #[test]
@@ -319,5 +322,11 @@ mod test {
             assert_eq!(def.result, None);
             assert_eq!(def.docs, Cow::Borrowed(" Testing Doc Comment"));
         }
+
+        {
+            let mut type_map = &mut specta::TypeMap::default();
+            let def: function::FunctionDataType = specta::fn_datatype!(type_map; raw);
+            assert_eq!(def.args[0].0, "type");
+        }
     }
 }

tests/ts.rs

@@ -293,9 +293,9 @@ fn typescript_types() {
         ExportError::InvalidName(
             NamedLocation::Type,
             #[cfg(not(windows))]
-            ExportPath::new_unsafe("tests/ts.rs:619:10"),
+            ExportPath::new_unsafe("tests/ts.rs:630:10"),
             #[cfg(windows)]
-            ExportPath::new_unsafe("tests\ts.rs:619:10"),
+            ExportPath::new_unsafe("tests\ts.rs:630:10"),
             r#"@odata.context"#.to_string()
         )
     );
@@ -305,9 +305,9 @@ fn typescript_types() {
         ExportError::InvalidName(
             NamedLocation::Type,
             #[cfg(not(windows))]
-            ExportPath::new_unsafe("tests/ts.rs:623:10"),
+            ExportPath::new_unsafe("tests/ts.rs:634:10"),
             #[cfg(windows)]
-            ExportPath::new_unsafe("tests\ts.rs:623:10"),
+            ExportPath::new_unsafe("tests\ts.rs:634:10"),
             r#"@odata.context"#.to_string()
         )
     );