feat(runtime/ops): strongly typed deserialization of JSON ops (#9532)

2 files changed, 28 insertions, 17 deletions

diff --git a/runtime/ops/mod.rs b/runtime/ops/mod.rs
index 0da4b9771..3ead7efa2 100644
--- a/runtime/ops/mod.rs
+++ b/runtime/ops/mod.rs
@@ -28,7 +28,8 @@ use crate::metrics::metrics_op;
 use deno_core::error::AnyError;
 use deno_core::json_op_async;
 use deno_core::json_op_sync;
-use deno_core::serde_json::Value;
+use deno_core::serde::de::DeserializeOwned;
+use deno_core::serde::Serialize;
 use deno_core::BufVec;
 use deno_core::JsRuntime;
 use deno_core::OpState;
@@ -37,18 +38,24 @@ use std::cell::RefCell;
 use std::future::Future;
 use std::rc::Rc;
 
-pub fn reg_json_async<F, R>(rt: &mut JsRuntime, name: &'static str, op_fn: F)
-where
-  F: Fn(Rc<RefCell<OpState>>, Value, BufVec) -> R + 'static,
-  R: Future<Output = Result<Value, AnyError>> + 'static,
+pub fn reg_json_async<F, V, R, RV>(
+  rt: &mut JsRuntime,
+  name: &'static str,
+  op_fn: F,
+) where
+  F: Fn(Rc<RefCell<OpState>>, V, BufVec) -> R + 'static,
+  V: DeserializeOwned,
+  R: Future<Output = Result<RV, AnyError>> + 'static,
+  RV: Serialize,
 {
   rt.register_op(name, metrics_op(json_op_async(op_fn)));
 }
 
-pub fn reg_json_sync<F>(rt: &mut JsRuntime, name: &'static str, op_fn: F)
+pub fn reg_json_sync<F, V, R>(rt: &mut JsRuntime, name: &'static str, op_fn: F)
 where
-  F: Fn(&mut OpState, Value, &mut [ZeroCopyBuf]) -> Result<Value, AnyError>
-    + 'static,
+  F: Fn(&mut OpState, V, &mut [ZeroCopyBuf]) -> Result<R, AnyError> + 'static,
+  V: DeserializeOwned,
+  R: Serialize,
 {
   rt.register_op(name, metrics_op(json_op_sync(op_fn)));
 }
diff --git a/runtime/ops/web_worker.rs b/runtime/ops/web_worker.rs
index aeaece89e..17561882e 100644
--- a/runtime/ops/web_worker.rs
+++ b/runtime/ops/web_worker.rs
@@ -3,7 +3,7 @@
 use crate::web_worker::WebWorkerHandle;
 use crate::web_worker::WorkerEvent;
 use deno_core::futures::channel::mpsc;
-use deno_core::serde_json::json;
+use deno_core::serde_json::{json, Value};
 
 pub fn init(
   rt: &mut deno_core::JsRuntime,
@@ -15,7 +15,7 @@ pub fn init(
   super::reg_json_sync(
     rt,
     "op_worker_post_message",
-    move |_state, _args, bufs| {
+    move |_state, _args: Value, bufs| {
       assert_eq!(bufs.len(), 1, "Invalid number of arguments");
       let msg_buf: Box<[u8]> = (*bufs[0]).into();
       sender_
@@ -27,11 +27,15 @@ pub fn init(
   );
 
   // Notify host that guest worker closes.
-  super::reg_json_sync(rt, "op_worker_close", move |_state, _args, _bufs| {
-    // Notify parent that we're finished
-    sender.clone().close_channel();
-    // Terminate execution of current worker
-    handle.terminate();
-    Ok(json!({}))
-  });
+  super::reg_json_sync(
+    rt,
+    "op_worker_close",
+    move |_state, _args: Value, _bufs| {
+      // Notify parent that we're finished
+      sender.clone().close_channel();
+      // Terminate execution of current worker
+      handle.terminate();
+      Ok(json!({}))
+    },
+  );
 }