Add back unraw's.

specta-rs · Jul 31, 2024 · b5deb39 · b5deb39
1 parent ed72657
commit b5deb39
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/js.rs b/src/js.rs
@@ -1,6 +1,7 @@
 use crate::*;
 use heck::ToLowerCamelCase;
 use indoc::formatdoc;
+use js_ts::unraw;
 use specta::{datatype, FunctionResultVariant};
 use specta_typescript as ts;
 use specta_typescript::js_doc;
@@ -56,7 +57,7 @@ impl ExportLanguage for Language {
                             type_map,
                         )
                         .map(|typ| {
-                            let name = name.to_lower_camel_case();
+                            let name = unraw(name).to_lower_camel_case();
 
                             format!("@param {{ {typ} }} {name}")
                         })

diff --git a/src/js_ts.rs b/src/js_ts.rs
@@ -77,9 +77,17 @@ pub fn render_all_parts<T: ExportLanguage<Config = specta_typescript::ExportConf
     })
 }
 
+pub fn unraw(s: &str) -> &str {
+    if s.starts_with("r#") {
+        s.split_at(2).1
+    } else {
+        s.as_ref()
+    }
+}
+
 pub fn arg_names(args: &[(Cow<'static, str>, DataType)]) -> Vec<String> {
     args.iter()
-        .map(|(name, _)| name.to_lower_camel_case())
+        .map(|(name, _)| unraw(name).to_lower_camel_case())
         .collect::<Vec<_>>()
 }
 

diff --git a/src/ts.rs b/src/ts.rs
@@ -1,3 +1,4 @@
+use crate::js_ts::unraw;
 use crate::{js_ts, *};
 use heck::ToLowerCamelCase;
 use indoc::formatdoc;
@@ -43,7 +44,7 @@ impl ExportLanguage for Language {
                             &FunctionResultVariant::Value(typ.clone()),
                             type_map,
                         )
-                        .map(|ty| format!("{}: {}", name.to_lower_camel_case(), ty))
+                        .map(|ty| format!("{}: {}", unraw(name).to_lower_camel_case(), ty))
                     })
                     .collect::<Result<Vec<_>, _>>()?;