Move KV test suite to worker-sandbox and fix bug in KV put metadata. (#550)

* Move worker-kv test suite to worker-sandbox

* Create explicit struct for KV PutOptions

* Use JSON serializer for KV options

Author: kflansburg

Cargo.lock

@@ -1,30 +1,34 @@
 use js_sys::{ArrayBuffer, Function, Object, Promise, Uint8Array};
 use serde::{de::DeserializeOwned, Serialize};
 use serde_json::Value;
+use serde_wasm_bindgen::Serializer;
 use wasm_bindgen::{JsCast, JsValue};
 use wasm_bindgen_futures::JsFuture;
 
 use crate::{KvError, ListResponse};
 
 /// A builder to configure put requests.
-#[derive(Debug, Clone, Serialize)]
+#[derive(Debug, Clone)]
 #[must_use = "PutOptionsBuilder does nothing until you 'execute' it"]
 pub struct PutOptionsBuilder {
-    #[serde(skip)]
     pub(crate) this: Object,
-    #[serde(skip)]
     pub(crate) put_function: Function,
-    #[serde(skip)]
     pub(crate) name: JsValue,
-    #[serde(skip)]
     pub(crate) value: JsValue,
-    #[serde(skip_serializing_if = "Option::is_none")]
     pub(crate) expiration: Option<u64>,
+    pub(crate) expiration_ttl: Option<u64>,
+    pub(crate) metadata: Option<Value>,
+}
+
+#[derive(Serialize)]
+struct PutOptions {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    expiration: Option<u64>,
     #[serde(skip_serializing_if = "Option::is_none")]
     #[serde(rename = "expirationTtl")]
-    pub(crate) expiration_ttl: Option<u64>,
+    expiration_ttl: Option<u64>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub(crate) metadata: Option<Value>,
+    metadata: Option<Value>,
 }
 
 impl PutOptionsBuilder {
@@ -46,7 +50,15 @@ impl PutOptionsBuilder {
     }
     /// Puts the value in the kv store.
     pub async fn execute(self) -> Result<(), KvError> {
-        let options_object = serde_wasm_bindgen::to_value(&self).map_err(JsValue::from)?;
+        let ser = Serializer::json_compatible();
+        let options_object = PutOptions {
+            expiration: self.expiration,
+            expiration_ttl: self.expiration_ttl,
+            metadata: self.metadata,
+        }
+        .serialize(&ser)
+        .map_err(JsValue::from)?;
+
         let promise: Promise = self
             .put_function
             .call3(&self.this, &self.name, &self.value, &options_object)?
@@ -59,13 +71,18 @@ impl PutOptionsBuilder {
 }
 
 /// A builder to configure list requests.
-#[derive(Debug, Clone, Serialize)]
+#[derive(Debug, Clone)]
 #[must_use = "ListOptionsBuilder does nothing until you 'execute' it"]
 pub struct ListOptionsBuilder {
-    #[serde(skip)]
     pub(crate) this: Object,
-    #[serde(skip)]
     pub(crate) list_function: Function,
+    pub(crate) limit: Option<u64>,
+    pub(crate) cursor: Option<String>,
+    pub(crate) prefix: Option<String>,
+}
+
+#[derive(Serialize)]
+struct ListOptions {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub(crate) limit: Option<u64>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -93,7 +110,15 @@ impl ListOptionsBuilder {
     }
     /// Lists the key value pairs in the kv store.
     pub async fn execute(self) -> Result<ListResponse, KvError> {
-        let options_object = serde_wasm_bindgen::to_value(&self).map_err(JsValue::from)?;
+        let ser = Serializer::json_compatible();
+        let options_object = ListOptions {
+            limit: self.limit,
+            cursor: self.cursor,
+            prefix: self.prefix,
+        }
+        .serialize(&ser)
+        .map_err(JsValue::from)?;
+
         let promise: Promise = self
             .list_function
             .call1(&self.this, &options_object)?
@@ -106,17 +131,19 @@ impl ListOptionsBuilder {
 }
 
 /// A builder to configure get requests.
-#[derive(Debug, Clone, Serialize)]
+#[derive(Debug, Clone)]
 #[must_use = "GetOptionsBuilder does nothing until you 'get' it"]
 pub struct GetOptionsBuilder {
-    #[serde(skip)]
     pub(crate) this: Object,
-    #[serde(skip)]
     pub(crate) get_function: Function,
-    #[serde(skip)]
     pub(crate) get_with_meta_function: Function,
-    #[serde(skip)]
     pub(crate) name: JsValue,
+    pub(crate) cache_ttl: Option<u64>,
+    pub(crate) value_type: Option<GetValueType>,
+}
+
+#[derive(Serialize)]
+struct GetOptions {
     #[serde(rename = "cacheTtl", skip_serializing_if = "Option::is_none")]
     pub(crate) cache_ttl: Option<u64>,
     #[serde(rename = "type", skip_serializing_if = "Option::is_none")]
@@ -141,8 +168,19 @@ impl GetOptionsBuilder {
         self
     }
 
+    fn options(&self) -> Result<JsValue, KvError> {
+        let ser = Serializer::json_compatible();
+        Ok(GetOptions {
+            cache_ttl: self.cache_ttl,
+            value_type: self.value_type,
+        }
+        .serialize(&ser)
+        .map_err(JsValue::from)?)
+    }
+
     async fn get(self) -> Result<JsValue, KvError> {
-        let options_object = serde_wasm_bindgen::to_value(&self).map_err(JsValue::from)?;
+        let options_object = self.options()?;
+
         let promise: Promise = self
             .get_function
             .call2(&self.this, &self.name, &options_object)?
@@ -185,7 +223,8 @@ impl GetOptionsBuilder {
     where
         M: DeserializeOwned,
     {
-        let options_object = serde_wasm_bindgen::to_value(&self).map_err(JsValue::from)?;
+        let options_object = self.options()?;
+
         let promise: Promise = self
             .get_with_meta_function
             .call2(&self.this, &self.name, &options_object)?
@@ -257,7 +296,7 @@ impl GetOptionsBuilder {
     }
 }
 
-#[derive(Debug, Clone, Serialize)]
+#[derive(Debug, Clone, Serialize, Copy)]
 #[serde(rename_all = "camelCase")]
 pub(crate) enum GetValueType {
     Text,