fix(napi): better error message for #[napi(catch_unwind)] (#1383)

Before, the JS error would only have `Any { .. }`
napi-rs · Dec 9, 2022 · 00b09bc · 00b09bc
1 parent e1864d6
commit 00b09bc
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/crates/backend/src/codegen/fn.rs b/crates/backend/src/codegen/fn.rs
@@ -140,7 +140,18 @@ impl TryToTokens for NapiFn {
       quote! {
         {
           std::panic::catch_unwind(|| { #function_call })
-            .map_err(|e| napi::Error::new(napi::Status::GenericFailure, format!("{:?}", e)))
+            .map_err(|e| {
+              let message = {
+                if let Some(string) = e.downcast_ref::<String>() {
+                  string.clone()
+                } else if let Some(string) = e.downcast_ref::<&str>() {
+                  string.to_string()
+                } else {
+                  format!("panic from Rust code: {:?}", e)
+                }
+              };
+              napi::Error::new(napi::Status::GenericFailure, message)
+            })
             .and_then(|r| r)
         }
       }