Abstracted out the to_string pattern

jstz-dev · Oct 26, 2023 · 95d7e59 · 95d7e59
1 parent a5fc971
commit 95d7e59
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 45 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,4 @@ node_modules/
 **/.vitepress/cache
 **/.vitepress/dist
 
-**/dist
-
-.vscode
+**/dist
diff --git a/jstz_api/src/url/mod.rs b/jstz_api/src/url/mod.rs
@@ -12,15 +12,15 @@ mod search_params;
 use std::{cmp::Ordering, ops::Deref};
 
 use boa_engine::{
-    builtins::object::Object as GlobalObject, js_string, object::Object,
-    property::Attribute, Context, JsArgs, JsError, JsNativeError, JsObject, JsResult,
-    JsValue, NativeFunction,
+    js_string, object::Object, property::Attribute, Context, JsArgs, JsError,
+    JsNativeError, JsObject, JsResult, JsValue, NativeFunction,
 };
 use boa_gc::{custom_trace, Finalize, GcRefMut, Trace};
 use jstz_core::{
     accessor,
     native::{
-        register_global_class, Accessor, ClassBuilder, JsNativeObject, NativeClass,
+        js_to_string, register_global_class, Accessor, ClassBuilder, JsNativeObject,
+        JsNativeObjectToString, NativeClass,
     },
     value::IntoJs,
 };
@@ -47,6 +47,15 @@ unsafe impl Trace for Url {
     });
 }
 
+impl JsNativeObjectToString for Url {
+    fn to_string(
+        this: &JsNativeObject<Self>,
+        context: &mut Context<'_>,
+    ) -> JsResult<JsValue> {
+        Ok(this.deref().href().into_js(context))
+    }
+}
+
 impl Url {
     fn parse_url(url: String, base: Option<String>) -> Option<InnerUrl> {
         let options = InnerUrl::options();
@@ -424,28 +433,12 @@ impl UrlClass {
         )
     }
 
-    fn to_string(
-        this: &JsValue,
-        _args: &[JsValue],
-        context: &mut Context<'_>,
-    ) -> JsResult<JsValue> {
-        Url::try_from_js(this)
-            .map(|url| url.href().into_js(context))
-            .or_else(|_| GlobalObject::to_string(this, _args, context))
-            .or_else(|_| {
-                Err(JsError::from_native(
-                    JsNativeError::typ()
-                        .with_message("Failed to convert `URL` into js string"),
-                ))
-            })
-    }
-
     fn to_json(
         this: &JsValue,
         args: &[JsValue],
         context: &mut Context<'_>,
     ) -> JsResult<JsValue> {
-        Self::to_string(this, args, context)
+        js_to_string::<Url>(this, args, context)
     }
 
     fn can_parse(
@@ -511,7 +504,7 @@ impl NativeClass for UrlClass {
             .method(
                 js_string!("toString"),
                 0,
-                NativeFunction::from_fn_ptr(UrlClass::to_string),
+                NativeFunction::from_fn_ptr(js_to_string::<Url>),
             )
             .method(
                 js_string!("toJSON"),

diff --git a/jstz_api/src/url/search_params.rs b/jstz_api/src/url/search_params.rs
@@ -1,7 +1,5 @@
 use boa_engine::{
-    builtins,
-    builtins::object::Object as GlobalObject,
-    js_string,
+    builtins, js_string,
     object::{builtins::JsArray, Object},
     property::Attribute,
     value::TryFromJs,
@@ -12,7 +10,8 @@ use boa_gc::{empty_trace, Finalize, GcRefMut, Trace};
 use jstz_core::{
     accessor,
     native::{
-        register_global_class, Accessor, ClassBuilder, JsNativeObject, NativeClass,
+        js_to_string, register_global_class, Accessor, ClassBuilder, JsNativeObject,
+        JsNativeObjectToString, NativeClass,
     },
     value::IntoJs,
 };
@@ -41,6 +40,15 @@ unsafe impl Trace for UrlSearchParams {
     empty_trace!();
 }
 
+impl JsNativeObjectToString for UrlSearchParams {
+    fn to_string(
+        this: &JsNativeObject<Self>,
+        context: &mut Context<'_>,
+    ) -> JsResult<JsValue> {
+        Ok(this.deref().to_string().into_js(context))
+    }
+}
+
 impl UrlSearchParams {
     pub(crate) fn set_values(&mut self, values: Vec<(Name, Value)>) {
         self.values = values
@@ -442,21 +450,6 @@ impl UrlSearchParamsClass {
 
         Ok(JsValue::undefined())
     }
-
-    fn to_string(
-        this: &JsValue,
-        _args: &[JsValue],
-        context: &mut Context<'_>,
-    ) -> JsResult<JsValue> {
-        UrlSearchParams::try_from_js(this)
-            .map(|search_params| search_params.to_string().into_js(context))
-            .or_else(|_| GlobalObject::to_string(this, _args, context))
-            .or_else(|_| {
-                Err(JsError::from_native(JsNativeError::typ().with_message(
-                    "Failed to convert `URLSearchParams` into js string",
-                )))
-            })
-    }
 }
 
 impl NativeClass for UrlSearchParamsClass {
@@ -518,7 +511,7 @@ impl NativeClass for UrlSearchParamsClass {
             .method(
                 js_string!("toString"),
                 0,
-                NativeFunction::from_fn_ptr(UrlSearchParamsClass::to_string),
+                NativeFunction::from_fn_ptr(js_to_string::<UrlSearchParams>),
             );
 
         Ok(())

diff --git a/jstz_core/src/native.rs b/jstz_core/src/native.rs
@@ -1,6 +1,7 @@
 use std::marker::PhantomData;
 
 use boa_engine::{
+    builtins::object::Object as GlobalObject,
     context::intrinsics::StandardConstructor,
     js_string,
     object::{
@@ -427,3 +428,22 @@ pub fn register_global_class<T: NativeClass>(context: &mut Context<'_>) -> JsRes
 
     Ok(())
 }
+
+pub trait JsNativeObjectToString: NativeObject + Sized {
+    fn to_string(
+        this: &JsNativeObject<Self>,
+        context: &mut Context<'_>,
+    ) -> JsResult<JsValue>;
+}
+
+pub fn js_to_string<T: JsNativeObjectToString>(
+    this: &JsValue,
+    args: &[JsValue],
+    context: &mut Context<'_>,
+) -> JsResult<JsValue> {
+    if let Ok(native_obj) = JsNativeObject::<T>::try_from(this.clone()) {
+        T::to_string(&native_obj, context)
+    } else {
+        GlobalObject::to_string(this, args, context)
+    }
+}