foster/denoland-deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-10-29 08:58:01 -04:00
Code Issues Wiki Activity

fix(ops): throw TypeError on op return failure (#14033)

Browse source 
Fixes #14028
This commit is contained in:
Aaron O'Mullan 2022-03-19 15:59:44 +01:00 committed by GitHub
parent 52a6e9ef4a
commit 52459faf0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/runtime.rs
View file

@ -2854,4 +2854,24 @@ assertEquals(1, notify_return_value);
assert_eq!(2, PROMISE_REJECT.load(Ordering::Relaxed));
assert_eq!(2, UNCAUGHT_EXCEPTION.load(Ordering::Relaxed));
}
#[test]
fn test_op_return_serde_v8_error() {
#[op]
fn op_err() -> Result<std::collections::BTreeMap<u64, u64>, anyhow::Error> {
Ok([(1, 2), (3, 4)].into_iter().collect()) // Maps can't have non-string keys in serde_v8
}
let ext = Extension::builder().ops(vec![op_err::decl()]).build();
let mut runtime = JsRuntime::new(RuntimeOptions {
extensions: vec![ext],
..Default::default()
});
assert!(runtime
.execute_script(
"test_op_return_serde_v8_error.js",
"Deno.core.opSync('op_err')"
)
.is_err());
}
}

9
ops/lib.rs
View file

@ -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)),
),
};
}
};