From 5f5bcd549e2690e9cd040a1194faa77ed34a4403 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Fri, 14 Jan 2022 12:01:05 -0500 Subject: [PATCH] LibJS: Sort Date.prototype methods by spec order When viewing the code side-by-side with the spec, it's much nicer when everything is in the same order. Also fixes the spec link for Date.prototype.getMilliseconds (it pointed at setMilliseconds by mistake). --- .../Libraries/LibJS/Runtime/DatePrototype.cpp | 822 +++++++++--------- .../Libraries/LibJS/Runtime/DatePrototype.h | 30 +- 2 files changed, 429 insertions(+), 423 deletions(-) diff --git a/Userland/Libraries/LibJS/Runtime/DatePrototype.cpp b/Userland/Libraries/LibJS/Runtime/DatePrototype.cpp index 826143b5f7..1f9db3c1ef 100644 --- a/Userland/Libraries/LibJS/Runtime/DatePrototype.cpp +++ b/Userland/Libraries/LibJS/Runtime/DatePrototype.cpp @@ -35,50 +35,51 @@ void DatePrototype::initialize(GlobalObject& global_object) Object::initialize(global_object); u8 attr = Attribute::Writable | Attribute::Configurable; define_native_function(vm.names.getDate, get_date, 0, attr); - define_native_function(vm.names.setDate, set_date, 1, attr); define_native_function(vm.names.getDay, get_day, 0, attr); define_native_function(vm.names.getFullYear, get_full_year, 0, attr); - define_native_function(vm.names.setFullYear, set_full_year, 3, attr); - define_native_function(vm.names.getYear, get_year, 0, attr); - define_native_function(vm.names.setYear, set_year, 1, attr); define_native_function(vm.names.getHours, get_hours, 0, attr); - define_native_function(vm.names.setHours, set_hours, 4, attr); define_native_function(vm.names.getMilliseconds, get_milliseconds, 0, attr); - define_native_function(vm.names.setMilliseconds, set_milliseconds, 1, attr); define_native_function(vm.names.getMinutes, get_minutes, 0, attr); - define_native_function(vm.names.setMinutes, set_minutes, 3, attr); define_native_function(vm.names.getMonth, get_month, 0, attr); - define_native_function(vm.names.setMonth, set_month, 2, attr); define_native_function(vm.names.getSeconds, get_seconds, 0, attr); - define_native_function(vm.names.setSeconds, set_seconds, 2, attr); define_native_function(vm.names.getTime, get_time, 0, attr); - define_native_function(vm.names.setTime, set_time, 1, attr); define_native_function(vm.names.getTimezoneOffset, get_timezone_offset, 0, attr); define_native_function(vm.names.getUTCDate, get_utc_date, 0, attr); - define_native_function(vm.names.setUTCDate, set_date, 1, attr); // FIXME: This is a hack, Serenity doesn't currently support timezones other than UTC. define_native_function(vm.names.getUTCDay, get_utc_day, 0, attr); define_native_function(vm.names.getUTCFullYear, get_utc_full_year, 0, attr); - define_native_function(vm.names.setUTCFullYear, set_full_year, 3, attr); // FIXME: see above define_native_function(vm.names.getUTCHours, get_utc_hours, 0, attr); - define_native_function(vm.names.setUTCHours, set_hours, 4, attr); // FIXME: see above define_native_function(vm.names.getUTCMilliseconds, get_utc_milliseconds, 0, attr); - define_native_function(vm.names.setUTCMilliseconds, set_milliseconds, 1, attr); // FIXME: see above define_native_function(vm.names.getUTCMinutes, get_utc_minutes, 0, attr); - define_native_function(vm.names.setUTCMinutes, set_minutes, 3, attr); // FIXME: see above define_native_function(vm.names.getUTCMonth, get_utc_month, 0, attr); - define_native_function(vm.names.setUTCMonth, set_month, 2, attr); // FIXME: see above define_native_function(vm.names.getUTCSeconds, get_utc_seconds, 0, attr); - define_native_function(vm.names.setUTCSeconds, set_seconds, 2, attr); // FIXME: see above + define_native_function(vm.names.setDate, set_date, 1, attr); + define_native_function(vm.names.setFullYear, set_full_year, 3, attr); + define_native_function(vm.names.setHours, set_hours, 4, attr); + define_native_function(vm.names.setMilliseconds, set_milliseconds, 1, attr); + define_native_function(vm.names.setMinutes, set_minutes, 3, attr); + define_native_function(vm.names.setMonth, set_month, 2, attr); + define_native_function(vm.names.setSeconds, set_seconds, 2, attr); + define_native_function(vm.names.setTime, set_time, 1, attr); + define_native_function(vm.names.setUTCDate, set_date, 1, attr); // FIXME: This is a hack, Serenity doesn't currently support timezones other than UTC. + define_native_function(vm.names.setUTCFullYear, set_full_year, 3, attr); // FIXME: see above + define_native_function(vm.names.setUTCHours, set_hours, 4, attr); // FIXME: see above + define_native_function(vm.names.setUTCMilliseconds, set_milliseconds, 1, attr); // FIXME: see above + define_native_function(vm.names.setUTCMinutes, set_minutes, 3, attr); // FIXME: see above + define_native_function(vm.names.setUTCMonth, set_month, 2, attr); // FIXME: see above + define_native_function(vm.names.setUTCSeconds, set_seconds, 2, attr); // FIXME: see above define_native_function(vm.names.toDateString, to_date_string, 0, attr); - define_native_function(vm.names.toUTCString, to_utc_string, 0, attr); define_native_function(vm.names.toISOString, to_iso_string, 0, attr); + define_native_function(vm.names.toJSON, to_json, 1, attr); define_native_function(vm.names.toLocaleDateString, to_locale_date_string, 0, attr); define_native_function(vm.names.toLocaleString, to_locale_string, 0, attr); define_native_function(vm.names.toLocaleTimeString, to_locale_time_string, 0, attr); - define_native_function(vm.names.toTimeString, to_time_string, 0, attr); define_native_function(vm.names.toString, to_string, 0, attr); - define_native_function(vm.names.toJSON, to_json, 1, attr); define_native_function(vm.names.toTemporalInstant, to_temporal_instant, 0, attr); + define_native_function(vm.names.toTimeString, to_time_string, 0, attr); + define_native_function(vm.names.toUTCString, to_utc_string, 0, attr); + + define_native_function(vm.names.getYear, get_year, 0, attr); + define_native_function(vm.names.setYear, set_year, 1, attr); // 21.4.4.45 Date.prototype [ @@toPrimitive ] ( hint ), https://tc39.es/ecma262/#sec-date.prototype-@@toprimitive define_native_function(*vm.well_known_symbol_to_primitive(), symbol_to_primitive, 1, Attribute::Configurable); @@ -121,30 +122,6 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_date) return Value(this_object->date()); } -// 21.4.4.20 Date.prototype.setDate ( date ), https://tc39.es/ecma262/#sec-date.prototype.setdate -JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_date) -{ - auto* this_object = TRY(typed_this_object(global_object)); - - auto& datetime = this_object->datetime(); - - auto new_date_value = TRY(vm.argument(0).to_number(global_object)); - if (!new_date_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_date = new_date_value.as_i32(); - - datetime.set_time(datetime.year(), datetime.month(), new_date, datetime.hour(), datetime.minute(), datetime.second()); - if (this_object->time() > Date::time_clip) { - this_object->set_is_invalid(true); - return js_nan(); - } - - this_object->set_is_invalid(false); - return Value(this_object->time()); -} - // 21.4.4.3 Date.prototype.getDay ( ), https://tc39.es/ecma262/#sec-date.prototype.getday JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_day) { @@ -167,87 +144,6 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_full_year) return Value(this_object->year()); } -// 21.4.4.21 Date.prototype.setFullYear ( year [ , month [ , date ] ] ), https://tc39.es/ecma262/#sec-date.prototype.setfullyear -JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_full_year) -{ - auto* this_object = TRY(typed_this_object(global_object)); - - auto& datetime = this_object->datetime(); - - auto arg_or = [&vm, &global_object](size_t i, i32 fallback) -> ThrowCompletionOr { - return vm.argument_count() > i ? vm.argument(i).to_number(global_object) : Value(fallback); - }; - - auto new_year_value = TRY(vm.argument(0).to_number(global_object)); - if (!new_year_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_year = new_year_value.as_i32(); - - auto new_month_value = TRY(arg_or(1, datetime.month() - 1)); - if (!new_month_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_month = new_month_value.as_i32() + 1; // JS Months: 0 - 11, DateTime months: 1-12 - - auto new_day_value = TRY(arg_or(2, datetime.day())); - if (!new_day_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_day = new_day_value.as_i32(); - - datetime.set_time(new_year, new_month, new_day, datetime.hour(), datetime.minute(), datetime.second()); - if (this_object->time() > Date::time_clip) { - this_object->set_is_invalid(true); - return js_nan(); - } - - this_object->set_is_invalid(false); - - return Value(this_object->time()); -} - -// B.2.4.1 Date.prototype.getYear ( ), https://tc39.es/ecma262/#sec-date.prototype.getyear -JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_year) -{ - auto* this_object = TRY(typed_this_object(global_object)); - - if (this_object->is_invalid()) - return js_nan(); - - return Value(this_object->year() - 1900); -} - -// B.2.4.2 Date.prototype.setYear ( year ), https://tc39.es/ecma262/#sec-date.prototype.setyear -JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_year) -{ - auto* this_object = TRY(typed_this_object(global_object)); - - auto& datetime = this_object->datetime(); - - auto new_year_value = TRY(vm.argument(0).to_number(global_object)); - if (!new_year_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_year = new_year_value.as_i32(); - if (new_year >= 0 && new_year <= 99) - new_year += 1900; - - datetime.set_time(new_year, datetime.month(), datetime.day(), datetime.hour(), datetime.minute(), datetime.second()); - if (this_object->time() > Date::time_clip) { - this_object->set_is_invalid(true); - return js_nan(); - } - - this_object->set_is_invalid(false); - - return Value(this_object->time()); -} - // 21.4.4.5 Date.prototype.getHours ( ), https://tc39.es/ecma262/#sec-date.prototype.gethours JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_hours) { @@ -259,59 +155,7 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_hours) return Value(this_object->hours()); } -// 21.4.4.22 Date.prototype.setHours ( hour [ , min [ , sec [ , ms ] ] ] ), https://tc39.es/ecma262/#sec-date.prototype.sethours -JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_hours) -{ - auto* this_object = TRY(typed_this_object(global_object)); - - auto arg_or = [&vm, &global_object](size_t i, i32 fallback) -> ThrowCompletionOr { - return vm.argument_count() > i ? vm.argument(i).to_number(global_object) : Value(fallback); - }; - - auto& datetime = this_object->datetime(); - - auto new_hours_value = TRY(vm.argument(0).to_number(global_object)); - if (!new_hours_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_hours = new_hours_value.as_i32(); - - auto new_minutes_value = TRY(arg_or(1, datetime.minute())); - if (!new_minutes_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_minutes = new_minutes_value.as_i32(); - - auto new_seconds_value = TRY(arg_or(2, datetime.second())); - if (!new_seconds_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_seconds = new_seconds_value.as_i32(); - - auto new_milliseconds_value = TRY(arg_or(3, this_object->milliseconds())); - if (!new_milliseconds_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_milliseconds = new_milliseconds_value.as_i32(); - - new_seconds += new_milliseconds / 1000; - this_object->set_milliseconds(new_milliseconds % 1000); - - datetime.set_time(datetime.year(), datetime.month(), datetime.day(), new_hours, new_minutes, new_seconds); - if (this_object->time() > Date::time_clip) { - this_object->set_is_invalid(true); - return js_nan(); - } - - this_object->set_is_invalid(false); - return Value(this_object->time()); -} - -// 21.4.4.23 Date.prototype.setMilliseconds ( ms ), https://tc39.es/ecma262/#sec-date.prototype.setmilliseconds +// 21.4.4.6 Date.prototype.getMilliseconds ( ), https://tc39.es/ecma262/#sec-date.prototype.getmilliseconds JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_milliseconds) { auto* this_object = TRY(typed_this_object(global_object)); @@ -322,38 +166,6 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_milliseconds) return Value(this_object->milliseconds()); } -// 21.4.4.23 Date.prototype.setMilliseconds ( ms ), https://tc39.es/ecma262/#sec-date.prototype.setmilliseconds -JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_milliseconds) -{ - auto* this_object = TRY(typed_this_object(global_object)); - - auto new_milliseconds_value = TRY(vm.argument(0).to_number(global_object)); - - if (!new_milliseconds_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - - auto new_milliseconds = new_milliseconds_value.as_i32(); - - this_object->set_milliseconds(new_milliseconds % 1000); - - auto added_seconds = new_milliseconds / 1000; - if (added_seconds > 0) { - auto& datetime = this_object->datetime(); - datetime.set_time(datetime.year(), datetime.month(), datetime.day(), datetime.hour(), datetime.minute(), datetime.second() + added_seconds); - } - - if (this_object->time() > Date::time_clip) { - this_object->set_is_invalid(true); - return js_nan(); - } - - this_object->set_is_invalid(false); - - return Value(this_object->time()); -} - // 21.4.4.7 Date.prototype.getMinutes ( ), https://tc39.es/ecma262/#sec-date.prototype.getminutes JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_minutes) { @@ -365,51 +177,6 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_minutes) return Value(this_object->minutes()); } -// 21.4.4.24 Date.prototype.setMinutes ( min [ , sec [ , ms ] ] ), https://tc39.es/ecma262/#sec-date.prototype.setminutes -JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_minutes) -{ - auto* this_object = TRY(typed_this_object(global_object)); - - auto arg_or = [&vm, &global_object](size_t i, i32 fallback) -> ThrowCompletionOr { - return vm.argument_count() > i ? vm.argument(i).to_number(global_object) : Value(fallback); - }; - - auto& datetime = this_object->datetime(); - - auto new_minutes_value = TRY(vm.argument(0).to_number(global_object)); - if (!new_minutes_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_minutes = new_minutes_value.as_i32(); - - auto new_seconds_value = TRY(arg_or(1, datetime.second())); - if (!new_seconds_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_seconds = new_seconds_value.as_i32(); - - auto new_milliseconds_value = TRY(arg_or(2, this_object->milliseconds())); - if (!new_milliseconds_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_milliseconds = new_milliseconds_value.as_i32(); - - new_seconds += new_milliseconds / 1000; - this_object->set_milliseconds(new_milliseconds % 1000); - - datetime.set_time(datetime.year(), datetime.month(), datetime.day(), datetime.hour(), new_minutes, new_seconds); - if (this_object->time() > Date::time_clip) { - this_object->set_is_invalid(true); - return js_nan(); - } - - this_object->set_is_invalid(false); - return Value(this_object->time()); -} - // 21.4.4.8 Date.prototype.getMonth ( ), https://tc39.es/ecma262/#sec-date.prototype.getmonth JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_month) { @@ -421,41 +188,6 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_month) return Value(this_object->month()); } -// 21.4.4.25 Date.prototype.setMonth ( month [ , date ] ), https://tc39.es/ecma262/#sec-date.prototype.setmonth -JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_month) -{ - auto* this_object = TRY(typed_this_object(global_object)); - - auto arg_or = [&vm, &global_object](size_t i, i32 fallback) -> ThrowCompletionOr { - return vm.argument_count() > i ? vm.argument(i).to_number(global_object) : Value(fallback); - }; - - auto& datetime = this_object->datetime(); - - auto new_month_value = TRY(vm.argument(0).to_number(global_object)); - if (!new_month_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_month = new_month_value.as_i32() + 1; // JS Months: 0 - 11, DateTime months: 1-12 - - auto new_date_value = TRY(arg_or(1, this_object->date())); - if (!new_date_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_date = new_date_value.as_i32(); - - datetime.set_time(datetime.year(), new_month, new_date, datetime.hour(), datetime.minute(), datetime.second()); - if (this_object->time() > Date::time_clip) { - this_object->set_is_invalid(true); - return js_nan(); - } - - this_object->set_is_invalid(false); - return Value(this_object->time()); -} - // 21.4.4.9 Date.prototype.getSeconds ( ), https://tc39.es/ecma262/#sec-date.prototype.getseconds JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_seconds) { @@ -467,44 +199,6 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_seconds) return Value(this_object->seconds()); } -// 21.4.4.26 Date.prototype.setSeconds ( sec [ , ms ] ), https://tc39.es/ecma262/#sec-date.prototype.setseconds -JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_seconds) -{ - auto* this_object = TRY(typed_this_object(global_object)); - - auto arg_or = [&vm, &global_object](size_t i, i32 fallback) -> ThrowCompletionOr { - return vm.argument_count() > i ? vm.argument(i).to_number(global_object) : Value(fallback); - }; - - auto& datetime = this_object->datetime(); - - auto new_seconds_value = TRY(vm.argument(0).to_number(global_object)); - if (!new_seconds_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_seconds = new_seconds_value.as_i32(); - - auto new_milliseconds_value = TRY(arg_or(1, this_object->milliseconds())); - if (!new_milliseconds_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_milliseconds = new_milliseconds_value.as_i32(); - - new_seconds += new_milliseconds / 1000; - this_object->set_milliseconds(new_milliseconds % 1000); - - datetime.set_time(datetime.year(), datetime.month(), datetime.day(), datetime.hour(), datetime.minute(), new_seconds); - if (this_object->time() > Date::time_clip) { - this_object->set_is_invalid(true); - return js_nan(); - } - - this_object->set_is_invalid(false); - return Value(this_object->time()); -} - // 21.4.4.10 Date.prototype.getTime ( ), https://tc39.es/ecma262/#sec-date.prototype.gettime JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_time) { @@ -516,31 +210,6 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_time) return Value(this_object->time()); } -// 21.4.4.27 Date.prototype.setTime ( time ), https://tc39.es/ecma262/#sec-date.prototype.settime -JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_time) -{ - auto* this_object = TRY(typed_this_object(global_object)); - - auto new_time_value = TRY(vm.argument(0).to_number(global_object)); - if (!new_time_value.is_finite_number()) { - this_object->set_is_invalid(true); - return js_nan(); - } - auto new_time = new_time_value.as_double(); - - if (new_time > Date::time_clip) { - this_object->set_is_invalid(true); - return js_nan(); - } - - auto new_date_time = Core::DateTime::from_timestamp(static_cast(new_time / 1000)); - this_object->datetime().set_time(new_date_time.year(), new_date_time.month(), new_date_time.day(), new_date_time.hour(), new_date_time.minute(), new_date_time.second()); - this_object->set_milliseconds(static_cast(fmod(new_time, 1000))); - - this_object->set_is_invalid(false); - return Value(this_object->time()); -} - // 21.4.4.11 Date.prototype.getTimezoneOffset ( ), https://tc39.es/ecma262/#sec-date.prototype.gettimezoneoffset JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_timezone_offset) { @@ -608,17 +277,6 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_utc_milliseconds) return Value(this_object->utc_milliseconds()); } -// 21.4.4.18 Date.prototype.getUTCMonth ( ), https://tc39.es/ecma262/#sec-date.prototype.getutcmonth -JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_utc_month) -{ - auto* this_object = TRY(typed_this_object(global_object)); - - if (this_object->is_invalid()) - return js_nan(); - - return Value(this_object->utc_month()); -} - // 21.4.4.17 Date.prototype.getUTCMinutes ( ), https://tc39.es/ecma262/#sec-date.prototype.getutcminutes JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_utc_minutes) { @@ -630,6 +288,17 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_utc_minutes) return Value(this_object->utc_minutes()); } +// 21.4.4.18 Date.prototype.getUTCMonth ( ), https://tc39.es/ecma262/#sec-date.prototype.getutcmonth +JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_utc_month) +{ + auto* this_object = TRY(typed_this_object(global_object)); + + if (this_object->is_invalid()) + return js_nan(); + + return Value(this_object->utc_month()); +} + // 21.4.4.19 Date.prototype.getUTCSeconds ( ), https://tc39.es/ecma262/#sec-date.prototype.getutcseconds JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_utc_seconds) { @@ -641,6 +310,300 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_utc_seconds) return Value(this_object->utc_seconds()); } +// 21.4.4.20 Date.prototype.setDate ( date ), https://tc39.es/ecma262/#sec-date.prototype.setdate +JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_date) +{ + auto* this_object = TRY(typed_this_object(global_object)); + + auto& datetime = this_object->datetime(); + + auto new_date_value = TRY(vm.argument(0).to_number(global_object)); + if (!new_date_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_date = new_date_value.as_i32(); + + datetime.set_time(datetime.year(), datetime.month(), new_date, datetime.hour(), datetime.minute(), datetime.second()); + if (this_object->time() > Date::time_clip) { + this_object->set_is_invalid(true); + return js_nan(); + } + + this_object->set_is_invalid(false); + return Value(this_object->time()); +} + +// 21.4.4.21 Date.prototype.setFullYear ( year [ , month [ , date ] ] ), https://tc39.es/ecma262/#sec-date.prototype.setfullyear +JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_full_year) +{ + auto* this_object = TRY(typed_this_object(global_object)); + + auto& datetime = this_object->datetime(); + + auto arg_or = [&vm, &global_object](size_t i, i32 fallback) -> ThrowCompletionOr { + return vm.argument_count() > i ? vm.argument(i).to_number(global_object) : Value(fallback); + }; + + auto new_year_value = TRY(vm.argument(0).to_number(global_object)); + if (!new_year_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_year = new_year_value.as_i32(); + + auto new_month_value = TRY(arg_or(1, datetime.month() - 1)); + if (!new_month_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_month = new_month_value.as_i32() + 1; // JS Months: 0 - 11, DateTime months: 1-12 + + auto new_day_value = TRY(arg_or(2, datetime.day())); + if (!new_day_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_day = new_day_value.as_i32(); + + datetime.set_time(new_year, new_month, new_day, datetime.hour(), datetime.minute(), datetime.second()); + if (this_object->time() > Date::time_clip) { + this_object->set_is_invalid(true); + return js_nan(); + } + + this_object->set_is_invalid(false); + + return Value(this_object->time()); +} + +// 21.4.4.22 Date.prototype.setHours ( hour [ , min [ , sec [ , ms ] ] ] ), https://tc39.es/ecma262/#sec-date.prototype.sethours +JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_hours) +{ + auto* this_object = TRY(typed_this_object(global_object)); + + auto arg_or = [&vm, &global_object](size_t i, i32 fallback) -> ThrowCompletionOr { + return vm.argument_count() > i ? vm.argument(i).to_number(global_object) : Value(fallback); + }; + + auto& datetime = this_object->datetime(); + + auto new_hours_value = TRY(vm.argument(0).to_number(global_object)); + if (!new_hours_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_hours = new_hours_value.as_i32(); + + auto new_minutes_value = TRY(arg_or(1, datetime.minute())); + if (!new_minutes_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_minutes = new_minutes_value.as_i32(); + + auto new_seconds_value = TRY(arg_or(2, datetime.second())); + if (!new_seconds_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_seconds = new_seconds_value.as_i32(); + + auto new_milliseconds_value = TRY(arg_or(3, this_object->milliseconds())); + if (!new_milliseconds_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_milliseconds = new_milliseconds_value.as_i32(); + + new_seconds += new_milliseconds / 1000; + this_object->set_milliseconds(new_milliseconds % 1000); + + datetime.set_time(datetime.year(), datetime.month(), datetime.day(), new_hours, new_minutes, new_seconds); + if (this_object->time() > Date::time_clip) { + this_object->set_is_invalid(true); + return js_nan(); + } + + this_object->set_is_invalid(false); + return Value(this_object->time()); +} + +// 21.4.4.23 Date.prototype.setMilliseconds ( ms ), https://tc39.es/ecma262/#sec-date.prototype.setmilliseconds +JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_milliseconds) +{ + auto* this_object = TRY(typed_this_object(global_object)); + + auto new_milliseconds_value = TRY(vm.argument(0).to_number(global_object)); + + if (!new_milliseconds_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + + auto new_milliseconds = new_milliseconds_value.as_i32(); + + this_object->set_milliseconds(new_milliseconds % 1000); + + auto added_seconds = new_milliseconds / 1000; + if (added_seconds > 0) { + auto& datetime = this_object->datetime(); + datetime.set_time(datetime.year(), datetime.month(), datetime.day(), datetime.hour(), datetime.minute(), datetime.second() + added_seconds); + } + + if (this_object->time() > Date::time_clip) { + this_object->set_is_invalid(true); + return js_nan(); + } + + this_object->set_is_invalid(false); + + return Value(this_object->time()); +} + +// 21.4.4.24 Date.prototype.setMinutes ( min [ , sec [ , ms ] ] ), https://tc39.es/ecma262/#sec-date.prototype.setminutes +JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_minutes) +{ + auto* this_object = TRY(typed_this_object(global_object)); + + auto arg_or = [&vm, &global_object](size_t i, i32 fallback) -> ThrowCompletionOr { + return vm.argument_count() > i ? vm.argument(i).to_number(global_object) : Value(fallback); + }; + + auto& datetime = this_object->datetime(); + + auto new_minutes_value = TRY(vm.argument(0).to_number(global_object)); + if (!new_minutes_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_minutes = new_minutes_value.as_i32(); + + auto new_seconds_value = TRY(arg_or(1, datetime.second())); + if (!new_seconds_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_seconds = new_seconds_value.as_i32(); + + auto new_milliseconds_value = TRY(arg_or(2, this_object->milliseconds())); + if (!new_milliseconds_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_milliseconds = new_milliseconds_value.as_i32(); + + new_seconds += new_milliseconds / 1000; + this_object->set_milliseconds(new_milliseconds % 1000); + + datetime.set_time(datetime.year(), datetime.month(), datetime.day(), datetime.hour(), new_minutes, new_seconds); + if (this_object->time() > Date::time_clip) { + this_object->set_is_invalid(true); + return js_nan(); + } + + this_object->set_is_invalid(false); + return Value(this_object->time()); +} + +// 21.4.4.25 Date.prototype.setMonth ( month [ , date ] ), https://tc39.es/ecma262/#sec-date.prototype.setmonth +JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_month) +{ + auto* this_object = TRY(typed_this_object(global_object)); + + auto arg_or = [&vm, &global_object](size_t i, i32 fallback) -> ThrowCompletionOr { + return vm.argument_count() > i ? vm.argument(i).to_number(global_object) : Value(fallback); + }; + + auto& datetime = this_object->datetime(); + + auto new_month_value = TRY(vm.argument(0).to_number(global_object)); + if (!new_month_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_month = new_month_value.as_i32() + 1; // JS Months: 0 - 11, DateTime months: 1-12 + + auto new_date_value = TRY(arg_or(1, this_object->date())); + if (!new_date_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_date = new_date_value.as_i32(); + + datetime.set_time(datetime.year(), new_month, new_date, datetime.hour(), datetime.minute(), datetime.second()); + if (this_object->time() > Date::time_clip) { + this_object->set_is_invalid(true); + return js_nan(); + } + + this_object->set_is_invalid(false); + return Value(this_object->time()); +} + +// 21.4.4.26 Date.prototype.setSeconds ( sec [ , ms ] ), https://tc39.es/ecma262/#sec-date.prototype.setseconds +JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_seconds) +{ + auto* this_object = TRY(typed_this_object(global_object)); + + auto arg_or = [&vm, &global_object](size_t i, i32 fallback) -> ThrowCompletionOr { + return vm.argument_count() > i ? vm.argument(i).to_number(global_object) : Value(fallback); + }; + + auto& datetime = this_object->datetime(); + + auto new_seconds_value = TRY(vm.argument(0).to_number(global_object)); + if (!new_seconds_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_seconds = new_seconds_value.as_i32(); + + auto new_milliseconds_value = TRY(arg_or(1, this_object->milliseconds())); + if (!new_milliseconds_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_milliseconds = new_milliseconds_value.as_i32(); + + new_seconds += new_milliseconds / 1000; + this_object->set_milliseconds(new_milliseconds % 1000); + + datetime.set_time(datetime.year(), datetime.month(), datetime.day(), datetime.hour(), datetime.minute(), new_seconds); + if (this_object->time() > Date::time_clip) { + this_object->set_is_invalid(true); + return js_nan(); + } + + this_object->set_is_invalid(false); + return Value(this_object->time()); +} + +// 21.4.4.27 Date.prototype.setTime ( time ), https://tc39.es/ecma262/#sec-date.prototype.settime +JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_time) +{ + auto* this_object = TRY(typed_this_object(global_object)); + + auto new_time_value = TRY(vm.argument(0).to_number(global_object)); + if (!new_time_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_time = new_time_value.as_double(); + + if (new_time > Date::time_clip) { + this_object->set_is_invalid(true); + return js_nan(); + } + + auto new_date_time = Core::DateTime::from_timestamp(static_cast(new_time / 1000)); + this_object->datetime().set_time(new_date_time.year(), new_date_time.month(), new_date_time.day(), new_date_time.hour(), new_date_time.minute(), new_date_time.second()); + this_object->set_milliseconds(static_cast(fmod(new_time, 1000))); + + this_object->set_is_invalid(false); + return Value(this_object->time()); +} + // 21.4.4.35 Date.prototype.toDateString ( ), https://tc39.es/ecma262/#sec-date.prototype.todatestring JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_date_string) { @@ -653,26 +616,6 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_date_string) return js_string(vm, move(string)); } -// B.2.4.3 Date.prototype.toGMTString ( ), https://tc39.es/ecma262/#sec-date.prototype.togmtstring -JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_gmt_string) -{ - // NOTE: The toUTCString method is preferred. The toGMTString method is provided principally for compatibility with old code. - return to_utc_string(vm, global_object); -} - -// 21.4.4.43 Date.prototype.toUTCString ( ), https://tc39.es/ecma262/#sec-date.prototype.toutcstring -JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_utc_string) -{ - auto* this_object = TRY(typed_this_object(global_object)); - - if (this_object->is_invalid()) - return js_string(vm, "Invalid Date"); - - // HTTP dates are always expressed in GMT. - auto string = this_object->gmt_date_string(); - return js_string(vm, move(string)); -} - // 21.4.4.36 Date.prototype.toISOString ( ), https://tc39.es/ecma262/#sec-date.prototype.toisostring JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_iso_string) { @@ -685,6 +628,19 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_iso_string) return js_string(vm, move(string)); } +// 21.4.4.37 Date.prototype.toJSON ( key ), https://tc39.es/ecma262/#sec-date.prototype.tojson +JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_json) +{ + auto this_value = vm.this_value(global_object); + + auto time_value = TRY(this_value.to_primitive(global_object, Value::PreferredType::Number)); + + if (time_value.is_number() && !time_value.is_finite_number()) + return js_null(); + + return TRY(this_value.invoke(global_object, vm.names.toISOString)); +} + static ThrowCompletionOr construct_date_time_format(GlobalObject& global_object, Value locales, Value options) { MarkedValueList arguments { global_object.vm().heap() }; @@ -695,6 +651,7 @@ static ThrowCompletionOr construct_date_time_format(Globa return static_cast(date_time_format); } +// 21.4.4.38 Date.prototype.toLocaleDateString ( [ reserved1 [ , reserved2 ] ] ), https://tc39.es/ecma262/#sec-date.prototype.tolocaledatestring // 18.4.2 Date.prototype.toLocaleDateString ( [ locales [ , options ] ] ), https://tc39.es/ecma402/#sup-date.prototype.tolocaledatestring JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_locale_date_string) { @@ -719,6 +676,7 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_locale_date_string) return js_string(vm, move(formatted)); } +// 21.4.4.39 Date.prototype.toLocaleString ( [ reserved1 [ , reserved2 ] ] ), https://tc39.es/ecma262/#sec-date.prototype.tolocalestring // 18.4.1 Date.prototype.toLocaleString ( [ locales [ , options ] ] ), https://tc39.es/ecma402/#sup-date.prototype.tolocalestring JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_locale_string) { @@ -743,6 +701,7 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_locale_string) return js_string(vm, move(formatted)); } +// 21.4.4.40 Date.prototype.toLocaleTimeString ( [ reserved1 [ , reserved2 ] ] ), https://tc39.es/ecma262/#sec-date.prototype.tolocaletimestring // 18.4.3 Date.prototype.toLocaleTimeString ( [ locales [ , options ] ] ), https://tc39.es/ecma402/#sup-date.prototype.tolocaletimestring JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_locale_time_string) { @@ -767,18 +726,6 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_locale_time_string) return js_string(vm, move(formatted)); } -// 21.4.4.42 Date.prototype.toTimeString ( ), https://tc39.es/ecma262/#sec-date.prototype.totimestring -JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_time_string) -{ - auto* this_object = TRY(typed_this_object(global_object)); - - if (this_object->is_invalid()) - return js_string(vm, "Invalid Date"); - - auto string = this_object->time_string(); - return js_string(vm, move(string)); -} - // 21.4.4.41 Date.prototype.toString ( ), https://tc39.es/ecma262/#sec-date.prototype.tostring JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_string) { @@ -791,19 +738,6 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_string) return js_string(vm, move(string)); } -// 21.4.4.37 Date.prototype.toJSON ( key ), https://tc39.es/ecma262/#sec-date.prototype.tojson -JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_json) -{ - auto this_value = vm.this_value(global_object); - - auto time_value = TRY(this_value.to_primitive(global_object, Value::PreferredType::Number)); - - if (time_value.is_number() && !time_value.is_finite_number()) - return js_null(); - - return TRY(this_value.invoke(global_object, vm.names.toISOString)); -} - // 14.1.1 Date.prototype.toTemporalInstant ( ), https://tc39.es/proposal-temporal/#sec-date.prototype.totemporalinstant JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_temporal_instant) { @@ -818,6 +752,31 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_temporal_instant) return MUST(Temporal::create_temporal_instant(global_object, *ns)); } +// 21.4.4.42 Date.prototype.toTimeString ( ), https://tc39.es/ecma262/#sec-date.prototype.totimestring +JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_time_string) +{ + auto* this_object = TRY(typed_this_object(global_object)); + + if (this_object->is_invalid()) + return js_string(vm, "Invalid Date"); + + auto string = this_object->time_string(); + return js_string(vm, move(string)); +} + +// 21.4.4.43 Date.prototype.toUTCString ( ), https://tc39.es/ecma262/#sec-date.prototype.toutcstring +JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_utc_string) +{ + auto* this_object = TRY(typed_this_object(global_object)); + + if (this_object->is_invalid()) + return js_string(vm, "Invalid Date"); + + // HTTP dates are always expressed in GMT. + auto string = this_object->gmt_date_string(); + return js_string(vm, move(string)); +} + // 21.4.4.45 Date.prototype [ @@toPrimitive ] ( hint ), https://tc39.es/ecma262/#sec-date.prototype-@@toprimitive JS_DEFINE_NATIVE_FUNCTION(DatePrototype::symbol_to_primitive) { @@ -838,4 +797,49 @@ JS_DEFINE_NATIVE_FUNCTION(DatePrototype::symbol_to_primitive) return TRY(this_value.as_object().ordinary_to_primitive(try_first)); } +// B.2.4.1 Date.prototype.getYear ( ), https://tc39.es/ecma262/#sec-date.prototype.getyear +JS_DEFINE_NATIVE_FUNCTION(DatePrototype::get_year) +{ + auto* this_object = TRY(typed_this_object(global_object)); + + if (this_object->is_invalid()) + return js_nan(); + + return Value(this_object->year() - 1900); +} + +// B.2.4.2 Date.prototype.setYear ( year ), https://tc39.es/ecma262/#sec-date.prototype.setyear +JS_DEFINE_NATIVE_FUNCTION(DatePrototype::set_year) +{ + auto* this_object = TRY(typed_this_object(global_object)); + + auto& datetime = this_object->datetime(); + + auto new_year_value = TRY(vm.argument(0).to_number(global_object)); + if (!new_year_value.is_finite_number()) { + this_object->set_is_invalid(true); + return js_nan(); + } + auto new_year = new_year_value.as_i32(); + if (new_year >= 0 && new_year <= 99) + new_year += 1900; + + datetime.set_time(new_year, datetime.month(), datetime.day(), datetime.hour(), datetime.minute(), datetime.second()); + if (this_object->time() > Date::time_clip) { + this_object->set_is_invalid(true); + return js_nan(); + } + + this_object->set_is_invalid(false); + + return Value(this_object->time()); +} + +// B.2.4.3 Date.prototype.toGMTString ( ), https://tc39.es/ecma262/#sec-date.prototype.togmtstring +JS_DEFINE_NATIVE_FUNCTION(DatePrototype::to_gmt_string) +{ + // NOTE: The toUTCString method is preferred. The toGMTString method is provided principally for compatibility with old code. + return to_utc_string(vm, global_object); +} + } diff --git a/Userland/Libraries/LibJS/Runtime/DatePrototype.h b/Userland/Libraries/LibJS/Runtime/DatePrototype.h index 9c164aed40..4dc436f490 100644 --- a/Userland/Libraries/LibJS/Runtime/DatePrototype.h +++ b/Userland/Libraries/LibJS/Runtime/DatePrototype.h @@ -21,24 +21,14 @@ public: private: JS_DECLARE_NATIVE_FUNCTION(get_date); - JS_DECLARE_NATIVE_FUNCTION(set_date); JS_DECLARE_NATIVE_FUNCTION(get_day); JS_DECLARE_NATIVE_FUNCTION(get_full_year); - JS_DECLARE_NATIVE_FUNCTION(set_full_year); - JS_DECLARE_NATIVE_FUNCTION(get_year); - JS_DECLARE_NATIVE_FUNCTION(set_year); JS_DECLARE_NATIVE_FUNCTION(get_hours); - JS_DECLARE_NATIVE_FUNCTION(set_hours); JS_DECLARE_NATIVE_FUNCTION(get_milliseconds); - JS_DECLARE_NATIVE_FUNCTION(set_milliseconds); JS_DECLARE_NATIVE_FUNCTION(get_minutes); - JS_DECLARE_NATIVE_FUNCTION(set_minutes); JS_DECLARE_NATIVE_FUNCTION(get_month); - JS_DECLARE_NATIVE_FUNCTION(set_month); JS_DECLARE_NATIVE_FUNCTION(get_seconds); - JS_DECLARE_NATIVE_FUNCTION(set_seconds); JS_DECLARE_NATIVE_FUNCTION(get_time); - JS_DECLARE_NATIVE_FUNCTION(set_time); JS_DECLARE_NATIVE_FUNCTION(get_timezone_offset); JS_DECLARE_NATIVE_FUNCTION(get_utc_date); JS_DECLARE_NATIVE_FUNCTION(get_utc_day); @@ -48,17 +38,29 @@ private: JS_DECLARE_NATIVE_FUNCTION(get_utc_minutes); JS_DECLARE_NATIVE_FUNCTION(get_utc_month); JS_DECLARE_NATIVE_FUNCTION(get_utc_seconds); + JS_DECLARE_NATIVE_FUNCTION(set_date); + JS_DECLARE_NATIVE_FUNCTION(set_full_year); + JS_DECLARE_NATIVE_FUNCTION(set_hours); + JS_DECLARE_NATIVE_FUNCTION(set_milliseconds); + JS_DECLARE_NATIVE_FUNCTION(set_minutes); + JS_DECLARE_NATIVE_FUNCTION(set_month); + JS_DECLARE_NATIVE_FUNCTION(set_seconds); + JS_DECLARE_NATIVE_FUNCTION(set_time); JS_DECLARE_NATIVE_FUNCTION(to_date_string); - JS_DECLARE_NATIVE_FUNCTION(to_gmt_string); - JS_DECLARE_NATIVE_FUNCTION(to_utc_string); JS_DECLARE_NATIVE_FUNCTION(to_iso_string); + JS_DECLARE_NATIVE_FUNCTION(to_json); JS_DECLARE_NATIVE_FUNCTION(to_locale_date_string); JS_DECLARE_NATIVE_FUNCTION(to_locale_string); JS_DECLARE_NATIVE_FUNCTION(to_locale_time_string); - JS_DECLARE_NATIVE_FUNCTION(to_time_string); JS_DECLARE_NATIVE_FUNCTION(to_string); - JS_DECLARE_NATIVE_FUNCTION(to_json); JS_DECLARE_NATIVE_FUNCTION(to_temporal_instant); + JS_DECLARE_NATIVE_FUNCTION(to_time_string); + JS_DECLARE_NATIVE_FUNCTION(to_utc_string); + + JS_DECLARE_NATIVE_FUNCTION(get_year); + JS_DECLARE_NATIVE_FUNCTION(set_year); + JS_DECLARE_NATIVE_FUNCTION(to_gmt_string); + JS_DECLARE_NATIVE_FUNCTION(symbol_to_primitive); };