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

fix(core): variadic opSync/opAsync (#14062)

This commit is contained in:
Aaron O'Mullan 2022-03-21 18:04:57 +01:00 committed by GitHub
parent b410937556
commit c5792d6d1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 4 deletions

View file

@ -152,9 +152,9 @@
return res;
}
function opAsync(opName, arg1 = null, arg2 = null) {
function opAsync(opName, ...args) {
const promiseId = nextPromiseId++;
const maybeError = ops[opName](opIds[opName], promiseId, arg1, arg2);
const maybeError = ops[opName](opIds[opName], promiseId, ...args);
// Handle sync error (e.g: error parsing args)
if (maybeError) return unwrapOpResult(maybeError);
let p = PromisePrototypeThen(setPromise(promiseId), unwrapOpResult);
@ -173,8 +173,8 @@
return p;
}
function opSync(opName, arg1, arg2) {
return unwrapOpResult(ops[opName](opIds[opName], arg1, arg2));
function opSync(opName, ...args) {
return unwrapOpResult(ops[opName](opIds[opName], ...args));
}
function refOp(promiseId) {

View file

@ -2874,4 +2874,28 @@ assertEquals(1, notify_return_value);
)
.is_err());
}
#[test]
fn test_op_high_arity() {
#[op]
fn op_add_4(
x1: i64,
x2: i64,
x3: i64,
x4: i64,
) -> Result<i64, anyhow::Error> {
Ok(x1 + x2 + x3 + x4)
}
let ext = Extension::builder().ops(vec![op_add_4::decl()]).build();
let mut runtime = JsRuntime::new(RuntimeOptions {
extensions: vec![ext],
..Default::default()
});
let r = runtime
.execute_script("test.js", "Deno.core.opSync('op_add_4', 1, 2, 3, 4)")
.unwrap();
let scope = &mut runtime.handle_scope();
assert_eq!(r.open(scope).integer_value(scope), Some(10));
}
}