From c5792d6d1dcd2fe60e59e836015eac4f05a76039 Mon Sep 17 00:00:00 2001
From: Aaron O'Mullan <aaron.omullan@gmail.com>
Date: Mon, 21 Mar 2022 18:04:57 +0100
Subject: [PATCH] fix(core): variadic opSync/opAsync (#14062)

---
 core/01_core.js |  8 ++++----
 core/runtime.rs | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/core/01_core.js b/core/01_core.js
index eb57d273e7..b37f0a0d5f 100644
--- a/core/01_core.js
+++ b/core/01_core.js
@@ -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) {
diff --git a/core/runtime.rs b/core/runtime.rs
index 5b6ce39982..dc279de88a 100644
--- a/core/runtime.rs
+++ b/core/runtime.rs
@@ -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));
+  }
 }