fix selection macro

src/selection.rs

@@ -1,72 +1,82 @@
-// #[macro_export]
-// macro_rules! selection {
-//     ( $s:expr, { $($n:ident),+ } ) => {{
-//         #[allow(non_camel_case_types)]
-//         mod selection {
-//             use $crate::Type;
-//             #[derive(serde::Serialize, Type)]
-//             #[specta(inline)]
-//             pub struct Selection<$($n,)*> {
-//                 $(pub $n: $n,)*
-//             }
-//         }
-//         use selection::Selection;
-//         #[allow(non_camel_case_types)]
-//         Selection { $($n: $s.$n,)* }
-//     }};
-//     ( $s:expr, [{ $($n:ident),+ }] ) => {{
-//         #[allow(non_camel_case_types)]
-//         mod selection {
-//             use $crate::Type;
-//             #[derive(serde::Serialize, Type)]
-//             #[specta(inline, crate = $crate)]
-//             pub struct Selection<$($n,)*> {
-//                 $(pub $n: $n,)*
-//             }
-//         }
-//         use selection::Selection;
-//         #[allow(non_camel_case_types)]
-//         $s.into_iter().map(|v| Selection { $($n: v.$n,)* }).collect::<Vec<_>>()
-//     }};
-// }
+#[macro_export]
+macro_rules! selection {
+    ( $s:expr, { $($n:ident),+ } ) => {{
+        #[allow(non_camel_case_types)]
+        mod selection {
+            // Due to macro expansion order `$crate` can't go in the Specta attribute but when hardcoding `rspc` macro hygiene get's angry.
+            // This hack is to avoid both issues.
+            mod _rspc {
+                pub use $crate::*;
+            }
 
-// #[cfg(test)]
-// mod tests {
-//     use specta::{ts::inline, Type};
+            #[derive(serde::Serialize, _rspc::Type)]
+            #[specta(inline, crate = "_rspc::internal::specta")]
+            pub struct Selection<$($n,)*> {
+                $(pub $n: $n),*
+            }
+        }
+        use selection::Selection;
+        #[allow(non_camel_case_types)]
+        Selection { $($n: $s.$n,)* }
+    }};
+    ( $s:expr, [{ $($n:ident),+ }] ) => {{
+        #[allow(non_camel_case_types)]
+        mod selection {
+            // Due to macro expansion order `$crate` can't go in the Specta attribute but when hardcoding `rspc` macro hygiene get's angry.
+            // This hack is to avoid both issues.
+            mod _rspc {
+                pub use $crate::*;
+            }
 
-//     fn ts_export_ref<T: Type>(_t: &T) -> String {
-//         inline::<T>(&Default::default()).unwrap()
-//     }
+            #[derive(serde::Serialize, _rspc::Type)]
+            #[specta(inline, crate = "_rspc::internal::specta")]
+            pub struct Selection<$($n,)*> {
+                $(pub $n: $n,)*
+            }
+        }
+        use selection::Selection;
+        #[allow(non_camel_case_types)]
+        $s.into_iter().map(|v| Selection { $($n: v.$n,)* }).collect::<Vec<_>>()
+    }};
+}
 
-//     #[derive(Clone)]
-//     #[allow(dead_code)]
-//     struct User {
-//         pub id: i32,
-//         pub name: String,
-//         pub email: String,
-//         pub age: i32,
-//         pub password: String,
-//     }
+#[cfg(test)]
+mod tests {
+    use specta::{ts::inline, Type};
 
-//     #[test]
-//     fn test_selection_macros() {
-//         let user = User {
-//             id: 1,
-//             name: "Monty Beaumont".into(),
-//             email: "[email protected]".into(),
-//             age: 7,
-//             password: "password123".into(),
-//         };
+    fn ts_export_ref<T: Type>(_t: &T) -> String {
+        inline::<T>(&Default::default()).unwrap()
+    }
 
-//         let s1 = selection!(user.clone(), { name, age });
-//         assert_eq!(s1.name, "Monty Beaumont".to_string());
-//         assert_eq!(s1.age, 7);
-//         assert_eq!(ts_export_ref(&s1), "{ name: string; age: number }");
+    #[derive(Clone)]
+    #[allow(dead_code)]
+    struct User {
+        pub id: i32,
+        pub name: String,
+        pub email: String,
+        pub age: i32,
+        pub password: String,
+    }
 
-//         let users = vec![user; 3];
-//         let s2 = selection!(users, [{ name, age }]);
-//         assert_eq!(s2[0].name, "Monty Beaumont".to_string());
-//         assert_eq!(s2[0].age, 7);
-//         assert_eq!(ts_export_ref(&s2), "{ name: string; age: number }[]");
-//     }
-// }
+    #[test]
+    fn test_selection_macros() {
+        let user = User {
+            id: 1,
+            name: "Monty Beaumont".into(),
+            email: "[email protected]".into(),
+            age: 7,
+            password: "password123".into(),
+        };
+
+        let s1 = selection!(user.clone(), { name, age });
+        assert_eq!(s1.name, "Monty Beaumont".to_string());
+        assert_eq!(s1.age, 7);
+        assert_eq!(ts_export_ref(&s1), "{ name: string; age: number }");
+
+        let users = vec![user; 3];
+        let s2 = selection!(users, [{ name, age }]);
+        assert_eq!(s2[0].name, "Monty Beaumont".to_string());
+        assert_eq!(s2[0].age, 7);
+        assert_eq!(ts_export_ref(&s2), "{ name: string; age: number }[]");
+    }
+}