Rebase with some minor fixes

boa-dev · Oct 27, 2022 · 2fc1d97 · 2fc1d97
1 parent ccedb40
commit 2fc1d97
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 49 deletions.
diff --git a/boa_engine/src/builtins/date/mod.rs b/boa_engine/src/builtins/date/mod.rs
@@ -13,7 +13,7 @@ use crate::{
     string::utf16,
     symbol::WellKnownSymbols,
     value::{JsValue, PreferredType},
-    Context, JsResult,
+    Context, JsError, JsResult,
 };
 use boa_profiler::Profiler;
 use chrono::{prelude::*, Duration, LocalResult};
@@ -48,7 +48,7 @@ fn ignore_ambiguity<T>(result: LocalResult<T>) -> Option<T> {
     }
 }
 
-#[derive(Debug, Finalize, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct Date(Option<NaiveDateTime>);
 
 impl Display for Date {
@@ -541,8 +541,12 @@ impl Date {
     ///
     /// [spec]: https://tc39.es/ecma262/#sec-date.prototype.getdate
     /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getDate
-    pub fn get_date(this: &JsValue, _args: &[JsValue], context: &mut Context) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+    pub fn get_date(
+        this: &JsValue,
+        _args: &[JsValue],
+        _context: &mut Context,
+    ) -> JsResult<JsValue> {
+        if let Some(t) = this_time_value(this)?.0 {
             let local = Local::now().timezone().from_utc_datetime(&t);
             Ok(JsValue::new(local.day()))
         } else {
@@ -561,8 +565,8 @@ impl Date {
     ///
     /// [spec]: https://tc39.es/ecma262/#sec-date.prototype.getday
     /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getDay
-    pub fn get_day(this: &JsValue, _args: &[JsValue], context: &mut Context) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+    pub fn get_day(this: &JsValue, _args: &[JsValue], _context: &mut Context) -> JsResult<JsValue> {
+        if let Some(t) = this_time_value(this)?.0 {
             let local = Local::now().timezone().from_utc_datetime(&t);
             Ok(JsValue::new(local.weekday().num_days_from_sunday()))
         } else {
@@ -583,9 +587,9 @@ impl Date {
     pub fn get_full_year(
         this: &JsValue,
         _args: &[JsValue],
-        context: &mut Context,
+        _context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             let local = Local::now().timezone().from_utc_datetime(&t);
             Ok(JsValue::new(local.year()))
         } else {
@@ -606,9 +610,9 @@ impl Date {
     pub fn get_hours(
         this: &JsValue,
         _args: &[JsValue],
-        context: &mut Context,
+        _context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             let local = Local::now().timezone().from_utc_datetime(&t);
             Ok(JsValue::new(local.hour()))
         } else {
@@ -629,9 +633,9 @@ impl Date {
     pub fn get_milliseconds(
         this: &JsValue,
         _args: &[JsValue],
-        context: &mut Context,
+        _context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             let local = Local::now().timezone().from_utc_datetime(&t);
             Ok(JsValue::new(local.timestamp_subsec_millis()))
         } else {
@@ -652,9 +656,9 @@ impl Date {
     pub fn get_minutes(
         this: &JsValue,
         _args: &[JsValue],
-        context: &mut Context,
+        _context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             let local = Local::now().timezone().from_utc_datetime(&t);
             Ok(JsValue::new(local.minute()))
         } else {
@@ -676,9 +680,9 @@ impl Date {
     pub fn get_month(
         this: &JsValue,
         _args: &[JsValue],
-        context: &mut Context,
+        _context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             let local = Local::now().timezone().from_utc_datetime(&t);
             Ok(JsValue::new(local.month0()))
         } else {
@@ -699,9 +703,9 @@ impl Date {
     pub fn get_seconds(
         this: &JsValue,
         _args: &[JsValue],
-        context: &mut Context,
+        _context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             let local = Local::now().timezone().from_utc_datetime(&t);
             Ok(JsValue::new(local.second()))
         } else {
@@ -722,7 +726,7 @@ impl Date {
     /// [spec]: https://tc39.es/ecma262/#sec-date.prototype.getyear
     /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getYear
     pub fn get_year(this: &JsValue, _args: &[JsValue], context: &mut Context) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             let local = Local::now().timezone().from_utc_datetime(&t);
             let year = JsValue::Integer(local.year());
             year.sub(&JsValue::from(1900), context)
@@ -741,8 +745,12 @@ impl Date {
     ///
     /// [spec]: https://tc39.es/ecma262/#sec-date.prototype.gettime
     /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getTime
-    pub fn get_time(this: &JsValue, _args: &[JsValue], context: &mut Context) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+    pub fn get_time(
+        this: &JsValue,
+        _args: &[JsValue],
+        _context: &mut Context,
+    ) -> JsResult<JsValue> {
+        if let Some(t) = this_time_value(this)?.0 {
             Ok(JsValue::new(t.timestamp_millis()))
         } else {
             Ok(JsValue::nan())
@@ -799,9 +807,9 @@ impl Date {
     pub fn get_utc_date(
         this: &JsValue,
         _args: &[JsValue],
-        context: &mut Context,
+        _context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             Ok(JsValue::new(t.day()))
         } else {
             Ok(JsValue::nan())
@@ -822,9 +830,9 @@ impl Date {
     pub fn get_utc_day(
         this: &JsValue,
         _args: &[JsValue],
-        context: &mut Context,
+        _context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             Ok(JsValue::new(t.weekday().num_days_from_sunday()))
         } else {
             Ok(JsValue::nan())
@@ -844,9 +852,9 @@ impl Date {
     pub fn get_utc_full_year(
         this: &JsValue,
         _args: &[JsValue],
-        context: &mut Context,
+        _context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             Ok(JsValue::new(t.year()))
         } else {
             Ok(JsValue::nan())
@@ -866,9 +874,9 @@ impl Date {
     pub fn get_utc_hours(
         this: &JsValue,
         _args: &[JsValue],
-        context: &mut Context,
+        _context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             Ok(JsValue::new(t.hour()))
         } else {
             Ok(JsValue::nan())
@@ -888,9 +896,9 @@ impl Date {
     pub fn get_utc_milliseconds(
         this: &JsValue,
         _args: &[JsValue],
-        context: &mut Context,
+        _context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             Ok(JsValue::new(t.timestamp_subsec_millis()))
         } else {
             Ok(JsValue::nan())
@@ -910,9 +918,9 @@ impl Date {
     pub fn get_utc_minutes(
         this: &JsValue,
         _args: &[JsValue],
-        context: &mut Context,
+        _context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             Ok(JsValue::new(t.minute()))
         } else {
             Ok(JsValue::nan())
@@ -933,9 +941,9 @@ impl Date {
     pub fn get_utc_month(
         this: &JsValue,
         _args: &[JsValue],
-        context: &mut Context,
+        _context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             Ok(JsValue::new(t.month0()))
         } else {
             Ok(JsValue::nan())
@@ -955,9 +963,9 @@ impl Date {
     pub fn get_utc_seconds(
         this: &JsValue,
         _args: &[JsValue],
-        context: &mut Context,
+        _context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             Ok(JsValue::new(t.second()))
         } else {
             Ok(JsValue::nan())
@@ -1782,7 +1790,7 @@ impl Date {
         _args: &[JsValue],
         _context: &mut Context,
     ) -> JsResult<JsValue> {
-        Err(JsValue::new("Function Unimplemented]"))
+        Err(JsError::from_opaque(JsValue::new("Function Unimplemented")))
     }
 
     /// `Date.prototype.toGMTString()`
@@ -1904,7 +1912,9 @@ impl Date {
         _: &[JsValue],
         _context: &mut Context,
     ) -> JsResult<JsValue> {
-        Err(JsValue::new("Function Unimplemented]"))
+        Err(JsError::from_opaque(JsValue::new(
+            "Function Unimplemented]",
+        )))
     }
 
     /// `Date.prototype.toTimeString()`
@@ -1955,7 +1965,9 @@ impl Date {
         _args: &[JsValue],
         _context: &mut Context,
     ) -> JsResult<JsValue> {
-        Err(JsValue::new("Function Unimplemented]"))
+        Err(JsError::from_opaque(JsValue::new(
+            "Function Unimplemented]",
+        )))
     }
 
     /// `Date.prototype.toUTCString()`
@@ -1973,11 +1985,11 @@ impl Date {
         _args: &[JsValue],
         context: &mut Context,
     ) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+        if let Some(t) = this_time_value(this)?.0 {
             let utc_string = t.format("%a, %d %b %Y %H:%M:%S GMT").to_string();
             Ok(JsValue::new(utc_string))
         } else {
-            context.throw_range_error("Invalid time value")
+            Ok(context.construct_error("Invalid time value"))
         }
     }
 
@@ -1991,8 +2003,12 @@ impl Date {
     ///
     /// [spec]: https://tc39.es/ecma262/#sec-date.prototype.valueof
     /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/valueOf
-    pub fn value_of(this: &JsValue, _args: &[JsValue], context: &mut Context) -> JsResult<JsValue> {
-        if let Some(t) = this_time_value(this, context)?.0 {
+    pub fn value_of(
+        this: &JsValue,
+        _args: &[JsValue],
+        _context: &mut Context,
+    ) -> JsResult<JsValue> {
+        if let Some(t) = this_time_value(this)?.0 {
             Ok(JsValue::new(t.timestamp_millis()))
         } else {
             Ok(JsValue::nan())
@@ -2108,7 +2124,7 @@ impl Date {
         let prototype = context.intrinsics().constructors().date().prototype();
         let date_time = DateTime::parse_from_rfc3339(&value.to_string(context).expect(
             "Utility: Date's string conversion used in limited(internal) area shouldn't fail",
-        ))
+        ).to_std_string().expect("Utility: Conversion of confirmed JsString to std string"))
         .expect("Utility: Parse RFC3339 is used in limited(internal) areas shouldn't fail");
         let internal_date = Date(Some(date_time.naive_local()));
         JsObject::from_proto_and_data(prototype, ObjectData::date(internal_date))

diff --git a/boa_engine/src/object/builtins/jsdate.rs b/boa_engine/src/object/builtins/jsdate.rs
@@ -15,9 +15,9 @@ use crate::{
 /// Create a `JsDate` object and set date to December 4 1995
 /// 
 /// ```
-/// use boa_engine::{object::JsDate, Context, JsValue};
+/// use boa_engine::{object::builtins::JsDate, Context, JsValue, JsResult};
 /// 
-/// fn main() -> Result<(), JsValue> {
+/// fn main() -> JsResult<()> {
 /// // JS mutable Context
 /// let context = &mut Context::default();
 /// 

diff --git a/boa_engine/src/object/builtins/mod.rs b/boa_engine/src/object/builtins/mod.rs
@@ -2,6 +2,7 @@
 
 mod jsarray;
 mod jsarraybuffer;
+mod jsdate;
 mod jsdataview;
 mod jsfunction;
 mod jsmap;
@@ -14,6 +15,7 @@ mod jstypedarray;
 
 pub use jsarray::*;
 pub use jsarraybuffer::*;
+pub use jsdate::*;
 pub use jsdataview::*;
 pub use jsfunction::*;
 pub use jsmap::*;

diff --git a/boa_examples/src/bin/jsdate.rs b/boa_examples/src/bin/jsdate.rs
@@ -1,6 +1,6 @@
-use boa_engine::{object::JsDate, Context, JsValue};
+use boa_engine::{object::builtins::JsDate, Context, JsValue, JsResult};
 
-fn main() -> Result<(), JsValue> {
+fn main() -> JsResult<()> {
     let context = &mut Context::default();
 
     let date = JsDate::new(context);