1 files changed, 42 insertions, 33 deletions

diff --git a/ext/web/lib.rs b/ext/web/lib.rs
index ebdb6b39e..f4789123b 100644
--- a/ext/web/lib.rs
+++ b/ext/web/lib.rs
@@ -11,6 +11,7 @@ use deno_core::error::range_error;
 use deno_core::error::type_error;
 use deno_core::error::AnyError;
 use deno_core::op;
+use deno_core::op2;
 use deno_core::serde_v8;
 use deno_core::url::Url;
 use deno_core::v8;
@@ -131,16 +132,18 @@ deno_core::extension!(deno_web,
   }
 );
 
-#[op]
-fn op_base64_decode(input: String) -> Result<ToJsBuffer, AnyError> {
+#[op2]
+#[serde]
+fn op_base64_decode(#[string] input: String) -> Result<ToJsBuffer, AnyError> {
   let mut s = input.into_bytes();
   let decoded_len = forgiving_base64_decode_inplace(&mut s)?;
   s.truncate(decoded_len);
   Ok(s.into())
 }
 
-#[op]
-fn op_base64_atob(mut s: ByteString) -> Result<ByteString, AnyError> {
+#[op2]
+#[serde]
+fn op_base64_atob(#[serde] mut s: ByteString) -> Result<ByteString, AnyError> {
   let decoded_len = forgiving_base64_decode_inplace(&mut s)?;
   s.truncate(decoded_len);
   Ok(s)
@@ -158,13 +161,15 @@ fn forgiving_base64_decode_inplace(
   Ok(decoded.len())
 }
 
-#[op]
-fn op_base64_encode(s: &[u8]) -> String {
+#[op2]
+#[string]
+fn op_base64_encode(#[buffer] s: &[u8]) -> String {
   forgiving_base64_encode(s)
 }
 
-#[op]
-fn op_base64_btoa(s: ByteString) -> String {
+#[op2]
+#[string]
+fn op_base64_btoa(#[serde] s: ByteString) -> String {
   forgiving_base64_encode(s.as_ref())
 }
 
@@ -174,8 +179,11 @@ fn forgiving_base64_encode(s: &[u8]) -> String {
   base64_simd::STANDARD.encode_to_string(s)
 }
 
-#[op]
-fn op_encoding_normalize_label(label: String) -> Result<String, AnyError> {
+#[op2]
+#[string]
+fn op_encoding_normalize_label(
+  #[string] label: String,
+) -> Result<String, AnyError> {
   let encoding = Encoding::for_label_no_replacement(label.as_bytes())
     .ok_or_else(|| {
       range_error(format!(
@@ -185,12 +193,12 @@ fn op_encoding_normalize_label(label: String) -> Result<String, AnyError> {
   Ok(encoding.name().to_lowercase())
 }
 
-#[op(v8)]
+#[op2]
 fn op_encoding_decode_utf8<'a>(
   scope: &mut v8::HandleScope<'a>,
-  zero_copy: &[u8],
+  #[anybuffer] zero_copy: &[u8],
   ignore_bom: bool,
-) -> Result<serde_v8::Value<'a>, AnyError> {
+) -> Result<v8::Local<'a, v8::String>, AnyError> {
   let buf = &zero_copy;
 
   let buf = if !ignore_bom
@@ -213,15 +221,16 @@ fn op_encoding_decode_utf8<'a>(
   // - https://github.com/denoland/deno/issues/6649
   // - https://github.com/v8/v8/blob/d68fb4733e39525f9ff0a9222107c02c28096e2a/include/v8.h#L3277-L3278
   match v8::String::new_from_utf8(scope, buf, v8::NewStringType::Normal) {
-    Some(text) => Ok(serde_v8::from_v8(scope, text.into())?),
+    Some(text) => Ok(text),
     None => Err(type_error("buffer exceeds maximum length")),
   }
 }
 
-#[op]
+#[op2]
+#[serde]
 fn op_encoding_decode_single(
-  data: &[u8],
-  label: String,
+  #[anybuffer] data: &[u8],
+  #[string] label: String,
   fatal: bool,
   ignore_bom: bool,
 ) -> Result<U16String, AnyError> {
@@ -271,10 +280,11 @@ fn op_encoding_decode_single(
   }
 }
 
-#[op]
+#[op2(fast)]
+#[smi]
 fn op_encoding_new_decoder(
   state: &mut OpState,
-  label: &str,
+  #[string] label: &str,
   fatal: bool,
   ignore_bom: bool,
 ) -> Result<ResourceId, AnyError> {
@@ -298,11 +308,12 @@ fn op_encoding_new_decoder(
   Ok(rid)
 }
 
-#[op]
+#[op2]
+#[serde]
 fn op_encoding_decode(
   state: &mut OpState,
-  data: &[u8],
-  rid: ResourceId,
+  #[anybuffer] data: &[u8],
+  #[smi] rid: ResourceId,
   stream: bool,
 ) -> Result<U16String, AnyError> {
   let resource = state.resource_table.get::<TextDecoderResource>(rid)?;
@@ -415,30 +426,28 @@ fn op_encoding_encode_into(
   out_buf[1] = boundary as u32;
 }
 
-#[op(v8)]
+#[op2]
 fn op_transfer_arraybuffer<'a>(
   scope: &mut v8::HandleScope<'a>,
-  input: serde_v8::Value<'a>,
-) -> Result<serde_v8::Value<'a>, AnyError> {
-  let ab = v8::Local::<v8::ArrayBuffer>::try_from(input.v8_value)?;
+  ab: &v8::ArrayBuffer,
+) -> Result<v8::Local<'a, v8::ArrayBuffer>, AnyError> {
   if !ab.is_detachable() {
     return Err(type_error("ArrayBuffer is not detachable"));
   }
   let bs = ab.get_backing_store();
   ab.detach(None);
-  let ab = v8::ArrayBuffer::with_backing_store(scope, &bs);
-  Ok(serde_v8::Value {
-    v8_value: ab.into(),
-  })
+  Ok(v8::ArrayBuffer::with_backing_store(scope, &bs))
 }
 
-#[op]
-fn op_encode_binary_string(s: &[u8]) -> ByteString {
+#[op2]
+#[serde]
+fn op_encode_binary_string(#[buffer] s: &[u8]) -> ByteString {
   ByteString::from(s)
 }
 
 /// Creates a [`CancelHandle`] resource that can be used to cancel invocations of certain ops.
-#[op(fast)]
+#[op2(fast)]
+#[smi]
 pub fn op_cancel_handle(state: &mut OpState) -> u32 {
   state.resource_table.add(CancelHandle::new())
 }