From 52459faf0b35ed157bb640d24c6107e1ff00aded Mon Sep 17 00:00:00 2001
From: Aaron O'Mullan <aaron.omullan@gmail.com>
Date: Sat, 19 Mar 2022 15:59:44 +0100
Subject: fix(ops): throw TypeError on op return failure (#14033)

Fixes #14028
---
 ops/lib.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'ops')

diff --git a/ops/lib.rs b/ops/lib.rs
index 49057507d..4a24b6e33 100644
--- a/ops/lib.rs
+++ b/ops/lib.rs
@@ -260,8 +260,13 @@ fn codegen_sync_ret(
     quote! {}
   } else {
     quote! {
-      let ret = #core::serde_v8::to_v8(scope, v).unwrap();
-      rv.set(ret);
+      match #core::serde_v8::to_v8(scope, v) {
+        Ok(ret) => rv.set(ret),
+        Err(err) => #core::_ops::throw_type_error(
+          scope,
+          format!("Error serializing return: {}", #core::anyhow::Error::from(err)),
+        ),
+      };
     }
   };
 
-- 
cgit v1.2.3