Instant.prototype.round tests now passing

lockels · lockels · commit f9fbf3eb6de1 · 2025-11-19T23:32:56.000+01:00
diff --git a/nova_vm/src/ecmascript/builtins/temporal.rs b/nova_vm/src/ecmascript/builtins/temporal.rs
@@ -8,13 +8,13 @@ pub mod instant;
 pub mod options;
 pub mod plain_time;
 
-use temporal_rs::options::{DifferenceSettings, RoundingMode, Unit, UnitGroup};
+use temporal_rs::options::{DifferenceSettings, RoundingIncrement, RoundingMode, Unit, UnitGroup};
 
 use crate::{
     ecmascript::{
         builders::ordinary_object_builder::OrdinaryObjectBuilder,
         builtins::temporal::{
-            instant::instant_prototype::{DefaultOption, get_temporal_unit_valued_option},
+            instant::instant_prototype::get_temporal_unit_valued_option,
             options::{get_rounding_increment_option, get_rounding_mode_option},
         },
         execution::{Agent, JsResult, Realm},
@@ -81,6 +81,8 @@ impl Temporal {
 trivially_bindable!(DifferenceSettings);
 trivially_bindable!(UnitGroup);
 trivially_bindable!(Unit);
+trivially_bindable!(RoundingMode);
+trivially_bindable!(RoundingIncrement);
 
 /// [13.42 GetDifferenceSettings ( operation, options, unitGroup, disallowedUnits, fallbackSmallestUnit, smallestLargestDefaultUnit )](https://tc39.es/proposal-temporal/#sec-temporal-getdifferencesettings)
 /// The abstract operation GetDifferenceSettings takes arguments operation (since or until),
@@ -111,7 +113,6 @@ pub(crate) fn get_difference_settings<'gc, const IS_UNTIL: bool>(
         agent,
         options.get(agent),
         BUILTIN_STRING_MEMORY.largestUnit.to_property_key(),
-        DefaultOption::Unset,
         gc.reborrow(),
     )
     .unbind()?
@@ -135,7 +136,6 @@ pub(crate) fn get_difference_settings<'gc, const IS_UNTIL: bool>(
         agent,
         options.get(agent),
         BUILTIN_STRING_MEMORY.smallestUnit.to_property_key(),
-        DefaultOption::Unset,
         gc.reborrow(),
     )
     .unbind()?
@@ -157,8 +157,8 @@ pub(crate) fn get_difference_settings<'gc, const IS_UNTIL: bool>(
     // 17. If maximum is not unset, perform ? ValidateTemporalRoundingIncrement(roundingIncrement, maximum, false).
     // 18. Return the Record { [[SmallestUnit]]: smallestUnit, [[LargestUnit]]: largestUnit, [[RoundingMode]]: roundingMode, [[RoundingIncrement]]: roundingIncrement,  }.
     let mut diff_settings = temporal_rs::options::DifferenceSettings::default();
-    diff_settings.largest_unit = Some(largest_unit);
-    diff_settings.smallest_unit = Some(smallest_unit);
+    diff_settings.largest_unit = largest_unit;
+    diff_settings.smallest_unit = smallest_unit;
     diff_settings.rounding_mode = Some(rounding_mode);
     diff_settings.increment = Some(rounding_increment);
     Ok(diff_settings)
diff --git a/nova_vm/src/ecmascript/builtins/temporal/instant/instant_prototype.rs b/nova_vm/src/ecmascript/builtins/temporal/instant/instant_prototype.rs
@@ -1,5 +1,3 @@
-use std::str::FromStr;
-
 use temporal_rs::options::{RoundingMode, RoundingOptions, Unit};
 
 use crate::{
@@ -18,7 +16,7 @@ use crate::{
                     require_internal_slot_temporal_instant, to_temporal_instant,
                 },
                 options::{
-                    OptionType, get_option, get_options_object, get_rounding_increment_option,
+                    get_option, get_options_object, get_rounding_increment_option,
                     get_rounding_mode_option,
                 },
             },
@@ -30,7 +28,7 @@ use crate::{
         types::{BUILTIN_STRING_MEMORY, BigInt, IntoValue, Object, PropertyKey, String, Value},
     },
     engine::{
-        context::{Bindable, GcScope, NoGcScope, trivially_bindable},
+        context::{Bindable, GcScope, NoGcScope},
         rootable::Scopable,
     },
     heap::WellKnownSymbolIndexes,
@@ -298,7 +296,7 @@ impl TemporalInstantPrototype {
         }
 
         // 4. If roundTo is a String, then
-        let round_to = if let Value::String(round_to) = round_to.unbind() {
+        let round_to = if round_to.unbind().is_string() {
             // a. Let paramString be roundTo.
             let param_string = round_to;
             // b. Set roundTo to OrdinaryObjectCreate(null).
@@ -319,17 +317,21 @@ impl TemporalInstantPrototype {
                 .unbind()?
                 .bind(gc.nogc())
         };
+
         let round_to = round_to.scope(agent, gc.nogc());
+
         // 6. NOTE: The following steps read options and perform independent validation in
         //    alphabetical order (GetRoundingIncrementOption reads "roundingIncrement" and
         //    GetRoundingModeOption reads "roundingMode").
         let mut options = RoundingOptions::default();
+
         // 7. Let roundingIncrement be ? GetRoundingIncrementOption(roundTo).
         let rounding_increment =
             get_rounding_increment_option(agent, round_to.get(agent), gc.reborrow())
                 .unbind()?
                 .bind(gc.nogc());
         options.increment = Some(rounding_increment);
+
         // 8. Let roundingMode be ? GetRoundingModeOption(roundTo, half-expand).
         let rounding_mode = get_rounding_mode_option(
             agent,
@@ -340,17 +342,18 @@ impl TemporalInstantPrototype {
         .unbind()?
         .bind(gc.nogc());
         options.rounding_mode = Some(rounding_mode);
+
         // 9. Let smallestUnit be ? GetTemporalUnitValuedOption(roundTo, "smallestUnit", required).
         let smallest_unit = get_temporal_unit_valued_option(
             agent,
             round_to.get(agent),
             BUILTIN_STRING_MEMORY.smallestUnit.into(),
-            DefaultOption::Required,
             gc.reborrow(),
         )
         .unbind()?
         .bind(gc.nogc());
-        options.smallest_unit = Some(smallest_unit);
+        options.smallest_unit = smallest_unit;
+
         // 10. Perform ? ValidateTemporalUnitValue(smallestUnit, time).
         // 11. If smallestUnit is hour, then
         //     a. Let maximum be HoursPerDay.
@@ -521,7 +524,7 @@ pub(crate) fn to_integer_with_truncation<'gc>(
     // 2. If number is NaN, +∞𝔽 or -∞𝔽, throw a RangeError exception.
     if number.is_nan(agent) || number.is_pos_infinity(agent) || number.is_neg_infinity(agent) {
         return Err(agent.throw_exception_with_static_message(
-            ExceptionType::TypeError,
+            ExceptionType::RangeError,
             "Number cannot be NaN, positive infinity, or negative infinity",
             gc.into_nogc(),
         ));
@@ -541,74 +544,12 @@ pub(crate) fn get_temporal_unit_valued_option<'gc>(
     agent: &mut Agent,
     options: Object,
     key: PropertyKey,
-    default: DefaultOption,
-    mut gc: GcScope<'gc, '_>,
-) -> JsResult<'gc, Unit> {
+    gc: GcScope<'gc, '_>,
+) -> JsResult<'gc, Option<Unit>> {
     let options = options.bind(gc.nogc());
-    let default = default.bind(gc.nogc());
     let key = key.bind(gc.nogc());
-    // 1. Let allowedStrings be a List containing all values in the "Singular property name" and
-    //    "Plural property name" columns of Table 21, except the header row.
-    const ALLOWED: &[&str] = &[
-        "year",
-        "years",
-        "month",
-        "months",
-        "week",
-        "weeks",
-        "day",
-        "days,",
-        "hour",
-        "hours",
-        "minute",
-        "minutes",
-        "second",
-        "seconds",
-        "millisecond",
-        "milliseconds",
-        "microsecond",
-        "microseconds",
-        "nanosecond",
-        "nanoseconds",
-        "auto",
-    ];
-    // 2. Append "auto" to allowedStrings.
-    // 3. NOTE: For each singular Temporal unit name that is contained within allowedStrings, the
-    //    corresponding plural name is also contained within it.
-    // 4. If default is unset, then
-    //    a. Let defaultValue be undefined.
-    // 5. Else,
-    //    a. Let defaultValue be default.
-    // 6. Let value be ? GetOption(options, key, string, allowedStrings, defaultValue).
-    let string_value = get_option(
-        agent,
-        options.unbind(),
-        key.unbind(),
-        OptionType::String,
-        ALLOWED,
-        gc.reborrow(),
-    )
-    .unbind()?
-    .bind(gc.nogc());
-
-    let js_str = string_value
-        .unbind()
-        .to_string(agent, gc.reborrow())
-        .unbind()?
-        .bind(gc.nogc());
 
-    let rust_str = js_str.as_str(agent).expect("aaa");
-    // 7. If value is undefined, return unset.
-    // 8. If value is "auto", return auto.
-    // 9. Return the value in the "Value" column of Table 21 corresponding to the row with value in
-    //    its "Singular property name" or "Plural property name" column.
-    Ok(Unit::from_str(rust_str).unwrap())
-}
+    let opt = get_option::<Unit>(agent, options.unbind(), key.unbind(), gc)?;
 
-#[allow(dead_code)]
-pub(crate) enum DefaultOption {
-    Required,
-    Unset,
+    Ok(opt)
 }
-
-trivially_bindable!(DefaultOption);
diff --git a/nova_vm/src/ecmascript/builtins/temporal/options.rs b/nova_vm/src/ecmascript/builtins/temporal/options.rs
